diff options
| -rw-r--r-- | appveyor.cmd | 2 | ||||
| -rw-r--r-- | appveyor.yml | 1 | ||||
| -rw-r--r-- | src/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj | 1 | ||||
| -rw-r--r-- | src/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj | 1 | ||||
| -rw-r--r-- | src/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj | 1 | ||||
| -rw-r--r-- | 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 @@ | |||
| 3 | @set _C=Release | 3 | @set _C=Release |
| 4 | 4 | ||
| 5 | msbuild -p:Configuration=%_C% -warnaserror -Restore || exit /b | 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 | 7 | ||
| 8 | dotnet test -c %_C% --no-build src\WixToolsetTest.BurnE2E || exit /b | 8 | dotnet test -c %_C% --no-build src\WixToolsetTest.BurnE2E || exit /b |
| 9 | 9 | ||
diff --git a/appveyor.yml b/appveyor.yml index bede9c68..d12975dc 100644 --- a/appveyor.yml +++ b/appveyor.yml | |||
| @@ -8,7 +8,6 @@ environment: | |||
| 8 | DOTNET_CLI_TELEMETRY_OPTOUT: 1 | 8 | DOTNET_CLI_TELEMETRY_OPTOUT: 1 |
| 9 | NUGET_XMLDOC_MODE: skip | 9 | NUGET_XMLDOC_MODE: skip |
| 10 | RuntimeTestsEnabled: true | 10 | RuntimeTestsEnabled: true |
| 11 | WIX_COMPRESSION_LEVEL: none | ||
| 12 | 11 | ||
| 13 | 12 | ||
| 14 | install: | 13 | 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 @@ | |||
| 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> |
