From 489fc2afcc38c06f5798d29680d74cfcce4f0b6f Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Tue, 26 Jan 2021 11:49:23 -0500
Subject: Add DefaultCompressionLevel support.

---
 src/WixToolset.BuildTasks/WixBuild.cs                                | 5 +++++
 src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs            | 1 +
 .../TestData/SimpleMsiPackage/MsiPackage/Package.wxs                 | 4 +---
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/WixToolset.BuildTasks/WixBuild.cs b/src/WixToolset.BuildTasks/WixBuild.cs
index b669c52b..dbff7e81 100644
--- a/src/WixToolset.BuildTasks/WixBuild.cs
+++ b/src/WixToolset.BuildTasks/WixBuild.cs
@@ -59,7 +59,9 @@ namespace WixToolset.BuildTasks
         public ITaskItem BindBuiltOutputsFile { get; set; }
 
         public string CabinetCachePath { get; set; }
+
         public int CabinetCreationThreadCount { get; set; }
+
         public string DefaultCompressionLevel { get; set; }
 
         [Output]
@@ -69,7 +71,9 @@ namespace WixToolset.BuildTasks
         public string[] WixVariables { get; set; }
 
         public bool SuppressValidation { get; set; }
+
         public string[] SuppressIces { get; set; }
+
         public string AdditionalCub { get; set; }
 
         protected override string ToolName => "wix.exe";
@@ -95,6 +99,7 @@ namespace WixToolset.BuildTasks
             commandLineBuilder.AppendSwitchIfNotNull("-contentsfile ", this.BindContentsFile);
             commandLineBuilder.AppendSwitchIfNotNull("-outputsfile ", this.BindOutputsFile);
             commandLineBuilder.AppendSwitchIfNotNull("-builtoutputsfile ", this.BindBuiltOutputsFile);
+            commandLineBuilder.AppendSwitchIfNotNull("-defaultcompressionlevel ", this.DefaultCompressionLevel);
 
             base.BuildCommandLine(commandLineBuilder);
 
diff --git a/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs b/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
index 87382cb8..9d132f66 100644
--- a/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
+++ b/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
@@ -45,6 +45,7 @@ namespace WixToolsetTest.BuildTasks
                     OutputFile = new TaskItem(Path.Combine(baseFolder, @"bin\test.msi")),
                     PdbType = "Full",
                     PdbFile = new TaskItem(pdbPath),
+                    DefaultCompressionLevel = "nOnE",
                 };
 
                 var result = task.Execute();
diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs b/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
index b900447a..3fd580db 100644
--- a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
+++ b/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs
@@ -1,12 +1,10 @@
-<?define Variable = "Value" ?>
+<?define Variable = "Value" ?>
 <?define Variable = "DifferentValue" ?>
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200">
-    
 
     <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
-    <MediaTemplate />
 
     <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)">
       <ComponentGroupRef Id="ProductComponents" />
-- 
cgit v1.2.3-55-g6feb