diff --git a/NUnitConsole.sln b/NUnitConsole.sln index 42dde2e20..dd041f3e7 100644 --- a/NUnitConsole.sln +++ b/NUnitConsole.sln @@ -31,6 +31,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution package-checks.cake = package-checks.cake package-tests.cake = package-tests.cake packages.cake = packages.cake + PLATFORM_SUPPORT.md = PLATFORM_SUPPORT.md README.md = README.md test-results.cake = test-results.cake VERSIONING.md = VERSIONING.md diff --git a/PLATFORM_SUPPORT.md b/PLATFORM_SUPPORT.md index 178b29fb2..18c2b8362 100644 --- a/PLATFORM_SUPPORT.md +++ b/PLATFORM_SUPPORT.md @@ -15,11 +15,9 @@ runtime available. ## Agents Provided -We currently supply a fairly large selection of agents with the console runner: -* .NET Framework 2.0 +We currently (July 3, 2024) supply the following agents with the console runner: * .NET Framework 4.6.2 * ,NET Core 3.1 -* .NET 5.0 * .NET 6.0 * .NET 7.0 * .NET 8.0 (coming in version 3.18.0) @@ -33,10 +31,10 @@ dates listed in the following table. | Runtime | Microsoft
End of Support | Agent Retirement | Notes | | -------------------- | --------------- | --------------------- | --- | -| .NET Framework 2.0 | July, 2011 | July, 2024 | Will be removed in version 3.18.0 +| .NET Framework 2.0 | July, 2011 | July, 2024 | Removed in version 3.18.0 | .NET Framework 4.6.2 | January, 2027 | after July, 2027 | May be upgraded to 4.8.1 before retirement date | | .NET Core 3.1 | December, 2022 | after December, 2024 | -| .NET 5.0 | May, 2022 | July, 2024 | Will be removed in version 3.18.0 +| .NET 5.0 | May, 2022 | July, 2024 | Removed in version 3.18.0 | .NET 6.0 | November, 2024 | after May, 2025 | | .NET 7.0 | May, 2024 | after November, 2024 | | .NET 8.0 | November, 2027 | after May, 2027 | diff --git a/build.cake b/build.cake index 0abb5989b..824b230ce 100644 --- a/build.cake +++ b/build.cake @@ -22,11 +22,10 @@ BuildSettings.Initialize( Net462X86Test, Net462PlusNet462Test, NetCore31Test, - Net50Test, Net60Test, Net70Test, Net80Test, - Net50PlusNet60Test, + Net60PlusNet80Test, Net462PlusNet60Test, NUnitProjectTest }; @@ -35,7 +34,6 @@ BuildSettings.Initialize( var NetCoreRunnerTests = new List { NetCore31Test, - Net50Test, Net60Test, Net70Test, Net80Test, @@ -52,7 +50,6 @@ BuildSettings.Initialize( if (!BuildSystem.IsRunningOnAppVeyor) { StandardRunnerTests.Add(NetCore31X86Test); - StandardRunnerTests.Add(Net50X86Test); StandardRunnerTests.Add(Net70X86Test); StandardRunnerTests.Add(Net80X86Test); } @@ -149,18 +146,6 @@ static PackageTest Net60X86Test = new PackageTest( "net6.0/mock-assembly-x86.dll", MockAssemblyX86ExpectedResult("netcore-6.0")); -static PackageTest Net50Test = new PackageTest( - 1, "Net50Test", - "Run mock-assembly.dll under .NET 5.0", - "net5.0/mock-assembly.dll", - MockAssemblyExpectedResult("netcore-5.0")); - -static PackageTest Net50X86Test = new PackageTest( - 1, "Net50X86Test", - "Run mock-assembly-x86.dll under .NET 5.0", - "net5.0/mock-assembly-x86.dll", - MockAssemblyX86ExpectedResult("netcore-5.0")); - static PackageTest NetCore31Test = new PackageTest( 1, "NetCore31Test", "Run mock-assembly.dll under .NET Core 3.1", @@ -173,11 +158,11 @@ static PackageTest NetCore31X86Test = new PackageTest( "netcoreapp3.1/mock-assembly-x86.dll", MockAssemblyX86ExpectedResult("netcore-3.1")); -static PackageTest Net50PlusNet60Test = new PackageTest( - 1, "Net50PlusNet60Test", - "Run mock-assembly under .NET 5.0 and 6.0 together", - "net5.0/mock-assembly.dll net6.0/mock-assembly.dll",//" net7.0/mock-assembly.dll net8.0/mock-assembly.dll", - MockAssemblyExpectedResult("netcore-5.0", "netcore-6.0")); +static PackageTest Net60PlusNet80Test = new PackageTest( + 1, "Net60PlusNet80Test", + "Run mock-assembly under .NET6.0 and 8.0 together", + "net6.0/mock-assembly.dll net8.0/mock-assembly.dll", + MockAssemblyExpectedResult("netcore-6.0", "netcore-8.0")); static PackageTest Net462PlusNet60Test = new PackageTest( 1, "Net462PlusNet60Test", @@ -244,7 +229,6 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] { HasDirectory("tools").WithFiles(CONSOLE_FILES).AndFiles(ENGINE_FILES).AndFile("nunit.console.nuget.addins"), HasDirectory("tools/agents/net462").WithFiles(AGENT_FILES).AndFile("nunit.console.nuget.agent.addins"), HasDirectory("tools/agents/netcoreapp3.1").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.console.nuget.agent.addins"), - HasDirectory("tools/agents/net5.0").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.console.nuget.agent.addins"), HasDirectory("tools/agents/net6.0").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.console.nuget.agent.addins"), HasDirectory("tools/agents/net7.0").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.console.nuget.agent.addins"), HasDirectory("tools/agents/net8.0").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.console.nuget.agent.addins") @@ -253,7 +237,6 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] { HasDirectory("tools").WithFiles(ENGINE_PDB_FILES).AndFile("nunit3-console.pdb"), HasDirectory("tools/agents/net462").WithFiles(AGENT_PDB_FILES), HasDirectory("tools/agents/netcoreapp3.1").WithFiles(AGENT_PDB_FILES_NETCORE), - HasDirectory("tools/agents/net5.0").WithFiles(AGENT_PDB_FILES_NETCORE), HasDirectory("tools/agents/net6.0").WithFiles(AGENT_PDB_FILES_NETCORE), HasDirectory("tools/agents/net7.0").WithFiles(AGENT_PDB_FILES_NETCORE), HasDirectory("tools/agents/net8.0").WithFiles(AGENT_PDB_FILES_NETCORE) @@ -303,7 +286,6 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] { HasDirectory("tools").WithFiles("LICENSE.txt", "NOTICES.txt", "VERIFICATION.txt").AndFiles(CONSOLE_FILES).AndFiles(ENGINE_FILES).AndFile("nunit.console.choco.addins"), HasDirectory("tools/agents/net462").WithFiles(AGENT_FILES).AndFile("nunit.console.choco.agent.addins"), HasDirectory("tools/agents/netcoreapp3.1").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.console.choco.agent.addins"), - HasDirectory("tools/agents/net5.0").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.console.choco.agent.addins"), HasDirectory("tools/agents/net6.0").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.console.choco.agent.addins"), HasDirectory("tools/agents/net7.0").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.console.choco.agent.addins"), HasDirectory("tools/agents/net8.0").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.console.choco.agent.addins") @@ -321,7 +303,6 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] { HasDirectory("bin/netstandard2.0").WithFiles(ENGINE_FILES).AndFiles(ENGINE_PDB_FILES), HasDirectory("bin/netcoreapp3.1").WithFiles(ENGINE_CORE_FILES).AndFiles(ENGINE_CORE_PDB_FILES), HasDirectory("bin/agents/net462").WithFiles(AGENT_FILES).AndFiles(AGENT_PDB_FILES), - HasDirectory("bin/agents/net5.0").WithFiles(AGENT_FILES_NETCORE).AndFiles(AGENT_PDB_FILES_NETCORE), HasDirectory("bin/agents/net6.0").WithFiles(AGENT_FILES_NETCORE).AndFiles(AGENT_PDB_FILES_NETCORE), HasDirectory("bin/agents/net7.0").WithFiles(AGENT_FILES_NETCORE).AndFiles(AGENT_PDB_FILES_NETCORE), HasDirectory("bin/agents/net8.0").WithFiles(AGENT_FILES_NETCORE).AndFiles(AGENT_PDB_FILES_NETCORE) diff --git a/choco/nunit-console-runner.nuspec b/choco/nunit-console-runner.nuspec index 9135e20b2..a1c687367 100644 --- a/choco/nunit-console-runner.nuspec +++ b/choco/nunit-console-runner.nuspec @@ -62,17 +62,6 @@ - - - - - - - - - - - diff --git a/nuget/runners/nunit.console-runner.nuspec b/nuget/runners/nunit.console-runner.nuspec index d2398b32f..343dc1c81 100644 --- a/nuget/runners/nunit.console-runner.nuspec +++ b/nuget/runners/nunit.console-runner.nuspec @@ -55,20 +55,6 @@ - - - - - - - - - - - - - - diff --git a/src/NUnitEngine/mock-assembly-x86/mock-assembly-x86.csproj b/src/NUnitEngine/mock-assembly-x86/mock-assembly-x86.csproj index e91f3dd71..62f67b383 100644 --- a/src/NUnitEngine/mock-assembly-x86/mock-assembly-x86.csproj +++ b/src/NUnitEngine/mock-assembly-x86/mock-assembly-x86.csproj @@ -2,7 +2,7 @@ NUnit.Tests - net462;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0 + net462;netcoreapp3.1;net6.0;net7.0;net8.0 true ..\..\nunit.snk x86 diff --git a/src/NUnitEngine/mock-assembly/mock-assembly.csproj b/src/NUnitEngine/mock-assembly/mock-assembly.csproj index 8dbee8fa4..a9e9578df 100644 --- a/src/NUnitEngine/mock-assembly/mock-assembly.csproj +++ b/src/NUnitEngine/mock-assembly/mock-assembly.csproj @@ -2,7 +2,7 @@ NUnit.Tests - net462;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0 + net462;netcoreapp3.1;net6.0;net7.0;net8.0 true ..\..\nunit.snk false diff --git a/src/NUnitEngine/nunit-agent/nunit-agent.csproj b/src/NUnitEngine/nunit-agent/nunit-agent.csproj index 2953aa24a..71e07baa5 100644 --- a/src/NUnitEngine/nunit-agent/nunit-agent.csproj +++ b/src/NUnitEngine/nunit-agent/nunit-agent.csproj @@ -3,7 +3,7 @@ Exe nunit.agent - net462;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0 + net462;netcoreapp3.1;net6.0;net7.0;net8.0 app.manifest ..\..\..\nunit.ico false diff --git a/src/NUnitEngine/nunit.engine.core.tests/nunit.engine.core.tests.csproj b/src/NUnitEngine/nunit.engine.core.tests/nunit.engine.core.tests.csproj index 2a296dbc0..66047d496 100644 --- a/src/NUnitEngine/nunit.engine.core.tests/nunit.engine.core.tests.csproj +++ b/src/NUnitEngine/nunit.engine.core.tests/nunit.engine.core.tests.csproj @@ -2,7 +2,7 @@ NUnit.Engine.Core.Tests - net462;netcoreapp3.1;net5.0;net6.0;net8.0 + net462;netcoreapp3.1;net6.0;net8.0 Exe true ..\..\nunit.snk diff --git a/src/NUnitEngine/nunit.engine.core/nunit.engine.core.csproj b/src/NUnitEngine/nunit.engine.core/nunit.engine.core.csproj index 0ff5b8f68..9f1239499 100644 --- a/src/NUnitEngine/nunit.engine.core/nunit.engine.core.csproj +++ b/src/NUnitEngine/nunit.engine.core/nunit.engine.core.csproj @@ -2,7 +2,7 @@ NUnit.Engine - net462;netstandard2.0;netcoreapp3.1;net5.0;net6.0;net8.0 + net462;netstandard2.0;netcoreapp3.1;net6.0;net8.0 $(NoWarn);SYSLIB0011;SYSLIB0012 true ..\..\nunit.snk diff --git a/src/NUnitEngine/nunit.engine/Services/AgentProcess.cs b/src/NUnitEngine/nunit.engine/Services/AgentProcess.cs index 27448cd31..a1ee5c6d1 100644 --- a/src/NUnitEngine/nunit.engine/Services/AgentProcess.cs +++ b/src/NUnitEngine/nunit.engine/Services/AgentProcess.cs @@ -127,7 +127,7 @@ public static string GetTestAgentExePath(RuntimeFramework targetRuntime, bool re agentExtension = ".exe"; break; case RuntimeType.NetCore: - runtimeDir = major >= 8 ? "net8.0" : major == 7 ? "net7.0" : major == 6 ? "net6.0" : major == 5 ? "net5.0" : "netcoreapp3.1"; + runtimeDir = major >= 8 ? "net8.0" : major == 7 ? "net7.0" : major == 6 ? "net6.0" : "netcoreapp3.1"; agentName = "nunit-agent"; agentExtension = ".dll"; break;