Merge pull request #1437 from nunit/issue-1434

Eliminate MSI package

NUnitConsole.sln

@@ -109,12 +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}") = "msi", "msi", "{0C0D20CE-70CD-4CEF-BE9B-AEB8A2DE9C8A}"
-	ProjectSection(SolutionItems) = preProject
-		msi\nunit-install.sln = msi\nunit-install.sln
-		msi\resources\nunit.bundle.addins = msi\resources\nunit.bundle.addins
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "zip", "zip", "{20005864-BE82-412D-99BF-288E2D8370E9}"
 	ProjectSection(SolutionItems) = preProject
 		zip\nunit.bundle.addins = zip\nunit.bundle.addins
@@ -141,21 +135,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{C5B712
 		.config\dotnet-tools.json = .config\dotnet-tools.json
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nunit", "nunit", "{93E5CAF4-D5DB-4915-AF0F-908A6043E462}"
-	ProjectSection(SolutionItems) = preProject
-		msi\nunit\addin-files.wxi = msi\nunit\addin-files.wxi
-		msi\nunit\banner.bmp = msi\nunit\banner.bmp
-		msi\nunit\console-files.wxi = msi\nunit\console-files.wxi
-		msi\nunit\dialog.bmp = msi\nunit\dialog.bmp
-		msi\nunit\engine-files.wxi = msi\nunit\engine-files.wxi
-		msi\nunit\nunit.wixproj = msi\nunit\nunit.wixproj
-		msi\nunit\nunit.wxs = msi\nunit\nunit.wxs
-		msi\nunit\runner-directories.wxi = msi\nunit\runner-directories.wxi
-		msi\nunit\runner-features.wxi = msi\nunit\runner-features.wxi
-		msi\nunit\utility-files.wxi = msi\nunit\utility-files.wxi
-		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
@@ -169,17 +148,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cake", "cake", "{D6449B7A-2
 		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-builders.cake = cake\task-builders.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
@@ -265,14 +243,12 @@ 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}
-		{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}
 		{25DA12FE-6209-4524-9A37-8E51F815E198} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
 		{08F8160E-E691-4F07-9F57-EA31B9736429} = {25DA12FE-6209-4524-9A37-8E51F815E198}
 		{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

build.cake

@@ -246,7 +246,6 @@ PackageDefinition NUnitConsoleRunnerNet80Package;
 PackageDefinition NUnitEnginePackage;
 PackageDefinition NUnitEngineApiPackage;
 PackageDefinition NUnitConsoleRunnerChocolateyPackage;
-PackageDefinition NUnitConsoleMsiPackage;
 PackageDefinition NUnitConsoleZipPackage;
 
 BuildSettings.Packages.AddRange(new PackageDefinition[] {
@@ -330,25 +329,6 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
             + $"nunit-console-runner.{BuildSettings.PackageVersion}/tools/nunit3-console.exe"),
         tests: StandardRunnerTests),
 
-    NUnitConsoleMsiPackage = new MsiPackage(
-        id: "NUnit.Console",
-        source: BuildSettings.MsiDirectory + "nunit/nunit.wixproj",
-        checks: new PackageCheck[] {
-            HasDirectory("NUnit.org").WithFiles("LICENSE.txt", "NOTICES.txt", "nunit.ico"),
-            HasDirectory("NUnit.org/nunit-console").WithFiles(CONSOLE_FILES).AndFiles(ENGINE_FILES).AndFile("nunit.bundle.addins"),
-            HasDirectory("Nunit.org/nunit-console/addins").WithFiles("nunit.core.dll", "nunit.core.interfaces.dll", "nunit.v2.driver.dll", "nunit-project-loader.dll", "vs-project-loader.dll", "nunit-v2-result-writer.dll", "teamcity-event-listener.dll")
-        },
-        testRunner: new ConsoleRunnerSelfTester(BuildSettings.MsiTestDirectory
-            + $"NUnit.Console.{BuildSettings.BuildVersion.SemVer}/NUnit.org/nunit-console/nunit3-console.exe"),
-        tests: StandardRunnerTests,
-        bundledExtensions: new [] {
-            new PackageReference("NUnit.Extension.VSProjectLoader", "3.9.0"),
-            new PackageReference("NUnit.Extension.NUnitProjectLoader", "3.7.1"),
-            new PackageReference("NUnit.Extension.NUnitV2Driver", "3.9.0"),
-            new PackageReference("NUnit.Extension.NUnitV2ResultWriter", "3.7.0"),
-            new PackageReference("NUnit.Extension.TeamCityEventListener", "1.0.9")
-        }),
-
     NUnitConsoleZipPackage = new ZipPackage(
         id: "NUnit.Console",
         source: BuildSettings.ZipImageDirectory,

cake/build-settings.cake

@@ -167,21 +167,17 @@ public static class BuildSettings
 	public static string OutputDirectory                => ProjectDirectory + BIN_DIR + Configuration + "/";
 	public static string NuGetDirectory                 => ProjectDirectory + NUGET_DIR;
 	public static string ChocolateyDirectory            => ProjectDirectory + CHOCO_DIR;
-    public static string MsiDirectory                   => ProjectDirectory + MSI_DIR;
     public static string ZipDirectory                   => ProjectDirectory + ZIP_DIR;
 	public static string PackageDirectory               => ProjectDirectory + PACKAGE_DIR;
 	public static string PackageTestDirectory           => ProjectDirectory + PKG_TEST_DIR;
 	public static string NuGetTestDirectory             => ProjectDirectory + NUGET_TEST_DIR;
 	public static string ChocolateyTestDirectory        => ProjectDirectory + CHOCO_TEST_DIR;
-	public static string MsiTestDirectory               => ProjectDirectory + MSI_TEST_DIR;
 	public static string ZipTestDirectory               => ProjectDirectory + ZIP_TEST_DIR;
 	public static string PackageResultDirectory         => ProjectDirectory + PKG_RSLT_DIR;
 	public static string NuGetResultDirectory           => ProjectDirectory + NUGET_RSLT_DIR;
 	public static string ChocolateyResultDirectory      => ProjectDirectory + CHOCO_RSLT_DIR;
-	public static string MsiResultDirectory             => ProjectDirectory + MSI_RSLT_DIR;
 	public static string ZipResultDirectory             => ProjectDirectory + ZIP_RSLT_DIR;
 	public static string ImageDirectory                 => ProjectDirectory + IMAGE_DIR;
-    public static string MsiImageDirectory              => ProjectDirectory + MSI_IMG_DIR;
     public static string ZipImageDirectory              => ProjectDirectory + ZIP_IMG_DIR;
 	public static string ExtensionsDirectory            => ProjectDirectory + "bundled-extensions/";
 	public static string ToolsDirectory                 => ProjectDirectory + "tools/";
@@ -298,15 +294,12 @@ public static class BuildSettings
 		Console.WriteLine("PackageTest:   " + PackageTestDirectory);
 		Console.WriteLine("NuGetTest:     " + NuGetTestDirectory);
 		Console.WriteLine("ChocoTest:     " + ChocolateyTestDirectory);
-		Console.WriteLine("MsiTest:       " + MsiTestDirectory);
 		Console.WriteLine("ZipTest:       " + ZipTestDirectory);
 		Console.WriteLine("PackageResult: " + PackageResultDirectory);
 		Console.WriteLine("NuGetResult:   " + NuGetResultDirectory);
 		Console.WriteLine("ChocoResult:   " + ChocolateyResultDirectory);
-		Console.WriteLine("MsiResult:     " + MsiResultDirectory);
 		Console.WriteLine("ZipResult:     " + ZipResultDirectory);
 		Console.WriteLine("Image:         " + ImageDirectory);
-		Console.WriteLine("MsiImage:      " + MsiImageDirectory);
 		Console.WriteLine("ZipImage:      " + ZipImageDirectory);
 
 		Console.WriteLine("\nBUILD");

cake/constants.cake

@@ -16,23 +16,19 @@ const string SRC_DIR			= "src/";
 const string BIN_DIR			= "bin/";
 const string NUGET_DIR			= "nuget/";
 const string CHOCO_DIR			= "choco/";
-const string MSI_DIR            = "msi/";
 const string ZIP_DIR			= "zip/";
 const string PACKAGE_DIR		= "package/";
 const string PKG_TEST_DIR		= "package/tests/";
 const string NUGET_TEST_DIR		= "package/tests/nuget/";
 //const string NUGET_RUNNER_DIR	= "package/tests/nuget/runners/";
 const string CHOCO_TEST_DIR		= "package/tests/choco/";
 //const string CHOCO_RUNNER_DIR	= "package/tests/choco/runners/";
-const string MSI_TEST_DIR		= "package/tests/msi/";
 const string ZIP_TEST_DIR		= "package/tests/zip/";
 const string PKG_RSLT_DIR		= "package/results/";
 const string NUGET_RSLT_DIR		= "package/results/nuget/";
 const string CHOCO_RSLT_DIR		= "package/results/choco/";
-const string MSI_RSLT_DIR		= "package/results/msi/";
 const string ZIP_RSLT_DIR		= "package/results/zip/";
 const string IMAGE_DIR          = "package/images";
-const string MSI_IMG_DIR		= "package/images/msi/";
 const string ZIP_IMG_DIR		= "package/images/zip/";
 const string TOOLS_DIR			= "tools/";
 

cake/help-messages.cake

@@ -31,9 +31,9 @@
                 more specifications, separated by '|' and '&'. Each specification
                 is of the form "prop=value", where prop may be either id or type.
                 Examples:
-                    --where type=msi
+                    --where type=nuget
                     --where id=NUnit.Engine.Api
-                    --where "type=msi|type=zip"
+                    --where "type=nuget|type=choco"
 
             --level=LEVEL           [--lev]
                 Specifies the level of package testing, 1, 2 or 3. Defaults are

cake/package-definition.cake

@@ -2,7 +2,6 @@ public enum PackageType
 {
     NuGet,
     Chocolatey,
-    Msi,
     Zip
 }
 

cake/zip-package.cake

@@ -18,8 +18,7 @@ public class ZipPackage : PackageDefinition
         BundledExtensions = bundledExtensions;
     }
 
-    // MSI and ZIP packages support bundling of extensions
-    // if any are specified in the definition.
+    // ZIP package supports bundling of extensions
     public PackageReference[] BundledExtensions { get; }
 
     // The file name of this package, including extension