diff options
| author | Steve Dower <steve.dower@python.org> | 2021-09-16 18:29:32 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-16 18:29:32 (GMT) |
| commit | f4b94b1f57827083990272b5f282aa1493ae2bf4 (patch) | |
| tree | d38f42a5007e99191f4927350caf86c7cb0e8249 /PCbuild | |
| parent | 7dacb70485a0910eb298c24b4d051720ca56fb91 (diff) | |
| download | cpython-f4b94b1f57827083990272b5f282aa1493ae2bf4.zip cpython-f4b94b1f57827083990272b5f282aa1493ae2bf4.tar.gz cpython-f4b94b1f57827083990272b5f282aa1493ae2bf4.tar.bz2 | |
bpo-45220: Avoid automatically selecting the Windows 11 SDK preview when building (GH-28393)
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/python.props | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/PCbuild/python.props b/PCbuild/python.props index 54dcef0..686d3ff 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -107,6 +107,9 @@ <!-- 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> |