Update to latest Cpp.Build.props for locating latest Win10 SDK.
Sean Hall committed
Jan 13, 2019 at 19:05 UTC
9b42d1d2f0fc13085f5f8d9ce8e420f556c55814
2 files changed
+5
-2
src/Cpp.Build.props
+5
-1
@@ -8,6 +8,10 @@
8
<OutDir>$(OutputPath)$(Platform)\</OutDir>
9
</PropertyGroup>
10
11
+ <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'=='15.0'">
12
+ <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
13
+ </PropertyGroup>
14
+
15
<ItemDefinitionGroup>
16
<ClCompile>
17
<DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings>
@@ -16,7 +20,7 @@
20
<PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
21
<PrecompiledHeader>Use</PrecompiledHeader>
22
<PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
19
- <CallingConvention>StdCall</CallingConvention>
23
+ <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention>
24
<TreatWarningAsError>true</TreatWarningAsError>
25
<ExceptionHandling>false</ExceptionHandling>
26
<AdditionalOptions>-YlprecompDefine</AdditionalOptions>
src/ca/vsca.vcxproj
-1
@@ -24,7 +24,6 @@
24
<CharacterSet>Unicode</CharacterSet>
25
<ProjectModuleDefinitionFile>vsca.def</ProjectModuleDefinitionFile>
26
<Description>WiX Toolset VS CustomAction</Description>
27
- <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
27
</PropertyGroup>
28
29
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />