9 files changed, 188 insertions, 3 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CalculateComponentGuids.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CalculateComponentGuids.cs
index 02336cae..55cda9ea 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CalculateComponentGuids.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CalculateComponentGuids.cs
@@ -67,7 +67,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     if (registryKeyRows.TryGetValue(componentSymbol.KeyPath, out var foundRow))
                     {
                         var bitness = componentSymbol.Win64 ? "64" : String.Empty;
-                        var regkey = String.Concat(bitness, foundRow.AsString(1), "\\", foundRow.AsString(2), "\\", foundRow.AsString(3));
+                        var regkey = String.Concat(bitness, foundRow.Root, "\\", foundRow.Key, "\\", foundRow.Name);
                         componentSymbol.ComponentId = this.BackendHelper.CreateGuid(BindDatabaseCommand.WixComponentGuidNamespace, regkey.ToLowerInvariant());
                     }
                 }
diff --git a/src/test/WixToolsetTest.CoreIntegration/PatchFixture.cs b/src/test/WixToolsetTest.CoreIntegration/PatchFixture.cs
index 3616bcab..f1d0ea58 100644
--- a/src/test/WixToolsetTest.CoreIntegration/PatchFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/PatchFixture.cs
@@ -2,14 +2,18 @@
 
 namespace WixToolsetTest.CoreIntegration
 {
+    using System.Collections.Generic;
     using System.ComponentModel;
     using System.IO;
     using System.Linq;
     using System.Runtime.InteropServices;
     using System.Text;
+    using System.Xml;
     using System.Xml.Linq;
     using WixBuildTools.TestSupport;
     using WixToolset.Core.TestPackage;
+    using WixToolset.Data;
+    using WixToolset.Data.Burn;
     using Xunit;
 
     public class PatchFixture
@@ -28,7 +32,6 @@ namespace WixToolsetTest.CoreIntegration
                 var baselinePdb = BuildMsi("Baseline.msi", folder, tempFolder, "1.0.0", "1.0.0", "1.0.0");
                 var update1Pdb = BuildMsi("Update.msi", folder, tempFolder, "1.0.1", "1.0.1", "1.0.1");
                 var patchPdb = BuildMsp("Patch1.msp", folder, tempFolder, "1.0.1");
-                var baselinePath = Path.ChangeExtension(baselinePdb, ".msp");
                 var patchPath = Path.ChangeExtension(patchPdb, ".msp");
 
                 Assert.True(File.Exists(baselinePdb));
@@ -49,6 +52,57 @@ namespace WixToolsetTest.CoreIntegration
             }
         }
 
+        [Fact]
+        public void CanBuildBundleWithNonSpecificPatches()
+        {
+            var folder = TestData.Get(@"TestData\PatchNonSpecific");
+
+            using (var fs = new DisposableFileSystem())
+            {
+                var tempFolder = fs.GetFolder();
+
+                var baselinePdb = BuildMsi("Baseline.msi", Path.Combine(folder, "PackageA"), tempFolder, "1.0.0", "A", "B");
+                var updatePdb = BuildMsi("Update.msi", Path.Combine(folder, "PackageA"), tempFolder, "1.0.1", "A", "B");
+                var patchAPdb = BuildMsp("PatchA.msp", Path.Combine(folder, "PatchA"), tempFolder, "1.0.1", true);
+                var patchBPdb = BuildMsp("PatchB.msp", Path.Combine(folder, "PatchB"), tempFolder, "1.0.1", true);
+                var patchCPdb = BuildMsp("PatchC.msp", Path.Combine(folder, "PatchC"), tempFolder, "1.0.1", true);
+                var bundleAPdb = BuildBundle("BundleA.exe", Path.Combine(folder, "BundleA"), tempFolder);
+                var bundleBPdb = BuildBundle("BundleB.exe", Path.Combine(folder, "BundleB"), tempFolder);
+                var bundleCPdb = BuildBundle("BundleC.exe", Path.Combine(folder, "BundleC"), tempFolder);
+
+                VerifyPatchTargetCodes(bundleAPdb, new[]
+                {
+                    "<PatchTargetCode TargetCode='{26309973-0A5E-4979-B142-98A6E064EDC0}' Product='yes' />",
+                });
+                VerifyPatchTargetCodes(bundleBPdb, new[]
+                {
+                    "<PatchTargetCode TargetCode='{26309973-0A5E-4979-B142-98A6E064EDC0}' Product='yes' />",
+                    "<PatchTargetCode TargetCode='{32B0396A-CE36-4570-B16E-F88FA42DC409}' Product='no' />",
+                });
+                VerifyPatchTargetCodes(bundleCPdb, new string[0]);
+            }
+        }
+
+        private static void VerifyPatchTargetCodes(string pdbPath, string[] expected)
+        {
+            using (var wixOutput = WixOutput.Read(pdbPath))
+            {
+                var manifestData = wixOutput.GetData(BurnConstants.BurnManifestWixOutputStreamName);
+                var doc = new XmlDocument();
+                doc.LoadXml(manifestData);
+                var nsmgr = BundleExtractor.GetBurnNamespaceManager(doc, "w");
+                var patchTargetCodes = doc.SelectNodes("/w:BurnManifest/w:PatchTargetCode", nsmgr);
+
+                var actual = new List<string>();
+                foreach (XmlNode patchTargetCodeNode in patchTargetCodes)
+                {
+                    actual.Add(patchTargetCodeNode.GetTestXml());
+                }
+
+                WixAssert.CompareLineByLine(expected, actual.ToArray());
+            }
+        }
+
         private static string BuildMsi(string outputName, string sourceFolder, string baseFolder, string defineV, string defineA, string defineB)
         {
             var outputPath = Path.Combine(baseFolder, Path.Combine("bin", outputName));
@@ -70,13 +124,14 @@ namespace WixToolsetTest.CoreIntegration
             return Path.ChangeExtension(outputPath, ".wixpdb");
         }
 
-        private static string BuildMsp(string outputName, string sourceFolder, string baseFolder, string defineV)
+        private static string BuildMsp(string outputName, string sourceFolder, string baseFolder, string defineV, bool hasNoFiles = false)
         {
             var outputPath = Path.Combine(baseFolder, Path.Combine("bin", outputName));
 
             var result = WixRunner.Execute(new[]
             {
                 "build",
+                hasNoFiles ? "-sw1079" : " ",
                 Path.Combine(sourceFolder, @"Patch.wxs"),
                 "-d", "V=" + defineV,
                 "-bindpath", Path.Combine(baseFolder, "bin"),
@@ -89,6 +144,26 @@ namespace WixToolsetTest.CoreIntegration
             return Path.ChangeExtension(outputPath, ".wixpdb");
         }
 
+        private static string BuildBundle(string outputName, string sourceFolder, string baseFolder)
+        {
+            var outputPath = Path.Combine(baseFolder, Path.Combine("bin", outputName));
+
+            var result = WixRunner.Execute(new[]
+            {
+                "build",
+                Path.Combine(sourceFolder, @"Bundle.wxs"),
+                Path.Combine(sourceFolder, "..", "..", "BundleWithPackageGroupRef", "Bundle.wxs"),
+                "-bindpath", Path.Combine(sourceFolder, "..", "..", "SimpleBundle", "data"),
+                "-bindpath", Path.Combine(baseFolder, "bin"),
+                "-intermediateFolder", Path.Combine(baseFolder, "obj"),
+                "-o", outputPath
+            });
+
+            result.AssertSuccess();
+
+            return Path.ChangeExtension(outputPath, ".wixpdb");
+        }
+
         private static XDocument GetExtractPatchXml(string path)
         {
             var buffer = new StringBuilder(65535);
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>