From 9b42d1d2f0fc13085f5f8d9ce8e420f556c55814 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sun, 13 Jan 2019 19:05:05 -0600
Subject: Update to latest Cpp.Build.props for locating latest Win10 SDK.

---
 src/Cpp.Build.props | 6 +++++-
 src/ca/vsca.vcxproj | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props
index 296b36ca..0e00132b 100644
--- a/src/Cpp.Build.props
+++ b/src/Cpp.Build.props
@@ -8,6 +8,10 @@
     <OutDir>$(OutputPath)$(Platform)\</OutDir>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'=='15.0'">
+    <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+
   <ItemDefinitionGroup>
     <ClCompile>
       <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings>
@@ -16,7 +20,7 @@
       <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
-      <CallingConvention>StdCall</CallingConvention>
+      <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention>
       <TreatWarningAsError>true</TreatWarningAsError>
       <ExceptionHandling>false</ExceptionHandling>
       <AdditionalOptions>-YlprecompDefine</AdditionalOptions>
diff --git a/src/ca/vsca.vcxproj b/src/ca/vsca.vcxproj
index f80b7215..c52840bf 100644
--- a/src/ca/vsca.vcxproj
+++ b/src/ca/vsca.vcxproj
@@ -24,7 +24,6 @@
     <CharacterSet>Unicode</CharacterSet>
     <ProjectModuleDefinitionFile>vsca.def</ProjectModuleDefinitionFile>
     <Description>WiX Toolset VS CustomAction</Description>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
   </PropertyGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-- 
cgit v1.2.3-55-g6feb