From: Steve Dower <steve.dower@python.org>
Date: Wed, 30 Jun 2021 19:06:06 +0000 (+0100)
Subject: bpo-44535: Enable building with Visual Studio 2022 on Windows (GH-26962)
X-Git-Tag: v3.11.0a1~759
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d3a95c1b6eacbbbd92c294744e7ed41932f3f63e;p=thirdparty%2FPython%2Fcpython.git

bpo-44535: Enable building with Visual Studio 2022 on Windows (GH-26962)
---

diff --git a/Misc/NEWS.d/next/Build/2021-06-30-02-32-46.bpo-44535.M9iN4-.rst b/Misc/NEWS.d/next/Build/2021-06-30-02-32-46.bpo-44535.M9iN4-.rst
new file mode 100644
index 000000000000..e06d0d304852
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2021-06-30-02-32-46.bpo-44535.M9iN4-.rst
@@ -0,0 +1 @@
+Enable building using a Visual Studio 2022 install on Windows.
diff --git a/PCbuild/python.props b/PCbuild/python.props
index 4a56d50b8b76..60625101b472 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -11,6 +11,7 @@
 
     We set BasePlatformToolset for ICC's benefit, it's otherwise ignored.
     -->
+    <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and ('$(MSBuildToolsVersion)' == '17.0' or '$(VisualStudioVersion)' == '17.0')">v142</BasePlatformToolset>
     <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and ('$(MSBuildToolsVersion)' == '16.0' or '$(VisualStudioVersion)' == '16.0')">v142</BasePlatformToolset>
     <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and ('$(MSBuildToolsVersion)' == '15.0' or '$(VisualStudioVersion)' == '15.0')">v141</BasePlatformToolset>
     <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(VCTargetsPath14)' != ''">v140</BasePlatformToolset>