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

(cherry picked from commit fd0c84dc28d00d68e4f43034dc41786a682390fd)

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

diff --git a/PC/pylauncher.rc b/PC/pylauncher.rc
index 92987af7138dd38c0a32dc52115794c48bde2cee..d21f9b6e9d2aba9902b1496fdeb3ae19fc364daa 100644 (file)
--- 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 e5924a42dabe296deaa015200dcce37320e9b264..fc607e97840fb0d62e8d7964cfe3d39448f82099 100644 (file)
--- 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 ae0b029b8070a44c23a9da1b860f2bc888119158..5eba89962b475b04903a29255058e26baccb71cb 100644 (file)
--- 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 b5fb58f26b20281a1a3f640500b6a4cfafc96b6c..6fd872c1a03cc27d6d4926b9547f62f8144046e2 100644 (file)
--- 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 88bf3592e18124bf6b7bbe19449ddce13cc4736c..562652be184719a4b0a6a9629066ef12154253d5 100644 (file)
--- 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 84bd87d9d575d6e1f13f17fa646cf16ef645e63b..d2c18f8add8b26e239580c6c38f4597bc763b7e6 100644 (file)
--- 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 888de37caaa25c02e0c4c9daca9743b86c7d5b37..42c67de4afa343618e2d4c32be84fc37da4e1530 100644 (file)
--- 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>