mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Steve Dower 2021-11-04 16:39:36 +00:00 committed by GitHub
parent 36b4f9e2a7
commit fd0c84dc28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PC/pylauncher.rc
View File

@ -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)

1
PC/pyshellext.rc
View File

@ -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
PC/python_exe.rc
View File

@ -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"

1
PC/python_nt.rc
View File

@ -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"
/////////////////////////////////////////////////////////////////////////////

1
PC/pythonw_exe.rc
View File

@ -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"

1
PC/sqlite3.rc
View File

@ -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"
/////////////////////////////////////////////////////////////////////////////

3
PCbuild/python.props
View File

@ -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>