From d18ef4f5f4f2f330b6d1e0e509281f5a3ab9fa81 Mon Sep 17 00:00:00 2001
From: Robert <mail@rbeekman.nl>
Date: Tue, 4 Jul 2023 20:24:38 +0200
Subject: [PATCH] Update Avalonia to 11 rc2.2

---
 src/Artemis.UI.Linux/Artemis.UI.Linux.csproj           |  8 ++++----
 src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj           |  8 ++++----
 src/Artemis.UI.Shared/Artemis.UI.Shared.csproj         |  6 +++---
 .../Controls/DataModelPicker/DataModelPickerButton.cs  |  2 +-
 src/Artemis.UI.Shared/Controls/NoInputTextBox.cs       |  6 ++++--
 src/Artemis.UI.Windows/Artemis.UI.Windows.csproj       | 10 +++++-----
 src/Artemis.UI.Windows/Program.cs                      |  5 -----
 src/Artemis.UI/Artemis.UI.csproj                       |  8 ++++----
 src/Artemis.UI/Screens/Root/RootView.axaml.cs          |  2 +-
 .../Artemis.VisualScripting.csproj                     |  4 ++--
 10 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj b/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj
index 21c5abd88..a38c1b34c 100644
--- a/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj
+++ b/src/Artemis.UI.Linux/Artemis.UI.Linux.csproj
@@ -16,11 +16,11 @@
         <None Remove=".gitignore" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.0-rc1.1" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.0.0-rc1.1" />
+        <PackageReference Include="Avalonia" Version="11.0.0-rc2.2" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.0.0-rc2.2" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-rc1.1" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-rc1.1" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-rc2.2" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-rc2.2" />
         <PackageReference Include="ReactiveUI" Version="18.4.26" />
     </ItemGroup>
     <ItemGroup>
diff --git a/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj b/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj
index 9e2fc0938..72a221df4 100644
--- a/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj
+++ b/src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj
@@ -15,11 +15,11 @@
         <None Remove=".gitignore" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.0-rc1.1" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.0.0-rc1.1" />
+        <PackageReference Include="Avalonia" Version="11.0.0-rc2.2" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.0.0-rc2.2" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-rc1.1" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-rc1.1" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-rc2.2" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-rc2.2" />
         <PackageReference Include="ReactiveUI" Version="18.4.26" />
     </ItemGroup>
     <ItemGroup>
diff --git a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
index 3b69f3087..824cd9624 100644
--- a/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
+++ b/src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
@@ -10,10 +10,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.0-rc1.1" />
+        <PackageReference Include="Avalonia" Version="11.0.0-rc2.2" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-rc1.1" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-rc1.1" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-rc2.2" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-rc2.2" />
         <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.0-rc1.1" />
         <PackageReference Include="DynamicData" Version="7.13.1" />
         <PackageReference Include="FluentAvaloniaUI" Version="2.0.0-rc1" />
diff --git a/src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPickerButton.cs b/src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPickerButton.cs
index eb8ab30a4..742e64458 100644
--- a/src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPickerButton.cs
+++ b/src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPickerButton.cs
@@ -225,7 +225,7 @@ public class DataModelPickerButton : TemplatedControl
 
     private void PathValidationChanged(object? sender, EventArgs e)
     {
-        Dispatcher.UIThread.InvokeAsync(UpdateValueDisplay, DispatcherPriority.DataBind);
+        Dispatcher.UIThread.InvokeAsync(UpdateValueDisplay, DispatcherPriority.Background);
     }
 
     private void UpdateValueDisplay()
diff --git a/src/Artemis.UI.Shared/Controls/NoInputTextBox.cs b/src/Artemis.UI.Shared/Controls/NoInputTextBox.cs
index de2964464..67ed37900 100644
--- a/src/Artemis.UI.Shared/Controls/NoInputTextBox.cs
+++ b/src/Artemis.UI.Shared/Controls/NoInputTextBox.cs
@@ -1,11 +1,12 @@
 using System;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Styling;
 
 namespace Artemis.UI.Shared;
 
-internal class NoInputTextBox : TextBox, IStyleable
+internal class NoInputTextBox : TextBox
 {
     /// <inheritdoc />
     protected override void OnKeyDown(KeyEventArgs e)
@@ -19,5 +20,6 @@ internal class NoInputTextBox : TextBox, IStyleable
         // Don't call the base method on purpose
     }
 
-    Type IStyleable.StyleKey => typeof(TextBox);
+    /// <inheritdoc />
+    protected override Type StyleKeyOverride => typeof(TextBox);
 }
\ No newline at end of file
diff --git a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj
index 0110ec37e..1b839e4bf 100644
--- a/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj
+++ b/src/Artemis.UI.Windows/Artemis.UI.Windows.csproj
@@ -21,12 +21,12 @@
         </None>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.0-rc1.1" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.0.0-rc1.1" />
+        <PackageReference Include="Avalonia" Version="11.0.0-rc2.2" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.0.0-rc2.2" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-rc1.1" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-rc1.1" />
-        <PackageReference Include="Avalonia.Win32" Version="11.0.0-rc1.1" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-rc2.2" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-rc2.2" />
+        <PackageReference Include="Avalonia.Win32" Version="11.0.0-rc2.2" />
         <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
         <PackageReference Include="Microsoft.Win32" Version="2.0.1" />
         <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.3" />
diff --git a/src/Artemis.UI.Windows/Program.cs b/src/Artemis.UI.Windows/Program.cs
index 37a113fc2..f9fc5e1f6 100644
--- a/src/Artemis.UI.Windows/Program.cs
+++ b/src/Artemis.UI.Windows/Program.cs
@@ -36,11 +36,6 @@ internal class Program
         return AppBuilder.Configure<App>()
             .UsePlatformDetect()
             .LogToTrace()
-            .With(new Win32PlatformOptions
-            {
-                UseWindowsUIComposition = true,
-                CompositionBackdropCornerRadius = 8f
-            })
             .UseReactiveUI();
     }
 
diff --git a/src/Artemis.UI/Artemis.UI.csproj b/src/Artemis.UI/Artemis.UI.csproj
index 205fae2f5..e6294906e 100644
--- a/src/Artemis.UI/Artemis.UI.csproj
+++ b/src/Artemis.UI/Artemis.UI.csproj
@@ -15,12 +15,12 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.0-rc1.1" />
+        <PackageReference Include="Avalonia" Version="11.0.0-rc2.2" />
         <PackageReference Include="Avalonia.Controls.PanAndZoom" Version="11.0.0-rc1.1" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.0.0-rc1.1" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.0.0-rc2.2" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-rc1.1" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-rc1.1" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-rc2.2" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-rc2.2" />
         <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.0-rc1.1" />
         <PackageReference Include="DryIoc.dll" Version="5.4.0" />
         <PackageReference Include="DynamicData" Version="7.13.1" />
diff --git a/src/Artemis.UI/Screens/Root/RootView.axaml.cs b/src/Artemis.UI/Screens/Root/RootView.axaml.cs
index 23d822d48..98b9fbc14 100644
--- a/src/Artemis.UI/Screens/Root/RootView.axaml.cs
+++ b/src/Artemis.UI/Screens/Root/RootView.axaml.cs
@@ -18,7 +18,7 @@ public partial class RootView : ReactiveUserControl<RootViewModel>
     {
         try
         {
-            Dispatcher.UIThread.Invoke(() => RootFrame.NavigateFromObject(viewModel));
+            // Dispatcher.UIThread.Invoke(() => RootFrame.NavigateFromObject(viewModel));
         }
         catch (Exception)
         {
diff --git a/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj b/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
index c0e7a1bec..9a7e1bdbb 100644
--- a/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
+++ b/src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
@@ -8,8 +8,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.0-rc1.1" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-rc1.1" />
+        <PackageReference Include="Avalonia" Version="11.0.0-rc2.2" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-rc2.2" />
         <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.0-rc1.1" />
         <PackageReference Include="DryIoc.dll" Version="5.4.0" />
         <PackageReference Include="NoStringEvaluating" Version="2.5.2" />