Merge pull request #70 from nunit/issue-69

Use dev00001 build of common NUnit cake recipe

appveyor.yml

@@ -19,3 +19,4 @@ environment:
     secure: aDsu1U+umVYFVybjkBVtVQsatSj3QKbD7VkGQci9mNF3493g9Giao/GABISIaHjT
   GITHUB_ACCESS_TOKEN:
     secure: xmGXWrw5Nj3CI3fPxhw/DWIU5YL/1mM06pSmjpkd9LpKs3t3EYXbECbEQs62lU/O
+  IGNORE_NORMALISATION_GIT_HEAD_MOVE: 1  

build.cake

@@ -1,27 +1,20 @@
-#tool NuGet.CommandLine&version=6.9.1
-#tool nuget:?package=GitVersion.CommandLine&version=5.6.3
-#tool nuget:?package=GitReleaseManager&version=0.17.0
-#tool nuget:?package=NUnit.ConsoleRunner&version=3.17.0
 #tool nuget:?package=NUnit.ConsoleRunner&version=3.15.5
 #tool nuget:?package=NUnit.ConsoleRUnner&version=3.17.0
 #tool nuget:?package=NUnit.ConsoleRunner&version=3.18.0-dev00037
 #tool nuget:?package=NUnit.ConsoleRunner.NetCore&version=3.18.0-dev00037
 
 // Load scripts 
-#load recipe/*.cake
+#load nuget:?package=NUnit.Cake.Recipe&version=1.0.0-dev00001
+//#load ../NUnit.Cake.Recipe/recipe/*.cake
 
 // Initialize BuildSettings
 BuildSettings.Initialize(
     Context,
     "NUnit Project Loader",
     "nunit-project-loader",
     solutionFile: "nunit-project-loader.sln",
-	//unitTestRunner: new NUnitLiteRunner(),
-	//unitTests: "**/*.Tests.exe");
-	unitTestRunner: new NUnitConsoleRunner("3.17.0"),
-	unitTests: "**/*.Tests.dll");
-	//unitTestRunner: new NUnitNetCoreConsoleRunner("3.18.0-dev00037"),
-	//unitTests: "**/*.Tests.dll");
+	unitTestRunner: new NUnitLiteRunner(),
+	unitTests: "**/*.Tests.exe");
 
 //////////////////////////////////////////////////////////////////////
 // PACKAGE TESTS
@@ -100,11 +93,6 @@ BuildSettings.Packages.Add(
 			HasDirectory("tools/net6.0").WithFiles("nunit-project-loader.dll", "nunit.engine.api.dll") },
 		tests: PackageTests,
 		testRunnerSource: new TestRunnerSource(new NUnitConsoleRunner("3.17.0"), new NUnitConsoleRunner("3.15.5"), new NUnitConsoleRunner("3.18.0-dev00037"))
-		//testRunner: new NUnitConsoleRunner("3.17.0")
-		//testRunner: new NUnitConsoleRunner("3.15.5")
-		//testRunner: new NUnitConsoleRunner("3.18.0-dev00037")
-		//testRunner: new NUnitNetCoreConsoleRunner("3.18.0-dev00037")
-		//testRunner: new EngineExtensionTestRunner()
 	));
 
 //////////////////////////////////////////////////////////////////////
@@ -121,10 +109,6 @@ BuildSettings.Packages.Add(
 			HasDirectory("tools/net6.0").WithFiles("nunit-project-loader.dll", "nunit.engine.api.dll") },
 		tests: PackageTests,
 		testRunnerSource: new TestRunnerSource(new NUnitConsoleRunner("3.17.0"), new NUnitConsoleRunner("3.15.5"), new NUnitConsoleRunner("3.18.0-dev00037"))
-		//testRunner: new NUnitConsoleRunner("3.17.0")
-		//testRunner: new NUnitConsoleRunner("3.15.5")
-		//testRunner: new NUnitConsoleRunner("3.18.0-dev00037")
-		//testRunner: new NUnitNetCoreConsoleRunner("3.18.0-dev00037")
 	));
 
 //////////////////////////////////////////////////////////////////////

nunit-project-loader.sln

@@ -29,38 +29,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test-lib-1", "src\test-lib-
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test-lib-2", "src\test-lib-2\test-lib-2.csproj", "{7808DEA9-FB13-47FC-823F-DC78C1057061}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "recipe", "recipe", "{7EE5FBD2-CD4B-4FB0-9F36-29665955E8BE}"
-	ProjectSection(SolutionItems) = preProject
-		recipe\banner.cake = recipe\banner.cake
-		recipe\build-settings.cake = recipe\build-settings.cake
-		recipe\builder.cake = recipe\builder.cake
-		recipe\chocolatey-package.cake = recipe\chocolatey-package.cake
-		recipe\command-line-options.cake = recipe\command-line-options.cake
-		recipe\constants.cake = recipe\constants.cake
-		recipe\dotnet.cake = recipe\dotnet.cake
-		recipe\extending.cake = recipe\extending.cake
-		recipe\headers.cake = recipe\headers.cake
-		recipe\help-messages.cake = recipe\help-messages.cake
-		recipe\known-extensions.cake = recipe\known-extensions.cake
-		recipe\nuget-package.cake = recipe\nuget-package.cake
-		recipe\package-checks.cake = recipe\package-checks.cake
-		recipe\package-reference.cake = recipe\package-reference.cake
-		recipe\package-definition.cake = recipe\package-definition.cake
-		recipe\package-test.cake = recipe\package-test.cake
-		recipe\publishing.cake = recipe\publishing.cake
-		recipe\setup.cake = recipe\setup.cake
-		recipe\task-builders.cake = recipe\task-builders.cake
-		recipe\task-definitions.cake = recipe\task-definitions.cake
-		recipe\test-reports.cake = recipe\test-reports.cake
-		recipe\test-results.cake = recipe\test-results.cake
-		recipe\test-runners.cake = recipe\test-runners.cake
-		recipe\tools.cake = recipe\tools.cake
-		recipe\unit-testing.cake = recipe\unit-testing.cake
-		recipe\utilities.cake = recipe\utilities.cake
-		recipe\versioning.cake = recipe\versioning.cake
-		recipe\zip-package.cake = recipe\zip-package.cake
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{6C381491-0062-4276-B884-86A6A175FFF5}"
 	ProjectSection(SolutionItems) = preProject
 		nuget\nunit-project-loader.legacy.addins = nuget\nunit-project-loader.legacy.addins
@@ -101,7 +69,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{7EE5FBD2-CD4B-4FB0-9F36-29665955E8BE} = {3B28CF0C-D613-4971-9D8F-00C960C656E2}
 		{6C381491-0062-4276-B884-86A6A175FFF5} = {3B28CF0C-D613-4971-9D8F-00C960C656E2}
 		{2DA8DF86-18D3-4832-970C-A0B26498B93D} = {3B28CF0C-D613-4971-9D8F-00C960C656E2}
 	EndGlobalSection