From cd920d8b45226dfed614a715d5a723994750e9a9 Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Tue, 14 Oct 2025 11:29:06 +0800
Subject: [PATCH] Replace Avalonia.ReactiveUI with ReactiveUI.Avalonia to use
 newer ReactiveUI version (#795)

* Initial plan

* Replace Avalonia.ReactiveUI with ReactiveUI.Avalonia to use newer ReactiveUI version

Co-authored-by: rabbitism <14807942+rabbitism@users.noreply.github.com>

* Update ReactiveUI.Avalonia version to 11.3.0 as requested

Co-authored-by: rabbitism <14807942+rabbitism@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: rabbitism <14807942+rabbitism@users.noreply.github.com>
---
 README.md                                                 | 2 +-
 build.ps1                                                 | 3 ++-
 build.sh                                                  | 3 ++-
 src/Ursa.ReactiveUIExtension/ReactiveUrsaView.cs          | 2 +-
 src/Ursa.ReactiveUIExtension/ReactiveUrsaWindow.cs        | 2 +-
 .../Ursa.ReactiveUIExtension.csproj                       | 8 ++++----
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 18b7ff4..8919d15 100644
--- a/README.md
+++ b/README.md
@@ -78,7 +78,7 @@ Ursa currently is compatible with both Avalonia 11.1.x and 11.2.x, but specifica
 If you need to integrate Ursa with Prism.Avalonia, you can use the Irihi.Ursa.PrismExtension package. This package provide Dialog related services to utilize Ursa Dialogs with Prism flavor. 
 
 ### ReactiveUI Extension
-If need to integrate Ursa with Avalonia.ReactiveUI, you can use the Irihi.Ursa.ReactiveUIExtension package. This package implements the ReactiveUI versions of UrsaWindow and UrsaView. Please refer to [wiki](https://github.com/irihitech/Ursa.Avalonia/wiki/Ursa-ReactiveUI-extension) for detail. 
+If need to integrate Ursa with ReactiveUI.Avalonia, you can use the Irihi.Ursa.ReactiveUIExtension package. This package implements the ReactiveUI versions of UrsaWindow and UrsaView. Please refer to [wiki](https://github.com/irihitech/Ursa.Avalonia/wiki/Ursa-ReactiveUI-extension) for detail. 
 
 ## Support
 
diff --git a/build.ps1 b/build.ps1
index 528ec79..85b69f3 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1,3 +1,4 @@
 dotnet build ./src/Ursa/Ursa.csproj -c Release
 dotnet build ./src/Ursa.Themes.Semi/Ursa.Themes.Semi.csproj -c Release
-dotnet build ./src/Ursa.PrismExtension/Ursa.PrismExtension.csproj -c Release
\ No newline at end of file
+dotnet build ./src/Ursa.PrismExtension/Ursa.PrismExtension.csproj -c Release
+dotnet build ./src/Ursa.ReactiveUIExtension/Ursa.ReactiveUIExtension.csproj -c Release
\ No newline at end of file
diff --git a/build.sh b/build.sh
index 528ec79..85b69f3 100755
--- a/build.sh
+++ b/build.sh
@@ -1,3 +1,4 @@
 dotnet build ./src/Ursa/Ursa.csproj -c Release
 dotnet build ./src/Ursa.Themes.Semi/Ursa.Themes.Semi.csproj -c Release
-dotnet build ./src/Ursa.PrismExtension/Ursa.PrismExtension.csproj -c Release
\ No newline at end of file
+dotnet build ./src/Ursa.PrismExtension/Ursa.PrismExtension.csproj -c Release
+dotnet build ./src/Ursa.ReactiveUIExtension/Ursa.ReactiveUIExtension.csproj -c Release
\ No newline at end of file
diff --git a/src/Ursa.ReactiveUIExtension/ReactiveUrsaView.cs b/src/Ursa.ReactiveUIExtension/ReactiveUrsaView.cs
index b725b23..576bc6c 100644
--- a/src/Ursa.ReactiveUIExtension/ReactiveUrsaView.cs
+++ b/src/Ursa.ReactiveUIExtension/ReactiveUrsaView.cs
@@ -2,7 +2,7 @@
 using ReactiveUI;
 using Ursa.Controls;
 
-/* These codes are ported from Avalonia.ReactiveUI.
+/* These codes are ported from ReactiveUI.Avalonia.
  * **/
 
 namespace Ursa.ReactiveUIExtension;
diff --git a/src/Ursa.ReactiveUIExtension/ReactiveUrsaWindow.cs b/src/Ursa.ReactiveUIExtension/ReactiveUrsaWindow.cs
index 36d58a5..cd2d6f5 100644
--- a/src/Ursa.ReactiveUIExtension/ReactiveUrsaWindow.cs
+++ b/src/Ursa.ReactiveUIExtension/ReactiveUrsaWindow.cs
@@ -2,7 +2,7 @@
 using ReactiveUI;
 using Ursa.Controls;
 
-/* These codes are ported from Avalonia.ReactiveUI.
+/* These codes are ported from ReactiveUI.Avalonia.
  * **/
 
 namespace Ursa.ReactiveUIExtension;
diff --git a/src/Ursa.ReactiveUIExtension/Ursa.ReactiveUIExtension.csproj b/src/Ursa.ReactiveUIExtension/Ursa.ReactiveUIExtension.csproj
index 8772a57..5d73155 100644
--- a/src/Ursa.ReactiveUIExtension/Ursa.ReactiveUIExtension.csproj
+++ b/src/Ursa.ReactiveUIExtension/Ursa.ReactiveUIExtension.csproj
@@ -10,18 +10,18 @@
         <PackageProjectUrl>https://github.com/irihitech/Ursa.Avalonia</PackageProjectUrl>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <Nullable>enable</Nullable>
-        <Description>This is a Ursa expansion. This package integrates and is compatible with UrsaWindow and UrsaView with Avalonia.ReactiveUI. [Avalonia.ReactiveUI See: https://docs.avaloniaui.net/zh-Hans/docs/concepts/reactiveui/]
+        <Description>This is a Ursa expansion. This package integrates and is compatible with UrsaWindow and UrsaView with ReactiveUI.Avalonia. [ReactiveUI.Avalonia See: https://github.com/reactiveui/ReactiveUI.Avalonia]
 
-            这个是一个Ursa拓展包。这个包整合并互相兼容了UrsaWindow和UrsaView与Avalonia.ReactiveUI的功能。【Avalonia.ReactiveUI参见：https://docs.avaloniaui.net/docs/concepts/reactiveui/】
+            这个是一个Ursa拓展包。这个包整合并互相兼容了UrsaWindow和UrsaView与ReactiveUI.Avalonia的功能。【ReactiveUI.Avalonia参见：https://github.com/reactiveui/ReactiveUI.Avalonia】
         </Description>
-        <Version>1.0.2</Version>
+        <Version>1.1.0</Version>
         <RepositoryUrl>https://github.com/irihitech/Ursa.Avalonia</RepositoryUrl>
         <IncludeSymbols>true</IncludeSymbols>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia.ReactiveUI" Version="11.1.0" />
+        <PackageReference Include="ReactiveUI.Avalonia" Version="11.3.0" />
     </ItemGroup>
 
     <ItemGroup>