Detect payload collisions.

#4574

4 files changed, 33 insertions, 11 deletions

diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicatePayloadNames.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicatePayloadNames.wxs
index 2d4e8a3c..4fe7e097 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicatePayloadNames.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/DuplicatePayloadNames.wxs
@@ -2,8 +2,30 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Fragment>
         <PackageGroup Id="BundlePackages">
-            <ExePackage Id="Auto1" SourceFile="burn.exe" CacheId="Auto1" />
-            <ExePackage Id="Auto2" SourceFile="burn.exe" CacheId="Auto2" />
+            <ExePackage Id="Auto1" SourceFile="burn.exe" CacheId="Auto1" DetectCondition="none" />
+            <ExePackage Id="Auto2" SourceFile="burn.exe" CacheId="Auto2" DetectCondition="none" />
+            <ExePackage Id="DuplicateCacheIds.wxs" SourceFile="$(sys.SOURCEFILEDIR)DuplicateCacheIds.wxs" Compressed="no" DetectCondition="none" Name="PayloadCollision">
+                <Payload SourceFile="$(sys.SOURCEFILEDIR)BundleVariable.wxs" Compressed="no" Name="ContainerCollision" />
+            </ExePackage>
+            <ExePackage Id="HiddenPersistedBundleVariable.wxs" SourceFile="$(sys.SOURCEFILEDIR)HiddenPersistedBundleVariable.wxs" Compressed="no" DetectCondition="none" Name="PayloadCollision" />
+            <PackageGroupRef Id="MsiPackages" />
         </PackageGroup>
+
+        <PackageGroup Id="MsiPackages">
+            <MsiPackage SourceFile="test.msi">
+                <Payload SourceFile="$(sys.SOURCEFILEDIR)InvalidIds.wxs" Name="MsiPackage\test.txt" />
+                <Payload SourceFile="$(sys.SOURCEFILEDIR)RegistryKey.wxs" Name="test.msi" />
+            </MsiPackage>
+        </PackageGroup>
+
+        <Container Id="MsiPackagesContainer" Type="detached" Name="ContainerCollision">
+            <PackageGroupRef Id="MsiPackages" />
+        </Container>
+
+        <BootstrapperApplication>
+            <Payload Id="DuplicatePayloadNames.wxs" SourceFile="$(sys.SOURCEFILEPATH)" Name="fakeba.dll" />
+            <Payload Id="UnscheduledPackage.wxs" SourceFile="$(sys.SOURCEFILEDIR)UnscheduledPackage.wxs" Name="BootstrapperApplicationData.xml" />
+            <Payload Id="UnscheduledRollbackBoundary.wxs" SourceFile="$(sys.SOURCEFILEDIR)UnscheduledRollbackBoundary.wxs" Name="BundleExtensionData.xml" />
+        </BootstrapperApplication>
     </Fragment>
 </Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs
index db755171..e52302d4 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BundleCustomTable/BundleCustomTable.wxs
@@ -48,6 +48,6 @@
             </BundleElement>
         </BundleCustomDataRef>
 
-        <BundleExtension Id="CustomTableExtension" SourceFile="fakeba.dll" />
+        <BundleExtension Id="CustomTableExtension" SourceFile="fakeba.dll" Name="fakebext.dll" />
     </Fragment>
 </Wix>
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 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Fragment>
         <PackageGroup Id="BundlePackages">
-            <MsiPackage SourceFile="FirstX64.msi" />
+            <MsiPackage SourceFile="FirstX64\" Name="FirstX64\FirstX64.msi" />
             <RollbackBoundary Transaction="yes" />
-            <MsiPackage SourceFile="FirstX86.msi" />
-            <MsiPackage SourceFile="SecondX86.msi" />
-            <MsiPackage SourceFile="SecondX64.msi" />
+            <MsiPackage SourceFile="FirstX86\" Name="FirstX86\FirstX86.msi" />
+            <MsiPackage SourceFile="SecondX86\" Name="SecondX86\SecondX86.msi" />
+            <MsiPackage SourceFile="SecondX64\" Name="SecondX64\SecondX64.msi" />
         </PackageGroup>
     </Fragment>
 </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 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Fragment>
         <PackageGroup Id="BundlePackages">
-            <MsiPackage SourceFile="FirstX86.msi" />
+            <MsiPackage SourceFile="FirstX86\" Name="FirstX86\FirstX86.msi" />
             <RollbackBoundary Transaction="yes" />
-            <MsiPackage SourceFile="FirstX64.msi" />
-            <MsiPackage SourceFile="SecondX64.msi" />
-            <MsiPackage SourceFile="SecondX86.msi" />
+            <MsiPackage SourceFile="FirstX64\" Name="FirstX64\FirstX64.msi" />
+            <MsiPackage SourceFile="SecondX64\" Name="SecondX64\SecondX64.msi" />
+            <MsiPackage SourceFile="SecondX86\" Name="SecondX86\SecondX86.msi" />
         </PackageGroup>
     </Fragment>
 </Wix>