Skip to content

Commit 77074c7

Browse files
CharliePooleCharliePoole
committed
Eliminate MSI package
1 parent 48d96aa commit 77074c7

24 files changed

+4
-781
lines changed

‎NUnitConsole.sln

+1-25
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deprecated", "deprecated",
109109
choco\deprecated\nunit-console-with-extensions.nuspec = choco\deprecated\nunit-console-with-extensions.nuspec
110110
EndProjectSection
111111
EndProject
112-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msi", "msi", "{0C0D20CE-70CD-4CEF-BE9B-AEB8A2DE9C8A}"
113-
ProjectSection(SolutionItems) = preProject
114-
msi\nunit-install.sln = msi\nunit-install.sln
115-
msi\resources\nunit.bundle.addins = msi\resources\nunit.bundle.addins
116-
EndProjectSection
117-
EndProject
118112
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "zip", "zip", "{20005864-BE82-412D-99BF-288E2D8370E9}"
119113
ProjectSection(SolutionItems) = preProject
120114
zip\nunit.bundle.addins = zip\nunit.bundle.addins
@@ -141,21 +135,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{C5B712
141135
.config\dotnet-tools.json = .config\dotnet-tools.json
142136
EndProjectSection
143137
EndProject
144-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nunit", "nunit", "{93E5CAF4-D5DB-4915-AF0F-908A6043E462}"
145-
ProjectSection(SolutionItems) = preProject
146-
msi\nunit\addin-files.wxi = msi\nunit\addin-files.wxi
147-
msi\nunit\banner.bmp = msi\nunit\banner.bmp
148-
msi\nunit\console-files.wxi = msi\nunit\console-files.wxi
149-
msi\nunit\dialog.bmp = msi\nunit\dialog.bmp
150-
msi\nunit\engine-files.wxi = msi\nunit\engine-files.wxi
151-
msi\nunit\nunit.wixproj = msi\nunit\nunit.wixproj
152-
msi\nunit\nunit.wxs = msi\nunit\nunit.wxs
153-
msi\nunit\runner-directories.wxi = msi\nunit\runner-directories.wxi
154-
msi\nunit\runner-features.wxi = msi\nunit\runner-features.wxi
155-
msi\nunit\utility-files.wxi = msi\nunit\utility-files.wxi
156-
msi\nunit\variables.wxi = msi\nunit\variables.wxi
157-
EndProjectSection
158-
EndProject
159138
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cake", "cake", "{D6449B7A-20FF-467B-A65E-174DD6992AEB}"
160139
ProjectSection(SolutionItems) = preProject
161140
cake\banner.cake = cake\banner.cake
@@ -169,17 +148,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cake", "cake", "{D6449B7A-2
169148
cake\headers.cake = cake\headers.cake
170149
cake\help-messages.cake = cake\help-messages.cake
171150
cake\known-extensions.cake = cake\known-extensions.cake
172-
cake\msi-package.cake = cake\msi-package.cake
173151
cake\nuget-package.cake = cake\nuget-package.cake
174152
cake\package-checks.cake = cake\package-checks.cake
175153
cake\package-definition.cake = cake\package-definition.cake
176154
cake\package-reference.cake = cake\package-reference.cake
177155
cake\package-test.cake = cake\package-test.cake
178156
cake\publishing.cake = cake\publishing.cake
179157
cake\setup.cake = cake\setup.cake
158+
cake\task-builders.cake = cake\task-builders.cake
180159
cake\task-definitions.cake = cake\task-definitions.cake
181160
cake\test-reports.cake = cake\test-reports.cake
182-
cake\task-builders.cake = cake\task-builders.cake
183161
cake\test-results.cake = cake\test-results.cake
184162
cake\test-runners.cake = cake\test-runners.cake
185163
cake\tools.cake = cake\tools.cake
@@ -265,14 +243,12 @@ Global
265243
{333D2FBC-CCA7-46AF-9453-C310671A67B0} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
266244
{9D3015EE-5B84-41B3-A1D3-1A439370C392} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
267245
{068F6CA9-6108-4F45-8540-351AA5227259} = {4FDF7BFA-A337-41D3-898D-C6A98278E6AD}
268-
{0C0D20CE-70CD-4CEF-BE9B-AEB8A2DE9C8A} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
269246
{20005864-BE82-412D-99BF-288E2D8370E9} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
270247
{CACC0520-B452-4310-A33C-DC944129ACDD} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
271248
{25DA12FE-6209-4524-9A37-8E51F815E198} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
272249
{08F8160E-E691-4F07-9F57-EA31B9736429} = {25DA12FE-6209-4524-9A37-8E51F815E198}
273250
{50371E48-BEC3-4D53-BD37-F3A6149CFD0D} = {25DA12FE-6209-4524-9A37-8E51F815E198}
274251
{C5B7120C-190B-4C38-95CB-83F12799598D} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
275-
{93E5CAF4-D5DB-4915-AF0F-908A6043E462} = {0C0D20CE-70CD-4CEF-BE9B-AEB8A2DE9C8A}
276252
{D6449B7A-20FF-467B-A65E-174DD6992AEB} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
277253
EndGlobalSection
278254
GlobalSection(ExtensibilityGlobals) = postSolution

‎build.cake

-20
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,6 @@ PackageDefinition NUnitConsoleRunnerNet80Package;
246246
PackageDefinition NUnitEnginePackage;
247247
PackageDefinition NUnitEngineApiPackage;
248248
PackageDefinition NUnitConsoleRunnerChocolateyPackage;
249-
PackageDefinition NUnitConsoleMsiPackage;
250249
PackageDefinition NUnitConsoleZipPackage;
251250

252251
BuildSettings.Packages.AddRange(new PackageDefinition[] {
@@ -330,25 +329,6 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
330329
+ $"nunit-console-runner.{BuildSettings.PackageVersion}/tools/nunit3-console.exe"),
331330
tests: StandardRunnerTests),
332331

333-
NUnitConsoleMsiPackage = new MsiPackage(
334-
id: "NUnit.Console",
335-
source: BuildSettings.MsiDirectory + "nunit/nunit.wixproj",
336-
checks: new PackageCheck[] {
337-
HasDirectory("NUnit.org").WithFiles("LICENSE.txt", "NOTICES.txt", "nunit.ico"),
338-
HasDirectory("NUnit.org/nunit-console").WithFiles(CONSOLE_FILES).AndFiles(ENGINE_FILES).AndFile("nunit.bundle.addins"),
339-
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")
340-
},
341-
testRunner: new ConsoleRunnerSelfTester(BuildSettings.MsiTestDirectory
342-
+ $"NUnit.Console.{BuildSettings.BuildVersion.SemVer}/NUnit.org/nunit-console/nunit3-console.exe"),
343-
tests: StandardRunnerTests,
344-
bundledExtensions: new [] {
345-
new PackageReference("NUnit.Extension.VSProjectLoader", "3.9.0"),
346-
new PackageReference("NUnit.Extension.NUnitProjectLoader", "3.7.1"),
347-
new PackageReference("NUnit.Extension.NUnitV2Driver", "3.9.0"),
348-
new PackageReference("NUnit.Extension.NUnitV2ResultWriter", "3.7.0"),
349-
new PackageReference("NUnit.Extension.TeamCityEventListener", "1.0.9")
350-
}),
351-
352332
NUnitConsoleZipPackage = new ZipPackage(
353333
id: "NUnit.Console",
354334
source: BuildSettings.ZipImageDirectory,

‎cake/build-settings.cake

-7
Original file line numberDiff line numberDiff line change
@@ -167,21 +167,17 @@ public static class BuildSettings
167167
public static string OutputDirectory => ProjectDirectory + BIN_DIR + Configuration + "/";
168168
public static string NuGetDirectory => ProjectDirectory + NUGET_DIR;
169169
public static string ChocolateyDirectory => ProjectDirectory + CHOCO_DIR;
170-
public static string MsiDirectory => ProjectDirectory + MSI_DIR;
171170
public static string ZipDirectory => ProjectDirectory + ZIP_DIR;
172171
public static string PackageDirectory => ProjectDirectory + PACKAGE_DIR;
173172
public static string PackageTestDirectory => ProjectDirectory + PKG_TEST_DIR;
174173
public static string NuGetTestDirectory => ProjectDirectory + NUGET_TEST_DIR;
175174
public static string ChocolateyTestDirectory => ProjectDirectory + CHOCO_TEST_DIR;
176-
public static string MsiTestDirectory => ProjectDirectory + MSI_TEST_DIR;
177175
public static string ZipTestDirectory => ProjectDirectory + ZIP_TEST_DIR;
178176
public static string PackageResultDirectory => ProjectDirectory + PKG_RSLT_DIR;
179177
public static string NuGetResultDirectory => ProjectDirectory + NUGET_RSLT_DIR;
180178
public static string ChocolateyResultDirectory => ProjectDirectory + CHOCO_RSLT_DIR;
181-
public static string MsiResultDirectory => ProjectDirectory + MSI_RSLT_DIR;
182179
public static string ZipResultDirectory => ProjectDirectory + ZIP_RSLT_DIR;
183180
public static string ImageDirectory => ProjectDirectory + IMAGE_DIR;
184-
public static string MsiImageDirectory => ProjectDirectory + MSI_IMG_DIR;
185181
public static string ZipImageDirectory => ProjectDirectory + ZIP_IMG_DIR;
186182
public static string ExtensionsDirectory => ProjectDirectory + "bundled-extensions/";
187183
public static string ToolsDirectory => ProjectDirectory + "tools/";
@@ -298,15 +294,12 @@ public static class BuildSettings
298294
Console.WriteLine("PackageTest: " + PackageTestDirectory);
299295
Console.WriteLine("NuGetTest: " + NuGetTestDirectory);
300296
Console.WriteLine("ChocoTest: " + ChocolateyTestDirectory);
301-
Console.WriteLine("MsiTest: " + MsiTestDirectory);
302297
Console.WriteLine("ZipTest: " + ZipTestDirectory);
303298
Console.WriteLine("PackageResult: " + PackageResultDirectory);
304299
Console.WriteLine("NuGetResult: " + NuGetResultDirectory);
305300
Console.WriteLine("ChocoResult: " + ChocolateyResultDirectory);
306-
Console.WriteLine("MsiResult: " + MsiResultDirectory);
307301
Console.WriteLine("ZipResult: " + ZipResultDirectory);
308302
Console.WriteLine("Image: " + ImageDirectory);
309-
Console.WriteLine("MsiImage: " + MsiImageDirectory);
310303
Console.WriteLine("ZipImage: " + ZipImageDirectory);
311304

312305
Console.WriteLine("\nBUILD");

‎cake/constants.cake

-4
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,19 @@ const string SRC_DIR = "src/";
1616
const string BIN_DIR = "bin/";
1717
const string NUGET_DIR = "nuget/";
1818
const string CHOCO_DIR = "choco/";
19-
const string MSI_DIR = "msi/";
2019
const string ZIP_DIR = "zip/";
2120
const string PACKAGE_DIR = "package/";
2221
const string PKG_TEST_DIR = "package/tests/";
2322
const string NUGET_TEST_DIR = "package/tests/nuget/";
2423
//const string NUGET_RUNNER_DIR = "package/tests/nuget/runners/";
2524
const string CHOCO_TEST_DIR = "package/tests/choco/";
2625
//const string CHOCO_RUNNER_DIR = "package/tests/choco/runners/";
27-
const string MSI_TEST_DIR = "package/tests/msi/";
2826
const string ZIP_TEST_DIR = "package/tests/zip/";
2927
const string PKG_RSLT_DIR = "package/results/";
3028
const string NUGET_RSLT_DIR = "package/results/nuget/";
3129
const string CHOCO_RSLT_DIR = "package/results/choco/";
32-
const string MSI_RSLT_DIR = "package/results/msi/";
3330
const string ZIP_RSLT_DIR = "package/results/zip/";
3431
const string IMAGE_DIR = "package/images";
35-
const string MSI_IMG_DIR = "package/images/msi/";
3632
const string ZIP_IMG_DIR = "package/images/zip/";
3733
const string TOOLS_DIR = "tools/";
3834

‎cake/help-messages.cake

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
more specifications, separated by '|' and '&'. Each specification
3232
is of the form "prop=value", where prop may be either id or type.
3333
Examples:
34-
--where type=msi
34+
--where type=nuget
3535
--where id=NUnit.Engine.Api
36-
--where "type=msi|type=zip"
36+
--where "type=nuget|type=choco"
3737
3838
--level=LEVEL [--lev]
3939
Specifies the level of package testing, 1, 2 or 3. Defaults are

‎cake/msi-package.cake

-95
This file was deleted.

‎cake/package-definition.cake

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ public enum PackageType
22
{
33
NuGet,
44
Chocolatey,
5-
Msi,
65
Zip
76
}
87

‎cake/zip-package.cake

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ public class ZipPackage : PackageDefinition
1818
BundledExtensions = bundledExtensions;
1919
}
2020

21-
// MSI and ZIP packages support bundling of extensions
22-
// if any are specified in the definition.
21+
// ZIP package supports bundling of extensions
2322
public PackageReference[] BundledExtensions { get; }
2423

2524
// The file name of this package, including extension

‎msi/nunit-install.sln

-27
This file was deleted.

‎msi/nunit/addin-files.wxi

-47
This file was deleted.

‎msi/nunit/banner.bmp

-29.1 KB
Binary file not shown.

‎msi/nunit/console-files.wxi

-14
This file was deleted.

‎msi/nunit/dialog.bmp

-152 KB
Binary file not shown.

0 commit comments

Comments
 (0)