diff options
| author | Bob Arnson <bob@joyofsetup.com> | 2018-09-03 18:19:08 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@joyofsetup.com> | 2018-09-03 18:19:08 -0400 |
| commit | a2614e6e11108abba52b9eca8f460d9ab57513f5 (patch) | |
| tree | 77df973d12040f1b3cb30d96c6516b9e0f73dc31 /src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj | |
| parent | c72297466821e6ca856866cd48726c919554b580 (diff) | |
| download | wix-a2614e6e11108abba52b9eca8f460d9ab57513f5.tar.gz wix-a2614e6e11108abba52b9eca8f460d9ab57513f5.tar.bz2 wix-a2614e6e11108abba52b9eca8f460d9ab57513f5.zip | |
Warn on preprocessor variable redefinition only when the values are different.
Fixes wixtoolset/issues#5853
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj')
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj index 516bd95c..f52d368b 100644 --- a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj +++ b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj | |||
| @@ -49,6 +49,10 @@ | |||
| 49 | <Content Include="TestData\Assembly\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" /> | 49 | <Content Include="TestData\Assembly\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" /> |
| 50 | <Content Include="TestData\Assembly\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | 50 | <Content Include="TestData\Assembly\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> |
| 51 | <Content Include="TestData\Assembly\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" /> | 51 | <Content Include="TestData\Assembly\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" /> |
| 52 | <Content Include="TestData\Variables\data\test.txt" CopyToOutputDirectory="PreserveNewest" /> | ||
| 53 | <Content Include="TestData\Variables\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" /> | ||
| 54 | <Content Include="TestData\Variables\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 55 | <Content Include="TestData\Variables\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 52 | </ItemGroup> | 56 | </ItemGroup> |
| 53 | 57 | ||
| 54 | <ItemGroup> | 58 | <ItemGroup> |