aboutsummaryrefslogtreecommitdiff
path: root/src/test/WixToolsetTest.CoreIntegration/TestData
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-04-24 16:28:44 -0500
committerSean Hall <r.sean.hall@gmail.com>2021-04-25 23:06:35 -0500
commitf4709371fa21ca1d0c06e04d1b53c0b10bfafeed (patch)
tree622576e0b46b0cea56143fd707936f9635389bad /src/test/WixToolsetTest.CoreIntegration/TestData
parent23de0a19bffe457916b0a45e07044650ace8f456 (diff)
downloadwix-f4709371fa21ca1d0c06e04d1b53c0b10bfafeed.tar.gz
wix-f4709371fa21ca1d0c06e04d1b53c0b10bfafeed.tar.bz2
wix-f4709371fa21ca1d0c06e04d1b53c0b10bfafeed.zip
Perform more bundle validation during linking.
#5273, #6291, #6398
Diffstat (limited to 'src/test/WixToolsetTest.CoreIntegration/TestData')
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/OrphanPayload.wxs11
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/PackageInMultipleContainers.wxs14
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledPackage.wxs6
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/UnscheduledRollbackBoundary.wxs4
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/Container/LayoutPayloadInContainer.wxs28
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/Container/PayloadInMultipleContainers.wxs28
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/Payload/SharedBAAndPackagePayloadBundle.wxs2
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/SharedPayloadsBetweenPackages/SharedPayloadsBetweenPackages.wxs4
8 files changed, 89 insertions, 8 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 @@
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>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Container/LayoutPayloadInContainer.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Container/LayoutPayloadInContainer.wxs
new file mode 100644
index 00000000..0c5f8c7e
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Container/LayoutPayloadInContainer.wxs
@@ -0,0 +1,28 @@
1<?xml version="1.0" encoding="utf-8"?>
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
3 <Bundle Name="BurnBundle" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="{B5B23622-239B-4E3B-BDAB-67648CB975BF}">
4 <BootstrapperApplication>
5 <BootstrapperApplicationDll SourceFile="fakeba.dll" />
6 </BootstrapperApplication>
7 <Chain>
8 <PackageGroupRef Id="BundlePackages" />
9 </Chain>
10 <PayloadGroupRef Id="Shared" />
11 </Bundle>
12 <Fragment>
13 <PackageGroup Id="BundlePackages">
14 <PackageGroupRef Id="FirstX64" />
15 </PackageGroup>
16 <PackageGroup Id="FirstX64">
17 <MsiPackage SourceFile="FirstX64.msi">
18 <PayloadGroupRef Id="Shared" />
19 </MsiPackage>
20 </PackageGroup>
21 <Container Id="FirstX64" Name="FirstX64" Type="detached">
22 <PackageGroupRef Id="FirstX64" />
23 </Container>
24 <PayloadGroup Id="Shared">
25 <Payload Id="SharedPayload" SourceFile="$(sys.SOURCEFILEPATH)" />
26 </PayloadGroup>
27 </Fragment>
28</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Container/PayloadInMultipleContainers.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Container/PayloadInMultipleContainers.wxs
new file mode 100644
index 00000000..c7f549a3
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Container/PayloadInMultipleContainers.wxs
@@ -0,0 +1,28 @@
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="FirstX86" />
6 <PackageGroupRef Id="FirstX64" />
7 </PackageGroup>
8 <PackageGroup Id="FirstX86">
9 <MsiPackage SourceFile="FirstX86.msi">
10 <PayloadGroupRef Id="Shared" />
11 </MsiPackage>
12 </PackageGroup>
13 <PackageGroup Id="FirstX64">
14 <MsiPackage SourceFile="FirstX64.msi">
15 <PayloadGroupRef Id="Shared" />
16 </MsiPackage>
17 </PackageGroup>
18 <Container Id="FirstX86" Name="FirstX86" Type="detached">
19 <PackageGroupRef Id="FirstX86" />
20 </Container>
21 <Container Id="FirstX64" Name="FirstX64" Type="detached">
22 <PackageGroupRef Id="FirstX64" />
23 </Container>
24 <PayloadGroup Id="Shared">
25 <Payload Id="SharedPayload" SourceFile="$(sys.SOURCEFILEPATH)" />
26 </PayloadGroup>
27 </Fragment>
28</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Payload/SharedBAAndPackagePayloadBundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Payload/SharedBAAndPackagePayloadBundle.wxs
index 4cfeb99f..5263cbd4 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/Payload/SharedBAAndPackagePayloadBundle.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Payload/SharedBAAndPackagePayloadBundle.wxs
@@ -2,7 +2,7 @@
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 SourceFile="burn.exe"> 5 <ExePackage SourceFile="burn.exe" DetectCondition="none">
6 <PayloadGroupRef Id="Shared" /> 6 <PayloadGroupRef Id="Shared" />
7 </ExePackage> 7 </ExePackage>
8 </PackageGroup> 8 </PackageGroup>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SharedPayloadsBetweenPackages/SharedPayloadsBetweenPackages.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SharedPayloadsBetweenPackages/SharedPayloadsBetweenPackages.wxs
index 3457a3b7..f16fce0d 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SharedPayloadsBetweenPackages/SharedPayloadsBetweenPackages.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SharedPayloadsBetweenPackages/SharedPayloadsBetweenPackages.wxs
@@ -2,10 +2,10 @@
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 SourceFile="C:\Windows\system32\credwiz.exe" Permanent="yes"> 5 <ExePackage SourceFile="C:\Windows\system32\credwiz.exe" Permanent="yes" DetectCondition="none">
6 <PayloadGroupRef Id="SharedPayloads" /> 6 <PayloadGroupRef Id="SharedPayloads" />
7 </ExePackage> 7 </ExePackage>
8 <ExePackage SourceFile="C:\Windows\system32\cscript.exe" Permanent="yes"> 8 <ExePackage SourceFile="C:\Windows\system32\cscript.exe" Permanent="yes" DetectCondition="none">
9 <PayloadGroupRef Id="SharedPayloads" /> 9 <PayloadGroupRef Id="SharedPayloads" />
10 </ExePackage> 10 </ExePackage>
11 </PackageGroup> 11 </PackageGroup>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-12-26 15:35:54 +0000