diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-05-01 20:58:16 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-05-04 11:33:47 -0500 |
| commit | 1c22e62b31e92a5788af04d448c19ae0c8b22767 (patch) | |
| tree | 6950c77461a3b30e17be457e57f0b1ab0110f5a3 /src | |
| parent | 70f6c04122db39b5d234715c373d690f97892f8b (diff) | |
| download | wix-1c22e62b31e92a5788af04d448c19ae0c8b22767.tar.gz wix-1c22e62b31e92a5788af04d448c19ae0c8b22767.tar.bz2 wix-1c22e62b31e92a5788af04d448c19ae0c8b22767.zip | |
Use WiX cmd line options for WarningAsError and DefaultCompressionLevel
Diffstat (limited to 'src')
4 files changed, 3 insertions, 3 deletions
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 @@ | |||
| 3 | <PropertyGroup> | 3 | <PropertyGroup> |
| 4 | <OutputType>Bundle</OutputType> | 4 | <OutputType>Bundle</OutputType> |
| 5 | <InstallerPlatform>x64</InstallerPlatform> | 5 | <InstallerPlatform>x64</InstallerPlatform> |
| 6 | <SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings> | ||
| 7 | <BA>hyperlinkLicense</BA> | 6 | <BA>hyperlinkLicense</BA> |
| 8 | <UpgradeCode>{6E86B95A-24F6-4C89-AF2E-470C0C734FCB}</UpgradeCode> | 7 | <UpgradeCode>{6E86B95A-24F6-4C89-AF2E-470C0C734FCB}</UpgradeCode> |
| 9 | </PropertyGroup> | 8 | </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 @@ | |||
| 5 | <BA>TestBA_x64</BA> | 5 | <BA>TestBA_x64</BA> |
| 6 | <UpgradeCode>{79F45B7A-D990-46E4-819B-078D87C3321A}</UpgradeCode> | 6 | <UpgradeCode>{79F45B7A-D990-46E4-819B-078D87C3321A}</UpgradeCode> |
| 7 | <InstallerPlatform>x64</InstallerPlatform> | 7 | <InstallerPlatform>x64</InstallerPlatform> |
| 8 | <SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings> | ||
| 9 | </PropertyGroup> | 8 | </PropertyGroup> |
| 10 | <ItemGroup> | 9 | <ItemGroup> |
| 11 | <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" /> | 10 | <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 @@ | |||
| 5 | <BA>TestBAdnc_x64</BA> | 5 | <BA>TestBAdnc_x64</BA> |
| 6 | <UpgradeCode>{638D31D0-92BA-4BCD-82F0-7F549820D9AB}</UpgradeCode> | 6 | <UpgradeCode>{638D31D0-92BA-4BCD-82F0-7F549820D9AB}</UpgradeCode> |
| 7 | <InstallerPlatform>x64</InstallerPlatform> | 7 | <InstallerPlatform>x64</InstallerPlatform> |
| 8 | <SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings> | ||
| 9 | </PropertyGroup> | 8 | </PropertyGroup> |
| 10 | <ItemGroup> | 9 | <ItemGroup> |
| 11 | <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" /> | 10 | <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 @@ | |||
| 4 | <TestGroupName Condition=" '$(TestGroupName)'=='' ">$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory)))))</TestGroupName> | 4 | <TestGroupName Condition=" '$(TestGroupName)'=='' ">$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory)))))</TestGroupName> |
| 5 | <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(TestGroupName)\$(ProjectName)\</BaseIntermediateOutputPath> | 5 | <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(TestGroupName)\$(ProjectName)\</BaseIntermediateOutputPath> |
| 6 | <OutputPath>$(OutputPath)netcoreapp3.1\TestData\$(TestGroupName)\</OutputPath> | 6 | <OutputPath>$(OutputPath)netcoreapp3.1\TestData\$(TestGroupName)\</OutputPath> |
| 7 | <DefaultCompressionLevel>None</DefaultCompressionLevel> | ||
| 8 | <CompilerAdditionalOptions>-wx</CompilerAdditionalOptions> | ||
| 9 | <SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings> | ||
| 7 | </PropertyGroup> | 10 | </PropertyGroup> |
| 8 | </Project> | 11 | </Project> |