Merge pull request #1501 from nunit/issue-1492

Eliminate .NET 6.0 build of the engine
nunit · Oct 20, 2024 · 4b99290 · 4b99290
2 parents e6ab451 + 89ec635
commit 4b99290
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 46 deletions.
diff --git a/NUnitConsole.sln b/NUnitConsole.sln
@@ -66,7 +66,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "runners", "runners", "{F3E8
 	ProjectSection(SolutionItems) = preProject
 		nuget\runners\DotnetToolSettings.xml = nuget\runners\DotnetToolSettings.xml
 		nuget\runners\nunit.console-runner-with-extensions.nuspec = nuget\runners\nunit.console-runner-with-extensions.nuspec
-		nuget\runners\nunit.console-runner.net80.nuspec = nuget\runners\nunit.console-runner.net80.nuspec
 		nuget\runners\nunit.console-runner.netcore.nuspec = nuget\runners\nunit.console-runner.netcore.nuspec
 		nuget\runners\nunit.console-runner.nuspec = nuget\runners\nunit.console-runner.nuspec
 		nuget\runners\nunit.console.nuget.addins = nuget\runners\nunit.console.nuget.addins

diff --git a/build.cake b/build.cake
@@ -92,25 +92,13 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
         checks: new PackageCheck[]
         { 
             HasFiles("nunit.exe"),
-            HasSomeDirectory(".store/nunit.consolerunner.netcore/**/tools/net6.0/any")
+            HasSomeDirectory(".store/nunit.consolerunner.netcore/**/tools/net8.0/any")
                 .WithFiles(ENGINE_FILES).AndFiles(ConsoleFiles).AndFile("Microsoft.Extensions.DependencyModel.dll")
         },
         testRunner: new ConsoleRunnerSelfTester(BuildSettings.NuGetTestDirectory
             + $"NUnit.ConsoleRunner.NetCore.{BuildSettings.PackageVersion}/nunit.exe"),
         tests: NetCoreRunnerTests),
 
-    NUnitConsoleRunnerNet80Package = new DotNetToolPackage(
-        id: "NUnit.ConsoleRunner.Net80",
-        source: BuildSettings.NuGetDirectory + "runners/nunit.console-runner.net80.nuspec",
-        checks: new PackageCheck[] { 
-            HasFiles("nunit-net80.exe"),
-            HasSomeDirectory(".store/nunit.consolerunner.net80/**/tools/net8.0/any")
-                .WithFiles(ENGINE_FILES).AndFiles(ConsoleFiles).AndFile("Microsoft.Extensions.DependencyModel.dll")
-        },
-        testRunner: new ConsoleRunnerSelfTester(BuildSettings.NuGetTestDirectory
-            + $"NUnit.ConsoleRunner.Net80.{BuildSettings.PackageVersion}/nunit-net80.exe"),
-        tests: NetCoreRunnerTests),
-
     NUnitConsoleRunnerChocolateyPackage = new ChocolateyPackage(
         id: "nunit-console-runner",
         source: BuildSettings.ChocolateyDirectory + "nunit-console-runner.nuspec",
@@ -159,11 +147,9 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
             HasFiles("LICENSE.txt", "NOTICES.txt"),
             HasDirectory("lib/net462").WithFiles(ENGINE_FILES),
             HasDirectory("lib/netstandard2.0").WithFiles(ENGINE_FILES),
-            HasDirectory("lib/net6.0").WithFiles(ENGINE_FILES).AndFile("Microsoft.Extensions.DependencyModel.dll"),
             HasDirectory("lib/net8.0").WithFiles(ENGINE_FILES).AndFile("Microsoft.Extensions.DependencyModel.dll"),
             HasDirectory("contentFiles/any/lib/net462").WithFile("nunit.engine.nuget.addins"),
             HasDirectory("contentFiles/any/lib/netstandard2.0").WithFile("nunit.engine.nuget.addins"),
-            HasDirectory("contentFiles/any/lib/net6.0").WithFile("nunit.engine.nuget.addins"),
             HasDirectory("contentFiles/any/lib/net8.0").WithFile("nunit.engine.nuget.addins"),
             HasDirectory("contentFiles/any/agents/net462").WithFiles(AGENT_FILES).AndFile("nunit.agent.addins")
         },

diff --git a/nuget/engine/nunit.engine.nuspec b/nuget/engine/nunit.engine.nuspec
@@ -80,16 +80,6 @@
     <file src="netstandard2.0/testcentric.engine.metadata.dll" target="lib/netstandard2.0" />
     <file src="../../nuget/engine/nunit.engine.nuget.addins" target="contentFiles/any/lib/netstandard2.0"/>
 
-    <file src="net6.0/nunit.engine.dll" target="lib/net6.0" />
-    <file src="net6.0/nunit.engine.pdb" target="lib/net6.0" />
-    <file src="net6.0/nunit.engine.core.dll" target="lib/net6.0" />
-    <file src="net6.0/nunit.engine.core.pdb" target="lib/net6.0" />
-    <file src="net6.0/nunit.engine.api.dll" target="lib/net6.0" />
-    <file src="net6.0/nunit.engine.api.pdb" target="lib/net6.0" />
-    <file src="net6.0/testcentric.engine.metadata.dll" target="lib/net6.0" />
-    <file src="net6.0/Microsoft.Extensions.DependencyModel.dll" target="lib/net6.0" />
-    <file src="../../nuget/engine/nunit.engine.nuget.addins" target="contentFiles/any/lib/net6.0"/>
-
     <file src="net8.0/nunit.engine.dll" target="lib/net8.0" />
     <file src="net8.0/nunit.engine.pdb" target="lib/net8.0" />
     <file src="net8.0/nunit.engine.core.dll" target="lib/net8.0" />

diff --git a/nuget/runners/nunit.console-runner.netcore.nuspec b/nuget/runners/nunit.console-runner.netcore.nuspec
@@ -29,24 +29,24 @@
   <files>
     <file src="../../LICENSE.txt" />
     <file src="../../NOTICES.txt" />
-    
-    <file src="net6.0/nunit3-console.exe" target="tools/net6.0/any" />
-    <file src="net6.0/nunit3-console.pdb" target="tools/net6.0/any" />
-    <file src="net6.0/nunit3-console.dll" target="tools/net6.0/any" />
-    <file src="net6.0/nunit3-console.dll.config" target="tools/net6.0/any" />
-    <file src="net6.0/nunit3-console.deps.json" target="tools/net6.0/any" />
-    <file src="net6.0/nunit3-console.runtimeconfig.json" target="tools/net6.0/any" />
-    <file src="net6.0/nunit.engine.core.dll" target="tools/net6.0/any" />
-    <file src="net6.0/nunit.engine.core.pdb" target="tools/net6.0/any" />
-    <file src="net6.0/nunit.engine.dll" target="tools/net6.0/any" />
-    <file src="net6.0/nunit.engine.pdb" target="tools/net6.0/any" />
-    <file src="net6.0/nunit.engine.api.dll" target="tools/net6.0/any" />
-    <file src="net6.0/nunit.engine.api.pdb" target="tools/net6.0/any" />
-    <file src="net6.0/nunit.engine.api.xml" target="tools/net6.0/any" />
-    <file src="net6.0/testcentric.engine.metadata.dll" target="tools/net6.0/any" />
-    <file src="net6.0/Microsoft.Extensions.DependencyModel.dll" target="tools/net6.0/any" />
-    <file src="../../nuget/runners/nunit.console.nuget.addins" target="tools/net6.0/any"/>
-    <file src="../../nuget/runners/DotnetToolSettings.xml" target="tools/net6.0/any"/>
+
+    <file src="net8.0/nunit3-console.exe" target="tools/net8.0/any" />
+    <file src="net8.0/nunit3-console.pdb" target="tools/net8.0/any" />
+    <file src="net8.0/nunit3-console.dll" target="tools/net8.0/any" />
+    <file src="net8.0/nunit3-console.dll.config" target="tools/net8.0/any" />
+    <file src="net8.0/nunit3-console.deps.json" target="tools/net8.0/any" />
+    <file src="net8.0/nunit3-console.runtimeconfig.json" target="tools/net8.0/any" />
+    <file src="net8.0/nunit.engine.core.dll" target="tools/net8.0/any" />
+    <file src="net8.0/nunit.engine.core.pdb" target="tools/net8.0/any" />
+    <file src="net8.0/nunit.engine.dll" target="tools/net8.0/any" />
+    <file src="net8.0/nunit.engine.pdb" target="tools/net8.0/any" />
+    <file src="net8.0/nunit.engine.api.dll" target="tools/net8.0/any" />
+    <file src="net8.0/nunit.engine.api.pdb" target="tools/net8.0/any" />
+    <file src="net8.0/nunit.engine.api.xml" target="tools/net8.0/any" />
+    <file src="net8.0/testcentric.engine.metadata.dll" target="tools/net8.0/any" />
+    <file src="net8.0/Microsoft.Extensions.DependencyModel.dll" target="tools/net8.0/any" />
+    <file src="../../nuget/runners/nunit.console.nuget.addins" target="tools/net8.0/any"/>
+    <file src="../../nuget/runners/DotnetToolSettings.xml" target="tools/net8.0/any"/>
 
     <file src="../../nunit_256.png" target="images"/>
   </files>

diff --git a/src/NUnitEngine/nunit.engine.tests/nunit.engine.tests.csproj b/src/NUnitEngine/nunit.engine.tests/nunit.engine.tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <RootNamespace>NUnit.Engine.Tests</RootNamespace>
-    <TargetFrameworks>net462;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net462;netcoreapp3.1;net8.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\nunit.snk</AssemblyOriginatorKeyFile>

diff --git a/src/NUnitEngine/nunit.engine/nunit.engine.csproj b/src/NUnitEngine/nunit.engine/nunit.engine.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <RootNamespace>NUnit.Engine</RootNamespace>
-    <TargetFrameworks>net462;netstandard2.0;net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net462;netstandard2.0;net8.0</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\nunit.snk</AssemblyOriginatorKeyFile>
     <DebugType>portable</DebugType>