diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-09-16 19:47:09 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-16 19:47:09 (GMT) |
| commit | f798cef8aaaa7faeb428bdb9ebf73df1a6146304 (patch) | |
| tree | b34c7266af8febed71a1f02c542a2ab3e42bb614 | |
| parent | e2856859f646989d10843841d437891b652a34e2 (diff) | |
| download | cpython-f798cef8aaaa7faeb428bdb9ebf73df1a6146304.zip cpython-f798cef8aaaa7faeb428bdb9ebf73df1a6146304.tar.gz cpython-f798cef8aaaa7faeb428bdb9ebf73df1a6146304.tar.bz2 | |
bpo-45220: Avoid automatically selecting the Windows 11 SDK preview when building (GH-28393) (GH-28394)
(cherry picked from commit f4b94b1f57827083990272b5f282aa1493ae2bf4)
Co-authored-by: Steve Dower <steve.dower@python.org>
| -rw-r--r-- | Misc/NEWS.d/next/Build/2021-09-16-18-00-43.bpo-45220.TgbkvW.rst | 3 | ||||
| -rw-r--r-- | PCbuild/python.props | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Misc/NEWS.d/next/Build/2021-09-16-18-00-43.bpo-45220.TgbkvW.rst b/Misc/NEWS.d/next/Build/2021-09-16-18-00-43.bpo-45220.TgbkvW.rst new file mode 100644 index 0000000..8bbd634 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2021-09-16-18-00-43.bpo-45220.TgbkvW.rst @@ -0,0 +1,3 @@ +Avoid building with the Windows 11 SDK previews automatically. This may be +overridden by setting the ``DefaultWindowsSDKVersion`` environment variable +before building. diff --git a/PCbuild/python.props b/PCbuild/python.props index 42c67de..888de37 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> |