From be40b71b9b2acff0b623d2075ab15d72ef2cd9bf Mon Sep 17 00:00:00 2001
From: Mateusz Nejman <mateusz_nejman@hotmail.com>
Date: Sat, 22 Nov 2025 12:31:34 +0100
Subject: [PATCH] Update Avalonia.ReactiveUI to ReactiveUI.Avalonia

---
 src/AvaloniaInside.Shell/AvaloniaInside.Shell.csproj          | 2 +-
 src/Directory.Packages.props                                  | 4 ++--
 .../ShellBottomCustomNavigator.Desktop/Program.cs             | 2 --
 .../ShellBottomCustomNavigator.csproj                         | 2 +-
 src/Example/ShellExample/ShellExample.Desktop/Program.cs      | 2 --
 src/Example/ShellExample/ShellExample/ShellExample.csproj     | 2 +-
 6 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/AvaloniaInside.Shell/AvaloniaInside.Shell.csproj b/src/AvaloniaInside.Shell/AvaloniaInside.Shell.csproj
index 35dcff5..2bd971c 100644
--- a/src/AvaloniaInside.Shell/AvaloniaInside.Shell.csproj
+++ b/src/AvaloniaInside.Shell/AvaloniaInside.Shell.csproj
@@ -24,7 +24,7 @@
 	<ItemGroup>
 		<PackageReference Include="Avalonia" />
 		<PackageReference Include="Avalonia.Themes.Fluent" />
-		<PackageReference Include="Avalonia.ReactiveUI" />
+		<PackageReference Include="ReactiveUI.Avalonia" />
 		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
 		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" />
 	</ItemGroup>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 3af1919..e6419fc 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -10,13 +10,13 @@
 		<PackageVersion Include="Avalonia.iOS" Version="11.3.9" />
 		<PackageVersion Include="Avalonia.Browser" Version="11.3.9" />
 		<PackageVersion Include="Avalonia.Themes.Fluent" Version="11.3.9" />
-		<PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.9" />
+		<PackageVersion Include="ReactiveUI.Avalonia" Version="11.3.8" />
 		<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.9" />
 		<PackageVersion Include="Avalonia.Fonts.Inter" Version="11.3.9" />
 		<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
 		<PackageVersion Include="Projektanker.Icons.Avalonia" Version="9.6.2" />
 		<PackageVersion Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.6.2" />
 		<PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.17" />
-		<PackageVersion Include="ReactiveUI" Version="21.0.1" />
+		<PackageVersion Include="ReactiveUI" Version="22.2.1" />
 	</ItemGroup>
 </Project>
diff --git a/src/Example/ShellBottomCustomNavigator/ShellBottomCustomNavigator.Desktop/Program.cs b/src/Example/ShellBottomCustomNavigator/ShellBottomCustomNavigator.Desktop/Program.cs
index f7e8418..09af2de 100644
--- a/src/Example/ShellBottomCustomNavigator/ShellBottomCustomNavigator.Desktop/Program.cs
+++ b/src/Example/ShellBottomCustomNavigator/ShellBottomCustomNavigator.Desktop/Program.cs
@@ -1,6 +1,5 @@
 using System;
 using Avalonia;
-using Avalonia.ReactiveUI;
 using AvaloniaInside.Shell;
 
 namespace ShellBottomCustomNavigator.Desktop;
@@ -20,6 +19,5 @@ public static AppBuilder BuildAvaloniaApp()
             .UsePlatformDetect()
             .WithInterFont()
             .LogToTrace()
-            .UseReactiveUI()
             .UseShell();
 }
\ No newline at end of file
diff --git a/src/Example/ShellBottomCustomNavigator/ShellBottomCustomNavigator/ShellBottomCustomNavigator.csproj b/src/Example/ShellBottomCustomNavigator/ShellBottomCustomNavigator/ShellBottomCustomNavigator.csproj
index c92f5fb..97e6e2e 100644
--- a/src/Example/ShellBottomCustomNavigator/ShellBottomCustomNavigator/ShellBottomCustomNavigator.csproj
+++ b/src/Example/ShellBottomCustomNavigator/ShellBottomCustomNavigator/ShellBottomCustomNavigator.csproj
@@ -15,7 +15,7 @@
         <PackageReference Include="Avalonia" />
         <PackageReference Include="Avalonia.Themes.Fluent" />
         <PackageReference Include="Avalonia.Fonts.Inter" />
-        <PackageReference Include="Avalonia.ReactiveUI" />
+        <PackageReference Include="ReactiveUI.Avalonia" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
         <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" />
         <PackageReference Include="Newtonsoft.Json" />
diff --git a/src/Example/ShellExample/ShellExample.Desktop/Program.cs b/src/Example/ShellExample/ShellExample.Desktop/Program.cs
index f05156b..29a6e2d 100644
--- a/src/Example/ShellExample/ShellExample.Desktop/Program.cs
+++ b/src/Example/ShellExample/ShellExample.Desktop/Program.cs
@@ -1,6 +1,5 @@
 using System;
 using Avalonia;
-using Avalonia.ReactiveUI;
 using AvaloniaInside.Shell;
 
 namespace ShellExample.Desktop;
@@ -19,6 +18,5 @@ public static AppBuilder BuildAvaloniaApp()
 		=> AppBuilder.Configure<App>()
 			.UsePlatformDetect()
 			.LogToTrace()
-			.UseReactiveUI()
 			.UseShell();
 }
diff --git a/src/Example/ShellExample/ShellExample/ShellExample.csproj b/src/Example/ShellExample/ShellExample/ShellExample.csproj
index 9400a42..88c25b1 100644
--- a/src/Example/ShellExample/ShellExample/ShellExample.csproj
+++ b/src/Example/ShellExample/ShellExample/ShellExample.csproj
@@ -13,7 +13,7 @@
     <ItemGroup>
         <PackageReference Include="Avalonia" />
         <PackageReference Include="Avalonia.Themes.Fluent" />
-        <PackageReference Include="Avalonia.ReactiveUI" />
+        <PackageReference Include="ReactiveUI.Avalonia" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
         <PackageReference Include="Avalonia.Diagnostics" />
         <PackageReference Include="Newtonsoft.Json" />