centralizing package versions, updating test deps

Xcaciv · Apr 24, 2024 · 82751e5 · 82751e5
1 parent 464e921
commit 82751e5
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 33 deletions.
diff --git a/src/Xcaciv.Loader/Directory.Packages.props b/src/Xcaciv.Loader/Directory.Packages.props
@@ -0,0 +1,17 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <!-- Applicaiton Versions -->
+  <ItemGroup>
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
+  </ItemGroup>
+  <!-- Unit Test Versions -->
+  <ItemGroup>
+    <PackageVersion Include="Fastenshtein" Version="1.0.0.8" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.2" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageVersion Include="xunit" Version="2.7.1" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.8" />
+  </ItemGroup>
+</Project>
diff --git a/src/Xcaciv.Loader/Xcaciv.Loader.sln b/src/Xcaciv.Loader/Xcaciv.Loader.sln
@@ -4,12 +4,6 @@ VisualStudioVersion = 17.0.31919.166
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xcaciv.Loader", "Xcaciv.Loader\Xcaciv.Loader.csproj", "{741E8D5A-2AEE-42F3-92B1-55BC0DF635A3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xcaciv.LoaderTests", "Xcaciv.LoaderTests\Xcaciv.LoaderTests.csproj", "{16C1DC13-1977-406E-A7A1-A7E8A52D8923}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9A5D89B5-D5B1-4A6A-96E4-29E3CAD435AD} = {9A5D89B5-D5B1-4A6A-96E4-29E3CAD435AD}
-		{81C6E4EE-E3BC-4982-94AC-DEC266530E09} = {81C6E4EE-E3BC-4982-94AC-DEC266530E09}
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "zTestAssembly", "TestAssembly\zTestAssembly.csproj", "{9A5D89B5-D5B1-4A6A-96E4-29E3CAD435AD}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "zTestInterfaces", "zTestInterfaces\zTestInterfaces.csproj", "{47DF3C90-291B-4BA9-BD60-93E96FA4C05B}"
@@ -19,6 +13,11 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{32657B9A-1435-43F3-BA24-B1878D8CC0B0}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{583D1946-4389-48A2-A558-E81E1F8D41D4}"
+	ProjectSection(SolutionItems) = preProject
+		Directory.Packages.props = Directory.Packages.props
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xcaciv.LoaderTests", "Xcaciv.LoaderTests\Xcaciv.LoaderTests.csproj", "{E61399D8-2419-4CD1-86BF-C3E039C8FCB4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -30,10 +29,6 @@ Global
 		{741E8D5A-2AEE-42F3-92B1-55BC0DF635A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{741E8D5A-2AEE-42F3-92B1-55BC0DF635A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{741E8D5A-2AEE-42F3-92B1-55BC0DF635A3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{16C1DC13-1977-406E-A7A1-A7E8A52D8923}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{16C1DC13-1977-406E-A7A1-A7E8A52D8923}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16C1DC13-1977-406E-A7A1-A7E8A52D8923}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{16C1DC13-1977-406E-A7A1-A7E8A52D8923}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9A5D89B5-D5B1-4A6A-96E4-29E3CAD435AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9A5D89B5-D5B1-4A6A-96E4-29E3CAD435AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9A5D89B5-D5B1-4A6A-96E4-29E3CAD435AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -46,15 +41,19 @@ Global
 		{81C6E4EE-E3BC-4982-94AC-DEC266530E09}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{81C6E4EE-E3BC-4982-94AC-DEC266530E09}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{81C6E4EE-E3BC-4982-94AC-DEC266530E09}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E61399D8-2419-4CD1-86BF-C3E039C8FCB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E61399D8-2419-4CD1-86BF-C3E039C8FCB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E61399D8-2419-4CD1-86BF-C3E039C8FCB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E61399D8-2419-4CD1-86BF-C3E039C8FCB4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{16C1DC13-1977-406E-A7A1-A7E8A52D8923} = {32657B9A-1435-43F3-BA24-B1878D8CC0B0}
 		{9A5D89B5-D5B1-4A6A-96E4-29E3CAD435AD} = {32657B9A-1435-43F3-BA24-B1878D8CC0B0}
 		{47DF3C90-291B-4BA9-BD60-93E96FA4C05B} = {32657B9A-1435-43F3-BA24-B1878D8CC0B0}
 		{81C6E4EE-E3BC-4982-94AC-DEC266530E09} = {32657B9A-1435-43F3-BA24-B1878D8CC0B0}
+		{E61399D8-2419-4CD1-86BF-C3E039C8FCB4} = {32657B9A-1435-43F3-BA24-B1878D8CC0B0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D3A16683-730F-4EEF-B8D1-22F5D5FA8FA9}

diff --git a/src/Xcaciv.Loader/Xcaciv.LoaderTests/AssemblyContextTests.cs b/src/Xcaciv.Loader/Xcaciv.LoaderTests/AssemblyContextTests.cs
@@ -5,7 +5,6 @@
 using System.Text;
 using System.Threading.Tasks;
 using zTestInterfaces;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Xunit.Abstractions;
 
 namespace Xcaciv.Loader.Tests

diff --git a/src/Xcaciv.Loader/Xcaciv.LoaderTests/Xcaciv.LoaderTests.csproj b/src/Xcaciv.Loader/Xcaciv.LoaderTests/Xcaciv.LoaderTests.csproj
@@ -1,21 +1,29 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <IsPackable>false</IsPackable>
-    <AssemblyName>Xc.LoaderTests</AssemblyName>
-    <RootNamespace>Xc.LoaderTests</RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
-    <PackageReference Include="coverlet.collector" Version="3.1.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Xcaciv.Loader\Xcaciv.Loader.csproj" />
-    <ProjectReference Include="..\zTestInterfaces\zTestInterfaces.csproj" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+
+    <AssemblyName>Xc.LoaderTests</AssemblyName>
+    <RootNamespace>Xc.LoaderTests</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+	  <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="coverlet.collector">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Xcaciv.Loader\Xcaciv.Loader.csproj" />
+    <ProjectReference Include="..\zTestInterfaces\zTestInterfaces.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/src/Xcaciv.Loader/zTestDependentAssembly/zTestDependentAssembly.csproj b/src/Xcaciv.Loader/zTestDependentAssembly/zTestDependentAssembly.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>zTestDependentAssembly</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Fastenshtein" Version="1.0.0.8" />
+    <PackageReference Include="Fastenshtein"/>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\zTestInterfaces\zTestInterfaces.csproj" />