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

feat: Add .NET9 agent #1642

Merged
merged 1 commit into from
Mar 12, 2025
Merged

feat: Add .NET9 agent #1642

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
10 changes: 7 additions & 3 deletions build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,15 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
HasDirectory("tools").WithFiles("nunit3-console.exe", "nunit3-console.exe.config").AndFiles(ENGINE_FILES),
HasDirectory("tools/agents/net462").WithFiles(AGENT_FILES),
HasDirectory("tools/agents/net6.0").WithFiles(AGENT_FILES_NETCORE),
HasDirectory("tools/agents/net8.0").WithFiles(AGENT_FILES_NETCORE)
HasDirectory("tools/agents/net8.0").WithFiles(AGENT_FILES_NETCORE),
HasDirectory("tools/agents/net9.0").WithFiles(AGENT_FILES_NETCORE)
},
symbols: new PackageCheck[] {
HasDirectory("tools").WithFiles(ENGINE_PDB_FILES).AndFile("nunit3-console.pdb"),
HasDirectory("tools/agents/net462").WithFiles(AGENT_PDB_FILES),
HasDirectory("tools/agents/net6.0").WithFiles(AGENT_PDB_FILES_NETCORE),
HasDirectory("tools/agents/net8.0").WithFiles(AGENT_PDB_FILES_NETCORE)
HasDirectory("tools/agents/net8.0").WithFiles(AGENT_PDB_FILES_NETCORE),
HasDirectory("tools/agents/net9.0").WithFiles(AGENT_PDB_FILES_NETCORE)
},
testRunner: new ConsoleRunnerSelfTester(BuildSettings.NuGetTestDirectory
+ $"NUnit.ConsoleRunner.{BuildSettings.PackageVersion}/tools/nunit3-console.exe"),
Expand Down Expand Up @@ -101,7 +103,8 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
HasDirectory("tools").WithFiles("LICENSE.txt", "NOTICES.txt", "VERIFICATION.txt", "nunit3-console.exe", "nunit3-console.exe.config").AndFiles(ENGINE_FILES),
HasDirectory("tools/agents/net462").WithFiles(AGENT_FILES),
HasDirectory("tools/agents/net6.0").WithFiles(AGENT_FILES_NETCORE),
HasDirectory("tools/agents/net8.0").WithFiles(AGENT_FILES_NETCORE)
HasDirectory("tools/agents/net8.0").WithFiles(AGENT_FILES_NETCORE),
HasDirectory("tools/agents/net9.0").WithFiles(AGENT_FILES_NETCORE)
},
testRunner: new ConsoleRunnerSelfTester(BuildSettings.ChocolateyTestDirectory
+ $"nunit-console-runner.{BuildSettings.PackageVersion}/tools/nunit3-console.exe"),
Expand All @@ -122,6 +125,7 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
HasDirectory("bin/agents/net462").WithFiles(AGENT_FILES).AndFiles(AGENT_PDB_FILES),
HasDirectory("bin/agents/net6.0").WithFiles(AGENT_FILES_NETCORE).AndFiles(AGENT_PDB_FILES_NETCORE),
HasDirectory("bin/agents/net8.0").WithFiles(AGENT_FILES_NETCORE).AndFiles(AGENT_PDB_FILES_NETCORE),
HasDirectory("bin/agents/net9.0").WithFiles(AGENT_FILES_NETCORE).AndFiles(AGENT_PDB_FILES_NETCORE),
},
testRunner: new ConsoleRunnerSelfTester(BuildSettings.ZipTestDirectory
+ $"NUnit.Console.{BuildSettings.PackageVersion}/bin/net462/nunit3-console.exe"),
Expand Down
12 changes: 12 additions & 0 deletions choco/nunit-console-runner.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,17 @@
<file src = "$BIN_DIR$agents/net8.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net8.0" />
<!-- File used by ExtensionManager to indicate this is a chocolatey installation -->
<file src = "VERIFICATION.txt" target = "tools/agents/net8.0" />

<file src = "$BIN_DIR$agents/net9.0/nunit-agent.dll" target="tools/agents/net9.0" />
<file src = "$BIN_DIR$agents/net9.0/nunit-agent.dll.config" target="tools/agents/net9.0" />
<file src = "$BIN_DIR$agents/net9.0/nunit-agent.deps.json" target="tools/agents/net9.0" />
<file src = "$BIN_DIR$agents/net9.0/nunit-agent.runtimeconfig.json" target="tools/agents/net9.0" />
<file src = "$BIN_DIR$agents/net9.0/nunit.engine.api.dll" target="tools/agents/net9.0" />
<file src = "$BIN_DIR$agents/net9.0/nunit.engine.api.xml" target="tools/agents/net9.0" />
<file src = "$BIN_DIR$agents/net9.0/nunit.engine.core.dll" target="tools/agents/net9.0" />
<file src = "$BIN_DIR$agents/net9.0/testcentric.engine.metadata.dll" target="tools/agents/net9.0" />
<file src = "$BIN_DIR$agents/net9.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net9.0" />
<!-- File used by ExtensionManager to indicate this is a chocolatey installation -->
<file src = "VERIFICATION.txt" target = "tools/agents/net9.0" />
</files>
</package>
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.100",
"version": "9.0.100",
"rollForward": "feature"
}
}
13 changes: 13 additions & 0 deletions nuget/runners/nunit.console-runner.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,19 @@
<file src="agents/net8.0/testcentric.engine.metadata.dll" target="tools/agents/net8.0" />
<file src="agents/net8.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net8.0" />

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

<file src="net462/nunit3-console.exe" target="tools" />
<file src="net462/nunit3-console.pdb" target="tools" />
<file src="net462/nunit3-console.exe.config" target="tools" />
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;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net462;net6.0;net8.0;net9.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/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 >= 7 ? "net8.0" : "net6.0";
runtimeDir = major >= 9 ? "net9.0" : major >= 7 ? "net8.0" : "net6.0";
agentName = "nunit-agent";
agentExtension = ".dll";
break;
Expand Down
Loading