Move common classes to Core assembly

StabilityMatrix.Core/StabilityMatrix.Core/Converters/Json/DefaultUnknownEnumConverter.cs

@@ -1,9 +1,8 @@
-using System;
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Serialization;
-using StabilityMatrix.Extensions;
+using StabilityMatrix.Core.Extensions;
 
-namespace StabilityMatrix.Converters.Json;
+namespace StabilityMatrix.Core.Converters.Json;
 
 public class DefaultUnknownEnumConverter<T> : JsonConverter<T> where T : Enum
 {

StabilityMatrix.Core/StabilityMatrix.Core/Converters/Json/LaunchOptionValueJsonConverter.cs

@@ -1,8 +1,7 @@
-using System;
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace StabilityMatrix.Converters.Json;
+namespace StabilityMatrix.Core.Converters.Json;
 
 public class LaunchOptionValueJsonConverter : JsonConverter<object?>
 {

StabilityMatrix.Core/StabilityMatrix.Core/Extensions/EnumAttributes.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace StabilityMatrix.Extensions;
+namespace StabilityMatrix.Core.Extensions;
 
 public static class EnumAttributeExtensions
 {

StabilityMatrix.Core/StabilityMatrix.Core/Extensions/EnumConversion.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace StabilityMatrix.Extensions;
+namespace StabilityMatrix.Core.Extensions;
 
 public static class EnumConversionExtensions
 {

StabilityMatrix.Core/StabilityMatrix.Core/Extensions/EnumerableExtensions.cs

@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace StabilityMatrix.Extensions;
+namespace StabilityMatrix.Core.Extensions;
 
 public static class EnumerableExtensions
 {

StabilityMatrix.Core/StabilityMatrix.Core/Extensions/LiteDBExtensions.cs

@@ -1,12 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
+using System.Linq.Expressions;
 using System.Reflection;
 using LiteDB;
 using LiteDB.Async;
 
-namespace StabilityMatrix.Extensions;
+namespace StabilityMatrix.Core.Extensions;
 
 // ReSharper disable once InconsistentNaming
 public static class LiteDBExtensions

StabilityMatrix.Core/StabilityMatrix.Core/Helper/Cache/GithubApiCache.cs

@@ -1,11 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Caching.Memory;
 using Octokit;
 
-namespace StabilityMatrix.Helper.Cache;
+namespace StabilityMatrix.Core.Helper.Cache;
 
 public class GithubApiCache : IGithubApiCache
 {

StabilityMatrix.Core/StabilityMatrix.Core/Helper/Cache/IGithubApiCache.cs

@@ -1,10 +1,7 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Octokit;
+using Octokit;
 using Refit;
 
-namespace StabilityMatrix.Helper.Cache;
+namespace StabilityMatrix.Core.Helper.Cache;
 
 public interface IGithubApiCache
 {

StabilityMatrix.Core/StabilityMatrix.Core/Helper/Cache/LRUCache.cs

@@ -1,7 +1,6 @@
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 
-namespace StabilityMatrix.Helper.Cache;
+namespace StabilityMatrix.Core.Helper.Cache;
 
 // ReSharper disable once InconsistentNaming
 public class LRUCache<TK,TV> where TK : notnull

StabilityMatrix.Core/StabilityMatrix.Core/Helper/Expressions.cs

@@ -1,8 +1,7 @@
-using System;
-using System.Linq.Expressions;
+using System.Linq.Expressions;
 using System.Reflection;
 
-namespace StabilityMatrix.Helper;
+namespace StabilityMatrix.Core.Helper;
 
 public static class Expressions
 {

StabilityMatrix.Core/StabilityMatrix.Core/Helper/FileHash.cs

@@ -1,12 +1,9 @@
-using System;
-using System.Buffers;
-using System.IO;
+using System.Buffers;
 using System.Security.Cryptography;
-using System.Threading.Tasks;
 using Blake3;
 using StabilityMatrix.Core.Models.Progress;
 
-namespace StabilityMatrix.Helper;
+namespace StabilityMatrix.Core.Helper;
 
 public static class FileHash
 {

StabilityMatrix.Core/StabilityMatrix.Core/Helper/FileTransfers.cs

@@ -1,12 +1,7 @@
-using System;
-using System.Buffers;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Buffers;
 using StabilityMatrix.Core.Models.Progress;
 
-namespace StabilityMatrix.Helper;
+namespace StabilityMatrix.Core.Helper;
 
 public static class FileTransfers
 {

StabilityMatrix.Core/StabilityMatrix.Core/Helper/HardwareHelper.cs

@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using Microsoft.Win32;
+using Microsoft.Win32;
 
-namespace StabilityMatrix.Helper;
+namespace StabilityMatrix.Core.Helper;
 
 public static class HardwareHelper
 {
@@ -82,25 +78,6 @@ public static class HardwareHelper
     }
 }
 
-[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-public static class Size
-{
-    public const ulong KiB = 1024;
-    public const ulong MiB = KiB * 1024;
-    public const ulong GiB = MiB * 1024;
-    
-    public static string FormatBytes(ulong bytes)
-    {
-        return bytes switch
-        {
-            < KiB => $"{bytes} B",
-            < MiB => $"{bytes / (double) KiB:0.0} KiB",
-            < GiB => $"{bytes / (double) MiB:0.0} MiB",
-            _ => $"{bytes / (double) GiB:0.0} GiB"
-        };
-    }
-}
-
 public enum Level
 {
     Unknown,

StabilityMatrix.Core/StabilityMatrix.Core/Helper/MinimumDelay.cs

@@ -1,8 +1,6 @@
-using System;
-using System.Diagnostics;
-using System.Threading.Tasks;
+using System.Diagnostics;
 
-namespace StabilityMatrix.Helper;
+namespace StabilityMatrix.Core.Helper;
 
 /// <summary>
 /// Enforces a minimum delay if the function returns too quickly.

StabilityMatrix.Core/StabilityMatrix.Core/Helper/ObjectHash.cs

@@ -1,8 +1,7 @@
-using System;
-using System.Text;
+using System.Text;
 using System.Text.Json;
 
-namespace StabilityMatrix.Helper;
+namespace StabilityMatrix.Core.Helper;
 
 public class ObjectHash
 {

StabilityMatrix.Core/StabilityMatrix.Core/Helper/ProcessRunner.cs

@@ -1,14 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
+using System.Diagnostics;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using NLog;
 using StabilityMatrix.Core.Exceptions;
 
-namespace StabilityMatrix.Helper;
+namespace StabilityMatrix.Core.Helper;
 
 public static class ProcessRunner
 {

StabilityMatrix.Core/StabilityMatrix.Core/Helper/ProcessTracker.cs

@@ -1,10 +1,10 @@
-using System;
-using System.ComponentModel;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
 using NLog;
 
-namespace StabilityMatrix.Helper;
+namespace StabilityMatrix.Core.Helper;
 
 /// <summary>
 /// Allows processes to be automatically killed if this parent process unexpectedly quits.
@@ -12,6 +12,7 @@ namespace StabilityMatrix.Helper;
 /// <remarks>References:
 ///  https://stackoverflow.com/a/4657392/386091
 ///  https://stackoverflow.com/a/9164742/386091 </remarks>
+[SupportedOSPlatform("windows")]
 public static class ProcessTracker
 {
     private static readonly Logger Logger = LogManager.GetCurrentClassLogger();

StabilityMatrix.Core/StabilityMatrix.Core/Helper/Size.cs

@@ -0,0 +1,22 @@
+using System.Diagnostics.CodeAnalysis;
+
+namespace StabilityMatrix.Core.Helper;
+
+[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+public static class Size
+{
+    public const ulong KiB = 1024;
+    public const ulong MiB = KiB * 1024;
+    public const ulong GiB = MiB * 1024;
+    
+    public static string FormatBytes(ulong bytes)
+    {
+        return bytes switch
+        {
+            < KiB => $"{bytes} B",
+            < MiB => $"{bytes / (double) KiB:0.0} KiB",
+            < GiB => $"{bytes / (double) MiB:0.0} MiB",
+            _ => $"{bytes / (double) GiB:0.0} GiB"
+        };
+    }
+}

StabilityMatrix.Core/StabilityMatrix.Core/Helper/SystemInfo.cs

@@ -1,8 +1,8 @@
 using System.Runtime.InteropServices;
 
-namespace StabilityMatrix.Helper;
+namespace StabilityMatrix.Core.Helper;
 
-internal static class SystemInfo
+public static class SystemInfo
 {
     [DllImport("UXTheme.dll", SetLastError = true, EntryPoint = "#138")] 
     public static extern bool ShouldUseDarkMode();

StabilityMatrix.Core/StabilityMatrix.Core/Helper/Utilities.cs

@@ -1,8 +1,6 @@
-using System.IO;
-using System.Linq;
-using System.Reflection;
+using System.Reflection;
 
-namespace StabilityMatrix.Helper;
+namespace StabilityMatrix.Core.Helper;
 
 public static class Utilities
 {

StabilityMatrix.Core/StabilityMatrix.Core/Models/Configs/DebugOptions.cs

@@ -1,4 +1,4 @@
-namespace StabilityMatrix.Models.Configs;
+namespace StabilityMatrix.Core.Models.Configs;
 
 public class DebugOptions
 {

StabilityMatrix.Core/StabilityMatrix.Core/Models/FileInterfaces/DirectoryPath.cs

@@ -1,8 +1,4 @@
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace StabilityMatrix.Models.FileInterfaces;
+namespace StabilityMatrix.Core.Models.FileInterfaces;
 
 public class DirectoryPath : FileSystemPath, IPathObject
 {

StabilityMatrix.Core/StabilityMatrix.Core/Models/FileInterfaces/FilePath.cs

@@ -1,9 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
 
-namespace StabilityMatrix.Models.FileInterfaces;
+namespace StabilityMatrix.Core.Models.FileInterfaces;
 
 [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
 public class FilePath : FileSystemPath, IPathObject

StabilityMatrix.Core/StabilityMatrix.Core/Models/FileInterfaces/FileSystemPath.cs

@@ -1,7 +1,4 @@
-using System;
-using System.IO;
-
-namespace StabilityMatrix.Models.FileInterfaces;
+namespace StabilityMatrix.Core.Models.FileInterfaces;
 
 public class FileSystemPath : IEquatable<FileSystemPath>, IEquatable<string>
 {

StabilityMatrix.Core/StabilityMatrix.Core/Models/FileInterfaces/IPathObject.cs

@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
-
-namespace StabilityMatrix.Models.FileInterfaces;
+namespace StabilityMatrix.Core.Models.FileInterfaces;
 
 public interface IPathObject
 {

StabilityMatrix.Core/StabilityMatrix.Core/Models/FileSizeType.cs

@@ -1,6 +1,6 @@
 using System.Globalization;
 
-namespace StabilityMatrix.Models;
+namespace StabilityMatrix.Core.Models;
 
 public class FileSizeType
 {

StabilityMatrix.Core/StabilityMatrix.Core/Models/GlobalConfig.cs

@@ -1,7 +1,6 @@
-using System;
-using StabilityMatrix.Models.FileInterfaces;
+using StabilityMatrix.Core.Models.FileInterfaces;
 
-namespace StabilityMatrix.Models;
+namespace StabilityMatrix.Core.Models;
 
 public static class GlobalConfig
 {

StabilityMatrix.Core/StabilityMatrix.Core/Models/InstalledPackage.cs

@@ -1,11 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text.Json.Serialization;
-using System.Threading.Tasks;
-using StabilityMatrix.Helper;
-
-namespace StabilityMatrix.Models;
+using System.Text.Json.Serialization;
+using StabilityMatrix.Core.Helper;
+
+namespace StabilityMatrix.Core.Models;
 
 /// <summary>
 /// Profile information for a user-installed package.

StabilityMatrix.Core/StabilityMatrix.Core/Models/LaunchOption.cs

@@ -1,9 +1,8 @@
-using System;
-using System.Text.Json.Serialization;
-using StabilityMatrix.Converters.Json;
-using StabilityMatrix.Helper;
+using System.Text.Json.Serialization;
+using StabilityMatrix.Core.Converters.Json;
+using StabilityMatrix.Core.Helper;
 
-namespace StabilityMatrix.Models;
+namespace StabilityMatrix.Core.Models;
 
 public class LaunchOption
 {

StabilityMatrix.Core/StabilityMatrix.Core/Models/LaunchOptionCard.cs

@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
 
-namespace StabilityMatrix.Models;
+namespace StabilityMatrix.Core.Models;
 
 public class LaunchOptionCard
 {

StabilityMatrix.Core/StabilityMatrix.Core/Models/LaunchOptionDefinition.cs

@@ -1,7 +1,6 @@
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
-namespace StabilityMatrix.Models;
+namespace StabilityMatrix.Core.Models;
 
 /// <summary>
 /// Defines a launch option for a BasePackage.

StabilityMatrix.Core/StabilityMatrix.Core/Models/LaunchOptionType.cs

@@ -1,4 +1,4 @@
-namespace StabilityMatrix.Models;
+namespace StabilityMatrix.Core.Models;
 
 public enum LaunchOptionType
 {

StabilityMatrix.Core/StabilityMatrix.Core/Models/LicenseInfo.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace StabilityMatrix.Models;
+namespace StabilityMatrix.Core.Models;
 
 public class LicenseInfo
 {

StabilityMatrix.Core/StabilityMatrix.Core/Models/LoadState.cs

@@ -1,4 +1,4 @@
-namespace StabilityMatrix.Models;
+namespace StabilityMatrix.Core.Models;
 
 public enum LoadState
 {

StabilityMatrix.Core/StabilityMatrix.Core/Models/PackageVersion.cs

@@ -1,4 +1,4 @@
-namespace StabilityMatrix.Models;
+namespace StabilityMatrix.Core.Models;
 
 public class PackageVersion
 {

StabilityMatrix.Core/StabilityMatrix.Core/Models/SharedFolderType.cs

@@ -1,7 +1,6 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 
-namespace StabilityMatrix.Models;
+namespace StabilityMatrix.Core.Models;
 
 [SuppressMessage("ReSharper", "InconsistentNaming")]
 [SuppressMessage("ReSharper", "IdentifierTypo")]

StabilityMatrix.Core/StabilityMatrix.Core/Models/TaskResult.cs

@@ -1,7 +1,6 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 
-namespace StabilityMatrix.Models;
+namespace StabilityMatrix.Core.Models;
 
 public readonly record struct TaskResult<T>
 {

StabilityMatrix.Core/StabilityMatrix.Core/Python/ArgParser.cs

@@ -1,11 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using NLog;
+using NLog;
 using Python.Runtime;
-using StabilityMatrix.Models;
+using StabilityMatrix.Core.Models;
 
-namespace StabilityMatrix.Python;
+namespace StabilityMatrix.Core.Python;
 
 /// <summary>
 /// Extracts command arguments from Python source file.

StabilityMatrix.Core/StabilityMatrix.Core/Python/IPyRunner.cs

@@ -1,9 +1,4 @@
-using System;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace StabilityMatrix.Python;
+namespace StabilityMatrix.Core.Python;
 
 public interface IPyRunner
 {

StabilityMatrix.Core/StabilityMatrix.Core/Python/Interop/PyIOStream.cs

@@ -1,10 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
+using System.Diagnostics.CodeAnalysis;
 using System.Text;
 
-namespace StabilityMatrix.Python.Interop;
+namespace StabilityMatrix.Core.Python.Interop;
 
 /// <summary>
 /// Implement the interface of the sys.stdout redirection

StabilityMatrix.Core/StabilityMatrix.Core/Python/PyRunner.cs

@@ -1,13 +1,9 @@
-using System;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using NLog;
+using NLog;
 using Python.Runtime;
-using StabilityMatrix.Helper;
-using StabilityMatrix.Python.Interop;
+using StabilityMatrix.Core.Helper;
+using StabilityMatrix.Core.Python.Interop;
 
-namespace StabilityMatrix.Python;
+namespace StabilityMatrix.Core.Python;
 
 public record struct PyVersionInfo(int Major, int Minor, int Micro, string ReleaseLevel, int Serial);
 

StabilityMatrix.Core/StabilityMatrix.Core/Python/PyVenvRunner.cs

@@ -1,15 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Diagnostics;
 using NLog;
 using Salaros.Configuration;
-using StabilityMatrix.Helper;
-using StabilityMatrix.Models.FileInterfaces;
+using StabilityMatrix.Core.Helper;
+using StabilityMatrix.Core.Models.FileInterfaces;
 
-namespace StabilityMatrix.Python;
+namespace StabilityMatrix.Core.Python;
 
 /// <summary>
 /// Python runner using a subprocess, mainly for venv support.

StabilityMatrix.Core/StabilityMatrix.Core/ReparsePoints/DeviceIoControlCode.cs

@@ -1,4 +1,4 @@
-namespace StabilityMatrix.ReparsePoints;
+namespace StabilityMatrix.Core.ReparsePoints;
 
 internal enum DeviceIoControlCode : uint
 {

StabilityMatrix.Core/StabilityMatrix.Core/ReparsePoints/Junction.cs

@@ -1,13 +1,11 @@
-using System;
-using System.Diagnostics;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
-using System.IO;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 using System.Text;
 using Microsoft.Win32.SafeHandles;
 
-namespace StabilityMatrix.ReparsePoints;
+namespace StabilityMatrix.Core.ReparsePoints;
 
 [SupportedOSPlatform("windows")]
 public static class Junction

StabilityMatrix.Core/StabilityMatrix.Core/ReparsePoints/ReparseDataBuffer.cs

@@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;
 
-namespace StabilityMatrix.ReparsePoints;
+namespace StabilityMatrix.Core.ReparsePoints;
 
 /// <summary>
 /// Because the tag we're using is IO_REPARSE_TAG_MOUNT_POINT,

StabilityMatrix.Core/StabilityMatrix.Core/ReparsePoints/Win32CreationDisposition.cs

@@ -1,4 +1,4 @@
-namespace StabilityMatrix.ReparsePoints;
+namespace StabilityMatrix.Core.ReparsePoints;
 
 internal enum Win32CreationDisposition : uint
 {

StabilityMatrix.Core/StabilityMatrix.Core/ReparsePoints/Win32ErrorCode.cs

@@ -1,36 +1,34 @@
-using StabilityMatrix.Extensions;
-
-namespace StabilityMatrix.ReparsePoints;
+namespace StabilityMatrix.Core.ReparsePoints;
 
 internal enum Win32ErrorCode
 {
     /// <summary>
     /// The file or directory is not a reparse point.
+    /// ERROR_NOT_A_REPARSE_POINT
     /// </summary>
-    [StringValue("ERROR_NOT_A_REPARSE_POINT")]
     NotAReparsePoint = 4390,
 
     /// <summary>
     /// The reparse point attribute cannot be set because it conflicts with an existing attribute.
+    /// ERROR_REPARSE_ATTRIBUTE_CONFLICT
     /// </summary>
-    [StringValue("ERROR_REPARSE_ATTRIBUTE_CONFLICT")]
     ReparseAttributeConflict = 4391,
 
     /// <summary>
     /// The data present in the reparse point buffer is invalid.
+    /// ERROR_INVALID_REPARSE_DATA
     /// </summary>
-    [StringValue("ERROR_INVALID_REPARSE_DATA")]
     InvalidReparseData = 4392,
 
     /// <summary>
     /// The tag present in the reparse point buffer is invalid.
+    /// ERROR_REPARSE_TAG_INVALID
     /// </summary>
-    [StringValue("ERROR_REPARSE_TAG_INVALID")]
     ReparseTagInvalid = 4393,
 
     /// <summary>
     /// There is a mismatch between the tag specified in the request and the tag present in the reparse point.
+    /// ERROR_REPARSE_TAG_MISMATCH
     /// </summary>
-    [StringValue("ERROR_REPARSE_TAG_MISMATCH")]
     ReparseTagMismatch = 4394,
 }

StabilityMatrix.Core/StabilityMatrix.Core/ReparsePoints/Win32FileAccess.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace StabilityMatrix.ReparsePoints;
+namespace StabilityMatrix.Core.ReparsePoints;
 
 [Flags]
 internal enum Win32FileAccess : uint

StabilityMatrix.Core/StabilityMatrix.Core/ReparsePoints/Win32FileAttribute.cs

@@ -1,7 +1,6 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 
-namespace StabilityMatrix.ReparsePoints;
+namespace StabilityMatrix.Core.ReparsePoints;
 
 [Flags]
 [SuppressMessage("ReSharper", "InconsistentNaming")]

StabilityMatrix.Core/StabilityMatrix.Core/ReparsePoints/Win32FileShare.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace StabilityMatrix.ReparsePoints;
+namespace StabilityMatrix.Core.ReparsePoints;
 
 [Flags]
 internal enum Win32FileShare : uint

StabilityMatrix.Core/StabilityMatrix.Core/StabilityMatrix.Core.csproj

@@ -6,4 +6,26 @@
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
+    <ItemGroup>
+      <PackageReference Include="AsyncAwaitBestPractices" Version="6.0.6" />
+      <PackageReference Include="Blake3" Version="0.5.1" />
+      <PackageReference Include="LiteDB" Version="5.0.16" />
+      <PackageReference Include="LiteDB.Async" Version="0.1.6" />
+      <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
+      <PackageReference Include="NLog" Version="5.2.2" />
+      <PackageReference Include="NLog.Extensions.Logging" Version="5.3.2" />
+      <PackageReference Include="Octokit" Version="7.0.1" />
+      <PackageReference Include="pythonnet" Version="3.0.1" />
+      <PackageReference Include="Refit" Version="7.0.0" />
+      <PackageReference Include="Refit.HttpClientFactory" Version="7.0.0" />
+      <PackageReference Include="Salaros.ConfigParser" Version="0.3.8" />
+      <PackageReference Include="Sentry.NLog" Version="3.33.1" />
+      <PackageReference Include="SharpCompress" Version="0.33.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Folder Include="Models\Settings\" />
+    </ItemGroup>
+
 </Project>

StabilityMatrix.Tests/Models/InstalledPackageTests.cs

@@ -1,4 +1,5 @@
-using StabilityMatrix.Models;
+using StabilityMatrix.Core.Models;
+using StabilityMatrix.Models;
 
 namespace StabilityMatrix.Tests.Models;
 

StabilityMatrix.Tests/Models/SharedFoldersTests.cs

@@ -1,4 +1,5 @@
-using StabilityMatrix.Extensions;
+using StabilityMatrix.Core.Extensions;
+using StabilityMatrix.Core.Models;
 using StabilityMatrix.Models;
 
 namespace StabilityMatrix.Tests.Models;

StabilityMatrix.Tests/Python/PyRunnerTests.cs

@@ -1,5 +1,5 @@
 using Python.Runtime;
-using StabilityMatrix.Python;
+using StabilityMatrix.Core.Python;
 
 namespace StabilityMatrix.Tests.Python;
 

StabilityMatrix.Tests/ReparsePoints/JunctionTests.cs

@@ -1,5 +1,5 @@
 using Microsoft.VisualBasic;
-using StabilityMatrix.ReparsePoints;
+using StabilityMatrix.Core.ReparsePoints;
 
 namespace StabilityMatrix.Tests.ReparsePoints;
 

StabilityMatrix/App.xaml.cs

@@ -27,13 +27,13 @@ using Polly.Timeout;
 using Refit;
 using Sentry;
 using StabilityMatrix.Api;
+using StabilityMatrix.Core.Helper.Cache;
+using StabilityMatrix.Core.Models.Configs;
+using StabilityMatrix.Core.Python;
 using StabilityMatrix.Database;
 using StabilityMatrix.Helper;
-using StabilityMatrix.Helper.Cache;
 using StabilityMatrix.Models;
-using StabilityMatrix.Models.Configs;
 using StabilityMatrix.Models.Packages;
-using StabilityMatrix.Python;
 using StabilityMatrix.Services;
 using StabilityMatrix.Updater;
 using StabilityMatrix.ViewModels;

StabilityMatrix/Database/LiteDbContext.cs

@@ -5,10 +5,10 @@ using System.Linq;
 using System.Threading.Tasks;
 using LiteDB.Async;
 using Microsoft.Extensions.Options;
-using StabilityMatrix.Extensions;
+using StabilityMatrix.Core.Extensions;
+using StabilityMatrix.Core.Models.Configs;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Models.Api;
-using StabilityMatrix.Models.Configs;
 
 namespace StabilityMatrix.Database;
 

StabilityMatrix/Helper/ArchiveHelper.cs

@@ -9,6 +9,7 @@ using System.Windows.Threading;
 using NLog;
 using SharpCompress.Common;
 using SharpCompress.Readers;
+using StabilityMatrix.Core.Helper;
 using StabilityMatrix.Core.Models.Progress;
 
 namespace StabilityMatrix.Helper;

StabilityMatrix/Helper/DialogFactory.cs

@@ -3,6 +3,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using StabilityMatrix.Core.Models;
 using StabilityMatrix.Models;
 using StabilityMatrix.Services;
 using StabilityMatrix.ViewModels;

StabilityMatrix/Helper/IDialogFactory.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using StabilityMatrix.Core.Models;
 using StabilityMatrix.Models;
 
 namespace StabilityMatrix.Helper;

StabilityMatrix/Helper/ISettingsManager.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq.Expressions;
+using StabilityMatrix.Core.Models;
 using StabilityMatrix.Models;
 using StabilityMatrix.Models.Settings;
 using Wpf.Ui.Controls.Window;

StabilityMatrix/Helper/ISnackbarService.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using StabilityMatrix.Core.Models;
 using StabilityMatrix.Models;
 using Wpf.Ui.Common;
 using Wpf.Ui.Controls;

StabilityMatrix/Helper/PrerequisiteHelper.cs

@@ -8,8 +8,9 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Microsoft.Win32;
 using Octokit;
+using StabilityMatrix.Core.Helper;
 using StabilityMatrix.Core.Models.Progress;
-using StabilityMatrix.Python;
+using StabilityMatrix.Core.Python;
 using StabilityMatrix.Services;
 
 namespace StabilityMatrix.Helper;

StabilityMatrix/Helper/SettingsManager.cs

@@ -12,9 +12,11 @@ using System.Threading.Tasks;
 using AsyncAwaitBestPractices;
 using NLog;
 using Refit;
+using StabilityMatrix.Core.Helper;
+using StabilityMatrix.Core.Models;
+using StabilityMatrix.Core.Python;
 using StabilityMatrix.Models;
 using StabilityMatrix.Models.Settings;
-using StabilityMatrix.Python;
 using Wpf.Ui.Controls.Window;
 
 namespace StabilityMatrix.Helper;

StabilityMatrix/Helper/SnackbarService.cs

@@ -1,6 +1,7 @@
 using System.Threading.Tasks;
 using System;
 using AsyncAwaitBestPractices;
+using StabilityMatrix.Core.Models;
 using StabilityMatrix.Models;
 using StabilityMatrix.ViewModels;
 using Wpf.Ui.Common;

StabilityMatrix/InstallerWindow.xaml

@@ -20,14 +20,14 @@
     xmlns:converters="clr-namespace:StabilityMatrix.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:models="clr-namespace:StabilityMatrix.Models"
     xmlns:octokit="clr-namespace:Octokit;assembly=Octokit"
     xmlns:packages="clr-namespace:StabilityMatrix.Models.Packages"
     xmlns:system="clr-namespace:System;assembly=System.Runtime"
     xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
     xmlns:viewModels="clr-namespace:StabilityMatrix.ViewModels"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:xaml="clr-namespace:MdXaml;assembly=MdXaml">
+    xmlns:xaml="clr-namespace:MdXaml;assembly=MdXaml"
+    xmlns:models="clr-namespace:StabilityMatrix.Core.Models;assembly=StabilityMatrix.Core">
 
     <ui:FluentWindow.Resources>
         <converters:ValueConverterGroup x:Key="InvertAndVisibilitate">

StabilityMatrix/LaunchOptionsDialog.xaml

@@ -16,7 +16,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:StabilityMatrix"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:models="clr-namespace:StabilityMatrix.Models"
+    xmlns:models="clr-namespace:StabilityMatrix.Core.Models;assembly=StabilityMatrix.Core"
     xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
     xmlns:viewModels="clr-namespace:StabilityMatrix.ViewModels"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">

StabilityMatrix/LaunchOptionsDialog.xaml.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Windows;
+using StabilityMatrix.Core.Models;
 using StabilityMatrix.Models;
 using StabilityMatrix.ViewModels;
 using Wpf.Ui.Contracts;

StabilityMatrix/LaunchPage.xaml

@@ -14,10 +14,10 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:designViewModels="clr-namespace:StabilityMatrix.DesignData"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:models="clr-namespace:StabilityMatrix.Models"
+    xmlns:models="clr-namespace:StabilityMatrix.Core.Models;assembly=StabilityMatrix.Core"
+    xmlns:terminal="clr-namespace:Simple.Wpf.Terminal;assembly=Simple.Wpf.Terminal"
     xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:terminal="clr-namespace:Simple.Wpf.Terminal;assembly=Simple.Wpf.Terminal">
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Page.Resources>
         <BooleanToVisibilityConverter x:Key="BoolToVisConverter" />

StabilityMatrix/Models/Api/CivitModel.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Text.Json.Serialization;
 using LiteDB;
+using StabilityMatrix.Core.Models;
 
 namespace StabilityMatrix.Models.Api;
 

StabilityMatrix/Models/Api/CivitModelType.cs

@@ -1,7 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json.Serialization;
-using StabilityMatrix.Converters.Json;
-using StabilityMatrix.Extensions;
+using StabilityMatrix.Core.Converters.Json;
+using StabilityMatrix.Core.Extensions;
+using StabilityMatrix.Core.Models;
 
 namespace StabilityMatrix.Models.Api;
 

StabilityMatrix/Models/CheckpointFile.cs

@@ -11,8 +11,9 @@ using AsyncAwaitBestPractices;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using NLog;
+using StabilityMatrix.Core.Extensions;
+using StabilityMatrix.Core.Helper;
 using StabilityMatrix.Core.Models.Progress;
-using StabilityMatrix.Extensions;
 using StabilityMatrix.Helper;
 
 namespace StabilityMatrix.Models;

StabilityMatrix/Models/CheckpointFolder.cs

@@ -8,10 +8,12 @@ using System.Threading.Tasks;
 using System.Windows;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using StabilityMatrix.Core.Extensions;
+using StabilityMatrix.Core.Helper;
+using StabilityMatrix.Core.Models;
+using StabilityMatrix.Core.Models.FileInterfaces;
 using StabilityMatrix.Core.Models.Progress;
-using StabilityMatrix.Extensions;
 using StabilityMatrix.Helper;
-using StabilityMatrix.Models.FileInterfaces;
 using StabilityMatrix.Services;
 using StabilityMatrix.ViewModels;
 

StabilityMatrix/Models/GlobalUserSecrets.cs

@@ -8,7 +8,8 @@ using System.Security.Cryptography;
 using System.Security.Principal;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using StabilityMatrix.Models.FileInterfaces;
+using StabilityMatrix.Core.Models;
+using StabilityMatrix.Core.Models.FileInterfaces;
 
 namespace StabilityMatrix.Models;
 

StabilityMatrix/Models/ISharedFolders.cs

@@ -1,4 +1,4 @@
-using StabilityMatrix.Models.FileInterfaces;
+using StabilityMatrix.Core.Models.FileInterfaces;
 using StabilityMatrix.Models.Packages;
 
 namespace StabilityMatrix.Models;

StabilityMatrix/Models/Packages/A3WebUI.cs

@@ -6,9 +6,11 @@ using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using StabilityMatrix.Core.Helper;
+using StabilityMatrix.Core.Helper.Cache;
+using StabilityMatrix.Core.Models;
 using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.Helper;
-using StabilityMatrix.Helper.Cache;
 using StabilityMatrix.Services;
 
 namespace StabilityMatrix.Models.Packages;

StabilityMatrix/Models/Packages/BaseGitPackage.cs

@@ -7,10 +7,11 @@ using System.Linq;
 using System.Threading.Tasks;
 using NLog;
 using Octokit;
+using StabilityMatrix.Core.Helper.Cache;
+using StabilityMatrix.Core.Models;
 using StabilityMatrix.Core.Models.Progress;
+using StabilityMatrix.Core.Python;
 using StabilityMatrix.Helper;
-using StabilityMatrix.Helper.Cache;
-using StabilityMatrix.Python;
 using StabilityMatrix.Services;
 
 namespace StabilityMatrix.Models.Packages;

StabilityMatrix/Models/Packages/BasePackage.cs

@@ -3,7 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Octokit;
+using StabilityMatrix.Core.Models;
 using StabilityMatrix.Core.Models.Progress;
+using PackageVersion = StabilityMatrix.Core.Models.PackageVersion;
 
 namespace StabilityMatrix.Models.Packages;
 

StabilityMatrix/Models/Packages/ComfyUI.cs

@@ -6,9 +6,11 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using NLog;
+using StabilityMatrix.Core.Helper;
+using StabilityMatrix.Core.Helper.Cache;
+using StabilityMatrix.Core.Models;
 using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.Helper;
-using StabilityMatrix.Helper.Cache;
 using StabilityMatrix.Services;
 
 namespace StabilityMatrix.Models.Packages;

StabilityMatrix/Models/Packages/DankDiffusion.cs

@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using StabilityMatrix.Core.Helper.Cache;
+using StabilityMatrix.Core.Models;
 using StabilityMatrix.Helper;
-using StabilityMatrix.Helper.Cache;
 using StabilityMatrix.Services;
 
 namespace StabilityMatrix.Models.Packages;

StabilityMatrix/Models/Packages/VladAutomatic.cs

@@ -7,10 +7,12 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using NLog;
+using StabilityMatrix.Core.Helper;
+using StabilityMatrix.Core.Helper.Cache;
+using StabilityMatrix.Core.Models;
 using StabilityMatrix.Core.Models.Progress;
+using StabilityMatrix.Core.Python;
 using StabilityMatrix.Helper;
-using StabilityMatrix.Helper.Cache;
-using StabilityMatrix.Python;
 using StabilityMatrix.Services;
 
 namespace StabilityMatrix.Models.Packages;

StabilityMatrix/Models/Settings/Settings.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using StabilityMatrix.Core.Models;
 using Wpf.Ui.Controls.Window;
 
 namespace StabilityMatrix.Models.Settings;

StabilityMatrix/Models/SharedFolders.cs

@@ -2,11 +2,12 @@
 using System.Collections.Generic;
 using System.IO;
 using NLog;
-using StabilityMatrix.Extensions;
+using StabilityMatrix.Core.Extensions;
+using StabilityMatrix.Core.Models;
+using StabilityMatrix.Core.Models.FileInterfaces;
+using StabilityMatrix.Core.ReparsePoints;
 using StabilityMatrix.Helper;
-using StabilityMatrix.Models.FileInterfaces;
 using StabilityMatrix.Models.Packages;
-using StabilityMatrix.ReparsePoints;
 
 namespace StabilityMatrix.Models;
 

StabilityMatrix/PackageManagerPage.xaml

@@ -12,7 +12,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:models="clr-namespace:StabilityMatrix.Models"
+    xmlns:models="clr-namespace:StabilityMatrix.Core.Models;assembly=StabilityMatrix.Core"
     xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
     xmlns:viewModels="clr-namespace:StabilityMatrix.ViewModels"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">

StabilityMatrix/Updater/UpdateChannel.cs

@@ -1,5 +1,5 @@
 using System.Text.Json.Serialization;
-using StabilityMatrix.Converters.Json;
+using StabilityMatrix.Core.Converters.Json;
 
 namespace StabilityMatrix.Updater;
 

StabilityMatrix/Updater/UpdateHelper.cs

@@ -7,10 +7,10 @@ using System.Threading.Tasks;
 using System.Windows.Threading;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using StabilityMatrix.Core.Extensions;
+using StabilityMatrix.Core.Models.Configs;
 using StabilityMatrix.Core.Models.Progress;
-using StabilityMatrix.Extensions;
 using StabilityMatrix.Helper;
-using StabilityMatrix.Models.Configs;
 using StabilityMatrix.Services;
 
 namespace StabilityMatrix.Updater;

StabilityMatrix/ViewModels/CheckpointBrowserCardViewModel.cs

@@ -10,12 +10,14 @@ using AsyncAwaitBestPractices;
 using CommunityToolkit.Mvvm.Input;
 using NLog;
 using Refit;
+using StabilityMatrix.Core.Extensions;
+using StabilityMatrix.Core.Helper;
+using StabilityMatrix.Core.Models;
+using StabilityMatrix.Core.Models.FileInterfaces;
 using StabilityMatrix.Core.Models.Progress;
-using StabilityMatrix.Extensions;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Models;
 using StabilityMatrix.Models.Api;
-using StabilityMatrix.Models.FileInterfaces;
 using StabilityMatrix.Services;
 using Wpf.Ui.Controls;
 

StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs

@@ -12,8 +12,10 @@ using System.Diagnostics;
 using System.Net.Http;
 using System.Windows.Data;
 using StabilityMatrix.Api;
+using StabilityMatrix.Core.Extensions;
+using StabilityMatrix.Core.Helper;
+using StabilityMatrix.Core.Models;
 using StabilityMatrix.Database;
-using StabilityMatrix.Extensions;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Models;
 using StabilityMatrix.Models.Api;

StabilityMatrix/ViewModels/DataDirectoryMigrationViewModel.cs

@@ -5,10 +5,11 @@ using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using NLog;
+using StabilityMatrix.Core.Helper;
+using StabilityMatrix.Core.Models.FileInterfaces;
+using StabilityMatrix.Core.Python;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Models;
-using StabilityMatrix.Models.FileInterfaces;
-using StabilityMatrix.Python;
 
 namespace StabilityMatrix.ViewModels;
 

StabilityMatrix/ViewModels/FirstLaunchSetupViewModel.cs

@@ -4,6 +4,7 @@ using AsyncAwaitBestPractices;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using StabilityMatrix.Controls;
+using StabilityMatrix.Core.Helper;
 using StabilityMatrix.Helper;
 
 namespace StabilityMatrix.ViewModels;

StabilityMatrix/ViewModels/InstallerViewModel.cs

@@ -11,11 +11,12 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.Logging;
 using Octokit;
+using StabilityMatrix.Core.Models;
 using StabilityMatrix.Core.Models.Progress;
+using StabilityMatrix.Core.Python;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Models;
 using StabilityMatrix.Models.Packages;
-using StabilityMatrix.Python;
 using StabilityMatrix.Services;
 using Wpf.Ui.Contracts;
 using Wpf.Ui.Controls;
@@ -24,7 +25,7 @@ using Wpf.Ui.Controls.Window;
 using Application = System.Windows.Application;
 using EventManager = StabilityMatrix.Helper.EventManager;
 using ISnackbarService = StabilityMatrix.Helper.ISnackbarService;
-using PackageVersion = StabilityMatrix.Models.PackageVersion;
+using PackageVersion = StabilityMatrix.Core.Models.PackageVersion;
 
 namespace StabilityMatrix.ViewModels;
 

StabilityMatrix/ViewModels/LaunchOptionsDialogViewModel.cs

@@ -6,7 +6,8 @@ using System.Diagnostics;
 using System.Linq;
 using CommunityToolkit.Mvvm.ComponentModel;
 using NLog;
-using StabilityMatrix.Helper.Cache;
+using StabilityMatrix.Core.Helper.Cache;
+using StabilityMatrix.Core.Models;
 using StabilityMatrix.Models;
 
 namespace StabilityMatrix.ViewModels;

StabilityMatrix/ViewModels/LaunchViewModel.cs

@@ -9,10 +9,12 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.Logging;
 using Microsoft.Toolkit.Uwp.Notifications;
+using StabilityMatrix.Core.Helper;
+using StabilityMatrix.Core.Models;
+using StabilityMatrix.Core.Python;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Models;
 using StabilityMatrix.Models.Packages;
-using StabilityMatrix.Python;
 using Wpf.Ui.Contracts;
 using Wpf.Ui.Controls.ContentDialogControl;
 using EventManager = StabilityMatrix.Helper.EventManager;

StabilityMatrix/ViewModels/MainWindowViewModel.cs

@@ -10,8 +10,9 @@ using AsyncAwaitBestPractices;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.Options;
+using StabilityMatrix.Core.Helper;
+using StabilityMatrix.Core.Models.Configs;
 using StabilityMatrix.Helper;
-using StabilityMatrix.Models.Configs;
 using StabilityMatrix.Services;
 using StabilityMatrix.Updater;
 using Wpf.Ui.Appearance;

StabilityMatrix/ViewModels/OneClickInstallViewModel.cs

@@ -4,11 +4,12 @@ using System.Windows;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.Logging;
+using StabilityMatrix.Core.Models;
 using StabilityMatrix.Core.Models.Progress;
+using StabilityMatrix.Core.Python;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Models;
 using StabilityMatrix.Models.Packages;
-using StabilityMatrix.Python;
 using EventManager = StabilityMatrix.Helper.EventManager;
 
 namespace StabilityMatrix.ViewModels;

StabilityMatrix/ViewModels/PackageManagerViewModel.cs

@@ -11,6 +11,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.Logging;
 using Polly;
+using StabilityMatrix.Core.Models;
 using StabilityMatrix.Core.Models.Progress;
 using Wpf.Ui.Contracts;
 using Wpf.Ui.Controls;

StabilityMatrix/ViewModels/SelectInstallLocationsViewModel.cs

@@ -9,6 +9,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using NLog;
 using Ookii.Dialogs.Wpf;
+using StabilityMatrix.Core.Helper;
 using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Models.Settings;

StabilityMatrix/ViewModels/SettingsViewModel.cs

@@ -20,11 +20,13 @@ using Ookii.Dialogs.Wpf;
 using Polly.Timeout;
 using Refit;
 using StabilityMatrix.Api;
+using StabilityMatrix.Core.Helper;
+using StabilityMatrix.Core.Models;
 using StabilityMatrix.Core.Models.Progress;
+using StabilityMatrix.Core.Python;
 using StabilityMatrix.Database;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Models;
-using StabilityMatrix.Python;
 using Wpf.Ui.Appearance;
 using Wpf.Ui.Contracts;
 using Wpf.Ui.Controls;

StabilityMatrix/ViewModels/TextToImageViewModel.cs

@@ -9,7 +9,8 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.Logging;
 using StabilityMatrix.Api;
-using StabilityMatrix.Extensions;
+using StabilityMatrix.Core.Extensions;
+using StabilityMatrix.Core.Models;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Models;
 using StabilityMatrix.Models.Api;

StabilityMatrix/ViewModels/UpdateWindowViewModel.cs

@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using StabilityMatrix.Core.Helper;
 using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.Helper;
 using StabilityMatrix.Updater;