From cc6d6a3b3f0f802ae0d5458b42e8ef7c896c9538 Mon Sep 17 00:00:00 2001 From: Jon Kunkee Date: Tue, 22 Jan 2019 15:01:06 -0800 Subject: [PATCH] Fix Windows SDK and VS version checks If WindowsTargetPlatformVersion is not set, the Visual Studio 15 (2017) toolchain assumes that Windows 8.1 is being targeted. Since ARM64 support is only present and unlocked in Windows SDKs >= Windows 10 1809, set that SDK as required in the vcxproj files. Note that this will not be an issue in Visual Studio 16 or greater, hence the -eq major version check. https://developercommunity.visualstudio.com/content/problem/128836/windowstargetplatformversion-to-use-the-latest-ava.html Bug: chromium:893460 Change-Id: Ib069501ad384d91349b1f635722dedd31a4edd97 --- build/make/gen_msvs_vcxproj.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh index ae2b1cd4c..84515ecff 100755 --- a/build/make/gen_msvs_vcxproj.sh +++ b/build/make/gen_msvs_vcxproj.sh @@ -312,15 +312,15 @@ generate_vcxproj() { tag_content ApplicationType "Windows Store" tag_content ApplicationTypeRevision 8.1 fi - if [ $vs_ver -eq 15 ] && [ "${platforms[0]}" = "ARM64" ]; then + if [ "${platforms[0]}" = "ARM64" ]; then # Require the first Visual Studio version to have ARM64 support. tag_content MinimumVisualStudioVersion 15.9 - # Require a Windows SDK that has ARM64 support rather than the - # default of 8.1. + fi + if [ $vs_ver -eq 15 ] && [ "${platforms[0]}" = "ARM64" ]; then # Since VS 15 does not have a 'use latest SDK version' facility, - # set WindowsTargetPlatformVersion to the first official SDK - # version to have ARM64 support. - tag_content WindowsTargetPlatformVersion 10.0.17134.0 + # specifically require the contemporaneous SDK with official ARM64 + # support. + tag_content WindowsTargetPlatformVersion 10.0.17763.0 fi close_tag PropertyGroup -- 2.50.1