Use Visual Studio 2022 for builds instead of 2019

Author: zanieb

.github/workflows/windows.yml

@@ -14,7 +14,7 @@ concurrency:
 jobs:
   pythonbuild:
     if: ${{ github.repository_owner == 'indygreg' || github.event_name != 'schedule' }}
-    runs-on: 'windows-2019'
+    runs-on: 'windows-2022'
     steps:
       - uses: actions/checkout@v4
 
@@ -66,7 +66,7 @@ jobs:
             options: 'freethreaded+pgo'
 
     needs: pythonbuild
-    runs-on: 'windows-2019'
+    runs-on: 'windows-2022'
     steps:
       - uses: actions/checkout@v4
         with:
@@ -96,7 +96,7 @@ jobs:
       - name: Build
         shell: cmd
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\${{ matrix.vcvars }}"
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\${{ matrix.vcvars }}"
           py.exe -3.9 build-windows.py --python ${{ matrix.py }} --sh c:\cygwin\bin\sh.exe --options ${{ matrix.options }}
 
       - name: Validate Distribution

cpython-windows/build.py

@@ -1424,6 +1424,16 @@ def build_cpython(
     # The python.props file keys off MSBUILD, so it needs to be set.
     os.environ["MSBUILD"] = str(msbuild)
 
+    # Workaround for https://github.com/actions/runner-images/issues/10819
+    if not os.environ.get("VCToolsRedistDir"):
+        os.environ["VCToolsRedistDir"] = os.path.join(
+            os.environ["VCINSTALLDIR"],
+            "Redist",
+            "MSVC",
+            os.environ["VCToolsVersion"],
+            "",
+        )
+
     bzip2_archive = download_entry("bzip2", BUILD)
     sqlite_archive = download_entry("sqlite", BUILD)
     tk_bin_archive = download_entry(
@@ -1887,7 +1897,7 @@ def main() -> None:
     parser.add_argument(
         "--vs",
         choices={"2019", "2022"},
-        default="2019",
+        default="2022",
         help="Visual Studio version to use",
     )
     parser.add_argument(