10 files changed, 163 insertions, 78 deletions

diff --git a/src/burn/engine/elevation.cpp b/src/burn/engine/elevation.cpp
index ba6b1dd3..12c9f296 100644
--- a/src/burn/engine/elevation.cpp
+++ b/src/burn/engine/elevation.cpp
@@ -1002,6 +1002,9 @@ extern "C" HRESULT ElevationExecuteMsiPackage(
     hr = BuffWriteNumber(&pbData, &cbData, (DWORD)pExecuteAction->msiPackage.fDisableExternalUiHandler);
     ExitOnFailure(hr, "Failed to write fDisableExternalUiHandler to message buffer.");
 
+    hr = BuffWriteNumber(&pbData, &cbData, (DWORD)pExecuteAction->msiPackage.fileVersioning);
+    ExitOnFailure(hr, "Failed to write fileVersioning to message buffer.");
+
     hr = BuffWriteNumber(&pbData, &cbData, (DWORD)pExecuteAction->msiPackage.action);
     ExitOnFailure(hr, "Failed to write action to message buffer.");
 
@@ -1083,6 +1086,9 @@ extern "C" HRESULT ElevationExecuteMspPackage(
     hr = BuffWriteNumber(&pbData, &cbData, (DWORD)pExecuteAction->mspTarget.fDisableExternalUiHandler);
     ExitOnFailure(hr, "Failed to write fDisableExternalUiHandler to message buffer.");
 
+    hr = BuffWriteNumber(&pbData, &cbData, (DWORD)pExecuteAction->mspTarget.fileVersioning);
+    ExitOnFailure(hr, "Failed to write fileVersioning to message buffer.");
+
     hr = BuffWriteNumber(&pbData, &cbData, (DWORD)pExecuteAction->mspTarget.action);
     ExitOnFailure(hr, "Failed to write action to message buffer.");
 
@@ -2603,6 +2609,9 @@ static HRESULT OnExecuteMsiPackage(
     hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)&executeAction.msiPackage.fDisableExternalUiHandler);
     ExitOnFailure(hr, "Failed to read fDisableExternalUiHandler.");
 
+    hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)&executeAction.msiPackage.fileVersioning);
+    ExitOnFailure(hr, "Failed to read fileVersioning.");
+
     hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)&executeAction.msiPackage.action);
     ExitOnFailure(hr, "Failed to read action.");
 
@@ -2703,6 +2712,9 @@ static HRESULT OnExecuteMspPackage(
     hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)&executeAction.mspTarget.fDisableExternalUiHandler);
     ExitOnFailure(hr, "Failed to read fDisableExternalUiHandler.");
 
+    hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)&executeAction.mspTarget.fileVersioning);
+    ExitOnFailure(hr, "Failed to read fileVersioning.");
+
     hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)&executeAction.mspTarget.action);
     ExitOnFailure(hr, "Failed to read action.");
 
diff --git a/src/burn/engine/logging.cpp b/src/burn/engine/logging.cpp
index 33295acd..21e010bc 100644
--- a/src/burn/engine/logging.cpp
+++ b/src/burn/engine/logging.cpp
@@ -480,6 +480,23 @@ extern "C" LPCSTR LoggingPackageRegistrationStateToString(
     }
 }
 
+extern "C" LPCSTR LoggingMsiFileVersioningToString(
+    __in BOOTSTRAPPER_MSI_FILE_VERSIONING fileVersioning
+    )
+{
+    switch (fileVersioning)
+    {
+    case BOOTSTRAPPER_MSI_FILE_VERSIONING_MISSING_OR_OLDER:
+        return "o";
+    case BOOTSTRAPPER_MSI_FILE_VERSIONING_MISSING_OR_OLDER_OR_EQUAL:
+        return "e";
+    case BOOTSTRAPPER_MSI_FILE_VERSIONING_ALL:
+        return "a";
+    default:
+        return "Invalid";
+    }
+}
+
 extern "C" LPCSTR LoggingMsiFeatureStateToString(
     __in BOOTSTRAPPER_FEATURE_STATE featureState
     )
diff --git a/src/burn/engine/logging.h b/src/burn/engine/logging.h
index 367b94a3..11f676b3 100644
--- a/src/burn/engine/logging.h
+++ b/src/burn/engine/logging.h
@@ -106,6 +106,10 @@ LPCSTR LoggingPackageRegistrationStateToString(
     __in BURN_PACKAGE_REGISTRATION_STATE registrationState
     );
 
+LPCSTR LoggingMsiFileVersioningToString(
+    __in BOOTSTRAPPER_MSI_FILE_VERSIONING fileVersioning
+    );
+
 LPCSTR LoggingMsiFeatureStateToString(
     __in BOOTSTRAPPER_FEATURE_STATE featureState
     );
diff --git a/src/burn/engine/msiengine.cpp b/src/burn/engine/msiengine.cpp
index c80fd79f..509fbb7a 100644
--- a/src/burn/engine/msiengine.cpp
+++ b/src/burn/engine/msiengine.cpp
@@ -958,8 +958,8 @@ extern "C" HRESULT MsiEnginePlanAddPackage(
         pAction->msiPackage.rgFeatures = rgRollbackFeatureActions;
         rgRollbackFeatureActions = NULL;
 
-        hr = MsiEngineCalculateInstallUiLevel(display, pUserExperience, pPackage->sczId, FALSE, pAction->msiPackage.action,
-            &pAction->msiPackage.actionMsiProperty, &pAction->msiPackage.uiLevel, &pAction->msiPackage.fDisableExternalUiHandler);
+        hr = MsiEnginePlanPackageOptions(display, pUserExperience, pPackage->sczId, FALSE, pAction->msiPackage.action,
+            &pAction->msiPackage.actionMsiProperty, &pAction->msiPackage.uiLevel, &pAction->msiPackage.fDisableExternalUiHandler, &pAction->msiPackage.fileVersioning);
         ExitOnFailure(hr, "Failed to get msi ui options.");
 
         LoggingSetPackageVariable(pPackage, NULL, TRUE, pLog, pVariables, &pAction->msiPackage.sczLogPath); // ignore errors.
@@ -984,8 +984,8 @@ extern "C" HRESULT MsiEnginePlanAddPackage(
         pAction->msiPackage.rgFeatures = rgFeatureActions;
         rgFeatureActions = NULL;
 
-        hr = MsiEngineCalculateInstallUiLevel(display, pUserExperience, pPackage->sczId, TRUE, pAction->msiPackage.action,
-            &pAction->msiPackage.actionMsiProperty, &pAction->msiPackage.uiLevel, &pAction->msiPackage.fDisableExternalUiHandler);
+        hr = MsiEnginePlanPackageOptions(display, pUserExperience, pPackage->sczId, TRUE, pAction->msiPackage.action,
+            &pAction->msiPackage.actionMsiProperty, &pAction->msiPackage.uiLevel, &pAction->msiPackage.fDisableExternalUiHandler, &pAction->msiPackage.fileVersioning);
         ExitOnFailure(hr, "Failed to get msi ui options.");
 
         LoggingSetPackageVariable(pPackage, NULL, FALSE, pLog, pVariables, &pAction->msiPackage.sczLogPath); // ignore errors.
@@ -1153,10 +1153,10 @@ extern "C" HRESULT MsiEngineExecutePackage(
     }
 
     // set up properties
-    hr = MsiEngineConcatProperties(pPackage->Msi.rgProperties, pPackage->Msi.cProperties, pVariables, fRollback, &sczProperties, FALSE);
+    hr = MsiEngineConcatPackageProperties(pPackage->Msi.rgProperties, pPackage->Msi.cProperties, pVariables, fRollback, &sczProperties, FALSE);
     ExitOnFailure(hr, "Failed to add properties to argument string.");
 
-    hr = MsiEngineConcatProperties(pPackage->Msi.rgProperties, pPackage->Msi.cProperties, pVariables, fRollback, &sczObfuscatedProperties, TRUE);
+    hr = MsiEngineConcatPackageProperties(pPackage->Msi.rgProperties, pPackage->Msi.cProperties, pVariables, fRollback, &sczObfuscatedProperties, TRUE);
     ExitOnFailure(hr, "Failed to add obfuscated properties to argument string.");
 
     // add feature action properties
@@ -1173,10 +1173,10 @@ extern "C" HRESULT MsiEngineExecutePackage(
     hr = ConcatPatchProperty(pCache, pPackage, fRollback, &sczObfuscatedProperties);
     ExitOnFailure(hr, "Failed to add patch properties to obfuscated argument string.");
 
-    hr = MsiEngineConcatActionProperty(pExecuteAction->msiPackage.actionMsiProperty, &sczProperties);
+    hr = MsiEngineConcatBurnProperties(pExecuteAction->msiPackage.action, pExecuteAction->msiPackage.actionMsiProperty, pExecuteAction->msiPackage.fileVersioning, TRUE, !pPackage->Msi.cFeatures, &sczProperties);
     ExitOnFailure(hr, "Failed to add action property to argument string.");
 
-    hr = MsiEngineConcatActionProperty(pExecuteAction->msiPackage.actionMsiProperty, &sczObfuscatedProperties);
+    hr = MsiEngineConcatBurnProperties(pExecuteAction->msiPackage.action, pExecuteAction->msiPackage.actionMsiProperty, pExecuteAction->msiPackage.fileVersioning, TRUE, !pPackage->Msi.cFeatures, &sczObfuscatedProperties);
     ExitOnFailure(hr, "Failed to add action property to obfuscated argument string.");
 
     LogId(REPORT_STANDARD, MSG_APPLYING_PACKAGE, LoggingRollbackOrExecute(fRollback), pPackage->sczId, LoggingActionStateToString(pExecuteAction->msiPackage.action), sczMsiPath, sczObfuscatedProperties ? sczObfuscatedProperties : L"");
@@ -1187,9 +1187,6 @@ extern "C" HRESULT MsiEngineExecutePackage(
     switch (pExecuteAction->msiPackage.action)
     {
     case BOOTSTRAPPER_ACTION_STATE_INSTALL:
-        hr = StrAllocConcatSecure(&sczProperties, L" REBOOT=ReallySuppress", 0);
-        ExitOnFailure(hr, "Failed to add reboot suppression property on install.");
-
         hr = WiuInstallProduct(sczMsiPath, sczProperties, &restart);
         ExitOnFailure(hr, "Failed to install MSI package.");
 
@@ -1197,17 +1194,6 @@ extern "C" HRESULT MsiEngineExecutePackage(
         break;
 
     case BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE:
-        // If feature selection is not enabled, then reinstall the existing features to ensure they get
-        // updated.
-        if (0 == pPackage->Msi.cFeatures)
-        {
-            hr = StrAllocConcatSecure(&sczProperties, L" REINSTALL=ALL", 0);
-            ExitOnFailure(hr, "Failed to add reinstall all property on minor upgrade.");
-        }
-
-        hr = StrAllocConcatSecure(&sczProperties, L" REINSTALLMODE=\"vomus\" REBOOT=ReallySuppress", 0);
-        ExitOnFailure(hr, "Failed to add reinstall mode and reboot suppression properties on minor upgrade.");
-
         hr = WiuInstallProduct(sczMsiPath, sczProperties, &restart);
         ExitOnFailure(hr, "Failed to perform minor upgrade of MSI package.");
 
@@ -1217,31 +1203,11 @@ extern "C" HRESULT MsiEngineExecutePackage(
     case BOOTSTRAPPER_ACTION_STATE_MODIFY: __fallthrough;
     case BOOTSTRAPPER_ACTION_STATE_MEND: __fallthrough;
     case BOOTSTRAPPER_ACTION_STATE_REPAIR:
-        {
-        LPCWSTR wzReinstallAll = (BOOTSTRAPPER_ACTION_STATE_MODIFY == pExecuteAction->msiPackage.action ||
-                                  pPackage->Msi.cFeatures) ? L"" : L" REINSTALL=ALL";
-        LPCWSTR wzReinstallMode = (BOOTSTRAPPER_ACTION_STATE_MODIFY == pExecuteAction->msiPackage.action || BOOTSTRAPPER_ACTION_STATE_MEND == pExecuteAction->msiPackage.action) ? L"o" : L"e";
-
-        hr = StrAllocFormattedSecure(&sczProperties, L"%ls%ls REINSTALLMODE=\"cmus%ls\" REBOOT=ReallySuppress", sczProperties ? sczProperties : L"", wzReinstallAll, wzReinstallMode);
-        ExitOnFailure(hr, "Failed to add reinstall mode and reboot suppression properties on repair.");
-        }
-
-        // Ignore all dependencies, since the Burn engine already performed the check.
-        hr = StrAllocFormattedSecure(&sczProperties, L"%ls %ls=ALL", sczProperties, DEPENDENCY_IGNOREDEPENDENCIES);
-        ExitOnFailure(hr, "Failed to add the list of dependencies to ignore to the properties.");
-
         hr = WiuInstallProduct(sczMsiPath, sczProperties, &restart);
         ExitOnFailure(hr, "Failed to run maintenance mode for MSI package.");
         break;
 
     case BOOTSTRAPPER_ACTION_STATE_UNINSTALL:
-        hr = StrAllocConcatSecure(&sczProperties, L" REBOOT=ReallySuppress", 0);
-        ExitOnFailure(hr, "Failed to add reboot suppression property on uninstall.");
-
-        // Ignore all dependencies, since the Burn engine already performed the check.
-        hr = StrAllocFormattedSecure(&sczProperties, L"%ls %ls=ALL", sczProperties, DEPENDENCY_IGNOREDEPENDENCIES);
-        ExitOnFailure(hr, "Failed to add the list of dependencies to ignore to the properties.");
-
         hr = WiuConfigureProductEx(pPackage->Msi.sczProductCode, INSTALLLEVEL_DEFAULT, INSTALLSTATE_ABSENT, sczProperties, &restart);
         if (HRESULT_FROM_WIN32(ERROR_UNKNOWN_PRODUCT) == hr)
         {
@@ -1283,13 +1249,55 @@ LExit:
     return hr;
 }
 
-extern "C" HRESULT MsiEngineConcatActionProperty(
+extern "C" HRESULT MsiEngineConcatBurnProperties(
+    __in BOOTSTRAPPER_ACTION_STATE action,
     __in BURN_MSI_PROPERTY actionMsiProperty,
+    __in BOOTSTRAPPER_MSI_FILE_VERSIONING fileVersioning,
+    __in BOOL fMsiPackage,
+    __in BOOL fFeatureSelectionEnabled,
     __deref_out_z LPWSTR* psczProperties
     )
 {
     HRESULT hr = S_OK;
     LPCWSTR wzPropertyName = NULL;
+    LPCWSTR wzReinstallModeOptions = NULL;
+    LPCWSTR wzFileVersioning = L"";
+    BOOL fReinstallAll = FALSE;
+    BOOL fIgnoreDependencies = FALSE;
+
+    switch (action)
+    {
+    case BOOTSTRAPPER_ACTION_STATE_INSTALL:
+        wzReinstallModeOptions = L"mus";
+        break;
+    case BOOTSTRAPPER_ACTION_STATE_MINOR_UPGRADE:
+        if (fMsiPackage)
+        {
+            // If feature selection is not enabled,
+            // then reinstall the existing features to ensure they get updated.
+            fReinstallAll = !fFeatureSelectionEnabled;
+
+            wzReinstallModeOptions = L"vmus";
+        }
+        break;
+    case BOOTSTRAPPER_ACTION_STATE_REPAIR: __fallthrough;
+    case BOOTSTRAPPER_ACTION_STATE_MEND: __fallthrough;
+    case BOOTSTRAPPER_ACTION_STATE_MODIFY:
+        if (fMsiPackage)
+        {
+            fReinstallAll = BOOTSTRAPPER_ACTION_STATE_MODIFY != action && !fFeatureSelectionEnabled;
+            wzReinstallModeOptions = L"cmus";
+            fIgnoreDependencies = TRUE;
+        }
+        else
+        {
+            wzReinstallModeOptions = L"mus";
+        }
+        break;
+    case BOOTSTRAPPER_ACTION_STATE_UNINSTALL:
+        fIgnoreDependencies = TRUE;
+        break;
+    }
 
     switch (actionMsiProperty)
     {
@@ -1313,11 +1321,46 @@ extern "C" HRESULT MsiEngineConcatActionProperty(
         ExitOnFailure(hr, "Failed to add burn action property.");
     }
 
+    if (fReinstallAll)
+    {
+        hr = StrAllocConcatSecure(psczProperties, L" REINSTALL=ALL", 0);
+        ExitOnFailure(hr, "Failed to add reinstall all property.");
+    }
+
+    if (wzReinstallModeOptions)
+    {
+        switch (fileVersioning)
+        {
+        case BOOTSTRAPPER_MSI_FILE_VERSIONING_MISSING_OR_OLDER:
+            wzFileVersioning = L"o";
+            break;
+        case BOOTSTRAPPER_MSI_FILE_VERSIONING_MISSING_OR_OLDER_OR_EQUAL:
+            wzFileVersioning = L"e";
+            break;
+        case BOOTSTRAPPER_MSI_FILE_VERSIONING_ALL:
+            wzFileVersioning = L"a";
+            break;
+        }
+
+        hr = StrAllocConcatFormattedSecure(psczProperties, L" REINSTALLMODE=\"%ls%ls\"", wzReinstallModeOptions, wzFileVersioning);
+        ExitOnFailure(hr, "Failed to add reinstall mode.");
+    }
+
+    hr = StrAllocConcatSecure(psczProperties, L" REBOOT=ReallySuppress", 0);
+    ExitOnFailure(hr, "Failed to add reboot suppression property.");
+
+    if (fIgnoreDependencies)
+    {
+        // Ignore all dependencies, since the Burn engine already performed the check.
+        hr = StrAllocConcatFormattedSecure(psczProperties, L" %ls=ALL", DEPENDENCY_IGNOREDEPENDENCIES);
+        ExitOnFailure(hr, "Failed to add the list of dependencies to ignore to the properties.");
+    }
+
 LExit:
     return hr;
 }
 
-extern "C" HRESULT MsiEngineConcatProperties(
+extern "C" HRESULT MsiEngineConcatPackageProperties(
     __in_ecount(cProperties) BURN_MSIPROPERTY* rgProperties,
     __in DWORD cProperties,
     __in BURN_VARIABLES* pVariables,
@@ -1379,7 +1422,7 @@ LExit:
     return hr;
 }
 
-extern "C" HRESULT MsiEngineCalculateInstallUiLevel(
+extern "C" HRESULT MsiEnginePlanPackageOptions(
     __in BOOTSTRAPPER_DISPLAY display,
     __in BURN_USER_EXPERIENCE* pUserExperience,
     __in LPCWSTR wzPackageId,
@@ -1387,11 +1430,13 @@ extern "C" HRESULT MsiEngineCalculateInstallUiLevel(
     __in BOOTSTRAPPER_ACTION_STATE actionState,
     __out BURN_MSI_PROPERTY* pActionMsiProperty,
     __out INSTALLUILEVEL* pUiLevel,
-    __out BOOL* pfDisableExternalUiHandler
+    __out BOOL* pfDisableExternalUiHandler,
+    __out BOOTSTRAPPER_MSI_FILE_VERSIONING* pFileVersioning
     )
 {
     *pUiLevel = INSTALLUILEVEL_NONE;
     *pfDisableExternalUiHandler = FALSE;
+    *pFileVersioning = BOOTSTRAPPER_MSI_FILE_VERSIONING_MISSING_OR_OLDER;
 
     if (BOOTSTRAPPER_DISPLAY_FULL == display ||
         BOOTSTRAPPER_DISPLAY_PASSIVE == display)
@@ -1406,6 +1451,7 @@ extern "C" HRESULT MsiEngineCalculateInstallUiLevel(
         break;
     case BOOTSTRAPPER_ACTION_STATE_REPAIR:
         *pActionMsiProperty = BURN_MSI_PROPERTY_REPAIR;
+        *pFileVersioning = BOOTSTRAPPER_MSI_FILE_VERSIONING_MISSING_OR_OLDER_OR_EQUAL;
         break;
     case BOOTSTRAPPER_ACTION_STATE_MODIFY:
         *pActionMsiProperty = BURN_MSI_PROPERTY_MODIFY;
@@ -1415,7 +1461,7 @@ extern "C" HRESULT MsiEngineCalculateInstallUiLevel(
         break;
     }
 
-    return UserExperienceOnPlanMsiPackage(pUserExperience, wzPackageId, fExecute, actionState, pActionMsiProperty, pUiLevel, pfDisableExternalUiHandler);
+    return UserExperienceOnPlanMsiPackage(pUserExperience, wzPackageId, fExecute, actionState, pActionMsiProperty, pUiLevel, pfDisableExternalUiHandler, pFileVersioning);
 }
 
 extern "C" void MsiEngineUpdateInstallRegistrationState(
diff --git a/src/burn/engine/msiengine.h b/src/burn/engine/msiengine.h
index 87f47f7c..113bf438 100644
--- a/src/burn/engine/msiengine.h
+++ b/src/burn/engine/msiengine.h
@@ -70,11 +70,15 @@ HRESULT MsiEngineExecutePackage(
     __in LPVOID pvContext,
     __out BOOTSTRAPPER_APPLY_RESTART* pRestart
     );
-HRESULT MsiEngineConcatActionProperty(
+HRESULT MsiEngineConcatBurnProperties(
+    __in BOOTSTRAPPER_ACTION_STATE action,
     __in BURN_MSI_PROPERTY actionMsiProperty,
+    __in BOOTSTRAPPER_MSI_FILE_VERSIONING fileVersioning,
+    __in BOOL fMsiPackage,
+    __in BOOL fFeatureSelectionEnabled,
     __deref_out_z LPWSTR* psczProperties
     );
-HRESULT MsiEngineConcatProperties(
+HRESULT MsiEngineConcatPackageProperties(
     __in_ecount(cProperties) BURN_MSIPROPERTY* rgProperties,
     __in DWORD cProperties,
     __in BURN_VARIABLES* pVariables,
@@ -82,7 +86,7 @@ HRESULT MsiEngineConcatProperties(
     __deref_out_z LPWSTR* psczProperties,
     __in BOOL fObfuscateHiddenVariables
     );
-HRESULT MsiEngineCalculateInstallUiLevel(
+HRESULT MsiEnginePlanPackageOptions(
     __in BOOTSTRAPPER_DISPLAY display,
     __in BURN_USER_EXPERIENCE* pUserExperience,
     __in LPCWSTR wzPackageId,
@@ -90,7 +94,8 @@ HRESULT MsiEngineCalculateInstallUiLevel(
     __in BOOTSTRAPPER_ACTION_STATE actionState,
     __out BURN_MSI_PROPERTY* pActionMsiProperty,
     __out INSTALLUILEVEL* pUiLevel,
-    __out BOOL* pfDisableExternalUiHandler
+    __out BOOL* pfDisableExternalUiHandler,
+    __out BOOTSTRAPPER_MSI_FILE_VERSIONING* pFileVersioning
     );
 void MsiEngineUpdateInstallRegistrationState(
     __in BURN_EXECUTE_ACTION* pAction,
diff --git a/src/burn/engine/mspengine.cpp b/src/burn/engine/mspengine.cpp
index 3d7b5517..a88d0cb2 100644
--- a/src/burn/engine/mspengine.cpp
+++ b/src/burn/engine/mspengine.cpp
@@ -629,16 +629,26 @@ extern "C" HRESULT MspEngineExecutePackage(
     }
 
     // set up properties
-    hr = MsiEngineConcatProperties(pExecuteAction->mspTarget.pPackage->Msp.rgProperties, pExecuteAction->mspTarget.pPackage->Msp.cProperties, pVariables, fRollback, &sczProperties, FALSE);
+    hr = MsiEngineConcatPackageProperties(pExecuteAction->mspTarget.pPackage->Msp.rgProperties, pExecuteAction->mspTarget.pPackage->Msp.cProperties, pVariables, fRollback, &sczProperties, FALSE);
     ExitOnFailure(hr, "Failed to add properties to argument string.");
 
-    hr = MsiEngineConcatProperties(pExecuteAction->mspTarget.pPackage->Msp.rgProperties, pExecuteAction->mspTarget.pPackage->Msp.cProperties, pVariables, fRollback, &sczObfuscatedProperties, TRUE);
+    hr = MsiEngineConcatPackageProperties(pExecuteAction->mspTarget.pPackage->Msp.rgProperties, pExecuteAction->mspTarget.pPackage->Msp.cProperties, pVariables, fRollback, &sczObfuscatedProperties, TRUE);
     ExitOnFailure(hr, "Failed to add properties to obfuscated argument string.");
 
-    hr = MsiEngineConcatActionProperty(pExecuteAction->mspTarget.actionMsiProperty, &sczProperties);
+    if (BOOTSTRAPPER_ACTION_STATE_UNINSTALL != pExecuteAction->mspTarget.action)
+    {
+        hr = StrAllocConcatFormattedSecure(&sczProperties, L" PATCH=\"%ls\"", sczPatches);
+        ExitOnFailure(hr, "Failed to add PATCH property to argument string.");
+
+        hr = StrAllocConcatFormatted(&sczObfuscatedProperties, L" PATCH=\"%ls\"", sczPatches);
+        ExitOnFailure(hr, "Failed to add PATCH property to obfuscated argument string.");
+    }
+
+    // Always add Burn properties last.
+    hr = MsiEngineConcatBurnProperties(pExecuteAction->mspTarget.action, pExecuteAction->mspTarget.actionMsiProperty, pExecuteAction->mspTarget.fileVersioning, FALSE, FALSE, &sczProperties);
     ExitOnFailure(hr, "Failed to add action property to argument string.");
 
-    hr = MsiEngineConcatActionProperty(pExecuteAction->mspTarget.actionMsiProperty, &sczObfuscatedProperties);
+    hr = MsiEngineConcatBurnProperties(pExecuteAction->mspTarget.action, pExecuteAction->mspTarget.actionMsiProperty, pExecuteAction->mspTarget.fileVersioning, FALSE, FALSE, &sczObfuscatedProperties);
     ExitOnFailure(hr, "Failed to add action property to obfuscated argument string.");
 
     LogId(REPORT_STANDARD, MSG_APPLYING_PATCH_PACKAGE, pExecuteAction->mspTarget.pPackage->sczId, LoggingActionStateToString(pExecuteAction->mspTarget.action), sczPatches, sczObfuscatedProperties, pExecuteAction->mspTarget.sczTargetProductCode);
@@ -650,27 +660,11 @@ extern "C" HRESULT MspEngineExecutePackage(
     {
     case BOOTSTRAPPER_ACTION_STATE_INSTALL: __fallthrough;
     case BOOTSTRAPPER_ACTION_STATE_REPAIR:
-        hr = StrAllocConcatSecure(&sczProperties, L" PATCH=\"", 0);
-        ExitOnFailure(hr, "Failed to add PATCH property on install.");
-
-        hr = StrAllocConcatSecure(&sczProperties, sczPatches, 0);
-        ExitOnFailure(hr, "Failed to add patches to PATCH property on install.");
-
-        hr = StrAllocConcatSecure(&sczProperties, L"\" REBOOT=ReallySuppress", 0);
-        ExitOnFailure(hr, "Failed to add reboot suppression property on install.");
-
         hr = WiuConfigureProductEx(pExecuteAction->mspTarget.sczTargetProductCode, INSTALLLEVEL_DEFAULT, INSTALLSTATE_DEFAULT, sczProperties, &restart);
         ExitOnFailure(hr, "Failed to install MSP package.");
         break;
 
     case BOOTSTRAPPER_ACTION_STATE_UNINSTALL:
-        hr = StrAllocConcatSecure(&sczProperties, L" REBOOT=ReallySuppress", 0);
-        ExitOnFailure(hr, "Failed to add reboot suppression property on uninstall.");
-
-        // Ignore all dependencies, since the Burn engine already performed the check.
-        hr = StrAllocFormattedSecure(&sczProperties, L"%ls %ls=ALL", sczProperties, DEPENDENCY_IGNOREDEPENDENCIES);
-        ExitOnFailure(hr, "Failed to add the list of dependencies to ignore to the properties.");
-
         hr = WiuRemovePatches(sczPatches, pExecuteAction->mspTarget.sczTargetProductCode, sczProperties, &restart);
         ExitOnFailure(hr, "Failed to uninstall MSP package.");
         break;
@@ -1128,8 +1122,8 @@ static HRESULT PlanTargetProduct(
         hr = StrAllocString(&pAction->mspTarget.sczTargetProductCode, pTargetProduct->wzTargetProductCode, 0);
         ExitOnFailure(hr, "Failed to copy target product code.");
 
-        hr = MsiEngineCalculateInstallUiLevel(display, pUserExperience, pPackage->sczId, !fRollback, pAction->mspTarget.action,
-            &pAction->mspTarget.actionMsiProperty, &pAction->mspTarget.uiLevel, &pAction->mspTarget.fDisableExternalUiHandler);
+        hr = MsiEnginePlanPackageOptions(display, pUserExperience, pPackage->sczId, !fRollback, pAction->mspTarget.action,
+            &pAction->mspTarget.actionMsiProperty, &pAction->mspTarget.uiLevel, &pAction->mspTarget.fDisableExternalUiHandler, &pAction->mspTarget.fileVersioning);
         ExitOnFailure(hr, "Failed to get msp ui options.");
 
         // If this is a per-machine target product, then the plan needs to be per-machine as well.
diff --git a/src/burn/engine/plan.cpp b/src/burn/engine/plan.cpp
index 58981352..5aad8c9b 100644
--- a/src/burn/engine/plan.cpp
+++ b/src/burn/engine/plan.cpp
@@ -2596,7 +2596,7 @@ static void ExecuteActionLog(
         break;
 
     case BURN_EXECUTE_ACTION_TYPE_MSI_PACKAGE:
-        LogStringLine(PlanDumpLevel, "%ls action[%u]: MSI_PACKAGE package id: %ls, action: %hs, action msi property: %ls, ui level: %u, disable externaluihandler: %ls, log path: %ls, logging attrib: %u", wzBase, iAction, pAction->msiPackage.pPackage->sczId, LoggingActionStateToString(pAction->msiPackage.action), LoggingBurnMsiPropertyToString(pAction->msiPackage.actionMsiProperty), pAction->msiPackage.uiLevel, pAction->msiPackage.fDisableExternalUiHandler ? L"yes" : L"no", pAction->msiPackage.sczLogPath, pAction->msiPackage.dwLoggingAttributes);
+        LogStringLine(PlanDumpLevel, "%ls action[%u]: MSI_PACKAGE package id: %ls, action: %hs, action msi property: %ls, ui level: %u, disable externaluihandler: %hs, file versioning: %hs, log path: %ls, logging attrib: %u", wzBase, iAction, pAction->msiPackage.pPackage->sczId, LoggingActionStateToString(pAction->msiPackage.action), LoggingBurnMsiPropertyToString(pAction->msiPackage.actionMsiProperty), pAction->msiPackage.uiLevel, LoggingBoolToString(pAction->msiPackage.fDisableExternalUiHandler), LoggingMsiFileVersioningToString(pAction->msiPackage.fileVersioning), pAction->msiPackage.sczLogPath, pAction->msiPackage.dwLoggingAttributes);
         for (DWORD j = 0; j < pAction->msiPackage.pPackage->Msi.cSlipstreamMspPackages; ++j)
         {
             const BURN_SLIPSTREAM_MSP* pSlipstreamMsp = pAction->msiPackage.pPackage->Msi.rgSlipstreamMsps + j;
@@ -2605,7 +2605,7 @@ static void ExecuteActionLog(
         break;
 
     case BURN_EXECUTE_ACTION_TYPE_MSP_TARGET:
-        LogStringLine(PlanDumpLevel, "%ls action[%u]: MSP_TARGET package id: %ls, action: %hs, target product code: %ls, target per-machine: %ls, action msi property: %ls, ui level: %u, disable externaluihandler: %ls, log path: %ls", wzBase, iAction, pAction->mspTarget.pPackage->sczId, LoggingActionStateToString(pAction->mspTarget.action), pAction->mspTarget.sczTargetProductCode, pAction->mspTarget.fPerMachineTarget ? L"yes" : L"no", LoggingBurnMsiPropertyToString(pAction->mspTarget.actionMsiProperty), pAction->mspTarget.uiLevel, pAction->mspTarget.fDisableExternalUiHandler ? L"yes" : L"no", pAction->mspTarget.sczLogPath);
+        LogStringLine(PlanDumpLevel, "%ls action[%u]: MSP_TARGET package id: %ls, action: %hs, target product code: %ls, target per-machine: %hs, action msi property: %ls, ui level: %u, disable externaluihandler: %hs, file versioning: %hs, log path: %ls", wzBase, iAction, pAction->mspTarget.pPackage->sczId, LoggingActionStateToString(pAction->mspTarget.action), pAction->mspTarget.sczTargetProductCode, LoggingBoolToString(pAction->mspTarget.fPerMachineTarget), LoggingBurnMsiPropertyToString(pAction->mspTarget.actionMsiProperty), pAction->mspTarget.uiLevel, LoggingBoolToString(pAction->mspTarget.fDisableExternalUiHandler), LoggingMsiFileVersioningToString(pAction->mspTarget.fileVersioning), pAction->mspTarget.sczLogPath);
         for (DWORD j = 0; j < pAction->mspTarget.cOrderedPatches; ++j)
         {
             LogStringLine(PlanDumpLevel, "      Patch[%u]: order: %u, msp package id: %ls", j, pAction->mspTarget.rgOrderedPatches[j].pTargetProduct->dwOrder, pAction->mspTarget.rgOrderedPatches[j].pPackage->sczId);
diff --git a/src/burn/engine/plan.h b/src/burn/engine/plan.h
index b8bb8c3d..b4348cc4 100644
--- a/src/burn/engine/plan.h
+++ b/src/burn/engine/plan.h
@@ -175,6 +175,7 @@ typedef struct _BURN_EXECUTE_ACTION
             INSTALLUILEVEL uiLevel;
             BOOL fDisableExternalUiHandler;
             BOOTSTRAPPER_ACTION_STATE action;
+            BOOTSTRAPPER_MSI_FILE_VERSIONING fileVersioning;
 
             BOOTSTRAPPER_FEATURE_ACTION* rgFeatures;
         } msiPackage;
@@ -190,6 +191,7 @@ typedef struct _BURN_EXECUTE_ACTION
             INSTALLUILEVEL uiLevel;
             BOOL fDisableExternalUiHandler;
             BOOTSTRAPPER_ACTION_STATE action;
+            BOOTSTRAPPER_MSI_FILE_VERSIONING fileVersioning;
 
             BURN_ORDERED_PATCHES* rgOrderedPatches;
             DWORD cOrderedPatches;
diff --git a/src/burn/engine/userexperience.cpp b/src/burn/engine/userexperience.cpp
index c974f4d4..2bd6ecaf 100644
--- a/src/burn/engine/userexperience.cpp
+++ b/src/burn/engine/userexperience.cpp
@@ -104,7 +104,7 @@ extern "C" HRESULT UserExperienceLoad(
     args.pCommand = pCommand;
     args.pfnBootstrapperEngineProc = EngineForApplicationProc;
     args.pvBootstrapperEngineProcContext = pEngineContext;
-    args.qwEngineAPIVersion = MAKEQWORDVERSION(2021, 8, 10, 0);
+    args.qwEngineAPIVersion = MAKEQWORDVERSION(2021, 12, 7, 0);
 
     results.cbSize = sizeof(BOOTSTRAPPER_CREATE_RESULTS);
 
@@ -1896,7 +1896,8 @@ EXTERN_C BAAPI UserExperienceOnPlanMsiPackage(
     __in BOOTSTRAPPER_ACTION_STATE action,
     __inout BURN_MSI_PROPERTY* pActionMsiProperty,
     __inout INSTALLUILEVEL* pUiLevel,
-    __inout BOOL* pfDisableExternalUiHandler
+    __inout BOOL* pfDisableExternalUiHandler,
+    __inout BOOTSTRAPPER_MSI_FILE_VERSIONING* pFileVersioning
     )
 {
     HRESULT hr = S_OK;
@@ -1907,11 +1908,13 @@ EXTERN_C BAAPI UserExperienceOnPlanMsiPackage(
     args.wzPackageId = wzPackageId;
     args.fExecute = fExecute;
     args.action = action;
+    args.recommendedFileVersioning = *pFileVersioning;
 
     results.cbSize = sizeof(results);
     results.actionMsiProperty = *pActionMsiProperty;
     results.uiLevel = *pUiLevel;
     results.fDisableExternalUiHandler = *pfDisableExternalUiHandler;
+    results.fileVersioning = args.recommendedFileVersioning;
 
     hr = SendBAMessage(pUserExperience, BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANMSIPACKAGE, &args, &results);
     ExitOnFailure(hr, "BA OnPlanMsiPackage failed.");
@@ -1923,6 +1926,7 @@ EXTERN_C BAAPI UserExperienceOnPlanMsiPackage(
     *pActionMsiProperty = results.actionMsiProperty;
     *pUiLevel = results.uiLevel;
     *pfDisableExternalUiHandler = results.fDisableExternalUiHandler;
+    *pFileVersioning = results.fileVersioning;
 
 LExit:
     return hr;
diff --git a/src/burn/engine/userexperience.h b/src/burn/engine/userexperience.h
index c2219f7e..2493569b 100644
--- a/src/burn/engine/userexperience.h
+++ b/src/burn/engine/userexperience.h
@@ -440,7 +440,8 @@ BAAPI UserExperienceOnPlanMsiPackage(
     __in BOOTSTRAPPER_ACTION_STATE action,
     __inout BURN_MSI_PROPERTY* pActionMsiProperty,
     __inout INSTALLUILEVEL* pUiLevel,
-    __inout BOOL* pfDisableExternalUiHandler
+    __inout BOOL* pfDisableExternalUiHandler,
+    __inout BOOTSTRAPPER_MSI_FILE_VERSIONING* pFileVersioning
     );
 BAAPI UserExperienceOnPlannedPackage(
     __in BURN_USER_EXPERIENCE* pUserExperience,