From 14e009938d71e52b297138eda75c177a0f22c519 Mon Sep 17 00:00:00 2001
From: Charlie Poole <charliepoole@gmail.com>
Date: Wed, 17 Jul 2024 16:38:50 -0700
Subject: [PATCH] Remove duplicate package id

---
 build.cake                                    | 19 ++---------------
 .../nunit.console-runner.netcore.nuspec       | 21 ++-----------------
 2 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/build.cake b/build.cake
index dd37c2dd3..3c64c10a8 100644
--- a/build.cake
+++ b/build.cake
@@ -228,8 +228,7 @@ FilePath[] CONSOLE_FILES_NETCORE = {
 
 PackageDefinition NUnitConsoleNuGetPackage;
 PackageDefinition NUnitConsoleRunnerNuGetPackage;
-PackageDefinition NUnitConsoleRunnerNet60Package;
-PackageDefinition NUnitConsoleRunnerNet80Package;
+PackageDefinition NUnitConsoleRunnerNetCorePackage;
 PackageDefinition NUnitEnginePackage;
 PackageDefinition NUnitEngineApiPackage;
 PackageDefinition NUnitConsoleRunnerChocolateyPackage;
@@ -267,21 +266,7 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
         source: BuildSettings.NuGetDirectory + "runners/nunit.console-runner-with-extensions.nuspec",
         checks: new PackageCheck[] { HasFile("LICENSE.txt") }),
 
-    NUnitConsoleRunnerNet80Package = new NuGetPackage(
-        id: "NUnit.ConsoleRunner.NetCore",
-        source: BuildSettings.NuGetDirectory + "runners/nunit.console-runner.netcore.nuspec",
-        checks: new PackageCheck[] {
-            HasFiles("LICENSE.txt", "NOTICES.txt"),
-            HasDirectory("tools/net8.0").WithFiles(CONSOLE_FILES_NETCORE).AndFiles(ENGINE_CORE_FILES).AndFile("nunit.console.nuget.addins")
-        },
-        symbols: new PackageCheck[] {
-            HasDirectory("tools/net8.0").WithFile("nunit3-console.pdb").AndFiles(ENGINE_PDB_FILES)
-        },
-        testRunner: new ConsoleRunnerSelfTester(BuildSettings.NuGetTestDirectory 
-            + $"NUnit.ConsoleRunner.NetCore.{BuildSettings.PackageVersion}/tools/net8.0/nunit3-console.exe"),
-        tests: NetCoreRunnerTests),
-
-    NUnitConsoleRunnerNet60Package = new NuGetPackage(
+    NUnitConsoleRunnerNetCorePackage = new NuGetPackage(
         id: "NUnit.ConsoleRunner.NetCore",
         source: BuildSettings.NuGetDirectory + "runners/nunit.console-runner.netcore.nuspec",
         checks: new PackageCheck[] {
diff --git a/nuget/runners/nunit.console-runner.netcore.nuspec b/nuget/runners/nunit.console-runner.netcore.nuspec
index fd36e66a7..35dfac8d4 100644
--- a/nuget/runners/nunit.console-runner.netcore.nuspec
+++ b/nuget/runners/nunit.console-runner.netcore.nuspec
@@ -26,6 +26,7 @@
   <files>
     <file src="../../LICENSE.txt" />
     <file src="../../NOTICES.txt" />
+    
     <file src="net6.0/nunit3-console.exe" target="tools/net6.0/" />
     <file src="net6.0/nunit3-console.pdb" target="tools/net6.0/" />
     <file src="net6.0/nunit3-console.dll" target="tools/net6.0/" />
@@ -43,25 +44,7 @@
     <file src="net6.0/Microsoft.Extensions.DependencyModel.dll" target="tools/net6.0" />
     <file src="../../nuget/runners/nunit.console.nuget.addins" target="tools/net6.0"/>
     <file src="../../nuget/runners/DotnetToolSettings.xml" target="tools/net6.0"/>
-
-    <file src="net8.0/nunit3-console.exe" target="tools/net8.0" />
-    <file src="net8.0/nunit3-console.pdb" target="tools/net8.0" />
-    <file src="net8.0/nunit3-console.dll" target="tools/net8.0" />
-    <file src="net8.0/nunit3-console.dll.config" target="tools/net8.0" />
-    <file src="net8.0/nunit3-console.deps.json" target="tools/net8.0" />
-    <file src="net8.0/nunit3-console.runtimeconfig.json" target="tools/net8.0" />
-    <file src="net8.0/nunit.engine.core.dll" target="tools/net8.0" />
-    <file src="net8.0/nunit.engine.core.pdb" target="tools/net8.0" />
-    <file src="net8.0/nunit.engine.dll" target="tools/net8.0" />
-    <file src="net8.0/nunit.engine.pdb" target="tools/net8.0" />
-    <file src="net8.0/nunit.engine.api.dll" target="tools/net8.0" />
-    <file src="net8.0/nunit.engine.api.pdb" target="tools/net8.0" />
-    <file src="net8.0/nunit.engine.api.xml" target="tools/net8.0" />
-    <file src="net8.0/testcentric.engine.metadata.dll" target="tools/net8.0" />
-    <file src="net8.0/Microsoft.Extensions.DependencyModel.dll" target="tools/net8.0" />
-    <file src="../../nuget/runners/nunit.console.nuget.addins" target="tools/net8.0"/>
-    <file src="../../nuget/runners/DotnetToolSettings.xml" target="tools/net8.0"/>
-    
+   
     <file src="../../nunit_256.png" target="images"/>
   </files>
 </package>