6 files changed, 174 insertions, 11 deletions

diff --git a/src/WixToolsetTest.BurnE2E/BurnE2ETests.cs b/src/WixToolsetTest.BurnE2E/BurnE2ETests.cs
index 8d1cca23..f3b3e583 100644
--- a/src/WixToolsetTest.BurnE2E/BurnE2ETests.cs
+++ b/src/WixToolsetTest.BurnE2E/BurnE2ETests.cs
@@ -21,9 +21,9 @@ namespace WixToolsetTest.BurnE2E
             return installer;
         }
 
-        protected PackageInstaller CreatePackageInstaller(string name)
+        protected PackageInstaller CreatePackageInstaller(string filename)
         {
-            var installer = new PackageInstaller(this.TestContext, name);
+            var installer = new PackageInstaller(this.TestContext, filename);
             this.Installers.Enqueue(installer);
             return installer;
         }
diff --git a/src/WixToolsetTest.BurnE2E/PackageInstaller.cs b/src/WixToolsetTest.BurnE2E/PackageInstaller.cs
index 95d6cd90..bd1e30cc 100644
--- a/src/WixToolsetTest.BurnE2E/PackageInstaller.cs
+++ b/src/WixToolsetTest.BurnE2E/PackageInstaller.cs
@@ -8,11 +8,10 @@ namespace WixToolsetTest.BurnE2E
 
     public partial class PackageInstaller : IDisposable
     {
-        public PackageInstaller(WixTestContext testContext, string name)
+        public PackageInstaller(WixTestContext testContext, string filename)
         {
-            this.Package = Path.Combine(testContext.TestDataFolder, $"{name}.msi");
-            this.PackagePdb = Path.Combine(testContext.TestDataFolder, $"{name}.wixpdb");
-            this.PackageName = name;
+            this.Package = Path.Combine(testContext.TestDataFolder, $"{filename}.msi");
+            this.PackagePdb = Path.Combine(testContext.TestDataFolder, $"{filename}.wixpdb");
             this.TestContext = testContext;
         }
 
diff --git a/src/WixToolsetTest.BurnE2E/PackageVerifier.cs b/src/WixToolsetTest.BurnE2E/PackageVerifier.cs
index 7b4bbfef..7a4fea88 100644
--- a/src/WixToolsetTest.BurnE2E/PackageVerifier.cs
+++ b/src/WixToolsetTest.BurnE2E/PackageVerifier.cs
@@ -12,15 +12,13 @@ namespace WixToolsetTest.BurnE2E
 
     public partial class PackageInstaller
     {
-        private string PackageName { get; }
-
         public string PackagePdb { get; }
 
         private WindowsInstallerData WiData { get; set; }
 
         public string GetInstalledFilePath(string filename)
         {
-            return this.TestContext.GetTestInstallFolder(Path.Combine(this.PackageName, filename));
+            return this.TestContext.GetTestInstallFolder(Path.Combine(this.GetInstallFolderName(), filename));
         }
 
         private WindowsInstallerData GetWindowsInstallerData()
@@ -34,6 +32,19 @@ namespace WixToolsetTest.BurnE2E
             return this.WiData;
         }
 
+        public string GetInstallFolderName()
+        {
+            var wiData = this.GetWindowsInstallerData();
+            var row = wiData.Tables["Directory"].Rows.Single(r => r.FieldAsString(0) == "INSTALLFOLDER");
+            var value = row.FieldAsString(2);
+            var longNameIndex = value.IndexOf('|') + 1;
+            if (longNameIndex > 0)
+            {
+                return value.Substring(longNameIndex);
+            }
+            return value;
+        }
+
         public string GetProperty(string name)
         {
             var wiData = this.GetWindowsInstallerData();
@@ -46,5 +57,21 @@ namespace WixToolsetTest.BurnE2E
             var productCode = this.GetProperty("ProductCode");
             Assert.Equal(installed, MsiUtilities.IsProductInstalled(productCode));
         }
+
+        public void VerifyTestRegistryRootDeleted()
+        {
+            using var testRegistryRoot = this.TestContext.GetTestRegistryRoot();
+            Assert.Null(testRegistryRoot);
+        }
+
+        public void VerifyTestRegistryValue(string name, string expectedValue)
+        {
+            using (var root = this.TestContext.GetTestRegistryRoot())
+            {
+                Assert.NotNull(root);
+                var actualValue = root.GetValue(name) as string;
+                Assert.Equal(expectedValue, actualValue);
+            }
+        }
     }
 }
diff --git a/src/WixToolsetTest.BurnE2E/PatchTests.cs b/src/WixToolsetTest.BurnE2E/PatchTests.cs
new file mode 100644
index 00000000..19adf8db
--- /dev/null
+++ b/src/WixToolsetTest.BurnE2E/PatchTests.cs
@@ -0,0 +1,137 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolsetTest.BurnE2E
+{
+    using System;
+    using System.IO;
+    using System.Xml;
+    using Xunit;
+    using Xunit.Abstractions;
+
+    public class PatchTests : BurnE2ETests
+    {
+        public PatchTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { }
+
+        [Fact]
+        public void CanRunDetectMultipleTimesWithPatches()
+        {
+            var testBAController = this.CreateTestBAController();
+            testBAController.SetRedetectCount(1);
+
+            this.CanInstallBundleWithPatchThenRemoveIt();
+        }
+
+        [Fact]
+        public void CanInstallBundleWithPatchThenRemoveIt()
+        {
+            var originalVersion = "1.0.0.0";
+            var patchedVersion = "1.0.1.0";
+            var testRegistryValue = "PackageA";
+
+            var packageAv1 = this.CreatePackageInstaller("PackageAv1");
+            var bundleA = this.CreateBundleInstaller("BundleA");
+            var bundlePatchA = this.CreateBundleInstaller("BundlePatchA");
+
+            bundleA.Install();
+            bundleA.VerifyRegisteredAndInPackageCache();
+
+            packageAv1.VerifyInstalled(true);
+            packageAv1.VerifyTestRegistryValue(testRegistryValue, originalVersion);
+
+            bundlePatchA.Install();
+            bundlePatchA.VerifyRegisteredAndInPackageCache();
+
+            packageAv1.VerifyTestRegistryValue(testRegistryValue, patchedVersion);
+
+            bundlePatchA.Uninstall();
+            bundlePatchA.VerifyUnregisteredAndRemovedFromPackageCache();
+
+            packageAv1.VerifyTestRegistryValue(testRegistryValue, originalVersion);
+
+            bundleA.Uninstall();
+            bundleA.VerifyUnregisteredAndRemovedFromPackageCache();
+
+            packageAv1.VerifyInstalled(false);
+            packageAv1.VerifyTestRegistryRootDeleted();
+        }
+
+        [Fact(Skip = "https://github.com/wixtoolset/issues/issues/5949")]
+        public void CanPatchSwidTag()
+        {
+            var originalVersion = "1.0.0.0";
+            var patchedVersion = "1.0.1.0";
+            var packageTagName = "~PatchTests - PackageA";
+            var bundleTagName = "~PatchTests - BundleA";
+            var bundlePatchTagName = "~PatchTests - BundlePatchA";
+
+            this.CreatePackageInstaller("PackageAv1");
+            var bundleA = this.CreateBundleInstaller("BundleA");
+            var bundlePatchA = this.CreateBundleInstaller("BundlePatchA");
+
+            bundleA.Install();
+            VerifySwidTagVersion(bundleTagName, originalVersion);
+            VerifySwidTagVersion(packageTagName, originalVersion);
+
+            bundlePatchA.Install();
+            VerifySwidTagVersion(bundlePatchTagName, patchedVersion);
+            VerifySwidTagVersion(packageTagName, patchedVersion);
+
+            bundlePatchA.Uninstall();
+            VerifySwidTagVersion(packageTagName, originalVersion);
+
+            bundleA.Uninstall();
+            VerifySwidTagVersion(bundleTagName, null);
+            VerifySwidTagVersion(packageTagName, null);
+        }
+
+        [Fact]
+        public void CanInstallBundleWithPatchesTargetingSingleProductThenRemoveIt()
+        {
+            var originalVersion = "1.0.0.0";
+            var patchedVersion = "1.0.1.0";
+            var testRegistryValue = "PackageA";
+            var testRegistryValue2 = "PackageA2";
+
+            var packageAv1 = this.CreatePackageInstaller("PackageAv1");
+            var bundlePatchA2 = this.CreateBundleInstaller("BundlePatchA2");
+
+            packageAv1.InstallProduct();
+            packageAv1.VerifyInstalled(true);
+            packageAv1.VerifyTestRegistryValue(testRegistryValue, originalVersion);
+            packageAv1.VerifyTestRegistryValue(testRegistryValue2, originalVersion);
+
+            bundlePatchA2.Install();
+            bundlePatchA2.VerifyRegisteredAndInPackageCache();
+
+            packageAv1.VerifyTestRegistryValue(testRegistryValue, patchedVersion);
+            packageAv1.VerifyTestRegistryValue(testRegistryValue2, patchedVersion);
+
+            bundlePatchA2.Uninstall();
+            bundlePatchA2.VerifyUnregisteredAndRemovedFromPackageCache();
+
+            packageAv1.VerifyTestRegistryValue(testRegistryValue, originalVersion);
+            packageAv1.VerifyTestRegistryValue(testRegistryValue2, originalVersion);
+        }
+
+        private static void VerifySwidTagVersion(string tagName, string expectedVersion)
+        {
+            var regidFolder = Environment.ExpandEnvironmentVariables(@"%ProgramData%\regid.1995-08.com.example");
+            var tagPath = Path.Combine(regidFolder, "regid.1995-08.com.example " + tagName + ".swidtag");
+            string version = null;
+
+            if (File.Exists(tagPath))
+            {
+                var doc = new XmlDocument();
+                doc.Load(tagPath);
+
+                var ns = new XmlNamespaceManager(doc.NameTable);
+                ns.AddNamespace("s", "http://standards.iso.org/iso/19770/-2/2009/schema.xsd");
+
+                var versionNode = doc.SelectSingleNode("/s:software_identification_tag/s:product_version/s:name", ns);
+                version = versionNode?.InnerText ?? String.Empty;
+            }
+
+            Assert.Equal(expectedVersion, version);
+        }
+    }
+}
diff --git a/src/WixToolsetTest.BurnE2E/WixTestContext.cs b/src/WixToolsetTest.BurnE2E/WixTestContext.cs
index 5620c6a7..0ae99a77 100644
--- a/src/WixToolsetTest.BurnE2E/WixTestContext.cs
+++ b/src/WixToolsetTest.BurnE2E/WixTestContext.cs
@@ -57,7 +57,7 @@ namespace WixToolsetTest.BurnE2E
         /// </remarks>
         public RegistryKey GetTestRegistryRoot(string additionalPath = null)
         {
-            var key = String.Format(@"Software\WiX\Tests\{0}\{1}", this.TestName, additionalPath ?? String.Empty);
+            var key = String.Format(@"Software\WOW6432Node\WiX\Tests\{0}\{1}", this.TestGroupName, additionalPath ?? String.Empty);
             return Registry.LocalMachine.OpenSubKey(key, true);
         }
 
diff --git a/src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj b/src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
index 86ad4410..3ffc892f 100644
--- a/src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
+++ b/src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
     <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.48" />
-    <PackageReference Include="WixToolset.Data" Version="4.0.180" />
+    <PackageReference Include="WixToolset.Data" Version="4.0.181" />
     <PackageReference Include="WixToolset.Mba.Core" Version="4.0.47" />
   </ItemGroup>