Add ability to customize file versioning rules for MsiPackage and MspPackage.

Fixes #5911

4 files changed, 10 insertions, 4 deletions

diff --git a/src/api/burn/balutil/inc/BalBaseBAFunctions.h b/src/api/burn/balutil/inc/BalBaseBAFunctions.h
index 2866f6b0..e45db2dc 100644
--- a/src/api/burn/balutil/inc/BalBaseBAFunctions.h
+++ b/src/api/burn/balutil/inc/BalBaseBAFunctions.h
@@ -303,10 +303,12 @@ public: // IBootstrapperApplication
         __in_z LPCWSTR /*wzPackageId*/,
         __in BOOL /*fExecute*/,
         __in BOOTSTRAPPER_ACTION_STATE /*action*/,
+        __in BOOTSTRAPPER_MSI_FILE_VERSIONING /*recommendedFileVersioning*/,
         __inout BOOL* /*pfCancel*/,
         __inout BURN_MSI_PROPERTY* /*pActionMsiProperty*/,
         __inout INSTALLUILEVEL* /*pUiLevel*/,
-        __inout BOOL* /*pfDisableExternalUiHandler*/
+        __inout BOOL* /*pfDisableExternalUiHandler*/,
+        __inout BOOTSTRAPPER_MSI_FILE_VERSIONING* /*pFileVersioning*/
         )
     {
         return S_OK;
diff --git a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
index 4c07ba89..c10b662c 100644
--- a/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
+++ b/src/api/burn/balutil/inc/BalBaseBootstrapperApplication.h
@@ -319,10 +319,12 @@ public: // IBootstrapperApplication
         __in_z LPCWSTR /*wzPackageId*/,
         __in BOOL /*fExecute*/,
         __in BOOTSTRAPPER_ACTION_STATE /*action*/,
+        __in BOOTSTRAPPER_MSI_FILE_VERSIONING /*recommendedFileVersioning*/,
         __inout BOOL* pfCancel,
         __inout BURN_MSI_PROPERTY* /*pActionMsiProperty*/,
         __inout INSTALLUILEVEL* /*pUiLevel*/,
-        __inout BOOL* /*pfDisableExternalUiHandler*/
+        __inout BOOL* /*pfDisableExternalUiHandler*/,
+        __inout BOOTSTRAPPER_MSI_FILE_VERSIONING* /*pFileVersioning*/
         )
     {
         *pfCancel |= CheckCanceled();
diff --git a/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h b/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h
index d536729f..f17e1fcb 100644
--- a/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h
+++ b/src/api/burn/balutil/inc/BalBaseBootstrapperApplicationProc.h
@@ -510,7 +510,7 @@ static HRESULT BalBaseBAProcOnPlanMsiPackage(
     __inout BA_ONPLANMSIPACKAGE_RESULTS* pResults
     )
 {
-    return pBA->OnPlanMsiPackage(pArgs->wzPackageId, pArgs->fExecute, pArgs->action, &pResults->fCancel, &pResults->actionMsiProperty, &pResults->uiLevel, &pResults->fDisableExternalUiHandler);
+    return pBA->OnPlanMsiPackage(pArgs->wzPackageId, pArgs->fExecute, pArgs->action, pArgs->recommendedFileVersioning, &pResults->fCancel, &pResults->actionMsiProperty, &pResults->uiLevel, &pResults->fDisableExternalUiHandler, &pResults->fileVersioning);
 }
 
 static HRESULT BalBaseBAProcOnBeginMsiTransactionBegin(
diff --git a/src/api/burn/balutil/inc/IBootstrapperApplication.h b/src/api/burn/balutil/inc/IBootstrapperApplication.h
index 51f58ec7..1fc99988 100644
--- a/src/api/burn/balutil/inc/IBootstrapperApplication.h
+++ b/src/api/burn/balutil/inc/IBootstrapperApplication.h
@@ -208,10 +208,12 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
         __in_z LPCWSTR wzPackageId,
         __in BOOL fExecute, // false means rollback.
         __in BOOTSTRAPPER_ACTION_STATE action,
+        __in BOOTSTRAPPER_MSI_FILE_VERSIONING recommendedFileVersioning,
         __inout BOOL* pfCancel,
         __inout BURN_MSI_PROPERTY* pActionMsiProperty,
         __inout INSTALLUILEVEL* pUiLevel,
-        __inout BOOL* pfDisableExternalUiHandler
+        __inout BOOL* pfDisableExternalUiHandler,
+        __inout BOOTSTRAPPER_MSI_FILE_VERSIONING* pFileVersioning
         ) = 0;
 
     // OnPlanPackageComplete - called after the engine has completed getting the BA's input