Integrate size_t and OnPlanPackageBegin changes in Burn headers.

13 files changed, 62 insertions, 51 deletions

diff --git a/src/balutil/BalBootstrapperEngine.cpp b/src/balutil/BalBootstrapperEngine.cpp
index dda98cb9..301b88a5 100644
--- a/src/balutil/BalBootstrapperEngine.cpp
+++ b/src/balutil/BalBootstrapperEngine.cpp
@@ -107,7 +107,7 @@ public: // IBootstrapperEngine
     virtual STDMETHODIMP GetVariableString(
         __in_z LPCWSTR wzVariable,
         __out_ecount_opt(*pcchValue) LPWSTR wzValue,
-        __inout DWORD* pcchValue
+        __inout SIZE_T* pcchValue
         )
     {
         HRESULT hr = S_OK;
@@ -134,7 +134,7 @@ public: // IBootstrapperEngine
     virtual STDMETHODIMP GetVariableVersion(
         __in_z LPCWSTR wzVariable,
         __out_ecount_opt(*pcchValue) LPWSTR wzValue,
-        __inout DWORD* pcchValue
+        __inout SIZE_T* pcchValue
         )
     {
         HRESULT hr = S_OK;
@@ -161,7 +161,7 @@ public: // IBootstrapperEngine
     virtual STDMETHODIMP FormatString(
         __in_z LPCWSTR wzIn,
         __out_ecount_opt(*pcchOut) LPWSTR wzOut,
-        __inout DWORD* pcchOut
+        __inout SIZE_T* pcchOut
         )
     {
         HRESULT hr = S_OK;
@@ -188,7 +188,7 @@ public: // IBootstrapperEngine
     virtual STDMETHODIMP EscapeString(
         __in_z LPCWSTR wzIn,
         __out_ecount_opt(*pcchOut) LPWSTR wzOut,
-        __inout DWORD* pcchOut
+        __inout SIZE_T* pcchOut
         )
     {
         HRESULT hr = S_OK;
@@ -485,7 +485,7 @@ public: // IBootstrapperEngine
     }
 
     virtual STDMETHODIMP Apply(
-        __in_opt HWND hwndParent
+        __in HWND hwndParent
         )
     {
         BAENGINE_APPLY_ARGS args = { };
diff --git a/src/balutil/balcondition.cpp b/src/balutil/balcondition.cpp
index 11d3e218..8b05508f 100644
--- a/src/balutil/balcondition.cpp
+++ b/src/balutil/balcondition.cpp
@@ -78,7 +78,7 @@ DAPI_(HRESULT) BalConditionEvaluate(
     )
 {
     HRESULT hr = S_OK;
-    DWORD_PTR cchMessage = 0;
+    SIZE_T cchMessage = 0;
 
     hr = pEngine->EvaluateCondition(pCondition->sczCondition, pfResult);
     ExitOnFailure(hr, "Failed to evaluate condition with bootstrapper engine.");
@@ -91,7 +91,7 @@ DAPI_(HRESULT) BalConditionEvaluate(
             ExitOnFailure(hr, "Failed to get length of message.");
         }
 
-        hr = pEngine->FormatString(pCondition->sczMessage, *psczMessage, reinterpret_cast<DWORD*>(&cchMessage));
+        hr = pEngine->FormatString(pCondition->sczMessage, *psczMessage, &cchMessage);
         if (E_MOREDATA == hr)
         {
             ++cchMessage;
@@ -99,7 +99,7 @@ DAPI_(HRESULT) BalConditionEvaluate(
             hr = StrAllocSecure(psczMessage, cchMessage);
             ExitOnFailure(hr, "Failed to allocate string for condition's formatted message.");
 
-            hr = pEngine->FormatString(pCondition->sczMessage, *psczMessage, reinterpret_cast<DWORD*>(&cchMessage));
+            hr = pEngine->FormatString(pCondition->sczMessage, *psczMessage, &cchMessage);
         }
         ExitOnFailure(hr, "Failed to format condition's message.");
     }
diff --git a/src/balutil/balinfo.cpp b/src/balutil/balinfo.cpp
index 492c8e08..3abb9286 100644
--- a/src/balutil/balinfo.cpp
+++ b/src/balutil/balinfo.cpp
@@ -261,17 +261,17 @@ static HRESULT ParsePackagesFromXml(
         hr = XmlGetAttributeEx(pNode, L"Cache", &scz);
         ExitOnFailure(hr, "Failed to get cache type for package.");
 
-        if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, scz, -1, L"no", -1))
+        if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, scz, -1, L"remove", -1))
         {
-            prgPackages[iPackage].cacheType = BAL_INFO_CACHE_TYPE_NO;
+            prgPackages[iPackage].cacheType = BOOTSTRAPPER_CACHE_TYPE_REMOVE;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, scz, -1, L"yes", -1))
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, scz, -1, L"keep", -1))
         {
-            prgPackages[iPackage].cacheType = BAL_INFO_CACHE_TYPE_YES;
+            prgPackages[iPackage].cacheType = BOOTSTRAPPER_CACHE_TYPE_KEEP;
         }
-        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, scz, -1, L"always", -1))
+        else if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, scz, -1, L"force", -1))
         {
-            prgPackages[iPackage].cacheType = BAL_INFO_CACHE_TYPE_ALWAYS;
+            prgPackages[iPackage].cacheType = BOOTSTRAPPER_CACHE_TYPE_FORCE;
         }
 
         ++iPackage;
diff --git a/src/balutil/balutil.cpp b/src/balutil/balutil.cpp
index faca70f5..7a638219 100644
--- a/src/balutil/balutil.cpp
+++ b/src/balutil/balutil.cpp
@@ -96,7 +96,7 @@ DAPI_(HRESULT) BalFormatString(
     )
 {
     HRESULT hr = S_OK;
-    DWORD cch = 0;
+    SIZE_T cch = 0;
 
     if (!vpEngine)
     {
@@ -106,7 +106,7 @@ DAPI_(HRESULT) BalFormatString(
 
     if (*psczOut)
     {
-        hr = StrMaxLength(*psczOut, reinterpret_cast<DWORD_PTR*>(&cch));
+        hr = StrMaxLength(*psczOut, &cch);
         ExitOnFailure(hr, "Failed to determine length of value.");
     }
 
@@ -172,7 +172,7 @@ DAPI_(BOOL) BalVariableExists(
     )
 {
     HRESULT hr = S_OK;
-    DWORD cch = 0;
+    SIZE_T cch = 0;
 
     if (!vpEngine)
     {
@@ -194,7 +194,7 @@ DAPI_(HRESULT) BalGetStringVariable(
     )
 {
     HRESULT hr = S_OK;
-    DWORD cch = 0;
+    SIZE_T cch = 0;
 
     if (!vpEngine)
     {
@@ -204,7 +204,7 @@ DAPI_(HRESULT) BalGetStringVariable(
 
     if (*psczValue)
     {
-        hr = StrMaxLength(*psczValue, reinterpret_cast<DWORD_PTR*>(&cch));
+        hr = StrMaxLength(*psczValue, &cch);
         ExitOnFailure(hr, "Failed to determine length of value.");
     }
 
diff --git a/src/balutil/balutil.vcxproj b/src/balutil/balutil.vcxproj
index a47e994f..73153d5e 100644
--- a/src/balutil/balutil.vcxproj
+++ b/src/balutil/balutil.vcxproj
@@ -2,8 +2,8 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props')" />
-  <Import Project="..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" />
 
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
@@ -98,8 +98,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.70\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" />
     <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.132\build\WixToolset.BootstrapperCore.Native.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.141\build\WixToolset.BootstrapperCore.Native.props'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/balutil/inc/BalBaseBAFunctions.h b/src/balutil/inc/BalBaseBAFunctions.h
index 054bfb26..ee2e452f 100644
--- a/src/balutil/inc/BalBaseBAFunctions.h
+++ b/src/balutil/inc/BalBaseBAFunctions.h
@@ -222,7 +222,8 @@ public: // IBootstrapperApplication
     virtual STDMETHODIMP OnDetectPackageComplete(
         __in_z LPCWSTR /*wzPackageId*/,
         __in HRESULT /*hrStatus*/,
-        __in BOOTSTRAPPER_PACKAGE_STATE /*state*/
+        __in BOOTSTRAPPER_PACKAGE_STATE /*state*/,
+        __in BOOL /*fCached*/
         )
     {
         return S_OK;
@@ -257,9 +258,12 @@ public: // IBootstrapperApplication
     virtual STDMETHODIMP OnPlanPackageBegin(
         __in_z LPCWSTR /*wzPackageId*/,
         __in BOOTSTRAPPER_PACKAGE_STATE /*state*/,
-        __in BOOL /*fInstallCondition*/,
+        __in BOOL /*fCached*/,
+        __in BOOTSTRAPPER_PACKAGE_CONDITION_RESULT /*installCondition*/,
         __in BOOTSTRAPPER_REQUEST_STATE /*recommendedState*/,
+        __in BOOTSTRAPPER_CACHE_TYPE /*recommendedCacheType*/,
         __inout BOOTSTRAPPER_REQUEST_STATE* /*pRequestState*/,
+        __inout BOOTSTRAPPER_CACHE_TYPE* /*pRequestedCacheType*/,
         __inout BOOL* /*pfCancel*/
         )
     {
@@ -313,7 +317,9 @@ public: // IBootstrapperApplication
     virtual STDMETHODIMP OnPlannedPackage(
         __in_z LPCWSTR /*wzPackageId*/,
         __in BOOTSTRAPPER_ACTION_STATE /*execute*/,
-        __in BOOTSTRAPPER_ACTION_STATE /*rollback*/
+        __in BOOTSTRAPPER_ACTION_STATE /*rollback*/,
+        __in BOOL /*fPlannedCache*/,
+        __in BOOL /*fPlannedUncache*/
         )
     {
         return S_OK;
diff --git a/src/balutil/inc/BalBaseBootstrapperApplication.h b/src/balutil/inc/BalBaseBootstrapperApplication.h
index 812025eb..bf21c4a5 100644
--- a/src/balutil/inc/BalBaseBootstrapperApplication.h
+++ b/src/balutil/inc/BalBaseBootstrapperApplication.h
@@ -228,7 +228,8 @@ public: // IBootstrapperApplication
     virtual STDMETHODIMP OnDetectPackageComplete(
         __in_z LPCWSTR /*wzPackageId*/,
         __in HRESULT /*hrStatus*/,
-        __in BOOTSTRAPPER_PACKAGE_STATE /*state*/
+        __in BOOTSTRAPPER_PACKAGE_STATE /*state*/,
+        __in BOOL /*fCached*/
         )
     {
         return S_OK;
@@ -265,9 +266,12 @@ public: // IBootstrapperApplication
     virtual STDMETHODIMP OnPlanPackageBegin(
         __in_z LPCWSTR /*wzPackageId*/,
         __in BOOTSTRAPPER_PACKAGE_STATE /*state*/,
-        __in BOOL /*fInstallCondition*/,
+        __in BOOL /*fCached*/,
+        __in BOOTSTRAPPER_PACKAGE_CONDITION_RESULT /*installCondition*/,
         __in BOOTSTRAPPER_REQUEST_STATE /*recommendedState*/,
+        __in BOOTSTRAPPER_CACHE_TYPE /*recommendedCacheType*/,
         __inout BOOTSTRAPPER_REQUEST_STATE* /*pRequestState*/,
+        __inout BOOTSTRAPPER_CACHE_TYPE* /*pRequestedCacheType*/,
         __inout BOOL* pfCancel
         )
     {
@@ -325,7 +329,9 @@ public: // IBootstrapperApplication
     virtual STDMETHODIMP OnPlannedPackage(
         __in_z LPCWSTR /*wzPackageId*/,
         __in BOOTSTRAPPER_ACTION_STATE /*execute*/,
-        __in BOOTSTRAPPER_ACTION_STATE /*rollback*/
+        __in BOOTSTRAPPER_ACTION_STATE /*rollback*/,
+        __in BOOL /*fPlannedCache*/,
+        __in BOOL /*fPlannedUncache*/
         )
     {
         return S_OK;
diff --git a/src/balutil/inc/BalBaseBootstrapperApplicationProc.h b/src/balutil/inc/BalBaseBootstrapperApplicationProc.h
index 10769529..7fe3ffd8 100644
--- a/src/balutil/inc/BalBaseBootstrapperApplicationProc.h
+++ b/src/balutil/inc/BalBaseBootstrapperApplicationProc.h
@@ -159,7 +159,7 @@ static HRESULT BalBaseBAProcOnDetectPackageComplete(
     __inout BA_ONDETECTPACKAGECOMPLETE_RESULTS* /*pResults*/
     )
 {
-    return pBA->OnDetectPackageComplete(pArgs->wzPackageId, pArgs->hrStatus, pArgs->state);
+    return pBA->OnDetectPackageComplete(pArgs->wzPackageId, pArgs->hrStatus, pArgs->state, pArgs->fCached);
 }
 
 static HRESULT BalBaseBAProcOnPlanRelatedBundle(
@@ -177,7 +177,7 @@ static HRESULT BalBaseBAProcOnPlanPackageBegin(
     __inout BA_ONPLANPACKAGEBEGIN_RESULTS* pResults
     )
 {
-    return pBA->OnPlanPackageBegin(pArgs->wzPackageId, pArgs->state, pArgs->fInstallCondition, pArgs->recommendedState, &pResults->requestedState, &pResults->fCancel);
+    return pBA->OnPlanPackageBegin(pArgs->wzPackageId, pArgs->state, pArgs->fCached, pArgs->installCondition, pArgs->recommendedState, pArgs->recommendedCacheType, &pResults->requestedState, &pResults->requestedCacheType, &pResults->fCancel);
 }
 
 static HRESULT BalBaseBAProcOnPlanPatchTarget(
@@ -213,7 +213,7 @@ static HRESULT BalBaseBAProcOnPlannedPackage(
     __inout BA_ONPLANNEDPACKAGE_RESULTS* /*pResults*/
     )
 {
-    return pBA->OnPlannedPackage(pArgs->wzPackageId, pArgs->execute, pArgs->rollback);
+    return pBA->OnPlannedPackage(pArgs->wzPackageId, pArgs->execute, pArgs->rollback, pArgs->fPlannedCache, pArgs->fPlannedUncache);
 }
 
 static HRESULT BalBaseBAProcOnApplyBegin(
diff --git a/src/balutil/inc/IBootstrapperApplication.h b/src/balutil/inc/IBootstrapperApplication.h
index 7d6a7164..c284cb49 100644
--- a/src/balutil/inc/IBootstrapperApplication.h
+++ b/src/balutil/inc/IBootstrapperApplication.h
@@ -135,7 +135,8 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
     STDMETHOD(OnDetectPackageComplete)(
         __in_z LPCWSTR wzPackageId,
         __in HRESULT hrStatus,
-        __in BOOTSTRAPPER_PACKAGE_STATE state
+        __in BOOTSTRAPPER_PACKAGE_STATE state,
+        __in BOOL fCached
         ) = 0;
 
     // OnDetectPackageComplete - called after the engine completes detection.
@@ -164,9 +165,12 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
     STDMETHOD(OnPlanPackageBegin)(
         __in_z LPCWSTR wzPackageId,
         __in BOOTSTRAPPER_PACKAGE_STATE state,
-        __in BOOL fInstallCondition,
+        __in BOOL fCached,
+        __in BOOTSTRAPPER_PACKAGE_CONDITION_RESULT installCondition,
         __in BOOTSTRAPPER_REQUEST_STATE recommendedState,
+        __in BOOTSTRAPPER_CACHE_TYPE recommendedCacheType,
         __inout BOOTSTRAPPER_REQUEST_STATE* pRequestedState,
+        __inout BOOTSTRAPPER_CACHE_TYPE* pRequestedCacheType,
         __inout BOOL* pfCancel
         ) = 0;
 
@@ -214,7 +218,9 @@ DECLARE_INTERFACE_IID_(IBootstrapperApplication, IUnknown, "53C31D56-49C0-426B-A
     STDMETHOD(OnPlannedPackage)(
         __in_z LPCWSTR wzPackageId,
         __in BOOTSTRAPPER_ACTION_STATE execute,
-        __in BOOTSTRAPPER_ACTION_STATE rollback
+        __in BOOTSTRAPPER_ACTION_STATE rollback,
+        __in BOOL fPlannedCache,
+        __in BOOL fPlannedUncache
         ) = 0;
 
     // OnPlanComplete - called when the engine completes planning.
diff --git a/src/balutil/inc/IBootstrapperEngine.h b/src/balutil/inc/IBootstrapperEngine.h
index af6379f4..ccb07f4f 100644
--- a/src/balutil/inc/IBootstrapperEngine.h
+++ b/src/balutil/inc/IBootstrapperEngine.h
@@ -16,25 +16,25 @@ DECLARE_INTERFACE_IID_(IBootstrapperEngine, IUnknown, "6480D616-27A0-44D7-905B-8
     STDMETHOD(GetVariableString)(
         __in_z LPCWSTR wzVariable,
         __out_ecount_opt(*pcchValue) LPWSTR wzValue,
-        __inout DWORD* pcchValue
+        __inout SIZE_T* pcchValue
         ) = 0;
 
     STDMETHOD(GetVariableVersion)(
         __in_z LPCWSTR wzVariable,
         __out_ecount_opt(*pcchValue) LPWSTR wzValue,
-        __inout DWORD* pcchValue
+        __inout SIZE_T * pcchValue
         ) = 0;
 
     STDMETHOD(FormatString)(
         __in_z LPCWSTR wzIn,
         __out_ecount_opt(*pcchOut) LPWSTR wzOut,
-        __inout DWORD* pcchOut
+        __inout SIZE_T * pcchOut
         ) = 0;
 
     STDMETHOD(EscapeString)(
         __in_z LPCWSTR wzIn,
         __out_ecount_opt(*pcchOut) LPWSTR wzOut,
-        __inout DWORD* pcchOut
+        __inout SIZE_T * pcchOut
         ) = 0;
 
     STDMETHOD(EvaluateCondition)(
@@ -114,7 +114,7 @@ DECLARE_INTERFACE_IID_(IBootstrapperEngine, IUnknown, "6480D616-27A0-44D7-905B-8
         ) = 0;
 
     STDMETHOD(Apply)(
-        __in_opt HWND hwndParent
+        __in HWND hwndParent
         ) = 0;
 
     STDMETHOD(Quit)(
diff --git a/src/balutil/inc/balinfo.h b/src/balutil/inc/balinfo.h
index 0d838ae3..8c2155e9 100644
--- a/src/balutil/inc/balinfo.h
+++ b/src/balutil/inc/balinfo.h
@@ -18,13 +18,6 @@ typedef enum BAL_INFO_PACKAGE_TYPE
     BAL_INFO_PACKAGE_TYPE_BUNDLE_PATCH,
 } BAL_INFO_PACKAGE_TYPE;
 
-typedef enum BAL_INFO_CACHE_TYPE
-{
-    BAL_INFO_CACHE_TYPE_NO,
-    BAL_INFO_CACHE_TYPE_YES,
-    BAL_INFO_CACHE_TYPE_ALWAYS,
-} BAL_INFO_CACHE_TYPE;
-
 
 typedef struct _BAL_INFO_PACKAGE
 {
@@ -39,7 +32,7 @@ typedef struct _BAL_INFO_PACKAGE
     LPWSTR sczUpgradeCode;
     LPWSTR sczVersion;
     LPWSTR sczInstallCondition;
-    BAL_INFO_CACHE_TYPE cacheType;
+    BOOTSTRAPPER_CACHE_TYPE cacheType;
     BOOL fPrereqPackage;
     LPWSTR sczPrereqLicenseFile;
     LPWSTR sczPrereqLicenseUrl;
diff --git a/src/balutil/inc/balutil.h b/src/balutil/inc/balutil.h
index affa4925..fad8a471 100644
--- a/src/balutil/inc/balutil.h
+++ b/src/balutil/inc/balutil.h
@@ -51,7 +51,7 @@ DAPI_(void) BalInitialize(
 ********************************************************************/
 DAPI_(HRESULT) BalInitializeFromCreateArgs(
     __in const BOOTSTRAPPER_CREATE_ARGS* pArgs,
-    __out IBootstrapperEngine** ppEngine
+    __out_opt IBootstrapperEngine** ppEngine
     );
 
 /*******************************************************************
diff --git a/src/balutil/packages.config b/src/balutil/packages.config
index de70fed1..08ea3364 100644
--- a/src/balutil/packages.config
+++ b/src/balutil/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
-  <package id="WixToolset.BootstrapperCore.Native" version="4.0.132" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.70" targetFramework="native" />
+  <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" />
 </packages>
\ No newline at end of file