Skip to content

Commit 4b99290

Browse files
CharliePooleCharliePoole
authored
Merge pull request #1501 from nunit/issue-1492
Eliminate .NET 6.0 build of the engine
2 parents e6ab451 + 89ec635 commit 4b99290

File tree

6 files changed

+21
-46
lines changed

6 files changed

+21
-46
lines changed

‎NUnitConsole.sln

-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "runners", "runners", "{F3E8
6666
ProjectSection(SolutionItems) = preProject
6767
nuget\runners\DotnetToolSettings.xml = nuget\runners\DotnetToolSettings.xml
6868
nuget\runners\nunit.console-runner-with-extensions.nuspec = nuget\runners\nunit.console-runner-with-extensions.nuspec
69-
nuget\runners\nunit.console-runner.net80.nuspec = nuget\runners\nunit.console-runner.net80.nuspec
7069
nuget\runners\nunit.console-runner.netcore.nuspec = nuget\runners\nunit.console-runner.netcore.nuspec
7170
nuget\runners\nunit.console-runner.nuspec = nuget\runners\nunit.console-runner.nuspec
7271
nuget\runners\nunit.console.nuget.addins = nuget\runners\nunit.console.nuget.addins

‎build.cake

+1-15
Original file line numberDiff line numberDiff line change
@@ -92,25 +92,13 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
9292
checks: new PackageCheck[]
9393
{
9494
HasFiles("nunit.exe"),
95-
HasSomeDirectory(".store/nunit.consolerunner.netcore/**/tools/net6.0/any")
95+
HasSomeDirectory(".store/nunit.consolerunner.netcore/**/tools/net8.0/any")
9696
.WithFiles(ENGINE_FILES).AndFiles(ConsoleFiles).AndFile("Microsoft.Extensions.DependencyModel.dll")
9797
},
9898
testRunner: new ConsoleRunnerSelfTester(BuildSettings.NuGetTestDirectory
9999
+ $"NUnit.ConsoleRunner.NetCore.{BuildSettings.PackageVersion}/nunit.exe"),
100100
tests: NetCoreRunnerTests),
101101

102-
NUnitConsoleRunnerNet80Package = new DotNetToolPackage(
103-
id: "NUnit.ConsoleRunner.Net80",
104-
source: BuildSettings.NuGetDirectory + "runners/nunit.console-runner.net80.nuspec",
105-
checks: new PackageCheck[] {
106-
HasFiles("nunit-net80.exe"),
107-
HasSomeDirectory(".store/nunit.consolerunner.net80/**/tools/net8.0/any")
108-
.WithFiles(ENGINE_FILES).AndFiles(ConsoleFiles).AndFile("Microsoft.Extensions.DependencyModel.dll")
109-
},
110-
testRunner: new ConsoleRunnerSelfTester(BuildSettings.NuGetTestDirectory
111-
+ $"NUnit.ConsoleRunner.Net80.{BuildSettings.PackageVersion}/nunit-net80.exe"),
112-
tests: NetCoreRunnerTests),
113-
114102
NUnitConsoleRunnerChocolateyPackage = new ChocolateyPackage(
115103
id: "nunit-console-runner",
116104
source: BuildSettings.ChocolateyDirectory + "nunit-console-runner.nuspec",
@@ -159,11 +147,9 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
159147
HasFiles("LICENSE.txt", "NOTICES.txt"),
160148
HasDirectory("lib/net462").WithFiles(ENGINE_FILES),
161149
HasDirectory("lib/netstandard2.0").WithFiles(ENGINE_FILES),
162-
HasDirectory("lib/net6.0").WithFiles(ENGINE_FILES).AndFile("Microsoft.Extensions.DependencyModel.dll"),
163150
HasDirectory("lib/net8.0").WithFiles(ENGINE_FILES).AndFile("Microsoft.Extensions.DependencyModel.dll"),
164151
HasDirectory("contentFiles/any/lib/net462").WithFile("nunit.engine.nuget.addins"),
165152
HasDirectory("contentFiles/any/lib/netstandard2.0").WithFile("nunit.engine.nuget.addins"),
166-
HasDirectory("contentFiles/any/lib/net6.0").WithFile("nunit.engine.nuget.addins"),
167153
HasDirectory("contentFiles/any/lib/net8.0").WithFile("nunit.engine.nuget.addins"),
168154
HasDirectory("contentFiles/any/agents/net462").WithFiles(AGENT_FILES).AndFile("nunit.agent.addins")
169155
},

‎nuget/engine/nunit.engine.nuspec

-10
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,6 @@
8080
<file src="netstandard2.0/testcentric.engine.metadata.dll" target="lib/netstandard2.0" />
8181
<file src="../../nuget/engine/nunit.engine.nuget.addins" target="contentFiles/any/lib/netstandard2.0"/>
8282

83-
<file src="net6.0/nunit.engine.dll" target="lib/net6.0" />
84-
<file src="net6.0/nunit.engine.pdb" target="lib/net6.0" />
85-
<file src="net6.0/nunit.engine.core.dll" target="lib/net6.0" />
86-
<file src="net6.0/nunit.engine.core.pdb" target="lib/net6.0" />
87-
<file src="net6.0/nunit.engine.api.dll" target="lib/net6.0" />
88-
<file src="net6.0/nunit.engine.api.pdb" target="lib/net6.0" />
89-
<file src="net6.0/testcentric.engine.metadata.dll" target="lib/net6.0" />
90-
<file src="net6.0/Microsoft.Extensions.DependencyModel.dll" target="lib/net6.0" />
91-
<file src="../../nuget/engine/nunit.engine.nuget.addins" target="contentFiles/any/lib/net6.0"/>
92-
9383
<file src="net8.0/nunit.engine.dll" target="lib/net8.0" />
9484
<file src="net8.0/nunit.engine.pdb" target="lib/net8.0" />
9585
<file src="net8.0/nunit.engine.core.dll" target="lib/net8.0" />

‎nuget/runners/nunit.console-runner.netcore.nuspec

+18-18
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,24 @@
2929
<files>
3030
<file src="../../LICENSE.txt" />
3131
<file src="../../NOTICES.txt" />
32-
33-
<file src="net6.0/nunit3-console.exe" target="tools/net6.0/any" />
34-
<file src="net6.0/nunit3-console.pdb" target="tools/net6.0/any" />
35-
<file src="net6.0/nunit3-console.dll" target="tools/net6.0/any" />
36-
<file src="net6.0/nunit3-console.dll.config" target="tools/net6.0/any" />
37-
<file src="net6.0/nunit3-console.deps.json" target="tools/net6.0/any" />
38-
<file src="net6.0/nunit3-console.runtimeconfig.json" target="tools/net6.0/any" />
39-
<file src="net6.0/nunit.engine.core.dll" target="tools/net6.0/any" />
40-
<file src="net6.0/nunit.engine.core.pdb" target="tools/net6.0/any" />
41-
<file src="net6.0/nunit.engine.dll" target="tools/net6.0/any" />
42-
<file src="net6.0/nunit.engine.pdb" target="tools/net6.0/any" />
43-
<file src="net6.0/nunit.engine.api.dll" target="tools/net6.0/any" />
44-
<file src="net6.0/nunit.engine.api.pdb" target="tools/net6.0/any" />
45-
<file src="net6.0/nunit.engine.api.xml" target="tools/net6.0/any" />
46-
<file src="net6.0/testcentric.engine.metadata.dll" target="tools/net6.0/any" />
47-
<file src="net6.0/Microsoft.Extensions.DependencyModel.dll" target="tools/net6.0/any" />
48-
<file src="../../nuget/runners/nunit.console.nuget.addins" target="tools/net6.0/any"/>
49-
<file src="../../nuget/runners/DotnetToolSettings.xml" target="tools/net6.0/any"/>
32+
33+
<file src="net8.0/nunit3-console.exe" target="tools/net8.0/any" />
34+
<file src="net8.0/nunit3-console.pdb" target="tools/net8.0/any" />
35+
<file src="net8.0/nunit3-console.dll" target="tools/net8.0/any" />
36+
<file src="net8.0/nunit3-console.dll.config" target="tools/net8.0/any" />
37+
<file src="net8.0/nunit3-console.deps.json" target="tools/net8.0/any" />
38+
<file src="net8.0/nunit3-console.runtimeconfig.json" target="tools/net8.0/any" />
39+
<file src="net8.0/nunit.engine.core.dll" target="tools/net8.0/any" />
40+
<file src="net8.0/nunit.engine.core.pdb" target="tools/net8.0/any" />
41+
<file src="net8.0/nunit.engine.dll" target="tools/net8.0/any" />
42+
<file src="net8.0/nunit.engine.pdb" target="tools/net8.0/any" />
43+
<file src="net8.0/nunit.engine.api.dll" target="tools/net8.0/any" />
44+
<file src="net8.0/nunit.engine.api.pdb" target="tools/net8.0/any" />
45+
<file src="net8.0/nunit.engine.api.xml" target="tools/net8.0/any" />
46+
<file src="net8.0/testcentric.engine.metadata.dll" target="tools/net8.0/any" />
47+
<file src="net8.0/Microsoft.Extensions.DependencyModel.dll" target="tools/net8.0/any" />
48+
<file src="../../nuget/runners/nunit.console.nuget.addins" target="tools/net8.0/any"/>
49+
<file src="../../nuget/runners/DotnetToolSettings.xml" target="tools/net8.0/any"/>
5050

5151
<file src="../../nunit_256.png" target="images"/>
5252
</files>

‎src/NUnitEngine/nunit.engine.tests/nunit.engine.tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<RootNamespace>NUnit.Engine.Tests</RootNamespace>
5-
<TargetFrameworks>net462;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
5+
<TargetFrameworks>net462;netcoreapp3.1;net8.0</TargetFrameworks>
66
<OutputType>Exe</OutputType>
77
<SignAssembly>true</SignAssembly>
88
<AssemblyOriginatorKeyFile>..\..\nunit.snk</AssemblyOriginatorKeyFile>

‎src/NUnitEngine/nunit.engine/nunit.engine.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<RootNamespace>NUnit.Engine</RootNamespace>
5-
<TargetFrameworks>net462;netstandard2.0;net6.0;net8.0</TargetFrameworks>
5+
<TargetFrameworks>net462;netstandard2.0;net8.0</TargetFrameworks>
66
<SignAssembly>true</SignAssembly>
77
<AssemblyOriginatorKeyFile>..\..\nunit.snk</AssemblyOriginatorKeyFile>
88
<DebugType>portable</DebugType>

0 commit comments

Comments
 (0)