[python3] Disable registry access to determine WinSDK (#17579)

Co-authored-by: Robert Schumacher <ras0219@outlook.com>
microsoft · Apr 29, 2021 · 4f942e1 · 4f942e1
1 parent 387623e
commit 4f942e1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake
@@ -88,6 +88,11 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
             "/p:ForceImportBeforeCppTargets=${SOURCE_PATH}/PCbuild/python_vcpkg.props"
         )
     endif()
+    string(REPLACE "\\" "" WindowsSDKVersion "$ENV{WindowsSDKVersion}")
+    list(APPEND OPTIONS
+        "/p:WindowsTargetPlatformVersion=${WindowsSDKVersion}"
+        "/p:DefaultWindowsSDKVersion=${WindowsSDKVersion}"
+    )
     if(VCPKG_TARGET_IS_UWP)
         list(APPEND OPTIONS "/p:IncludeUwp=true")
     else()

diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "python3",
   "version-string": "3.9.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "The Python programming language",
   "homepage": "https://github.com/python/cpython",
   "supports": "!(arm | uwp)",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -4966,7 +4966,7 @@
     },
     "python3": {
       "baseline": "3.9.2",
-      "port-version": 1
+      "port-version": 2
     },
     "qca": {
       "baseline": "2.3.1",

diff --git a/versions/p-/python3.json b/versions/p-/python3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ebb4ed9ed737c672ca5462a4019a704b6461e91d",
+      "version-string": "3.9.2",
+      "port-version": 2
+    },
     {
       "git-tree": "025737aca98a8b23d4ea8de388dacfba6b844eca",
       "version-string": "3.9.2",