1 files changed, 46 insertions, 4 deletions

diff --git a/src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs
index 1bb0c0b6..bcdea974 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/BundlePackageTests.cs
@@ -31,8 +31,8 @@ namespace WixToolsetTest.BurnE2E
             multipleBundlePackagesBundle.Install();
             multipleBundlePackagesBundle.VerifyRegisteredAndInPackageCache();
 
-            bundleA.VerifyRegisteredAndInPackageCache();
-            bundleB_x64.VerifyRegisteredAndInPackageCache();
+            bundleA.VerifyRegisteredAndInPackageCache(expectedSystemComponent: 1);
+            bundleB_x64.VerifyRegisteredAndInPackageCache(expectedSystemComponent: 1);
 
             // Source file should be installed
             Assert.True(File.Exists(packageA32SourceCodeFilePath), $"Should have found PackageA payload installed at: {packageA32SourceCodeFilePath}");
@@ -61,14 +61,15 @@ namespace WixToolsetTest.BurnE2E
 
             upgradeBundlePackageBundlev2.Install();
             upgradeBundlePackageBundlev2.VerifyRegisteredAndInPackageCache();
-            bundleAv2.VerifyRegisteredAndInPackageCache();
+            bundleAv2.VerifyRegisteredAndInPackageCache(expectedSystemComponent: 1);
             bundleAv1.VerifyUnregisteredAndRemovedFromPackageCache();
         }
 
         [Fact]
         public void CanInstallV3BundlePackage()
         {
-            var v3BundleName = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Package Cache", "{215a70db-ab35-48c7-be51-d66eaac87177}", "CustomV3Theme");
+            var v3BundleId = "{215a70db-ab35-48c7-be51-d66eaac87177}";
+            var v3BundleName = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Package Cache", v3BundleId, "CustomV3Theme");
             var v3Bundle = new BundleInstaller(this.TestContext, v3BundleName);
             this.AddBundleInstaller(v3Bundle);
             var v3BundlePackageBundle = this.CreateBundleInstaller("V3BundlePackageBundle");
@@ -79,6 +80,47 @@ namespace WixToolsetTest.BurnE2E
             v3BundlePackageBundle.VerifyRegisteredAndInPackageCache();
 
             Assert.True(LogVerifier.MessageInLogFile(logPath, "Applied execute package: v3bundle.exe, result: 0x0, restart: None"));
+
+            Assert.True(BundleRegistration.TryGetPerMachineBundleRegistrationById(v3BundleId, false, out var v3Registration));
+            Assert.Null(v3Registration.SystemComponent);
+        }
+
+        [Fact]
+        public void CanLeaveBundlePackageVisible()
+        {
+            var bundleAv1 = this.CreateBundleInstaller(@"..\UpgradeRelatedBundleTests\BundleAv1");
+            var upgradeBundlePackageBundlev1 = this.CreateBundleInstaller("UpgradeBundlePackageBundlev1");
+
+            bundleAv1.Install();
+            bundleAv1.VerifyRegisteredAndInPackageCache();
+
+            upgradeBundlePackageBundlev1.Install();
+            upgradeBundlePackageBundlev1.VerifyRegisteredAndInPackageCache();
+            bundleAv1.VerifyRegisteredAndInPackageCache();
+
+            upgradeBundlePackageBundlev1.Uninstall();
+            upgradeBundlePackageBundlev1.VerifyUnregisteredAndRemovedFromPackageCache();
+            bundleAv1.VerifyRegisteredAndInPackageCache();
+        }
+
+        [Fact]
+        public void CanReferenceCountBundlePackage()
+        {
+            var bundleAv1 = this.CreateBundleInstaller(@"..\UpgradeRelatedBundleTests\BundleAv1");
+            var upgradeBundlePackageBundlev1 = this.CreateBundleInstaller("UpgradeBundlePackageBundlev1");
+
+            upgradeBundlePackageBundlev1.Install();
+            upgradeBundlePackageBundlev1.VerifyRegisteredAndInPackageCache();
+            bundleAv1.VerifyRegisteredAndInPackageCache(expectedSystemComponent: 1);
+
+            // Repair bundle so it adds itself as a reference to itself.
+            bundleAv1.Repair();
+            bundleAv1.VerifyRegisteredAndInPackageCache(expectedSystemComponent: 1);
+
+            upgradeBundlePackageBundlev1.Uninstall();
+            upgradeBundlePackageBundlev1.VerifyUnregisteredAndRemovedFromPackageCache();
+
+            bundleAv1.VerifyRegisteredAndInPackageCache(expectedSystemComponent: 1);
         }
 
         [Fact]