Add patch test from old repo and get it passing.

Fixes #6341.

1 files changed, 77 insertions, 2 deletions

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);