Upgrade to latest dutil as first step for x64 and ARM64

19 files changed, 44 insertions, 44 deletions

diff --git a/src/engine/elevation.cpp b/src/engine/elevation.cpp
index af5610dc..94418dc3 100644
--- a/src/engine/elevation.cpp
+++ b/src/engine/elevation.cpp
@@ -865,7 +865,7 @@ extern "C" HRESULT ElevationExecuteMsiPackage(
     hr = BuffWriteString(&pbData, &cbData, pExecuteAction->msiPackage.pPackage->sczId);
     ExitOnFailure(hr, "Failed to write package id to message buffer.");
 
-    hr = BuffWriteNumber(&pbData, &cbData, (DWORD)hwndParent);
+    hr = BuffWritePointer(&pbData, &cbData, (DWORD_PTR)hwndParent);
     ExitOnFailure(hr, "Failed to write parent hwnd to message buffer.");
 
     hr = BuffWriteString(&pbData, &cbData, pExecuteAction->msiPackage.sczLogPath);
@@ -944,7 +944,7 @@ extern "C" HRESULT ElevationExecuteMspPackage(
     hr = BuffWriteString(&pbData, &cbData, pExecuteAction->mspTarget.pPackage->sczId);
     ExitOnFailure(hr, "Failed to write package id to message buffer.");
 
-    hr = BuffWriteNumber(&pbData, &cbData, (DWORD)hwndParent);
+    hr = BuffWritePointer(&pbData, &cbData, (DWORD_PTR)hwndParent);
     ExitOnFailure(hr, "Failed to write parent hwnd to message buffer.");
 
     hr = BuffWriteString(&pbData, &cbData, pExecuteAction->mspTarget.sczTargetProductCode);
@@ -2322,7 +2322,7 @@ static HRESULT OnExecuteMsiPackage(
     hr = PackageFindById(pPackages, sczPackage, &executeAction.msiPackage.pPackage);
     ExitOnFailure(hr, "Failed to find package: %ls", sczPackage);
 
-    hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)&hwndParent);
+    hr = BuffReadPointer(pbData, cbData, &iData, (DWORD_PTR*)&hwndParent);
     ExitOnFailure(hr, "Failed to read parent hwnd.");
 
     hr = BuffReadString(pbData, cbData, &iData, &executeAction.msiPackage.sczLogPath);
@@ -2420,7 +2420,7 @@ static HRESULT OnExecuteMspPackage(
     hr = PackageFindById(pPackages, sczPackage, &executeAction.mspTarget.pPackage);
     ExitOnFailure(hr, "Failed to find package: %ls", sczPackage);
 
-    hr = BuffReadNumber(pbData, cbData, &iData, (DWORD*)&hwndParent);
+    hr = BuffReadPointer(pbData, cbData, &iData, (DWORD_PTR*)&hwndParent);
     ExitOnFailure(hr, "Failed to read parent hwnd.");
 
     executeAction.mspTarget.fPerMachineTarget = TRUE; // we're in the elevated process, clearly we're targeting a per-machine product.
diff --git a/src/engine/embedded.cpp b/src/engine/embedded.cpp
index 09666980..b512b365 100644
--- a/src/engine/embedded.cpp
+++ b/src/engine/embedded.cpp
@@ -147,7 +147,7 @@ static HRESULT OnEmbeddedErrorMessage(
     )
 {
     HRESULT hr = S_OK;
-    DWORD iData = 0;
+    SIZE_T iData = 0;
     GENERIC_EXECUTE_MESSAGE message = { };
     LPWSTR sczMessage = NULL;
 
@@ -181,7 +181,7 @@ static HRESULT OnEmbeddedProgress(
     )
 {
     HRESULT hr = S_OK;
-    DWORD iData = 0;
+    SIZE_T iData = 0;
     GENERIC_EXECUTE_MESSAGE message = { };
 
     message.type = GENERIC_EXECUTE_MESSAGE_PROGRESS;
diff --git a/src/engine/engine.vcxproj b/src/engine/engine.vcxproj
index 3624d923..d62105ed 100644
--- a/src/engine/engine.vcxproj
+++ b/src/engine/engine.vcxproj
@@ -2,7 +2,7 @@
 <!-- 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.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" />
 
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -174,7 +174,7 @@ rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command>
     <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.56\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.59\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'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/engine/externalengine.cpp b/src/engine/externalengine.cpp
index 3d5b3696..39878c8b 100644
--- a/src/engine/externalengine.cpp
+++ b/src/engine/externalengine.cpp
@@ -194,7 +194,7 @@ HRESULT ExternalEngineSendEmbeddedError(
 {
     HRESULT hr = S_OK;
     BYTE* pbData = NULL;
-    DWORD cbData = 0;
+    SIZE_T cbData = 0;
     DWORD dwResult = *pnResult = 0;
 
     if (BURN_MODE_EMBEDDED != pEngineState->mode)
@@ -232,7 +232,7 @@ HRESULT ExternalEngineSendEmbeddedProgress(
 {
     HRESULT hr = S_OK;
     BYTE* pbData = NULL;
-    DWORD cbData = 0;
+    SIZE_T cbData = 0;
     DWORD dwResult = *pnResult = 0;
 
     if (BURN_MODE_EMBEDDED != pEngineState->mode)
diff --git a/src/engine/packages.config b/src/engine/packages.config
index dc425a64..f074ae43 100644
--- a/src/engine/packages.config
+++ b/src/engine/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
-  <package id="WixToolset.DUtil" version="4.0.56" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.59" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/engine/pipe.cpp b/src/engine/pipe.cpp
index 7ecc4859..eb3eb863 100644
--- a/src/engine/pipe.cpp
+++ b/src/engine/pipe.cpp
@@ -12,9 +12,9 @@ static const LPCWSTR CACHE_PIPE_NAME_FORMAT_STRING = L"\\\\.\\pipe\\%ls.Cache";
 static HRESULT AllocatePipeMessage(
     __in DWORD dwMessage,
     __in_bcount_opt(cbData) LPVOID pvData,
-    __in DWORD cbData,
+    __in SIZE_T cbData,
     __out_bcount(cb) LPVOID* ppvMessage,
-    __out DWORD* cbMessage
+    __out SIZE_T* cbMessage
     );
 static void FreePipeMessage(
     __in BURN_PIPE_MESSAGE *pMsg
@@ -23,7 +23,7 @@ static HRESULT WritePipeMessage(
     __in HANDLE hPipe,
     __in DWORD dwMessage,
     __in_bcount_opt(cbData) LPVOID pvData,
-    __in DWORD cbData
+    __in SIZE_T cbData
     );
 static HRESULT GetPipeMessage(
     __in HANDLE hPipe,
@@ -77,7 +77,7 @@ extern "C" HRESULT PipeSendMessage(
     __in HANDLE hPipe,
     __in DWORD dwMessage,
     __in_bcount_opt(cbData) LPVOID pvData,
-    __in DWORD cbData,
+    __in SIZE_T cbData,
     __in_opt PFN_PIPE_MESSAGE_CALLBACK pfnCallback,
     __in_opt LPVOID pvContext,
     __out DWORD* pdwResult
@@ -665,14 +665,14 @@ LExit:
 static HRESULT AllocatePipeMessage(
     __in DWORD dwMessage,
     __in_bcount_opt(cbData) LPVOID pvData,
-    __in DWORD cbData,
+    __in SIZE_T cbData,
     __out_bcount(cb) LPVOID* ppvMessage,
-    __out DWORD* cbMessage
+    __out SIZE_T* cbMessage
     )
 {
     HRESULT hr = S_OK;
     LPVOID pv = NULL;
-    DWORD cb = 0;
+    SIZE_T cb = 0;
 
     // If no data was provided, ensure the count of bytes is zero.
     if (!pvData)
@@ -716,22 +716,22 @@ static HRESULT WritePipeMessage(
     __in HANDLE hPipe,
     __in DWORD dwMessage,
     __in_bcount_opt(cbData) LPVOID pvData,
-    __in DWORD cbData
+    __in SIZE_T cbData
     )
 {
     HRESULT hr = S_OK;
     LPVOID pv = NULL;
-    DWORD cb = 0;
+    SIZE_T cb = 0;
 
     hr = AllocatePipeMessage(dwMessage, pvData, cbData, &pv, &cb);
     ExitOnFailure(hr, "Failed to allocate message to write.");
 
     // Write the message.
     DWORD cbWrote = 0;
-    DWORD cbTotalWritten = 0;
+    SIZE_T cbTotalWritten = 0;
     while (cbTotalWritten < cb)
     {
-        if (!::WriteFile(hPipe, pv, cb - cbTotalWritten, &cbWrote, NULL))
+        if (!::WriteFile(hPipe, pv, (DWORD)(cb - cbTotalWritten), &cbWrote, NULL))
         {
             ExitWithLastError(hr, "Failed to write message type to pipe.");
         }
diff --git a/src/engine/pipe.h b/src/engine/pipe.h
index b6a7742a..085c3a76 100644
--- a/src/engine/pipe.h
+++ b/src/engine/pipe.h
@@ -17,7 +17,7 @@ typedef struct _BURN_PIPE_CONNECTION
     HANDLE hCachePipe;
 } BURN_PIPE_CONNECTION;
 
-typedef enum _BURN_PIPE_MESSAGE_TYPE
+typedef enum _BURN_PIPE_MESSAGE_TYPE : DWORD
 {
     BURN_PIPE_MESSAGE_TYPE_LOG = 0xF0000001,
     BURN_PIPE_MESSAGE_TYPE_COMPLETE = 0xF0000002,
@@ -58,7 +58,7 @@ HRESULT PipeSendMessage(
     __in HANDLE hPipe,
     __in DWORD dwMessage,
     __in_bcount_opt(cbData) LPVOID pvData,
-    __in DWORD cbData,
+    __in SIZE_T cbData,
     __in_opt PFN_PIPE_MESSAGE_CALLBACK pfnCallback,
     __in_opt LPVOID pvContext,
     __out DWORD* pdwResult
diff --git a/src/engine/registration.cpp b/src/engine/registration.cpp
index 4e8c810d..d3732e74 100644
--- a/src/engine/registration.cpp
+++ b/src/engine/registration.cpp
@@ -982,7 +982,7 @@ LExit:
 extern "C" HRESULT RegistrationLoadState(
     __in BURN_REGISTRATION* pRegistration,
     __out_bcount(*pcbBuffer) BYTE** ppbBuffer,
-    __out DWORD* pcbBuffer
+    __out SIZE_T* pcbBuffer
     )
 {
     // read data from file
diff --git a/src/engine/registration.h b/src/engine/registration.h
index fa7be368..dc9bc5b7 100644
--- a/src/engine/registration.h
+++ b/src/engine/registration.h
@@ -196,12 +196,12 @@ HRESULT RegistrationSessionEnd(
 HRESULT RegistrationSaveState(
     __in BURN_REGISTRATION* pRegistration,
     __in_bcount_opt(cbBuffer) BYTE* pbBuffer,
-    __in_opt DWORD cbBuffer
+    __in_opt SIZE_T cbBuffer
     );
 HRESULT RegistrationLoadState(
     __in BURN_REGISTRATION* pRegistration,
     __out_bcount(*pcbBuffer) BYTE** ppbBuffer,
-    __out DWORD* pcbBuffer
+    __out SIZE_T* pcbBuffer
     );
 HRESULT RegistrationGetResumeCommandLine(
     __in const BURN_REGISTRATION* pRegistration,
diff --git a/src/engine/section.cpp b/src/engine/section.cpp
index 3adcdd14..3720155c 100644
--- a/src/engine/section.cpp
+++ b/src/engine/section.cpp
@@ -51,7 +51,7 @@ extern "C" HRESULT SectionInitialize(
     DWORD dwSignatureOffset = 0;
     DWORD cbSignature = 0;
     IMAGE_SECTION_HEADER sectionHeader = { };
-    DWORD dwOriginalChecksumAndSignatureOffset = 0;
+    DWORD_PTR dwOriginalChecksumAndSignatureOffset = 0;
     BURN_SECTION_HEADER* pBurnSectionHeader = NULL;
 
     pSection->hEngineFile = hEngineFile;
diff --git a/src/engine/section.h b/src/engine/section.h
index 78331469..6c62ba44 100644
--- a/src/engine/section.h
+++ b/src/engine/section.h
@@ -20,7 +20,7 @@ typedef struct _BURN_SECTION
 
     DWORD dwChecksumOffset;
     DWORD dwCertificateTableOffset;
-    DWORD dwOriginalChecksumAndSignatureOffset;
+    DWORD_PTR dwOriginalChecksumAndSignatureOffset;
 
     DWORD dwOriginalChecksum;
     DWORD dwOriginalSignatureOffset;
diff --git a/src/engine/splashscreen.cpp b/src/engine/splashscreen.cpp
index cad8c88c..90bd5203 100644
--- a/src/engine/splashscreen.cpp
+++ b/src/engine/splashscreen.cpp
@@ -196,7 +196,7 @@ static LRESULT CALLBACK WndProc(
     )
 {
     LRESULT lres = 0;
-    SPLASHSCREEN_INFO* pSplashScreen = reinterpret_cast<SPLASHSCREEN_INFO*>(::GetWindowLongW(hWnd, GWLP_USERDATA));
+    SPLASHSCREEN_INFO* pSplashScreen = reinterpret_cast<SPLASHSCREEN_INFO*>(::GetWindowLongPtrW(hWnd, GWLP_USERDATA));
 
     switch (uMsg)
     {
diff --git a/src/engine/uithread.cpp b/src/engine/uithread.cpp
index cf111745..39f92142 100644
--- a/src/engine/uithread.cpp
+++ b/src/engine/uithread.cpp
@@ -196,7 +196,7 @@ static LRESULT CALLBACK WndProc(
         BOOL fRet = FALSE;
 
         // Always block shutdown in the elevated process, but ask the BA in the non-elevated.
-        UITHREAD_INFO* pInfo = reinterpret_cast<UITHREAD_INFO*>(::GetWindowLongW(hWnd, GWLP_USERDATA));
+        UITHREAD_INFO* pInfo = reinterpret_cast<UITHREAD_INFO*>(::GetWindowLongPtrW(hWnd, GWLP_USERDATA));
         if (!pInfo->fElevated)
         {
             // TODO: instead of recommending canceling all non-critical shutdowns, maybe we should only recommend cancel
diff --git a/src/engine/variable.cpp b/src/engine/variable.cpp
index 4bf73a9b..ea84752d 100644
--- a/src/engine/variable.cpp
+++ b/src/engine/variable.cpp
@@ -53,7 +53,7 @@ static HRESULT FormatString(
     __in BURN_VARIABLES* pVariables,
     __in_z LPCWSTR wzIn,
     __out_z_opt LPWSTR* psczOut,
-    __out_opt DWORD* pcchOut,
+    __out_opt SIZE_T* pcchOut,
     __in BOOL fObfuscateHiddenVariables,
     __out BOOL* pfContainsHiddenVariable
     );
@@ -704,7 +704,7 @@ extern "C" HRESULT VariableFormatString(
     __in BURN_VARIABLES* pVariables,
     __in_z LPCWSTR wzIn,
     __out_z_opt LPWSTR* psczOut,
-    __out_opt DWORD* pcchOut
+    __out_opt SIZE_T* pcchOut
     )
 {
     return FormatString(pVariables, wzIn, psczOut, pcchOut, FALSE, NULL);
@@ -714,7 +714,7 @@ extern "C" HRESULT VariableFormatStringObfuscated(
     __in BURN_VARIABLES* pVariables,
     __in_z LPCWSTR wzIn,
     __out_z_opt LPWSTR* psczOut,
-    __out_opt DWORD* pcchOut
+    __out_opt SIZE_T* pcchOut
     )
 {
     return FormatString(pVariables, wzIn, psczOut, pcchOut, TRUE, NULL);
@@ -1085,7 +1085,7 @@ static HRESULT FormatString(
     __in BURN_VARIABLES* pVariables,
     __in_z LPCWSTR wzIn,
     __out_z_opt LPWSTR* psczOut,
-    __out_opt DWORD* pcchOut,
+    __out_opt SIZE_T* pcchOut,
     __in BOOL fObfuscateHiddenVariables,
     __out BOOL* pfContainsHiddenVariable
     )
diff --git a/src/engine/variable.h b/src/engine/variable.h
index 713fe6e3..a38c9daa 100644
--- a/src/engine/variable.h
+++ b/src/engine/variable.h
@@ -126,13 +126,13 @@ HRESULT VariableFormatString(
     __in BURN_VARIABLES* pVariables,
     __in_z LPCWSTR wzIn,
     __out_z_opt LPWSTR* psczOut,
-    __out_opt DWORD* pcchOut
+    __out_opt SIZE_T* pcchOut
     );
 HRESULT VariableFormatStringObfuscated(
     __in BURN_VARIABLES* pVariables,
     __in_z LPCWSTR wzIn,
     __out_z_opt LPWSTR* psczOut,
-    __out_opt DWORD* pcchOut
+    __out_opt SIZE_T* pcchOut
     );
 HRESULT VariableEscapeString(
     __in_z LPCWSTR wzIn,
diff --git a/src/stub/packages.config b/src/stub/packages.config
index eb65b3b3..7681e32c 100644
--- a/src/stub/packages.config
+++ b/src/stub/packages.config
@@ -4,5 +4,5 @@
   <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.DUtil" version="4.0.56" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.59" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/stub/stub.vcxproj b/src/stub/stub.vcxproj
index 42b614cd..aa2f964e 100644
--- a/src/stub/stub.vcxproj
+++ b/src/stub/stub.vcxproj
@@ -5,7 +5,7 @@
   <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.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" />
 
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -107,6 +107,6 @@
     <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.56\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/test/BurnUnitTest/BurnUnitTest.vcxproj b/src/test/BurnUnitTest/BurnUnitTest.vcxproj
index 71f3ea09..18527de5 100644
--- a/src/test/BurnUnitTest/BurnUnitTest.vcxproj
+++ b/src/test/BurnUnitTest/BurnUnitTest.vcxproj
@@ -4,7 +4,7 @@
 
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <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.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -81,6 +81,6 @@
     </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.56\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props'))" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/test/BurnUnitTest/packages.config b/src/test/BurnUnitTest/packages.config
index 472349e7..f9d0f75a 100644
--- a/src/test/BurnUnitTest/packages.config
+++ b/src/test/BurnUnitTest/packages.config
@@ -10,5 +10,5 @@
   <package id="xunit.runner.visualstudio" version="2.4.1" />
   <package id="WixBuildTools.TestSupport" version="4.0.47" />
   <package id="WixBuildTools.TestSupport.Native" version="4.0.47" />
-  <package id="WixToolset.DUtil" version="4.0.56" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.59" targetFramework="native" />
 </packages>
\ No newline at end of file