Skip to content

Commit

Permalink
Addins files for agents; test NUnitProjectLoader extension
Browse files Browse the repository at this point in the history
  • Loading branch information
CharliePoole committed Jun 10, 2024
1 parent f861b05 commit c8fe139
Show file tree
Hide file tree
Showing 11 changed files with 82 additions and 39 deletions.
2 changes: 1 addition & 1 deletion GitVersion.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
next-version: 3.17.1
next-version: 3.18.0
mode: ContinuousDelivery
legacy-semver-padding: 5
build-metadata-padding: 5
Expand Down
6 changes: 3 additions & 3 deletions NUnitConsole.sln
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "runners", "runners", "{F3E87D0F-6F06-4C0B-AE06-42C0834C3C6E}"
ProjectSection(SolutionItems) = preProject
nuget\runners\DotnetToolSettings.xml = nuget\runners\DotnetToolSettings.xml
nuget\runners\nunit.agent.addins = nuget\runners\nunit.agent.addins
nuget\runners\nunit.console-runner-with-extensions.nuspec = nuget\runners\nunit.console-runner-with-extensions.nuspec
nuget\runners\nunit.console-runner.netcore.nuspec = nuget\runners\nunit.console-runner.netcore.nuspec
nuget\runners\nunit.console-runner.nuspec = nuget\runners\nunit.console-runner.nuspec
nuget\runners\nunit.console.nuget.addins = nuget\runners\nunit.console.nuget.addins
nuget\runners\nunit.console.nuget.agent.addins = nuget\runners\nunit.console.nuget.agent.addins
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mock-assembly", "src\NUnitEngine\mock-assembly\mock-assembly.csproj", "{D2C80E4B-1117-4F02-AB02-E453BDA0C58E}"
Expand All @@ -85,9 +85,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "choco", "choco", "{4FDF7BFA
choco\nunit-agent-x86.exe.ignore = choco\nunit-agent-x86.exe.ignore
choco\nunit-agent.exe.ignore = choco\nunit-agent.exe.ignore
choco\nunit-console-runner.nuspec = choco\nunit-console-runner.nuspec
choco\nunit.agent.addins = choco\nunit.agent.addins
choco\nunit.choco.addins = choco\nunit.choco.addins
choco\VERIFICATION.txt = choco\VERIFICATION.txt
choco\nunit.console.choco.addins = choco\nunit.console.choco.addins
choco\nunit.console.choco.agent.addins = choco\nunit.console.choco.agent.addins
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deprecated", "deprecated", "{9A7C8370-ED1F-486F-A8F5-C5BF4221464E}"
Expand Down
37 changes: 19 additions & 18 deletions cake/package-definitions.cake
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ public void InitializePackageDefinitions(ICakeContext context)
Net70Test,
Net80Test,
Net50PlusNet60Test,
Net40PlusNet60Test
Net40PlusNet60Test,
NUnitProjectTest
};

// Tests run for the NETCORE runner package
Expand Down Expand Up @@ -79,13 +80,13 @@ public void InitializePackageDefinitions(ICakeContext context)
checks: new PackageCheck[] {
HasFiles("LICENSE.txt", "NOTICES.txt"),
HasDirectory("tools").WithFiles(CONSOLE_FILES).AndFiles(ENGINE_FILES).AndFile("nunit.console.nuget.addins"),
HasDirectory("tools/agents/net20").WithFiles(AGENT_FILES).AndFile("nunit.agent.addins"),
HasDirectory("tools/agents/net40").WithFiles(AGENT_FILES).AndFile("nunit.agent.addins"),
HasDirectory("tools/agents/netcoreapp3.1").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.agent.addins"),
HasDirectory("tools/agents/net5.0").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.agent.addins"),
HasDirectory("tools/agents/net6.0").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.agent.addins"),
HasDirectory("tools/agents/net7.0").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.agent.addins"),
HasDirectory("tools/agents/net8.0").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.agent.addins")
HasDirectory("tools/agents/net20").WithFiles(AGENT_FILES).AndFile("nunit.console.nuget.agent.addins"),
HasDirectory("tools/agents/net40").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")
},
symbols: new PackageCheck[] {
HasDirectory("tools").WithFiles(ENGINE_PDB_FILES).AndFile("nunit3-console.pdb"),
Expand Down Expand Up @@ -136,14 +137,14 @@ public void InitializePackageDefinitions(ICakeContext context)
version: ProductVersion,
source: CHOCO_DIR + "nunit-console-runner.nuspec",
checks: new PackageCheck[] {
HasDirectory("tools").WithFiles("LICENSE.txt", "NOTICES.txt", "VERIFICATION.txt").AndFiles(CONSOLE_FILES).AndFiles(ENGINE_FILES).AndFile("nunit.choco.addins"),
HasDirectory("tools/agents/net20").WithFiles(AGENT_FILES).AndFile("nunit.agent.addins"),
HasDirectory("tools/agents/net40").WithFiles(AGENT_FILES).AndFile("nunit.agent.addins"),
HasDirectory("tools/agents/netcoreapp3.1").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.agent.addins"),
HasDirectory("tools/agents/net5.0").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.agent.addins"),
HasDirectory("tools/agents/net6.0").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.agent.addins"),
HasDirectory("tools/agents/net7.0").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.agent.addins"),
HasDirectory("tools/agents/net8.0").WithFiles(AGENT_FILES_NETCORE).AndFile("nunit.agent.addins")
HasDirectory("tools").WithFiles("LICENSE.txt", "NOTICES.txt", "VERIFICATION.txt").AndFiles(CONSOLE_FILES).AndFiles(ENGINE_FILES).AndFile("nunit.console.choco.addins"),
HasDirectory("tools/agents/net20").WithFiles(AGENT_FILES).AndFile("nunit.console.choco.agent.addins"),
HasDirectory("tools/agents/net40").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")
},
executable: "tools/nunit3-console.exe",
tests: StandardRunnerTests),
Expand All @@ -159,7 +160,7 @@ public void InitializePackageDefinitions(ICakeContext context)
HasDirectory("Nunit.org/nunit-console/addins").WithFiles("nunit.core.dll", "nunit.core.interfaces.dll", "nunit.v2.driver.dll", "nunit-project-loader.dll", "vs-project-loader.dll", "nunit-v2-result-writer.dll", "teamcity-event-listener.dll")
},
executable: "NUnit.org/nunit-console/nunit3-console.exe",
tests: StandardRunnerTests.Concat(new[] { NUnitProjectTest })),
tests: StandardRunnerTests),

NUnitConsoleZipPackage = new ZipPackage(
context: context,
Expand All @@ -181,7 +182,7 @@ public void InitializePackageDefinitions(ICakeContext context)
HasDirectory("bin/agents/net8.0").WithFiles(AGENT_FILES_NETCORE).AndFiles(AGENT_PDB_FILES_NETCORE)
},
executable: "bin/net20/nunit3-console.exe",
tests: StandardRunnerTests.Concat(new[] { NUnitProjectTest })),
tests: StandardRunnerTests),

// NOTE: Packages below this point have no direct tests

Expand Down
28 changes: 28 additions & 0 deletions cake/package-tester.cake
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,37 @@ public class PackageTester
{
Console.WriteLine($"Unzipping package to {_installDirectory}");
_context.Unzip(_packageUnderTest, _installDirectory);

if (_packageType == PackageType.NuGet || _packageType == PackageType.Chocolatey)
{
foreach (string packageDir in System.IO.Directory.GetDirectories(EXTENSIONS_DIR))
{
string subdir = _packageType.ToString().ToLower();
string packageName = System.IO.Path.GetFileName(packageDir);
string targetDir = $"{PACKAGE_TEST_DIR}{subdir}/{packageName}";

_context.CopyDirectory(packageDir, targetDir);

if (_packageType == PackageType.Chocolatey)
RenamePackageForChocolatey(targetDir);
}
}
}
}

private void RenamePackageForChocolatey(string nugetDir)
{
string chocoDir = nugetDir
.Replace("NUnit.Extension.NUnitProjectLoader", "nunit-extension-nunit-project-loader")
.Replace("NUnit.Extension.VSProjectLoader", "nunit-extension-vs-project-loader")
.Replace("NUnit.Extension.NUnitV2ResultWriter", "nunit-extension-v2-result-writer")
.Replace("NUnit.Extension.NUnitV2Driver", "nunit-extension-nunit-v2-driver")
.Replace("NUnit.Extension.TeamCityEventListener", "nunit-extension-teamcity-event-listener");

if (chocoDir != nugetDir)
_context.MoveDirectory(nugetDir, chocoDir);
}

private void RunPackageTests()
{
var reporter = new ResultReporter(_packageName);
Expand Down
16 changes: 8 additions & 8 deletions choco/nunit-console-runner.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<file src = "../LICENSE.txt" target = "tools" />
<file src = "../NOTICES.txt" target = "tools" />
<file src = "VERIFICATION.txt" target = "tools" />
<file src = "nunit.choco.addins" target = "tools" />
<file src = "nunit.console.choco.addins" target = "tools" />

<file src = "$BIN_DIR$net20/nunit3-console.exe" target="tools" />
<file src = "$BIN_DIR$net20/nunit3-console.exe.config" target="tools" />
Expand All @@ -49,7 +49,7 @@
<file src = "$BIN_DIR$agents/net20/testcentric.engine.metadata.dll" target="tools/agents/net20" />
<file src = "nunit-agent.exe.ignore" target="tools/agents/net20" />
<file src = "nunit-agent-x86.exe.ignore" target="tools/agents/net20" />
<file src = "nunit.agent.addins" target = "tools/agents/net20" />
<file src = "nunit.console.choco.agent.addins" target = "tools/agents/net20" />

<file src = "$BIN_DIR$agents/net40/nunit-agent.exe" target="tools/agents/net40" />
<file src = "$BIN_DIR$agents/net40/nunit-agent.exe.config" target="tools/agents/net40" />
Expand All @@ -61,7 +61,7 @@
<file src = "$BIN_DIR$agents/net40/testcentric.engine.metadata.dll" target="tools/agents/net40" />
<file src = "nunit-agent.exe.ignore" target="tools/agents/net40" />
<file src = "nunit-agent-x86.exe.ignore" target="tools/agents/net40" />
<file src = "nunit.agent.addins" target = "tools/agents/net40" />
<file src = "nunit.console.choco.agent.addins" target = "tools/agents/net40" />

<file src = "$BIN_DIR$agents/netcoreapp3.1/nunit-agent.dll" target="tools/agents/netcoreapp3.1" />
<file src = "$BIN_DIR$agents/netcoreapp3.1/nunit-agent.dll.config" target="tools/agents/netcoreapp3.1" />
Expand All @@ -72,7 +72,7 @@
<file src = "$BIN_DIR$agents/netcoreapp3.1/nunit.engine.core.dll" target="tools/agents/netcoreapp3.1" />
<file src = "$BIN_DIR$agents/netcoreapp3.1/testcentric.engine.metadata.dll" target="tools/agents/netcoreapp3.1" />
<file src = "$BIN_DIR$agents/netcoreapp3.1/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/netcoreapp3.1" />
<file src = "nunit.agent.addins" 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" />
Expand All @@ -83,7 +83,7 @@
<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.agent.addins" 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" />
Expand All @@ -94,7 +94,7 @@
<file src = "$BIN_DIR$agents/net6.0/nunit.engine.core.dll" target="tools/agents/net6.0" />
<file src = "$BIN_DIR$agents/net6.0/testcentric.engine.metadata.dll" target="tools/agents/net6.0" />
<file src = "$BIN_DIR$agents/net6.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net6.0" />
<file src = "nunit.agent.addins" target = "tools/agents/net6.0" />
<file src = "nunit.console.choco.agent.addins" target = "tools/agents/net6.0" />

<file src = "$BIN_DIR$agents/net7.0/nunit-agent.dll" target="tools/agents/net7.0" />
<file src = "$BIN_DIR$agents/net7.0/nunit-agent.dll.config" target="tools/agents/net7.0" />
Expand All @@ -105,7 +105,7 @@
<file src = "$BIN_DIR$agents/net7.0/nunit.engine.core.dll" target="tools/agents/net7.0" />
<file src = "$BIN_DIR$agents/net7.0/testcentric.engine.metadata.dll" target="tools/agents/net7.0" />
<file src = "$BIN_DIR$agents/net7.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net7.0" />
<file src = "nunit.agent.addins" target = "tools/agents/net7.0" />
<file src = "nunit.console.choco.agent.addins" target = "tools/agents/net7.0" />

<file src = "$BIN_DIR$agents/net8.0/nunit-agent.dll" target="tools/agents/net8.0" />
<file src = "$BIN_DIR$agents/net8.0/nunit-agent.dll.config" target="tools/agents/net8.0" />
Expand All @@ -116,6 +116,6 @@
<file src = "$BIN_DIR$agents/net8.0/nunit.engine.core.dll" target="tools/agents/net8.0" />
<file src = "$BIN_DIR$agents/net8.0/testcentric.engine.metadata.dll" target="tools/agents/net8.0" />
<file src = "$BIN_DIR$agents/net8.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net8.0" />
<file src = "nunit.agent.addins" target = "tools/agents/net8.0" />
<file src = "nunit.console.choco.agent.addins" target = "tools/agents/net8.0" />
</files>
</package>
1 change: 0 additions & 1 deletion choco/nunit.agent.addins

This file was deleted.

File renamed without changes.
5 changes: 5 additions & 0 deletions choco/nunit.console.choco.agent.addins
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Extensions built for a single runtime target
../../../../nunit-extension-*/tools/ # find extensions installed under chocolatey

# Extensions built for multiple targets
../../../../nunit-extension-*/tools/*/ # find extensions installed under chocolatey
1 change: 0 additions & 1 deletion nuget/runners/nunit.agent.addins

This file was deleted.

14 changes: 7 additions & 7 deletions nuget/runners/nunit.console-runner.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<file src="agents/net20/nunit.engine.core.dll" target="tools/agents/net20" />
<file src="agents/net20/nunit.engine.core.pdb" target="tools/agents/net20" />
<file src="agents/net20/testcentric.engine.metadata.dll" target="tools/agents/net20" />
<file src="../../nuget/runners/nunit.agent.addins" target="tools/agents/net20"/>
<file src="../../nuget/runners/nunit.console.nuget.agent.addins" target="tools/agents/net20"/>

<file src="agents/net40/nunit-agent.exe" target="tools/agents/net40" />
<file src="agents/net40/nunit-agent.pdb" target="tools/agents/net40" />
Expand All @@ -52,7 +52,7 @@
<file src="agents/net40/nunit.engine.core.dll" target="tools/agents/net40" />
<file src="agents/net40/nunit.engine.core.pdb" target="tools/agents/net40" />
<file src="agents/net40/testcentric.engine.metadata.dll" target="tools/agents/net40" />
<file src="../../nuget/runners/nunit.agent.addins" target="tools/agents/net40"/>
<file src="../../nuget/runners/nunit.console.nuget.agent.addins" target="tools/agents/net40"/>

<file src="agents/netcoreapp3.1/nunit-agent.dll" target="tools/agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit-agent.pdb" target="tools/agents/netcoreapp3.1" />
Expand All @@ -66,7 +66,7 @@
<file src="agents/netcoreapp3.1/nunit.engine.core.pdb" target="tools/agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/testcentric.engine.metadata.dll" target="tools/agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/netcoreapp3.1" />
<file src="../../nuget/engine/nunit.agent.addins" 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" />
Expand All @@ -80,7 +80,7 @@
<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/engine/nunit.agent.addins" 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" />
Expand All @@ -94,7 +94,7 @@
<file src="agents/net6.0/nunit.engine.core.pdb" target="tools/agents/net6.0" />
<file src="agents/net6.0/testcentric.engine.metadata.dll" target="tools/agents/net6.0" />
<file src="agents/net6.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net6.0" />
<file src="../../nuget/engine/nunit.agent.addins" target="tools/agents/net6.0"/>
<file src="../../nuget/runners/nunit.console.nuget.agent.addins" target="tools/agents/net6.0"/>

<file src="agents/net7.0/nunit-agent.dll" target="tools/agents/net7.0" />
<file src="agents/net7.0/nunit-agent.pdb" target="tools/agents/net7.0" />
Expand All @@ -108,7 +108,7 @@
<file src="agents/net7.0/nunit.engine.core.pdb" target="tools/agents/net7.0" />
<file src="agents/net7.0/testcentric.engine.metadata.dll" target="tools/agents/net7.0" />
<file src="agents/net7.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net7.0" />
<file src="../../nuget/engine/nunit.agent.addins" target="tools/agents/net7.0"/>
<file src="../../nuget/runners/nunit.console.nuget.agent.addins" target="tools/agents/net7.0"/>

<file src="agents/net8.0/nunit-agent.dll" target="tools/agents/net8.0" />
<file src="agents/net8.0/nunit-agent.pdb" target="tools/agents/net8.0" />
Expand All @@ -122,7 +122,7 @@
<file src="agents/net8.0/nunit.engine.core.pdb" target="tools/agents/net8.0" />
<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="../../nuget/engine/nunit.agent.addins" target="tools/agents/net8.0"/>
<file src="../../nuget/runners/nunit.console.nuget.agent.addins" target="tools/agents/net8.0"/>

<file src="net20/nunit3-console.exe" target="tools" />
<file src="net20/nunit3-console.pdb" target="tools" />
Expand Down
11 changes: 11 additions & 0 deletions nuget/runners/nunit.console.nuget.agent.addins
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Extensions built for a single runtime target
../../../../NUnit.Extension.*/**/tools/ # nuget v2 layout
../../../../../NUnit.Extension.*/**/tools/ # nuget v3 layout
../../../../nunit.extension.*/**/tools/ # nuget v2 layout
../../../../../nunit.extension.*/**/tools/ # nuget v3 layout

# Extensions built for multiple targets
../../../../NUnit.Extension.*/**/tools/*/ # nuget v2 layout
../../../../../NUnit.Extension.*/**/tools/*/ # nuget v3 layout
../../../../nunit.extension.*/**/tools/*/ # nuget v2 layout
../../../../../nunit.extension.*/**/tools/*/ # nuget v3 layout

0 comments on commit c8fe139

Please sign in to comment.