diff --git a/src/Artemis.Core/Constants.cs b/src/Artemis.Core/Constants.cs
index a05acf32c..6ad386c9f 100644
--- a/src/Artemis.Core/Constants.cs
+++ b/src/Artemis.Core/Constants.cs
@@ -40,7 +40,7 @@ public static class Constants
///
/// The full path to the Artemis data folder
///
- public static readonly string DataFolder = Path.Combine(BaseFolder, "Artemis");
+ public static readonly string DataFolder = Path.Combine(BaseFolder, "Artemis-dev");
///
/// The full path to the Artemis logs folder
diff --git a/src/Artemis.UI.Windows/App.axaml.cs b/src/Artemis.UI.Windows/App.axaml.cs
index 824c8a9c4..3099777a6 100644
--- a/src/Artemis.UI.Windows/App.axaml.cs
+++ b/src/Artemis.UI.Windows/App.axaml.cs
@@ -16,7 +16,6 @@ using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using DryIoc;
-using HotAvalonia;
using ReactiveUI;
namespace Artemis.UI.Windows;
@@ -28,8 +27,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())
{
diff --git a/src/Artemis.UI.Windows/Program.cs b/src/Artemis.UI.Windows/Program.cs
index f9fc5e1f6..1db782d20 100644
--- a/src/Artemis.UI.Windows/Program.cs
+++ b/src/Artemis.UI.Windows/Program.cs
@@ -2,8 +2,10 @@ using System;
using Artemis.Core;
using Artemis.Storage;
using Avalonia;
+using Avalonia.Logging;
using Avalonia.ReactiveUI;
using DryIoc;
+using HotAvalonia;
using Serilog;
namespace Artemis.UI.Windows;
@@ -36,7 +38,8 @@ internal class Program
return AppBuilder.Configure()
.UsePlatformDetect()
.LogToTrace()
- .UseReactiveUI();
+ .UseReactiveUI()
+ .UseHotReload();
}
public static void CreateLogger(IContainer container)
diff --git a/src/Artemis.UI/SerilogAvaloniaSink.cs b/src/Artemis.UI/SerilogAvaloniaSink.cs
index f40c83b28..b8dea3fcd 100644
--- a/src/Artemis.UI/SerilogAvaloniaSink.cs
+++ b/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
}
///
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 96732544e..c018e282b 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -68,7 +68,7 @@
-
-
+
+
\ No newline at end of file