Use new PackagePayload symbols for the package's payload.

#4183
author: Sean Hall <r.sean.hall@gmail.com> 2021-02-28 21:05:49 -0600
committer: Sean Hall <r.sean.hall@gmail.com> 2021-03-02 15:50:47 -0600
commit: 8b3488c8c77959f425d0e5f70d27c5b2b1c86125 (patch)
tree: 827dfa7caba09d7fa032c317505a590bb834c4e6 /src/test/WixToolsetTest.CoreIntegration/TestData
parent: a6013a643208a8d1fc2d1136ef8d3a6c3e909522 (diff)
download: wix-8b3488c8c77959f425d0e5f70d27c5b2b1c86125.tar.gz
wix-8b3488c8c77959f425d0e5f70d27c5b2b1c86125.tar.bz2
wix-8b3488c8c77959f425d0e5f70d27c5b2b1c86125.zip
8 files changed, 84 insertions, 5 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/MissingSourceFileAndHash.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/MissingSourceFileAndHash.wxs
new file mode 100644
index 00000000..5e1b99ff
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/MissingSourceFileAndHash.wxs
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <PackageGroup Id="BundlePackages">
+            <MsuPackage Id="MissingSourceFileAndHash" Permanent="yes" DetectCondition="none">
+                <MsuPackagePayload DownloadUrl="example.com" />
+            </MsuPackage>
+        </PackageGroup>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/MissingSourceFileAndName.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/MissingSourceFileAndName.wxs
new file mode 100644
index 00000000..f220d81a
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/MissingSourceFileAndName.wxs
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <PackageGroup Id="BundlePackages">
+            <MsiPackage Id="MissingSourceFileAndName">
+                <MsiPackagePayload DownloadUrl="example.com" />
+            </MsiPackage>
+        </PackageGroup>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/PackagePayloadInPayloadGroup.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/PackagePayloadInPayloadGroup.wxs
new file mode 100644
index 00000000..149870a4
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/PackagePayloadInPayloadGroup.wxs
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <PackageGroup Id="BundlePackages">
+            <ExePackage Id="PackagePayloadInPayloadGroup" Permanent="yes" DetectCondition="none">
+                <PayloadGroupRef Id="PackagePayloadGroup" />
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
+    <Fragment>
+        <PayloadGroup Id="PackagePayloadGroup">
+            <ExePackagePayload SourceFile="burn.exe" />
+        </PayloadGroup>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedHash.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedHash.wxs
new file mode 100644
index 00000000..3c361c49
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedHash.wxs
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <PackageGroup Id="BundlePackages">
+            <MspPackage Id="SpecifiedHash">
+                <MspPackagePayload SourceFile="example.msp" DownloadUrl="example.com" Hash="abcd" />
+            </MspPackage>
+        </PackageGroup>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedHashAndMissingDownloadUrl.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedHashAndMissingDownloadUrl.wxs
new file mode 100644
index 00000000..8e62f660
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedHashAndMissingDownloadUrl.wxs
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <PackageGroup Id="BundlePackages">
+            <MsuPackage Id="SpecifiedHashAndMissingDownloadUrl" Permanent="yes" DetectCondition="none">
+                <MsuPackagePayload Name="example.msu" Hash="abcd" Size="1" Version="1.0.0.0" ProductName="KB1234567" Description="fake msu" />
+            </MsuPackage>
+        </PackageGroup>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedSourceFileAndHash.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedSourceFileAndHash.wxs
new file mode 100644
index 00000000..f79da874
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedSourceFileAndHash.wxs
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <PackageGroup Id="BundlePackages">
+            <ExePackage Id="SpecifiedSourceFileAndHash" Permanent="yes" DetectCondition="none">
+                <ExePackagePayload SourceFile="example.exe" Hash="abcd" />
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/WrongPackagePayloadInPayloadGroup.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/WrongPackagePayloadInPayloadGroup.wxs
new file mode 100644
index 00000000..dda306cf
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/WrongPackagePayloadInPayloadGroup.wxs
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Fragment>
+        <PackageGroup Id="BundlePackages">
+            <MsiPackage Id="WrongPackagePayloadInPayloadGroup">
+                <PayloadGroupRef Id="WrongPackagePayloadGroup" />
+            </MsiPackage>
+        </PackageGroup>
+    </Fragment>
+    <Fragment>
+        <PayloadGroup Id="WrongPackagePayloadGroup">
+            <ExePackagePayload SourceFile="burn.exe" />
+        </PayloadGroup>
+    </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleExeBundle/SingleExeRemotePayload.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleExeBundle/SingleExeRemotePayload.wxs
index 79ba52d2..56f08ba9 100644
--- a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleExeBundle/SingleExeRemotePayload.wxs
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleExeBundle/SingleExeRemotePayload.wxs
@@ -13,11 +13,10 @@
                Vital="yes"
                Permanent="yes"
                Protocol="netfx4"
-                DownloadUrl="C"
+                LogPathVariable="NetFx462FullLog">
-                LogPathVariable="NetFx462FullLog"
+                <ExePackagePayload
-                Compressed="no"
+                  DownloadUrl="C"
-                Name="NDP462-KB3151802-Web.exe">
+                  Name="NDP462-KB3151802-Web.exe"
-                <RemotePayload
                  Description="Microsoft .NET Framework 4.6.2 Setup"
                  Hash="C42E6ED280290648BBD59F664008852F4CFE4548"
                  ProductName="Microsoft .NET Framework 4.6.2"
author	Sean Hall <r.sean.hall@gmail.com>	2021-02-28 21:05:49 -0600
committer	Sean Hall <r.sean.hall@gmail.com>	2021-03-02 15:50:47 -0600
commit	8b3488c8c77959f425d0e5f70d27c5b2b1c86125 (patch)
tree	827dfa7caba09d7fa032c317505a590bb834c4e6 /src/test/WixToolsetTest.CoreIntegration/TestData
parent	a6013a643208a8d1fc2d1136ef8d3a6c3e909522 (diff)
download	wix-8b3488c8c77959f425d0e5f70d27c5b2b1c86125.tar.gz wix-8b3488c8c77959f425d0e5f70d27c5b2b1c86125.tar.bz2 wix-8b3488c8c77959f425d0e5f70d27c5b2b1c86125.zip

diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/MissingSourceFileAndHash.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/MissingSourceFileAndHash.wxs new file mode 100644 index 00000000..5e1b99ff --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/MissingSourceFileAndHash.wxs
@@ -0,0 +1,10 @@
		1	<?xml version="1.0" encoding="utf-8"?>
		2	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
		3	<Fragment>
		4	<PackageGroup Id="BundlePackages">
		5	<MsuPackage Id="MissingSourceFileAndHash" Permanent="yes" DetectCondition="none">
		6	<MsuPackagePayload DownloadUrl="example.com" />
		7	</MsuPackage>
		8	</PackageGroup>
		9	</Fragment>
		10	</Wix>


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/MissingSourceFileAndName.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/MissingSourceFileAndName.wxs new file mode 100644 index 00000000..f220d81a --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/MissingSourceFileAndName.wxs
@@ -0,0 +1,10 @@
		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="MissingSourceFileAndName">
		6	<MsiPackagePayload DownloadUrl="example.com" />
		7	</MsiPackage>
		8	</PackageGroup>
		9	</Fragment>
		10	</Wix>


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/PackagePayloadInPayloadGroup.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/PackagePayloadInPayloadGroup.wxs new file mode 100644 index 00000000..149870a4 --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/PackagePayloadInPayloadGroup.wxs
@@ -0,0 +1,15 @@
		1	<?xml version="1.0" encoding="utf-8"?>
		2	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
		3	<Fragment>
		4	<PackageGroup Id="BundlePackages">
		5	<ExePackage Id="PackagePayloadInPayloadGroup" Permanent="yes" DetectCondition="none">
		6	<PayloadGroupRef Id="PackagePayloadGroup" />
		7	</ExePackage>
		8	</PackageGroup>
		9	</Fragment>
		10	<Fragment>
		11	<PayloadGroup Id="PackagePayloadGroup">
		12	<ExePackagePayload SourceFile="burn.exe" />
		13	</PayloadGroup>
		14	</Fragment>
		15	</Wix>


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedHash.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedHash.wxs new file mode 100644 index 00000000..3c361c49 --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedHash.wxs
@@ -0,0 +1,10 @@
		1	<?xml version="1.0" encoding="utf-8"?>
		2	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
		3	<Fragment>
		4	<PackageGroup Id="BundlePackages">
		5	<MspPackage Id="SpecifiedHash">
		6	<MspPackagePayload SourceFile="example.msp" DownloadUrl="example.com" Hash="abcd" />
		7	</MspPackage>
		8	</PackageGroup>
		9	</Fragment>
		10	</Wix>


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedHashAndMissingDownloadUrl.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedHashAndMissingDownloadUrl.wxs new file mode 100644 index 00000000..8e62f660 --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedHashAndMissingDownloadUrl.wxs
@@ -0,0 +1,10 @@
		1	<?xml version="1.0" encoding="utf-8"?>
		2	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
		3	<Fragment>
		4	<PackageGroup Id="BundlePackages">
		5	<MsuPackage Id="SpecifiedHashAndMissingDownloadUrl" Permanent="yes" DetectCondition="none">
		6	<MsuPackagePayload Name="example.msu" Hash="abcd" Size="1" Version="1.0.0.0" ProductName="KB1234567" Description="fake msu" />
		7	</MsuPackage>
		8	</PackageGroup>
		9	</Fragment>
		10	</Wix>


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedSourceFileAndHash.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedSourceFileAndHash.wxs new file mode 100644 index 00000000..f79da874 --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/SpecifiedSourceFileAndHash.wxs
@@ -0,0 +1,10 @@
		1	<?xml version="1.0" encoding="utf-8"?>
		2	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
		3	<Fragment>
		4	<PackageGroup Id="BundlePackages">
		5	<ExePackage Id="SpecifiedSourceFileAndHash" Permanent="yes" DetectCondition="none">
		6	<ExePackagePayload SourceFile="example.exe" Hash="abcd" />
		7	</ExePackage>
		8	</PackageGroup>
		9	</Fragment>
		10	</Wix>


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/WrongPackagePayloadInPayloadGroup.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/WrongPackagePayloadInPayloadGroup.wxs new file mode 100644 index 00000000..dda306cf --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PackagePayload/WrongPackagePayloadInPayloadGroup.wxs
@@ -0,0 +1,15 @@
		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="WrongPackagePayloadInPayloadGroup">
		6	<PayloadGroupRef Id="WrongPackagePayloadGroup" />
		7	</MsiPackage>
		8	</PackageGroup>
		9	</Fragment>
		10	<Fragment>
		11	<PayloadGroup Id="WrongPackagePayloadGroup">
		12	<ExePackagePayload SourceFile="burn.exe" />
		13	</PayloadGroup>
		14	</Fragment>
		15	</Wix>


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleExeBundle/SingleExeRemotePayload.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleExeBundle/SingleExeRemotePayload.wxs index 79ba52d2..56f08ba9 100644 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/SingleExeBundle/SingleExeRemotePayload.wxs +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/SingleExeBundle/SingleExeRemotePayload.wxs
@@ -13,11 +13,10 @@
13	Vital="yes"	13	Vital="yes"
14	Permanent="yes"	14	Permanent="yes"
15	Protocol="netfx4"	15	Protocol="netfx4"
16	DownloadUrl="C"	16	LogPathVariable="NetFx462FullLog">
17	LogPathVariable="NetFx462FullLog"	17	<ExePackagePayload
18	Compressed="no"	18	DownloadUrl="C"
19	Name="NDP462-KB3151802-Web.exe">	19	Name="NDP462-KB3151802-Web.exe"
20	<RemotePayload
21	Description="Microsoft .NET Framework 4.6.2 Setup"	20	Description="Microsoft .NET Framework 4.6.2 Setup"
22	Hash="C42E6ED280290648BBD59F664008852F4CFE4548"	21	Hash="C42E6ED280290648BBD59F664008852F4CFE4548"
23	ProductName="Microsoft .NET Framework 4.6.2"	22	ProductName="Microsoft .NET Framework 4.6.2"