From e973868257eeb64fddb5568d3e54e9752a0aa374 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 15 Nov 2023 08:28:10 -0800
Subject: [PATCH] Use latest Avalonia

---
 .../AvaloniaSample.Android/AvaloniaSample.Android.csproj      | 2 +-
 AvaloniaSample/AvaloniaSample.iOS/AvaloniaSample.iOS.csproj   | 2 +-
 AvaloniaSample/AvaloniaSample/AvaloniaSample.csproj           | 4 ++--
 Directory.Build.props                                         | 4 +++-
 MauiSample/MauiSample.csproj                                  | 3 ++-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/AvaloniaSample/AvaloniaSample.Android/AvaloniaSample.Android.csproj b/AvaloniaSample/AvaloniaSample.Android/AvaloniaSample.Android.csproj
index fe4d8a9..4a8599f 100644
--- a/AvaloniaSample/AvaloniaSample.Android/AvaloniaSample.Android.csproj
+++ b/AvaloniaSample/AvaloniaSample.Android/AvaloniaSample.Android.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.Android" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="Avalonia.Android" Version="$(AvaloniaSamplesVersion)" />
     <PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.1" />
   </ItemGroup>
 
diff --git a/AvaloniaSample/AvaloniaSample.iOS/AvaloniaSample.iOS.csproj b/AvaloniaSample/AvaloniaSample.iOS/AvaloniaSample.iOS.csproj
index a813cea..b0a7ec4 100644
--- a/AvaloniaSample/AvaloniaSample.iOS/AvaloniaSample.iOS.csproj
+++ b/AvaloniaSample/AvaloniaSample.iOS/AvaloniaSample.iOS.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.iOS" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="Avalonia.iOS" Version="$(AvaloniaSamplesVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/AvaloniaSample/AvaloniaSample/AvaloniaSample.csproj b/AvaloniaSample/AvaloniaSample/AvaloniaSample.csproj
index 96f577b..e6ac434 100644
--- a/AvaloniaSample/AvaloniaSample/AvaloniaSample.csproj
+++ b/AvaloniaSample/AvaloniaSample/AvaloniaSample.csproj
@@ -13,8 +13,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
+    <PackageReference Include="Avalonia" Version="$(AvaloniaSamplesVersion)" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaSamplesVersion)" />
 
     <PackageReference Include="Syncfusion.Maui.Core" version="22.2.5" />
     <PackageReference Include="Syncfusion.Maui.ProgressBar" version="22.2.5" />
diff --git a/Directory.Build.props b/Directory.Build.props
index 0fd9034..f050abe 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,8 @@
 <Project>
   <PropertyGroup>
-    <AvaloniaVersion>11.0.5-rc1</AvaloniaVersion>
+    <AvaloniaSamplesVersion>11.0.5</AvaloniaSamplesVersion>
+    <!-- 11.0.5 has some critical improvements that we need -->
+    <AvaloniaVersion>11.0.5</AvaloniaVersion>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/MauiSample/MauiSample.csproj b/MauiSample/MauiSample.csproj
index 3397fd4..f8cda79 100644
--- a/MauiSample/MauiSample.csproj
+++ b/MauiSample/MauiSample.csproj
@@ -49,7 +49,8 @@
 
 	<ItemGroup>
 	  <ProjectReference Include="..\Avalonia.Maui\Avalonia.Maui.csproj" />
-	  <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
+	  <PackageReference Include="Avalonia" Version="$(AvaloniaSamplesVersion)" />
+	  <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaSamplesVersion)" />
 	</ItemGroup>
 
 	<ItemGroup>