mirror of https://github.com/python/cpython
bpo-45220: Avoid automatically selecting the Windows 11 SDK preview when building (GH-28393)
This commit is contained in:
parent
7dacb70485
commit
f4b94b1f57
|
@ -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.
|
|
@ -107,6 +107,9 @@
|
||||||
<!-- Sometimes the version in the registry has to .0 suffix, and sometimes it doesn't. Check and add it -->
|
<!-- 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>
|
<_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 -->
|
<!-- The minimum allowed SDK version to use for building -->
|
||||||
<DefaultWindowsSDKVersion>10.0.10586.0</DefaultWindowsSDKVersion>
|
<DefaultWindowsSDKVersion>10.0.10586.0</DefaultWindowsSDKVersion>
|
||||||
<DefaultWindowsSDKVersion Condition="$(_RegistryVersion) != '' and $([System.Version]::Parse($(_RegistryVersion))) > $([System.Version]::Parse($(DefaultWindowsSDKVersion)))">$(_RegistryVersion)</DefaultWindowsSDKVersion>
|
<DefaultWindowsSDKVersion Condition="$(_RegistryVersion) != '' and $([System.Version]::Parse($(_RegistryVersion))) > $([System.Version]::Parse($(DefaultWindowsSDKVersion)))">$(_RegistryVersion)</DefaultWindowsSDKVersion>
|
||||||
|
|
Loading…
Reference in New Issue