[Python-checkins] bpo-45220: Remove invalid include from resource definition files on Windows (GH-29396) (GH-29406)

[ambv]

https://github.com/python/cpython/commit/c0f3281d6ca5c59d4a11698364463d968b9ddd3c
commit: c0f3281d6ca5c59d4a11698364463d968b9ddd3c
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: ambv <lukasz at langa.pl>
date: 2021-11-04T21:17:08+01:00
summary:

bpo-45220: Remove invalid include from resource definition files on Windows (GH-29396) (GH-29406)

(cherry picked from commit fd0c84dc28d00d68e4f43034dc41786a682390fd)

Co-authored-by: Steve Dower <steve.dower at python.org>

files:
M PC/pylauncher.rc
M PC/pyshellext.rc
M PC/python_exe.rc
M PC/python_nt.rc
M PC/pythonw_exe.rc
M PC/sqlite3.rc
M PCbuild/python.props

diff --git a/PC/pylauncher.rc b/PC/pylauncher.rc
index 92987af7138dd..d21f9b6e9d2ab 100644
--- a/PC/pylauncher.rc
+++ b/PC/pylauncher.rc
@@ -4,7 +4,6 @@
 
 // Include the manifest file that indicates we support all
 // current versions of Windows.
-#include <winuser.h>
 1 RT_MANIFEST "python.manifest"
 
 #if defined(PY_ICON)
diff --git a/PC/pyshellext.rc b/PC/pyshellext.rc
index e5924a42dabe2..fc607e97840fb 100644
--- a/PC/pyshellext.rc
+++ b/PC/pyshellext.rc
@@ -4,7 +4,6 @@
 
 // Include the manifest file that indicates we support all
 // current versions of Windows.
-#include <winuser.h>
 1 RT_MANIFEST "python.manifest"
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/PC/python_exe.rc b/PC/python_exe.rc
index ae0b029b8070a..5eba89962b475 100644
--- a/PC/python_exe.rc
+++ b/PC/python_exe.rc
@@ -4,7 +4,6 @@
 
 // Include the manifest file that indicates we support all
 // current versions of Windows.
-#include <winuser.h>
 1 RT_MANIFEST "python.manifest"
 
 1 ICON DISCARDABLE "icons\python.ico" 
diff --git a/PC/python_nt.rc b/PC/python_nt.rc
index b5fb58f26b202..6fd872c1a03cc 100644
--- a/PC/python_nt.rc
+++ b/PC/python_nt.rc
@@ -4,7 +4,6 @@
 
 // Include the manifest file that indicates we support all
 // current versions of Windows.
-#include <winuser.h>
 2 RT_MANIFEST "python.manifest"
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/PC/pythonw_exe.rc b/PC/pythonw_exe.rc
index 88bf3592e1812..562652be18471 100644
--- a/PC/pythonw_exe.rc
+++ b/PC/pythonw_exe.rc
@@ -4,7 +4,6 @@
 
 // Include the manifest file that indicates we support all
 // current versions of Windows.
-#include <winuser.h>
 1 RT_MANIFEST "python.manifest"
 
 1 ICON DISCARDABLE "icons\pythonw.ico" 
diff --git a/PC/sqlite3.rc b/PC/sqlite3.rc
index 84bd87d9d575d..d2c18f8add8b2 100644
--- a/PC/sqlite3.rc
+++ b/PC/sqlite3.rc
@@ -4,7 +4,6 @@
 
 // Include the manifest file that indicates we support all
 // current versions of Windows.
-#include <winuser.h>
 2 RT_MANIFEST "python.manifest"
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/PCbuild/python.props b/PCbuild/python.props
index 888de37caaa25..42c67de4afa34 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -107,9 +107,6 @@
     <!-- 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>
 
-    <!-- Avoid upgrading to Windows 11 SDK for now, but assume the latest Win10 SDK is installed -->
-    <_RegistryVersion Condition="$([System.Version]::Parse($(_RegistryVersion))) >= $([System.Version]::Parse(`10.0.22000.0`))">10.0.19041.0</_RegistryVersion>
-
     <!-- The minimum allowed SDK version to use for building -->
     <DefaultWindowsSDKVersion>10.0.10586.0</DefaultWindowsSDKVersion>
     <DefaultWindowsSDKVersion Condition="$(_RegistryVersion) != '' and $([System.Version]::Parse($(_RegistryVersion))) > $([System.Version]::Parse($(DefaultWindowsSDKVersion)))">$(_RegistryVersion)</DefaultWindowsSDKVersion>