diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2018-09-09 15:15:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-09 15:15:17 -0500 |
| commit | 954b7179a06c1933ae783b602bc29caa0370aec0 (patch) | |
| tree | 98584897bded70665994d9fe68f5e0f1bd24dfb4 /src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj | |
| parent | 38b6fe65e36ed9442e3fc714dea1793d457f0b20 (diff) | |
| parent | a2614e6e11108abba52b9eca8f460d9ab57513f5 (diff) | |
| download | wix-954b7179a06c1933ae783b602bc29caa0370aec0.tar.gz wix-954b7179a06c1933ae783b602bc29caa0370aec0.tar.bz2 wix-954b7179a06c1933ae783b602bc29caa0370aec0.zip | |
Merge pull request #2 from wixtoolset/bob/5853-variable-redefinition
Warn on variable redefinition only when the values are different.
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> |