diff --git a/NUnitConsole.sln b/NUnitConsole.sln index 5a33c0c61..ca1fc006d 100644 --- 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 index 5a5707155..288c9877e 100644 --- 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 index 83f60a5cb..743232e34 100644 --- a/nuget/engine/nunit.engine.nuspec +++ b/nuget/engine/nunit.engine.nuspec @@ -80,16 +80,6 @@ - - - - - - - - - - diff --git a/nuget/runners/nunit.console-runner.netcore.nuspec b/nuget/runners/nunit.console-runner.netcore.nuspec index e297d4524..a2005cdec 100644 --- a/nuget/runners/nunit.console-runner.netcore.nuspec +++ b/nuget/runners/nunit.console-runner.netcore.nuspec @@ -29,24 +29,24 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/src/NUnitEngine/nunit.engine.tests/nunit.engine.tests.csproj b/src/NUnitEngine/nunit.engine.tests/nunit.engine.tests.csproj index 3398bbcd8..35822ea83 100644 --- a/src/NUnitEngine/nunit.engine.tests/nunit.engine.tests.csproj +++ b/src/NUnitEngine/nunit.engine.tests/nunit.engine.tests.csproj @@ -2,7 +2,7 @@ NUnit.Engine.Tests - net462;netcoreapp3.1;net6.0;net8.0 + net462;netcoreapp3.1;net8.0 Exe true ..\..\nunit.snk diff --git a/src/NUnitEngine/nunit.engine/nunit.engine.csproj b/src/NUnitEngine/nunit.engine/nunit.engine.csproj index 040bd46fe..1db72dfa5 100644 --- a/src/NUnitEngine/nunit.engine/nunit.engine.csproj +++ b/src/NUnitEngine/nunit.engine/nunit.engine.csproj @@ -2,7 +2,7 @@ NUnit.Engine - net462;netstandard2.0;net6.0;net8.0 + net462;netstandard2.0;net8.0 true ..\..\nunit.snk portable