diff options
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration')
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs | 4 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicateCacheIds.wxs | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs index 38554b70..d121da0f 100644 --- a/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/BundleFixture.cs | |||
| @@ -280,7 +280,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 280 | } | 280 | } |
| 281 | } | 281 | } |
| 282 | 282 | ||
| 283 | [Fact(Skip = "https://github.com/wixtoolset/issues/issues/4628")] | 283 | [Fact] |
| 284 | public void CantBuildWithDuplicateCacheIds() | 284 | public void CantBuildWithDuplicateCacheIds() |
| 285 | { | 285 | { |
| 286 | var folder = TestData.Get(@"TestData"); | 286 | var folder = TestData.Get(@"TestData"); |
| @@ -302,7 +302,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 302 | "-o", exePath, | 302 | "-o", exePath, |
| 303 | }); | 303 | }); |
| 304 | 304 | ||
| 305 | Assert.InRange(result.ExitCode, 2, Int32.MaxValue); | 305 | Assert.Equal(8001, result.ExitCode); |
| 306 | } | 306 | } |
| 307 | } | 307 | } |
| 308 | 308 | ||
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicateCacheIds.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicateCacheIds.wxs index 5c58ef50..0c350042 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicateCacheIds.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicateCacheIds.wxs | |||
| @@ -2,8 +2,11 @@ | |||
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 3 | <Fragment> | 3 | <Fragment> |
| 4 | <PackageGroup Id="BundlePackages"> | 4 | <PackageGroup Id="BundlePackages"> |
| 5 | <ExePackage Id="Manual1" SourceFile="burn.exe" Name="manual1\burn.exe" CacheId="Manual" /> | 5 | <ExePackage Id="Manual1" SourceFile="burn.exe" Name="manual1\burn.exe" DetectCondition="test" CacheId="!(wix.WixVariable1)" /> |
| 6 | <ExePackage Id="Manual2" SourceFile="burn.exe" Name="manual2\burn.exe" CacheId="Manual" /> | 6 | <ExePackage Id="Manual2" SourceFile="burn.exe" Name="manual2\burn.exe" DetectCondition="test" CacheId="!(wix.WixVariable2)" /> |
| 7 | </PackageGroup> | 7 | </PackageGroup> |
| 8 | |||
| 9 | <WixVariable Id="WixVariable1" Value="CollidingCacheId" /> | ||
| 10 | <WixVariable Id="WixVariable2" Value="CollidingCacheId" /> | ||
| 8 | </Fragment> | 11 | </Fragment> |
| 9 | </Wix> | 12 | </Wix> |
