Merge branch 'feature/hot-avalonia-3' into feature/default-entries

src/Artemis.Core/Constants.cs

@@ -40,7 +40,7 @@ public static class Constants
     /// <summary>
     ///     The full path to the Artemis data folder
     /// </summary>
-    public static readonly string DataFolder = Path.Combine(BaseFolder, "Artemis");
+    public static readonly string DataFolder = Path.Combine(BaseFolder, "Artemis-dev");
 
     /// <summary>
     ///     The full path to the Artemis logs folder

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

@@ -28,8 +28,6 @@ public class App : Application
 
     public override void Initialize()
     {
-        this.EnableHotReload();
-        
         // If Artemis is already running, bring it to foreground and stop this process
         if (FocusExistingInstance())
         {
@@ -43,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

@@ -2,6 +2,7 @@ using System;
 using Artemis.Core;
 using Artemis.Storage;
 using Avalonia;
+using Avalonia.Logging;
 using Avalonia.ReactiveUI;
 using DryIoc;
 using Serilog;

src/Artemis.UI/SerilogAvaloniaSink.cs

@@ -24,11 +24,11 @@ public class SerilogAvaloniaSink : ILogSink
         
         #if DEBUG
         // Except with binding errors, ignore anything that is information or lower
-        return (area == "Binding" || logLevel > SerilogLogLevel.Information) && _logger.IsEnabled(logLevel);
-        #else
+        return true;
+#else
         // Ignore binding errors in release builds, shoo
         return area != "Binding" && logLevel > SerilogLogLevel.Information && _logger.IsEnabled(logLevel);
-        #endif
+#endif
     }
 
     /// <inheritdoc />

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="2.1.0" />
-    <PackageVersion Include="HotAvalonia.Extensions" Version="2.1.0" />
+    <PackageVersion Include="HotAvalonia" Version="3.0.0" />
   </ItemGroup>
 </Project>