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/VisualStudio/ca | |
parent | dc6022da6cdbb9d7ca54c4a36485ceead07feaaf (diff) | |
download | wix-df016066100df955d5ff98811e113fb2b1bd4b8a.tar.gz wix-df016066100df955d5ff98811e113fb2b1bd4b8a.tar.bz2 wix-df016066100df955d5ff98811e113fb2b1bd4b8a.zip |
Implement integrated build process
Diffstat (limited to 'src/ext/VisualStudio/ca')
-rw-r--r-- | src/ext/VisualStudio/ca/precomp.h | 1 | ||||
-rw-r--r-- | src/ext/VisualStudio/ca/vsca.vcxproj | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/ext/VisualStudio/ca/precomp.h b/src/ext/VisualStudio/ca/precomp.h index 3edad7ed..a08ca180 100644 --- a/src/ext/VisualStudio/ca/precomp.h +++ b/src/ext/VisualStudio/ca/precomp.h | |||
@@ -5,7 +5,6 @@ | |||
5 | #include <windows.h> | 5 | #include <windows.h> |
6 | #include <msiquery.h> | 6 | #include <msiquery.h> |
7 | 7 | ||
8 | #define MAXUINT USHRT_MAX | ||
9 | #include <Setup.Configuration.h> | 8 | #include <Setup.Configuration.h> |
10 | 9 | ||
11 | #include "wcautil.h" | 10 | #include "wcautil.h" |
diff --git a/src/ext/VisualStudio/ca/vsca.vcxproj b/src/ext/VisualStudio/ca/vsca.vcxproj index f4fbcc46..8d6a3500 100644 --- a/src/ext/VisualStudio/ca/vsca.vcxproj +++ b/src/ext/VisualStudio/ca/vsca.vcxproj | |||
@@ -47,11 +47,11 @@ | |||
47 | </ItemGroup> | 47 | </ItemGroup> |
48 | 48 | ||
49 | <ItemGroup> | 49 | <ItemGroup> |
50 | <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="1.14.114" /> | 50 | <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Native" /> |
51 | <PackageReference Include="WixToolset.Dutil" Version="4.0.65" /> | 51 | <PackageReference Include="WixToolset.Dutil" /> |
52 | <PackageReference Include="WixToolset.WcaUtil" Version="4.0.18" /> | 52 | <PackageReference Include="WixToolset.WcaUtil" /> |
53 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" /> | 53 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> |
54 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" /> | 54 | <PackageReference Include="GitInfo" /> |
55 | </ItemGroup> | 55 | </ItemGroup> |
56 | 56 | ||
57 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 57 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |