From ffd819876a0e107dafeeb7ece8d8c27d0a032da9 Mon Sep 17 00:00:00 2001 From: Charlie Poole Date: Tue, 31 Dec 2024 12:17:38 -0800 Subject: [PATCH] Change runner exe names; change chocolatey package name --- NUnitConsole.sln | 12 ------------ build.cake | 14 +++++++------- choco/nunit-console-runner.nuspec | 12 ++++++------ nuget/runners/DotnetToolSettings.xml | 2 +- .../nunit.console-runner-with-extensions.nuspec | 2 +- nuget/runners/nunit.console-runner.netcore.nuspec | 12 ++++++------ nuget/runners/nunit.console-runner.nuspec | 6 +++--- .../nunit4-console/nunit4-console.csproj | 2 +- .../nunit4-netcore-console.csproj | 2 +- zip/nunit.bundle.addins | 1 - 10 files changed, 26 insertions(+), 39 deletions(-) delete mode 100644 zip/nunit.bundle.addins diff --git a/NUnitConsole.sln b/NUnitConsole.sln index 7d1a6858f..24c9bd494 100644 --- a/NUnitConsole.sln +++ b/NUnitConsole.sln @@ -90,16 +90,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deprecated", "deprecated", choco\deprecated\nunit-console-with-extensions.nuspec = choco\deprecated\nunit-console-with-extensions.nuspec EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msi", "msi", "{0C0D20CE-70CD-4CEF-BE9B-AEB8A2DE9C8A}" - ProjectSection(SolutionItems) = preProject - msi\resources\nunit.bundle.addins = msi\resources\nunit.bundle.addins - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "zip", "zip", "{20005864-BE82-412D-99BF-288E2D8370E9}" - ProjectSection(SolutionItems) = preProject - zip\nunit.bundle.addins = zip\nunit.bundle.addins - EndProjectSection -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.engine.core.tests", "src\NUnitEngine\nunit.engine.core.tests\nunit.engine.core.tests.csproj", "{CACC0520-B452-4310-A33C-DC944129ACDD}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestData", "TestData", "{37D508B2-91E0-4B32-869B-DFF9E68EA213}" @@ -268,8 +258,6 @@ Global {A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39} {9D3015EE-5B84-41B3-A1D3-1A439370C392} = {37D508B2-91E0-4B32-869B-DFF9E68EA213} {068F6CA9-6108-4F45-8540-351AA5227259} = {4FDF7BFA-A337-41D3-898D-C6A98278E6AD} - {0C0D20CE-70CD-4CEF-BE9B-AEB8A2DE9C8A} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF} - {20005864-BE82-412D-99BF-288E2D8370E9} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF} {CACC0520-B452-4310-A33C-DC944129ACDD} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39} {1704B7B2-5AD3-44EA-AB26-445C4E4E2C54} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39} {D5CC541C-95B7-4CB4-AADD-660FDCC281B8} = {1704B7B2-5AD3-44EA-AB26-445C4E4E2C54} diff --git a/build.cake b/build.cake index 6ef40cae6..089d011b1 100644 --- a/build.cake +++ b/build.cake @@ -35,7 +35,7 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] { checks: new PackageCheck[] { HasFiles("LICENSE.txt", "NOTICES.txt"), HasDirectory("tools").WithFiles( - "nunit4-console.exe", "nunit4-console.exe.config", + "nunit-console.exe", "nunit-console.exe.config", "nunit.engine.dll", "nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.engine.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", @@ -55,7 +55,7 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] { }, symbols: new PackageCheck[] { HasDirectory("tools").WithFiles( - "nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb", "nunit4-console.pdb"), + "nunit.engine.pdb", "nunit.engine.core.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"), HasDirectory("tools/agents/netcoreapp3.1").WithFiles( @@ -68,7 +68,7 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] { "nunit-agent.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb") }, testRunner: new ConsoleRunnerSelfTester(BuildSettings.NuGetTestDirectory - + $"NUnit.ConsoleRunner.{BuildSettings.PackageVersion}/tools/nunit4-console.exe"), + + $"NUnit.ConsoleRunner.{BuildSettings.PackageVersion}/tools/nunit-console.exe"), tests: StandardRunnerTests), // NOTE: Must follow ConsoleRunner, upon which it depends @@ -84,7 +84,7 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] { { HasFiles("nunit.exe"), HasDirectory(".store/nunit.consolerunner.netcore/**/tools/net8.0/any").WithFiles( - "nunit4-netcore-console.dll", "nunit4-netcore-console.dll.config", + "nunit-netcore-console.dll", "nunit-netcore-console.dll.config", "nunit.engine.dll", "nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.engine.metadata.dll", "Microsoft.Extensions.DependencyModel.dll") }, @@ -93,11 +93,11 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] { tests: NetCoreRunnerTests), NUnitConsoleRunnerChocolateyPackage = new ChocolateyPackage( - id: "nunit-console-runner", + id: "nunit-console-runner-v4", source: BuildSettings.ChocolateyDirectory + "nunit-console-runner.nuspec", checks: new PackageCheck[] { HasDirectory("tools").WithFiles( - "LICENSE.txt", "NOTICES.txt", "VERIFICATION.txt", "nunit4-console.exe", "nunit4-console.exe.config", + "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.engine.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", @@ -116,7 +116,7 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] { "nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.engine.metadata.dll") }, testRunner: new ConsoleRunnerSelfTester(BuildSettings.ChocolateyTestDirectory - + $"nunit-console-runner.{BuildSettings.PackageVersion}/tools/nunit4-console.exe"), + + $"nunit-console-runner-v4.{BuildSettings.PackageVersion}/tools/nunit-console.exe"), tests: StandardRunnerTests), NUnitEnginePackage = new NuGetPackage( diff --git a/choco/nunit-console-runner.nuspec b/choco/nunit-console-runner.nuspec index 73d9f0776..0a9a485f6 100644 --- a/choco/nunit-console-runner.nuspec +++ b/choco/nunit-console-runner.nuspec @@ -2,12 +2,12 @@ - nunit-console-runner + nunit-console-runner-v4 0.0.0 - NUnit 3 Console Runner - Console runner for the NUnit 3 unit-testing framework. + NUnit Console Runner V4 + Console runner for the NUnit unit-testing framework. - This package includes the nunit3-console runner and test engine for version 3 of the NUnit unit-testing framework. + This package includes version 4 of the NUnit Console Runner and test engine. https://nunit.org https://github.com/nunit/nunit-console @@ -31,8 +31,8 @@ - - + + diff --git a/nuget/runners/DotnetToolSettings.xml b/nuget/runners/DotnetToolSettings.xml index ee2ec209f..de890b752 100644 --- a/nuget/runners/DotnetToolSettings.xml +++ b/nuget/runners/DotnetToolSettings.xml @@ -1,6 +1,6 @@ - + diff --git a/nuget/runners/nunit.console-runner-with-extensions.nuspec b/nuget/runners/nunit.console-runner-with-extensions.nuspec index 73c0aad32..b741e39ff 100644 --- a/nuget/runners/nunit.console-runner-with-extensions.nuspec +++ b/nuget/runners/nunit.console-runner-with-extensions.nuspec @@ -14,7 +14,7 @@ false Console runner for the NUnit unit-testing framework with selected extensions. - This package includes the nunit4-console runner and test engine for the NUnit unit-testing framework. + This package includes the nunit-console runner and test engine for the NUnit unit-testing framework. The following extensions are included with this package: * NUnitProjectLoader - loads tests from NUnit projects diff --git a/nuget/runners/nunit.console-runner.netcore.nuspec b/nuget/runners/nunit.console-runner.netcore.nuspec index 449328ba9..6a60ddb93 100644 --- a/nuget/runners/nunit.console-runner.netcore.nuspec +++ b/nuget/runners/nunit.console-runner.netcore.nuspec @@ -29,12 +29,12 @@ - - - - - - + + + + + + diff --git a/nuget/runners/nunit.console-runner.nuspec b/nuget/runners/nunit.console-runner.nuspec index 63c6c66b3..bce19fcba 100644 --- a/nuget/runners/nunit.console-runner.nuspec +++ b/nuget/runners/nunit.console-runner.nuspec @@ -92,9 +92,9 @@ - - - + + + diff --git a/src/NUnitConsole/nunit4-console/nunit4-console.csproj b/src/NUnitConsole/nunit4-console/nunit4-console.csproj index 063e79ba8..e49338b0c 100644 --- a/src/NUnitConsole/nunit4-console/nunit4-console.csproj +++ b/src/NUnitConsole/nunit4-console/nunit4-console.csproj @@ -3,7 +3,7 @@ Exe NUnit.ConsoleRunner - nunit4-console + nunit-console net462 ../../../bin/$(Configuration) Major diff --git a/src/NUnitConsole/nunit4-netcore-console/nunit4-netcore-console.csproj b/src/NUnitConsole/nunit4-netcore-console/nunit4-netcore-console.csproj index 7313a7be5..83f6ee8fb 100644 --- a/src/NUnitConsole/nunit4-netcore-console/nunit4-netcore-console.csproj +++ b/src/NUnitConsole/nunit4-netcore-console/nunit4-netcore-console.csproj @@ -3,7 +3,7 @@ Exe NUnit.ConsoleRunner - nunit4-netcore-console + nunit-netcore-console net8.0 ../../../bin/$(Configuration) Major diff --git a/zip/nunit.bundle.addins b/zip/nunit.bundle.addins deleted file mode 100644 index 174b44cc6..000000000 --- a/zip/nunit.bundle.addins +++ /dev/null @@ -1 +0,0 @@ -addins/nunit-project-loader.dll