From a6ffec2e88437ed4fecb10cb359cf2fb64781e9a Mon Sep 17 00:00:00 2001
From: "Miss Islington (bot)"
<31488909+miss-islington@users.noreply.github.com>
Date: Mon, 6 Nov 2017 15:04:58 -0800
Subject: [3.6] bpo-31957: Fixes version detection. (GH-4298) (#4300)
---
.../next/Build/2017-11-06-11-53-39.bpo-31957.S_1jFK.rst | 1 +
PCbuild/python.props | 14 ++++++--------
2 files changed, 7 insertions(+), 8 deletions(-)
create mode 100644 Misc/NEWS.d/next/Build/2017-11-06-11-53-39.bpo-31957.S_1jFK.rst
diff --git a/Misc/NEWS.d/next/Build/2017-11-06-11-53-39.bpo-31957.S_1jFK.rst b/Misc/NEWS.d/next/Build/2017-11-06-11-53-39.bpo-31957.S_1jFK.rst
new file mode 100644
index 0000000..ffee902
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2017-11-06-11-53-39.bpo-31957.S_1jFK.rst
@@ -0,0 +1 @@
+Fixes Windows SDK version detection when building for Windows.
diff --git a/PCbuild/python.props b/PCbuild/python.props
index cf31586..82cb8b6 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -72,14 +72,12 @@
possible version). Since we limit WINVER to Windows 7 anyway, it doesn't really
matter which WinSDK version we use.
-->
- 10.0.15063.0
- 10.0.15063.0
- 10.0.14393.0
- 10.0.14393.0
- 10.0.10586.0
- 10.0.10586.0
- 10.0.10240.0
- 10.0.10240.0
+ <_RegistryVersion>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)
+ <_RegistryVersion Condition="$(_RegistryVersion) == ''">$(Registry:HKEY_LOCAL_MACHINE\WOW6432Node\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)
+ 10.0.15063.0
+ 10.0.14393.0
+ 10.0.10586.0
+ 10.0.10240.0
--
cgit v0.12