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

diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh
index ae2b1cd4c8be6f2fb97005bd24f8088d0f9117d5..84515ecff4e18d7e975df0857b2787f461c138c7 100755 (executable)
--- 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