30 files changed, 244 insertions, 215 deletions

diff --git a/src/WixToolset.Mba.Core/BootstrapperApplication.cs b/src/WixToolset.Mba.Core/BootstrapperApplication.cs
index 0a8f3af8..072d3ef0 100644
--- a/src/WixToolset.Mba.Core/BootstrapperApplication.cs
+++ b/src/WixToolset.Mba.Core/BootstrapperApplication.cs
@@ -1343,9 +1343,9 @@ namespace WixToolset.Mba.Core
             return args.HResult;
         }
 
-        int IBootstrapperApplication.OnDetectPackageComplete(string wzPackageId, int hrStatus, PackageState state)
+        int IBootstrapperApplication.OnDetectPackageComplete(string wzPackageId, int hrStatus, PackageState state, bool fCached)
         {
-            DetectPackageCompleteEventArgs args = new DetectPackageCompleteEventArgs(wzPackageId, hrStatus, state);
+            DetectPackageCompleteEventArgs args = new DetectPackageCompleteEventArgs(wzPackageId, hrStatus, state, fCached);
             this.OnDetectPackageComplete(args);
 
             return args.HResult;
@@ -1378,9 +1378,9 @@ namespace WixToolset.Mba.Core
             return args.HResult;
         }
 
-        int IBootstrapperApplication.OnPlanPackageBegin(string wzPackageId, PackageState state, bool fInstallCondition, RequestState recommendedState, ref RequestState pRequestedState, ref bool fCancel)
+        int IBootstrapperApplication.OnPlanPackageBegin(string wzPackageId, PackageState state, bool fCached, BOOTSTRAPPER_PACKAGE_CONDITION_RESULT installCondition, RequestState recommendedState, BOOTSTRAPPER_CACHE_TYPE recommendedCacheType, ref RequestState pRequestedState, ref BOOTSTRAPPER_CACHE_TYPE pRequestedCacheType, ref bool fCancel)
         {
-            PlanPackageBeginEventArgs args = new PlanPackageBeginEventArgs(wzPackageId, state, fInstallCondition, recommendedState, pRequestedState, fCancel);
+            PlanPackageBeginEventArgs args = new PlanPackageBeginEventArgs(wzPackageId, state, fCached, installCondition, recommendedState, recommendedCacheType, pRequestedState, pRequestedCacheType, fCancel);
             this.OnPlanPackageBegin(args);
 
             pRequestedState = args.State;
@@ -1428,9 +1428,9 @@ namespace WixToolset.Mba.Core
             return args.HResult;
         }
 
-        int IBootstrapperApplication.OnPlannedPackage(string wzPackageId, ActionState execute, ActionState rollback)
+        int IBootstrapperApplication.OnPlannedPackage(string wzPackageId, ActionState execute, ActionState rollback, bool fPlannedCache, bool fPlannedUncache)
         {
-            var args = new PlannedPackageEventArgs(wzPackageId, execute, rollback);
+            var args = new PlannedPackageEventArgs(wzPackageId, execute, rollback, fPlannedCache, fPlannedUncache);
             this.OnPlannedPackage(args);
 
             return args.HResult;
diff --git a/src/WixToolset.Mba.Core/Engine.cs b/src/WixToolset.Mba.Core/Engine.cs
index e07ecd8b..aed420d5 100644
--- a/src/WixToolset.Mba.Core/Engine.cs
+++ b/src/WixToolset.Mba.Core/Engine.cs
@@ -62,7 +62,7 @@ namespace WixToolset.Mba.Core
         /// <inheritdoc/>
         public bool ContainsVariable(string name)
         {
-            int capacity = 0;
+            IntPtr capacity = new IntPtr(0);
             int ret = this.engine.GetVariableString(name, IntPtr.Zero, ref capacity);
             return NativeMethods.E_NOTFOUND != ret;
         }
@@ -101,14 +101,15 @@ namespace WixToolset.Mba.Core
         /// <inheritdoc/>
         public string EscapeString(string input)
         {
-            int capacity = InitialBufferSize;
-            StringBuilder sb = new StringBuilder(capacity);
+            IntPtr capacity = new IntPtr(InitialBufferSize);
+            StringBuilder sb = new StringBuilder(capacity.ToInt32());
 
             // Get the size of the buffer.
             int ret = this.engine.EscapeString(input, sb, ref capacity);
             if (NativeMethods.E_INSUFFICIENT_BUFFER == ret || NativeMethods.E_MOREDATA == ret)
             {
-                sb.Capacity = ++capacity; // Add one for the null terminator.
+                capacity = new IntPtr(capacity.ToInt32() + 1); // Add one for the null terminator.
+                sb.Capacity = capacity.ToInt32();
                 ret = this.engine.EscapeString(input, sb, ref capacity);
             }
 
@@ -132,14 +133,15 @@ namespace WixToolset.Mba.Core
         /// <inheritdoc/>
         public string FormatString(string format)
         {
-            int capacity = InitialBufferSize;
-            StringBuilder sb = new StringBuilder(capacity);
+            IntPtr capacity = new IntPtr(InitialBufferSize);
+            StringBuilder sb = new StringBuilder(capacity.ToInt32());
 
             // Get the size of the buffer.
             int ret = this.engine.FormatString(format, sb, ref capacity);
             if (NativeMethods.E_INSUFFICIENT_BUFFER == ret || NativeMethods.E_MOREDATA == ret)
             {
-                sb.Capacity = ++capacity; // Add one for the null terminator.
+                capacity = new IntPtr(capacity.ToInt32() + 1); // Add one for the null terminator.
+                sb.Capacity = capacity.ToInt32();
                 ret = this.engine.FormatString(format, sb, ref capacity);
             }
 
@@ -343,9 +345,9 @@ namespace WixToolset.Mba.Core
         /// <exception cref="Exception">An error occurred getting the variable.</exception>
         internal IntPtr getStringVariable(string name, out int length)
         {
-            int capacity = InitialBufferSize;
+            IntPtr capacity = new IntPtr(InitialBufferSize);
             bool success = false;
-            IntPtr pValue = Marshal.AllocCoTaskMem(capacity * UnicodeEncoding.CharSize);
+            IntPtr pValue = Marshal.AllocCoTaskMem(capacity.ToInt32() * UnicodeEncoding.CharSize);
             try
             {
                 // Get the size of the buffer.
@@ -353,7 +355,7 @@ namespace WixToolset.Mba.Core
                 if (NativeMethods.E_INSUFFICIENT_BUFFER == ret || NativeMethods.E_MOREDATA == ret)
                 {
                     // Don't need to add 1 for the null terminator, the engine already includes that.
-                    pValue = Marshal.ReAllocCoTaskMem(pValue, capacity * UnicodeEncoding.CharSize);
+                    pValue = Marshal.ReAllocCoTaskMem(pValue, capacity.ToInt32() * UnicodeEncoding.CharSize);
                     ret = this.engine.GetVariableString(name, pValue, ref capacity);
                 }
 
@@ -363,9 +365,10 @@ namespace WixToolset.Mba.Core
                 }
 
                 // The engine only returns the exact length of the string if the buffer was too small, so calculate it ourselves.
-                for (length = 0; length < capacity; ++length)
+                int maxLength = capacity.ToInt32();
+                for (length = 0; length < maxLength; ++length)
                 {
-                    if(0 == Marshal.ReadInt16(pValue, length * UnicodeEncoding.CharSize))
+                    if (0 == Marshal.ReadInt16(pValue, length * UnicodeEncoding.CharSize))
                     {
                         break;
                     }
@@ -392,9 +395,9 @@ namespace WixToolset.Mba.Core
         /// <exception cref="Exception">An error occurred getting the variable.</exception>
         internal IntPtr getVersionVariable(string name, out int length)
         {
-            int capacity = InitialBufferSize;
+            IntPtr capacity = new IntPtr(InitialBufferSize);
             bool success = false;
-            IntPtr pValue = Marshal.AllocCoTaskMem(capacity * UnicodeEncoding.CharSize);
+            IntPtr pValue = Marshal.AllocCoTaskMem(capacity.ToInt32() * UnicodeEncoding.CharSize);
             try
             {
                 // Get the size of the buffer.
@@ -402,7 +405,7 @@ namespace WixToolset.Mba.Core
                 if (NativeMethods.E_INSUFFICIENT_BUFFER == ret || NativeMethods.E_MOREDATA == ret)
                 {
                     // Don't need to add 1 for the null terminator, the engine already includes that.
-                    pValue = Marshal.ReAllocCoTaskMem(pValue, capacity * UnicodeEncoding.CharSize);
+                    pValue = Marshal.ReAllocCoTaskMem(pValue, capacity.ToInt32() * UnicodeEncoding.CharSize);
                     ret = this.engine.GetVariableVersion(name, pValue, ref capacity);
                 }
 
@@ -412,7 +415,8 @@ namespace WixToolset.Mba.Core
                 }
 
                 // The engine only returns the exact length of the string if the buffer was too small, so calculate it ourselves.
-                for (length = 0; length < capacity; ++length)
+                int maxLength = capacity.ToInt32();
+                for (length = 0; length < maxLength; ++length)
                 {
                     if (0 == Marshal.ReadInt16(pValue, length * UnicodeEncoding.CharSize))
                     {
diff --git a/src/WixToolset.Mba.Core/EventArgs.cs b/src/WixToolset.Mba.Core/EventArgs.cs
index e64f6d2c..8ef8af14 100644
--- a/src/WixToolset.Mba.Core/EventArgs.cs
+++ b/src/WixToolset.Mba.Core/EventArgs.cs
@@ -617,22 +617,18 @@ namespace WixToolset.Mba.Core
     }
 
     /// <summary>
-    /// Additional arguments used when the detection for a specific package has completed.
+    /// Additional arguments for <see cref="IDefaultBootstrapperApplication.DetectPackageComplete"/>.
     /// </summary>
     [Serializable]
     public class DetectPackageCompleteEventArgs : StatusEventArgs
     {
-        /// <summary>
-        /// Creates a new instance of the <see cref="DetectPackageCompleteEventArgs"/> class.
-        /// </summary>
-        /// <param name="packageId">The identity of the package detected.</param>
-        /// <param name="hrStatus">The return code of the operation.</param>
-        /// <param name="state">The state of the specified package.</param>
-        public DetectPackageCompleteEventArgs(string packageId, int hrStatus, PackageState state)
+        /// <summary />
+        public DetectPackageCompleteEventArgs(string packageId, int hrStatus, PackageState state, bool cached)
             : base(hrStatus)
         {
             this.PackageId = packageId;
             this.State = state;
+            this.Cached = cached;
         }
 
         /// <summary>
@@ -644,6 +640,11 @@ namespace WixToolset.Mba.Core
         /// Gets the state of the specified package.
         /// </summary>
         public PackageState State { get; private set; }
+
+        /// <summary>
+        /// Gets whether any part of the package is cached.
+        /// </summary>
+        public bool Cached { get; private set; }
     }
 
     /// <summary>
@@ -725,23 +726,18 @@ namespace WixToolset.Mba.Core
     [Serializable]
     public class PlanPackageBeginEventArgs : CancellableHResultEventArgs
     {
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="packageId"></param>
-        /// <param name="currentState"></param>
-        /// <param name="installCondition"></param>
-        /// <param name="recommendedState"></param>
-        /// <param name="state"></param>
-        /// <param name="cancelRecommendation"></param>
-        public PlanPackageBeginEventArgs(string packageId, PackageState currentState, bool installCondition, RequestState recommendedState, RequestState state, bool cancelRecommendation)
+        /// <summary />
+        public PlanPackageBeginEventArgs(string packageId, PackageState currentState, bool cached, BOOTSTRAPPER_PACKAGE_CONDITION_RESULT installCondition, RequestState recommendedState, BOOTSTRAPPER_CACHE_TYPE recommendedCacheType, RequestState state, BOOTSTRAPPER_CACHE_TYPE cacheType, bool cancelRecommendation)
             : base(cancelRecommendation)
         {
             this.PackageId = packageId;
             this.CurrentState = currentState;
+            this.Cached = cached;
             this.InstallCondition = installCondition;
             this.RecommendedState = recommendedState;
+            this.RecommendedCacheType = recommendedCacheType;
             this.State = state;
+            this.CacheType = cacheType;
         }
 
         /// <summary>
@@ -755,9 +751,14 @@ namespace WixToolset.Mba.Core
         public PackageState CurrentState { get; private set; }
 
         /// <summary>
+        /// Gets whether any part of the package is cached.
+        /// </summary>
+        public bool Cached { get; private set; }
+
+        /// <summary>
         /// Gets the evaluated result of the package's install condition.
         /// </summary>
-        public bool InstallCondition { get; private set; }
+        public BOOTSTRAPPER_PACKAGE_CONDITION_RESULT InstallCondition { get; private set; }
 
         /// <summary>
         /// Gets the recommended requested state for the package.
@@ -765,9 +766,19 @@ namespace WixToolset.Mba.Core
         public RequestState RecommendedState { get; private set; }
 
         /// <summary>
+        /// The authored cache type of the package.
+        /// </summary>
+        public BOOTSTRAPPER_CACHE_TYPE RecommendedCacheType { get; private set; }
+
+        /// <summary>
         /// Gets or sets the requested state for the package.
         /// </summary>
         public RequestState State { get; set; }
+
+        /// <summary>
+        /// Gets or sets the requested cache type for the package.
+        /// </summary>
+        public BOOTSTRAPPER_CACHE_TYPE CacheType { get; set; }
     }
 
     /// <summary>
@@ -936,17 +947,14 @@ namespace WixToolset.Mba.Core
     [Serializable]
     public class PlannedPackageEventArgs : HResultEventArgs
     {
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="packageId"></param>
-        /// <param name="execute"></param>
-        /// <param name="rollback"></param>
-        public PlannedPackageEventArgs(string packageId, ActionState execute, ActionState rollback)
+        /// <summary />
+        public PlannedPackageEventArgs(string packageId, ActionState execute, ActionState rollback, bool cache, bool uncache)
         {
             this.PackageId = packageId;
             this.Execute = execute;
             this.Rollback = rollback;
+            this.Cache = cache;
+            this.Uncache = uncache;
         }
 
         /// <summary>
@@ -963,6 +971,16 @@ namespace WixToolset.Mba.Core
         /// Gets the planned rollback action.
         /// </summary>
         public ActionState Rollback { get; private set; }
+
+        /// <summary>
+        /// Gets whether the package will be cached.
+        /// </summary>
+        public bool Cache { get; private set; }
+
+        /// <summary>
+        /// Gets whether the package will be removed from the package cache.
+        /// </summary>
+        public bool Uncache { get; private set; }
     }
 
     /// <summary>
diff --git a/src/WixToolset.Mba.Core/IBootstrapperApplication.cs b/src/WixToolset.Mba.Core/IBootstrapperApplication.cs
index 2195fd4b..530fb1a9 100644
--- a/src/WixToolset.Mba.Core/IBootstrapperApplication.cs
+++ b/src/WixToolset.Mba.Core/IBootstrapperApplication.cs
@@ -251,16 +251,13 @@ namespace WixToolset.Mba.Core
         /// <summary>
         /// See <see cref="IDefaultBootstrapperApplication.DetectPackageComplete"/>.
         /// </summary>
-        /// <param name="wzPackageId"></param>
-        /// <param name="hrStatus"></param>
-        /// <param name="state"></param>
-        /// <returns></returns>
         [PreserveSig]
         [return: MarshalAs(UnmanagedType.I4)]
         int OnDetectPackageComplete(
             [MarshalAs(UnmanagedType.LPWStr)] string wzPackageId,
             int hrStatus,
-            [MarshalAs(UnmanagedType.U4)] PackageState state
+            [MarshalAs(UnmanagedType.U4)] PackageState state,
+            [MarshalAs(UnmanagedType.Bool)] bool fCached
             );
 
         /// <summary>
@@ -309,21 +306,17 @@ namespace WixToolset.Mba.Core
         /// <summary>
         /// See <see cref="IDefaultBootstrapperApplication.PlanPackageBegin"/>.
         /// </summary>
-        /// <param name="wzPackageId"></param>
-        /// <param name="state"></param>
-        /// <param name="fInstallCondition"></param>
-        /// <param name="recommendedState"></param>
-        /// <param name="pRequestedState"></param>
-        /// <param name="fCancel"></param>
-        /// <returns></returns>
         [PreserveSig]
         [return: MarshalAs(UnmanagedType.I4)]
         int OnPlanPackageBegin(
             [MarshalAs(UnmanagedType.LPWStr)] string wzPackageId,
             [MarshalAs(UnmanagedType.U4)] PackageState state,
-            [MarshalAs(UnmanagedType.Bool)] bool fInstallCondition,
+            [MarshalAs(UnmanagedType.Bool)] bool fCached,
+            [MarshalAs(UnmanagedType.U4)] BOOTSTRAPPER_PACKAGE_CONDITION_RESULT installCondition,
             [MarshalAs(UnmanagedType.U4)] RequestState recommendedState,
+            [MarshalAs(UnmanagedType.U4)] BOOTSTRAPPER_CACHE_TYPE recommendedCacheType,
             [MarshalAs(UnmanagedType.U4)] ref RequestState pRequestedState,
+            [MarshalAs(UnmanagedType.U4)] ref BOOTSTRAPPER_CACHE_TYPE pRequestedCacheType,
             [MarshalAs(UnmanagedType.Bool)] ref bool fCancel
             );
 
@@ -406,16 +399,14 @@ namespace WixToolset.Mba.Core
         /// <summary>
         /// See <see cref="IDefaultBootstrapperApplication.PlannedPackage"/>.
         /// </summary>
-        /// <param name="wzPackageId"></param>
-        /// <param name="execute"></param>
-        /// <param name="rollback"></param>
-        /// <returns></returns>
         [PreserveSig]
         [return: MarshalAs(UnmanagedType.I4)]
         int OnPlannedPackage(
             [MarshalAs(UnmanagedType.LPWStr)] string wzPackageId,
             [MarshalAs(UnmanagedType.U4)] ActionState execute,
-            [MarshalAs(UnmanagedType.U4)] ActionState rollback
+            [MarshalAs(UnmanagedType.U4)] ActionState rollback,
+            [MarshalAs(UnmanagedType.Bool)] bool fPlannedCache,
+            [MarshalAs(UnmanagedType.Bool)] bool fPlannedUncache
             );
 
         /// <summary>
@@ -1642,6 +1633,27 @@ namespace WixToolset.Mba.Core
     }
 
     /// <summary>
+    /// The cache strategy to be used for the package.
+    /// </summary>
+    public enum BOOTSTRAPPER_CACHE_TYPE
+    {
+        /// <summary>
+        /// The package will be cached in order to securely run the package, but will always be cleaned from the cache at the end.
+        /// </summary>
+        Remove,
+
+        /// <summary>
+        /// The package will be cached in order to run the package, and then kept in the cache until the package is uninstalled.
+        /// </summary>
+        Keep,
+
+        /// <summary>
+        /// The package will always be cached and stay in the cache, unless the package and bundle are both being uninstalled.
+        /// </summary>
+        Force,
+    }
+
+    /// <summary>
     /// The available actions for <see cref="IDefaultBootstrapperApplication.CacheAcquireComplete"/>.
     /// </summary>
     public enum BOOTSTRAPPER_CACHEACQUIRECOMPLETE_ACTION
@@ -1737,6 +1749,27 @@ namespace WixToolset.Mba.Core
     }
 
     /// <summary>
+    /// The result of evaluating a condition from a package.
+    /// </summary>
+    public enum BOOTSTRAPPER_PACKAGE_CONDITION_RESULT
+    {
+        /// <summary>
+        /// No condition was authored.
+        /// </summary>
+        Default,
+
+        /// <summary>
+        /// Evaluated to false.
+        /// </summary>
+        False,
+
+        /// <summary>
+        /// Evaluated to true.
+        /// </summary>
+        True,
+    }
+
+    /// <summary>
     /// The available actions for <see cref="IDefaultBootstrapperApplication.CacheAcquireResolving"/>.
     /// </summary>
     public enum BOOTSTRAPPER_RESOLVESOURCE_ACTION
diff --git a/src/WixToolset.Mba.Core/IBootstrapperEngine.cs b/src/WixToolset.Mba.Core/IBootstrapperEngine.cs
index 78753a42..4e19bf0f 100644
--- a/src/WixToolset.Mba.Core/IBootstrapperEngine.cs
+++ b/src/WixToolset.Mba.Core/IBootstrapperEngine.cs
@@ -39,57 +39,41 @@ namespace WixToolset.Mba.Core
         /// <summary>
         /// See <see cref="IEngine.GetVariableString(string)"/>.
         /// </summary>
-        /// <param name="wzVariable"></param>
-        /// <param name="wzValue"></param>
-        /// <param name="pcchValue"></param>
-        /// <returns></returns>
         [PreserveSig]
         int GetVariableString(
             [MarshalAs(UnmanagedType.LPWStr)] string wzVariable,
                                               IntPtr wzValue,
-            [MarshalAs(UnmanagedType.U4)] ref int pcchValue
+                                          ref IntPtr pcchValue
             );
 
         /// <summary>
         /// See <see cref="IEngine.GetVariableVersion(string)"/>.
         /// </summary>
-        /// <param name="wzVariable"></param>
-        /// <param name="wzValue"></param>
-        /// <param name="pcchValue"></param>
-        /// <returns></returns>
         [PreserveSig]
         int GetVariableVersion(
             [MarshalAs(UnmanagedType.LPWStr)] string wzVariable,
                                               IntPtr wzValue,
-            [MarshalAs(UnmanagedType.U4)] ref int pcchValue
+                                          ref IntPtr pcchValue
             );
 
         /// <summary>
         /// See <see cref="IEngine.FormatString(string)"/>.
         /// </summary>
-        /// <param name="wzIn"></param>
-        /// <param name="wzOut"></param>
-        /// <param name="pcchOut"></param>
-        /// <returns></returns>
         [PreserveSig]
         int FormatString(
             [MarshalAs(UnmanagedType.LPWStr)] string wzIn,
             [MarshalAs(UnmanagedType.LPWStr), Out] StringBuilder wzOut,
-            [MarshalAs(UnmanagedType.U4)] ref int pcchOut
+            ref IntPtr pcchOut
             );
 
         /// <summary>
         /// See <see cref="IEngine.EscapeString(string)"/>.
         /// </summary>
-        /// <param name="wzIn"></param>
-        /// <param name="wzOut"></param>
-        /// <param name="pcchOut"></param>
-        /// <returns></returns>
         [PreserveSig]
         int EscapeString(
             [MarshalAs(UnmanagedType.LPWStr)] string wzIn,
             [MarshalAs(UnmanagedType.LPWStr), Out] StringBuilder wzOut,
-            [MarshalAs(UnmanagedType.U4)] ref int pcchOut
+            ref IntPtr pcchOut
             );
 
         /// <summary>
diff --git a/src/WixToolset.Mba.Core/IPackageInfo.cs b/src/WixToolset.Mba.Core/IPackageInfo.cs
index 0d7e549e..a1d99b10 100644
--- a/src/WixToolset.Mba.Core/IPackageInfo.cs
+++ b/src/WixToolset.Mba.Core/IPackageInfo.cs
@@ -10,7 +10,7 @@ namespace WixToolset.Mba.Core
         /// <summary>
         /// 
         /// </summary>
-        CacheType CacheType { get; }
+        BOOTSTRAPPER_CACHE_TYPE CacheType { get; }
 
         /// <summary>
         /// Place for the BA to store it's own custom data for this package.
diff --git a/src/WixToolset.Mba.Core/PackageInfo.cs b/src/WixToolset.Mba.Core/PackageInfo.cs
index 75a0fd53..567a7cdd 100644
--- a/src/WixToolset.Mba.Core/PackageInfo.cs
+++ b/src/WixToolset.Mba.Core/PackageInfo.cs
@@ -10,27 +10,6 @@ namespace WixToolset.Mba.Core
     /// <summary>
     /// 
     /// </summary>
-    public enum CacheType
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        No,
-
-        /// <summary>
-        /// 
-        /// </summary>
-        Yes,
-
-        /// <summary>
-        /// 
-        /// </summary>
-        Always,
-    }
-
-    /// <summary>
-    /// 
-    /// </summary>
     public enum PackageType
     {
         /// <summary>
@@ -113,7 +92,7 @@ namespace WixToolset.Mba.Core
         public string InstallCondition { get; internal set; }
 
         /// <inheritdoc/>
-        public CacheType CacheType { get; internal set; }
+        public BOOTSTRAPPER_CACHE_TYPE CacheType { get; internal set; }
 
         /// <inheritdoc/>
         public bool PrereqPackage { get; internal set; }
@@ -198,7 +177,7 @@ namespace WixToolset.Mba.Core
         /// <param name="node"></param>
         /// <param name="attributeName"></param>
         /// <returns></returns>
-        public static CacheType? GetCacheTypeAttribute(XPathNavigator node, string attributeName)
+        public static BOOTSTRAPPER_CACHE_TYPE? GetCacheTypeAttribute(XPathNavigator node, string attributeName)
         {
             string attributeValue = BootstrapperApplicationData.GetAttribute(node, attributeName);
 
@@ -207,17 +186,17 @@ namespace WixToolset.Mba.Core
                 return null;
             }
 
-            if (attributeValue.Equals("yes", StringComparison.InvariantCulture))
+            if (attributeValue.Equals("keep", StringComparison.InvariantCulture))
             {
-                return CacheType.Yes;
+                return BOOTSTRAPPER_CACHE_TYPE.Keep;
             }
-            else if (attributeValue.Equals("always", StringComparison.InvariantCulture))
+            else if (attributeValue.Equals("force", StringComparison.InvariantCulture))
             {
-                return CacheType.Always;
+                return BOOTSTRAPPER_CACHE_TYPE.Force;
             }
             else
             {
-                return CacheType.No;
+                return BOOTSTRAPPER_CACHE_TYPE.Remove;
             }
         }
 
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
diff --git a/src/bextutil/BextBundleExtensionEngine.cpp b/src/bextutil/BextBundleExtensionEngine.cpp
index 9906a7f5..6043e2db 100644
--- a/src/bextutil/BextBundleExtensionEngine.cpp
+++ b/src/bextutil/BextBundleExtensionEngine.cpp
@@ -56,7 +56,7 @@ public: // IBundleExtensionEngine
     virtual STDMETHODIMP EscapeString(
         __in_z LPCWSTR wzIn,
         __out_ecount_opt(*pcchOut) LPWSTR wzOut,
-        __inout DWORD* pcchOut
+        __inout SIZE_T* pcchOut
         )
     {
         HRESULT hr = S_OK;
@@ -107,7 +107,7 @@ public: // IBundleExtensionEngine
     virtual STDMETHODIMP FormatString(
         __in_z LPCWSTR wzIn,
         __out_ecount_opt(*pcchOut) LPWSTR wzOut,
-        __inout DWORD* pcchOut
+        __inout SIZE_T* pcchOut
         )
     {
         HRESULT hr = S_OK;
@@ -159,7 +159,7 @@ public: // IBundleExtensionEngine
     virtual STDMETHODIMP GetVariableString(
         __in_z LPCWSTR wzVariable,
         __out_ecount_opt(*pcchValue) LPWSTR wzValue,
-        __inout DWORD* pcchValue
+        __inout SIZE_T* pcchValue
         )
     {
         HRESULT hr = S_OK;
@@ -186,7 +186,7 @@ public: // IBundleExtensionEngine
     virtual STDMETHODIMP GetVariableVersion(
         __in_z LPCWSTR wzVariable,
         __out_ecount_opt(*pcchValue) LPWSTR wzValue,
-        __inout DWORD* pcchValue
+        __inout SIZE_T* pcchValue
         )
     {
         HRESULT hr = S_OK;
diff --git a/src/bextutil/bextutil.vcxproj b/src/bextutil/bextutil.vcxproj
index c8671f3b..b3ce96ba 100644
--- a/src/bextutil/bextutil.vcxproj
+++ b/src/bextutil/bextutil.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">
@@ -87,8 +87,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/bextutil/inc/IBundleExtensionEngine.h b/src/bextutil/inc/IBundleExtensionEngine.h
index a96e3812..63dadb06 100644
--- a/src/bextutil/inc/IBundleExtensionEngine.h
+++ b/src/bextutil/inc/IBundleExtensionEngine.h
@@ -7,18 +7,18 @@ DECLARE_INTERFACE_IID_(IBundleExtensionEngine, IUnknown, "9D027A39-F6B6-42CC-973
     STDMETHOD(EscapeString)(
         __in_z LPCWSTR wzIn,
         __out_ecount_opt(*pcchOut) LPWSTR wzOut,
-        __inout DWORD * pcchOut
+        __inout SIZE_T* pcchOut
         ) = 0;
 
     STDMETHOD(EvaluateCondition)(
         __in_z LPCWSTR wzCondition,
-        __out BOOL * pf
+        __out BOOL* pf
         ) = 0;
 
     STDMETHOD(FormatString)(
         __in_z LPCWSTR wzIn,
         __out_ecount_opt(*pcchOut) LPWSTR wzOut,
-        __inout DWORD * pcchOut
+        __inout SIZE_T* pcchOut
         ) = 0;
 
     STDMETHOD(GetVariableNumeric)(
@@ -29,13 +29,13 @@ DECLARE_INTERFACE_IID_(IBundleExtensionEngine, IUnknown, "9D027A39-F6B6-42CC-973
     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(Log)(
diff --git a/src/bextutil/packages.config b/src/bextutil/packages.config
index de70fed1..08ea3364 100644
--- a/src/bextutil/packages.config
+++ b/src/bextutil/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
diff --git a/src/mbanative/mbanative.vcxproj b/src/mbanative/mbanative.vcxproj
index 729d5df2..f91fe3be 100644
--- a/src/mbanative/mbanative.vcxproj
+++ b/src/mbanative/mbanative.vcxproj
@@ -2,11 +2,11 @@
 <!-- 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.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\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
   <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
   <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.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.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">
@@ -96,7 +96,7 @@
     <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
     <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />
     <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.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.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.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\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/mbanative/packages.config b/src/mbanative/packages.config
index b5ba712e..745fcae9 100644
--- a/src/mbanative/packages.config
+++ b/src/mbanative/packages.config
@@ -4,6 +4,6 @@
   <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
   <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
   <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
diff --git a/src/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj b/src/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj
index 95d7ed5f..b7bbd77d 100644
--- a/src/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj
+++ b/src/test/BalUtilUnitTest/BalUtilUnitTest.vcxproj
@@ -3,9 +3,9 @@
 
 
 <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\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.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\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.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|Win32">
       <Configuration>Debug</Configuration>
@@ -50,10 +50,10 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="WixBuildTools.TestSupport">
-      <HintPath>..\..\..\packages\WixBuildTools.TestSupport.4.0.47\lib\net472\WixBuildTools.TestSupport.dll</HintPath>
+      <HintPath>..\..\..\packages\WixBuildTools.TestSupport.4.0.50\lib\net472\WixBuildTools.TestSupport.dll</HintPath>
     </Reference>
     <Reference Include="WixBuildTools.TestSupport.Native">
-      <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath>
+      <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -62,14 +62,14 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets')" />
+  <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <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\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props'))" />
-    <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets'))" />
-    <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.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\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets'))" />
+    <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\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/test/BalUtilUnitTest/packages.config b/src/test/BalUtilUnitTest/packages.config
index 49b76211..6d381fbe 100644
--- a/src/test/BalUtilUnitTest/packages.config
+++ b/src/test/BalUtilUnitTest/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-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. -->
 <packages>
-  <package id="WixBuildTools.TestSupport" version="4.0.47" />
-  <package id="WixBuildTools.TestSupport.Native" version="4.0.47" />
-  <package id="WixToolset.BootstrapperCore.Native" version="4.0.132" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.70" targetFramework="native" />
+  <package id="WixBuildTools.TestSupport" version="4.0.50" />
+  <package id="WixBuildTools.TestSupport.Native" version="4.0.50" />
+  <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" />
   <package id="xunit.abstractions" version="2.0.3" />
   <package id="xunit.assert" version="2.4.1" />
   <package id="xunit.core" version="2.4.1" />
diff --git a/src/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj b/src/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj
index 886e3c2c..f45b9b83 100644
--- a/src/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj
+++ b/src/test/BextUtilUnitTest/BextUtilUnitTest.vcxproj
@@ -3,9 +3,9 @@
 
 
 <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\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.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\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.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|Win32">
       <Configuration>Debug</Configuration>
@@ -49,10 +49,10 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="WixBuildTools.TestSupport">
-      <HintPath>..\..\..\packages\WixBuildTools.TestSupport.4.0.47\lib\net472\WixBuildTools.TestSupport.dll</HintPath>
+      <HintPath>..\..\..\packages\WixBuildTools.TestSupport.4.0.50\lib\net472\WixBuildTools.TestSupport.dll</HintPath>
     </Reference>
     <Reference Include="WixBuildTools.TestSupport.Native">
-      <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath>
+      <HintPath>..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\lib\net472\WixBuildTools.TestSupport.Native.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -61,14 +61,14 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets')" />
+  <Import Project="..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets" Condition="Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <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\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.props'))" />
-    <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.47\build\WixBuildTools.TestSupport.Native.targets'))" />
-    <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.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\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixBuildTools.TestSupport.Native.4.0.50\build\WixBuildTools.TestSupport.Native.targets'))" />
+    <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\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/test/BextUtilUnitTest/packages.config b/src/test/BextUtilUnitTest/packages.config
index 49b76211..6d381fbe 100644
--- a/src/test/BextUtilUnitTest/packages.config
+++ b/src/test/BextUtilUnitTest/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-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. -->
 <packages>
-  <package id="WixBuildTools.TestSupport" version="4.0.47" />
-  <package id="WixBuildTools.TestSupport.Native" version="4.0.47" />
-  <package id="WixToolset.BootstrapperCore.Native" version="4.0.132" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.70" targetFramework="native" />
+  <package id="WixBuildTools.TestSupport" version="4.0.50" />
+  <package id="WixBuildTools.TestSupport.Native" version="4.0.50" />
+  <package id="WixToolset.BootstrapperCore.Native" version="4.0.141" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" />
   <package id="xunit.abstractions" version="2.0.3" />
   <package id="xunit.assert" version="2.4.1" />
   <package id="xunit.core" version="2.4.1" />