diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-12-07 17:34:09 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-12-08 17:14:11 -0600 |
commit | 19d85eed389fbd964f64c2fbb85e40ec20439d26 (patch) | |
tree | 29adf2c191ea8a50153238ee457ff34f0d73d059 /src/ext | |
parent | 5c7b1a8fa2b02ddd758c0c267f59b7e77b527f62 (diff) | |
download | wix-19d85eed389fbd964f64c2fbb85e40ec20439d26.tar.gz wix-19d85eed389fbd964f64c2fbb85e40ec20439d26.tar.bz2 wix-19d85eed389fbd964f64c2fbb85e40ec20439d26.zip |
Add ability to customize file versioning rules for MsiPackage and MspPackage.
Fixes #5911
Diffstat (limited to 'src/ext')
-rw-r--r-- | src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp index 6a8bb2b8..abf5af83 100644 --- a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp | |||
@@ -462,10 +462,12 @@ public: // IBootstrapperApplication | |||
462 | __in_z LPCWSTR wzPackageId, | 462 | __in_z LPCWSTR wzPackageId, |
463 | __in BOOL fExecute, | 463 | __in BOOL fExecute, |
464 | __in BOOTSTRAPPER_ACTION_STATE action, | 464 | __in BOOTSTRAPPER_ACTION_STATE action, |
465 | __in BOOTSTRAPPER_MSI_FILE_VERSIONING recommendedFileVersioning, | ||
465 | __inout BOOL* pfCancel, | 466 | __inout BOOL* pfCancel, |
466 | __inout BURN_MSI_PROPERTY* pActionMsiProperty, | 467 | __inout BURN_MSI_PROPERTY* pActionMsiProperty, |
467 | __inout INSTALLUILEVEL* pUiLevel, | 468 | __inout INSTALLUILEVEL* pUiLevel, |
468 | __inout BOOL* pfDisableExternalUiHandler | 469 | __inout BOOL* pfDisableExternalUiHandler, |
470 | __inout BOOTSTRAPPER_MSI_FILE_VERSIONING* pFileVersioning | ||
469 | ) | 471 | ) |
470 | { | 472 | { |
471 | HRESULT hr = S_OK; | 473 | HRESULT hr = S_OK; |
@@ -501,7 +503,7 @@ public: // IBootstrapperApplication | |||
501 | } | 503 | } |
502 | 504 | ||
503 | LExit: | 505 | LExit: |
504 | return __super::OnPlanMsiPackage(wzPackageId, fExecute, action, pfCancel, pActionMsiProperty, pUiLevel, pfDisableExternalUiHandler); | 506 | return __super::OnPlanMsiPackage(wzPackageId, fExecute, action, recommendedFileVersioning, pfCancel, pActionMsiProperty, pUiLevel, pfDisableExternalUiHandler, pFileVersioning); |
505 | } | 507 | } |
506 | 508 | ||
507 | 509 | ||