diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-11-04 13:17:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-04 21:17:08 +0100 |
| commit | c0f3281d6ca5c59d4a11698364463d968b9ddd3c (patch) | |
| tree | 914b53b5e25bb7fad34a23f32c71b8d91a31bd62 | |
| parent | d729c8097910fc8c6d15927ab6176b0bae12674a (diff) | |
| download | cpython-git-c0f3281d6ca5c59d4a11698364463d968b9ddd3c.tar.gz | |
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@python.org>
| -rw-r--r-- | PC/pylauncher.rc | 1 | ||||
| -rw-r--r-- | PC/pyshellext.rc | 1 | ||||
| -rw-r--r-- | PC/python_exe.rc | 1 | ||||
| -rw-r--r-- | PC/python_nt.rc | 1 | ||||
| -rw-r--r-- | PC/pythonw_exe.rc | 1 | ||||
| -rw-r--r-- | PC/sqlite3.rc | 1 | ||||
| -rw-r--r-- | PCbuild/python.props | 3 |
7 files changed, 0 insertions, 9 deletions
diff --git a/PC/pylauncher.rc b/PC/pylauncher.rc index 92987af713..d21f9b6e9d 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 e5924a42da..fc607e9784 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 ae0b029b80..5eba89962b 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 b5fb58f26b..6fd872c1a0 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 88bf3592e1..562652be18 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 84bd87d9d5..d2c18f8add 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 888de37caa..42c67de4af 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> |