From 3b1848368ffe8220973b12de2f76fdc8c0114683 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sun, 13 Jan 2019 19:08:11 -0600
Subject: Update to latest Cpp.Build.props for locating latest Win10 SDK.
 Remove unused Microsoft.VisualStudio.Setup.Configuration.Native package.

---
 src/Cpp.Build.props    | 6 +++++-
 src/ca/packages.config | 1 -
 src/ca/precomp.h       | 1 -
 src/ca/utilca.vcxproj  | 9 ---------
 4 files changed, 5 insertions(+), 12 deletions(-)

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/packages.config b/src/ca/packages.config
index b74ff5d0..b87f9ab4 100644
--- a/src/ca/packages.config
+++ b/src/ca/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.VisualStudio.Setup.Configuration.Native" version="1.14.114" targetFramework="native" developmentDependency="true" />
   <package id="WixToolset.DUtil" version="4.0.6" targetFramework="native" />
   <package id="WixToolset.WcaUtil" version="4.0.2" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/ca/precomp.h b/src/ca/precomp.h
index 45984156..66e2f6b0 100644
--- a/src/ca/precomp.h
+++ b/src/ca/precomp.h
@@ -23,7 +23,6 @@
 #include <intshcut.h>
 
 #define MAXUINT USHRT_MAX
-#include <Setup.Configuration.h>
 
 #include "wcautil.h"
 #include "wcawow64.h"
diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj
index e9d74a66..9bff19b0 100644
--- a/src/ca/utilca.vcxproj
+++ b/src/ca/utilca.vcxproj
@@ -24,19 +24,11 @@
     <CharacterSet>Unicode</CharacterSet>
     <ProjectModuleDefinitionFile>utilca.def</ProjectModuleDefinitionFile>
     <Description>WiX Toolset Util CustomAction</Description>
-    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
   </PropertyGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-
-  <ImportGroup Label="Shared">
-    <Import Project="..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.14.114\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.14.114\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets')" />
-  </ImportGroup>
-
   <PropertyGroup>
     <ProjectAdditionalLinkLibraries>activeds.lib;adsiid.lib;msi.lib;netapi32.lib;shlwapi.lib</ProjectAdditionalLinkLibraries>
   </PropertyGroup>
@@ -96,7 +88,6 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.14.114\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.14.114\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets'))" />
     <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props'))" />
     <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props'))" />
   </Target>
-- 
cgit v1.2.3-55-g6feb