From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 21 Mar 2019 21:54:59 +0000 (-0700)
Subject: Fix registry key for Windows SDK detection (GH-12445)
X-Git-Tag: v3.7.4rc1~317
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cba5ddf088683859dd022d04cb3726d56f5f0297;p=thirdparty%2FPython%2Fcpython.git

Fix registry key for Windows SDK detection (GH-12445)

(cherry picked from commit aedc273fd90e31c7a20904568de3115f8957395b)

Co-authored-by: Isuru Fernando <isuruf@gmail.com>
---

diff --git a/PCbuild/python.props b/PCbuild/python.props
index f83d4df0d59f..683fbb6e6f84 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -76,7 +76,7 @@
     matter which WinSDK version we use.
     -->
     <_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>
+    <_RegistryVersion Condition="$(_RegistryVersion) == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</_RegistryVersion>
     <!-- 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>