Merge pull request #1751 from nunit/issue-1750

Restore use of recipe for build

Author: CharliePoole

NUnitConsole.sln

@@ -157,20 +157,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FakeExtensionsV1", "src\Tes
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FakeExtensionsV2", "src\TestData\FakeExtensions\2.0\FakeExtensionsV2.csproj", "{E3A8037B-83EF-CB79-3EED-492C89F47BF9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cake", "cake", "{C3D1ADBF-7497-4725-8AE4-6B4693F68622}"
-	ProjectSection(SolutionItems) = preProject
-		cake\build-settings.cake = cake\build-settings.cake
-		cake\execution.cake = cake\execution.cake
-		cake\package-definition.cake = cake\package-definition.cake
-		cake\package-tests.cake = cake\package-tests.cake
-		cake\packaging.cake = cake\packaging.cake
-		cake\publishing.cake = cake\publishing.cake
-		cake\reporting.cake = cake\reporting.cake
-		cake\targets.cake = cake\targets.cake
-		cake\testing.cake = cake\testing.cake
-		cake\utilities.cake = cake\utilities.cake
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -336,7 +322,6 @@ Global
 		{0E415863-1621-41DB-9DB0-36B5664DFF35} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}
 		{3AA135F1-CF80-C1D9-89FF-1DF30F567CA1} = {37D508B2-91E0-4B32-869B-DFF9E68EA213}
 		{E3A8037B-83EF-CB79-3EED-492C89F47BF9} = {37D508B2-91E0-4B32-869B-DFF9E68EA213}
-		{C3D1ADBF-7497-4725-8AE4-6B4693F68622} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D8E4FC26-5422-4C51-8BBC-D1AC0A578711}

build.cake

@@ -1,5 +1,10 @@
-// Load the additional cake files
-#load cake/*.cake
+// Load the recipe
+#load nuget:?package=NUnit.Cake.Recipe&version=1.5.1-alpha.1
+// Comment out above line and uncomment below for local tests of recipe changes
+//#load ../NUnit.Cake.Recipe/recipe/*.cake
+
+// Load additional cake files
+#load package-tests.cake
 
 // Initialize BuildSettings
 BuildSettings.Initialize(
@@ -15,8 +20,7 @@ BuildSettings.Initialize(
 //////////////////////////////////////////////////////////////////////
 
 var THIS_VERSION = BuildSettings.PackageVersion;
-PackageDefinition NUnitExtensibilityApiPackage = new PackageDefinition(
-    PackageType.NuGet,
+PackageDefinition NUnitExtensibilityApiPackage = new NuGetPackage(
     id: "NUnit.Extensibility.Api",
     source: BuildSettings.SourceDirectory + "NUnitCommon/nunit.extensibility.api/nunit.extensibility.api.csproj",
     checks: new PackageCheck[] {
@@ -29,8 +33,7 @@ PackageDefinition NUnitExtensibilityApiPackage = new PackageDefinition(
         HasDirectory("lib/netstandard2.0").WithFile("nunit.extensibility.api.pdb")
     });
 
-PackageDefinition NUnitEngineApiPackage = new PackageDefinition(
-    PackageType.NuGet,
+PackageDefinition NUnitEngineApiPackage = new NuGetPackage(
     id: "NUnit.Engine.Api",
     source: BuildSettings.SourceDirectory + "NUnitEngine/nunit.engine.api/nunit.engine.api.csproj",
     checks: new PackageCheck[] {
@@ -44,8 +47,7 @@ PackageDefinition NUnitEngineApiPackage = new PackageDefinition(
         HasDirectory("lib/netstandard2.0").WithFile("nunit.engine.api.pdb")
     });
 
-PackageDefinition NUnitCommonPackage = new PackageDefinition(
-    PackageType.NuGet,
+PackageDefinition NUnitCommonPackage = new NuGetPackage(
     id: "NUnit.Common",
     source: BuildSettings.SourceDirectory + "NUnitCommon/nunit.common/nunit.common.csproj",
     checks: new PackageCheck[]
@@ -61,8 +63,7 @@ PackageDefinition NUnitCommonPackage = new PackageDefinition(
         HasDirectory("lib/netstandard2.0").WithFile("nunit.common.pdb"),
     });
 
-PackageDefinition NUnitExtensibilityPackage = new PackageDefinition(
-    PackageType.NuGet,
+PackageDefinition NUnitExtensibilityPackage = new NuGetPackage(
     id: "NUnit.Extensibility",
     source: BuildSettings.SourceDirectory + "NUnitCommon/nunit.extensibility/nunit.extensibility.csproj",
     checks: new PackageCheck[]
@@ -81,8 +82,7 @@ PackageDefinition NUnitExtensibilityPackage = new PackageDefinition(
         HasDirectory("lib/netstandard2.0").WithFile("nunit.extensibility.pdb")
     });
 
-PackageDefinition NUnitAgentCorePackage = new PackageDefinition(
-    PackageType.NuGet,
+PackageDefinition NUnitAgentCorePackage = new NuGetPackage(
     id: "NUnit.Agent.Core",
     source: BuildSettings.SourceDirectory + "NUnitCommon/nunit.agent.core/nunit.agent.core.csproj",
     checks: new PackageCheck[]
@@ -102,8 +102,7 @@ PackageDefinition NUnitAgentCorePackage = new PackageDefinition(
     testRunner: new DirectTestAgentRunner(),
     tests: AgentCoreTests);
 
-PackageDefinition NUnitEnginePackage = new PackageDefinition(
-    PackageType.NuGet,
+PackageDefinition NUnitEnginePackage = new NuGetPackage(
     id: "NUnit.Engine",
     source: BuildSettings.SourceDirectory + "NUnitEngine/nunit.engine/nunit.engine.csproj",
     checks: new PackageCheck[]
@@ -125,8 +124,7 @@ PackageDefinition NUnitEnginePackage = new PackageDefinition(
 //    BuildSettings.NuGetTestDirectory + $"NUnit.Engine.{BuildSettings.PackageVersion}/agents"),
 //tests: EngineTests),
 
-PackageDefinition NUnitConsoleRunnerDotNetToolPackage = new PackageDefinition(
-    PackageType.Tool,
+PackageDefinition NUnitConsoleRunnerDotNetToolPackage = new DotNetToolPackage(
     id: "NUnit.ConsoleRunner.NetCore",
     source: BuildSettings.SourceDirectory + "NUnitConsole/nunit4-netcore-console/nunit4-netcore-console.csproj",
     checks: new PackageCheck[]
@@ -138,14 +136,13 @@ PackageDefinition NUnitConsoleRunnerDotNetToolPackage = new PackageDefinition(
             "nunit.extensibility.api.dll", "nunit.engine.api.dll", "testcentric.metadata.dll",
             "Microsoft.Extensions.DependencyModel.dll")
     },
-    testRunner: new ConsoleRunnerSelfTester(BuildSettings.PackageTestDirectory + "nunit.exe"),
+    testRunner: new ConsoleRunnerSelfTester(BuildSettings.NuGetTestDirectory + "nunit.exe"),
     tests: NetCoreRunnerTests);
 
 // NOTE: The final three packages continue to use a nuspec file for various reasons
 
 // 1. NUnit.ConsoleRunner needs to use it to specify the bundled pluggable agents
-PackageDefinition NUnitConsoleRunnerNuGetPackage = new PackageDefinition(
-    PackageType.NuGet,
+PackageDefinition NUnitConsoleRunnerNuGetPackage = new NuGetPackage(
     id: "NUnit.ConsoleRunner",
     source: BuildSettings.NuGetDirectory + "runners/nunit.console-runner.nuspec",
     checks: new PackageCheck[] {
@@ -168,15 +165,13 @@ PackageDefinition NUnitConsoleRunnerNuGetPackage = new PackageDefinition(
     tests: StandardRunnerTests);
 
 // 2. NUnit.Console is a meta-package
-PackageDefinition NUnitConsoleNuGetPackage = new PackageDefinition(
-    PackageType.NuGet,
+PackageDefinition NUnitConsoleNuGetPackage = new NuGetPackage(
     id: "NUnit.Console",
     source: BuildSettings.NuGetDirectory + "runners/nunit.console-runner-with-extensions.nuspec",
     checks: new PackageCheck[] { HasFile("LICENSE.txt") });
 
 // 3. The chocolatey console runner has to follow special chocolatey conventions
-PackageDefinition NUnitConsoleRunnerChocolateyPackage = new PackageDefinition(
-    PackageType.Chocolatey,
+PackageDefinition NUnitConsoleRunnerChocolateyPackage = new ChocolateyPackage(
     id: "nunit-console-runner",
     source: BuildSettings.ChocolateyDirectory + "nunit-console-runner.nuspec",
     checks: new PackageCheck[] {