From 174fa0f13b295bc1053fce58c6b2dd99f1b7ff7d Mon Sep 17 00:00:00 2001
From: Wulian233 <1055917385@qq.com>
Date: Sun, 15 Sep 2024 19:13:38 +0800
Subject: [PATCH 1/6] Update Dependency Information for PCBuild to Correct
 Information

---
 PCbuild/build.bat         |  2 +-
 PCbuild/get_externals.bat |  2 +-
 PCbuild/python.props      |  2 +-
 PCbuild/readme.txt        |  8 ++++----
 Tools/msi/README.txt      | 26 +++++++++++++-------------
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/PCbuild/build.bat b/PCbuild/build.bat
index 6c76f09a071312..64f0a7f41c22b8 100644
--- a/PCbuild/build.bat
+++ b/PCbuild/build.bat
@@ -8,7 +8,7 @@ echo.version(s) of Microsoft Visual Studio to be installed (see readme.txt).
 echo.
 echo.After the flags recognized by this script, up to 9 arguments to be passed
 echo.directly to MSBuild may be passed.  If the argument contains an '=', the
-echo.entire argument must be quoted (e.g. `%~nx0 "/p:PlatformToolset=v100"`).
+echo.entire argument must be quoted (e.g. `%~nx0 "/p:PlatformToolset=v140"`).
 echo.Alternatively you can put extra flags for MSBuild in a file named 
 echo.`msbuild.rsp` in the `PCbuild` directory, one flag per line. This file
 echo.will be picked automatically by MSBuild. Flags put in this file does not
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index a1a67966182863..137c94789e1809 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -45,7 +45,7 @@ if "%ORG%"=="" (set ORG=python)
 call "%PCBUILD%\find_python.bat" "%PYTHON%"
 
 if NOT DEFINED PYTHON (
-    where /Q git || echo Python 3.6 could not be found or installed, and git.exe is not on your PATH && exit /B 1
+    where /Q git || echo Python 3.10 or later could not be found or installed, and git.exe is not on your PATH && exit /B 1
 )
 
 echo.Fetching external libraries...
diff --git a/PCbuild/python.props b/PCbuild/python.props
index c8ecdb4515ae9a..268a844bfe902c 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -6,7 +6,7 @@
     <Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
     <!--
     Use the latest available version of Visual Studio to build. To override
-    this and build with an earlier version, pass "/p:PlatformToolset=v100"
+    this and build with an earlier version, pass "/p:PlatformToolset=v140"
     (for example) when building.
 
     We set BasePlatformToolset for ICC's benefit, it's otherwise ignored.
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index f4dfe0e9015f02..865e294d260a49 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -3,7 +3,7 @@ Quick Start Guide
 
 1.  Install Microsoft Visual Studio 2017 or later with Python workload and
     Python native development component.
-1a. Optionally install Python 3.6 or later.  If not installed,
+1a. Optionally install Python 3.10 or later.  If not installed,
     get_externals.bat (via build.bat) will download and use Python via
     NuGet.
 2.  Run "build.bat" to build Python in 32-bit Release configuration.
@@ -57,7 +57,7 @@ Building Python using the build.bat script
 
 In this directory you can find build.bat, a script designed to make
 building Python on Windows simpler.  This script will use the env.bat
-script to detect either Visual Studio 2017 or 2015, either of
+script to detect either Visual Studio 2017 or later, either of
 which may be used to build Python. Currently Visual Studio 2017 is
 officially supported.
 
@@ -172,7 +172,7 @@ _lzma
     Homepage:
         https://tukaani.org/xz/
 _ssl
-    Python wrapper for version 3.0 of the OpenSSL secure sockets
+    Python wrapper for version 3.0.15 of the OpenSSL secure sockets
     library, which is downloaded from our binaries repository at
     https://github.com/python/cpython-bin-deps.
 
@@ -195,7 +195,7 @@ _sqlite3
     Homepage:
         https://www.sqlite.org/
 _tkinter
-    Wraps version 8.6.6 of the Tk windowing system, which is downloaded
+    Wraps version 8.6.14 of the Tk windowing system, which is downloaded
     from our binaries repository at
     https://github.com/python/cpython-bin-deps.
 
diff --git a/Tools/msi/README.txt b/Tools/msi/README.txt
index c25ada8397cd95..b3c860856fa95b 100644
--- a/Tools/msi/README.txt
+++ b/Tools/msi/README.txt
@@ -67,18 +67,18 @@ similarly named file in PCbuild.)
 
 One of the dependencies used in builds is WiX, a toolset that lets developers
 create installers for Windows Installer, the Windows installation engine. WiX
-has a dependency on the Microsoft .NET Framework Version 3.5 (which may not be
-configured on recent versions of Windows, such as Windows 10). If you are
-building on a recent Windows version, use the Control Panel (Programs | Programs
-and Features | Turn Windows Features on or off) and ensure that the entry
-".NET Framework 3.5 (includes .NET 2.0 and 3.0)" is enabled.
-
-For Python 3.11.x and above, enable "Microsoft .NET Framework 4.8 Advanced Services"
-instead of "Microsoft .NET Framework Version 3.5" available for Windows 10 and above.
-Also make sure "MSVC v143 - VS 2022 C++ ARM64 build tools" are selected under
-"Desktop Development with C++" in "Visual Studio installer" even if you are not
-building on ARM64 along with other x64 related v143 build tools. This is because for
-3.11.x and above we have upgraded to Wix-3.14.
+has a dependency on the Microsoft .NET Framework 4.8 Advanced Services (which
+may not be configured on recent versions of Windows, such as Windows 10 or
+later). If you are building on these recent versions, use the Control Panel
+(Programs | Programs and Features | Turn Windows Features on or off) and
+ensure that the entry "Microsoft .NET Framework 4.8 Advanced Services" is
+enabled.
+
+Additionally, make sure "MSVC v14x - VS 20xx C++ ARM64 build tools" are
+selected under "Desktop Development with C++" in "Visual Studio installer",
+even if you are not building on ARM64. This is required because we have
+upgraded to WiX-3.14, which requires these tools for Python 3.11 and later
+versions.
 
 For testing, the installer should be built with the Tools/msi/build.bat
 script:
@@ -107,7 +107,7 @@ be available alongside. This takes longer, but is easier to share.
 For an official release, the installer should be built with the
 Tools/msi/buildrelease.bat script:
 
-    set PYTHON=<path to Python 2.7 or 3.4>
+    set PYTHON=<path to Python 3.10 or later>
     set SPHINXBUILD=<path to sphinx-build.exe>
     set PATH=<path to Git (git.exe)>;%PATH%
 

From 12017f8b3567121043a69e65d660d856854d878d Mon Sep 17 00:00:00 2001
From: Wulian233 <1055917385@qq.com>
Date: Mon, 16 Sep 2024 09:42:40 +0800
Subject: [PATCH 2/6] news

---
 .../next/Build/2024-09-16-09-42-05.gh-issue-124102.Ow254j.rst   | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 Misc/NEWS.d/next/Build/2024-09-16-09-42-05.gh-issue-124102.Ow254j.rst

diff --git a/Misc/NEWS.d/next/Build/2024-09-16-09-42-05.gh-issue-124102.Ow254j.rst b/Misc/NEWS.d/next/Build/2024-09-16-09-42-05.gh-issue-124102.Ow254j.rst
new file mode 100644
index 00000000000000..53e1699ed475a2
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2024-09-16-09-42-05.gh-issue-124102.Ow254j.rst
@@ -0,0 +1,2 @@
+Update Dependency Information for PCBuild to Correct Information. Now
+requires VS2017 or later and Python 3.10 or later

From 6c54282e45a2da5e2677e370b1ef19c5221d4b4b Mon Sep 17 00:00:00 2001
From: Wulian <1055917385@qq.com>
Date: Mon, 16 Sep 2024 16:41:02 +0800
Subject: [PATCH 3/6] env.bat now support VS2017+ (2015 is min ver) NOTE:
 remove find VS2015 earlier bacause not support

---
 PCbuild/env.bat                             | 10 +++++-----
 PCbuild/find_msbuild.bat                    | 10 ----------
 PCbuild/python.props                        |  3 ---
 PCbuild/tcltk.props                         |  3 ---
 Tools/msi/bundle/bootstrap/pythonba.vcxproj |  1 -
 5 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/PCbuild/env.bat b/PCbuild/env.bat
index 2820e304582cff..b2f2b43a7ae7c3 100644
--- a/PCbuild/env.bat
+++ b/PCbuild/env.bat
@@ -4,8 +4,8 @@ rem command window. However, most builds of Python will ignore the version
 rem of the tools on PATH and use PlatformToolset instead. Ideally, both sets of
 rem tools should be the same version to avoid potential conflicts.
 rem
-rem To build Python with an earlier toolset, pass "/p:PlatformToolset=v100" (or
-rem 'v110', 'v120' or 'v140') to the build script.
+rem To build Python with an earlier toolset, pass "/p:PlatformToolset=v140" (or
+rem 'v142', 'v141') to the build script.
 
 echo Build environments: x86, amd64, x86_amd64
 echo.
@@ -20,8 +20,8 @@ call "%VSTOOLS%" %_ARGS%
 exit /B 0
 
 :skip_vswhere
+if not defined VSTOOLS set VSTOOLS=%VS143COMNTOOLS%
+if not defined VSTOOLS set VSTOOLS=%VS142COMNTOOLS%
+if not defined VSTOOLS set VSTOOLS=%VS141COMNTOOLS%
 if not defined VSTOOLS set VSTOOLS=%VS140COMNTOOLS%
-if not defined VSTOOLS set VSTOOLS=%VS120COMNTOOLS%
-if not defined VSTOOLS set VSTOOLS=%VS110COMNTOOLS%
-if not defined VSTOOLS set VSTOOLS=%VS100COMNTOOLS%
 call "%VSTOOLS%..\..\VC\vcvarsall.bat" %_ARGS%
diff --git a/PCbuild/find_msbuild.bat b/PCbuild/find_msbuild.bat
index ce7e71efa31f6c..82dd34beede6ee 100644
--- a/PCbuild/find_msbuild.bat
+++ b/PCbuild/find_msbuild.bat
@@ -39,16 +39,6 @@
 @if defined MSBUILD @if exist %MSBUILD% (set _Py_MSBuild_Source=Visual Studio installation) & goto :found
 :skip_vswhere
 
-@rem VS 2015 and earlier register MSBuild separately, so we can find it.
-@reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0" /v MSBuildToolsPath /reg:32 >nul 2>nul
-@if NOT ERRORLEVEL 1 @for /F "tokens=1,2*" %%i in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0" /v MSBuildToolsPath /reg:32') DO @(
-    @if "%%i"=="MSBuildToolsPath" @if exist "%%k\msbuild.exe" @(set MSBUILD="%%k\msbuild.exe")
-)
-@if exist %MSBUILD% (set _Py_MSBuild_Source=registry) & goto :found
-
-
-@exit /b 1
-
 :found
 @pushd %MSBUILD% >nul 2>nul
 @if not ERRORLEVEL 1 @(
diff --git a/PCbuild/python.props b/PCbuild/python.props
index 268a844bfe902c..3c3193477531bb 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -15,9 +15,6 @@
     <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(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>
-    <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(VCTargetsPath12)' != ''">v120</BasePlatformToolset>
-    <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(VCTargetsPath11)' != ''">v110</BasePlatformToolset>
-    <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(VCTargetsPath10)' != ''">v100</BasePlatformToolset>
 
     <PlatformToolset Condition="'$(PlatformToolset)' == ''">$(BasePlatformToolset)</PlatformToolset>
     <ICCBuild>false</ICCBuild>
diff --git a/PCbuild/tcltk.props b/PCbuild/tcltk.props
index 95b699b4cac0aa..83c38c993d5754 100644
--- a/PCbuild/tcltk.props
+++ b/PCbuild/tcltk.props
@@ -37,9 +37,6 @@
     <BuildDirTop Condition="$(Configuration) == 'Debug'">Debug</BuildDirTop>
     <BuildDirTop Condition="$(TclMachine) != 'IX86'">$(BuildDirTop)_$(TclMachine)</BuildDirTop>
     <BuildDirTop Condition="$(PlatformToolset.StartsWith('v14'))">$(BuildDirTop)_VC13</BuildDirTop>
-    <BuildDirTop Condition="$(PlatformToolset) == 'v120'">$(BuildDirTop)_VC12</BuildDirTop>
-    <BuildDirTop Condition="$(PlatformToolset) == 'v110'">$(BuildDirTop)_VC11</BuildDirTop>
-    <BuildDirTop Condition="$(PlatformToolset) == 'v100'">$(BuildDirTop)_VC10</BuildDirTop>
   </PropertyGroup>
 
   <!--
diff --git a/Tools/msi/bundle/bootstrap/pythonba.vcxproj b/Tools/msi/bundle/bootstrap/pythonba.vcxproj
index bb383bfcaa240e..11bf3402c60d67 100644
--- a/Tools/msi/bundle/bootstrap/pythonba.vcxproj
+++ b/Tools/msi/bundle/bootstrap/pythonba.vcxproj
@@ -52,7 +52,6 @@
       <AdditionalDependencies>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib;dutil.lib;balutil.lib;version.lib;uxtheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories Condition="$(PlatformToolset.StartsWith(`v14`))">$(WixInstallPath)sdk\vs2017\lib\x86</AdditionalLibraryDirectories>
       <AdditionalLibraryDirectories Condition="'$(PlatformToolset)' == 'v140'">$(WixInstallPath)sdk\vs2015\lib\x86</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="'$(PlatformToolset)' == 'v120'">$(WixInstallPath)sdk\vs2013\lib\x86</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>pythonba.def</ModuleDefinitionFile>
       <GenerateDebugInformation Condition="'$(Configuration)'=='Debug'">true</GenerateDebugInformation>
     </Link>

From 7b634a846a17c3beabd97fd8fcd30ef5c31c8cbb Mon Sep 17 00:00:00 2001
From: Wulian <1055917385@qq.com>
Date: Tue, 17 Sep 2024 10:48:48 +0800
Subject: [PATCH 4/6] remove VS2015

---
 .../2024-09-16-09-42-05.gh-issue-124102.Ow254j.rst     |  4 ++--
 PCbuild/env.bat                                        |  5 ++---
 PCbuild/python.props                                   |  3 +--
 PCbuild/pythoncore.vcxproj                             |  2 +-
 Tools/msi/README.txt                                   | 10 ++--------
 Tools/msi/bundle/bootstrap/pythonba.vcxproj            |  2 --
 6 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/Misc/NEWS.d/next/Build/2024-09-16-09-42-05.gh-issue-124102.Ow254j.rst b/Misc/NEWS.d/next/Build/2024-09-16-09-42-05.gh-issue-124102.Ow254j.rst
index 53e1699ed475a2..6edc9a6abbced4 100644
--- a/Misc/NEWS.d/next/Build/2024-09-16-09-42-05.gh-issue-124102.Ow254j.rst
+++ b/Misc/NEWS.d/next/Build/2024-09-16-09-42-05.gh-issue-124102.Ow254j.rst
@@ -1,2 +1,2 @@
-Update Dependency Information for PCBuild to Correct Information. Now
-requires VS2017 or later and Python 3.10 or later
+Update internal documentation under PCbuild, so it now correctly states that
+Windows requires VS2017 or later and Python 3.10 or later
diff --git a/PCbuild/env.bat b/PCbuild/env.bat
index b2f2b43a7ae7c3..cf4638b7aa63a7 100644
--- a/PCbuild/env.bat
+++ b/PCbuild/env.bat
@@ -4,8 +4,8 @@ rem command window. However, most builds of Python will ignore the version
 rem of the tools on PATH and use PlatformToolset instead. Ideally, both sets of
 rem tools should be the same version to avoid potential conflicts.
 rem
-rem To build Python with an earlier toolset, pass "/p:PlatformToolset=v140" (or
-rem 'v142', 'v141') to the build script.
+rem To build Python with an earlier toolset, pass "/p:PlatformToolset=v141" (or
+rem 'v142', 'v143') to the build script.
 
 echo Build environments: x86, amd64, x86_amd64
 echo.
@@ -23,5 +23,4 @@ exit /B 0
 if not defined VSTOOLS set VSTOOLS=%VS143COMNTOOLS%
 if not defined VSTOOLS set VSTOOLS=%VS142COMNTOOLS%
 if not defined VSTOOLS set VSTOOLS=%VS141COMNTOOLS%
-if not defined VSTOOLS set VSTOOLS=%VS140COMNTOOLS%
 call "%VSTOOLS%..\..\VC\vcvarsall.bat" %_ARGS%
diff --git a/PCbuild/python.props b/PCbuild/python.props
index 3c3193477531bb..6e90178f4ea8ab 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -6,7 +6,7 @@
     <Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
     <!--
     Use the latest available version of Visual Studio to build. To override
-    this and build with an earlier version, pass "/p:PlatformToolset=v140"
+    this and build with an earlier version, pass "/p:PlatformToolset=v141"
     (for example) when building.
 
     We set BasePlatformToolset for ICC's benefit, it's otherwise ignored.
@@ -14,7 +14,6 @@
     <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(VisualStudioVersion)' == '17.0'">v143</BasePlatformToolset>
     <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(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>
 
     <PlatformToolset Condition="'$(PlatformToolset)' == ''">$(BasePlatformToolset)</PlatformToolset>
     <ICCBuild>false</ICCBuild>
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index 6399eac313db29..19b982db7f5b87 100644
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -738,7 +738,7 @@
       </ClCompile>
     </ItemGroup>
   </Target>
-  <Target Name="_WarnAboutToolset" BeforeTargets="PrepareForBuild" Condition="$(PlatformToolset) != 'v140' and $(PlatformToolset) != 'v141' and $(PlatformToolset) != 'v142' and $(PlatformToolset) != 'v143'">
+  <Target Name="_WarnAboutToolset" BeforeTargets="PrepareForBuild" Condition="$(PlatformToolset) != 'v141' and $(PlatformToolset) != 'v142' and $(PlatformToolset) != 'v143'">
     <Warning Text="Toolset $(PlatformToolset) is not used for official builds. Your build may have errors or incompatibilities." />
   </Target>
   <Target Name="_WarnAboutZlib" BeforeTargets="PrepareForBuild" Condition="!$(IncludeExternals)">
diff --git a/Tools/msi/README.txt b/Tools/msi/README.txt
index b3c860856fa95b..98e5ba039d2bcd 100644
--- a/Tools/msi/README.txt
+++ b/Tools/msi/README.txt
@@ -9,7 +9,7 @@ script:
 For an official release, the installer should be built with the
 Tools/msi/buildrelease.bat script and environment variables:
 
-    set PYTHON=<path to Python 3.8 or later>
+    set PYTHON=<path to Python 3.10 or later>
     set SPHINXBUILD=<path to sphinx-build.exe>
     set PATH=<path to Git (git.exe)>;%PATH%
 
@@ -66,13 +66,7 @@ Tools\msi\get_externals.bat. (Note that this is in addition to the
 similarly named file in PCbuild.)
 
 One of the dependencies used in builds is WiX, a toolset that lets developers
-create installers for Windows Installer, the Windows installation engine. WiX
-has a dependency on the Microsoft .NET Framework 4.8 Advanced Services (which
-may not be configured on recent versions of Windows, such as Windows 10 or
-later). If you are building on these recent versions, use the Control Panel
-(Programs | Programs and Features | Turn Windows Features on or off) and
-ensure that the entry "Microsoft .NET Framework 4.8 Advanced Services" is
-enabled.
+create installers for Windows Installer, the Windows installation engine.
 
 Additionally, make sure "MSVC v14x - VS 20xx C++ ARM64 build tools" are
 selected under "Desktop Development with C++" in "Visual Studio installer",
diff --git a/Tools/msi/bundle/bootstrap/pythonba.vcxproj b/Tools/msi/bundle/bootstrap/pythonba.vcxproj
index 11bf3402c60d67..3970e857894ba5 100644
--- a/Tools/msi/bundle/bootstrap/pythonba.vcxproj
+++ b/Tools/msi/bundle/bootstrap/pythonba.vcxproj
@@ -24,7 +24,6 @@
     <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(VisualStudioVersion)' == '17.0'">v143</PlatformToolset>
     <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
     <PlatformToolset Condition="'$(PlatformToolset)' == '' and ('$(MSBuildToolsVersion)' == '15.0' or '$(VisualStudioVersion)' == '15.0')">v141</PlatformToolset>
-    <PlatformToolset Condition="'$(PlatformToolset)' == ''">v140</PlatformToolset>
     <ProjectGuid>{7A09B132-B3EE-499B-A700-A4B2157FEA3D}</ProjectGuid>
     <TargetName>PythonBA</TargetName>
   </PropertyGroup>
@@ -51,7 +50,6 @@
     <Link>
       <AdditionalDependencies>comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib;dutil.lib;balutil.lib;version.lib;uxtheme.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories Condition="$(PlatformToolset.StartsWith(`v14`))">$(WixInstallPath)sdk\vs2017\lib\x86</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="'$(PlatformToolset)' == 'v140'">$(WixInstallPath)sdk\vs2015\lib\x86</AdditionalLibraryDirectories>
       <ModuleDefinitionFile>pythonba.def</ModuleDefinitionFile>
       <GenerateDebugInformation Condition="'$(Configuration)'=='Debug'">true</GenerateDebugInformation>
     </Link>

From 9b9b716428dc0e09a38108e54f686fb18d0fa2e0 Mon Sep 17 00:00:00 2001
From: Wulian <1055917385@qq.com>
Date: Tue, 17 Sep 2024 11:18:28 +0800
Subject: [PATCH 5/6] remove VS2015

---
 PCbuild/build.bat                             |  2 +-
 Tools/c-analyzer/distutils/_msvccompiler.py   | 35 +-----------
 Tools/c-analyzer/distutils/cygwinccompiler.py | 53 +++++++++++++------
 3 files changed, 39 insertions(+), 51 deletions(-)

diff --git a/PCbuild/build.bat b/PCbuild/build.bat
index 64f0a7f41c22b8..abe649553756a7 100644
--- a/PCbuild/build.bat
+++ b/PCbuild/build.bat
@@ -8,7 +8,7 @@ echo.version(s) of Microsoft Visual Studio to be installed (see readme.txt).
 echo.
 echo.After the flags recognized by this script, up to 9 arguments to be passed
 echo.directly to MSBuild may be passed.  If the argument contains an '=', the
-echo.entire argument must be quoted (e.g. `%~nx0 "/p:PlatformToolset=v140"`).
+echo.entire argument must be quoted (e.g. `%~nx0 "/p:PlatformToolset=v141"`).
 echo.Alternatively you can put extra flags for MSBuild in a file named 
 echo.`msbuild.rsp` in the `PCbuild` directory, one flag per line. This file
 echo.will be picked automatically by MSBuild. Flags put in this file does not
diff --git a/Tools/c-analyzer/distutils/_msvccompiler.py b/Tools/c-analyzer/distutils/_msvccompiler.py
index 1e67870d13323d..92de591947127d 100644
--- a/Tools/c-analyzer/distutils/_msvccompiler.py
+++ b/Tools/c-analyzer/distutils/_msvccompiler.py
@@ -1,9 +1,9 @@
 """distutils._msvccompiler
 
 Contains MSVCCompiler, an implementation of the abstract CCompiler class
-for Microsoft Visual Studio 2015.
+for Microsoft Visual Studio 2017 and later.
 
-The module is compatible with VS 2015 and later. You can find legacy support
+The module is compatible with VS 2017 and later. You can find legacy support
 for older versions in distutils.msvc9compiler and distutils.msvccompiler.
 """
 
@@ -23,34 +23,6 @@
 
 from itertools import count
 
-def _find_vc2015():
-    try:
-        key = winreg.OpenKeyEx(
-            winreg.HKEY_LOCAL_MACHINE,
-            r"Software\Microsoft\VisualStudio\SxS\VC7",
-            access=winreg.KEY_READ | winreg.KEY_WOW64_32KEY
-        )
-    except OSError:
-        log.debug("Visual C++ is not registered")
-        return None, None
-
-    best_version = 0
-    best_dir = None
-    with key:
-        for i in count():
-            try:
-                v, vc_dir, vt = winreg.EnumValue(key, i)
-            except OSError:
-                break
-            if v and vt == winreg.REG_SZ and os.path.isdir(vc_dir):
-                try:
-                    version = int(float(v))
-                except (ValueError, TypeError):
-                    continue
-                if version >= 14 and version > best_version:
-                    best_version, best_dir = version, vc_dir
-    return best_version, best_dir
-
 def _find_vc2017():
     """Returns "15, path" based on the result of invoking vswhere.exe
     If no install is found, returns "None, None"
@@ -94,9 +66,6 @@ def _find_vcvarsall(plat_spec):
     # bpo-38597: Removed vcruntime return value
     _, best_dir = _find_vc2017()
 
-    if not best_dir:
-        best_version, best_dir = _find_vc2015()
-
     if not best_dir:
         log.debug("No suitable Visual C++ version found")
         return None, None
diff --git a/Tools/c-analyzer/distutils/cygwinccompiler.py b/Tools/c-analyzer/distutils/cygwinccompiler.py
index a8409179d677a7..79e8cacc4e9e0a 100644
--- a/Tools/c-analyzer/distutils/cygwinccompiler.py
+++ b/Tools/c-analyzer/distutils/cygwinccompiler.py
@@ -61,23 +61,42 @@ def get_msvcr():
     msc_pos = sys.version.find('MSC v.')
     if msc_pos != -1:
         msc_ver = sys.version[msc_pos+6:msc_pos+10]
-        if msc_ver == '1300':
-            # MSVC 7.0
-            return ['msvcr70']
-        elif msc_ver == '1310':
-            # MSVC 7.1
-            return ['msvcr71']
-        elif msc_ver == '1400':
-            # VS2005 / MSVC 8.0
-            return ['msvcr80']
-        elif msc_ver == '1500':
-            # VS2008 / MSVC 9.0
-            return ['msvcr90']
-        elif msc_ver == '1600':
-            # VS2010 / MSVC 10.0
-            return ['msvcr100']
-        else:
-            raise ValueError("Unknown MS Compiler version %s " % msc_ver)
+        match msc_ver:
+            case '1300':
+                # MSVC 7.0
+                return ['msvcr70']
+            case '1310':
+                # MSVC 7.1
+                return ['msvcr71']
+            case '1400':
+                # VS2005 / MSVC 8.0
+                return ['msvcr80']
+            case '1500':
+                # VS2008 / MSVC 9.0
+                return ['msvcr90']
+            case '1600':
+                # VS2010 / MSVC 10.0
+                return ['msvcr100']
+            case '1700':
+                # VS2012 / MSVC 11.0
+                return ['msvcr110']
+            case '1800':
+                # VS2013 / MSVC 12.0
+                return ['msvcr120']
+            case '1900':
+                # VS2015 / MSVC 14.0
+                return ['msvcr140']
+            case '1910':
+                # VS2017 / MSVC 14.1
+                return ['msvcr141']
+            case '1920':
+                # VS2019 / MSVC 14.2
+                return ['msvcr142']
+            case '1930':
+                # VS2022 / MSVC 14.3
+                return ['msvcr143']
+            case _:
+                raise ValueError(f"Unknown MS Compiler version {msc_ver}")
 
 
 class CygwinCCompiler(UnixCCompiler):

From 2fd06a891b3f479fbad0d0d4ce2d8f9c49ecbba5 Mon Sep 17 00:00:00 2001
From: Wulian <1055917385@qq.com>
Date: Tue, 24 Sep 2024 06:29:23 +0800
Subject: [PATCH 6/6] revert

---
 Tools/c-analyzer/distutils/_msvccompiler.py   | 35 +++++++++++-
 Tools/c-analyzer/distutils/cygwinccompiler.py | 53 ++++++-------------
 2 files changed, 50 insertions(+), 38 deletions(-)

diff --git a/Tools/c-analyzer/distutils/_msvccompiler.py b/Tools/c-analyzer/distutils/_msvccompiler.py
index 92de591947127d..1e67870d13323d 100644
--- a/Tools/c-analyzer/distutils/_msvccompiler.py
+++ b/Tools/c-analyzer/distutils/_msvccompiler.py
@@ -1,9 +1,9 @@
 """distutils._msvccompiler
 
 Contains MSVCCompiler, an implementation of the abstract CCompiler class
-for Microsoft Visual Studio 2017 and later.
+for Microsoft Visual Studio 2015.
 
-The module is compatible with VS 2017 and later. You can find legacy support
+The module is compatible with VS 2015 and later. You can find legacy support
 for older versions in distutils.msvc9compiler and distutils.msvccompiler.
 """
 
@@ -23,6 +23,34 @@
 
 from itertools import count
 
+def _find_vc2015():
+    try:
+        key = winreg.OpenKeyEx(
+            winreg.HKEY_LOCAL_MACHINE,
+            r"Software\Microsoft\VisualStudio\SxS\VC7",
+            access=winreg.KEY_READ | winreg.KEY_WOW64_32KEY
+        )
+    except OSError:
+        log.debug("Visual C++ is not registered")
+        return None, None
+
+    best_version = 0
+    best_dir = None
+    with key:
+        for i in count():
+            try:
+                v, vc_dir, vt = winreg.EnumValue(key, i)
+            except OSError:
+                break
+            if v and vt == winreg.REG_SZ and os.path.isdir(vc_dir):
+                try:
+                    version = int(float(v))
+                except (ValueError, TypeError):
+                    continue
+                if version >= 14 and version > best_version:
+                    best_version, best_dir = version, vc_dir
+    return best_version, best_dir
+
 def _find_vc2017():
     """Returns "15, path" based on the result of invoking vswhere.exe
     If no install is found, returns "None, None"
@@ -66,6 +94,9 @@ def _find_vcvarsall(plat_spec):
     # bpo-38597: Removed vcruntime return value
     _, best_dir = _find_vc2017()
 
+    if not best_dir:
+        best_version, best_dir = _find_vc2015()
+
     if not best_dir:
         log.debug("No suitable Visual C++ version found")
         return None, None
diff --git a/Tools/c-analyzer/distutils/cygwinccompiler.py b/Tools/c-analyzer/distutils/cygwinccompiler.py
index 79e8cacc4e9e0a..a8409179d677a7 100644
--- a/Tools/c-analyzer/distutils/cygwinccompiler.py
+++ b/Tools/c-analyzer/distutils/cygwinccompiler.py
@@ -61,42 +61,23 @@ def get_msvcr():
     msc_pos = sys.version.find('MSC v.')
     if msc_pos != -1:
         msc_ver = sys.version[msc_pos+6:msc_pos+10]
-        match msc_ver:
-            case '1300':
-                # MSVC 7.0
-                return ['msvcr70']
-            case '1310':
-                # MSVC 7.1
-                return ['msvcr71']
-            case '1400':
-                # VS2005 / MSVC 8.0
-                return ['msvcr80']
-            case '1500':
-                # VS2008 / MSVC 9.0
-                return ['msvcr90']
-            case '1600':
-                # VS2010 / MSVC 10.0
-                return ['msvcr100']
-            case '1700':
-                # VS2012 / MSVC 11.0
-                return ['msvcr110']
-            case '1800':
-                # VS2013 / MSVC 12.0
-                return ['msvcr120']
-            case '1900':
-                # VS2015 / MSVC 14.0
-                return ['msvcr140']
-            case '1910':
-                # VS2017 / MSVC 14.1
-                return ['msvcr141']
-            case '1920':
-                # VS2019 / MSVC 14.2
-                return ['msvcr142']
-            case '1930':
-                # VS2022 / MSVC 14.3
-                return ['msvcr143']
-            case _:
-                raise ValueError(f"Unknown MS Compiler version {msc_ver}")
+        if msc_ver == '1300':
+            # MSVC 7.0
+            return ['msvcr70']
+        elif msc_ver == '1310':
+            # MSVC 7.1
+            return ['msvcr71']
+        elif msc_ver == '1400':
+            # VS2005 / MSVC 8.0
+            return ['msvcr80']
+        elif msc_ver == '1500':
+            # VS2008 / MSVC 9.0
+            return ['msvcr90']
+        elif msc_ver == '1600':
+            # VS2010 / MSVC 10.0
+            return ['msvcr100']
+        else:
+            raise ValueError("Unknown MS Compiler version %s " % msc_ver)
 
 
 class CygwinCCompiler(UnixCCompiler):