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

Upgrade packages

Browse Source 
Update namespaces
Clean up unused imports
Replace Avalonia.ReactiveUI with ReactiveUI.Avalonia 🙄
This commit is contained in:
Robert 2025-12-16 22:01:43 +01:00
parent 8e4a430e19
commit 55dca6cebb
387 changed files with 367 additions and 696 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Artemis.Core/Artemis.Core.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<PreserveCompilationContext>false</PreserveCompilationContext>
<ShouldIncludeNativeSkiaSharp>false</ShouldIncludeNativeSkiaSharp>
<AssemblyTitle>Artemis.Core</AssemblyTitle>

3
src/Artemis.Core/ColorScience/Quantization/ColorSwatch.cs
View File

@ -1,5 +1,4 @@
using System.Text;
using SkiaSharp;
using SkiaSharp;
namespace Artemis.Core.ColorScience;

3
src/Artemis.Core/Models/ProfileConfiguration/Hotkey.cs
View File

@ -1,5 +1,4 @@
using System;
using Artemis.Core.Services;
using Artemis.Core.Services;
using Artemis.Storage.Entities.Profile;
namespace Artemis.Core;

1
src/Artemis.Core/Plugins/DeviceProviders/DeviceProvider.cs
View File

@ -1,7 +1,6 @@
using System;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using RGB.NET.Core;
namespace Artemis.Core.DeviceProviders;

1
src/Artemis.Core/Services/DeviceService.cs
View File

@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Artemis.Core.DeviceProviders;
using Artemis.Core.Providers;

4
src/Artemis.Core/Services/Input/InputKeyLedIdMap.cs
View File

@ -1,6 +1,4 @@
using System;
using System.Collections.Generic;
using RGB.NET.Core;
using RGB.NET.Core;
namespace Artemis.Core.Services;

1
src/Artemis.Core/Services/Interfaces/IDeviceService.cs
View File

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Artemis.Core.DeviceProviders;
namespace Artemis.Core.Services;

2
src/Artemis.Core/Services/Interfaces/IRenderService.cs
View File

@ -1,6 +1,4 @@
using System;
using System.Collections.Generic;
using Artemis.Core.Services.Core;
using Artemis.Core.SkiaSharp;
using RGB.NET.Core;

1
src/Artemis.Core/Services/PluginManagementService.cs
View File

@ -9,7 +9,6 @@ using System.Threading;
using System.Threading.Tasks;
using Artemis.Core.DeviceProviders;
using Artemis.Core.DryIoc;
using Artemis.Storage.Entities.General;
using Artemis.Storage.Entities.Plugins;
using Artemis.Storage.Entities.Surface;
using Artemis.Storage.Repositories.Interfaces;

2
src/Artemis.Core/Services/Storage/ProfileService.cs
View File

@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Diagnostics;
using System.IO;
using System.IO.Compression;
using System.Linq;
@ -11,7 +10,6 @@ using System.Text.Json.Nodes;
using System.Threading.Tasks;
using Artemis.Core.Modules;
using Artemis.Storage.Entities.Profile;
using Artemis.Storage.Migrations;
using Artemis.Storage.Repositories.Interfaces;
using Serilog;
using SkiaSharp;

2
src/Artemis.Core/Services/WebServer/EndPoints/JsonPluginEndPoint.cs
View File

@ -2,8 +2,8 @@
using System.Text.Json;
using System.Threading.Tasks;
using GenHTTP.Api.Protocol;
using GenHTTP.Modules.Basics;
using GenHTTP.Modules.Conversion.Serializers.Json;
using GenHTTP.Modules.IO;
namespace Artemis.Core.Services;

2
src/Artemis.Core/Services/WebServer/EndPoints/PluginEndPoint.cs
View File

@ -1,9 +1,7 @@
using System;
using System.Net.Http;
using System.Text.Json.Serialization;
using System.Threading.Tasks;
using GenHTTP.Api.Protocol;
using GenHTTP.Modules.Basics;
using GenHTTP.Modules.IO;
using StringContent = GenHTTP.Modules.IO.Strings.StringContent;

2
src/Artemis.Core/Services/WebServer/EndPoints/StringPluginEndPoint.cs
View File

@ -2,7 +2,7 @@
using System.IO;
using System.Threading.Tasks;
using GenHTTP.Api.Protocol;
using GenHTTP.Modules.Basics;
using GenHTTP.Modules.IO;
using GenHTTP.Modules.IO.Strings;
namespace Artemis.Core.Services;

1
src/Artemis.Core/Services/WebServer/Interfaces/IWebServerService.cs
View File

@ -1,6 +1,5 @@
using System;
using System.Threading.Tasks;
using Artemis.Core.Modules;
using GenHTTP.Api.Infrastructure;
using GenHTTP.Api.Protocol;

4
src/Artemis.Core/Services/WebServer/PluginsHandler.cs
View File

@ -1,12 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.Json;
using System.Threading.Tasks;
using GenHTTP.Api.Content;
using GenHTTP.Api.Protocol;
using GenHTTP.Modules.Basics;
using GenHTTP.Modules.Conversion.Serializers.Json;
using GenHTTP.Modules.IO;
using GenHTTP.Modules.IO.Strings;
namespace Artemis.Core.Services;

1
src/Artemis.Core/Services/WebServer/WebServerService.cs
View File

@ -12,7 +12,6 @@ using GenHTTP.Api.Protocol;
using GenHTTP.Engine.Internal;
using GenHTTP.Modules.Conversion;
using GenHTTP.Modules.Conversion.Serializers;
using GenHTTP.Modules.ErrorHandling;
using GenHTTP.Modules.Layouting;
using GenHTTP.Modules.Layouting.Provider;
using GenHTTP.Modules.Practices;

4
src/Artemis.Core/Utilities/EnumUtilities.cs
View File

@ -30,7 +30,7 @@ public static class EnumUtilities
if (!t.IsEnum)
throw new ArgumentException($"{t} must be an enum type");
return Enum.GetValues(t).Cast<Enum>().Select(e => (e, e.Humanize())).ToList();
return Enum.GetValues(t).Cast<Enum>().Select(e => (e, HumanizeValue(e))).ToList();
}
/// <summary>
@ -40,6 +40,6 @@ public static class EnumUtilities
/// <returns>A humanized string describing the given value</returns>
public static string HumanizeValue(Enum value)
{
return value.Humanize();
return value.ToString().Humanize();
}
}

1
src/Artemis.Core/Utilities/Utilities.cs
View File

@ -4,7 +4,6 @@ using System.IO;
using System.Linq;
using System.Security.AccessControl;
using System.Security.Principal;
using SkiaSharp;
namespace Artemis.Core;

2
src/Artemis.Storage.Legacy/Artemis.Storage.Legacy.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

2
src/Artemis.Storage/Artemis.Storage.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<PreserveCompilationContext>false</PreserveCompilationContext>
<Platforms>x64</Platforms>
<Nullable>enable</Nullable>

1
src/Artemis.Storage/ArtemisDbContext.cs
View File

@ -8,7 +8,6 @@ using Artemis.Storage.Entities.Profile;
using Artemis.Storage.Entities.Surface;
using Artemis.Storage.Entities.Workshop;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Diagnostics;
namespace Artemis.Storage;

1
src/Artemis.Storage/Entities/Plugins/PluginEntity.cs
View File

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Runtime.InteropServices;
using Microsoft.EntityFrameworkCore;
namespace Artemis.Storage.Entities.Plugins;

1
src/Artemis.Storage/Entities/Profile/ProfileEntity.cs
View File

@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Artemis.Storage.Entities.General;
namespace Artemis.Storage.Entities.Profile;

1
src/Artemis.Storage/Repositories/ProfileRepository.cs
View File

@ -4,7 +4,6 @@ using System.Linq;
using System.Text.Json.Nodes;
using Artemis.Storage.Entities;
using Artemis.Storage.Entities.Profile;
using Artemis.Storage.Exceptions;
using Artemis.Storage.Migrations;
using Artemis.Storage.Repositories.Interfaces;
using Microsoft.EntityFrameworkCore;

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

@ -7,7 +7,7 @@ using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
using DryIoc;
using ReactiveUI;

2
src/Artemis.UI.Linux/Artemis.UI.Linux.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<PlatformTarget>x64</PlatformTarget>
<Platforms>x64</Platforms>

2
src/Artemis.UI.Linux/Program.cs
View File

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

1
src/Artemis.UI.Linux/Providers/Input/LinuxInputDeviceReader.cs
View File

@ -1,5 +1,4 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Runtime.InteropServices;
using System.Threading;

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

@ -2,7 +2,7 @@ using Artemis.Storage.Legacy;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
using DryIoc;
using ReactiveUI;

2
src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<PlatformTarget>x64</PlatformTarget>
<Platforms>x64</Platforms>

2
src/Artemis.UI.MacOS/Program.cs
View File

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

4
src/Artemis.UI.Shared/Artemis.UI.Shared.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<OutputPath>bin\</OutputPath>
<Platforms>x64</Platforms>
@ -14,12 +14,12 @@
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" />
<PackageReference Include="Avalonia.Controls.ItemsRepeater" />
<PackageReference Include="Avalonia.ReactiveUI" />
<PackageReference Include="Avalonia.Xaml.Behaviors" />
<PackageReference Include="DynamicData" />
<PackageReference Include="FluentAvaloniaUI" />
<PackageReference Include="Material.Icons.Avalonia" />
<PackageReference Include="ReactiveUI" />
<PackageReference Include="ReactiveUI.Avalonia" />
<PackageReference Include="ReactiveUI.Validation" />
<PackageReference Include="JetBrains.Annotations" PrivateAssets="All"/>
</ItemGroup>

2
src/Artemis.UI.Shared/Controls/ArtemisIcon.axaml.cs
View File

@ -2,10 +2,8 @@ using System;
using System.Text.RegularExpressions;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.Documents;
using Avalonia.Layout;
using Avalonia.LogicalTree;
using Avalonia.Markup.Xaml;
using Avalonia.Media;
using Avalonia.Media.Imaging;
using Material.Icons;

1
src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPicker.cs
View File

@ -1,5 +1,4 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;

1
src/Artemis.UI.Shared/Controls/DraggableNumberBox.axaml.cs
View File

@ -1,5 +1,4 @@
using System;
using System.Linq;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Data;

1
src/Artemis.UI.Shared/Controls/EnumComboBox.axaml.cs
View File

@ -6,7 +6,6 @@ using Avalonia;
using Avalonia.Controls;
using Avalonia.Data;
using Avalonia.LogicalTree;
using Avalonia.Markup.Xaml;
namespace Artemis.UI.Shared;

1
src/Artemis.UI.Shared/Controls/Flyouts/MaterialIconPickerFlyout.cs
View File

@ -1,5 +1,4 @@
using Avalonia.Controls;
using FluentAvalonia.UI.Controls;
namespace Artemis.UI.Shared.Flyouts;

1
src/Artemis.UI.Shared/Controls/HotkeyBox.axaml.cs
View File

@ -7,7 +7,6 @@ using Avalonia.Controls;
using Avalonia.Data;
using Avalonia.Input;
using Avalonia.Interactivity;
using Avalonia.Markup.Xaml;
using Avalonia.Threading;
using Avalonia.VisualTree;
using DryIoc;

2
src/Artemis.UI.Shared/Controls/NoInputTextBox.cs
View File

@ -1,8 +1,6 @@
using System;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.Styling;
namespace Artemis.UI.Shared;

1
src/Artemis.UI.Shared/Controls/TagsInput/TagsInput.properties.cs
View File

@ -1,7 +1,6 @@
using System.Collections.ObjectModel;
using Avalonia;
using Avalonia.Controls.Primitives;
using Avalonia.Data;
namespace Artemis.UI.Shared.TagsInput;

1
src/Artemis.UI.Shared/Converters/BytesToStringConverter.cs
View File

@ -2,7 +2,6 @@ using System;
using System.Globalization;
using Avalonia.Data.Converters;
using Humanizer;
using Humanizer.Bytes;
namespace Artemis.UI.Shared.Converters;

1
src/Artemis.UI.Shared/DefaultTypes/DataModel/Display/DefaultDataModelDisplayView.axaml.cs
View File

@ -1,5 +1,4 @@
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace Artemis.UI.Shared.DefaultTypes.DataModel.Display;

1
src/Artemis.UI.Shared/DefaultTypes/DataModel/Display/SKColorDataModelDisplayView.axaml.cs
View File

@ -1,5 +1,4 @@
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using SkiaSharp;
namespace Artemis.UI.Shared.DefaultTypes.DataModel.Display;

5
src/Artemis.UI.Shared/ReactiveAppWindow.cs
View File

@ -1,12 +1,9 @@
using System;
using System.Reactive.Disposables;
using System.Reactive.Disposables.Fluent;
using System.Runtime.InteropServices;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Media;
using Avalonia.Media.Immutable;
using Avalonia.Styling;
using FluentAvalonia.UI.Media;
using FluentAvalonia.UI.Windowing;
using ReactiveUI;

3
src/Artemis.UI.Shared/Routing/Router/Navigation.cs
View File

@ -1,10 +1,7 @@
using System;
using System.Reactive.Threading.Tasks;
using System.Threading;
using System.Threading.Tasks;
using Avalonia.Threading;
using DryIoc;
using ReactiveUI;
using Serilog;
namespace Artemis.UI.Shared.Routing;

1
src/Artemis.UI.Shared/Routing/Router/NavigationArguments.cs
View File

@ -1,5 +1,4 @@
using System;
using System.Threading.Tasks;
namespace Artemis.UI.Shared.Routing;

1
src/Artemis.UI.Shared/Services/Builders/FileDialogFilterBuilder.cs
View File

@ -2,7 +2,6 @@
using System.Linq;
using Avalonia.Controls;
using Avalonia.Platform.Storage;
using SkiaSharp;
namespace Artemis.UI.Shared.Services.Builders;

1
src/Artemis.UI.Shared/Services/MainWindow/MainWindowService.cs
View File

@ -1,5 +1,4 @@
using System;
using ReactiveUI;
namespace Artemis.UI.Shared.Services.MainWindow;

1
src/Artemis.UI.Shared/Services/ProfileEditor/IToolViewModel.cs
View File

@ -1,6 +1,5 @@
using System;
using Artemis.Core;
using Avalonia.Input;
using Material.Icons;
namespace Artemis.UI.Shared.Services.ProfileEditor;

1
src/Artemis.UI.Shared/Services/PropertyInput/PropertyInputViewModel.cs
View File

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Reactive.Disposables;
using System.Reactive.Disposables.Fluent;
using System.Reactive.Linq;
using Artemis.Core;
using Artemis.UI.Shared.Controls;

3
src/Artemis.UI.Shared/Services/Window/ExceptionDialogView.axaml.cs
View File

@ -1,6 +1,5 @@
using Avalonia;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
namespace Artemis.UI.Shared.Services;

1
src/Artemis.UI.Shared/Services/Window/ExceptionDialogViewModel.cs
View File

@ -1,7 +1,6 @@
using System;
using System.Threading.Tasks;
using Artemis.UI.Shared.Services.Builders;
using Avalonia;
using Avalonia.Layout;
namespace Artemis.UI.Shared.Services;

1
src/Artemis.UI.Shared/VisualScripting/CustomNodeViewModel.cs
View File

@ -1,6 +1,7 @@
using System;
using System.ComponentModel;
using System.Reactive.Disposables;
using System.Reactive.Disposables.Fluent;
using Artemis.Core;
using ReactiveUI;
using ReactiveUI.Validation.Helpers;

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

@ -14,7 +14,7 @@ using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
using DryIoc;
using HotAvalonia;
using ReactiveUI;

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

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net9.0-windows10.0.17763.0</TargetFramework>
<TargetFramework>net10.0-windows10.0.17763.0</TargetFramework>
<Nullable>enable</Nullable>
<Platforms>x64</Platforms>
<OutputPath>bin</OutputPath>

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

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

1
src/Artemis.UI.Windows/Utilities/InputUtilities.cs
View File

@ -1,6 +1,5 @@
using System;
using System.Runtime.InteropServices;
using System.Text;
using Artemis.Core.Services;
using Microsoft.Win32;

2
src/Artemis.UI/Artemis.UI.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<OutputPath>bin/</OutputPath>
<Platforms>x64</Platforms>

1
src/Artemis.UI/Converters/DateTimeConverter.cs
View File

@ -1,6 +1,5 @@
using System;
using System.Globalization;
using Artemis.WebClient.Workshop;
using Avalonia.Data.Converters;
using Humanizer;

1
src/Artemis.UI/Converters/PropertyTreeMarginConverter.cs
View File

@ -1,7 +1,6 @@
using System;
using System.Globalization;
using Artemis.UI.Screens.ProfileEditor.Properties.Tree;
using Artemis.UI.Screens.ProfileEditor.Properties.Tree;
using Avalonia;
using Avalonia.Data.Converters;

2
src/Artemis.UI/Converters/SubstringConverter.cs
View File

@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using Avalonia.Data.Converters;
namespace Artemis.UI.Converters;

3
src/Artemis.UI/DefaultTypes/PropertyInput/BoolPropertyInputView.axaml.cs
View File

@ -1,5 +1,4 @@
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
namespace Artemis.UI.DefaultTypes.PropertyInput;

3
src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputView.axaml.cs
View File

@ -1,5 +1,4 @@
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
namespace Artemis.UI.DefaultTypes.PropertyInput;

3
src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputViewModel.cs
View File

@ -1,7 +1,7 @@
using System;
using System.Collections.ObjectModel;
using System.Linq;
using System.Reactive.Disposables;
using System.Reactive.Disposables.Fluent;
using System.Reactive.Linq;
using Artemis.Core;
using Artemis.Core.LayerBrushes;
@ -14,7 +14,6 @@ using Artemis.UI.Shared.Services.ProfileEditor.Commands;
using Artemis.UI.Shared.Services.PropertyInput;
using Avalonia.Threading;
using ReactiveUI;
using LayerBrushPresetViewModel = Artemis.UI.Screens.ProfileEditor.Properties.Tree.Dialogs.LayerBrushPresetViewModel;
namespace Artemis.UI.DefaultTypes.PropertyInput;

3
src/Artemis.UI/DefaultTypes/PropertyInput/ColorGradientPropertyInputView.axaml.cs
View File

@ -1,7 +1,6 @@
using System;
using Artemis.UI.Shared.Controls.GradientPicker;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
namespace Artemis.UI.DefaultTypes.PropertyInput;

3
src/Artemis.UI/DefaultTypes/PropertyInput/EnumPropertyInputView.axaml.cs
View File

@ -1,6 +1,5 @@
using Artemis.UI.Shared.Services.PropertyInput;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
namespace Artemis.UI.DefaultTypes.PropertyInput;

3
src/Artemis.UI/DefaultTypes/PropertyInput/FloatPropertyInputView.axaml.cs
View File

@ -1,7 +1,6 @@
using System;
using Artemis.UI.Shared.Controls;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
namespace Artemis.UI.DefaultTypes.PropertyInput;

3
src/Artemis.UI/DefaultTypes/PropertyInput/FloatRangePropertyInputView.axaml.cs
View File

@ -1,7 +1,6 @@
using System;
using Artemis.UI.Shared.Controls;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
namespace Artemis.UI.DefaultTypes.PropertyInput;

3
src/Artemis.UI/DefaultTypes/PropertyInput/IntPropertyInputView.axaml.cs
View File

@ -1,7 +1,6 @@
using System;
using Artemis.UI.Shared.Controls;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
namespace Artemis.UI.DefaultTypes.PropertyInput;

3
src/Artemis.UI/DefaultTypes/PropertyInput/IntRangePropertyInputView.axaml.cs
View File

@ -1,7 +1,6 @@
using System;
using Artemis.UI.Shared.Controls;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
namespace Artemis.UI.DefaultTypes.PropertyInput;

3
src/Artemis.UI/DefaultTypes/PropertyInput/SKColorPropertyInputView.axaml.cs
View File

@ -1,6 +1,5 @@
using System;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
using FluentAvalonia.UI.Controls;
namespace Artemis.UI.DefaultTypes.PropertyInput;

3
src/Artemis.UI/DefaultTypes/PropertyInput/SKPointPropertyInputView.axaml.cs
View File

@ -1,7 +1,6 @@
using System;
using Artemis.UI.Shared.Controls;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
namespace Artemis.UI.DefaultTypes.PropertyInput;

3
src/Artemis.UI/DefaultTypes/PropertyInput/SKSizePropertyInputView.axaml.cs
View File

@ -1,7 +1,6 @@
using System;
using Artemis.UI.Shared.Controls;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
namespace Artemis.UI.DefaultTypes.PropertyInput;

2
src/Artemis.UI/DefaultTypes/PropertyInput/StringPropertyInputView.axaml.cs
View File

@ -1,5 +1,5 @@
using Avalonia.Input;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
namespace Artemis.UI.DefaultTypes.PropertyInput;

1
src/Artemis.UI/Extensions/CompositeDisposableExtensions.cs
View File

@ -1,4 +1,5 @@
using System.Reactive.Disposables;
using System.Reactive.Disposables.Fluent;
using System.Threading;
namespace Artemis.UI.Extensions;

2
src/Artemis.UI/MainWindow.axaml.cs
View File

@ -7,7 +7,7 @@ using Artemis.UI.Shared;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
using ReactiveUI;
namespace Artemis.UI;

3
src/Artemis.UI/Screens/Debugger/DebugView.axaml.cs
View File

@ -1,11 +1,10 @@
using System;
using System.Reactive.Disposables;
using System.Reactive.Disposables.Fluent;
using System.Reactive.Linq;
using Artemis.UI.Shared;
using Artemis.UI.Shared.Events;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using ReactiveUI;
namespace Artemis.UI.Screens.Debugger;

1
src/Artemis.UI/Screens/Debugger/DebugViewModel.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Collections.ObjectModel;
using System.Reactive.Disposables;
using System.Reactive.Disposables.Fluent;
using Artemis.UI.Screens.Debugger.DataModel;
using Artemis.UI.Screens.Debugger.Logs;
using Artemis.UI.Screens.Debugger.Performance;

3
src/Artemis.UI/Screens/Debugger/Tabs/DataModel/DataModelDebugView.axaml.cs
View File

@ -1,5 +1,4 @@
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
namespace Artemis.UI.Screens.Debugger.DataModel;

1
src/Artemis.UI/Screens/Debugger/Tabs/DataModel/DataModelDebugViewModel.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Reactive.Disposables;
using System.Reactive.Disposables.Fluent;
using System.Reactive.Linq;
using Artemis.Core;
using Artemis.Core.Modules;

6
src/Artemis.UI/Screens/Debugger/Tabs/Logs/LogsDebugView.axaml.cs
View File

@ -1,10 +1,6 @@
using System;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
using Avalonia.Threading;
using ReactiveUI;
using Serilog;
namespace Artemis.UI.Screens.Debugger.Logs;

4
src/Artemis.UI/Screens/Debugger/Tabs/Logs/LogsDebugViewModel.cs
View File

@ -1,5 +1,4 @@
using System;
using System.Collections.ObjectModel;
using Artemis.Core;
using Artemis.UI.Shared;
using Avalonia.Threading;
@ -7,9 +6,8 @@ using ReactiveUI;
using Serilog.Events;
using Serilog.Formatting.Display;
using System.IO;
using System.Linq;
using System.Reactive.Disposables;
using System.Text;
using System.Reactive.Disposables.Fluent;
using Avalonia.Controls.Documents;
using Avalonia.Media;

1
src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugPluginView.axaml.cs
View File

@ -1,5 +1,4 @@
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace Artemis.UI.Screens.Debugger.Performance;

1
src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugProfilerView.axaml.cs
View File

@ -1,5 +1,4 @@
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace Artemis.UI.Screens.Debugger.Performance;

3
src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugView.axaml.cs
View File

@ -1,5 +1,4 @@
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
namespace Artemis.UI.Screens.Debugger.Performance;

1
src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugViewModel.cs
View File

@ -2,6 +2,7 @@
using System.Collections.ObjectModel;
using System.Linq;
using System.Reactive.Disposables;
using System.Reactive.Disposables.Fluent;
using System.Reactive.Linq;
using Artemis.Core;
using Artemis.Core.Services;

3
src/Artemis.UI/Screens/Debugger/Tabs/Render/RenderDebugView.axaml.cs
View File

@ -1,5 +1,4 @@
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
namespace Artemis.UI.Screens.Debugger.Render;

1
src/Artemis.UI/Screens/Debugger/Tabs/Render/RenderDebugViewModel.cs
View File

@ -1,5 +1,6 @@
using System.IO;
using System.Reactive.Disposables;
using System.Reactive.Disposables.Fluent;
using Artemis.Core;
using Artemis.Core.Services;
using Artemis.UI.Shared;

2
src/Artemis.UI/Screens/Debugger/Tabs/Routing/RoutingDebugView.axaml.cs
View File

@ -1,5 +1,5 @@
using Avalonia.Controls;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
using Avalonia.Threading;
namespace Artemis.UI.Screens.Debugger.Routing;

1
src/Artemis.UI/Screens/Debugger/Tabs/Routing/RoutingDebugViewModel.cs
View File

@ -2,6 +2,7 @@
using System.IO;
using System.Reactive;
using System.Reactive.Disposables;
using System.Reactive.Disposables.Fluent;
using System.Reactive.Linq;
using System.Threading;
using System.Threading.Tasks;

3
src/Artemis.UI/Screens/Debugger/Tabs/Settings/DebugSettingsView.axaml.cs
View File

@ -1,5 +1,4 @@
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
namespace Artemis.UI.Screens.Debugger.Settings;

5
src/Artemis.UI/Screens/Debugger/Tabs/Workshop/WorkshopDebugView.axaml.cs
View File

@ -1,7 +1,4 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
namespace Artemis.UI.Screens.Debugger.Workshop;

3
src/Artemis.UI/Screens/Device/DeviceDetectInputView.axaml.cs
View File

@ -1,5 +1,4 @@
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
namespace Artemis.UI.Screens.Device;

1
src/Artemis.UI/Screens/Device/DeviceDetectInputViewModel.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Linq;
using System.Reactive.Disposables;
using System.Reactive.Disposables.Fluent;
using System.Reactive.Linq;
using Artemis.Core;
using Artemis.Core.Services;

1
src/Artemis.UI/Screens/Device/DevicePropertiesView.axaml.cs
View File

@ -3,7 +3,6 @@ using Artemis.UI.Shared;
using Artemis.UI.Shared.Events;
using Avalonia;
using Avalonia.Input;
using Avalonia.Markup.Xaml;
namespace Artemis.UI.Screens.Device;

1
src/Artemis.UI/Screens/Device/DevicePropertiesViewModel.cs
View File

@ -2,6 +2,7 @@
using System.Linq;
using System.Reactive;
using System.Reactive.Disposables;
using System.Reactive.Disposables.Fluent;
using Artemis.Core;
using Artemis.Core.Services;
using Artemis.UI.DryIoc.Factories;

3
src/Artemis.UI/Screens/Device/DeviceSettingsView.axaml.cs
View File

@ -1,5 +1,4 @@
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
namespace Artemis.UI.Screens.Device;

2
src/Artemis.UI/Screens/Device/Tabs/General/DeviceGeneralTabView.axaml.cs
View File

@ -1,4 +1,4 @@
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
namespace Artemis.UI.Screens.Device.General;
public partial class DeviceGeneralTabView : ReactiveUserControl<DeviceGeneralTabViewModel>

1
src/Artemis.UI/Screens/Device/Tabs/General/DeviceGeneralTabViewModel.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Reactive.Disposables;
using System.Reactive.Disposables.Fluent;
using System.Threading.Tasks;
using Artemis.Core;
using Artemis.Core.Services;

2
src/Artemis.UI/Screens/Device/Tabs/InputMappings/InputMappingsTabView.axaml.cs
View File

@ -1,4 +1,4 @@
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
namespace Artemis.UI.Screens.Device.InputMappings;

Some files were not shown because too many files have changed in this diff Show More