Add patch test from old repo and get it passing.

Fixes #6341.
author: Sean Hall <r.sean.hall@gmail.com> 2021-01-27 20:06:23 -0600
committer: Sean Hall <r.sean.hall@gmail.com> 2021-01-27 20:45:17 -0600
commit: 9a6688a8d6ec05817451dc8706a0bc9db82b9d36 (patch)
tree: c3b8347c32a4b6986ace5da37866e3c47d175662 /src/test/WixToolsetTest.CoreIntegration/TestData
parent: 8eed3c02afb5883bc4e3bb45ab1f9b6da5a65476 (diff)
download: wix-9a6688a8d6ec05817451dc8706a0bc9db82b9d36.tar.gz
wix-9a6688a8d6ec05817451dc8706a0bc9db82b9d36.tar.bz2
wix-9a6688a8d6ec05817451dc8706a0bc9db82b9d36.zip
7 files changed, 110 insertions, 0 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleA/Bundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleA/Bundle.wxs
new file mode 100644
index 00000000..4a8f5630
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleA/Bundle.wxs
@@ -0,0 +1,7 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <MspPackage Id="PatchA" SourceFile="PatchA.msp" PerMachine="yes" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleB/Bundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleB/Bundle.wxs
new file mode 100644
index 00000000..7fb3cb56
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleB/Bundle.wxs
@@ -0,0 +1,8 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <MspPackage Id="PatchA" SourceFile="PatchA.msp" PerMachine="yes" />
+      <MspPackage Id="PatchB" SourceFile="PatchB.msp" PerMachine="yes" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleC/Bundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleC/Bundle.wxs
new file mode 100644
index 00000000..201d177b
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleC/Bundle.wxs
@@ -0,0 +1,9 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <MspPackage Id="PatchA" SourceFile="PatchA.msp" PerMachine="yes" />
+      <MspPackage Id="PatchB" SourceFile="PatchB.msp" PerMachine="yes" />
+      <MspPackage Id="PatchC" SourceFile="PatchC.msp" PerMachine="yes" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PackageA/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PackageA/Package.wxs
new file mode 100644
index 00000000..2d5fbc6d
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PackageA/Package.wxs
@@ -0,0 +1,46 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package ProductCode="26309973-0A5E-4979-B142-98A6E064EDC0" Name="PackageA" Language="1033" Version="$(var.V)" Manufacturer="Example Corporation"
+           UpgradeCode="32B0396A-CE36-4570-B16E-F88FA42DC409" Scope="perMachine" Compressed="yes">
+    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+    <MediaTemplate EmbedCab="yes" />
+    <PropertyRef Id="TestVersion"/>
+    <Feature Id="Complete" Level="1">
+      <ComponentRef Id="FileComponent"/>
+      <ComponentRef Id="RegistryComponent"/>
+      <ComponentRef Id="RegistryComponent2" />
+    </Feature>
+  </Package>
+  <Fragment>
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder">
+        <Directory Id="INSTALLFOLDER" Name="~Test A" />
+      </Directory>
+    </Directory>
+  </Fragment>
+  <Fragment>
+    <Component Id="FileComponent" Directory="INSTALLFOLDER">
+      <File Source="$(sys.SOURCEFILEPATH)"/>
+    </Component>
+  </Fragment>
+  <Fragment>
+    <Component Id="RegistryComponent" Directory="INSTALLFOLDER">
+      <RegistryValue Root="HKLM" Key="Software\WiX\Tests\$(var.A)" Name="A" Value="!(bind.Property.TestVersion)" Type="string" />
+    </Component>
+  </Fragment>
+  <Fragment>
+    <Component Id="RegistryComponent2" Directory="INSTALLFOLDER">
+      <RegistryValue Root="HKLM" Key="Software\WiX\Tests\$(var.B)" Name="A2" Value="!(bind.Property.TestVersion)" Type="string" />
+    </Component>
+  </Fragment>
+  <Fragment>
+    <Property Id="TestVersion" Value="$(var.V)"/>
+  </Fragment>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchA/Patch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchA/Patch.wxs
new file mode 100644
index 00000000..1b01774c
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchA/Patch.wxs
@@ -0,0 +1,12 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Patch AllowRemoval="yes" Classification="Update" ClientPatchId="PatchA" Description="Patch A" DisplayName="Patch A" Manufacturer="Example Corporation" MinorUpdateTargetRTM="yes">
+        <Media Id="100" Cabinet="A" EmbedCab="yes">
+            <PatchBaseline Id="PatchA" BaselineFile="Baseline.wixpdb" UpdateFile="Update.wixpdb" />
+        </Media>
+        <PatchFamily Id="A" Version="$(var.V)" Supersede="yes">
+          <ComponentRef Id="RegistryComponent" />
+          <PropertyRef Id="TestVersion" />
+        </PatchFamily>
+    </Patch>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchB/Patch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchB/Patch.wxs
new file mode 100644
index 00000000..f0630ead
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchB/Patch.wxs
@@ -0,0 +1,14 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Patch AllowRemoval="yes" Classification="Update" ClientPatchId="PatchB" Description="Patch B" DisplayName="Patch B" Manufacturer="Example Corporation" MinorUpdateTargetRTM="yes">
+        <Media Id="100" Cabinet="B" EmbedCab="yes">
+            <PatchBaseline Id="PatchB" BaselineFile="Baseline.wixpdb" UpdateFile="Update.wixpdb">
+                <Validate ProductId="no" />
+            </PatchBaseline>
+        </Media>
+        <PatchFamily Id="B" Version="$(var.V)" Supersede="yes">
+          <ComponentRef Id="RegistryComponent" />
+          <PropertyRef Id="TestVersion" />
+        </PatchFamily>
+    </Patch>
+</Wix>
diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchC/Patch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchC/Patch.wxs
new file mode 100644
index 00000000..f9d2a55a
--- /dev/null
+++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchC/Patch.wxs
@@ -0,0 +1,14 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <Patch AllowRemoval="yes" Classification="Update" ClientPatchId="PatchC" Description="Patch C" DisplayName="Patch C" Manufacturer="Example Corporation" MinorUpdateTargetRTM="yes">
+        <Media Id="100" Cabinet="C" EmbedCab="yes">
+            <PatchBaseline Id="PatchC" BaselineFile="Baseline.wixpdb" UpdateFile="Update.wixpdb">
+                <Validate ProductId="no" UpgradeCode="no" />
+            </PatchBaseline>
+        </Media>
+        <PatchFamily Id="C" Version="$(var.V)" Supersede="yes">
+          <ComponentRef Id="RegistryComponent" />
+          <PropertyRef Id="TestVersion" />
+        </PatchFamily>
+    </Patch>
+</Wix>
author	Sean Hall <r.sean.hall@gmail.com>	2021-01-27 20:06:23 -0600
committer	Sean Hall <r.sean.hall@gmail.com>	2021-01-27 20:45:17 -0600
commit	9a6688a8d6ec05817451dc8706a0bc9db82b9d36 (patch)
tree	c3b8347c32a4b6986ace5da37866e3c47d175662 /src/test/WixToolsetTest.CoreIntegration/TestData
parent	8eed3c02afb5883bc4e3bb45ab1f9b6da5a65476 (diff)
download	wix-9a6688a8d6ec05817451dc8706a0bc9db82b9d36.tar.gz wix-9a6688a8d6ec05817451dc8706a0bc9db82b9d36.tar.bz2 wix-9a6688a8d6ec05817451dc8706a0bc9db82b9d36.zip

diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleA/Bundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleA/Bundle.wxs new file mode 100644 index 00000000..4a8f5630 --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleA/Bundle.wxs
@@ -0,0 +1,7 @@
	1	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
	2	<Fragment>
	3	<PackageGroup Id="BundlePackages">
	4	<MspPackage Id="PatchA" SourceFile="PatchA.msp" PerMachine="yes" />
	5	</PackageGroup>
	6	</Fragment>
	7	</Wix>


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleB/Bundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleB/Bundle.wxs new file mode 100644 index 00000000..7fb3cb56 --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleB/Bundle.wxs
@@ -0,0 +1,8 @@
	1	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
	2	<Fragment>
	3	<PackageGroup Id="BundlePackages">
	4	<MspPackage Id="PatchA" SourceFile="PatchA.msp" PerMachine="yes" />
	5	<MspPackage Id="PatchB" SourceFile="PatchB.msp" PerMachine="yes" />
	6	</PackageGroup>
	7	</Fragment>
	8	</Wix>


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleC/Bundle.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleC/Bundle.wxs new file mode 100644 index 00000000..201d177b --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/BundleC/Bundle.wxs
@@ -0,0 +1,9 @@
	1	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
	2	<Fragment>
	3	<PackageGroup Id="BundlePackages">
	4	<MspPackage Id="PatchA" SourceFile="PatchA.msp" PerMachine="yes" />
	5	<MspPackage Id="PatchB" SourceFile="PatchB.msp" PerMachine="yes" />
	6	<MspPackage Id="PatchC" SourceFile="PatchC.msp" PerMachine="yes" />
	7	</PackageGroup>
	8	</Fragment>
	9	</Wix>


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PackageA/Package.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PackageA/Package.wxs new file mode 100644 index 00000000..2d5fbc6d --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PackageA/Package.wxs
@@ -0,0 +1,46 @@
	1	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
	2	<Package ProductCode="26309973-0A5E-4979-B142-98A6E064EDC0" Name="PackageA" Language="1033" Version="$(var.V)" Manufacturer="Example Corporation"
	3	UpgradeCode="32B0396A-CE36-4570-B16E-F88FA42DC409" Scope="perMachine" Compressed="yes">
	4
	5	<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
	6	<MediaTemplate EmbedCab="yes" />
	7
	8	<PropertyRef Id="TestVersion"/>
	9
	10	<Feature Id="Complete" Level="1">
	11	<ComponentRef Id="FileComponent"/>
	12	<ComponentRef Id="RegistryComponent"/>
	13	<ComponentRef Id="RegistryComponent2" />
	14	</Feature>
	15	</Package>
	16
	17	<Fragment>
	18	<Directory Id="TARGETDIR" Name="SourceDir">
	19	<Directory Id="ProgramFilesFolder">
	20	<Directory Id="INSTALLFOLDER" Name="~Test A" />
	21	</Directory>
	22	</Directory>
	23	</Fragment>
	24
	25	<Fragment>
	26	<Component Id="FileComponent" Directory="INSTALLFOLDER">
	27	<File Source="$(sys.SOURCEFILEPATH)"/>
	28	</Component>
	29	</Fragment>
	30
	31	<Fragment>
	32	<Component Id="RegistryComponent" Directory="INSTALLFOLDER">
	33	<RegistryValue Root="HKLM" Key="Software\WiX\Tests\$(var.A)" Name="A" Value="!(bind.Property.TestVersion)" Type="string" />
	34	</Component>
	35	</Fragment>
	36
	37	<Fragment>
	38	<Component Id="RegistryComponent2" Directory="INSTALLFOLDER">
	39	<RegistryValue Root="HKLM" Key="Software\WiX\Tests\$(var.B)" Name="A2" Value="!(bind.Property.TestVersion)" Type="string" />
	40	</Component>
	41	</Fragment>
	42
	43	<Fragment>
	44	<Property Id="TestVersion" Value="$(var.V)"/>
	45	</Fragment>
	46	</Wix>


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchA/Patch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchA/Patch.wxs new file mode 100644 index 00000000..1b01774c --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchA/Patch.wxs
@@ -0,0 +1,12 @@
	1	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
	2	<Patch AllowRemoval="yes" Classification="Update" ClientPatchId="PatchA" Description="Patch A" DisplayName="Patch A" Manufacturer="Example Corporation" MinorUpdateTargetRTM="yes">
	3	<Media Id="100" Cabinet="A" EmbedCab="yes">
	4	<PatchBaseline Id="PatchA" BaselineFile="Baseline.wixpdb" UpdateFile="Update.wixpdb" />
	5	</Media>
	6
	7	<PatchFamily Id="A" Version="$(var.V)" Supersede="yes">
	8	<ComponentRef Id="RegistryComponent" />
	9	<PropertyRef Id="TestVersion" />
	10	</PatchFamily>
	11	</Patch>
	12	</Wix>


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchB/Patch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchB/Patch.wxs new file mode 100644 index 00000000..f0630ead --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchB/Patch.wxs
@@ -0,0 +1,14 @@
	1	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
	2	<Patch AllowRemoval="yes" Classification="Update" ClientPatchId="PatchB" Description="Patch B" DisplayName="Patch B" Manufacturer="Example Corporation" MinorUpdateTargetRTM="yes">
	3	<Media Id="100" Cabinet="B" EmbedCab="yes">
	4	<PatchBaseline Id="PatchB" BaselineFile="Baseline.wixpdb" UpdateFile="Update.wixpdb">
	5	<Validate ProductId="no" />
	6	</PatchBaseline>
	7	</Media>
	8
	9	<PatchFamily Id="B" Version="$(var.V)" Supersede="yes">
	10	<ComponentRef Id="RegistryComponent" />
	11	<PropertyRef Id="TestVersion" />
	12	</PatchFamily>
	13	</Patch>
	14	</Wix>


diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchC/Patch.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchC/Patch.wxs new file mode 100644 index 00000000..f9d2a55a --- /dev/null +++ b/src/test/WixToolsetTest.CoreIntegration/TestData/PatchNonSpecific/PatchC/Patch.wxs
@@ -0,0 +1,14 @@
	1	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
	2	<Patch AllowRemoval="yes" Classification="Update" ClientPatchId="PatchC" Description="Patch C" DisplayName="Patch C" Manufacturer="Example Corporation" MinorUpdateTargetRTM="yes">
	3	<Media Id="100" Cabinet="C" EmbedCab="yes">
	4	<PatchBaseline Id="PatchC" BaselineFile="Baseline.wixpdb" UpdateFile="Update.wixpdb">
	5	<Validate ProductId="no" UpgradeCode="no" />
	6	</PatchBaseline>
	7	</Media>
	8
	9	<PatchFamily Id="C" Version="$(var.V)" Supersede="yes">
	10	<ComponentRef Id="RegistryComponent" />
	11	<PropertyRef Id="TestVersion" />
	12	</PatchFamily>
	13	</Patch>
	14	</Wix>