diff options
| author | Rob Mensching <rob@firegiant.com> | 2020-05-22 14:53:27 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2020-05-22 15:25:19 -0700 |
| commit | 6b30680fd7a712b45538c3f0a89d652f0457a893 (patch) | |
| tree | 46ef7f7d51de4189b7ef1af07dda3add16ad302f /src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj | |
| parent | 236f958468923f65a8f02e406601fb47e71cd58e (diff) | |
| download | wix-6b30680fd7a712b45538c3f0a89d652f0457a893.tar.gz wix-6b30680fd7a712b45538c3f0a89d652f0457a893.tar.bz2 wix-6b30680fd7a712b45538c3f0a89d652f0457a893.zip | |
Support merging merge modules
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj')
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj index 0651ec7a..9d2cf1d6 100644 --- a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj +++ b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj | |||
| @@ -77,6 +77,9 @@ | |||
| 77 | <Content Include="TestData\SimpleBundle\data\fakeba.dll" CopyToOutputDirectory="PreserveNewest" /> | 77 | <Content Include="TestData\SimpleBundle\data\fakeba.dll" CopyToOutputDirectory="PreserveNewest" /> |
| 78 | <Content Include="TestData\SimpleBundle\data\MsiPackage\Shared.dll" CopyToOutputDirectory="PreserveNewest" /> | 78 | <Content Include="TestData\SimpleBundle\data\MsiPackage\Shared.dll" CopyToOutputDirectory="PreserveNewest" /> |
| 79 | <Content Include="TestData\SimpleBundle\data\MsiPackage\test.txt" CopyToOutputDirectory="PreserveNewest" /> | 79 | <Content Include="TestData\SimpleBundle\data\MsiPackage\test.txt" CopyToOutputDirectory="PreserveNewest" /> |
| 80 | <Content Include="TestData\SimpleMerge\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" /> | ||
| 81 | <Content Include="TestData\SimpleMerge\Package.wxs" CopyToOutputDirectory="PreserveNewest" /> | ||
| 82 | <Content Include="TestData\SimpleMerge\.data\test.msm" CopyToOutputDirectory="PreserveNewest" /> | ||
| 80 | <Content Include="TestData\SimpleModule\data\test.txt" CopyToOutputDirectory="PreserveNewest" /> | 83 | <Content Include="TestData\SimpleModule\data\test.txt" CopyToOutputDirectory="PreserveNewest" /> |
| 81 | <Content Include="TestData\SimpleModule\Module.en-us.wxl" CopyToOutputDirectory="PreserveNewest" /> | 84 | <Content Include="TestData\SimpleModule\Module.en-us.wxl" CopyToOutputDirectory="PreserveNewest" /> |
| 82 | <Content Include="TestData\SimpleModule\Module.wxs" CopyToOutputDirectory="PreserveNewest" /> | 85 | <Content Include="TestData\SimpleModule\Module.wxs" CopyToOutputDirectory="PreserveNewest" /> |