[Python-checkins] bpo-35433: Properly detect installed SDK versions (GH-11009)

Sun Dec 9 22:59:38 EST 2018

https://github.com/python/cpython/commit/f46eccd0ffe65333035c3820886295b71c41ab6e
commit: f46eccd0ffe65333035c3820886295b71c41ab6e
branch: master
author: Jeremy Kloth <jeremy.kloth at gmail.com>
committer: Steve Dower <steve.dower at microsoft.com>
date: 2018年12月09日T19:59:32-08:00
summary:
bpo-35433: Properly detect installed SDK versions (GH-11009)
files:
M PCbuild/build.bat
M PCbuild/python.props

diff --git a/PCbuild/build.bat b/PCbuild/build.bat
index d4aebf555137..759aa5221b42 100644
--- a/PCbuild/build.bat
+++ b/PCbuild/build.bat
@@ -148,4 +148,5 @@ goto :eof
 
 :Version
 rem Display the current build version information
-%MSBUILD% "%dir%python.props" /t:ShowVersionInfo /v:m /nologo %1 %2 %3 %4 %5 %6 %7 %8 %9
+call "%dir%find_msbuild.bat" %MSBUILD%
+if not ERRORLEVEL 1 %MSBUILD% "%dir%pythoncore.vcxproj" /t:ShowVersionInfo /v:m /nologo %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/PCbuild/python.props b/PCbuild/python.props
index 09f11d3bba8c..f474e6f07e6d 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -77,14 +77,18 @@
 -->
 <_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.17134.0</DefaultWindowsSDKVersion>
- <DefaultWindowsSDKVersion Condition="$(_RegistryVersion) == '10.0.16299'">10.0.16299.0</DefaultWindowsSDKVersion>
- <DefaultWindowsSDKVersion Condition="$(_RegistryVersion) == '10.0.15063'">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>
+ <!-- Sometimes the version in the registry has to .0 suffix, and sometimes it doesn't. Check and add it -->
+ <_RegistryVersion Condition="$(_RegistryVersion) != '' and !$(_RegistryVersion.EndsWith('.0'))">$(_RegistryVersion).0</_RegistryVersion>
+
+ <!-- The minimum allowed SDK version to use for building -->
+ <DefaultWindowsSDKVersion>10.0.10586.0</DefaultWindowsSDKVersion>
+ <DefaultWindowsSDKVersion Condition="$([System.Version]::Parse($(_RegistryVersion))) > $([System.Version]::Parse($(DefaultWindowsSDKVersion)))">$(_RegistryVersion)</DefaultWindowsSDKVersion>
 </PropertyGroup>
 
+ <PropertyGroup Condition="$(WindowsTargetPlatformVersion) == ''">
+ <WindowsTargetPlatformVersion>$(DefaultWindowsSDKVersion)</WindowsTargetPlatformVersion>
+ </PropertyGroup>
+
 <PropertyGroup Condition="'$(OverrideVersion)' == ''">
 <!--
 Read version information from Include\patchlevel.h. The following properties are set:
@@ -190,5 +194,6 @@
 <Message Importance="high" Text="Field3Value: $(Field3Value)" />
 <Message Importance="high" Text="SysWinVer: $(SysWinVer)" />
 <Message Importance="high" Text="PyDllName: $(PyDllName)" />
+ <Message Importance="high" Text="WindowsSdkVersion: $(TargetPlatformVersion)" />
 </Target>
 </Project>
