From 132dae2a241c9ce4a1f42febbc907efb9766ca05 Mon Sep 17 00:00:00 2001
From: Jeremy Kloth <jeremy.kloth@gmail.com>
Date: Thu, 6 Dec 2018 18:04:28 -0700
Subject: [PATCH 1/3] bpo-35433: Properly detect installed SDK versions

---
 PCbuild/python.props | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/PCbuild/python.props b/PCbuild/python.props
index 09f11d3bba8c58d..cf75535c00df552 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -77,12 +77,12 @@
     -->
     <_RegistryVersion>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</_RegistryVersion>
     <_RegistryVersion Condition="$(_RegistryVersion) == ''">$(Registry:HKEY_LOCAL_MACHINE\WOW6432Node\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@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="$(_RegistryVersion.CompareTo($(DefaultWindowsSDKVersion))) >= 0">$(_RegistryVersion)</DefaultWindowsSDKVersion>
   </PropertyGroup>
   
   <PropertyGroup Condition="'$(OverrideVersion)' == ''">

From 21dd59d40b5e0da158f7e2c00d26d844640ead1a Mon Sep 17 00:00:00 2001
From: Jeremy Kloth <jeremy.kloth@gmail.com>
Date: Sun, 9 Dec 2018 08:13:29 -0700
Subject: [PATCH 2/3] Enable display of computed build properties in
 ShowVersionInfo

---
 PCbuild/build.bat | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/PCbuild/build.bat b/PCbuild/build.bat
index d4aebf5551379f7..759aa5221b42662 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

From 63e032128914322d46a383f9727f6bde547fd77a Mon Sep 17 00:00:00 2001
From: Jeremy Kloth <jeremy.kloth@gmail.com>
Date: Sun, 9 Dec 2018 08:16:37 -0700
Subject: [PATCH 3/3] Use System.Version to compare SDK versions. Added
 computed SDK version to ShowVersionInfo.

---
 PCbuild/python.props | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/PCbuild/python.props b/PCbuild/python.props
index cf75535c00df552..f474e6f07e6dacc 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -82,9 +82,13 @@
 
     <!-- The minimum allowed SDK version to use for building -->
     <DefaultWindowsSDKVersion>10.0.10586.0</DefaultWindowsSDKVersion>
-    <DefaultWindowsSDKVersion Condition="$(_RegistryVersion.CompareTo($(DefaultWindowsSDKVersion))) >= 0">$(_RegistryVersion)</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>