diff --git a/src/HUDMergerTests/Extensions/KeyValuesExtensionsTests.cs b/src/HUDMerger.Core.Tests/Extensions/KeyValuesExtensionsTests.cs similarity index 93% rename from src/HUDMergerTests/Extensions/KeyValuesExtensionsTests.cs rename to src/HUDMerger.Core.Tests/Extensions/KeyValuesExtensionsTests.cs index 2629ee9..9e5875d 100644 --- a/src/HUDMergerTests/Extensions/KeyValuesExtensionsTests.cs +++ b/src/HUDMerger.Core.Tests/Extensions/KeyValuesExtensionsTests.cs @@ -1,9 +1,10 @@ using System; using System.Linq; using Microsoft.VisualStudio.TestTools.UnitTesting; +using HUDMerger.Core.Extensions; using VDF.Models; -namespace HUDMerger.Extensions.Tests; +namespace HUDMerger.Core.Tests.Extensions; [TestClass()] public class KeyValuesExtensionsTests diff --git a/src/HUDMergerTests/HUDMergerTests.csproj b/src/HUDMerger.Core.Tests/HUDMerger.Core.Tests.csproj similarity index 80% rename from src/HUDMergerTests/HUDMergerTests.csproj rename to src/HUDMerger.Core.Tests/HUDMerger.Core.Tests.csproj index 0d60af0..e77802e 100644 --- a/src/HUDMergerTests/HUDMergerTests.csproj +++ b/src/HUDMerger.Core.Tests/HUDMerger.Core.Tests.csproj @@ -2,7 +2,7 @@ net8.0-windows - HUDMergerTests + HUDMerger.Core.Tests Enable false @@ -15,7 +15,7 @@ - + diff --git a/src/HUDMergerTests/Models/FilesHashSetTests.cs b/src/HUDMerger.Core.Tests/Models/FilesHashSetTests.cs similarity index 80% rename from src/HUDMergerTests/Models/FilesHashSetTests.cs rename to src/HUDMerger.Core.Tests/Models/FilesHashSetTests.cs index ef0dd7a..27b9837 100644 --- a/src/HUDMergerTests/Models/FilesHashSetTests.cs +++ b/src/HUDMerger.Core.Tests/Models/FilesHashSetTests.cs @@ -1,7 +1,8 @@ -using System; +using System; using Microsoft.VisualStudio.TestTools.UnitTesting; +using HUDMerger.Core.Models; -namespace HUDMerger.Models.Tests; +namespace HUDMerger.Core.Tests.Models; [TestClass()] public class FilesHashSetTests diff --git a/src/HUDMerger.sln b/src/HUDMerger.sln index 404807e..6578142 100644 --- a/src/HUDMerger.sln +++ b/src/HUDMerger.sln @@ -5,8 +5,6 @@ VisualStudioVersion = 17.1.32228.430 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HUDMerger", "HUDMerger\HUDMerger.csproj", "{A559117E-9AFE-4845-B619-E82E594987A8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HUDMergerTests", "HUDMergerTests\HUDMergerTests.csproj", "{636E43CE-24FD-4F54-860B-8E442ACC0318}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDF", "VDF\VDF.csproj", "{1C8FB3B7-478B-40AF-87B4-EBBD422E49F6}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HUDAnimations", "HUDAnimations\HUDAnimations.csproj", "{6050DF67-1BD9-47C3-AEA0-F40127B4ABEF}" @@ -15,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HUDMerger.Core", "HUDMerger EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HUDAnimations.Tests", "HUDAnimations.Tests\HUDAnimations.Tests.csproj", "{56A4737F-39BB-4E61-AE86-DB97649EC8D1}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HUDMerger.Core.Tests", "HUDMerger.Core.Tests\HUDMerger.Core.Tests.csproj", "{8743B2FC-5BC2-4CF1-B91E-FC48AE652F35}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -37,18 +37,6 @@ Global {A559117E-9AFE-4845-B619-E82E594987A8}.Release|x64.Build.0 = Release|Any CPU {A559117E-9AFE-4845-B619-E82E594987A8}.Release|x86.ActiveCfg = Release|Any CPU {A559117E-9AFE-4845-B619-E82E594987A8}.Release|x86.Build.0 = Release|Any CPU - {636E43CE-24FD-4F54-860B-8E442ACC0318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {636E43CE-24FD-4F54-860B-8E442ACC0318}.Debug|Any CPU.Build.0 = Debug|Any CPU - {636E43CE-24FD-4F54-860B-8E442ACC0318}.Debug|x64.ActiveCfg = Debug|Any CPU - {636E43CE-24FD-4F54-860B-8E442ACC0318}.Debug|x64.Build.0 = Debug|Any CPU - {636E43CE-24FD-4F54-860B-8E442ACC0318}.Debug|x86.ActiveCfg = Debug|Any CPU - {636E43CE-24FD-4F54-860B-8E442ACC0318}.Debug|x86.Build.0 = Debug|Any CPU - {636E43CE-24FD-4F54-860B-8E442ACC0318}.Release|Any CPU.ActiveCfg = Release|Any CPU - {636E43CE-24FD-4F54-860B-8E442ACC0318}.Release|Any CPU.Build.0 = Release|Any CPU - {636E43CE-24FD-4F54-860B-8E442ACC0318}.Release|x64.ActiveCfg = Release|Any CPU - {636E43CE-24FD-4F54-860B-8E442ACC0318}.Release|x64.Build.0 = Release|Any CPU - {636E43CE-24FD-4F54-860B-8E442ACC0318}.Release|x86.ActiveCfg = Release|Any CPU - {636E43CE-24FD-4F54-860B-8E442ACC0318}.Release|x86.Build.0 = Release|Any CPU {1C8FB3B7-478B-40AF-87B4-EBBD422E49F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1C8FB3B7-478B-40AF-87B4-EBBD422E49F6}.Debug|Any CPU.Build.0 = Debug|Any CPU {1C8FB3B7-478B-40AF-87B4-EBBD422E49F6}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -97,6 +85,18 @@ Global {56A4737F-39BB-4E61-AE86-DB97649EC8D1}.Release|x64.Build.0 = Release|Any CPU {56A4737F-39BB-4E61-AE86-DB97649EC8D1}.Release|x86.ActiveCfg = Release|Any CPU {56A4737F-39BB-4E61-AE86-DB97649EC8D1}.Release|x86.Build.0 = Release|Any CPU + {8743B2FC-5BC2-4CF1-B91E-FC48AE652F35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8743B2FC-5BC2-4CF1-B91E-FC48AE652F35}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8743B2FC-5BC2-4CF1-B91E-FC48AE652F35}.Debug|x64.ActiveCfg = Debug|Any CPU + {8743B2FC-5BC2-4CF1-B91E-FC48AE652F35}.Debug|x64.Build.0 = Debug|Any CPU + {8743B2FC-5BC2-4CF1-B91E-FC48AE652F35}.Debug|x86.ActiveCfg = Debug|Any CPU + {8743B2FC-5BC2-4CF1-B91E-FC48AE652F35}.Debug|x86.Build.0 = Debug|Any CPU + {8743B2FC-5BC2-4CF1-B91E-FC48AE652F35}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8743B2FC-5BC2-4CF1-B91E-FC48AE652F35}.Release|Any CPU.Build.0 = Release|Any CPU + {8743B2FC-5BC2-4CF1-B91E-FC48AE652F35}.Release|x64.ActiveCfg = Release|Any CPU + {8743B2FC-5BC2-4CF1-B91E-FC48AE652F35}.Release|x64.Build.0 = Release|Any CPU + {8743B2FC-5BC2-4CF1-B91E-FC48AE652F35}.Release|x86.ActiveCfg = Release|Any CPU + {8743B2FC-5BC2-4CF1-B91E-FC48AE652F35}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE