diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-04-21 16:51:22 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-04-21 16:54:42 -0500 |
| commit | 0531df3e9f7b3e41434def0c569bd748adc721f6 (patch) | |
| tree | ec8003985cac685aee6c1ece1e0a2a05907f640e /src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction | |
| parent | aee568fddd21fe0fc270f7e705dc7b9e834d9ff4 (diff) | |
| download | wix-0531df3e9f7b3e41434def0c569bd748adc721f6.tar.gz wix-0531df3e9f7b3e41434def0c569bd748adc721f6.tar.bz2 wix-0531df3e9f7b3e41434def0c569bd748adc721f6.zip | |
Detect payload collisions.
#4574
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction')
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X64AfterX86Bundle.wxs | 8 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X86AfterX64Bundle.wxs | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X64AfterX86Bundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X64AfterX86Bundle.wxs index 8f4fc8bd..e6527a36 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X64AfterX86Bundle.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X64AfterX86Bundle.wxs | |||
| @@ -2,11 +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 | <MsiPackage SourceFile="FirstX64.msi" /> | 5 | <MsiPackage SourceFile="FirstX64\" Name="FirstX64\FirstX64.msi" /> |
| 6 | <RollbackBoundary Transaction="yes" /> | 6 | <RollbackBoundary Transaction="yes" /> |
| 7 | <MsiPackage SourceFile="FirstX86.msi" /> | 7 | <MsiPackage SourceFile="FirstX86\" Name="FirstX86\FirstX86.msi" /> |
| 8 | <MsiPackage SourceFile="SecondX86.msi" /> | 8 | <MsiPackage SourceFile="SecondX86\" Name="SecondX86\SecondX86.msi" /> |
| 9 | <MsiPackage SourceFile="SecondX64.msi" /> | 9 | <MsiPackage SourceFile="SecondX64\" Name="SecondX64\SecondX64.msi" /> |
| 10 | </PackageGroup> | 10 | </PackageGroup> |
| 11 | </Fragment> | 11 | </Fragment> |
| 12 | </Wix> | 12 | </Wix> |
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X86AfterX64Bundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X86AfterX64Bundle.wxs index 221f06c5..f1c939db 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X86AfterX64Bundle.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/MsiTransaction/X86AfterX64Bundle.wxs | |||
| @@ -2,11 +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 | <MsiPackage SourceFile="FirstX86.msi" /> | 5 | <MsiPackage SourceFile="FirstX86\" Name="FirstX86\FirstX86.msi" /> |
| 6 | <RollbackBoundary Transaction="yes" /> | 6 | <RollbackBoundary Transaction="yes" /> |
| 7 | <MsiPackage SourceFile="FirstX64.msi" /> | 7 | <MsiPackage SourceFile="FirstX64\" Name="FirstX64\FirstX64.msi" /> |
| 8 | <MsiPackage SourceFile="SecondX64.msi" /> | 8 | <MsiPackage SourceFile="SecondX64\" Name="SecondX64\SecondX64.msi" /> |
| 9 | <MsiPackage SourceFile="SecondX86.msi" /> | 9 | <MsiPackage SourceFile="SecondX86\" Name="SecondX86\SecondX86.msi" /> |
| 10 | </PackageGroup> | 10 | </PackageGroup> |
| 11 | </Fragment> | 11 | </Fragment> |
| 12 | </Wix> | 12 | </Wix> |