[Python-checkins] [3.6] bpo-31957: Fixes version detection. (GH-4298) (#4300)
Steve Dower
webhook-mailer at python.org
Mon Nov 6 18:05:01 EST 2017
https://github.com/python/cpython/commit/a6ffec2e88437ed4fecb10cb359cf2fb64781e9a
commit: a6ffec2e88437ed4fecb10cb359cf2fb64781e9a
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Steve Dower <steve.dower at microsoft.com>
date: 2017-11-06T15:04:58-08:00
summary:
[3.6] bpo-31957: Fixes version detection. (GH-4298) (#4300)
files:
A Misc/NEWS.d/next/Build/2017-11-06-11-53-39.bpo-31957.S_1jFK.rst
M PCbuild/python.props
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 cf3158699ce..82cb8b646fe 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.
-->
- <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0 at ProductVersion) >= '10.0.15063'">10.0.15063.0</DefaultWindowsSDKVersion>
- <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0 at ProductVersion) >= '10.0.15063'">10.0.15063.0</DefaultWindowsSDKVersion>
- <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0 at ProductVersion) == '10.0.14393'">10.0.14393.0</DefaultWindowsSDKVersion>
- <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0 at ProductVersion) == '10.0.14393'">10.0.14393.0</DefaultWindowsSDKVersion>
- <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0 at ProductVersion) == '10.0.10586'">10.0.10586.0</DefaultWindowsSDKVersion>
- <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0 at ProductVersion) == '10.0.10586'">10.0.10586.0</DefaultWindowsSDKVersion>
- <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0 at ProductVersion) == '10.0.10240'">10.0.10240.0</DefaultWindowsSDKVersion>
- <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0 at ProductVersion) == '10.0.10240'">10.0.10240.0</DefaultWindowsSDKVersion>
+ <_RegistryVersion>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0 at ProductVersion)</_RegistryVersion>
+ <_RegistryVersion Condition="$(_RegistryVersion) == ''">$(Registry:HKEY_LOCAL_MACHINE\WOW6432Node\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0 at ProductVersion)</_RegistryVersion>
+ <DefaultWindowsSDKVersion>10.0.15063.0</DefaultWindowsSDKVersion>
+ <DefaultWindowsSDKVersion Condition="$(_RegistryVersion) == '10.0.14393'">10.0.14393.0</DefaultWindowsSDKVersion>
+ <DefaultWindowsSDKVersion Condition="$(_RegistryVersion) == '10.0.10586'">10.0.10586.0</DefaultWindowsSDKVersion>
+ <DefaultWindowsSDKVersion Condition="$(_RegistryVersion) == '10.0.10240'">10.0.10240.0</DefaultWindowsSDKVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(OverrideVersion)' == ''">
More information about the Python-checkins
mailing list