Update DUtil dependency.
Bob Arnson committed
Feb 9, 2021 at 21:28 UTC
b4a31404325d3fdd95d67fd41eda8e48e3491629
6 files changed
+11
-11
src/be/packages.config
+1
-1
@@ -6,5 +6,5 @@
6
<package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
7
<package id="WixToolset.BextUtil" version="4.0.48" targetFramework="native" />
8
<package id="WixToolset.BootstrapperCore.Native" version="4.0.75" targetFramework="native" />
9
- <package id="WixToolset.DUtil" version="4.0.56" targetFramework="native" />
9
+ <package id="WixToolset.DUtil" version="4.0.62" targetFramework="native" />
10
</packages>
\ No newline at end of file
src/be/utilbe.vcxproj
+2
-2
@@ -6,7 +6,7 @@
6
<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')" />
7
<Import Project="..\..\packages\WixToolset.BextUtil.4.0.48\build\WixToolset.BextUtil.props" Condition="Exists('..\..\packages\WixToolset.BextUtil.4.0.48\build\WixToolset.BextUtil.props')" />
8
<Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props')" />
9
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" />
9
+ <Import Project="..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" />
10
<ItemGroup Label="ProjectConfigurations">
11
<ProjectConfiguration Include="Debug|ARM64">
12
<Configuration>Debug</Configuration>
@@ -85,6 +85,6 @@
85
<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'))" />
86
<Error Condition="!Exists('..\..\packages\WixToolset.BextUtil.4.0.48\build\WixToolset.BextUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BextUtil.4.0.48\build\WixToolset.BextUtil.props'))" />
87
<Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.75\build\WixToolset.BootstrapperCore.Native.props'))" />
88
- <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'))" />
88
+ <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'))" />
89
</Target>
90
</Project>
\ No newline at end of file
src/ca/XmlConfig.cpp
+1
-1
@@ -346,7 +346,7 @@ static HRESULT BeginChangeFile(
346
BOOL fIs64Bit = iCompAttributes & msidbComponentAttributes64bit;
347
348
LPBYTE pbData = NULL;
349
- DWORD cbData = 0;
349
+ SIZE_T cbData = 0;
350
351
LPWSTR pwzRollbackCustomActionData = NULL;
352
src/ca/XmlFile.cpp
+1
-1
@@ -213,7 +213,7 @@ static HRESULT BeginChangeFile(
213
BOOL fIs64Bit = pxfc->iCompAttributes & msidbComponentAttributes64bit;
214
BOOL fUseXPath = pxfc->iXmlFlags & XMLFILE_USE_XPATH;
215
LPBYTE pbData = NULL;
216
- DWORD cbData = 0;
216
+ SIZE_T cbData = 0;
217
218
LPWSTR pwzRollbackCustomActionData = NULL;
219
src/ca/packages.config
+2
-2
@@ -4,6 +4,6 @@
4
<package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
5
<package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
6
<package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
7
- <package id="WixToolset.DUtil" version="4.0.56" targetFramework="native" />
8
- <package id="WixToolset.WcaUtil" version="4.0.17" targetFramework="native" />
7
+ <package id="WixToolset.DUtil" version="4.0.62" targetFramework="native" />
8
+ <package id="WixToolset.WcaUtil" version="4.0.18" targetFramework="native" />
9
</packages>
\ No newline at end of file
src/ca/utilca.vcxproj
+4
-4
@@ -5,8 +5,8 @@
5
<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')" />
6
<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')" />
7
<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')" />
8
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" />
9
- <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props')" />
8
+ <Import Project="..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" />
9
+ <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props')" />
10
11
<ItemGroup Label="ProjectConfigurations">
12
<ProjectConfiguration Include="Debug|ARM64">
@@ -117,7 +117,7 @@
117
<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'))" />
118
<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'))" />
119
<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'))" />
120
- <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'))" />
121
- <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props'))" />
120
+ <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'))" />
121
+ <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props'))" />
122
</Target>
123
</Project>
\ No newline at end of file