Merge pull request #1039 from nunit/issue-720

Stop re-publishing deprecated packages with each new release
nunit · Nov 19, 2021 · 37a1b61 · 37a1b61
2 parents 65cd7a0 + a43a479
commit 37a1b61
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 59 deletions.
diff --git a/NUnitConsole.sln b/NUnitConsole.sln
@@ -82,7 +82,6 @@ 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-console-with-extensions.nuspec = choco\nunit-console-with-extensions.nuspec
 		choco\nunit.agent.addins = choco\nunit.agent.addins
 		choco\nunit.choco.addins = choco\nunit.choco.addins
 		choco\VERIFICATION.txt = choco\VERIFICATION.txt
@@ -100,6 +99,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit-agent-x86", "src\NUni
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mock-assembly-x86", "src\NUnitEngine\mock-assembly-x86\mock-assembly-x86.csproj", "{9D3015EE-5B84-41B3-A1D3-1A439370C392}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deprecated", "deprecated", "{068F6CA9-6108-4F45-8540-351AA5227259}"
+	ProjectSection(SolutionItems) = preProject
+		choco\deprecated\nunit-console-with-extensions.nuspec = choco\deprecated\nunit-console-with-extensions.nuspec
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -171,6 +175,7 @@ Global
 		{A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
 		{333D2FBC-CCA7-46AF-9453-C310671A67B0} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
 		{9D3015EE-5B84-41B3-A1D3-1A439370C392} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
+		{068F6CA9-6108-4F45-8540-351AA5227259} = {4FDF7BFA-A337-41D3-898D-C6A98278E6AD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D8E4FC26-5422-4C51-8BBC-D1AC0A578711}

diff --git a/build.cake b/build.cake
@@ -408,10 +408,6 @@ Task("BuildNuGetPackages")
         NuGetPack("nuget/runners/nunit.console-runner-with-extensions.nuspec", basicPackSettings);
 
         NuGetPack("nuget/runners/nunit.console-runner.netcore.nuspec", packSettingsWithSymbols);
-
-        NuGetPack("nuget/deprecated/nunit.runners.nuspec", basicPackSettings);
-
-        NuGetPack("nuget/deprecated/nunit.engine.netstandard.nuspec", basicPackSettings);
     });
 
 Task("TestNuGetPackages")
@@ -481,18 +477,6 @@ Task("BuildChocolateyPackages")
                     new ChocolateyNuSpecContent { Source = CURRENT_IMG_NET20_BIN_DIR + "testcentric.engine.metadata.dll", Target="tools" }
                 }
             });
-
-        ChocolateyPack("choco/nunit-console-with-extensions.nuspec",
-            new ChocolateyPackSettings()
-            {
-                Version = productVersion,
-                OutputDirectory = PACKAGE_DIR,
-                Files = new [] {
-                    new ChocolateyNuSpecContent { Source = CURRENT_IMG_DIR + "LICENSE.txt", Target = "tools" },
-                    new ChocolateyNuSpecContent { Source = CURRENT_IMG_DIR + "NOTICES.txt", Target = "tools" },
-                    new ChocolateyNuSpecContent { Source = CHOCO_DIR + "VERIFICATION.txt", Target = "tools" }
-                }
-            });
     });
 
 Task("TestChocolateyPackage")

diff --git a/choco/nunit-console-with-extensions.nuspec → ...ated/nunit-console-with-extensions.nuspec b/choco/nunit-console-with-extensions.nuspec → ...ated/nunit-console-with-extensions.nuspec
@@ -7,16 +7,9 @@
     <title>NUnit 3 Console Runner Plus Extensions</title>
     <summary>Console runner for the NUnit 3 unit-testing framework with selected extensions.</summary>
     <description>
-      This package includes the nunit3-console runner and test engine for version 3 of the NUnit unit-testing framework.
-
-      The following extensions are included with this package:
-      * NUnitProjectLoader     - loads tests from NUnit projects
-      * VSProjectLoader        - loads tests from Visual Studio projects
-      * NUnitV2ResultWriter    - saves results in NUnit V2 format.
-      * NUnitV2FrameworkDriver - runs NUnit V2 tests.
-      * TeamCityEventListener - supports special progress messages used by teamcity.
-
-      Other extensions, if needed, must be installed separately.
+      This package is now obsolete. It is partially replaced by the nunit-console-runner package.
+      Because of the nature of Chocolatey, it is not necessary to have a console runner with a set of
+      standard extensions built-in. Install extensions separately for use with nunit-console-runner.
     </description>
     <projectUrl>https://nunit.org</projectUrl>
     <projectSourceUrl>https://github.com/nunit/nunit-console</projectSourceUrl>
@@ -36,11 +29,6 @@
     <dependencies>
       <group>
           <dependency id="nunit-console-runner" version="$version$" />
-          <dependency id="nunit-extension-nunit-project-loader" version="3.6.0" />
-          <dependency id="nunit-extension-vs-project-loader" version="3.8.0" />
-          <dependency id="nunit-extension-nunit-v2-result-writer" version="3.6.0" />
-          <dependency id="nunit-extension-nunit-v2-driver" version="3.8.0" />
-          <dependency id="nunit-extension-teamcity-event-listener" version="1.0.7" />
       </group>
     </dependencies>
   </metadata>

diff --git a/nuget/deprecated/nunit.engine.netstandard.nuspec b/nuget/deprecated/nunit.engine.netstandard.nuspec
@@ -15,8 +15,6 @@
     <summary>Deprecated NUnit 3 .NET Standard engine - use NUnit.Engine.</summary>
     <description>
       This package is now obsolete and has been replaced by the NUnit.Engine package.
-
-      Provides a common interface for loading, exploring and running NUnit tests in .NET Core and .NET Standard
     </description>
     <language>en-US</language>
     <tags>nunit test testing tdd runner</tags>
@@ -27,8 +25,4 @@
       </group>
     </dependencies>
   </metadata>
-  <files>
-    <file src="LICENSE.txt" />
-    <file src="..\..\nunit_256.png" target="images"/>
-  </files>
 </package>
diff --git a/nuget/deprecated/nunit.runners.nuspec b/nuget/deprecated/nunit.runners.nuspec
@@ -15,17 +15,6 @@
     <summary>Deprecated NUnit 3 console runner - use NUnit.Console or NUnit.ConsoleRunner.</summary>
     <description>
       This package is now obsolete and has been replaced by the NUnit.Console package.
-
-      It includes the nunit3-console runner and test engine for version 3 of the NUnit unit-testing framework.
-
-      The following extensions are included with this package:
-      * NUnitProjectLoader     - loads tests from NUnit projects
-      * VSProjectLoader        - loads tests from Visual Studio projects
-      * NUnitV2ResultWriter    - saves results in NUnit V2 format.
-      * NUnitV2FrameworkDriver - runs NUnit V2 tests.
-      * TeamCityEventListener - supports special progress messages used by teamcity.
-
-      Other extensions, if needed, must be installed separately.
     </description>
     <releaseNotes>https://docs.nunit.org/articles/nunit/release-notes/console-and-engine.html</releaseNotes>
     <language>en-US</language>
@@ -37,8 +26,4 @@
       </group>
     </dependencies>
   </metadata>
-  <files>
-    <file src="LICENSE.txt" />
-    <file src="..\..\nunit_256.png" target="images"/>
-  </files>
 </package>
diff --git a/package-checks.cake b/package-checks.cake
@@ -78,17 +78,11 @@ public void CheckAllPackages()
             "NUnit.Engine.Api",
             HasDirectory("lib/net20").WithFile("nunit.engine.api.pdb"),
             HasDirectory("lib/netstandard2.0").WithFile("nunit.engine.api.pdb")) &
-        CheckNuGetPackage(
-            "NUnit.Runners",
-            HasFile("LICENSE.txt")) &
         CheckChocolateyPackage(
             "nunit-console-runner",
             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")) &
-        CheckChocolateyPackage(
-            "nunit-console-with-extensions",
-            HasDirectory("tools").WithFiles("LICENSE.txt", "NOTICES.txt", "VERIFICATION.txt")) &
         CheckZipPackage(
             "NUnit.Console",
             HasFiles("LICENSE.txt", "license.rtf", "NOTICES.txt", "CHANGES.txt"),