Update DUtil dependency.
Bob Arnson committed
Feb 9, 2021 at 21:21 UTC
cacae742b21e42c6c7a1cd7c9ddd102264ac0782
5 files changed
+9
-15
src/wcautil/inc/wcautil.h
+2
-2
@@ -232,7 +232,7 @@ HRESULT WIXAPI WcaGetRecordFormattedString(
232
233
HRESULT WIXAPI WcaAllocStream(
234
__deref_out_bcount_part(cbData, 0) BYTE** ppbData,
235
- __in DWORD cbData
235
+ __in SIZE_T cbData
236
);
237
HRESULT WIXAPI WcaFreeStream(
238
__in BYTE* pbData
@@ -287,7 +287,7 @@ HRESULT WIXAPI WcaWriteIntegerToCaData(
287
);
288
HRESULT WIXAPI WcaWriteStreamToCaData(
289
__in_bcount(cbData) const BYTE* pbData,
290
- __in DWORD cbData,
290
+ __in SIZE_T cbData,
291
__deref_inout_z_opt LPWSTR* ppwzCustomActionData
292
);
293
src/wcautil/packages.config
+1
-1
@@ -1,5 +1,5 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
3
<package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
4
- <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" />
4
+ <package id="WixToolset.DUtil" version="4.0.62" targetFramework="native" />
5
</packages>
\ No newline at end of file
src/wcautil/wcautil.vcxproj
+2
-2
@@ -1,7 +1,7 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<!-- 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. -->
3
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" />
4
+ <Import Project="..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" />
5
<ItemGroup Label="ProjectConfigurations">
6
<ProjectConfiguration Include="Debug|ARM64">
7
<Configuration>Debug</Configuration>
@@ -89,6 +89,6 @@
89
<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>
90
</PropertyGroup>
91
<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'))" />
92
- <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'))" />
92
+ <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'))" />
93
</Target>
94
</Project>
\ No newline at end of file
src/wcautil/wcawrap.cpp
+2
-2
@@ -1000,7 +1000,7 @@ NOTE: Use WcaFreeStream() to release the byte stream
1000
********************************************************************/
1001
extern "C" HRESULT WIXAPI WcaAllocStream(
1002
__deref_out_bcount_part(cbData, 0) BYTE** ppbData,
1003
- __in DWORD cbData
1003
+ __in SIZE_T cbData
1004
)
1005
{
1006
Assert(ppbData);
@@ -1379,7 +1379,7 @@ feed a deferred CustomAction
1379
********************************************************************/
1380
extern "C" HRESULT WIXAPI WcaWriteStreamToCaData(
1381
__in_bcount(cbData) const BYTE* pbData,
1382
- __in DWORD cbData,
1382
+ __in SIZE_T cbData,
1383
__deref_inout_z_opt LPWSTR* ppwzCustomActionData
1384
)
1385
{
wcautil.sln
+2
-8
@@ -1,32 +1,26 @@
1
2
Microsoft Visual Studio Solution File, Format Version 12.00
3
-# Visual Studio 15
4
-VisualStudioVersion = 15.0.26730.12
3
+# Visual Studio Version 16
4
+VisualStudioVersion = 16.0.31005.135
5
MinimumVisualStudioVersion = 15.0.26124.0
6
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wcautil", "src\wcautil\wcautil.vcxproj", "{5B3714B6-3A76-463E-8595-D48DA276C512}"
7
EndProject
8
Global
9
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10
- Debug|ARM = Debug|ARM
10
Debug|ARM64 = Debug|ARM64
11
Debug|x64 = Debug|x64
12
Debug|x86 = Debug|x86
14
- Release|ARM = Release|ARM
13
Release|ARM64 = Release|ARM64
14
Release|x64 = Release|x64
15
Release|x86 = Release|x86
16
EndGlobalSection
17
GlobalSection(ProjectConfigurationPlatforms) = postSolution
20
- {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|ARM.ActiveCfg = Debug|ARM
21
- {5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|ARM.Build.0 = Debug|ARM
18
{5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|ARM64.ActiveCfg = Debug|ARM64
19
{5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|ARM64.Build.0 = Debug|ARM64
20
{5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|x64.ActiveCfg = Debug|x64
21
{5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|x64.Build.0 = Debug|x64
22
{5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|x86.ActiveCfg = Debug|Win32
23
{5B3714B6-3A76-463E-8595-D48DA276C512}.Debug|x86.Build.0 = Debug|Win32
28
- {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|ARM.ActiveCfg = Release|ARM
29
- {5B3714B6-3A76-463E-8595-D48DA276C512}.Release|ARM.Build.0 = Release|ARM
24
{5B3714B6-3A76-463E-8595-D48DA276C512}.Release|ARM64.ActiveCfg = Release|ARM64
25
{5B3714B6-3A76-463E-8595-D48DA276C512}.Release|ARM64.Build.0 = Release|ARM64
26
{5B3714B6-3A76-463E-8595-D48DA276C512}.Release|x64.ActiveCfg = Release|x64