Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Eliminate .NET 5.0 builds #1438

Merged
merged 1 commit into from
Jul 3, 2024
Merged

Eliminate .NET 5.0 builds #1438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NUnitConsole.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions PLATFORM_SUPPORT.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -33,10 +31,10 @@ dates listed in the following table.

| Runtime | Microsoft<br>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 |
Expand Down
31 changes: 6 additions & 25 deletions build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,10 @@ BuildSettings.Initialize(
Net462X86Test,
Net462PlusNet462Test,
NetCore31Test,
Net50Test,
Net60Test,
Net70Test,
Net80Test,
Net50PlusNet60Test,
Net60PlusNet80Test,
Net462PlusNet60Test,
NUnitProjectTest
};
Expand All @@ -35,7 +34,6 @@ BuildSettings.Initialize(
var NetCoreRunnerTests = new List<PackageTest>
{
NetCore31Test,
Net50Test,
Net60Test,
Net70Test,
Net80Test,
Expand All @@ -52,7 +50,6 @@ BuildSettings.Initialize(
if (!BuildSystem.IsRunningOnAppVeyor)
{
StandardRunnerTests.Add(NetCore31X86Test);
StandardRunnerTests.Add(Net50X86Test);
StandardRunnerTests.Add(Net70X86Test);
StandardRunnerTests.Add(Net80X86Test);
}
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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")
Expand All @@ -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)
Expand Down Expand Up @@ -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")
Expand All @@ -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)
Expand Down
11 changes: 0 additions & 11 deletions choco/nunit-console-runner.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,6 @@
<file src = "$BIN_DIR$agents/netcoreapp3.1/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/netcoreapp3.1" />
<file src = "nunit.console.choco.agent.addins" target = "tools/agents/netcoreapp3.1" />

<file src = "$BIN_DIR$agents/net5.0/nunit-agent.dll" target="tools/agents/net5.0" />
<file src = "$BIN_DIR$agents/net5.0/nunit-agent.dll.config" target="tools/agents/net5.0" />
<file src = "$BIN_DIR$agents/net5.0/nunit-agent.deps.json" target="tools/agents/net5.0" />
<file src = "$BIN_DIR$agents/net5.0/nunit-agent.runtimeconfig.json" target="tools/agents/net5.0" />
<file src = "$BIN_DIR$agents/net5.0/nunit.engine.api.dll" target="tools/agents/net5.0" />
<file src = "$BIN_DIR$agents/net5.0/nunit.engine.api.xml" target="tools/agents/net5.0" />
<file src = "$BIN_DIR$agents/net5.0/nunit.engine.core.dll" target="tools/agents/net5.0" />
<file src = "$BIN_DIR$agents/net5.0/testcentric.engine.metadata.dll" target="tools/agents/net5.0" />
<file src = "$BIN_DIR$agents/net5.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net5.0" />
<file src = "nunit.console.choco.agent.addins" target = "tools/agents/net5.0" />

<file src = "$BIN_DIR$agents/net6.0/nunit-agent.dll" target="tools/agents/net6.0" />
<file src = "$BIN_DIR$agents/net6.0/nunit-agent.dll.config" target="tools/agents/net6.0" />
<file src = "$BIN_DIR$agents/net6.0/nunit-agent.deps.json" target="tools/agents/net6.0" />
Expand Down
14 changes: 0 additions & 14 deletions nuget/runners/nunit.console-runner.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,6 @@
<file src="agents/netcoreapp3.1/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/netcoreapp3.1" />
<file src="../../nuget/runners/nunit.console.nuget.agent.addins" target="tools/agents/netcoreapp3.1"/>

<file src="agents/net5.0/nunit-agent.dll" target="tools/agents/net5.0" />
<file src="agents/net5.0/nunit-agent.pdb" target="tools/agents/net5.0" />
<file src="agents/net5.0/nunit-agent.dll.config" target="tools/agents/net5.0" />
<file src="agents/net5.0/nunit-agent.deps.json" target="tools/agents/net5.0" />
<file src="agents/net5.0/nunit-agent.runtimeconfig.json" target="tools/agents/net5.0" />
<file src="agents/net5.0/nunit.engine.api.dll" target="tools/agents/net5.0" />
<file src="agents/net5.0/nunit.engine.api.pdb" target="tools/agents/net5.0" />
<file src="agents/net5.0/nunit.engine.api.xml" target="tools/agents/net5.0" />
<file src="agents/net5.0/nunit.engine.core.dll" target="tools/agents/net5.0" />
<file src="agents/net5.0/nunit.engine.core.pdb" target="tools/agents/net5.0" />
<file src="agents/net5.0/testcentric.engine.metadata.dll" target="tools/agents/net5.0" />
<file src="agents/net5.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net5.0" />
<file src="../../nuget/runners/nunit.console.nuget.agent.addins" target="tools/agents/net5.0"/>

<file src="agents/net6.0/nunit-agent.dll" target="tools/agents/net6.0" />
<file src="agents/net6.0/nunit-agent.pdb" target="tools/agents/net6.0" />
<file src="agents/net6.0/nunit-agent.dll.config" target="tools/agents/net6.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/NUnitEngine/mock-assembly-x86/mock-assembly-x86.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<RootNamespace>NUnit.Tests</RootNamespace>
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net462;netcoreapp3.1;net6.0;net7.0;net8.0</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\nunit.snk</AssemblyOriginatorKeyFile>
<PlatformTarget>x86</PlatformTarget>
Expand Down
2 changes: 1 addition & 1 deletion src/NUnitEngine/mock-assembly/mock-assembly.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<RootNamespace>NUnit.Tests</RootNamespace>
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net462;netcoreapp3.1;net6.0;net7.0;net8.0</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\nunit.snk</AssemblyOriginatorKeyFile>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion src/NUnitEngine/nunit-agent/nunit-agent.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<RootNamespace>nunit.agent</RootNamespace>
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net462;netcoreapp3.1;net6.0;net7.0;net8.0</TargetFrameworks>
<ApplicationManifest>app.manifest</ApplicationManifest>
<ApplicationIcon>..\..\..\nunit.ico</ApplicationIcon>
<GenerateSupportedRuntime>false</GenerateSupportedRuntime>
Expand Down
2 changes: 1 addition & 1 deletion src/NUnitEngine/nunit.engine.core.tests/nunit.engine.core.tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<RootNamespace>NUnit.Engine.Core.Tests</RootNamespace>
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net462;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\nunit.snk</AssemblyOriginatorKeyFile>
Expand Down
2 changes: 1 addition & 1 deletion src/NUnitEngine/nunit.engine.core/nunit.engine.core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<RootNamespace>NUnit.Engine</RootNamespace>
<TargetFrameworks>net462;netstandard2.0;netcoreapp3.1;net5.0;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net462;netstandard2.0;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
<NoWarn>$(NoWarn);SYSLIB0011;SYSLIB0012</NoWarn><!-- TODO: Get rid of obsolete stuff -->
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\nunit.snk</AssemblyOriginatorKeyFile>
Expand Down
2 changes: 1 addition & 1 deletion src/NUnitEngine/nunit.engine/Services/AgentProcess.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down