Merge pull request #878 from Kira-NT/feature/hot-avalonia-3

Fix HotAvalonia setup

src/Artemis.UI.Windows/App.axaml.cs

@@ -16,6 +16,7 @@ using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using Avalonia.ReactiveUI;
 using DryIoc;
+using HotAvalonia;
 using ReactiveUI;
 
 namespace Artemis.UI.Windows;
@@ -40,6 +41,7 @@ public class App : Application
         LegacyMigrationService.MigrateToSqlite(_container);
 
         RxApp.MainThreadScheduler = AvaloniaScheduler.Instance;
+        this.EnableHotReload();
         AvaloniaXamlLoader.Load(this);
     }
 

src/Artemis.UI.Windows/Artemis.UI.Windows.csproj

@@ -9,6 +9,7 @@
         <AssemblyTitle>Artemis</AssemblyTitle>
         <ApplicationIcon>..\Artemis.UI\Assets\Images\Logo\application.ico</ApplicationIcon>
         <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+        <HotAvaloniaAutoEnable>false</HotAvaloniaAutoEnable>
     </PropertyGroup>
     <ItemGroup>
         <AvaloniaResource Include="Assets\**" />

src/Artemis.UI.Windows/Program.cs

@@ -5,7 +5,6 @@ using Avalonia;
 using Avalonia.Logging;
 using Avalonia.ReactiveUI;
 using DryIoc;
-using HotAvalonia;
 using Serilog;
 
 namespace Artemis.UI.Windows;
@@ -38,8 +37,7 @@ internal class Program
         return AppBuilder.Configure<App>()
             .UsePlatformDetect()
             .LogToTrace()
-            .UseReactiveUI()
-            .UseHotReload();
+            .UseReactiveUI();
     }
 
     public static void CreateLogger(IContainer container)

src/Directory.Build.targets

@@ -1,12 +1,5 @@
 <Project>
-    <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-        <!-- If you're a .vbproj user, replace ';' with ',' -->
-        <DefineConstants>$(DefineConstants);ENABLE_XAML_HOT_RELOAD</DefineConstants>
-    </PropertyGroup>
-
     <ItemGroup>
-        <PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="Avalonia.Markup.Xaml.Loader" />
-        <PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="HotAvalonia" />
-        <PackageReference Include="HotAvalonia.Extensions" PrivateAssets="All" />
+        <PackageReference Include="HotAvalonia" PrivateAssets="All" />
     </ItemGroup>
 </Project>

src/Directory.Packages.props

@@ -66,9 +66,6 @@
     <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.11.0" />
     <PackageVersion Include="System.Text.Json" Version="9.0.5" />
     <PackageVersion Include="TextMateSharp.Grammars" Version="1.0.68" />
-    
-    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.0" />
     <PackageVersion Include="HotAvalonia" Version="3.0.0" />
-    <PackageVersion Include="HotAvalonia.Extensions" Version="3.0.0" />
   </ItemGroup>
 </Project>