diff options
author | Bob Arnson <bob@firegiant.com> | 2021-02-09 21:28:02 -0500 |
---|---|---|
committer | Bob Arnson <bob@firegiant.com> | 2021-02-09 21:30:58 -0500 |
commit | b4a31404325d3fdd95d67fd41eda8e48e3491629 (patch) | |
tree | 1ebfb7511de2ccc7de3f885707d1b76d92164bc5 | |
parent | ee462cad8c0bda4f0b340ac0c03329a362232091 (diff) | |
download | wix-b4a31404325d3fdd95d67fd41eda8e48e3491629.tar.gz wix-b4a31404325d3fdd95d67fd41eda8e48e3491629.tar.bz2 wix-b4a31404325d3fdd95d67fd41eda8e48e3491629.zip |
Update DUtil dependency.
-rw-r--r-- | src/be/packages.config | 2 | ||||
-rw-r--r-- | src/be/utilbe.vcxproj | 4 | ||||
-rw-r--r-- | src/ca/XmlConfig.cpp | 2 | ||||
-rw-r--r-- | src/ca/XmlFile.cpp | 2 | ||||
-rw-r--r-- | src/ca/packages.config | 4 | ||||
-rw-r--r-- | src/ca/utilca.vcxproj | 8 |
6 files changed, 11 insertions, 11 deletions
diff --git a/src/be/packages.config b/src/be/packages.config index 2b96e672..615279de 100644 --- a/src/be/packages.config +++ b/src/be/packages.config | |||
@@ -6,5 +6,5 @@ | |||
6 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> | 6 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> |
7 | <package id="WixToolset.BextUtil" version="4.0.48" targetFramework="native" /> | 7 | <package id="WixToolset.BextUtil" version="4.0.48" targetFramework="native" /> |
8 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.75" 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 | 10 | </packages> \ No newline at end of file |
diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj index 96e0bca6..f6665932 100644 --- a/src/be/utilbe.vcxproj +++ b/src/be/utilbe.vcxproj | |||
@@ -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')" /> | 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')" /> | 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')" /> | 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"> | 10 | <ItemGroup Label="ProjectConfigurations"> |
11 | <ProjectConfiguration Include="Debug|ARM64"> | 11 | <ProjectConfiguration Include="Debug|ARM64"> |
12 | <Configuration>Debug</Configuration> | 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'))" /> | 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'))" /> | 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'))" /> | 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> | 89 | </Target> |
90 | </Project> \ No newline at end of file | 90 | </Project> \ No newline at end of file |
diff --git a/src/ca/XmlConfig.cpp b/src/ca/XmlConfig.cpp index 0c2fae37..959f95b0 100644 --- a/src/ca/XmlConfig.cpp +++ b/src/ca/XmlConfig.cpp | |||
@@ -346,7 +346,7 @@ static HRESULT BeginChangeFile( | |||
346 | BOOL fIs64Bit = iCompAttributes & msidbComponentAttributes64bit; | 346 | BOOL fIs64Bit = iCompAttributes & msidbComponentAttributes64bit; |
347 | 347 | ||
348 | LPBYTE pbData = NULL; | 348 | LPBYTE pbData = NULL; |
349 | DWORD cbData = 0; | 349 | SIZE_T cbData = 0; |
350 | 350 | ||
351 | LPWSTR pwzRollbackCustomActionData = NULL; | 351 | LPWSTR pwzRollbackCustomActionData = NULL; |
352 | 352 | ||
diff --git a/src/ca/XmlFile.cpp b/src/ca/XmlFile.cpp index d7cb227e..95f18411 100644 --- a/src/ca/XmlFile.cpp +++ b/src/ca/XmlFile.cpp | |||
@@ -213,7 +213,7 @@ static HRESULT BeginChangeFile( | |||
213 | BOOL fIs64Bit = pxfc->iCompAttributes & msidbComponentAttributes64bit; | 213 | BOOL fIs64Bit = pxfc->iCompAttributes & msidbComponentAttributes64bit; |
214 | BOOL fUseXPath = pxfc->iXmlFlags & XMLFILE_USE_XPATH; | 214 | BOOL fUseXPath = pxfc->iXmlFlags & XMLFILE_USE_XPATH; |
215 | LPBYTE pbData = NULL; | 215 | LPBYTE pbData = NULL; |
216 | DWORD cbData = 0; | 216 | SIZE_T cbData = 0; |
217 | 217 | ||
218 | LPWSTR pwzRollbackCustomActionData = NULL; | 218 | LPWSTR pwzRollbackCustomActionData = NULL; |
219 | 219 | ||
diff --git a/src/ca/packages.config b/src/ca/packages.config index 7251c430..987359f7 100644 --- a/src/ca/packages.config +++ b/src/ca/packages.config | |||
@@ -4,6 +4,6 @@ | |||
4 | <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" /> | 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" /> | 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" /> | 6 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> |
7 | <package id="WixToolset.DUtil" version="4.0.56" targetFramework="native" /> | 7 | <package id="WixToolset.DUtil" version="4.0.62" targetFramework="native" /> |
8 | <package id="WixToolset.WcaUtil" version="4.0.17" targetFramework="native" /> | 8 | <package id="WixToolset.WcaUtil" version="4.0.18" targetFramework="native" /> |
9 | </packages> \ No newline at end of file | 9 | </packages> \ No newline at end of file |
diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj index 5082f759..9ff0ec8e 100644 --- a/src/ca/utilca.vcxproj +++ b/src/ca/utilca.vcxproj | |||
@@ -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')" /> | 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')" /> | 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')" /> | 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')" /> | 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.17\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.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 | 10 | ||
11 | <ItemGroup Label="ProjectConfigurations"> | 11 | <ItemGroup Label="ProjectConfigurations"> |
12 | <ProjectConfiguration Include="Debug|ARM64"> | 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'))" /> | 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'))" /> | 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'))" /> | 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'))" /> | 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.17\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.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> | 122 | </Target> |
123 | </Project> \ No newline at end of file | 123 | </Project> \ No newline at end of file |