Detect MinorUpgrade MsiPackages independently of the base product.

Fixes #6535

6 files changed, 46 insertions, 52 deletions

diff --git a/src/burn/engine/detect.cpp b/src/burn/engine/detect.cpp
index e251871c..3bd39784 100644
--- a/src/burn/engine/detect.cpp
+++ b/src/burn/engine/detect.cpp
@@ -64,6 +64,8 @@ extern "C" void DetectReset(
 
         if (BURN_PACKAGE_TYPE_MSI == pPackage->type)
         {
+            pPackage->Msi.operation = BOOTSTRAPPER_RELATED_OPERATION_NONE;
+
             for (DWORD iFeature = 0; iFeature < pPackage->Msi.cFeatures; ++iFeature)
             {
                 BURN_MSIFEATURE* pFeature = pPackage->Msi.rgFeatures + iFeature;
diff --git a/src/burn/engine/msiengine.cpp b/src/burn/engine/msiengine.cpp
index c8f68184..c27dd8c2 100644
--- a/src/burn/engine/msiengine.cpp
+++ b/src/burn/engine/msiengine.cpp
@@ -443,7 +443,6 @@ extern "C" HRESULT MsiEngineDetectPackage(
     LPWSTR sczInstalledVersion = NULL;
     LPWSTR sczInstalledLanguage = NULL;
     INSTALLSTATE installState = INSTALLSTATE_UNKNOWN;
-    BOOTSTRAPPER_RELATED_OPERATION operation = BOOTSTRAPPER_RELATED_OPERATION_NONE;
     BOOTSTRAPPER_RELATED_OPERATION relatedMsiOperation = BOOTSTRAPPER_RELATED_OPERATION_NONE;
     WCHAR wzProductCode[MAX_GUID_CHARS + 1] = { };
     VERUTIL_VERSION* pVersion = NULL;
@@ -455,39 +454,39 @@ extern "C" HRESULT MsiEngineDetectPackage(
     hr = WiuGetProductInfoEx(pPackage->Msi.sczProductCode, NULL, pPackage->fPerMachine ? MSIINSTALLCONTEXT_MACHINE : MSIINSTALLCONTEXT_USERUNMANAGED, INSTALLPROPERTY_VERSIONSTRING, &sczInstalledVersion);
     if (SUCCEEDED(hr))
     {
-        hr = VerParseVersion(sczInstalledVersion, 0, FALSE, &pPackage->Msi.pInstalledVersion);
+        hr = VerParseVersion(sczInstalledVersion, 0, FALSE, &pVersion);
         ExitOnFailure(hr, "Failed to parse installed version: '%ls' for ProductCode: %ls", sczInstalledVersion, pPackage->Msi.sczProductCode);
 
-        if (pPackage->Msi.pInstalledVersion->fInvalid)
+        if (pVersion->fInvalid)
         {
             LogId(REPORT_WARNING, MSG_DETECTED_MSI_PACKAGE_INVALID_VERSION, pPackage->Msi.sczProductCode, sczInstalledVersion);
         }
 
         // compare versions
-        hr = VerCompareParsedVersions(pPackage->Msi.pVersion, pPackage->Msi.pInstalledVersion, &nCompareResult);
-        ExitOnFailure(hr, "Failed to compare version '%ls' to installed version: '%ls'", pPackage->Msi.pVersion->sczVersion, pPackage->Msi.pInstalledVersion->sczVersion);
+        hr = VerCompareParsedVersions(pPackage->Msi.pVersion, pVersion, &nCompareResult);
+        ExitOnFailure(hr, "Failed to compare version '%ls' to installed version: '%ls'", pPackage->Msi.pVersion->sczVersion, pVersion->sczVersion);
 
         if (nCompareResult < 0)
         {
-            operation = BOOTSTRAPPER_RELATED_OPERATION_DOWNGRADE;
+            pPackage->Msi.operation = BOOTSTRAPPER_RELATED_OPERATION_DOWNGRADE;
             pPackage->currentState = BOOTSTRAPPER_PACKAGE_STATE_SUPERSEDED;
         }
+        else if (nCompareResult > 0)
+        {
+            pPackage->Msi.operation = BOOTSTRAPPER_RELATED_OPERATION_MINOR_UPDATE;
+            pPackage->currentState = BOOTSTRAPPER_PACKAGE_STATE_ABSENT;
+        }
         else
         {
-            if (nCompareResult > 0)
-            {
-                operation = BOOTSTRAPPER_RELATED_OPERATION_MINOR_UPDATE;
-            }
-
             pPackage->currentState = BOOTSTRAPPER_PACKAGE_STATE_PRESENT;
         }
 
         // Report related MSI package to BA.
-        if (BOOTSTRAPPER_RELATED_OPERATION_NONE != operation)
+        if (BOOTSTRAPPER_RELATED_OPERATION_NONE != pPackage->Msi.operation)
         {
-            LogId(REPORT_STANDARD, MSG_DETECTED_RELATED_PACKAGE, pPackage->Msi.sczProductCode, LoggingPerMachineToString(pPackage->fPerMachine), pPackage->Msi.pInstalledVersion->sczVersion, pPackage->Msi.dwLanguage, LoggingRelatedOperationToString(operation));
+            LogId(REPORT_STANDARD, MSG_DETECTED_RELATED_PACKAGE, pPackage->Msi.sczProductCode, LoggingPerMachineToString(pPackage->fPerMachine), pVersion->sczVersion, pPackage->Msi.dwLanguage, LoggingRelatedOperationToString(pPackage->Msi.operation));
 
-            hr = UserExperienceOnDetectRelatedMsiPackage(pUserExperience, pPackage->sczId, pPackage->Msi.sczUpgradeCode, pPackage->Msi.sczProductCode, pPackage->fPerMachine, pPackage->Msi.pInstalledVersion, operation);
+            hr = UserExperienceOnDetectRelatedMsiPackage(pUserExperience, pPackage->sczId, pPackage->Msi.sczUpgradeCode, pPackage->Msi.sczProductCode, pPackage->fPerMachine, pVersion, pPackage->Msi.operation);
             ExitOnRootFailure(hr, "BA aborted detect related MSI package.");
         }
     }
@@ -623,7 +622,7 @@ extern "C" HRESULT MsiEngineDetectPackage(
             {
                 // If we've already detected a major upgrade that trumps any guesses that the detect is a downgrade
                 // or even something else.
-                if (BOOTSTRAPPER_RELATED_OPERATION_MAJOR_UPGRADE == operation)
+                if (BOOTSTRAPPER_RELATED_OPERATION_MAJOR_UPGRADE == pPackage->Msi.operation)
                 {
                     relatedMsiOperation = BOOTSTRAPPER_RELATED_OPERATION_NONE;
                 }
@@ -632,7 +631,7 @@ extern "C" HRESULT MsiEngineDetectPackage(
                          pPackage->Msi.sczUpgradeCode && CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, pPackage->Msi.sczUpgradeCode, -1, pRelatedMsi->sczUpgradeCode, -1))
                 {
                     relatedMsiOperation = BOOTSTRAPPER_RELATED_OPERATION_DOWNGRADE;
-                    operation = BOOTSTRAPPER_RELATED_OPERATION_DOWNGRADE;
+                    pPackage->Msi.operation = BOOTSTRAPPER_RELATED_OPERATION_DOWNGRADE;
                     pPackage->currentState = BOOTSTRAPPER_PACKAGE_STATE_OBSOLETE;
                 }
                 else // we're already on the machine so the detect-only *must* be for detection purposes only.
@@ -643,7 +642,7 @@ extern "C" HRESULT MsiEngineDetectPackage(
             else
             {
                 relatedMsiOperation = BOOTSTRAPPER_RELATED_OPERATION_MAJOR_UPGRADE;
-                operation = BOOTSTRAPPER_RELATED_OPERATION_MAJOR_UPGRADE;
+                pPackage->Msi.operation = BOOTSTRAPPER_RELATED_OPERATION_MAJOR_UPGRADE;
             }
 
             LogId(REPORT_STANDARD, MSG_DETECTED_RELATED_PACKAGE, wzProductCode, LoggingPerMachineToString(fPerMachine), pVersion->sczVersion, uLcid, LoggingRelatedOperationToString(relatedMsiOperation));
@@ -858,9 +857,6 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage(
     Trace(REPORT_STANDARD, "Planning MSI package 0x%p", pPackage);
 
     HRESULT hr = S_OK;
-    VERUTIL_VERSION* pVersion = pPackage->Msi.pVersion;
-    VERUTIL_VERSION* pInstalledVersion = pPackage->Msi.pInstalledVersion;
-    int nCompareResult = 0;
     BOOTSTRAPPER_ACTION_STATE execute = BOOTSTRAPPER_ACTION_STATE_NONE;
     BOOTSTRAPPER_ACTION_STATE rollback = BOOTSTRAPPER_ACTION_STATE_NONE;
     BOOL fFeatureActionDelta = FALSE;
@@ -892,17 +888,7 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage(
     case BOOTSTRAPPER_PACKAGE_STATE_SUPERSEDED:
         if (BOOTSTRAPPER_REQUEST_STATE_PRESENT == pPackage->requested || BOOTSTRAPPER_REQUEST_STATE_REPAIR == pPackage->requested)
         {
-            hr = VerCompareParsedVersions(pVersion, pInstalledVersion, &nCompareResult);
-            ExitOnFailure(hr, "Failed to compare '%ls' to '%ls' for planning.", pVersion->sczVersion, pInstalledVersion->sczVersion);
-
-            // Take a look at the version and determine if this is a potential
-            // minor upgrade (same ProductCode newer ProductVersion), otherwise,
-            // there is a newer version so no work necessary.
-            if (nCompareResult > 0)
-            {
-                execute = BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE;
-            }
-            else if (BOOTSTRAPPER_REQUEST_STATE_REPAIR == pPackage->requested)
+            if (BOOTSTRAPPER_REQUEST_STATE_REPAIR == pPackage->requested)
             {
                 execute = BOOTSTRAPPER_ACTION_STATE_REPAIR;
             }
@@ -937,7 +923,14 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage(
         case BOOTSTRAPPER_REQUEST_STATE_PRESENT: __fallthrough;
         case BOOTSTRAPPER_REQUEST_STATE_FORCE_PRESENT: __fallthrough;
         case BOOTSTRAPPER_REQUEST_STATE_REPAIR:
-            execute = BOOTSTRAPPER_ACTION_STATE_INSTALL;
+            if (BOOTSTRAPPER_RELATED_OPERATION_MINOR_UPDATE == pPackage->Msi.operation)
+            {
+                execute = BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE;
+            }
+            else
+            {
+                execute = BOOTSTRAPPER_ACTION_STATE_INSTALL;
+            }
             break;
 
         case BOOTSTRAPPER_REQUEST_STATE_FORCE_ABSENT:
diff --git a/src/burn/engine/package.h b/src/burn/engine/package.h
index 1e61d92b..eb40443d 100644
--- a/src/burn/engine/package.h
+++ b/src/burn/engine/package.h
@@ -341,9 +341,10 @@ typedef struct _BURN_PACKAGE
             LPWSTR sczProductCode;
             DWORD dwLanguage;
             VERUTIL_VERSION* pVersion;
-            VERUTIL_VERSION* pInstalledVersion;
             LPWSTR sczUpgradeCode;
 
+            BOOTSTRAPPER_RELATED_OPERATION operation;
+
             BURN_MSIPROPERTY* rgProperties;
             DWORD cProperties;
 
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
index ba02d8ee..3437bf00 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
@@ -730,22 +730,21 @@ namespace WixToolsetTest.BurnE2E
             bundleNv101.VerifyUnregisteredAndRemovedFromPackageCache();
             bundleNv1.VerifyRegisteredAndInPackageCache();
 
-            // The expected values will change after implementing https://github.com/wixtoolset/issues/issues/6535 and https://github.com/wixtoolset/issues/issues/3421
             packageAv1.VerifyInstalled(true);
             packageC.VerifyInstalled(false);
-            packageFv1.VerifyInstalledWithVersion(false);
-            packageFv101.VerifyInstalledWithVersion(true);
-            packageGv1.VerifyInstalledWithVersion(false);
-            packageGv101.VerifyInstalledWithVersion(true);
+            packageFv1.VerifyInstalledWithVersion(true);
+            packageFv101.VerifyInstalledWithVersion(false);
+            packageGv1.VerifyInstalledWithVersion(true);
+            packageGv101.VerifyInstalledWithVersion(false);
 
             bundleM.Uninstall();
             bundleM.VerifyUnregisteredAndRemovedFromPackageCache();
 
             packageAv1.VerifyInstalled(false);
-            packageFv1.VerifyInstalledWithVersion(false);
-            packageFv101.VerifyInstalledWithVersion(true);
-            packageGv1.VerifyInstalledWithVersion(false);
-            packageGv101.VerifyInstalledWithVersion(true);
+            packageFv1.VerifyInstalledWithVersion(true);
+            packageFv101.VerifyInstalledWithVersion(false);
+            packageGv1.VerifyInstalledWithVersion(true);
+            packageGv101.VerifyInstalledWithVersion(false);
 
             bundleNv1.Uninstall();
             bundleNv1.VerifyUnregisteredAndRemovedFromPackageCache();
@@ -804,20 +803,19 @@ namespace WixToolsetTest.BurnE2E
             bundleNv101.VerifyUnregisteredAndRemovedFromPackageCache();
             bundleNv1.VerifyRegisteredAndInPackageCache();
 
-            // The expected values will change after implementing https://github.com/wixtoolset/issues/issues/6535 and https://github.com/wixtoolset/issues/issues/3421
             packageAv1.VerifyInstalled(true);
             packageC.VerifyInstalled(false);
-            packageFv1.VerifyInstalledWithVersion(false);
-            packageFv101.VerifyInstalledWithVersion(true);
-            packageGv1.VerifyInstalledWithVersion(false);
-            packageGv101.VerifyInstalledWithVersion(true);
+            packageFv1.VerifyInstalledWithVersion(true);
+            packageFv101.VerifyInstalledWithVersion(false);
+            packageGv1.VerifyInstalledWithVersion(true);
+            packageGv101.VerifyInstalledWithVersion(false);
 
             bundleNv1.Uninstall();
             bundleNv1.VerifyUnregisteredAndRemovedFromPackageCache();
 
             packageAv1.VerifyInstalled(true);
-            packageFv1.VerifyInstalledWithVersion(false);
-            packageFv101.VerifyInstalledWithVersion(true);
+            packageFv1.VerifyInstalledWithVersion(true);
+            packageFv101.VerifyInstalledWithVersion(false);
             packageGv1.VerifyInstalledWithVersion(false);
             packageGv101.VerifyInstalledWithVersion(false);
 
diff --git a/src/wix/WixToolset.Core.Burn/Bind/ProcessDependencyProvidersCommand.cs b/src/wix/WixToolset.Core.Burn/Bind/ProcessDependencyProvidersCommand.cs
index 5df6c887..e4e04845 100644
--- a/src/wix/WixToolset.Core.Burn/Bind/ProcessDependencyProvidersCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bind/ProcessDependencyProvidersCommand.cs
@@ -107,7 +107,7 @@ namespace WixToolset.Core.Burn.Bind
                     this.Section.AddSymbol(new WixDependencyProviderSymbol(facade.PackageSymbol.SourceLineNumbers, facade.PackageSymbol.Id)
                     {
                         ParentRef = facade.PackageId,
-                        ProviderKey = key,
+                        ProviderKey = $"{key}_v{facade.PackageSymbol.Version}",
                         Version = facade.PackageSymbol.Version,
                         DisplayName = facade.PackageSymbol.DisplayName
                     });
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs
index e41986ee..7cfcdded 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/ContainerFixture.cs
@@ -150,7 +150,7 @@ namespace WixToolsetTest.CoreIntegration
                 {
                     "<MsiPackage Id='FirstX86.msi' Cache='keep' CacheId='*' InstallSize='*' Size='*' PerMachine='yes' Permanent='no' Vital='yes' RollbackBoundaryForward='WixDefaultBoundary' LogPathVariable='WixBundleLog_FirstX86.msi' RollbackLogPathVariable='WixBundleRollbackLog_FirstX86.msi' ProductCode='*' Language='1033' Version='1.0.0.0' UpgradeCode='{12E4699F-E774-4D05-8A01-5BDD41BBA127}'>" +
                       "<MsiProperty Id='ARPSYSTEMCOMPONENT' Value='1' />" +
-                     $"<Provides Key='{GetProductCodeFromMsiPdb(pdbPaths[0])}' Version='1.0.0.0' DisplayName='MsiPackage' />" +
+                     $"<Provides Key='{GetProductCodeFromMsiPdb(pdbPaths[0])}_v1.0.0.0' Version='1.0.0.0' DisplayName='MsiPackage' />" +
                       "<RelatedPackage Id='{12E4699F-E774-4D05-8A01-5BDD41BBA127}' MaxVersion='1.0.0.0' MaxInclusive='no' OnlyDetect='no' LangInclusive='yes'><Language Id='1033' /></RelatedPackage>" +
                       "<RelatedPackage Id='{12E4699F-E774-4D05-8A01-5BDD41BBA127}' MinVersion='1.0.0.0' MinInclusive='no' OnlyDetect='yes' LangInclusive='yes'><Language Id='1033' /></RelatedPackage>" +
                       "<PayloadRef Id='FirstX86.msi' />" +
@@ -158,7 +158,7 @@ namespace WixToolsetTest.CoreIntegration
                     "</MsiPackage>",
                     "<MsiPackage Id='FirstX64.msi' Cache='keep' CacheId='*' InstallSize='*' Size='*' PerMachine='yes' Permanent='no' Vital='yes' RollbackBoundaryBackward='WixDefaultBoundary' LogPathVariable='WixBundleLog_FirstX64.msi' RollbackLogPathVariable='WixBundleRollbackLog_FirstX64.msi' ProductCode='*' Language='1033' Version='1.0.0.0' UpgradeCode='{12E4699F-E774-4D05-8A01-5BDD41BBA127}'>" +
                       "<MsiProperty Id='ARPSYSTEMCOMPONENT' Value='1' />" +
-                     $"<Provides Key='{GetProductCodeFromMsiPdb(pdbPaths[1])}' Version='1.0.0.0' DisplayName='MsiPackage' />" +
+                     $"<Provides Key='{GetProductCodeFromMsiPdb(pdbPaths[1])}_v1.0.0.0' Version='1.0.0.0' DisplayName='MsiPackage' />" +
                       "<RelatedPackage Id='{12E4699F-E774-4D05-8A01-5BDD41BBA127}' MaxVersion='1.0.0.0' MaxInclusive='no' OnlyDetect='no' LangInclusive='yes'><Language Id='1033' /></RelatedPackage>" +
                       "<RelatedPackage Id='{12E4699F-E774-4D05-8A01-5BDD41BBA127}' MinVersion='1.0.0.0' MinInclusive='no' OnlyDetect='yes' LangInclusive='yes'><Language Id='1033' /></RelatedPackage>" +
                       "<PayloadRef Id='FirstX64.msi' />" +