From 541787274dd18ff87e2f961b139df89e23eb640e Mon Sep 17 00:00:00 2001 From: robloo Date: Sat, 1 Apr 2023 10:53:58 -0400 Subject: [PATCH 1/4] Mark Tmds.DBus.* as PrivateAssets in Avalonia.FreeDesktop.csproj --- src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj b/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj index da6ae9e856..5260001c3d 100644 --- a/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj +++ b/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj @@ -12,8 +12,8 @@ - - + + From b7fa91a0ad66b67d0a46c46b12fa0452d6c930e4 Mon Sep 17 00:00:00 2001 From: robloo Date: Sat, 1 Apr 2023 14:19:38 -0400 Subject: [PATCH 2/4] Remove `PrivateAssets="All"` from Tmds.DBus.Protocol package ref --- src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj b/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj index 5260001c3d..d8162c0486 100644 --- a/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj +++ b/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj @@ -12,7 +12,7 @@ - + From 659a256aa6561ab5ef533d47095f662836e527bd Mon Sep 17 00:00:00 2001 From: Collin Alpert Date: Sun, 2 Apr 2023 19:40:52 +0200 Subject: [PATCH 3/4] Fix nullability --- src/Avalonia.Controls/SystemDialog.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Avalonia.Controls/SystemDialog.cs b/src/Avalonia.Controls/SystemDialog.cs index ee41b94b5a..d2b893df37 100644 --- a/src/Avalonia.Controls/SystemDialog.cs +++ b/src/Avalonia.Controls/SystemDialog.cs @@ -18,7 +18,7 @@ namespace Avalonia.Controls /// Gets or sets a collection of filters which determine the types of files displayed in an /// or an . /// - public List? Filters { get; set; } = new List(); + public List Filters { get; set; } = new List(); /// /// Gets or sets initial file name that is displayed when the dialog is opened. From 935c0b549d2fbb5704f490c055f08ec7c86302b2 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Mon, 3 Apr 2023 04:45:08 -0700 Subject: [PATCH 4/4] Move WithInterFont to the global Avalonia namespace To keep it in line with other AppBuilder extensions, keeping Program.cs file simpler --- src/Avalonia.Fonts.Inter/AppBuilderExtension.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Avalonia.Fonts.Inter/AppBuilderExtension.cs b/src/Avalonia.Fonts.Inter/AppBuilderExtension.cs index 842629c923..e63032aa56 100644 --- a/src/Avalonia.Fonts.Inter/AppBuilderExtension.cs +++ b/src/Avalonia.Fonts.Inter/AppBuilderExtension.cs @@ -1,4 +1,6 @@ -namespace Avalonia.Fonts.Inter +using Avalonia.Fonts.Inter; + +namespace Avalonia { public static class AppBuilderExtension {