Use WiX cmd line options for WarningAsError and DefaultCompressionLevel
Sean Hall committed
May 1, 2021 at 20:58 UTC
1c22e62b31e92a5788af04d448c19ae0c8b22767
6 files changed
+4
-5
appveyor.cmd
+1
-1
@@ -3,7 +3,7 @@
3
@set _C=Release
4
5
msbuild -p:Configuration=%_C% -warnaserror -Restore || exit /b
6
-msbuild -p:Configuration=%_C% src\TestData -warnaserror -Restore || exit /b
6
+msbuild -p:Configuration=%_C% src\TestData -Restore || exit /b
7
8
dotnet test -c %_C% --no-build src\WixToolsetTest.BurnE2E || exit /b
9
appveyor.yml
-1
@@ -8,7 +8,6 @@ environment:
8
DOTNET_CLI_TELEMETRY_OPTOUT: 1
9
NUGET_XMLDOC_MODE: skip
10
RuntimeTestsEnabled: true
11
- WIX_COMPRESSION_LEVEL: none
11
12
13
install:
src/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj
-1
@@ -3,7 +3,6 @@
3
<PropertyGroup>
4
<OutputType>Bundle</OutputType>
5
<InstallerPlatform>x64</InstallerPlatform>
6
- <SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings>
6
<BA>hyperlinkLicense</BA>
7
<UpgradeCode>{6E86B95A-24F6-4C89-AF2E-470C0C734FCB}</UpgradeCode>
8
</PropertyGroup>
src/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj
-1
@@ -5,7 +5,6 @@
5
<BA>TestBA_x64</BA>
6
<UpgradeCode>{79F45B7A-D990-46E4-819B-078D87C3321A}</UpgradeCode>
7
<InstallerPlatform>x64</InstallerPlatform>
8
- <SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings>
8
</PropertyGroup>
9
<ItemGroup>
10
<Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
src/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj
-1
@@ -5,7 +5,6 @@
5
<BA>TestBAdnc_x64</BA>
6
<UpgradeCode>{638D31D0-92BA-4BCD-82F0-7F549820D9AB}</UpgradeCode>
7
<InstallerPlatform>x64</InstallerPlatform>
8
- <SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings>
8
</PropertyGroup>
9
<ItemGroup>
10
<Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
src/Wix.Build.props
+3
@@ -4,5 +4,8 @@
4
<TestGroupName Condition=" '$(TestGroupName)'=='' ">$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory)))))</TestGroupName>
5
<BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(TestGroupName)\$(ProjectName)\</BaseIntermediateOutputPath>
6
<OutputPath>$(OutputPath)netcoreapp3.1\TestData\$(TestGroupName)\</OutputPath>
7
+ <DefaultCompressionLevel>None</DefaultCompressionLevel>
8
+ <CompilerAdditionalOptions>-wx</CompilerAdditionalOptions>
9
+ <SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings>
10
</PropertyGroup>
11
</Project>