From 30f4fa456ef626ad7a92759f492ec7a268f7af4e Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Mon, 6 Nov 2017 12:52:09 -0800 Subject: [PATCH] bpo-31957: Fixes version detection. (#4298) --- .../2017-11-06-11-53-39.bpo-31957.S_1jFK.rst | 1 + PCbuild/python.props | 15 +++++++-------- 2 files changed, 8 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 00000000000..ffee9025a7b --- /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 2d48ed1e362..a826bbf283e 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -73,14 +73,13 @@ 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.16299.0 + 10.0.15063.0 + 10.0.14393.0 + 10.0.10586.0 + 10.0.10240.0