From 1bee62173cfcae626ef741dfac58dcb581e087cd Mon Sep 17 00:00:00 2001
From: Torben Nehmer <torben@nehmer.net>
Date: Sun, 10 Nov 2024 21:24:33 +0100
Subject: [PATCH] Update NuGet References, change code accordingly. Update
 Startup code to behave well with Rider's XAML viewer

---
 Stars Assistant/App.axaml.cs                  |  2 +-
 Stars Assistant/Stars Assistant.csproj        | 26 +++++++++++--------
 .../ViewModels/MainWindowViewModel.cs         |  2 --
 Stars Assistant/Views/BuColView.axaml         |  2 +-
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Stars Assistant/App.axaml.cs b/Stars Assistant/App.axaml.cs
index 37fa10b..4e73114 100644
--- a/Stars Assistant/App.axaml.cs	
+++ b/Stars Assistant/App.axaml.cs	
@@ -33,7 +33,7 @@ public partial class App : Application
         }
         else
         {
-            throw new InvalidOperationException("This app supports only Desktop mode.");
+            base.OnFrameworkInitializationCompleted();
         }
     }
 }
diff --git a/Stars Assistant/Stars Assistant.csproj b/Stars Assistant/Stars Assistant.csproj
index a073113..1f7fec1 100644
--- a/Stars Assistant/Stars Assistant.csproj	
+++ b/Stars Assistant/Stars Assistant.csproj	
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <OutputType>WinExe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>StarsAssistant</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -9,6 +9,7 @@
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+    <LangVersion>default</LangVersion>
   </PropertyGroup>
   
   <ItemGroup>
@@ -16,21 +17,24 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.1.3" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.2.0" />
     <PackageReference Include="CsvHelper" Version="33.0.1" />
     <!-- PackageReference Include="DynamicData" Version="9.0.4" /-->
     <PackageReference Include="Material.Icons.Avalonia" Version="2.1.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.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" />
+    <PackageReference Include="Avalonia" Version="11.2.0" />
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.2.0" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.2.0" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.0" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.0" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.3" />
-    <PackageReference Include="ReactiveUI.SourceGenerators" Version="1.0.3" />
-    <PackageReference Include="Splat" Version="15.1.1" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.0" />
+    <PackageReference Include="ReactiveUI.SourceGenerators" Version="2.0.17">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Splat" Version="15.2.22" />
     <PackageReference Include="System.Reactive" Version="6.0.1" />
   </ItemGroup>
 
diff --git a/Stars Assistant/ViewModels/MainWindowViewModel.cs b/Stars Assistant/ViewModels/MainWindowViewModel.cs
index 3701acc..0fa9ee5 100644
--- a/Stars Assistant/ViewModels/MainWindowViewModel.cs	
+++ b/Stars Assistant/ViewModels/MainWindowViewModel.cs	
@@ -17,8 +17,6 @@ public partial class MainWindowViewModel : ViewModelBase
 
     public MainWindowViewModel()
     {
-        InitializeCommands();
-
         using var db = Locator.Current.GetService<StarsDatabase>()!;
         DbPath = Path.GetFullPath(db.DbPath);
 
diff --git a/Stars Assistant/Views/BuColView.axaml b/Stars Assistant/Views/BuColView.axaml
index 341e4ee..1ee2dbc 100644
--- a/Stars Assistant/Views/BuColView.axaml	
+++ b/Stars Assistant/Views/BuColView.axaml	
@@ -3,7 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="using:StarsAssistant.ViewModels"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="200"
              x:Class="StarsAssistant.Views.BuColView"
              x:DataType="vm:BuColViewModel">