diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-04-26 11:31:05 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-05-11 11:14:01 -0700 |
| commit | df016066100df955d5ff98811e113fb2b1bd4b8a (patch) | |
| tree | a27b35a3651ca7b1d8c4bb7c7483ec2f92583e08 /src/ext/Util/be | |
| parent | dc6022da6cdbb9d7ca54c4a36485ceead07feaaf (diff) | |
| download | wix-df016066100df955d5ff98811e113fb2b1bd4b8a.tar.gz wix-df016066100df955d5ff98811e113fb2b1bd4b8a.tar.bz2 wix-df016066100df955d5ff98811e113fb2b1bd4b8a.zip | |
Implement integrated build process
Diffstat (limited to 'src/ext/Util/be')
| -rw-r--r-- | src/ext/Util/be/precomp.h | 2 | ||||
| -rw-r--r-- | src/ext/Util/be/utilbe.vcxproj | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/ext/Util/be/precomp.h b/src/ext/Util/be/precomp.h index 76d24c7b..bb36b3f3 100644 --- a/src/ext/Util/be/precomp.h +++ b/src/ext/Util/be/precomp.h | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | 15 | ||
| 16 | #include <msxml2.h> | 16 | #include <msxml2.h> |
| 17 | 17 | ||
| 18 | #define MAXUINT USHRT_MAX | 18 | // #define MAXUINT USHRT_MAX |
| 19 | 19 | ||
| 20 | #include <dutil.h> | 20 | #include <dutil.h> |
| 21 | #include <memutil.h> | 21 | #include <memutil.h> |
diff --git a/src/ext/Util/be/utilbe.vcxproj b/src/ext/Util/be/utilbe.vcxproj index 683b376a..5e5a44d3 100644 --- a/src/ext/Util/be/utilbe.vcxproj +++ b/src/ext/Util/be/utilbe.vcxproj | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 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. --> | 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 | 3 | ||
| 4 | <Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" Toolsxmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 5 | <ItemGroup Label="ProjectConfigurations"> | 5 | <ItemGroup Label="ProjectConfigurations"> |
| 6 | <ProjectConfiguration Include="Debug|ARM64"> | 6 | <ProjectConfiguration Include="Debug|ARM64"> |
| 7 | <Configuration>Debug</Configuration> | 7 | <Configuration>Debug</Configuration> |
| @@ -69,11 +69,12 @@ | |||
| 69 | </ItemGroup> | 69 | </ItemGroup> |
| 70 | 70 | ||
| 71 | <ItemGroup> | 71 | <ItemGroup> |
| 72 | <PackageReference Include="WixToolset.BextUtil" Version="4.0.58" /> | 72 | <PackageReference Include="WixToolset.DUtil" /> |
| 73 | <PackageReference Include="WixToolset.BootstrapperCore.Native" Version="4.0.141" /> | 73 | <PackageReference Include="WixToolset.BextUtil" /> |
| 74 | <PackageReference Include="WixToolset.DUtil" Version="4.0.72" /> | 74 | <PackageReference Include="WixToolset.BootstrapperCore.Native" /> |
| 75 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" /> | 75 | |
| 76 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" /> | 76 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 77 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 77 | </ItemGroup> | 78 | </ItemGroup> |
| 78 | 79 | ||
| 79 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 80 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |