5 files changed, 9 insertions, 15 deletions

diff --git a/src/wcautil/inc/wcautil.h b/src/wcautil/inc/wcautil.h
index 982173f4..4d036a9d 100644
--- a/src/wcautil/inc/wcautil.h
+++ b/src/wcautil/inc/wcautil.h
@@ -232,7 +232,7 @@ HRESULT WIXAPI WcaGetRecordFormattedString(
 
 HRESULT WIXAPI WcaAllocStream(
     __deref_out_bcount_part(cbData, 0) BYTE** ppbData,
-    __in DWORD cbData
+    __in SIZE_T cbData
     );
 HRESULT WIXAPI WcaFreeStream(
     __in BYTE* pbData
@@ -287,7 +287,7 @@ HRESULT WIXAPI WcaWriteIntegerToCaData(
     );
 HRESULT WIXAPI WcaWriteStreamToCaData(
     __in_bcount(cbData) const BYTE* pbData,
-    __in DWORD cbData,
+    __in SIZE_T cbData,
     __deref_inout_z_opt LPWSTR* ppwzCustomActionData
     );
 
diff --git a/src/wcautil/packages.config b/src/wcautil/packages.config
index 924b5e93..aee0138c 100644
--- a/src/wcautil/packages.config
+++ b/src/wcautil/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
-  <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.62" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/wcautil/wcautil.vcxproj b/src/wcautil/wcautil.vcxproj
index 27ed9ac7..c5b60b4a 100644
--- a/src/wcautil/wcautil.vcxproj
+++ b/src/wcautil/wcautil.vcxproj
@@ -1,7 +1,7 @@
 <?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. -->
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
@@ -89,6 +89,6 @@
       <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\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/wcautil/wcawrap.cpp b/src/wcautil/wcawrap.cpp
index 625489c1..7c210069 100644
--- a/src/wcautil/wcawrap.cpp
+++ b/src/wcautil/wcawrap.cpp
@@ -1000,7 +1000,7 @@ NOTE: Use WcaFreeStream() to release the byte stream
 ********************************************************************/
 extern "C" HRESULT WIXAPI WcaAllocStream(
     __deref_out_bcount_part(cbData, 0) BYTE** ppbData,
-    __in DWORD cbData
+    __in SIZE_T cbData
     )
 {
     Assert(ppbData);
@@ -1379,7 +1379,7 @@ feed a deferred CustomAction
 ********************************************************************/
 extern "C" HRESULT WIXAPI WcaWriteStreamToCaData(
     __in_bcount(cbData) const BYTE* pbData,
-    __in DWORD cbData,
+    __in SIZE_T cbData,
     __deref_inout_z_opt LPWSTR* ppwzCustomActionData
     )
 {
diff --git a/wcautil.sln b/wcautil.sln
index 8f45f5f6..5682f1f7 100644
--- a/wcautil.sln
+++ b/wcautil.sln
@@ -1,32 +1,26 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26730.12
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.31005.135
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wcautil", "src\wcautil\wcautil.vcxproj", "{5B3714B6-3A76-463E-8595-D48DA276C512}"
 EndProject
 Global
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
-                Debug|ARM = Debug|ARM
                 Debug|ARM64 = Debug|ARM64
                 Debug|x64 = Debug|x64
                 Debug|x86 = Debug|x86
-                Release|ARM = Release|ARM
                 Release|ARM64 = Release|ARM64
                 Release|x64 = Release|x64
                 Release|x86 = Release|x86
         EndGlobalSection
         GlobalSection(ProjectConfigurationPlatforms) = postSolution
-                {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|ARM.ActiveCfg = Debug|ARM
-                {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|ARM.Build.0 = Debug|ARM
                 {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|ARM64.ActiveCfg = Debug|ARM64
                 {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|ARM64.Build.0 = Debug|ARM64
                 {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|x64.ActiveCfg = Debug|x64
                 {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|x64.Build.0 = Debug|x64
                 {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|x86.ActiveCfg = Debug|Win32
                 {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|x86.Build.0 = Debug|Win32
-                {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|ARM.ActiveCfg = Release|ARM
-                {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|ARM.Build.0 = Release|ARM
                 {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|ARM64.ActiveCfg = Release|ARM64
                 {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|ARM64.Build.0 = Release|ARM64
                 {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|x64.ActiveCfg = Release|x64