From 8e24a2d2c569691c10572cebd53c4178b5035920 Mon Sep 17 00:00:00 2001
From: ClemensFischer <fischer.clemens@gmail.com>
Date: Mon, 22 Jul 2024 19:58:42 +0200
Subject: [PATCH] Updated Avalonia version

---
 MBTiles/Avalonia/MBTiles.Avalonia.csproj            |  2 +-
 MapControl/Avalonia/MapControl.Avalonia.csproj      |  2 +-
 .../Avalonia/MapProjections.Avalonia.csproj         |  2 +-
 MapUiTools/Avalonia/MapUiTools.Avalonia.csproj      |  2 +-
 MapUiTools/Avalonia/MenuButton.Avalonia.cs          | 13 ++++++-------
 SampleApps/AvaloniaApp/AvaloniaApp.csproj           | 10 +++++-----
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/MBTiles/Avalonia/MBTiles.Avalonia.csproj b/MBTiles/Avalonia/MBTiles.Avalonia.csproj
index 9faffc58..a8a8cb55 100644
--- a/MBTiles/Avalonia/MBTiles.Avalonia.csproj
+++ b/MBTiles/Avalonia/MBTiles.Avalonia.csproj
@@ -15,7 +15,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.11" />
+        <PackageReference Include="Avalonia" Version="11.1.0" />
         <PackageReference Include="System.Data.SQLite.Core" Version="1.0.118" />
     </ItemGroup>
 </Project>
diff --git a/MapControl/Avalonia/MapControl.Avalonia.csproj b/MapControl/Avalonia/MapControl.Avalonia.csproj
index c508d8d4..6929f58e 100644
--- a/MapControl/Avalonia/MapControl.Avalonia.csproj
+++ b/MapControl/Avalonia/MapControl.Avalonia.csproj
@@ -16,7 +16,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.11" />
+        <PackageReference Include="Avalonia" Version="11.1.0" />
         <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
     </ItemGroup>
diff --git a/MapProjections/Avalonia/MapProjections.Avalonia.csproj b/MapProjections/Avalonia/MapProjections.Avalonia.csproj
index 960f0ea5..f7eb2070 100644
--- a/MapProjections/Avalonia/MapProjections.Avalonia.csproj
+++ b/MapProjections/Avalonia/MapProjections.Avalonia.csproj
@@ -19,7 +19,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.11" />
+        <PackageReference Include="Avalonia" Version="11.1.0" />
         <PackageReference Include="ProjNET4GeoAPI" Version="1.4.1" />
     </ItemGroup>
 </Project>
diff --git a/MapUiTools/Avalonia/MapUiTools.Avalonia.csproj b/MapUiTools/Avalonia/MapUiTools.Avalonia.csproj
index e02ab51b..52719a52 100644
--- a/MapUiTools/Avalonia/MapUiTools.Avalonia.csproj
+++ b/MapUiTools/Avalonia/MapUiTools.Avalonia.csproj
@@ -15,6 +15,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.11" />
+        <PackageReference Include="Avalonia" Version="11.1.0" />
     </ItemGroup>
 </Project>
diff --git a/MapUiTools/Avalonia/MenuButton.Avalonia.cs b/MapUiTools/Avalonia/MenuButton.Avalonia.cs
index e0a2c1c2..a6a3a3a1 100644
--- a/MapUiTools/Avalonia/MenuButton.Avalonia.cs
+++ b/MapUiTools/Avalonia/MenuButton.Avalonia.cs
@@ -15,11 +15,10 @@ namespace MapControl
 {
     public class ToggleMenuFlyoutItem : MenuItem
     {
-        internal static readonly FontFamily SymbolFont = new FontFamily("Segoe MDL2 Assets");
+        internal static readonly FontFamily SymbolFont = new("Segoe MDL2 Assets");
 
         private readonly StackPanel header;
         private readonly TextBlock icon;
-        private bool isChecked;
 
         public ToggleMenuFlyoutItem(string text, object item, EventHandler<RoutedEventArgs> click)
         {
@@ -42,13 +41,13 @@ namespace MapControl
 
         protected override Type StyleKeyOverride => typeof(MenuItem);
 
-        public bool IsChecked
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs args)
         {
-            get => isChecked;
-            set
+            base.OnPropertyChanged(args);
+
+            if (args.Property == IsCheckedProperty)
             {
-                isChecked = value;
-                icon.Text = isChecked ? "\uE73E" : ""; // CheckMark
+                icon.Text = (bool)args.NewValue ? "\uE73E" : ""; // CheckMark
             }
         }
     }
diff --git a/SampleApps/AvaloniaApp/AvaloniaApp.csproj b/SampleApps/AvaloniaApp/AvaloniaApp.csproj
index f6070fff..f44fcc2c 100644
--- a/SampleApps/AvaloniaApp/AvaloniaApp.csproj
+++ b/SampleApps/AvaloniaApp/AvaloniaApp.csproj
@@ -32,11 +32,11 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.11" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.0.11" />
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.11" />
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.11" />
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.11" />
+        <PackageReference Include="Avalonia" Version="11.1.0" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.1.0" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.0" />
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.0" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.0" />
         <PackageReference Include="Markdown.Avalonia.Tight" Version="11.0.2" />
     </ItemGroup>
 </Project>