Update testing dependencies

Fixes incompatibility with .NET 8 and references to obsolete .NET Core 3.1.
BluewireTechnologies · Dec 13, 2023 · d5de565 · d5de565
1 parent d709b47
commit d5de565
Show file tree

Hide file tree

Showing 25 changed files with 118 additions and 152 deletions.
diff --git a/...ire.Common.GitWrapper.IntegrationTests/Bluewire.Common.GitWrapper.IntegrationTests.csproj b/...ire.Common.GitWrapper.IntegrationTests/Bluewire.Common.GitWrapper.IntegrationTests.csproj
@@ -17,14 +17,15 @@
       <Version>2.0.12</Version>
     </PackageReference>
     <PackageReference Include="NUnit">
-      <Version>3.12.0</Version>
+      <Version>3.14.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit.ConsoleRunner">
-      <Version>3.10.0</Version>
+      <Version>3.16.3</Version>
     </PackageReference>
     <PackageReference Include="NUnit.Extension.TeamCityEventListener">
-      <Version>1.0.7</Version>
+      <Version>1.0.9</Version>
     </PackageReference>
   </ItemGroup>
+  <Import Project="Bluewire.Common.GitWrapper.IntegrationTests.targets" />
   <Import Project="..\StyleCopAnalyzers.props" />
 </Project>
diff --git a/...re.Common.GitWrapper.IntegrationTests/Bluewire.Common.GitWrapper.IntegrationTests.targets b/...re.Common.GitWrapper.IntegrationTests/Bluewire.Common.GitWrapper.IntegrationTests.targets
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>  
+  <!-- Force generation of binding redirects for library projects, ie. test projects. See https://github.com/microsoft/msbuild/issues/1310 -->
+  <Target Name="ForceGenerationOfBindingRedirects"
+          AfterTargets="ResolveAssemblyReferences"
+          BeforeTargets="GenerateBindingRedirects"
+          Condition="'$(AutoGenerateBindingRedirects)' == 'true'">
+    <PropertyGroup>
+      <!-- Needs to be set in a target because it has to be set after the initial evaluation in the MS common targets -->
+      <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    </PropertyGroup>
+  </Target>
+</Project>
diff --git a/Bluewire.Common.GitWrapper.IntegrationTests/app.config b/Bluewire.Common.GitWrapper.IntegrationTests/app.config
diff --git a/Bluewire.Common.GitWrapper.UnitTests/Bluewire.Common.GitWrapper.UnitTests.csproj b/Bluewire.Common.GitWrapper.UnitTests/Bluewire.Common.GitWrapper.UnitTests.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net48;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net48;net6</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="*.ncrunchproject" />
@@ -11,12 +11,12 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="NUnit">
-      <Version>3.12.0</Version>
+      <Version>3.14.0</Version>
     </PackageReference>
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.23" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.38" />
   </ItemGroup>
   <Import Project="..\StyleCopAnalyzers.props" />
 </Project>
diff --git a/Bluewire.Conventions.UnitTests/Bluewire.Conventions.UnitTests.csproj b/Bluewire.Conventions.UnitTests/Bluewire.Conventions.UnitTests.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net48;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net48;net6</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="*.ncrunchproject" />
@@ -14,12 +14,12 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="NUnit">
-      <Version>3.12.0</Version>
+      <Version>3.14.0</Version>
     </PackageReference>
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.23" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.38" />
   </ItemGroup>
   <Import Project="..\StyleCopAnalyzers.props" />
 </Project>
diff --git a/Bluewire.Stash.IntegrationTests/Bluewire.Stash.IntegrationTests.csproj b/Bluewire.Stash.IntegrationTests/Bluewire.Stash.IntegrationTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net48</TargetFrameworks>
@@ -9,15 +9,15 @@
     <PackageReference Include="Bluewire.Common.Console.NUnit3">
       <Version>9.2.2</Version>
     </PackageReference>
-    <PackageReference Include="Moq" Version="4.16.1" />
+    <PackageReference Include="Moq" Version="4.20.70" />
     <PackageReference Include="NUnit">
-      <Version>3.12.0</Version>
+      <Version>3.14.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit.ConsoleRunner">
-      <Version>3.10.0</Version>
+      <Version>3.16.3</Version>
     </PackageReference>
     <PackageReference Include="NUnit.Extension.TeamCityEventListener">
-      <Version>1.0.7</Version>
+      <Version>1.0.9</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.6.0" />
@@ -26,5 +26,6 @@
     <ProjectReference Include="..\Bluewire.Stash.Tool\Bluewire.Stash.Tool.csproj" />
     <ProjectReference Include="..\Bluewire.Stash\Bluewire.Stash.csproj" />
   </ItemGroup>
+  <Import Project="Bluewire.Stash.IntegrationTests.targets" />
   <Import Project="..\StyleCopAnalyzers.props" />
 </Project>
diff --git a/Bluewire.Stash.IntegrationTests/Bluewire.Stash.IntegrationTests.targets b/Bluewire.Stash.IntegrationTests/Bluewire.Stash.IntegrationTests.targets
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>  
+  <!-- Force generation of binding redirects for library projects, ie. test projects. See https://github.com/microsoft/msbuild/issues/1310 -->
+  <Target Name="ForceGenerationOfBindingRedirects"
+          AfterTargets="ResolveAssemblyReferences"
+          BeforeTargets="GenerateBindingRedirects"
+          Condition="'$(AutoGenerateBindingRedirects)' == 'true'">
+    <PropertyGroup>
+      <!-- Needs to be set in a target because it has to be set after the initial evaluation in the MS common targets -->
+      <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    </PropertyGroup>
+  </Target>
+</Project>
diff --git a/Bluewire.Stash.IntegrationTests/app.config b/Bluewire.Stash.IntegrationTests/app.config
diff --git a/Bluewire.Stash.Service/Bluewire.Stash.Service.csproj b/Bluewire.Stash.Service/Bluewire.Stash.Service.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
     <UserSecretsId>aspnet-Bluewire.Stash.Service-2D72830D-2586-4565-BBFB-4138BFEAB11C</UserSecretsId>
     <WebProject_DirectoryAccessLevelKey>0</WebProject_DirectoryAccessLevelKey>
     <Nullable>Enable</Nullable>

diff --git a/Bluewire.Stash.UnitTests/Bluewire.Stash.UnitTests.csproj b/Bluewire.Stash.UnitTests/Bluewire.Stash.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net48;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net48;net6</TargetFrameworks>
     <LangVersion>8.0</LangVersion>
     <Nullable>Enable</Nullable>
   </PropertyGroup>
@@ -12,12 +12,12 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="NUnit">
-      <Version>3.12.0</Version>
+      <Version>3.14.0</Version>
     </PackageReference>
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
-    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.23" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.38" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...Tools.GitRepository.IntegrationTests/Bluewire.Tools.GitRepository.IntegrationTests.csproj b/...Tools.GitRepository.IntegrationTests/Bluewire.Tools.GitRepository.IntegrationTests.csproj
@@ -19,8 +19,9 @@
       <Version>2.0.12</Version>
     </PackageReference>
     <PackageReference Include="NUnit">
-      <Version>3.12.0</Version>
+      <Version>3.14.0</Version>
     </PackageReference>
   </ItemGroup>
+  <Import Project="Bluewire.Tools.GitRepository.IntegrationTests.targets" />
   <Import Project="..\StyleCopAnalyzers.props" />
 </Project>
diff --git a/...ools.GitRepository.IntegrationTests/Bluewire.Tools.GitRepository.IntegrationTests.targets b/...ools.GitRepository.IntegrationTests/Bluewire.Tools.GitRepository.IntegrationTests.targets
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>  
+  <!-- Force generation of binding redirects for library projects, ie. test projects. See https://github.com/microsoft/msbuild/issues/1310 -->
+  <Target Name="ForceGenerationOfBindingRedirects"
+          AfterTargets="ResolveAssemblyReferences"
+          BeforeTargets="GenerateBindingRedirects"
+          Condition="'$(AutoGenerateBindingRedirects)' == 'true'">
+    <PropertyGroup>
+      <!-- Needs to be set in a target because it has to be set after the initial evaluation in the MS common targets -->
+      <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    </PropertyGroup>
+  </Target>
+</Project>
diff --git a/Bluewire.Tools.GitRepository.IntegrationTests/app.config b/Bluewire.Tools.GitRepository.IntegrationTests/app.config
diff --git a/Bluewire.Tools.Runner.IntegrationTests/Bluewire.Tools.Runner.IntegrationTests.csproj b/Bluewire.Tools.Runner.IntegrationTests/Bluewire.Tools.Runner.IntegrationTests.csproj
@@ -17,5 +17,6 @@
       <Version>9.2.2</Version>
     </PackageReference>
   </ItemGroup>
+  <Import Project="Bluewire.Tools.Runner.IntegrationTests.targets" />
   <Import Project="..\StyleCopAnalyzers.props" />
 </Project>
diff --git a/Bluewire.Tools.Runner.IntegrationTests/Bluewire.Tools.Runner.IntegrationTests.targets b/Bluewire.Tools.Runner.IntegrationTests/Bluewire.Tools.Runner.IntegrationTests.targets
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>  
+  <!-- Force generation of binding redirects for library projects, ie. test projects. See https://github.com/microsoft/msbuild/issues/1310 -->
+  <Target Name="ForceGenerationOfBindingRedirects"
+          AfterTargets="ResolveAssemblyReferences"
+          BeforeTargets="GenerateBindingRedirects"
+          Condition="'$(AutoGenerateBindingRedirects)' == 'true'">
+    <PropertyGroup>
+      <!-- Needs to be set in a target because it has to be set after the initial evaluation in the MS common targets -->
+      <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    </PropertyGroup>
+  </Target>
+</Project>
diff --git a/Bluewire.Tools.Runner.IntegrationTests/app.config b/Bluewire.Tools.Runner.IntegrationTests/app.config
diff --git a/CanaryBuilder.IntegrationTests/CanaryBuilder.IntegrationTests.csproj b/CanaryBuilder.IntegrationTests/CanaryBuilder.IntegrationTests.csproj
@@ -19,11 +19,12 @@
       <Version>2.0.12</Version>
     </PackageReference>
     <PackageReference Include="Moq">
-      <Version>4.13.1</Version>
+      <Version>4.20.70</Version>
     </PackageReference>
     <PackageReference Include="NUnit">
-      <Version>3.12.0</Version>
+      <Version>3.14.0</Version>
     </PackageReference>
   </ItemGroup>
+  <Import Project="CanaryBuilder.IntegrationTests.targets" />
   <Import Project="..\StyleCopAnalyzers.props" />
 </Project>
diff --git a/CanaryBuilder.IntegrationTests/CanaryBuilder.IntegrationTests.targets b/CanaryBuilder.IntegrationTests/CanaryBuilder.IntegrationTests.targets
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>  
+  <!-- Force generation of binding redirects for library projects, ie. test projects. See https://github.com/microsoft/msbuild/issues/1310 -->
+  <Target Name="ForceGenerationOfBindingRedirects"
+          AfterTargets="ResolveAssemblyReferences"
+          BeforeTargets="GenerateBindingRedirects"
+          Condition="'$(AutoGenerateBindingRedirects)' == 'true'">
+    <PropertyGroup>
+      <!-- Needs to be set in a target because it has to be set after the initial evaluation in the MS common targets -->
+      <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    </PropertyGroup>
+  </Target>
+</Project>
diff --git a/CanaryBuilder.IntegrationTests/app.config b/CanaryBuilder.IntegrationTests/app.config
diff --git a/CanaryBuilder.UnitTests/CanaryBuilder.UnitTests.csproj b/CanaryBuilder.UnitTests/CanaryBuilder.UnitTests.csproj
@@ -12,13 +12,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="NUnit">
-      <Version>3.12.0</Version>
+      <Version>3.14.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit.ConsoleRunner">
-      <Version>3.10.0</Version>
+      <Version>3.16.3</Version>
     </PackageReference>
     <PackageReference Include="NUnit.Extension.TeamCityEventListener">
-      <Version>1.0.7</Version>
+      <Version>1.0.9</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="..\StyleCopAnalyzers.props" />

diff --git a/CanaryBuilder/CanaryBuilder.csproj b/CanaryBuilder/CanaryBuilder.csproj
@@ -19,7 +19,7 @@
       <Version>2.0.12</Version>
     </PackageReference>
     <PackageReference Include="NUnit">
-      <Version>3.12.0</Version>
+      <Version>3.14.0</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="..\StyleCopAnalyzers.props" />

diff --git a/CanaryCollector.UnitTests/CanaryCollector.UnitTests.csproj b/CanaryCollector.UnitTests/CanaryCollector.UnitTests.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="NUnit">
-      <Version>3.12.0</Version>
+      <Version>3.14.0</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="..\StyleCopAnalyzers.props" />