diff options
author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-11-04 20:17:08 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-04 20:17:08 (GMT) |
commit | c0f3281d6ca5c59d4a11698364463d968b9ddd3c (patch) | |
tree | 914b53b5e25bb7fad34a23f32c71b8d91a31bd62 /PCbuild/python.props | |
parent | d729c8097910fc8c6d15927ab6176b0bae12674a (diff) | |
download | cpython-c0f3281d6ca5c59d4a11698364463d968b9ddd3c.zip cpython-c0f3281d6ca5c59d4a11698364463d968b9ddd3c.tar.gz cpython-c0f3281d6ca5c59d4a11698364463d968b9ddd3c.tar.bz2 |
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>
Diffstat (limited to 'PCbuild/python.props')
-rw-r--r-- | PCbuild/python.props | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/PCbuild/python.props b/PCbuild/python.props index 888de37..42c67de 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> |