Merge pull request #1426 from nunit/issue-1422

First step toward a general recipe for engine and extensions
nunit · Jul 2, 2024 · c4d49d0 · c4d49d0
2 parents 84e45ad + 61b9710
commit c4d49d0
Show file tree

Hide file tree

Showing 39 changed files with 3,114 additions and 2,270 deletions.
diff --git a/NUnitConsole.sln b/NUnitConsole.sln
@@ -30,9 +30,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		nunit.ico = nunit.ico
 		package-checks.cake = package-checks.cake
 		package-tests.cake = package-tests.cake
+		packages.cake = packages.cake
 		README.md = README.md
 		test-results.cake = test-results.cake
 		VERSIONING.md = VERSIONING.md
+		cake\zip-package.cake = cake\zip-package.cake
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{A972031D-2F61-4183-AF75-99EE1A9F6B32}"
@@ -85,9 +87,9 @@ 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\VERIFICATION.txt = choco\VERIFICATION.txt
 		choco\nunit.console.choco.addins = choco\nunit.console.choco.addins
 		choco\nunit.console.choco.agent.addins = choco\nunit.console.choco.agent.addins
+		choco\VERIFICATION.txt = choco\VERIFICATION.txt
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deprecated", "deprecated", "{9A7C8370-ED1F-486F-A8F5-C5BF4221464E}"
@@ -107,20 +109,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deprecated", "deprecated",
 		choco\deprecated\nunit-console-with-extensions.nuspec = choco\deprecated\nunit-console-with-extensions.nuspec
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cake", "cake", "{9BCA00E2-D072-424B-A6DF-5BECF719C1FB}"
-	ProjectSection(SolutionItems) = preProject
-		cake\constants.cake = cake\constants.cake
-		cake\dotnet.cake = cake\dotnet.cake
-		cake\header-check.cake = cake\header-check.cake
-		cake\package-checks.cake = cake\package-checks.cake
-		cake\package-definitions.cake = cake\package-definitions.cake
-		cake\package-tester.cake = cake\package-tester.cake
-		cake\package-tests.cake = cake\package-tests.cake
-		cake\test-results.cake = cake\test-results.cake
-		cake\utilities.cake = cake\utilities.cake
-		cake\versioning.cake = cake\versioning.cake
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msi", "msi", "{0C0D20CE-70CD-4CEF-BE9B-AEB8A2DE9C8A}"
 	ProjectSection(SolutionItems) = preProject
 		msi\nunit-install.sln = msi\nunit-install.sln
@@ -168,6 +156,39 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nunit", "nunit", "{93E5CAF4
 		msi\nunit\variables.wxi = msi\nunit\variables.wxi
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cake", "cake", "{D6449B7A-20FF-467B-A65E-174DD6992AEB}"
+	ProjectSection(SolutionItems) = preProject
+		cake\banner.cake = cake\banner.cake
+		cake\build-settings.cake = cake\build-settings.cake
+		cake\builder.cake = cake\builder.cake
+		cake\chocolatey-package.cake = cake\chocolatey-package.cake
+		cake\command-line-options.cake = cake\command-line-options.cake
+		cake\constants.cake = cake\constants.cake
+		cake\dotnet.cake = cake\dotnet.cake
+		cake\extending.cake = cake\extending.cake
+		cake\headers.cake = cake\headers.cake
+		cake\help-messages.cake = cake\help-messages.cake
+		cake\known-extensions.cake = cake\known-extensions.cake
+		cake\msi-package.cake = cake\msi-package.cake
+		cake\nuget-package.cake = cake\nuget-package.cake
+		cake\package-checks.cake = cake\package-checks.cake
+		cake\package-definition.cake = cake\package-definition.cake
+		cake\package-reference.cake = cake\package-reference.cake
+		cake\package-test.cake = cake\package-test.cake
+		cake\publishing.cake = cake\publishing.cake
+		cake\setup.cake = cake\setup.cake
+		cake\task-definitions.cake = cake\task-definitions.cake
+		cake\test-reports.cake = cake\test-reports.cake
+		cake\task-builders.cake = cake\task-builders.cake
+		cake\test-results.cake = cake\test-results.cake
+		cake\test-runners.cake = cake\test-runners.cake
+		cake\tools.cake = cake\tools.cake
+		cake\unit-testing.cake = cake\unit-testing.cake
+		cake\utilities.cake = cake\utilities.cake
+		cake\versioning.cake = cake\versioning.cake
+		cake\zip-package.cake = cake\zip-package.cake
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -244,7 +265,6 @@ Global
 		{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}
-		{9BCA00E2-D072-424B-A6DF-5BECF719C1FB} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
 		{0C0D20CE-70CD-4CEF-BE9B-AEB8A2DE9C8A} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
 		{20005864-BE82-412D-99BF-288E2D8370E9} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
 		{CACC0520-B452-4310-A33C-DC944129ACDD} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
@@ -253,6 +273,7 @@ Global
 		{50371E48-BEC3-4D53-BD37-F3A6149CFD0D} = {25DA12FE-6209-4524-9A37-8E51F815E198}
 		{C5B7120C-190B-4C38-95CB-83F12799598D} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
 		{93E5CAF4-D5DB-4915-AF0F-908A6043E462} = {0C0D20CE-70CD-4CEF-BE9B-AEB8A2DE9C8A}
+		{D6449B7A-20FF-467B-A65E-174DD6992AEB} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D8E4FC26-5422-4C51-8BBC-D1AC0A578711}