Skip to content

Commit

Permalink
Merge pull request #1584 from nunit/issue-1149
Browse files Browse the repository at this point in the history 
Change runner exe names; change chocolatey package name
  • Loading branch information
@CharliePoole
CharliePoole authored Dec 31, 2024
2 parents 17b1783 + ffd8198 commit 746de61
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 39 deletions.
12 changes: 0 additions & 12 deletions NUnitConsole.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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}
Expand Down
14 changes: 7 additions & 7 deletions build.cake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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(
Expand All @@ -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
Expand All @@ -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")
},
Expand All @@ -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",
Expand All @@ -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(
Expand Down
12 changes: 6 additions & 6 deletions choco/nunit-console-runner.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<!-- Do not remove this test for UTF-8: if “Ω” doesn’t appear as greek uppercase omega letter enclosed in quotation marks, you should use an editor that supports UTF-8, not this one. -->
<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
<metadata>
<id>nunit-console-runner</id>
<id>nunit-console-runner-v4</id>
<version>0.0.0</version>
<title>NUnit 3 Console Runner</title>
<summary>Console runner for the NUnit 3 unit-testing framework.</summary>
<title>NUnit Console Runner V4</title>
<summary>Console runner for the NUnit unit-testing framework.</summary>
<description>
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.
</description>
<projectUrl>https://nunit.org</projectUrl>
<projectSourceUrl>https://github.com/nunit/nunit-console</projectSourceUrl>
Expand All @@ -31,8 +31,8 @@
<file src = "VERIFICATION.txt" target = "tools" />
<file src = "nunit.choco.addins" target = "tools" />

<file src = "$BIN_DIR$net462/nunit4-console.exe" target="tools" />
<file src = "$BIN_DIR$net462/nunit4-console.exe.config" target="tools" />
<file src = "$BIN_DIR$net462/nunit-console.exe" target="tools" />
<file src = "$BIN_DIR$net462/nunit-console.exe.config" target="tools" />
<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" />
Expand Down
2 changes: 1 addition & 1 deletion nuget/runners/DotnetToolSettings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<DotNetCliTool>
<Commands>
<Command Name="nunit" EntryPoint="nunit4-netcore-console.dll" Runner="dotnet" />
<Command Name="nunit" EntryPoint="nunit-netcore-console.dll" Runner="dotnet" />
</Commands>
</DotNetCliTool>
2 changes: 1 addition & 1 deletion nuget/runners/nunit.console-runner-with-extensions.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<summary>Console runner for the NUnit unit-testing framework with selected extensions.</summary>
<description>
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
Expand Down
12 changes: 6 additions & 6 deletions nuget/runners/nunit.console-runner.netcore.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
<files>
<file src="../../LICENSE.txt" />
<file src="../../NOTICES.txt" />
<file src="net8.0/nunit4-netcore-console.exe" target="tools/net8.0/any" />
<file src="net8.0/nunit4-netcore-console.pdb" target="tools/net8.0/any" />
<file src="net8.0/nunit4-netcore-console.dll" target="tools/net8.0/any" />
<file src="net8.0/nunit4-netcore-console.dll.config" target="tools/net8.0/any" />
<file src="net8.0/nunit4-netcore-console.deps.json" target="tools/net8.0/any" />
<file src="net8.0/nunit4-netcore-console.runtimeconfig.json" target="tools/net8.0/any" />
<file src="net8.0/nunit-netcore-console.exe" target="tools/net8.0/any" />
<file src="net8.0/nunit-netcore-console.pdb" target="tools/net8.0/any" />
<file src="net8.0/nunit-netcore-console.dll" target="tools/net8.0/any" />
<file src="net8.0/nunit-netcore-console.dll.config" target="tools/net8.0/any" />
<file src="net8.0/nunit-netcore-console.deps.json" target="tools/net8.0/any" />
<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.engine.dll" target="tools/net8.0/any" />
Expand Down
6 changes: 3 additions & 3 deletions nuget/runners/nunit.console-runner.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@
<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="net462/nunit4-console.exe" target="tools" />
<file src="net462/nunit4-console.pdb" target="tools" />
<file src="net462/nunit4-console.exe.config" target="tools" />
<file src="net462/nunit-console.exe" target="tools" />
<file src="net462/nunit-console.pdb" target="tools" />
<file src="net462/nunit-console.exe.config" target="tools" />
<file src="net462/nunit.engine.api.dll" target="tools" />
<file src="net462/nunit.engine.api.pdb" target="tools" />
<file src="net462/nunit.engine.api.xml" target="tools" />
Expand Down
2 changes: 1 addition & 1 deletion src/NUnitConsole/nunit4-console/nunit4-console.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<RootNamespace>NUnit.ConsoleRunner</RootNamespace>
<AssemblyName>nunit4-console</AssemblyName>
<AssemblyName>nunit-console</AssemblyName>
<TargetFrameworks>net462</TargetFrameworks>
<OutputPath>../../../bin/$(Configuration)</OutputPath>
<RollForward>Major</RollForward>
Expand Down
2 changes: 1 addition & 1 deletion src/NUnitConsole/nunit4-netcore-console/nunit4-netcore-console.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<RootNamespace>NUnit.ConsoleRunner</RootNamespace>
<AssemblyName>nunit4-netcore-console</AssemblyName>
<AssemblyName>nunit-netcore-console</AssemblyName>
<TargetFrameworks>net8.0</TargetFrameworks>
<OutputPath>../../../bin/$(Configuration)</OutputPath>
<RollForward>Major</RollForward>
Expand Down
1 change: 0 additions & 1 deletion zip/nunit.bundle.addins
View file

This file was deleted.

0 comments on commit 746de61

Please sign in to comment.