5 files changed, 167 insertions, 2 deletions

diff --git a/src/test/burn/TestData/BundlePackageTests/BundlePackageUninstallFailureBundle/BundlePackageUninstallFailureBundle.wixproj b/src/test/burn/TestData/BundlePackageTests/BundlePackageUninstallFailureBundle/BundlePackageUninstallFailureBundle.wixproj
new file mode 100644
index 00000000..276d9dcb
--- /dev/null
+++ b/src/test/burn/TestData/BundlePackageTests/BundlePackageUninstallFailureBundle/BundlePackageUninstallFailureBundle.wixproj
@@ -0,0 +1,19 @@
+<!-- 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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <UpgradeCode>{1CD57FE5-A2FA-4A72-BEBA-74D9730C2C93}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageFail\PackageFail.wixproj" />
+    <ProjectReference Include="..\..\BasicFunctionalityTests\BundleA\BundleA.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.NetFx.wixext" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/test/burn/TestData/BundlePackageTests/BundlePackageUninstallFailureBundle/BundlePackageUninstallFailureBundle.wxs b/src/test/burn/TestData/BundlePackageTests/BundlePackageUninstallFailureBundle/BundlePackageUninstallFailureBundle.wxs
new file mode 100644
index 00000000..1e27161c
--- /dev/null
+++ b/src/test/burn/TestData/BundlePackageTests/BundlePackageUninstallFailureBundle/BundlePackageUninstallFailureBundle.wxs
@@ -0,0 +1,15 @@
+<!-- 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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Fragment>
+    <Variable Name="FAILWHENDEFERRED" bal:Overridable="yes" />
+
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageFail" SourceFile="$(var.PackageFail.TargetPath)">
+        <MsiProperty Name="WIXFAILWHENDEFERRED" Value="[FAILWHENDEFERRED]" />
+      </MsiPackage>
+      <BundlePackage Id="PackageA" SourceFile="$(var.BundleA.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/burn/TestData/BundlePackageTests/PackageFail/PackageFail.wixproj b/src/test/burn/TestData/BundlePackageTests/PackageFail/PackageFail.wixproj
new file mode 100644
index 00000000..68b5470b
--- /dev/null
+++ b/src/test/burn/TestData/BundlePackageTests/PackageFail/PackageFail.wixproj
@@ -0,0 +1,12 @@
+<!-- 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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <UpgradeCode>{2674BFB2-634D-42DB-A1EC-C2CD148A2328}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\PackageFail.wxs" Link="PackageFail.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Util.wixext" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/test/burn/WixTestTools/BundleVerifier.cs b/src/test/burn/WixTestTools/BundleVerifier.cs
index ff45a291..3a19ca02 100644
--- a/src/test/burn/WixTestTools/BundleVerifier.cs
+++ b/src/test/burn/WixTestTools/BundleVerifier.cs
@@ -158,14 +158,21 @@ namespace WixTestTools
             }
         }
 
-        public void VerifyPackageIsCached(string packageId, bool cached = true)
+        public string GetPackageEntryPointCachePath(string packageId)
         {
             using var wixOutput = WixOutput.Read(this.BundlePdb);
             var intermediate = Intermediate.Load(wixOutput);
             var section = intermediate.Sections.Single();
             var packageSymbol = section.Symbols.OfType<WixBundlePackageSymbol>().Single(p => p.Id.Id == packageId);
+            var packagePayloadSymbol = section.Symbols.OfType<WixBundlePayloadSymbol>().Single(p => p.Id.Id == packageSymbol.PayloadRef);
             var cachePath = this.GetPackageCachePathForCacheId(packageSymbol.CacheId, packageSymbol.PerMachine == true);
-            Assert.Equal(cached, Directory.Exists(cachePath));
+            return Path.Combine(cachePath, packagePayloadSymbol.Name);
+        }
+
+        public void VerifyPackageIsCached(string packageId, bool cached = true)
+        {
+            var entryPointCachePath = this.GetPackageEntryPointCachePath(packageId);
+            Assert.Equal(cached, File.Exists(entryPointCachePath));
         }
 
         public void VerifyPackageProviderRemoved(string packageId)
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs
index 0c6e5873..b3ef9430 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs
@@ -5,6 +5,7 @@ namespace WixToolsetTest.BurnE2E
     using System;
     using System.IO;
     using WixTestTools;
+    using WixToolset.Mba.Core;
     using Xunit;
     using Xunit.Abstractions;
 
@@ -137,5 +138,116 @@ namespace WixToolsetTest.BurnE2E
             upgradeBundlePackageBundlev1.VerifyUnregisteredAndRemovedFromPackageCache();
             bundleAv1.VerifyUnregisteredAndRemovedFromPackageCache();
         }
+
+        [RuntimeFact]
+        public void CanRecacheAndReinstallBundlePackageOnUninstallRollback()
+        {
+            var packageFail = this.CreatePackageInstaller("PackageFail");
+            var packageA = this.CreatePackageInstaller(@"..\BasicFunctionalityTests\PackageA");
+            var bundleA = this.CreateBundleInstaller(@"..\BasicFunctionalityTests\BundleA");
+            var bundlePackageUninstallFailureBundle = this.CreateBundleInstaller("BundlePackageUninstallFailureBundle");
+            var testBAController = this.CreateTestBAController();
+            var bundleASelfCachedPath = bundleA.GetExpectedCachedBundlePath();
+            var bundleAEmbeddedCachedPath = bundlePackageUninstallFailureBundle.GetPackageEntryPointCachePath("PackageA");
+
+            packageA.VerifyInstalled(false);
+            packageFail.VerifyInstalled(false);
+            bundleA.VerifyUnregisteredAndRemovedFromPackageCache();
+
+            testBAController.SetPackageRequestedCacheType("PackageA", BOOTSTRAPPER_CACHE_TYPE.Remove);
+
+            var installLogPath = bundlePackageUninstallFailureBundle.Install();
+            bundlePackageUninstallFailureBundle.VerifyRegisteredAndInPackageCache();
+            packageFail.VerifyInstalled(true);
+            bundleA.VerifyRegisteredAndInPackageCache(expectedSystemComponent: 1);
+
+            Assert.False(LogVerifier.MessageInLogFile(installLogPath, $"Applying execute package: PackageA, action: Install, path: {bundleASelfCachedPath}"), bundleASelfCachedPath);
+            Assert.True(LogVerifier.MessageInLogFile(installLogPath, $"Applying execute package: PackageA, action: Install, path: {bundleAEmbeddedCachedPath}"), bundleAEmbeddedCachedPath);
+
+            testBAController.ResetPackageStates("PackageA");
+            testBAController.SetAllowAcquireAfterValidationFailure();
+
+            var uninstallLogPath = bundlePackageUninstallFailureBundle.Uninstall((int)MSIExec.MSIExecReturnCode.ERROR_INSTALL_FAILURE, "FAILWHENDEFERRED=1");
+            bundlePackageUninstallFailureBundle.VerifyRegisteredAndInPackageCache();
+            bundleA.VerifyRegisteredAndInPackageCache(expectedSystemComponent: 1);
+            packageFail.VerifyInstalled(true);
+
+            Assert.True(LogVerifier.MessageInLogFile(uninstallLogPath, "TESTBA: OnCachePackageNonVitalValidationFailure() - id: PackageA, default: None, requested: Acquire"));
+            Assert.False(LogVerifier.MessageInLogFile(uninstallLogPath, $"Applying execute package: PackageA, action: Uninstall, path: {bundleASelfCachedPath}"), bundleASelfCachedPath);
+            Assert.True(LogVerifier.MessageInLogFile(uninstallLogPath, $"Applying execute package: PackageA, action: Uninstall, path: {bundleAEmbeddedCachedPath}"), bundleAEmbeddedCachedPath);
+            Assert.False(LogVerifier.MessageInLogFile(uninstallLogPath, $"Applying rollback package: PackageA, action: Install, path: {bundleASelfCachedPath}"), bundleASelfCachedPath);
+            Assert.True(LogVerifier.MessageInLogFile(uninstallLogPath, $"Applying rollback package: PackageA, action: Install, path: {bundleAEmbeddedCachedPath}"), bundleAEmbeddedCachedPath);
+        }
+
+        [RuntimeFact]
+        public void CanReinstallBundlePackageOnUninstallRollback()
+        {
+            var packageFail = this.CreatePackageInstaller("PackageFail");
+            var packageA = this.CreatePackageInstaller(@"..\BasicFunctionalityTests\PackageA");
+            var bundleA = this.CreateBundleInstaller(@"..\BasicFunctionalityTests\BundleA");
+            var bundlePackageUninstallFailureBundle = this.CreateBundleInstaller("BundlePackageUninstallFailureBundle");
+            var bundleASelfCachedPath = bundleA.GetExpectedCachedBundlePath();
+            var bundleAEmbeddedCachedPath = bundlePackageUninstallFailureBundle.GetPackageEntryPointCachePath("PackageA");
+
+            packageA.VerifyInstalled(false);
+            packageFail.VerifyInstalled(false);
+            bundleA.VerifyUnregisteredAndRemovedFromPackageCache();
+
+            var installLogPath = bundlePackageUninstallFailureBundle.Install();
+            bundlePackageUninstallFailureBundle.VerifyRegisteredAndInPackageCache();
+            packageFail.VerifyInstalled(true);
+            bundleA.VerifyRegisteredAndInPackageCache(expectedSystemComponent: 1);
+
+            Assert.False(LogVerifier.MessageInLogFile(installLogPath, $"Applying execute package: PackageA, action: Install, path: {bundleASelfCachedPath}"), bundleASelfCachedPath);
+            Assert.True(LogVerifier.MessageInLogFile(installLogPath, $"Applying execute package: PackageA, action: Install, path: {bundleAEmbeddedCachedPath}"), bundleAEmbeddedCachedPath);
+
+            var uninstallLogPath = bundlePackageUninstallFailureBundle.Uninstall((int)MSIExec.MSIExecReturnCode.ERROR_INSTALL_FAILURE, "FAILWHENDEFERRED=1");
+            bundlePackageUninstallFailureBundle.VerifyRegisteredAndInPackageCache();
+            bundleA.VerifyRegisteredAndInPackageCache(expectedSystemComponent: 1);
+            packageFail.VerifyInstalled(true);
+
+            Assert.False(LogVerifier.MessageInLogFile(uninstallLogPath, "TESTBA: OnCachePackageNonVitalValidationFailure() - id: PackageA"));
+            Assert.False(LogVerifier.MessageInLogFile(uninstallLogPath, $"Applying execute package: PackageA, action: Uninstall, path: {bundleASelfCachedPath}"), bundleASelfCachedPath);
+            Assert.True(LogVerifier.MessageInLogFile(uninstallLogPath, $"Applying execute package: PackageA, action: Uninstall, path: {bundleAEmbeddedCachedPath}"), bundleAEmbeddedCachedPath);
+            Assert.False(LogVerifier.MessageInLogFile(uninstallLogPath, $"Applying rollback package: PackageA, action: Install, path: {bundleASelfCachedPath}"), bundleASelfCachedPath);
+            Assert.True(LogVerifier.MessageInLogFile(uninstallLogPath, $"Applying rollback package: PackageA, action: Install, path: {bundleAEmbeddedCachedPath}"), bundleAEmbeddedCachedPath);
+        }
+
+        [RuntimeFact]
+        public void CanSkipReinstallBundlePackageOnUninstallRollback()
+        {
+            var packageFail = this.CreatePackageInstaller("PackageFail");
+            var packageA = this.CreatePackageInstaller(@"..\BasicFunctionalityTests\PackageA");
+            var bundleA = this.CreateBundleInstaller(@"..\BasicFunctionalityTests\BundleA");
+            var bundlePackageUninstallFailureBundle = this.CreateBundleInstaller("BundlePackageUninstallFailureBundle");
+            var testBAController = this.CreateTestBAController();
+            var bundleASelfCachedPath = bundleA.GetExpectedCachedBundlePath();
+            var bundleAEmbeddedCachedPath = bundlePackageUninstallFailureBundle.GetPackageEntryPointCachePath("PackageA");
+
+            packageA.VerifyInstalled(false);
+            packageFail.VerifyInstalled(false);
+            bundleA.VerifyUnregisteredAndRemovedFromPackageCache();
+
+            testBAController.SetPackageRequestedCacheType("PackageA", BOOTSTRAPPER_CACHE_TYPE.Remove);
+
+            var installLogPath = bundlePackageUninstallFailureBundle.Install();
+            bundlePackageUninstallFailureBundle.VerifyRegisteredAndInPackageCache();
+            packageFail.VerifyInstalled(true);
+            bundleA.VerifyRegisteredAndInPackageCache(expectedSystemComponent: 1);
+
+            Assert.False(LogVerifier.MessageInLogFile(installLogPath, $"Applying execute package: PackageA, action: Install, path: {bundleASelfCachedPath}"), bundleASelfCachedPath);
+            Assert.True(LogVerifier.MessageInLogFile(installLogPath, $"Applying execute package: PackageA, action: Install, path: {bundleAEmbeddedCachedPath}"), bundleAEmbeddedCachedPath);
+
+            var uninstallLogPath = bundlePackageUninstallFailureBundle.Uninstall((int)MSIExec.MSIExecReturnCode.ERROR_INSTALL_FAILURE, "FAILWHENDEFERRED=1");
+            bundlePackageUninstallFailureBundle.VerifyRegisteredAndInPackageCache();
+            bundleA.VerifyUnregisteredAndRemovedFromPackageCache();
+            packageFail.VerifyInstalled(true);
+
+            Assert.True(LogVerifier.MessageInLogFile(uninstallLogPath, "TESTBA: OnCachePackageNonVitalValidationFailure() - id: PackageA, default: None, requested: None"));
+            Assert.True(LogVerifier.MessageInLogFile(uninstallLogPath, $"Applying execute package: PackageA, action: Uninstall, path: {bundleASelfCachedPath}"), bundleASelfCachedPath);
+            Assert.False(LogVerifier.MessageInLogFile(uninstallLogPath, $"Applying execute package: PackageA, action: Uninstall, path: {bundleAEmbeddedCachedPath}"), bundleAEmbeddedCachedPath);
+            Assert.False(LogVerifier.MessageInLogFile(uninstallLogPath, $"Applying rollback package: PackageA, action: Install, path: {bundleASelfCachedPath}"), bundleASelfCachedPath);
+            Assert.False(LogVerifier.MessageInLogFile(uninstallLogPath, $"Applying rollback package: PackageA, action: Install, path: {bundleAEmbeddedCachedPath}"), bundleAEmbeddedCachedPath);
+        }
     }
 }