Upgrade packages

Update namespaces
Clean up unused imports
Replace Avalonia.ReactiveUI with ReactiveUI.Avalonia 🙄

src/Artemis.Core/Artemis.Core.csproj

@@ -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>

src/Artemis.Core/ColorScience/Quantization/ColorSwatch.cs

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

src/Artemis.Core/Models/ProfileConfiguration/Hotkey.cs

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

src/Artemis.Core/Plugins/DeviceProviders/DeviceProvider.cs

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

src/Artemis.Core/Services/DeviceService.cs

@@ -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;

src/Artemis.Core/Services/Input/InputKeyLedIdMap.cs

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

src/Artemis.Core/Services/Interfaces/IDeviceService.cs

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

src/Artemis.Core/Services/Interfaces/IRenderService.cs

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

src/Artemis.Core/Services/PluginManagementService.cs

@@ -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;

src/Artemis.Core/Services/Storage/ProfileService.cs

@@ -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;

src/Artemis.Core/Services/WebServer/EndPoints/JsonPluginEndPoint.cs

@@ -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;
 

src/Artemis.Core/Services/WebServer/EndPoints/PluginEndPoint.cs

@@ -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;
 

src/Artemis.Core/Services/WebServer/EndPoints/StringPluginEndPoint.cs

@@ -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;

src/Artemis.Core/Services/WebServer/Interfaces/IWebServerService.cs

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

src/Artemis.Core/Services/WebServer/PluginsHandler.cs

@@ -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.IO;
-using GenHTTP.Modules.Conversion.Serializers.Json;
 using GenHTTP.Modules.IO.Strings;
 
 namespace Artemis.Core.Services;

src/Artemis.Core/Services/WebServer/WebServerService.cs

@@ -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;

src/Artemis.Core/Utilities/EnumUtilities.cs

@@ -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();
     }
 }

src/Artemis.Core/Utilities/Utilities.cs

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

src/Artemis.Storage.Legacy/Artemis.Storage.Legacy.csproj

@@ -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>

src/Artemis.Storage/Artemis.Storage.csproj

@@ -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>

src/Artemis.Storage/ArtemisDbContext.cs

@@ -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;
 

src/Artemis.Storage/Entities/Plugins/PluginEntity.cs

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

src/Artemis.Storage/Entities/Profile/ProfileEntity.cs

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

src/Artemis.Storage/Repositories/ProfileRepository.cs

@@ -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;

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

@@ -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;
 

src/Artemis.UI.Linux/Artemis.UI.Linux.csproj

@@ -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>

src/Artemis.UI.Linux/Program.cs

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

src/Artemis.UI.Linux/Providers/Input/LinuxInputDeviceReader.cs

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

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

@@ -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;
 

src/Artemis.UI.MacOS/Artemis.UI.MacOS.csproj

@@ -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>

src/Artemis.UI.MacOS/Program.cs

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

src/Artemis.UI.Shared/Artemis.UI.Shared.csproj

@@ -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>

src/Artemis.UI.Shared/Controls/ArtemisIcon.axaml.cs

@@ -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;

src/Artemis.UI.Shared/Controls/DataModelPicker/DataModelPicker.cs

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

src/Artemis.UI.Shared/Controls/DraggableNumberBox.axaml.cs

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

src/Artemis.UI.Shared/Controls/EnumComboBox.axaml.cs

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

src/Artemis.UI.Shared/Controls/Flyouts/MaterialIconPickerFlyout.cs

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

src/Artemis.UI.Shared/Controls/HotkeyBox.axaml.cs

@@ -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;

src/Artemis.UI.Shared/Controls/NoInputTextBox.cs

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

src/Artemis.UI.Shared/Controls/TagsInput/TagsInput.properties.cs

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

src/Artemis.UI.Shared/Converters/BytesToStringConverter.cs

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

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

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

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

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

src/Artemis.UI.Shared/ReactiveAppWindow.cs

@@ -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;
 

src/Artemis.UI.Shared/Routing/Router/Navigation.cs

@@ -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;

src/Artemis.UI.Shared/Routing/Router/NavigationArguments.cs

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

src/Artemis.UI.Shared/Services/Builders/FileDialogFilterBuilder.cs

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

src/Artemis.UI.Shared/Services/MainWindow/MainWindowService.cs

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

src/Artemis.UI.Shared/Services/ProfileEditor/IToolViewModel.cs

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

src/Artemis.UI.Shared/Services/PropertyInput/PropertyInputViewModel.cs

@@ -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;

src/Artemis.UI.Shared/Services/Window/ExceptionDialogView.axaml.cs

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

src/Artemis.UI.Shared/Services/Window/ExceptionDialogViewModel.cs

@@ -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;

src/Artemis.UI.Shared/VisualScripting/CustomNodeViewModel.cs

@@ -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;

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

@@ -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;

src/Artemis.UI.Windows/Artemis.UI.Windows.csproj

@@ -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>

src/Artemis.UI.Windows/Program.cs

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

src/Artemis.UI.Windows/Utilities/InputUtilities.cs

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

src/Artemis.UI/Artemis.UI.csproj

@@ -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>

src/Artemis.UI/Converters/DateTimeConverter.cs

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

src/Artemis.UI/Converters/PropertyTreeMarginConverter.cs

@@ -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;
 

src/Artemis.UI/Converters/SubstringConverter.cs

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

src/Artemis.UI/DefaultTypes/PropertyInput/BoolPropertyInputView.axaml.cs

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

src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputView.axaml.cs

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

src/Artemis.UI/DefaultTypes/PropertyInput/BrushPropertyInputViewModel.cs

@@ -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;
 

src/Artemis.UI/DefaultTypes/PropertyInput/ColorGradientPropertyInputView.axaml.cs

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

src/Artemis.UI/DefaultTypes/PropertyInput/EnumPropertyInputView.axaml.cs

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

src/Artemis.UI/DefaultTypes/PropertyInput/FloatPropertyInputView.axaml.cs

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

src/Artemis.UI/DefaultTypes/PropertyInput/FloatRangePropertyInputView.axaml.cs

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

src/Artemis.UI/DefaultTypes/PropertyInput/IntPropertyInputView.axaml.cs

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

src/Artemis.UI/DefaultTypes/PropertyInput/IntRangePropertyInputView.axaml.cs

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

src/Artemis.UI/DefaultTypes/PropertyInput/SKColorPropertyInputView.axaml.cs

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

src/Artemis.UI/DefaultTypes/PropertyInput/SKPointPropertyInputView.axaml.cs

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

src/Artemis.UI/DefaultTypes/PropertyInput/SKSizePropertyInputView.axaml.cs

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

src/Artemis.UI/DefaultTypes/PropertyInput/StringPropertyInputView.axaml.cs

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

src/Artemis.UI/Extensions/CompositeDisposableExtensions.cs

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

src/Artemis.UI/MainWindow.axaml.cs

@@ -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;

src/Artemis.UI/Screens/Debugger/DebugView.axaml.cs

@@ -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;

src/Artemis.UI/Screens/Debugger/DebugViewModel.cs

@@ -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;

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

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

src/Artemis.UI/Screens/Debugger/Tabs/DataModel/DataModelDebugViewModel.cs

@@ -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;

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

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

src/Artemis.UI/Screens/Debugger/Tabs/Logs/LogsDebugViewModel.cs

@@ -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;
 

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

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

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

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

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

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

src/Artemis.UI/Screens/Debugger/Tabs/Performance/PerformanceDebugViewModel.cs

@@ -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;

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

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

src/Artemis.UI/Screens/Debugger/Tabs/Render/RenderDebugViewModel.cs

@@ -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;

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

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

src/Artemis.UI/Screens/Debugger/Tabs/Routing/RoutingDebugViewModel.cs

@@ -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;

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

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

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

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

src/Artemis.UI/Screens/Device/DeviceDetectInputView.axaml.cs

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

src/Artemis.UI/Screens/Device/DeviceDetectInputViewModel.cs

@@ -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;

src/Artemis.UI/Screens/Device/DevicePropertiesView.axaml.cs

@@ -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;
 

src/Artemis.UI/Screens/Device/DevicePropertiesViewModel.cs

@@ -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;

src/Artemis.UI/Screens/Device/DeviceSettingsView.axaml.cs

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

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

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

src/Artemis.UI/Screens/Device/Tabs/General/DeviceGeneralTabViewModel.cs

@@ -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;

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

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