DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Robert Beekman 2025-12-01 14:37:07 +01:00
commit 6988255dce
7 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Artemis.Core/Constants.cs
View File

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

3
src/Artemis.UI.Windows/App.axaml.cs
View File

@ -28,8 +28,6 @@ public class App : Application
public override void Initialize() public override void Initialize()
{ {
this.EnableHotReload();
// If Artemis is already running, bring it to foreground and stop this process // If Artemis is already running, bring it to foreground and stop this process
if (FocusExistingInstance()) if (FocusExistingInstance())
{ {
@ -43,6 +41,7 @@ public class App : Application
LegacyMigrationService.MigrateToSqlite(_container); LegacyMigrationService.MigrateToSqlite(_container);
RxApp.MainThreadScheduler = AvaloniaScheduler.Instance; RxApp.MainThreadScheduler = AvaloniaScheduler.Instance;
this.EnableHotReload();
AvaloniaXamlLoader.Load(this); AvaloniaXamlLoader.Load(this);
} }

1
src/Artemis.UI.Windows/Artemis.UI.Windows.csproj
View File

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

1
src/Artemis.UI.Windows/Program.cs
View File

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

6
src/Artemis.UI/SerilogAvaloniaSink.cs
View File

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

9
src/Directory.Build.targets
View File

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

5
src/Directory.Packages.props
View File

@ -66,9 +66,6 @@
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.11.0" /> <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.11.0" />
<PackageVersion Include="System.Text.Json" Version="9.0.5" /> <PackageVersion Include="System.Text.Json" Version="9.0.5" />
<PackageVersion Include="TextMateSharp.Grammars" Version="1.0.68" /> <PackageVersion Include="TextMateSharp.Grammars" Version="1.0.68" />
<PackageVersion Include="HotAvalonia" Version="3.0.0" />
<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" />
</ItemGroup> </ItemGroup>
</Project> </Project>