From 1c22e62b31e92a5788af04d448c19ae0c8b22767 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sat, 1 May 2021 20:58:16 -0500
Subject: Use WiX cmd line options for WarningAsError and
 DefaultCompressionLevel

---
 appveyor.cmd                                                         | 2 +-
 appveyor.yml                                                         | 1 -
 src/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj | 1 -
 src/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj | 1 -
 src/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj | 1 -
 src/Wix.Build.props                                                  | 3 +++
 6 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/appveyor.cmd b/appveyor.cmd
index eeb56296..c0d965e5 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -3,7 +3,7 @@
 @set _C=Release
 
 msbuild -p:Configuration=%_C% -warnaserror -Restore || exit /b
-msbuild -p:Configuration=%_C% src\TestData -warnaserror -Restore || exit /b
+msbuild -p:Configuration=%_C% src\TestData -Restore || exit /b
 
 dotnet test -c %_C% --no-build src\WixToolsetTest.BurnE2E || exit /b
 
diff --git a/appveyor.yml b/appveyor.yml
index bede9c68..d12975dc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,7 +8,6 @@ environment:
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
   NUGET_XMLDOC_MODE: skip
   RuntimeTestsEnabled: true
-  WIX_COMPRESSION_LEVEL: none
 
 
 install:
diff --git a/src/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj b/src/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj
index f5c53195..3f405ce5 100644
--- a/src/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj
+++ b/src/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <OutputType>Bundle</OutputType>
     <InstallerPlatform>x64</InstallerPlatform>
-    <SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings>
     <BA>hyperlinkLicense</BA>
     <UpgradeCode>{6E86B95A-24F6-4C89-AF2E-470C0C734FCB}</UpgradeCode>
   </PropertyGroup>
diff --git a/src/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj b/src/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj
index 35f78cb8..1b1a5006 100644
--- a/src/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj
+++ b/src/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj
@@ -5,7 +5,6 @@
     <BA>TestBA_x64</BA>
     <UpgradeCode>{79F45B7A-D990-46E4-819B-078D87C3321A}</UpgradeCode>
     <InstallerPlatform>x64</InstallerPlatform>
-    <SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
diff --git a/src/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj b/src/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj
index aef5e18e..3b9d7360 100644
--- a/src/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj
+++ b/src/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj
@@ -5,7 +5,6 @@
     <BA>TestBAdnc_x64</BA>
     <UpgradeCode>{638D31D0-92BA-4BCD-82F0-7F549820D9AB}</UpgradeCode>
     <InstallerPlatform>x64</InstallerPlatform>
-    <SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
diff --git a/src/Wix.Build.props b/src/Wix.Build.props
index 61fdc815..06cf5b1d 100644
--- a/src/Wix.Build.props
+++ b/src/Wix.Build.props
@@ -4,5 +4,8 @@
     <TestGroupName Condition=" '$(TestGroupName)'=='' ">$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory)))))</TestGroupName>
     <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(TestGroupName)\$(ProjectName)\</BaseIntermediateOutputPath>
     <OutputPath>$(OutputPath)netcoreapp3.1\TestData\$(TestGroupName)\</OutputPath>
+    <DefaultCompressionLevel>None</DefaultCompressionLevel>
+    <CompilerAdditionalOptions>-wx</CompilerAdditionalOptions>
+    <SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings>
   </PropertyGroup>
 </Project>
-- 
cgit v1.2.3-55-g6feb