4 files changed, 30 insertions, 5 deletions
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="Auto1" SourceFile="burn.exe" CacheId="Auto1" DetectCondition="none" />
-            <ExePackage Id="Auto2" SourceFile="burn.exe" CacheId="Auto2" />
+            <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="Auto1" SourceFile="burn.exe" CacheId="Auto1" DetectCondition="none" />
-            <ExePackage Id="Auto2" SourceFile="burn.exe" CacheId="Auto2" />
+            <ExePackage Id="Auto2" SourceFile="burn.exe" CacheId="Auto2" DetectCondition="none" />
        </PackageGroup>
        <SetVariableRef Id="Dummy" />
    </Fragment>

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 @@
		1	<?xml version="1.0" encoding="utf-8"?>
		2	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
		3	<Fragment>
		4	<PackageGroup Id="BundlePackages">
		5	<PackageGroupRef Id="MinimalPackageGroup" />
		6	</PackageGroup>
		7	<PayloadGroup Id="OrphanPayloads">
		8	<Payload Id="OrphanPayload" SourceFile="$(sys.SOURCEFILEPATH)" />
		9	</PayloadGroup>
		10	</Fragment>
		11	</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 @@
		1	<?xml version="1.0" encoding="utf-8"?>
		2	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
		3	<Fragment>
		4	<PackageGroup Id="BundlePackages">
		5	<PackageGroupRef Id="MinimalPackageGroup" />
		6	</PackageGroup>
		7	<Container Id="First">
		8	<PackageGroupRef Id="BundlePackages" />
		9	</Container>
		10	<Container Id="Second">
		11	<PackageGroupRef Id="BundlePackages" />
		12	</Container>
		13	</Fragment>
		14	</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 @@
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="Auto1" SourceFile="burn.exe" CacheId="Auto1" />	5	<ExePackage Id="Auto1" SourceFile="burn.exe" CacheId="Auto1" DetectCondition="none" />
6	<ExePackage Id="Auto2" SourceFile="burn.exe" CacheId="Auto2" />	6	<ExePackage Id="Auto2" SourceFile="burn.exe" CacheId="Auto2" DetectCondition="none" />
7	</PackageGroup>	7	</PackageGroup>
8	<SetVariableRef Id="Dummy" />	8	<SetVariableRef Id="Dummy" />
9	</Fragment>	9	</Fragment>
10	<Fragment>	10	<Fragment>
11	<SetVariable Id="Dummy" Variable="Dummy" />	11	<SetVariable Id="Dummy" Variable="Dummy" />
12	<PackageGroup Id="Unscheduled">	12	<PackageGroup Id="Unscheduled">
13	<ExePackage Id="Unscheduled1" SourceFile="burn.exe" CacheId="Unscheduled1" />	13	<ExePackage Id="Unscheduled1" SourceFile="burn.exe" CacheId="Unscheduled1" DetectCondition="none" />
14	</PackageGroup>	14	</PackageGroup>
15	</Fragment>	15	</Fragment>
16	</Wix>	16	</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 @@
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="Auto1" SourceFile="burn.exe" CacheId="Auto1" />	5	<ExePackage Id="Auto1" SourceFile="burn.exe" CacheId="Auto1" DetectCondition="none" />
6	<ExePackage Id="Auto2" SourceFile="burn.exe" CacheId="Auto2" />	6	<ExePackage Id="Auto2" SourceFile="burn.exe" CacheId="Auto2" DetectCondition="none" />
7	</PackageGroup>	7	</PackageGroup>
8	<SetVariableRef Id="Dummy" />	8	<SetVariableRef Id="Dummy" />
9	</Fragment>	9	</Fragment>