From f4709371fa21ca1d0c06e04d1b53c0b10bfafeed Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sat, 24 Apr 2021 16:28:44 -0500
Subject: Perform more bundle validation during linking.

#5273, #6291, #6398
---
 .../TestData/BadInput/OrphanPayload.wxs                    | 11 +++++++++++
 .../TestData/BadInput/PackageInMultipleContainers.wxs      | 14 ++++++++++++++
 .../TestData/BadInput/UnscheduledPackage.wxs               |  6 +++---
 .../TestData/BadInput/UnscheduledRollbackBoundary.wxs      |  4 ++--
 4 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/OrphanPayload.wxs
 create mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/PackageInMultipleContainers.wxs

(limited to 'src/test/WixToolsetTest.CoreIntegration/TestData/BadInput')

diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/OrphanPayload.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/OrphanPayload.wxs
new file mode 100644
index 00000000..92a9602f
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/OrphanPayload.wxs
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <PackageGroup Id="BundlePackages">
+            <PackageGroupRef Id="MinimalPackageGroup"  />
+        </PackageGroup>
+        <PayloadGroup Id="OrphanPayloads">
+            <Payload Id="OrphanPayload" SourceFile="$(sys.SOURCEFILEPATH)" />
+        </PayloadGroup>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/PackageInMultipleContainers.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/PackageInMultipleContainers.wxs
new file mode 100644
index 00000000..a00874ce
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/PackageInMultipleContainers.wxs
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <PackageGroup Id="BundlePackages">
+            <PackageGroupRef Id="MinimalPackageGroup" />
+        </PackageGroup>
+        <Container Id="First">
+            <PackageGroupRef Id="BundlePackages" />
+        </Container>
+        <Container Id="Second">
+            <PackageGroupRef Id="BundlePackages" />
+        </Container>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledPackage.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledPackage.wxs
index ab86982d..fc53c4a2 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledPackage.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledPackage.wxs
@@ -2,15 +2,15 @@
 <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" />
         </PackageGroup>
         <SetVariableRef Id="Dummy" />
     </Fragment>
     <Fragment>
         <SetVariable Id="Dummy" Variable="Dummy" />
         <PackageGroup Id="Unscheduled">
-            <ExePackage Id="Unscheduled1" SourceFile="burn.exe" CacheId="Unscheduled1" />
+            <ExePackage Id="Unscheduled1" SourceFile="burn.exe" CacheId="Unscheduled1" DetectCondition="none" />
         </PackageGroup>
     </Fragment>
 </Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledRollbackBoundary.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledRollbackBoundary.wxs
index 8015ed92..6cf8528e 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledRollbackBoundary.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledRollbackBoundary.wxs
@@ -2,8 +2,8 @@
 <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" />
         </PackageGroup>
         <SetVariableRef Id="Dummy" />
     </Fragment>
-- 
cgit v1.2.3-55-g6feb