Skip to content

Commit d149dd7

Browse files
CharliePooleCharliePoole
authored
Merge pull request #1642 from nunit/feat/add-net9-agent
feat: Add .NET9 agent
2 parents 2efb6e1 + 80c00c1 commit d149dd7

File tree

6 files changed

+35
-6
lines changed

6 files changed

+35
-6
lines changed

‎build.cake‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,15 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
6464
HasDirectory("tools").WithFiles("nunit3-console.exe", "nunit3-console.exe.config").AndFiles(ENGINE_FILES),
6565
HasDirectory("tools/agents/net462").WithFiles(AGENT_FILES),
6666
HasDirectory("tools/agents/net6.0").WithFiles(AGENT_FILES_NETCORE),
67-
HasDirectory("tools/agents/net8.0").WithFiles(AGENT_FILES_NETCORE)
67+
HasDirectory("tools/agents/net8.0").WithFiles(AGENT_FILES_NETCORE),
68+
HasDirectory("tools/agents/net9.0").WithFiles(AGENT_FILES_NETCORE)
6869
},
6970
symbols: new PackageCheck[] {
7071
HasDirectory("tools").WithFiles(ENGINE_PDB_FILES).AndFile("nunit3-console.pdb"),
7172
HasDirectory("tools/agents/net462").WithFiles(AGENT_PDB_FILES),
7273
HasDirectory("tools/agents/net6.0").WithFiles(AGENT_PDB_FILES_NETCORE),
73-
HasDirectory("tools/agents/net8.0").WithFiles(AGENT_PDB_FILES_NETCORE)
74+
HasDirectory("tools/agents/net8.0").WithFiles(AGENT_PDB_FILES_NETCORE),
75+
HasDirectory("tools/agents/net9.0").WithFiles(AGENT_PDB_FILES_NETCORE)
7476
},
7577
testRunner: new ConsoleRunnerSelfTester(BuildSettings.NuGetTestDirectory
7678
+ $"NUnit.ConsoleRunner.{BuildSettings.PackageVersion}/tools/nunit3-console.exe"),
@@ -101,7 +103,8 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
101103
HasDirectory("tools").WithFiles("LICENSE.txt", "NOTICES.txt", "VERIFICATION.txt", "nunit3-console.exe", "nunit3-console.exe.config").AndFiles(ENGINE_FILES),
102104
HasDirectory("tools/agents/net462").WithFiles(AGENT_FILES),
103105
HasDirectory("tools/agents/net6.0").WithFiles(AGENT_FILES_NETCORE),
104-
HasDirectory("tools/agents/net8.0").WithFiles(AGENT_FILES_NETCORE)
106+
HasDirectory("tools/agents/net8.0").WithFiles(AGENT_FILES_NETCORE),
107+
HasDirectory("tools/agents/net9.0").WithFiles(AGENT_FILES_NETCORE)
105108
},
106109
testRunner: new ConsoleRunnerSelfTester(BuildSettings.ChocolateyTestDirectory
107110
+ $"nunit-console-runner.{BuildSettings.PackageVersion}/tools/nunit3-console.exe"),
@@ -122,6 +125,7 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
122125
HasDirectory("bin/agents/net462").WithFiles(AGENT_FILES).AndFiles(AGENT_PDB_FILES),
123126
HasDirectory("bin/agents/net6.0").WithFiles(AGENT_FILES_NETCORE).AndFiles(AGENT_PDB_FILES_NETCORE),
124127
HasDirectory("bin/agents/net8.0").WithFiles(AGENT_FILES_NETCORE).AndFiles(AGENT_PDB_FILES_NETCORE),
128+
HasDirectory("bin/agents/net9.0").WithFiles(AGENT_FILES_NETCORE).AndFiles(AGENT_PDB_FILES_NETCORE),
125129
},
126130
testRunner: new ConsoleRunnerSelfTester(BuildSettings.ZipTestDirectory
127131
+ $"NUnit.Console.{BuildSettings.PackageVersion}/bin/net462/nunit3-console.exe"),

‎choco/nunit-console-runner.nuspec‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,17 @@
7575
<file src = "$BIN_DIR$agents/net8.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net8.0" />
7676
<!-- File used by ExtensionManager to indicate this is a chocolatey installation -->
7777
<file src = "VERIFICATION.txt" target = "tools/agents/net8.0" />
78+
79+
<file src = "$BIN_DIR$agents/net9.0/nunit-agent.dll" target="tools/agents/net9.0" />
80+
<file src = "$BIN_DIR$agents/net9.0/nunit-agent.dll.config" target="tools/agents/net9.0" />
81+
<file src = "$BIN_DIR$agents/net9.0/nunit-agent.deps.json" target="tools/agents/net9.0" />
82+
<file src = "$BIN_DIR$agents/net9.0/nunit-agent.runtimeconfig.json" target="tools/agents/net9.0" />
83+
<file src = "$BIN_DIR$agents/net9.0/nunit.engine.api.dll" target="tools/agents/net9.0" />
84+
<file src = "$BIN_DIR$agents/net9.0/nunit.engine.api.xml" target="tools/agents/net9.0" />
85+
<file src = "$BIN_DIR$agents/net9.0/nunit.engine.core.dll" target="tools/agents/net9.0" />
86+
<file src = "$BIN_DIR$agents/net9.0/testcentric.engine.metadata.dll" target="tools/agents/net9.0" />
87+
<file src = "$BIN_DIR$agents/net9.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net9.0" />
88+
<!-- File used by ExtensionManager to indicate this is a chocolatey installation -->
89+
<file src = "VERIFICATION.txt" target = "tools/agents/net9.0" />
7890
</files>
7991
</package>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.100",
3+
"version": "9.0.100",
44
"rollForward": "feature"
55
}
66
}

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,19 @@
6666
<file src="agents/net8.0/testcentric.engine.metadata.dll" target="tools/agents/net8.0" />
6767
<file src="agents/net8.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net8.0" />
6868

69+
<file src="agents/net9.0/nunit-agent.dll" target="tools/agents/net9.0" />
70+
<file src="agents/net9.0/nunit-agent.pdb" target="tools/agents/net9.0" />
71+
<file src="agents/net9.0/nunit-agent.dll.config" target="tools/agents/net9.0" />
72+
<file src="agents/net9.0/nunit-agent.deps.json" target="tools/agents/net9.0" />
73+
<file src="agents/net9.0/nunit-agent.runtimeconfig.json" target="tools/agents/net9.0" />
74+
<file src="agents/net9.0/nunit.engine.api.dll" target="tools/agents/net9.0" />
75+
<file src="agents/net9.0/nunit.engine.api.pdb" target="tools/agents/net9.0" />
76+
<file src="agents/net9.0/nunit.engine.api.xml" target="tools/agents/net9.0" />
77+
<file src="agents/net9.0/nunit.engine.core.dll" target="tools/agents/net9.0" />
78+
<file src="agents/net9.0/nunit.engine.core.pdb" target="tools/agents/net9.0" />
79+
<file src="agents/net9.0/testcentric.engine.metadata.dll" target="tools/agents/net9.0" />
80+
<file src="agents/net9.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net9.0" />
81+
6982
<file src="net462/nunit3-console.exe" target="tools" />
7083
<file src="net462/nunit3-console.pdb" target="tools" />
7184
<file src="net462/nunit3-console.exe.config" target="tools" />

‎src/NUnitEngine/nunit-agent/nunit-agent.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<RootNamespace>nunit.agent</RootNamespace>
6-
<TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
6+
<TargetFrameworks>net462;net6.0;net8.0;net9.0</TargetFrameworks>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
88
<ApplicationIcon>..\..\..\nunit.ico</ApplicationIcon>
99
<GenerateSupportedRuntime>false</GenerateSupportedRuntime>

‎src/NUnitEngine/nunit.engine/Services/AgentProcess.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public static string GetTestAgentExePath(RuntimeFramework targetRuntime, bool re
127127
agentExtension = ".exe";
128128
break;
129129
case RuntimeType.NetCore:
130-
runtimeDir = major >= 7 ? "net8.0" : "net6.0";
130+
runtimeDir = major >= 9 ? "net9.0" : major >= 7 ? "net8.0" : "net6.0";
131131
agentName = "nunit-agent";
132132
agentExtension = ".dll";
133133
break;

0 commit comments

Comments
 (0)