From a9763be8d2f2e591e1b442ba42aa43ae530ee0b5 Mon Sep 17 00:00:00 2001
From: Torben Nehmer <torben@nehmer.net>
Date: Fri, 23 Aug 2024 17:59:02 +0200
Subject: [PATCH] NuGet Changes: Update Avalonia move back to Reactive UI

---
 Stars Assistant/Program.cs                  |  6 ++++--
 Stars Assistant/Stars Assistant.csproj      | 15 ++++++++-------
 Stars Assistant/ViewModels/ViewModelBase.cs |  4 ++--
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Stars Assistant/Program.cs b/Stars Assistant/Program.cs
index edc97b8..4029ab1 100644
--- a/Stars Assistant/Program.cs	
+++ b/Stars Assistant/Program.cs	
@@ -6,6 +6,7 @@ using CsvHelper.Configuration;
 using CsvHelper;
 using StarsAssistant.Model;
 using System.Globalization;
+using Avalonia.ReactiveUI;
 
 
 namespace StarsAssistant;
@@ -21,7 +22,7 @@ sealed class Program
         __createTestData();
         
         BuildAvaloniaApp()
-        .StartWithClassicDesktopLifetime(args);
+            .StartWithClassicDesktopLifetime(args);
     }
 
     // Avalonia configuration, don't remove; also used by visual designer.
@@ -29,7 +30,8 @@ sealed class Program
         => AppBuilder.Configure<App>()
             .UsePlatformDetect()
             .WithInterFont()
-            .LogToTrace();
+            .LogToTrace()
+            .UseReactiveUI();
 
 
     public static void __createTestData ()
diff --git a/Stars Assistant/Stars Assistant.csproj b/Stars Assistant/Stars Assistant.csproj
index 3437de0..e07b684 100644
--- a/Stars Assistant/Stars Assistant.csproj	
+++ b/Stars Assistant/Stars Assistant.csproj	
@@ -16,17 +16,18 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.1.3" />
     <PackageReference Include="CsvHelper" Version="33.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
 
-    <PackageReference Include="Avalonia" Version="11.0.10" />
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.10" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.10" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.10" />
+    <PackageReference Include="Avalonia" Version="11.1.3" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.1.3" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.1.3" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.3" />
     <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.10" />
     <!--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.10" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.3" />
+    <PackageReference Include="System.Reactive" Version="6.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/Stars Assistant/ViewModels/ViewModelBase.cs b/Stars Assistant/ViewModels/ViewModelBase.cs
index 3d1cbcc..6bbc936 100644
--- a/Stars Assistant/ViewModels/ViewModelBase.cs	
+++ b/Stars Assistant/ViewModels/ViewModelBase.cs	
@@ -1,7 +1,7 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using ReactiveUI;
 
 namespace StarsAssistant.ViewModels;
 
-public class ViewModelBase : ObservableObject
+public class ViewModelBase : ReactiveObject
 {
 }