Skip to content

Commit 83d154c

Browse files
authored
Merge pull request #1450 from nunit/issue-1449
Remove duplicate package id
2 parents d74da04 + 14e0099 commit 83d154c

File tree

2 files changed

+4
-36
lines changed

2 files changed

+4
-36
lines changed

build.cake

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,7 @@ FilePath[] CONSOLE_FILES_NETCORE = {
228228

229229
PackageDefinition NUnitConsoleNuGetPackage;
230230
PackageDefinition NUnitConsoleRunnerNuGetPackage;
231-
PackageDefinition NUnitConsoleRunnerNet60Package;
232-
PackageDefinition NUnitConsoleRunnerNet80Package;
231+
PackageDefinition NUnitConsoleRunnerNetCorePackage;
233232
PackageDefinition NUnitEnginePackage;
234233
PackageDefinition NUnitEngineApiPackage;
235234
PackageDefinition NUnitConsoleRunnerChocolateyPackage;
@@ -267,21 +266,7 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
267266
source: BuildSettings.NuGetDirectory + "runners/nunit.console-runner-with-extensions.nuspec",
268267
checks: new PackageCheck[] { HasFile("LICENSE.txt") }),
269268

270-
NUnitConsoleRunnerNet80Package = new NuGetPackage(
271-
id: "NUnit.ConsoleRunner.NetCore",
272-
source: BuildSettings.NuGetDirectory + "runners/nunit.console-runner.netcore.nuspec",
273-
checks: new PackageCheck[] {
274-
HasFiles("LICENSE.txt", "NOTICES.txt"),
275-
HasDirectory("tools/net8.0").WithFiles(CONSOLE_FILES_NETCORE).AndFiles(ENGINE_CORE_FILES).AndFile("nunit.console.nuget.addins")
276-
},
277-
symbols: new PackageCheck[] {
278-
HasDirectory("tools/net8.0").WithFile("nunit3-console.pdb").AndFiles(ENGINE_PDB_FILES)
279-
},
280-
testRunner: new ConsoleRunnerSelfTester(BuildSettings.NuGetTestDirectory
281-
+ $"NUnit.ConsoleRunner.NetCore.{BuildSettings.PackageVersion}/tools/net8.0/nunit3-console.exe"),
282-
tests: NetCoreRunnerTests),
283-
284-
NUnitConsoleRunnerNet60Package = new NuGetPackage(
269+
NUnitConsoleRunnerNetCorePackage = new NuGetPackage(
285270
id: "NUnit.ConsoleRunner.NetCore",
286271
source: BuildSettings.NuGetDirectory + "runners/nunit.console-runner.netcore.nuspec",
287272
checks: new PackageCheck[] {

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

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<files>
2727
<file src="../../LICENSE.txt" />
2828
<file src="../../NOTICES.txt" />
29+
2930
<file src="net6.0/nunit3-console.exe" target="tools/net6.0/" />
3031
<file src="net6.0/nunit3-console.pdb" target="tools/net6.0/" />
3132
<file src="net6.0/nunit3-console.dll" target="tools/net6.0/" />
@@ -43,25 +44,7 @@
4344
<file src="net6.0/Microsoft.Extensions.DependencyModel.dll" target="tools/net6.0" />
4445
<file src="../../nuget/runners/nunit.console.nuget.addins" target="tools/net6.0"/>
4546
<file src="../../nuget/runners/DotnetToolSettings.xml" target="tools/net6.0"/>
46-
47-
<file src="net8.0/nunit3-console.exe" target="tools/net8.0" />
48-
<file src="net8.0/nunit3-console.pdb" target="tools/net8.0" />
49-
<file src="net8.0/nunit3-console.dll" target="tools/net8.0" />
50-
<file src="net8.0/nunit3-console.dll.config" target="tools/net8.0" />
51-
<file src="net8.0/nunit3-console.deps.json" target="tools/net8.0" />
52-
<file src="net8.0/nunit3-console.runtimeconfig.json" target="tools/net8.0" />
53-
<file src="net8.0/nunit.engine.core.dll" target="tools/net8.0" />
54-
<file src="net8.0/nunit.engine.core.pdb" target="tools/net8.0" />
55-
<file src="net8.0/nunit.engine.dll" target="tools/net8.0" />
56-
<file src="net8.0/nunit.engine.pdb" target="tools/net8.0" />
57-
<file src="net8.0/nunit.engine.api.dll" target="tools/net8.0" />
58-
<file src="net8.0/nunit.engine.api.pdb" target="tools/net8.0" />
59-
<file src="net8.0/nunit.engine.api.xml" target="tools/net8.0" />
60-
<file src="net8.0/testcentric.engine.metadata.dll" target="tools/net8.0" />
61-
<file src="net8.0/Microsoft.Extensions.DependencyModel.dll" target="tools/net8.0" />
62-
<file src="../../nuget/runners/nunit.console.nuget.addins" target="tools/net8.0"/>
63-
<file src="../../nuget/runners/DotnetToolSettings.xml" target="tools/net8.0"/>
64-
47+
6548
<file src="../../nunit_256.png" target="images"/>
6649
</files>
6750
</package>

0 commit comments

Comments
 (0)