Skip to content

Commit

Permalink
New nunit.common assembly - first cut"
Browse files Browse the repository at this point in the history
  • Loading branch information
CharliePoole committed Jan 22, 2025
1 parent b63739c commit ed4f647
Show file tree
Hide file tree
Showing 52 changed files with 107 additions and 166 deletions.
7 changes: 7 additions & 0 deletions NUnitConsole.sln
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit3.2", "src\TestData\NU
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit3.10", "src\TestData\NUnit3.10\NUnit3.10.csproj", "{0555B97D-E918-455B-951C-74EFCDA8790A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.common", "src\NUnitEngine\nunit.common\nunit.common.csproj", "{542685E5-8C2E-4425-ADD1-C45B55AFB964}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -267,6 +269,10 @@ Global
{0555B97D-E918-455B-951C-74EFCDA8790A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0555B97D-E918-455B-951C-74EFCDA8790A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0555B97D-E918-455B-951C-74EFCDA8790A}.Release|Any CPU.Build.0 = Release|Any CPU
{542685E5-8C2E-4425-ADD1-C45B55AFB964}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{542685E5-8C2E-4425-ADD1-C45B55AFB964}.Debug|Any CPU.Build.0 = Debug|Any CPU
{542685E5-8C2E-4425-ADD1-C45B55AFB964}.Release|Any CPU.ActiveCfg = Release|Any CPU
{542685E5-8C2E-4425-ADD1-C45B55AFB964}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -311,6 +317,7 @@ Global
{56416AD9-8E7B-4F72-B0E1-E75A024431F8} = {D31607D2-D689-488B-9F9F-92F47AC1D7F6}
{8AFBB856-700A-4CCC-AE0E-9B622178E1E0} = {D31607D2-D689-488B-9F9F-92F47AC1D7F6}
{0555B97D-E918-455B-951C-74EFCDA8790A} = {D31607D2-D689-488B-9F9F-92F47AC1D7F6}
{542685E5-8C2E-4425-ADD1-C45B55AFB964} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D8E4FC26-5422-4C51-8BBC-D1AC0A578711}
Expand Down
56 changes: 28 additions & 28 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -35,37 +35,37 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
checks: new PackageCheck[] {
HasFiles("LICENSE.txt", "NOTICES.txt"),
HasDirectory("tools").WithFiles(
"nunit-console.exe", "nunit-console.exe.config",
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
"nunit-console.exe", "nunit-console.exe.config", "nunit.engine.dll", "nunit.engine.core.dll",
"nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
HasDirectory("tools/agents/net462").WithFiles(
"nunit-agent-net462.exe", "nunit-agent-net462.exe.config", "nunit-agent-net462-x86.exe", "nunit-agent-net462-x86.exe.config",
"nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
"nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
HasDirectory("tools/agents/netcoreapp3.1").WithFiles(
"nunit-agent-netcore31.dll", "nunit-agent-netcore31.dll.config",
"nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
"nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
HasDirectory("tools/agents/net6.0").WithFiles(
"nunit-agent-net60.dll", "nunit-agent-net60.dll.config",
"nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
"nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
HasDirectory("tools/agents/net7.0").WithFiles(
"nunit-agent-net70.dll", "nunit-agent-net70.dll.config",
"nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
"nunit-agent-net70.dll", "nunit.common.dll", "nunit-agent-net70.dll.config",
"nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
HasDirectory("tools/agents/net8.0").WithFiles(
"nunit-agent-net80.dll", "nunit-agent-net80.dll.config",
"nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll")
"nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll")
},
symbols: new PackageCheck[] {
HasDirectory("tools").WithFiles(
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb", "nunit-console.pdb"),
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb", "nunit-console.pdb"),
HasDirectory("tools/agents/net462").WithFiles(
"nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb"),
"nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"),
HasDirectory("tools/agents/netcoreapp3.1").WithFiles(
"nunit-agent.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb"),
"nunit-agent.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"),
HasDirectory("tools/agents/net6.0").WithFiles(
"nunit-agent.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb"),
"nunit-agent.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"),
HasDirectory("tools/agents/net7.0").WithFiles(
"nunit-agent.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb"),
"nunit-agent.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"),
HasDirectory("tools/agents/net8.0").WithFiles(
"nunit-agent.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb")
"nunit-agent.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb")
},
testRunner: new ConsoleRunnerSelfTester(BuildSettings.NuGetTestDirectory
+ $"NUnit.ConsoleRunner.{BuildSettings.PackageVersion}/tools/nunit-console.exe"),
Expand Down Expand Up @@ -98,22 +98,22 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
checks: new PackageCheck[] {
HasDirectory("tools").WithFiles(
"LICENSE.txt", "NOTICES.txt", "VERIFICATION.txt", "nunit-console.exe", "nunit-console.exe.config",
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
HasDirectory("tools/agents/net462").WithFiles(
"nunit-agent-net462.exe", "nunit-agent-net462.exe.config", "nunit-agent-net462-x86.exe", "nunit-agent-net462-x86.exe.config",
"nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
"nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
HasDirectory("tools/agents/netcoreapp3.1").WithFiles(
"nunit-agent-netcore31.dll", "nunit-agent-netcore31.dll.config",
"nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
"nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
HasDirectory("tools/agents/net6.0").WithFiles(
"nunit-agent-net60.dll", "nunit-agent-net60.dll.config",
"nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
"nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
HasDirectory("tools/agents/net7.0").WithFiles(
"nunit-agent-net70.dll", "nunit-agent-net70.dll.config",
"nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
"nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
HasDirectory("tools/agents/net8.0").WithFiles(
"nunit-agent-net80.dll", "nunit-agent-net80.dll.config",
"nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll")
"nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll")
},
testRunner: new ConsoleRunnerSelfTester(BuildSettings.ChocolateyTestDirectory
+ $"nunit-console-runner-v4.{BuildSettings.PackageVersion}/tools/nunit-console.exe"),
Expand All @@ -125,24 +125,24 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
checks: new PackageCheck[] {
HasFiles("LICENSE.txt", "NOTICES.txt"),
HasDirectory("lib/net462").WithFiles(
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
HasDirectory("lib/net8.0").WithFiles(
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll", "Microsoft.Extensions.DependencyModel.dll"),
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll", "Microsoft.Extensions.DependencyModel.dll"),
HasDirectory("agents/net462").WithFiles(
"nunit-agent-net462.exe", "nunit-agent-net462.exe.config",
"nunit-agent-net462-x86.exe", "nunit-agent-net462-x86.exe.config",
"nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll") },
"nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll") },
symbols: new PackageCheck[] {
HasDirectory("lib/net462").WithFiles(
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb"),
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"),
HasDirectory("lib/netstandard2.0").WithFiles(
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb"),
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"),
HasDirectory("lib/net6.0").WithFiles(
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb"),
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"),
HasDirectory("lib/net8.0").WithFiles(
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb"),
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"),
HasDirectory("contentFiles/any/agents/net462").WithFiles(
"nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb")
"nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb")
}),

NUnitEngineApiPackage = new NuGetPackage(
Expand Down
6 changes: 6 additions & 0 deletions choco/nunit-console-runner.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
<file src = "$BIN_DIR$net462/nunit.engine.api.dll" target="tools" />
<file src = "$BIN_DIR$net462/nunit.engine.api.xml" target="tools" />
<file src = "$BIN_DIR$net462/nunit.engine.core.dll" target="tools" />
<file src = "$BIN_DIR$net462/nunit.common.dll" target="tools" />
<file src = "$BIN_DIR$net462/nunit.engine.dll" target="tools" />
<file src = "$BIN_DIR$net462/testcentric.metadata.dll" target="tools" />

Expand All @@ -46,6 +47,7 @@
<file src = "$BIN_DIR$agents/net462/nunit.engine.api.dll" target="tools/agents/net462" />
<file src = "$BIN_DIR$agents/net462/nunit.engine.api.xml" target="tools/agents/net462" />
<file src = "$BIN_DIR$agents/net462/nunit.engine.core.dll" target="tools/agents/net462" />
<file src = "$BIN_DIR$agents/net462/nunit.common.dll" target="tools/agents/net462" />
<file src = "$BIN_DIR$agents/net462/testcentric.metadata.dll" target="tools/agents/net462" />
<file src = "nunit-agent.exe.ignore" target="tools/agents/net462" />
<file src = "nunit-agent-x86.exe.ignore" target="tools/agents/net462" />
Expand All @@ -57,6 +59,7 @@
<file src = "$BIN_DIR$agents/netcoreapp3.1/nunit.engine.api.dll" target="tools/agents/netcoreapp3.1" />
<file src = "$BIN_DIR$agents/netcoreapp3.1/nunit.engine.api.xml" target="tools/agents/netcoreapp3.1" />
<file src = "$BIN_DIR$agents/netcoreapp3.1/nunit.engine.core.dll" target="tools/agents/netcoreapp3.1" />
<file src = "$BIN_DIR$agents/netcoreapp3.1/nunit.common.dll" target="tools/agents/netcoreapp3.1" />
<file src = "$BIN_DIR$agents/netcoreapp3.1/testcentric.metadata.dll" target="tools/agents/netcoreapp3.1" />
<file src = "$BIN_DIR$agents/netcoreapp3.1/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/netcoreapp3.1" />

Expand All @@ -67,6 +70,7 @@
<file src = "$BIN_DIR$agents/net6.0/nunit.engine.api.dll" target="tools/agents/net6.0" />
<file src = "$BIN_DIR$agents/net6.0/nunit.engine.api.xml" target="tools/agents/net6.0" />
<file src = "$BIN_DIR$agents/net6.0/nunit.engine.core.dll" target="tools/agents/net6.0" />
<file src = "$BIN_DIR$agents/net6.0/nunit.common.dll" target="tools/agents/net6.0" />
<file src = "$BIN_DIR$agents/net6.0/testcentric.metadata.dll" target="tools/agents/net6.0" />
<file src = "$BIN_DIR$agents/net6.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net6.0" />

Expand All @@ -77,6 +81,7 @@
<file src = "$BIN_DIR$agents/net7.0/nunit.engine.api.dll" target="tools/agents/net7.0" />
<file src = "$BIN_DIR$agents/net7.0/nunit.engine.api.xml" target="tools/agents/net7.0" />
<file src = "$BIN_DIR$agents/net7.0/nunit.engine.core.dll" target="tools/agents/net7.0" />
<file src = "$BIN_DIR$agents/net7.0/nunit.common.dll" target="tools/agents/net7.0" />
<file src = "$BIN_DIR$agents/net7.0/testcentric.metadata.dll" target="tools/agents/net7.0" />
<file src = "$BIN_DIR$agents/net7.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net7.0" />

Expand All @@ -87,6 +92,7 @@
<file src = "$BIN_DIR$agents/net8.0/nunit.engine.api.dll" target="tools/agents/net8.0" />
<file src = "$BIN_DIR$agents/net8.0/nunit.engine.api.xml" target="tools/agents/net8.0" />
<file src = "$BIN_DIR$agents/net8.0/nunit.engine.core.dll" target="tools/agents/net8.0" />
<file src = "$BIN_DIR$agents/net8.0/nunit.common.dll" target="tools/agents/net8.0" />
<file src = "$BIN_DIR$agents/net8.0/testcentric.metadata.dll" target="tools/agents/net8.0" />
<file src = "$BIN_DIR$agents/net8.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net8.0" />
</files>
Expand Down
14 changes: 14 additions & 0 deletions nuget/engine/nunit.engine.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
<file src="net462/nunit.engine.pdb" target="lib/net462" />
<file src="net462/nunit.engine.core.dll" target="lib/net462" />
<file src="net462/nunit.engine.core.pdb" target="lib/net462" />
<file src="net462/nunit.common.dll" target="lib/net462" />
<file src="net462/nunit.common.pdb" target="lib/net462" />
<file src="net462/nunit.engine.api.dll" target="lib/net462" />
<file src="net462/nunit.engine.api.pdb" target="lib/net462" />
<file src="net462/testcentric.metadata.dll" target="lib/net462" />
Expand All @@ -48,6 +50,8 @@
<file src="net8.0/nunit.engine.pdb" target="lib/net8.0" />
<file src="net8.0/nunit.engine.core.dll" target="lib/net8.0" />
<file src="net8.0/nunit.engine.core.pdb" target="lib/net8.0" />
<file src="net8.0/nunit.common.dll" target="lib/net8.0" />
<file src="net8.0/nunit.common.pdb" target="lib/net8.0" />
<file src="net8.0/nunit.engine.api.dll" target="lib/net8.0" />
<file src="net8.0/nunit.engine.api.pdb" target="lib/net8.0" />
<file src="net8.0/testcentric.metadata.dll" target="lib/net8.0" />
Expand All @@ -62,6 +66,8 @@
<file src="agents/net462/nunit-agent-net462-x86.exe.config" target="agents/net462" />
<file src="agents/net462/nunit.engine.core.dll" target="agents/net462" />
<file src="agents/net462/nunit.engine.core.pdb" target="agents/net462" />
<file src="agents/net462/nunit.common.dll" target="agents/net462" />
<file src="agents/net462/nunit.common.pdb" target="agents/net462" />
<file src="agents/net462/nunit.engine.api.dll" target="agents/net462" />
<file src="agents/net462/nunit.engine.api.pdb" target="agents/net462" />
<file src="agents/net462/testcentric.metadata.dll" target="agents/net462" />
Expand All @@ -73,6 +79,8 @@
<file src="agents/netcoreapp3.1/nunit-agent-netcore31.runtimeconfig.json" target="agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit.engine.core.dll" target="agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit.engine.core.pdb" target="agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit.common.dll" target="agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit.common.pdb" target="agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit.engine.api.dll" target="agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit.engine.api.pdb" target="agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/testcentric.metadata.dll" target="agents/netcoreapp3.1" />
Expand All @@ -85,6 +93,8 @@
<file src="agents/net6.0/nunit-agent-net60.runtimeconfig.json" target="agents/net6.0" />
<file src="agents/net6.0/nunit.engine.core.dll" target="agents/net6.0" />
<file src="agents/net6.0/nunit.engine.core.pdb" target="agents/net6.0" />
<file src="agents/net6.0/nunit.common.dll" target="agents/net6.0" />
<file src="agents/net6.0/nunit.common.pdb" target="agents/net6.0" />
<file src="agents/net6.0/nunit.engine.api.dll" target="agents/net6.0" />
<file src="agents/net6.0/nunit.engine.api.pdb" target="agents/net6.0" />
<file src="agents/net6.0/testcentric.metadata.dll" target="agents/net6.0" />
Expand All @@ -97,6 +107,8 @@
<file src="agents/net7.0/nunit-agent-net70.runtimeconfig.json" target="agents/net7.0" />
<file src="agents/net7.0/nunit.engine.core.dll" target="agents/net7.0" />
<file src="agents/net7.0/nunit.engine.core.pdb" target="agents/net7.0" />
<file src="agents/net7.0/nunit.common.dll" target="agents/net7.0" />
<file src="agents/net7.0/nunit.common.pdb" target="agents/net7.0" />
<file src="agents/net7.0/nunit.engine.api.dll" target="agents/net7.0" />
<file src="agents/net7.0/nunit.engine.api.pdb" target="agents/net7.0" />
<file src="agents/net7.0/testcentric.metadata.dll" target="agents/net7.0" />
Expand All @@ -109,6 +121,8 @@
<file src="agents/net8.0/nunit-agent-net80.runtimeconfig.json" target="agents/net8.0" />
<file src="agents/net8.0/nunit.engine.core.dll" target="agents/net8.0" />
<file src="agents/net8.0/nunit.engine.core.pdb" target="agents/net8.0" />
<file src="agents/net8.0/nunit.common.dll" target="agents/net8.0" />
<file src="agents/net8.0/nunit.common.pdb" target="agents/net8.0" />
<file src="agents/net8.0/nunit.engine.api.dll" target="agents/net8.0" />
<file src="agents/net8.0/nunit.engine.api.pdb" target="agents/net8.0" />
<file src="agents/net8.0/testcentric.metadata.dll" target="agents/net8.0" />
Expand Down
2 changes: 2 additions & 0 deletions nuget/runners/nunit.console-runner.netcore.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
<file src="net8.0/nunit-netcore-console.runtimeconfig.json" target="tools/net8.0/any" />
<file src="net8.0/nunit.engine.core.dll" target="tools/net8.0/any" />
<file src="net8.0/nunit.engine.core.pdb" target="tools/net8.0/any" />
<file src="net8.0/nunit.common.dll" target="tools/net8.0/any" />
<file src="net8.0/nunit.common.pdb" target="tools/net8.0/any" />
<file src="net8.0/nunit.engine.dll" target="tools/net8.0/any" />
<file src="net8.0/nunit.engine.pdb" target="tools/net8.0/any" />
<file src="net8.0/nunit.engine.api.dll" target="tools/net8.0/any" />
Expand Down
Loading

0 comments on commit ed4f647

Please sign in to comment.