Update to latest Cpp.Build.props for locating latest Win10 SDK. Remove unused Microsoft.VisualStudio.Setup.Configuration.Native package.
Update to latest Cpp.Build.props for locating latest Win10 SDK. Remove unused Microsoft.VisualStudio.Setup.Configuration.Native package.
Sean Hall committed
Jan 13, 2019 at 19:08 UTC
3b1848368ffe8220973b12de2f76fdc8c0114683
4 files changed
+5
-12
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/packages.config
-1
@@ -1,6 +1,5 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<packages>
3
- <package id="Microsoft.VisualStudio.Setup.Configuration.Native" version="1.14.114" targetFramework="native" developmentDependency="true" />
3
<package id="WixToolset.DUtil" version="4.0.6" targetFramework="native" />
4
<package id="WixToolset.WcaUtil" version="4.0.2" targetFramework="native" />
5
</packages>
\ No newline at end of file
src/ca/precomp.h
-1
@@ -23,7 +23,6 @@
23
#include <intshcut.h>
24
25
#define MAXUINT USHRT_MAX
26
-#include <Setup.Configuration.h>
26
27
#include "wcautil.h"
28
#include "wcawow64.h"
src/ca/utilca.vcxproj
-9
@@ -24,19 +24,11 @@
24
<CharacterSet>Unicode</CharacterSet>
25
<ProjectModuleDefinitionFile>utilca.def</ProjectModuleDefinitionFile>
26
<Description>WiX Toolset Util 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" />
30
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
31
33
- <ImportGroup Label="ExtensionSettings">
34
- </ImportGroup>
35
-
36
- <ImportGroup Label="Shared">
37
- <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')" />
38
- </ImportGroup>
39
-
32
<PropertyGroup>
33
<ProjectAdditionalLinkLibraries>activeds.lib;adsiid.lib;msi.lib;netapi32.lib;shlwapi.lib</ProjectAdditionalLinkLibraries>
34
</PropertyGroup>
@@ -96,7 +88,6 @@
88
<PropertyGroup>
89
<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>
90
</PropertyGroup>
99
- <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'))" />
91
<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'))" />
92
<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'))" />
93
</Target>