From f22b1b73038761e5ead6affa751a43f155543e4e Mon Sep 17 00:00:00 2001 From: Giuseppe Lippolis Date: Mon, 21 Dec 2020 13:17:37 +0100 Subject: [PATCH 01/13] Removed unnecessary Avalonia.Build.Tasks dependency from Avalonia.Base --- src/Avalonia.Base/Avalonia.Base.csproj | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj index 9bfd387ca9..0470dbfe89 100644 --- a/src/Avalonia.Base/Avalonia.Base.csproj +++ b/src/Avalonia.Base/Avalonia.Base.csproj @@ -5,9 +5,6 @@ Avalonia True - - - From 7f0284f7462985361f812b14925e8300fce08976 Mon Sep 17 00:00:00 2001 From: Giuseppe Lippolis Date: Mon, 21 Dec 2020 13:23:53 +0100 Subject: [PATCH 02/13] Set Avalonia.Build.Tasks ProjectReference as PrivateAssets to avoid fixes mismatch of in xml comment. --- packages/Avalonia/Avalonia.csproj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj index 75ee4a05cb..71f30bce6f 100644 --- a/packages/Avalonia/Avalonia.csproj +++ b/packages/Avalonia/Avalonia.csproj @@ -6,7 +6,9 @@ - + + all + From 9f583b939ad655739a544e9702ad80eaec487255 Mon Sep 17 00:00:00 2001 From: Giuseppe Lippolis Date: Mon, 21 Dec 2020 14:32:01 +0100 Subject: [PATCH 03/13] Fixes nuget downgrade warning --- build/AndroidWorkarounds.props | 2 +- samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj | 7 +++++-- .../Avalonia.AndroidTestApplication.csproj | 7 ++++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/build/AndroidWorkarounds.props b/build/AndroidWorkarounds.props index 67947296b3..de86acc6de 100644 --- a/build/AndroidWorkarounds.props +++ b/build/AndroidWorkarounds.props @@ -2,7 +2,7 @@ - + diff --git a/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj b/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj index db1e16166a..8d4a2f8e1b 100644 --- a/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj +++ b/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj @@ -177,10 +177,13 @@ {d0a739b9-3c68-4ba6-a328-41606954b6bd} ControlCatalog - + + 2.0.0 + + - + \ No newline at end of file diff --git a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj index f880e48282..444b2fc0d9 100644 --- a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj +++ b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj @@ -144,10 +144,15 @@ Avalonia.Skia + + + 2.0.0 + + - + \ No newline at end of file From cbbfc63a2b89616e82d31cb6facce681b50cd18a Mon Sep 17 00:00:00 2001 From: Giuseppe Lippolis Date: Mon, 21 Dec 2020 17:53:59 +0100 Subject: [PATCH 04/13] Revert "Fixes nuget downgrade warning iOS" --- samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj | 7 ++----- .../Avalonia.AndroidTestApplication.csproj | 5 ----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj b/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj index 8d4a2f8e1b..db1e16166a 100644 --- a/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj +++ b/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj @@ -177,13 +177,10 @@ {d0a739b9-3c68-4ba6-a328-41606954b6bd} ControlCatalog - - 2.0.0 - - + - \ No newline at end of file + diff --git a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj index 444b2fc0d9..492029b21c 100644 --- a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj +++ b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj @@ -144,11 +144,6 @@ Avalonia.Skia - - - 2.0.0 - - From 6ecc402d1d740b1a5328fdcedf368d9397e62ec4 Mon Sep 17 00:00:00 2001 From: Giuseppe Lippolis Date: Wed, 23 Dec 2020 13:09:50 +0100 Subject: [PATCH 05/13] fixes Issue #5210: Add buildTransitive in nuget --- packages/Avalonia/Avalonia.csproj | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj index 71f30bce6f..5fd137de7b 100644 --- a/packages/Avalonia/Avalonia.csproj +++ b/packages/Avalonia/Avalonia.csproj @@ -31,18 +31,19 @@ + true - build\ + build\;buildTransitive\ true - build\ + build\;buildTransitive\ true - build\ + build\;buildTransitive\ From 10b8baa79969cee304aac0ef780e9a244f0389a4 Mon Sep 17 00:00:00 2001 From: Giuseppe Lippolis Date: Wed, 23 Dec 2020 15:23:56 +0100 Subject: [PATCH 06/13] Migrated from SourceLink.Create.CommandLine to Microsoft.SourceLink.GitHub --- build/SourceLink.props | 23 ++++++++++++++++++- packages/Avalonia/Avalonia.csproj | 1 + .../Avalonia.Themes.Default.csproj | 6 ++--- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/build/SourceLink.props b/build/SourceLink.props index e27727c9e8..1e007e01eb 100644 --- a/build/SourceLink.props +++ b/build/SourceLink.props @@ -1,5 +1,26 @@ + + true + false + true + embedded + $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb + + + + true + + + + true + + - + + + + + + diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj index 5fd137de7b..f5a481869e 100644 --- a/packages/Avalonia/Avalonia.csproj +++ b/packages/Avalonia/Avalonia.csproj @@ -49,4 +49,5 @@ + diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj index 153e21761e..922b84e732 100644 --- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj +++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj @@ -12,10 +12,8 @@ - - - - + + From 48e82adcd4e0abb0fcc5a8043a934073c64be56e Mon Sep 17 00:00:00 2001 From: Giuseppe Lippolis Date: Wed, 23 Dec 2020 15:48:33 +0100 Subject: [PATCH 07/13] Revert Avalonia.Themes.Default This reverts commit 10b8baa79969cee304aac0ef780e9a244f0389a4. --- src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj index 922b84e732..153e21761e 100644 --- a/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj +++ b/src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj @@ -12,8 +12,10 @@ - - + + + + From 020cd8e89ca5b1311060e0ab213efae64dc5530b Mon Sep 17 00:00:00 2001 From: Giuseppe Lippolis Date: Wed, 23 Dec 2020 17:02:12 +0100 Subject: [PATCH 08/13] Add DisableSourceLink Condition in Avalonia.csproj --- packages/Avalonia/Avalonia.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Avalonia/Avalonia.csproj b/packages/Avalonia/Avalonia.csproj index f5a481869e..44e2290a0d 100644 --- a/packages/Avalonia/Avalonia.csproj +++ b/packages/Avalonia/Avalonia.csproj @@ -49,5 +49,5 @@ - + From 688c8ff4e4e6132c7a8caa9705649a5e842a899e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Pedro?= Date: Sat, 16 Jan 2021 15:27:50 +0000 Subject: [PATCH 09/13] Fixed Avalonia version in About dialog. Hide "Development Build" text in release versions. --- src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml | 6 +++--- src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml.cs | 9 ++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml b/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml index e51cc2f3ce..c5e1d43d80 100644 --- a/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml +++ b/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml @@ -79,8 +79,8 @@ - - + + @@ -102,4 +102,4 @@ - \ No newline at end of file + diff --git a/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml.cs b/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml.cs index 09fab0ed3f..55e30396e1 100644 --- a/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml.cs +++ b/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml.cs @@ -1,3 +1,4 @@ +using System; using System.Diagnostics; using System.Runtime.InteropServices; using Avalonia.Controls; @@ -7,12 +8,18 @@ namespace Avalonia.Dialogs { public class AboutAvaloniaDialog : Window { + private static readonly Version s_version = typeof(AboutAvaloniaDialog).Assembly.GetName().Version; + + public static string Version { get; } = s_version.ToString(2); + + public static bool IsDevelopmentBuild { get; } = s_version.Revision == 999; + public AboutAvaloniaDialog() { AvaloniaXamlLoader.Load(this); DataContext = this; } - + public static void OpenBrowser(string url) { if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) From 25f1b969e46521c89df169ae58901ce5fb67f18c Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 20 Jan 2021 14:03:16 +0100 Subject: [PATCH 10/13] Apply delay when closing submenu due to pointer leave. Fixes #4729 Fixes #5320 --- .../Platform/DefaultMenuInteractionHandler.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs index 5cbd3698b6..e3e9e84d7e 100644 --- a/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs +++ b/src/Avalonia.Controls/Platform/DefaultMenuInteractionHandler.cs @@ -355,7 +355,13 @@ namespace Avalonia.Controls.Platform } else if (!item.IsPointerOverSubMenu) { - item.IsSubMenuOpen = false; + DelayRun(() => + { + if (!item.IsPointerOverSubMenu) + { + item.IsSubMenuOpen = false; + } + }, MenuShowDelay); } } } From 13977f9ae05133b6e516327727a29ffce0fa1dec Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Wed, 20 Jan 2021 15:10:08 +0000 Subject: [PATCH 11/13] fix captionbutton style. --- src/Avalonia.Themes.Default/CaptionButtons.xaml | 2 +- src/Avalonia.Themes.Fluent/Controls/CaptionButtons.xaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Avalonia.Themes.Default/CaptionButtons.xaml b/src/Avalonia.Themes.Default/CaptionButtons.xaml index 95967547c6..cf469eeac5 100644 --- a/src/Avalonia.Themes.Default/CaptionButtons.xaml +++ b/src/Avalonia.Themes.Default/CaptionButtons.xaml @@ -57,7 +57,7 @@ - -