Skip to content

Commit 924d5b1

Browse files
CharliePooleCharliePoole
authored
Merge pull request #1778 from nunit/issue-1777
Issue 1777
2 parents c64d6d7 + ef4b3ea commit 924d5b1

File tree

12 files changed

+75
-45
lines changed

12 files changed

+75
-45
lines changed

‎.github/workflows/NUnitConsoleAndEngine.CI.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ jobs:
3939
3.1.x
4040
6.0.x
4141
7.0.x
42-
8.0.100
42+
8.0.x
43+
9.0.x
44+
10.0.x
4345
4446
- name: 🔧 Install dotnet tools
4547
run: dotnet tool restore

‎build.cake‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,16 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
6464
HasFiles("LICENSE.txt", "NOTICES.txt"),
6565
HasDirectory("tools").WithFiles("nunit3-console.exe", "nunit3-console.exe.config").AndFiles(ENGINE_FILES),
6666
HasDirectory("tools/agents/net462").WithFiles(AGENT_FILES),
67-
HasDirectory("tools/agents/net6.0").WithFiles(AGENT_FILES_NETCORE),
6867
HasDirectory("tools/agents/net8.0").WithFiles(AGENT_FILES_NETCORE),
69-
HasDirectory("tools/agents/net9.0").WithFiles(AGENT_FILES_NETCORE)
68+
HasDirectory("tools/agents/net9.0").WithFiles(AGENT_FILES_NETCORE),
69+
HasDirectory("tools/agents/net10.0").WithFiles(AGENT_FILES_NETCORE)
7070
},
7171
symbols: new PackageCheck[] {
7272
HasDirectory("tools").WithFiles(ENGINE_PDB_FILES).AndFile("nunit3-console.pdb"),
7373
HasDirectory("tools/agents/net462").WithFiles(AGENT_PDB_FILES),
74-
HasDirectory("tools/agents/net6.0").WithFiles(AGENT_PDB_FILES_NETCORE),
7574
HasDirectory("tools/agents/net8.0").WithFiles(AGENT_PDB_FILES_NETCORE),
76-
HasDirectory("tools/agents/net9.0").WithFiles(AGENT_PDB_FILES_NETCORE)
75+
HasDirectory("tools/agents/net9.0").WithFiles(AGENT_PDB_FILES_NETCORE),
76+
HasDirectory("tools/agents/net10.0").WithFiles(AGENT_PDB_FILES_NETCORE)
7777
},
7878
testRunner: new ConsoleRunnerSelfTester(BuildSettings.NuGetTestDirectory
7979
+ $"NUnit.ConsoleRunner.{BuildSettings.PackageVersion}/tools/nunit3-console.exe"),
@@ -111,9 +111,9 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
111111
checks: new PackageCheck[] {
112112
HasDirectory("tools").WithFiles("LICENSE.txt", "NOTICES.txt", "VERIFICATION.txt", "nunit3-console.exe", "nunit3-console.exe.config").AndFiles(ENGINE_FILES),
113113
HasDirectory("tools/agents/net462").WithFiles(AGENT_FILES),
114-
HasDirectory("tools/agents/net6.0").WithFiles(AGENT_FILES_NETCORE),
115114
HasDirectory("tools/agents/net8.0").WithFiles(AGENT_FILES_NETCORE),
116-
HasDirectory("tools/agents/net9.0").WithFiles(AGENT_FILES_NETCORE)
115+
HasDirectory("tools/agents/net9.0").WithFiles(AGENT_FILES_NETCORE),
116+
HasDirectory("tools/agents/net10.0").WithFiles(AGENT_FILES_NETCORE)
117117
},
118118
testRunner: new ConsoleRunnerSelfTester(BuildSettings.ChocolateyTestDirectory
119119
+ $"nunit-console-runner.{BuildSettings.ChocolateyPackageVersion}/tools/nunit3-console.exe"),
@@ -132,9 +132,9 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
132132
HasDirectory("NUnit.Extension.TeamCityEventListener.1.0.10"),
133133
HasDirectory("NUnit.Extension.VSProjectLoader.3.9.0"),
134134
HasDirectory("bin/agents/net462").WithFiles(AGENT_FILES).AndFiles(AGENT_PDB_FILES),
135-
HasDirectory("bin/agents/net6.0").WithFiles(AGENT_FILES_NETCORE).AndFiles(AGENT_PDB_FILES_NETCORE),
136135
HasDirectory("bin/agents/net8.0").WithFiles(AGENT_FILES_NETCORE).AndFiles(AGENT_PDB_FILES_NETCORE),
137-
HasDirectory("bin/agents/net9.0").WithFiles(AGENT_FILES_NETCORE).AndFiles(AGENT_PDB_FILES_NETCORE)
136+
HasDirectory("bin/agents/net9.0").WithFiles(AGENT_FILES_NETCORE).AndFiles(AGENT_PDB_FILES_NETCORE),
137+
HasDirectory("bin/agents/net10.0").WithFiles(AGENT_FILES_NETCORE).AndFiles(AGENT_PDB_FILES_NETCORE)
138138
},
139139
testRunner: new ConsoleRunnerSelfTester(BuildSettings.ZipTestDirectory
140140
+ $"NUnit.Console.{BuildSettings.PackageVersion}/bin/net462/nunit3-console.exe"),

‎choco/nunit-console-runner.nuspec‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,6 @@
5252
<!-- File used by ExtensionManager to indicate this is a chocolatey installation -->
5353
<file src = "VERIFICATION.txt" target = "tools/agents/net462" />
5454

55-
<file src = "$BIN_DIR$agents/net6.0/nunit-agent.dll" target="tools/agents/net6.0" />
56-
<file src = "$BIN_DIR$agents/net6.0/nunit-agent.dll.config" target="tools/agents/net6.0" />
57-
<file src = "$BIN_DIR$agents/net6.0/nunit-agent.deps.json" target="tools/agents/net6.0" />
58-
<file src = "$BIN_DIR$agents/net6.0/nunit-agent.runtimeconfig.json" target="tools/agents/net6.0" />
59-
<file src = "$BIN_DIR$agents/net6.0/nunit.engine.api.dll" target="tools/agents/net6.0" />
60-
<file src = "$BIN_DIR$agents/net6.0/nunit.engine.api.xml" target="tools/agents/net6.0" />
61-
<file src = "$BIN_DIR$agents/net6.0/nunit.engine.core.dll" target="tools/agents/net6.0" />
62-
<file src = "$BIN_DIR$agents/net6.0/testcentric.engine.metadata.dll" target="tools/agents/net6.0" />
63-
<file src = "$BIN_DIR$agents/net6.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net6.0" />
64-
<!-- File used by ExtensionManager to indicate this is a chocolatey installation -->
65-
<file src = "VERIFICATION.txt" target = "tools/agents/net6.0" />
66-
6755
<file src = "$BIN_DIR$agents/net8.0/nunit-agent.dll" target="tools/agents/net8.0" />
6856
<file src = "$BIN_DIR$agents/net8.0/nunit-agent.dll.config" target="tools/agents/net8.0" />
6957
<file src = "$BIN_DIR$agents/net8.0/nunit-agent.deps.json" target="tools/agents/net8.0" />
@@ -87,5 +75,17 @@
8775
<file src = "$BIN_DIR$agents/net9.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net9.0" />
8876
<!-- File used by ExtensionManager to indicate this is a chocolatey installation -->
8977
<file src = "VERIFICATION.txt" target = "tools/agents/net9.0" />
78+
79+
<file src = "$BIN_DIR$agents/net10.0/nunit-agent.dll" target="tools/agents/net10.0" />
80+
<file src = "$BIN_DIR$agents/net10.0/nunit-agent.dll.config" target="tools/agents/net10.0" />
81+
<file src = "$BIN_DIR$agents/net10.0/nunit-agent.deps.json" target="tools/agents/net10.0" />
82+
<file src = "$BIN_DIR$agents/net10.0/nunit-agent.runtimeconfig.json" target="tools/agents/net10.0" />
83+
<file src = "$BIN_DIR$agents/net10.0/nunit.engine.api.dll" target="tools/agents/net10.0" />
84+
<file src = "$BIN_DIR$agents/net10.0/nunit.engine.api.xml" target="tools/agents/net10.0" />
85+
<file src = "$BIN_DIR$agents/net10.0/nunit.engine.core.dll" target="tools/agents/net10.0" />
86+
<file src = "$BIN_DIR$agents/net10.0/testcentric.engine.metadata.dll" target="tools/agents/net10.0" />
87+
<file src = "$BIN_DIR$agents/net10.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net10.0" />
88+
<!-- File used by ExtensionManager to indicate this is a chocolatey installation -->
89+
<file src = "VERIFICATION.txt" target = "tools/agents/net10.0" />
9090
</files>
9191
</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": "9.0.100",
3+
"version": "10.0.0",
44
"rollForward": "feature"
55
}
66
}

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,6 @@
4040
<file src="agents/net462/nunit.engine.core.pdb" target="tools/agents/net462" />
4141
<file src="agents/net462/testcentric.engine.metadata.dll" target="tools/agents/net462" />
4242

43-
<file src="agents/net6.0/nunit-agent.dll" target="tools/agents/net6.0" />
44-
<file src="agents/net6.0/nunit-agent.pdb" target="tools/agents/net6.0" />
45-
<file src="agents/net6.0/nunit-agent.dll.config" target="tools/agents/net6.0" />
46-
<file src="agents/net6.0/nunit-agent.deps.json" target="tools/agents/net6.0" />
47-
<file src="agents/net6.0/nunit-agent.runtimeconfig.json" target="tools/agents/net6.0" />
48-
<file src="agents/net6.0/nunit.engine.api.dll" target="tools/agents/net6.0" />
49-
<file src="agents/net6.0/nunit.engine.api.pdb" target="tools/agents/net6.0" />
50-
<file src="agents/net6.0/nunit.engine.api.xml" target="tools/agents/net6.0" />
51-
<file src="agents/net6.0/nunit.engine.core.dll" target="tools/agents/net6.0" />
52-
<file src="agents/net6.0/nunit.engine.core.pdb" target="tools/agents/net6.0" />
53-
<file src="agents/net6.0/testcentric.engine.metadata.dll" target="tools/agents/net6.0" />
54-
<file src="agents/net6.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net6.0" />
55-
5643
<file src="agents/net8.0/nunit-agent.dll" target="tools/agents/net8.0" />
5744
<file src="agents/net8.0/nunit-agent.pdb" target="tools/agents/net8.0" />
5845
<file src="agents/net8.0/nunit-agent.dll.config" target="tools/agents/net8.0" />
@@ -79,6 +66,19 @@
7966
<file src="agents/net9.0/testcentric.engine.metadata.dll" target="tools/agents/net9.0" />
8067
<file src="agents/net9.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net9.0" />
8168

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

‎package-tests.cake‎

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,13 @@ public static class PackageTests
4646
ExpectedResult=new MockAssemblyExpectedResult("net-4.6.2")
4747
});
4848

49+
AllLists.Add(new PackageTest(1, "Net10Test")
50+
{
51+
Description = "Run mock-assembly.dll targeting .NET 10.0",
52+
Arguments = "testdata/net10.0/mock-assembly.dll",
53+
ExpectedResult = new MockAssemblyExpectedResult("netcore-10.0")
54+
});
55+
4956
AllLists.Add(new PackageTest(1, "Net90Test")
5057
{
5158
Description = "Run mock-assembly.dll targeting .NET 9.0",
@@ -145,11 +152,11 @@ public static class PackageTests
145152
ExpectedResult = new MockAssemblyExpectedResult("net-4.6.2", "net-4.6.2")
146153
});
147154

148-
StandardAndZipLists.Add(new PackageTest(1, "Net60PlusNet80Test")
155+
StandardAndZipLists.Add(new PackageTest(1, "Net60PlusNet80PlusNet10Test")
149156
{
150157
Description = "Run mock-assembly targeting .NET6.0 and 8.0 together",
151-
Arguments = "testdata/net6.0/mock-assembly.dll testdata/net8.0/mock-assembly.dll",
152-
ExpectedResult = new MockAssemblyExpectedResult("netcore-6.0", "netcore-8.0")
158+
Arguments = "testdata/net6.0/mock-assembly.dll testdata/net8.0/mock-assembly.dll testdata/net10.0/mock-assembly.dll",
159+
ExpectedResult = new MockAssemblyExpectedResult("netcore-6.0", "netcore-8.0", "netcore-10.0")
153160
});
154161

155162
StandardAndZipLists.Add(new PackageTest(1, "Net462PlusNet60Test")
@@ -195,6 +202,22 @@ public static class PackageTests
195202
}
196203
});
197204

205+
AllLists.Add(new PackageTest(1, "Net10AspNetCoreTest")
206+
{
207+
Description = "Run test using AspNetCore targeting .NET 8.0",
208+
Arguments = "testdata/net8.0/aspnetcore-test.dll",
209+
ExpectedResult = new ExpectedResult("Passed")
210+
{
211+
Total = 3,
212+
Passed = 3,
213+
Failed = 0,
214+
Warnings = 0,
215+
Inconclusive = 0,
216+
Skipped = 0,
217+
Assemblies = new ExpectedAssemblyResult[] { new ExpectedAssemblyResult("aspnetcore-test.dll", "netcore-8.0", "netcore-10.0") }
218+
}
219+
});
220+
198221
//////////////////////////////////////////////////////////////////////
199222
// WINDOWS FORMS TESTS
200223
//////////////////////////////////////////////////////////////////////
@@ -311,7 +334,7 @@ public static class PackageTests
311334
{
312335
Description = "Run mock-assembly using the .csproj file",
313336
Arguments = "../../src/TestData/mock-assembly/mock-assembly.csproj --config=Release",
314-
ExpectedResult = new MockAssemblyExpectedResult("net462", "netcore-3.1", "netcore-6.0", "netcore-7.0", "netcore-8.0", "netcore-9.0"),
337+
ExpectedResult = new MockAssemblyExpectedResult("net462", "netcore-3.1", "netcore-6.0", "netcore-7.0", "netcore-8.0", "netcore-9.0", "netcore-10.0"),
315338
ExtensionsNeeded = new[] { Extensions.VSProjectLoader }
316339
});
317340

‎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;net9.0</TargetFrameworks>
6+
<TargetFrameworks>net462;net8.0;net9.0;net10.0</TargetFrameworks>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
88
<ApplicationIcon>..\..\..\nunit.ico</ApplicationIcon>
99
<GenerateSupportedRuntime>false</GenerateSupportedRuntime>

‎src/NUnitEngine/nunit.engine.core.tests/nunit.engine.core.tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<RootNamespace>NUnit.Engine</RootNamespace>
5-
<TargetFrameworks>net462;netcoreapp3.1;net6.0;net8.0;net9.0</TargetFrameworks>
5+
<TargetFrameworks>net462;netcoreapp3.1;net6.0;net8.0;net9.0;net10.0</TargetFrameworks>
66
<OutputType>Exe</OutputType>
77
<SignAssembly>true</SignAssembly>
88
<AssemblyOriginatorKeyFile>..\..\nunit.snk</AssemblyOriginatorKeyFile>

‎src/NUnitEngine/nunit.engine.core/nunit.engine.core.csproj‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<RootNamespace>NUnit.Engine</RootNamespace>
5-
<TargetFrameworks>net462;netcoreapp3.1;net6.0;net8.0;net9.0</TargetFrameworks>
5+
<TargetFrameworks>net462;netcoreapp3.1;net6.0;net8.0;net9.0;net10.0</TargetFrameworks>
66
<NoWarn>$(NoWarn);SYSLIB0011;SYSLIB0012</NoWarn><!-- TODO: Get rid of obsolete stuff -->
77
<SignAssembly>true</SignAssembly>
88
<AssemblyOriginatorKeyFile>..\..\nunit.snk</AssemblyOriginatorKeyFile>
@@ -32,6 +32,11 @@
3232
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.2" />
3333
</ItemGroup>
3434

35+
<ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
36+
<PackageReference Include="Microsoft.Win32.Registry" Version="4.3.0" />
37+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="10.0.0" />
38+
</ItemGroup>
39+
3540
<ItemGroup>
3641
<PackageReference Include="TestCentric.Metadata" Version="2.0.0" />
3742
</ItemGroup>

‎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 >= 9 ? "net9.0" : major >= 7 ? "net8.0" : "net6.0";
130+
runtimeDir = major >= 10 ? "net10.0" : major >= 9 ? "net9.0" : "net8.0";
131131
agentName = "nunit-agent";
132132
agentExtension = ".dll";
133133
break;

0 commit comments

Comments
 (0)