DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-01-02 10:43:31 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: DarthAffe:520c1107577e0f927bbd51861d579c58e53616e0
Branches Tags
DarthAffe:master
DarthAffe:feature/docs-in-docker
DarthAffe:feature/default-entries
DarthAffe:feature/hot-avalonia-3
DarthAffe:RGB.NET_v3
DarthAffe:feature/datamodelsegment
DarthAffe:feature/device-refactor
DarthAffe:RenderOptimizations
DarthAffe:feature/linux-ci
DarthAffe:wpf
DarthAffe:feature/ScreenCaptureNodes
DarthAffe:1.x
DarthAffe:prerelease
..
compare: DarthAffe:6d1e39c1cc712d70198fa2836e75a04e371e686c
Branches Tags
DarthAffe:master
DarthAffe:feature/docs-in-docker
DarthAffe:feature/default-entries
DarthAffe:feature/hot-avalonia-3
DarthAffe:RGB.NET_v3
DarthAffe:feature/datamodelsegment
DarthAffe:feature/device-refactor
DarthAffe:RenderOptimizations
DarthAffe:feature/linux-ci
DarthAffe:wpf
DarthAffe:feature/ScreenCaptureNodes
DarthAffe:1.x
DarthAffe:prerelease

No commits in common. "520c1107577e0f927bbd51861d579c58e53616e0" and "6d1e39c1cc712d70198fa2836e75a04e371e686c" have entirely different histories.
520c110757 ... 6d1e39c1cc

5 changed files with 14 additions and 5 deletions
Show Stats Expand all files Collapse all files

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

@ -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;
@ -41,7 +40,6 @@ public class App : Application
LegacyMigrationService.MigrateToSqlite(_container);
RxApp.MainThreadScheduler = AvaloniaScheduler.Instance;
this.EnableHotReload();
AvaloniaXamlLoader.Load(this);
}

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

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

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

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

9
src/Directory.Build.targets
View File

@ -1,5 +1,12 @@
<Project>
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
<!-- If you're a .vbproj user, replace ';' with ',' -->
<DefineConstants>$(DefineConstants);ENABLE_XAML_HOT_RELOAD</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="HotAvalonia" PrivateAssets="All" />
<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" />
</ItemGroup>
</Project>

3
src/Directory.Packages.props
View File

@ -66,6 +66,9 @@
<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>