From c5f3f0faaa9ababcb18402a187ca7856536d4b59 Mon Sep 17 00:00:00 2001 From: Ionite Date: Thu, 6 Jul 2023 22:47:41 -0400 Subject: [PATCH] Fix namespaces --- .../Json/DefaultUnknownEnumConverter.cs | 0 .../Json/LaunchOptionValueJsonConverter.cs | 0 .../Exceptions/ProcessException.cs | 0 .../Extensions/EnumAttributes.cs | 0 .../Extensions/EnumConversion.cs | 0 .../Extensions/EnumerableExtensions.cs | 0 .../Extensions/LiteDBExtensions.cs | 0 .../Helper/Cache/GithubApiCache.cs | 0 .../Helper/Cache/IGithubApiCache.cs | 0 .../Helper/Cache/LRUCache.cs | 0 .../Helper/Expressions.cs | 0 .../Helper/FileHash.cs | 0 .../Helper/FileTransfers.cs | 0 .../Helper/HardwareHelper.cs | 0 .../Helper/MinimumDelay.cs | 0 .../Helper/ObjectHash.cs | 0 .../Helper/ProcessRunner.cs | 0 .../Helper/ProcessTracker.cs | 0 .../{StabilityMatrix.Core => }/Helper/Size.cs | 0 .../Helper/SystemInfo.cs | 0 .../Helper/Utilities.cs | 0 .../Models/Configs/DebugOptions.cs | 0 .../Models/FileInterfaces/DirectoryPath.cs | 0 .../Models/FileInterfaces/FilePath.cs | 0 .../Models/FileInterfaces/FileSystemPath.cs | 0 .../Models/FileInterfaces/IPathObject.cs | 0 .../Models/FileSizeType.cs | 0 .../Models/GlobalConfig.cs | 0 .../Models/InstalledPackage.cs | 2 +- .../Models/LaunchOption.cs | 0 .../Models/LaunchOptionCard.cs | 0 .../Models/LaunchOptionDefinition.cs | 0 .../Models/LaunchOptionType.cs | 0 .../Models/LicenseInfo.cs | 0 .../Models/LoadState.cs | 0 .../Models/PackageVersion.cs | 0 .../Models/Progress/ProgressReport.cs | 0 .../Models/Progress/ProgressState.cs | 0 .../Models/Progress/ProgressType.cs | 0 .../Models/SharedFolderType.cs | 0 .../Models/TaskResult.cs | 0 .../Python/ArgParser.cs | 0 .../Python/IPyRunner.cs | 0 .../Python/Interop/PyIOStream.cs | 0 .../Python/PyRunner.cs | 0 .../Python/PyVenvRunner.cs | 0 .../ReparsePoints/DeviceIoControlCode.cs | 0 .../ReparsePoints/Junction.cs | 0 .../ReparsePoints/ReparseDataBuffer.cs | 0 .../ReparsePoints/Win32CreationDisposition.cs | 0 .../ReparsePoints/Win32ErrorCode.cs | 0 .../ReparsePoints/Win32FileAccess.cs | 0 .../ReparsePoints/Win32FileAttribute.cs | 0 .../ReparsePoints/Win32FileShare.cs | 0 .../StabilityMatrix.Core.csproj | 0 .../Helper/PackageFactoryTests.cs | 1 - .../Models/InstalledPackageTests.cs | 1 - .../StabilityMatrix.Tests.csproj | 1 + StabilityMatrix.sln | 8 ++++- StabilityMatrix/InstallerWindow.xaml | 32 ++++++++++--------- StabilityMatrix/StabilityMatrix.csproj | 4 +-- 61 files changed, 28 insertions(+), 21 deletions(-) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Converters/Json/DefaultUnknownEnumConverter.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Converters/Json/LaunchOptionValueJsonConverter.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Exceptions/ProcessException.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Extensions/EnumAttributes.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Extensions/EnumConversion.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Extensions/EnumerableExtensions.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Extensions/LiteDBExtensions.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Helper/Cache/GithubApiCache.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Helper/Cache/IGithubApiCache.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Helper/Cache/LRUCache.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Helper/Expressions.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Helper/FileHash.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Helper/FileTransfers.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Helper/HardwareHelper.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Helper/MinimumDelay.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Helper/ObjectHash.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Helper/ProcessRunner.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Helper/ProcessTracker.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Helper/Size.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Helper/SystemInfo.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Helper/Utilities.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Models/Configs/DebugOptions.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Models/FileInterfaces/DirectoryPath.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Models/FileInterfaces/FilePath.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Models/FileInterfaces/FileSystemPath.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Models/FileInterfaces/IPathObject.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Models/FileSizeType.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Models/GlobalConfig.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Models/InstalledPackage.cs (98%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Models/LaunchOption.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Models/LaunchOptionCard.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Models/LaunchOptionDefinition.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Models/LaunchOptionType.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Models/LicenseInfo.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Models/LoadState.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Models/PackageVersion.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Models/Progress/ProgressReport.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Models/Progress/ProgressState.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Models/Progress/ProgressType.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Models/SharedFolderType.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Models/TaskResult.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Python/ArgParser.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Python/IPyRunner.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Python/Interop/PyIOStream.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Python/PyRunner.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/Python/PyVenvRunner.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/ReparsePoints/DeviceIoControlCode.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/ReparsePoints/Junction.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/ReparsePoints/ReparseDataBuffer.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/ReparsePoints/Win32CreationDisposition.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/ReparsePoints/Win32ErrorCode.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/ReparsePoints/Win32FileAccess.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/ReparsePoints/Win32FileAttribute.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/ReparsePoints/Win32FileShare.cs (100%) rename StabilityMatrix.Core/{StabilityMatrix.Core => }/StabilityMatrix.Core.csproj (100%) diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Converters/Json/DefaultUnknownEnumConverter.cs b/StabilityMatrix.Core/Converters/Json/DefaultUnknownEnumConverter.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Converters/Json/DefaultUnknownEnumConverter.cs rename to StabilityMatrix.Core/Converters/Json/DefaultUnknownEnumConverter.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Converters/Json/LaunchOptionValueJsonConverter.cs b/StabilityMatrix.Core/Converters/Json/LaunchOptionValueJsonConverter.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Converters/Json/LaunchOptionValueJsonConverter.cs rename to StabilityMatrix.Core/Converters/Json/LaunchOptionValueJsonConverter.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Exceptions/ProcessException.cs b/StabilityMatrix.Core/Exceptions/ProcessException.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Exceptions/ProcessException.cs rename to StabilityMatrix.Core/Exceptions/ProcessException.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Extensions/EnumAttributes.cs b/StabilityMatrix.Core/Extensions/EnumAttributes.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Extensions/EnumAttributes.cs rename to StabilityMatrix.Core/Extensions/EnumAttributes.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Extensions/EnumConversion.cs b/StabilityMatrix.Core/Extensions/EnumConversion.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Extensions/EnumConversion.cs rename to StabilityMatrix.Core/Extensions/EnumConversion.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Extensions/EnumerableExtensions.cs b/StabilityMatrix.Core/Extensions/EnumerableExtensions.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Extensions/EnumerableExtensions.cs rename to StabilityMatrix.Core/Extensions/EnumerableExtensions.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Extensions/LiteDBExtensions.cs b/StabilityMatrix.Core/Extensions/LiteDBExtensions.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Extensions/LiteDBExtensions.cs rename to StabilityMatrix.Core/Extensions/LiteDBExtensions.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Helper/Cache/GithubApiCache.cs b/StabilityMatrix.Core/Helper/Cache/GithubApiCache.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Helper/Cache/GithubApiCache.cs rename to StabilityMatrix.Core/Helper/Cache/GithubApiCache.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Helper/Cache/IGithubApiCache.cs b/StabilityMatrix.Core/Helper/Cache/IGithubApiCache.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Helper/Cache/IGithubApiCache.cs rename to StabilityMatrix.Core/Helper/Cache/IGithubApiCache.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Helper/Cache/LRUCache.cs b/StabilityMatrix.Core/Helper/Cache/LRUCache.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Helper/Cache/LRUCache.cs rename to StabilityMatrix.Core/Helper/Cache/LRUCache.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Helper/Expressions.cs b/StabilityMatrix.Core/Helper/Expressions.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Helper/Expressions.cs rename to StabilityMatrix.Core/Helper/Expressions.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Helper/FileHash.cs b/StabilityMatrix.Core/Helper/FileHash.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Helper/FileHash.cs rename to StabilityMatrix.Core/Helper/FileHash.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Helper/FileTransfers.cs b/StabilityMatrix.Core/Helper/FileTransfers.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Helper/FileTransfers.cs rename to StabilityMatrix.Core/Helper/FileTransfers.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Helper/HardwareHelper.cs b/StabilityMatrix.Core/Helper/HardwareHelper.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Helper/HardwareHelper.cs rename to StabilityMatrix.Core/Helper/HardwareHelper.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Helper/MinimumDelay.cs b/StabilityMatrix.Core/Helper/MinimumDelay.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Helper/MinimumDelay.cs rename to StabilityMatrix.Core/Helper/MinimumDelay.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Helper/ObjectHash.cs b/StabilityMatrix.Core/Helper/ObjectHash.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Helper/ObjectHash.cs rename to StabilityMatrix.Core/Helper/ObjectHash.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Helper/ProcessRunner.cs b/StabilityMatrix.Core/Helper/ProcessRunner.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Helper/ProcessRunner.cs rename to StabilityMatrix.Core/Helper/ProcessRunner.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Helper/ProcessTracker.cs b/StabilityMatrix.Core/Helper/ProcessTracker.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Helper/ProcessTracker.cs rename to StabilityMatrix.Core/Helper/ProcessTracker.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Helper/Size.cs b/StabilityMatrix.Core/Helper/Size.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Helper/Size.cs rename to StabilityMatrix.Core/Helper/Size.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Helper/SystemInfo.cs b/StabilityMatrix.Core/Helper/SystemInfo.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Helper/SystemInfo.cs rename to StabilityMatrix.Core/Helper/SystemInfo.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Helper/Utilities.cs b/StabilityMatrix.Core/Helper/Utilities.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Helper/Utilities.cs rename to StabilityMatrix.Core/Helper/Utilities.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Models/Configs/DebugOptions.cs b/StabilityMatrix.Core/Models/Configs/DebugOptions.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Models/Configs/DebugOptions.cs rename to StabilityMatrix.Core/Models/Configs/DebugOptions.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Models/FileInterfaces/DirectoryPath.cs b/StabilityMatrix.Core/Models/FileInterfaces/DirectoryPath.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Models/FileInterfaces/DirectoryPath.cs rename to StabilityMatrix.Core/Models/FileInterfaces/DirectoryPath.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Models/FileInterfaces/FilePath.cs b/StabilityMatrix.Core/Models/FileInterfaces/FilePath.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Models/FileInterfaces/FilePath.cs rename to StabilityMatrix.Core/Models/FileInterfaces/FilePath.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Models/FileInterfaces/FileSystemPath.cs b/StabilityMatrix.Core/Models/FileInterfaces/FileSystemPath.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Models/FileInterfaces/FileSystemPath.cs rename to StabilityMatrix.Core/Models/FileInterfaces/FileSystemPath.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Models/FileInterfaces/IPathObject.cs b/StabilityMatrix.Core/Models/FileInterfaces/IPathObject.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Models/FileInterfaces/IPathObject.cs rename to StabilityMatrix.Core/Models/FileInterfaces/IPathObject.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Models/FileSizeType.cs b/StabilityMatrix.Core/Models/FileSizeType.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Models/FileSizeType.cs rename to StabilityMatrix.Core/Models/FileSizeType.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Models/GlobalConfig.cs b/StabilityMatrix.Core/Models/GlobalConfig.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Models/GlobalConfig.cs rename to StabilityMatrix.Core/Models/GlobalConfig.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Models/InstalledPackage.cs b/StabilityMatrix.Core/Models/InstalledPackage.cs similarity index 98% rename from StabilityMatrix.Core/StabilityMatrix.Core/Models/InstalledPackage.cs rename to StabilityMatrix.Core/Models/InstalledPackage.cs index 2f8ef880..b8aa0fd4 100644 --- a/StabilityMatrix.Core/StabilityMatrix.Core/Models/InstalledPackage.cs +++ b/StabilityMatrix.Core/Models/InstalledPackage.cs @@ -44,7 +44,7 @@ public class InstalledPackage /// Get the path as a relative sub-path of the relative path. /// If not a sub-path, return null. /// - internal static string? GetSubPath(string relativeTo, string path) + public static string? GetSubPath(string relativeTo, string path) { var relativePath = System.IO.Path.GetRelativePath(relativeTo, path); // GetRelativePath returns the path if it's not relative diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Models/LaunchOption.cs b/StabilityMatrix.Core/Models/LaunchOption.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Models/LaunchOption.cs rename to StabilityMatrix.Core/Models/LaunchOption.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Models/LaunchOptionCard.cs b/StabilityMatrix.Core/Models/LaunchOptionCard.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Models/LaunchOptionCard.cs rename to StabilityMatrix.Core/Models/LaunchOptionCard.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Models/LaunchOptionDefinition.cs b/StabilityMatrix.Core/Models/LaunchOptionDefinition.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Models/LaunchOptionDefinition.cs rename to StabilityMatrix.Core/Models/LaunchOptionDefinition.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Models/LaunchOptionType.cs b/StabilityMatrix.Core/Models/LaunchOptionType.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Models/LaunchOptionType.cs rename to StabilityMatrix.Core/Models/LaunchOptionType.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Models/LicenseInfo.cs b/StabilityMatrix.Core/Models/LicenseInfo.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Models/LicenseInfo.cs rename to StabilityMatrix.Core/Models/LicenseInfo.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Models/LoadState.cs b/StabilityMatrix.Core/Models/LoadState.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Models/LoadState.cs rename to StabilityMatrix.Core/Models/LoadState.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Models/PackageVersion.cs b/StabilityMatrix.Core/Models/PackageVersion.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Models/PackageVersion.cs rename to StabilityMatrix.Core/Models/PackageVersion.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Models/Progress/ProgressReport.cs b/StabilityMatrix.Core/Models/Progress/ProgressReport.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Models/Progress/ProgressReport.cs rename to StabilityMatrix.Core/Models/Progress/ProgressReport.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Models/Progress/ProgressState.cs b/StabilityMatrix.Core/Models/Progress/ProgressState.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Models/Progress/ProgressState.cs rename to StabilityMatrix.Core/Models/Progress/ProgressState.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Models/Progress/ProgressType.cs b/StabilityMatrix.Core/Models/Progress/ProgressType.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Models/Progress/ProgressType.cs rename to StabilityMatrix.Core/Models/Progress/ProgressType.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Models/SharedFolderType.cs b/StabilityMatrix.Core/Models/SharedFolderType.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Models/SharedFolderType.cs rename to StabilityMatrix.Core/Models/SharedFolderType.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Models/TaskResult.cs b/StabilityMatrix.Core/Models/TaskResult.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Models/TaskResult.cs rename to StabilityMatrix.Core/Models/TaskResult.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Python/ArgParser.cs b/StabilityMatrix.Core/Python/ArgParser.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Python/ArgParser.cs rename to StabilityMatrix.Core/Python/ArgParser.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Python/IPyRunner.cs b/StabilityMatrix.Core/Python/IPyRunner.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Python/IPyRunner.cs rename to StabilityMatrix.Core/Python/IPyRunner.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Python/Interop/PyIOStream.cs b/StabilityMatrix.Core/Python/Interop/PyIOStream.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Python/Interop/PyIOStream.cs rename to StabilityMatrix.Core/Python/Interop/PyIOStream.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Python/PyRunner.cs b/StabilityMatrix.Core/Python/PyRunner.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Python/PyRunner.cs rename to StabilityMatrix.Core/Python/PyRunner.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/Python/PyVenvRunner.cs b/StabilityMatrix.Core/Python/PyVenvRunner.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/Python/PyVenvRunner.cs rename to StabilityMatrix.Core/Python/PyVenvRunner.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/ReparsePoints/DeviceIoControlCode.cs b/StabilityMatrix.Core/ReparsePoints/DeviceIoControlCode.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/ReparsePoints/DeviceIoControlCode.cs rename to StabilityMatrix.Core/ReparsePoints/DeviceIoControlCode.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/ReparsePoints/Junction.cs b/StabilityMatrix.Core/ReparsePoints/Junction.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/ReparsePoints/Junction.cs rename to StabilityMatrix.Core/ReparsePoints/Junction.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/ReparsePoints/ReparseDataBuffer.cs b/StabilityMatrix.Core/ReparsePoints/ReparseDataBuffer.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/ReparsePoints/ReparseDataBuffer.cs rename to StabilityMatrix.Core/ReparsePoints/ReparseDataBuffer.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/ReparsePoints/Win32CreationDisposition.cs b/StabilityMatrix.Core/ReparsePoints/Win32CreationDisposition.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/ReparsePoints/Win32CreationDisposition.cs rename to StabilityMatrix.Core/ReparsePoints/Win32CreationDisposition.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/ReparsePoints/Win32ErrorCode.cs b/StabilityMatrix.Core/ReparsePoints/Win32ErrorCode.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/ReparsePoints/Win32ErrorCode.cs rename to StabilityMatrix.Core/ReparsePoints/Win32ErrorCode.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/ReparsePoints/Win32FileAccess.cs b/StabilityMatrix.Core/ReparsePoints/Win32FileAccess.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/ReparsePoints/Win32FileAccess.cs rename to StabilityMatrix.Core/ReparsePoints/Win32FileAccess.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/ReparsePoints/Win32FileAttribute.cs b/StabilityMatrix.Core/ReparsePoints/Win32FileAttribute.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/ReparsePoints/Win32FileAttribute.cs rename to StabilityMatrix.Core/ReparsePoints/Win32FileAttribute.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/ReparsePoints/Win32FileShare.cs b/StabilityMatrix.Core/ReparsePoints/Win32FileShare.cs similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/ReparsePoints/Win32FileShare.cs rename to StabilityMatrix.Core/ReparsePoints/Win32FileShare.cs diff --git a/StabilityMatrix.Core/StabilityMatrix.Core/StabilityMatrix.Core.csproj b/StabilityMatrix.Core/StabilityMatrix.Core.csproj similarity index 100% rename from StabilityMatrix.Core/StabilityMatrix.Core/StabilityMatrix.Core.csproj rename to StabilityMatrix.Core/StabilityMatrix.Core.csproj diff --git a/StabilityMatrix.Tests/Helper/PackageFactoryTests.cs b/StabilityMatrix.Tests/Helper/PackageFactoryTests.cs index b7b6145f..a7fc0230 100644 --- a/StabilityMatrix.Tests/Helper/PackageFactoryTests.cs +++ b/StabilityMatrix.Tests/Helper/PackageFactoryTests.cs @@ -1,5 +1,4 @@ using StabilityMatrix.Helper; -using StabilityMatrix.Models; using StabilityMatrix.Models.Packages; namespace StabilityMatrix.Tests.Helper; diff --git a/StabilityMatrix.Tests/Models/InstalledPackageTests.cs b/StabilityMatrix.Tests/Models/InstalledPackageTests.cs index 510e42f2..4a0935d7 100644 --- a/StabilityMatrix.Tests/Models/InstalledPackageTests.cs +++ b/StabilityMatrix.Tests/Models/InstalledPackageTests.cs @@ -1,5 +1,4 @@ using StabilityMatrix.Core.Models; -using StabilityMatrix.Models; namespace StabilityMatrix.Tests.Models; diff --git a/StabilityMatrix.Tests/StabilityMatrix.Tests.csproj b/StabilityMatrix.Tests/StabilityMatrix.Tests.csproj index 477825ee..0606e14e 100644 --- a/StabilityMatrix.Tests/StabilityMatrix.Tests.csproj +++ b/StabilityMatrix.Tests/StabilityMatrix.Tests.csproj @@ -26,6 +26,7 @@ + diff --git a/StabilityMatrix.sln b/StabilityMatrix.sln index c9b91440..cf064da1 100644 --- a/StabilityMatrix.sln +++ b/StabilityMatrix.sln @@ -7,7 +7,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StabilityMatrix", "Stabilit EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StabilityMatrix.Tests", "StabilityMatrix.Tests\StabilityMatrix.Tests.csproj", "{63EF4330-CCFF-4677-B14C-1A700CD81FDA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StabilityMatrix.Core", "StabilityMatrix.Core\StabilityMatrix.Core\StabilityMatrix.Core.csproj", "{E2E0B158-26D2-48EB-84E3-C5559D9AE84C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StabilityMatrix.Core", "StabilityMatrix.Core\StabilityMatrix.Core.csproj", "{E2E0B158-26D2-48EB-84E3-C5559D9AE84C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StabilityMatrix.Avalonia", "StabilityMatrix.Avalonia\StabilityMatrix.Avalonia.csproj", "{3F9F96FA-12E7-4B82-BFE5-1FAD88F3ACB2}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -27,6 +29,10 @@ Global {E2E0B158-26D2-48EB-84E3-C5559D9AE84C}.Debug|Any CPU.Build.0 = Debug|Any CPU {E2E0B158-26D2-48EB-84E3-C5559D9AE84C}.Release|Any CPU.ActiveCfg = Release|Any CPU {E2E0B158-26D2-48EB-84E3-C5559D9AE84C}.Release|Any CPU.Build.0 = Release|Any CPU + {3F9F96FA-12E7-4B82-BFE5-1FAD88F3ACB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3F9F96FA-12E7-4B82-BFE5-1FAD88F3ACB2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3F9F96FA-12E7-4B82-BFE5-1FAD88F3ACB2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3F9F96FA-12E7-4B82-BFE5-1FAD88F3ACB2}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/StabilityMatrix/InstallerWindow.xaml b/StabilityMatrix/InstallerWindow.xaml index 6904752f..00fa2f5f 100644 --- a/StabilityMatrix/InstallerWindow.xaml +++ b/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.Core.Models;assembly=StabilityMatrix.Core" 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:models="clr-namespace:StabilityMatrix.Core.Models;assembly=StabilityMatrix.Core"> + xmlns:xaml="clr-namespace:MdXaml;assembly=MdXaml"> @@ -37,7 +37,7 @@ - + - +