summaryrefslogtreecommitdiffstats
path: root/PCbuild
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2021-11-04 17:01:19 (GMT)
committerGitHub <noreply@github.com>2021-11-04 17:01:19 (GMT)
commit1a44d27e6f8a06cb7d56e39be48852f0c3f4502b (patch)
tree364986b22b56c3cd7c15ece10f64817bcd2951cf /PCbuild
parent7e244fc80434584d082c0c7a3d9a92e69aa30061 (diff)
downloadcpython-1a44d27e6f8a06cb7d56e39be48852f0c3f4502b.zip
cpython-1a44d27e6f8a06cb7d56e39be48852f0c3f4502b.tar.gz
cpython-1a44d27e6f8a06cb7d56e39be48852f0c3f4502b.tar.bz2
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>
Diffstat (limited to 'PCbuild')
-rw-r--r--PCbuild/python.props3
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>