@joebigelow / wix-1 / commits / 489fc2af

Add DefaultCompressionLevel support.

Bob Arnson committed Jan 26, 2021 at 11:49 UTC 489fc2afcc38c06f5798d29680d74cfcce4f0b6f
3 files changed +7 -3
src/WixToolset.BuildTasks/WixBuild.cs
+5
@@ -59,7 +59,9 @@ namespace WixToolset.BuildTasks
59 public ITaskItem BindBuiltOutputsFile { get; set; }
60
61 public string CabinetCachePath { get; set; }
62 +
63 public int CabinetCreationThreadCount { get; set; }
64 +
65 public string DefaultCompressionLevel { get; set; }
66
67 [Output]
@@ -69,7 +71,9 @@ namespace WixToolset.BuildTasks
71 public string[] WixVariables { get; set; }
72
73 public bool SuppressValidation { get; set; }
74 +
75 public string[] SuppressIces { get; set; }
76 +
77 public string AdditionalCub { get; set; }
78
79 protected override string ToolName => "wix.exe";
@@ -95,6 +99,7 @@ namespace WixToolset.BuildTasks
99 commandLineBuilder.AppendSwitchIfNotNull("-contentsfile ", this.BindContentsFile);
100 commandLineBuilder.AppendSwitchIfNotNull("-outputsfile ", this.BindOutputsFile);
101 commandLineBuilder.AppendSwitchIfNotNull("-builtoutputsfile ", this.BindBuiltOutputsFile);
102 + commandLineBuilder.AppendSwitchIfNotNull("-defaultcompressionlevel ", this.DefaultCompressionLevel);
103
104 base.BuildCommandLine(commandLineBuilder);
105
src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
+1
@@ -45,6 +45,7 @@ namespace WixToolsetTest.BuildTasks
45 OutputFile = new TaskItem(Path.Combine(baseFolder, @"bin\test.msi")),
46 PdbType = "Full",
47 PdbFile = new TaskItem(pdbPath),
48 + DefaultCompressionLevel = "nOnE",
49 };
50
51 var result = task.Execute();
src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
+1 -3
@@ -1,12 +1,10 @@
1 -<?define Variable = "Value" ?>
1 +<?define Variable = "Value" ?>
2 <?define Variable = "DifferentValue" ?>
3
4 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200">
6 -
6
7 <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
9 - <MediaTemplate />
8
9 <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
10 <ComponentGroupRef Id="ProductComponents" />