aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-05-11 07:44:04 -0700
committerRob Mensching <rob@firegiant.com>2021-05-11 07:44:04 -0700
commitf0c6faa8f16569fced7512c5388ecad5a331d438 (patch)
treee2f12ac48e7592d736802fcc218f882aee37df50 /src/test
parent459225b8ad2b11d4cd576f037e459bfb21b5a87a (diff)
parent8cf0427984a88b0b3ddfb2061e5be721afffe82e (diff)
downloadwix-f0c6faa8f16569fced7512c5388ecad5a331d438.tar.gz
wix-f0c6faa8f16569fced7512c5388ecad5a331d438.tar.bz2
wix-f0c6faa8f16569fced7512c5388ecad5a331d438.zip
Merge Core
Diffstat (limited to 'src/test')
-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/Container/HarvestIntoAttachedContainer.wxs17
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/Container/LayoutPayloadInContainer.wxs28
-rw-r--r--src/test/WixToolsetTest.CoreIntegration/TestData/Container/PayloadInMultipleContainers.wxs28
5 files changed, 98 insertions, 0 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/Container/HarvestIntoAttachedContainer.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Container/HarvestIntoAttachedContainer.wxs
new file mode 100644
index 00000000..ec757c5d
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/Container/HarvestIntoAttachedContainer.wxs
@@ -0,0 +1,17 @@
1<?xml version="1.0" encoding="utf-8"?>
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
3 <Fragment>
4 <PackageGroup Id="BundlePackages">
5 <MsiPackage Id="FirstX86">
6 <PayloadGroupRef Id="FirstX86Payloads" />
7 </MsiPackage>
8 <MsiPackage Id="FirstX64" Name="FirstX64\FirstX64.msi" SourceFile="FirstX64\" DownloadUrl="http://example.com/{0}/{1}/{2}" />
9 </PackageGroup>
10 <Container Id="BundlePackages" Type="attached">
11 <PackageGroupRef Id="BundlePackages" />
12 </Container>
13 <PayloadGroup Id="FirstX86Payloads">
14 <MsiPackagePayload Name="FirstX86\FirstX86.msi" SourceFile="FirstX86\" DownloadUrl="http://example.com/{0}/{1}/{2}" />
15 </PayloadGroup>
16 </Fragment>
17</Wix>
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>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-12-29 23:52:23 +0000