From f5eb3567f89f4b54972705c23226c257e1e956d5 Mon Sep 17 00:00:00 2001
From: Mateusz <matt.wozakowski@gmail.com>
Date: Wed, 6 Aug 2025 15:16:05 +0100
Subject: [PATCH] Install VS2019 tools for building on windows 2022

---
 .github/workflows/tests.yml    |  8 +++++++-
 .github/workflows/versions.yml | 10 ++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d73648ee..3425c031 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -782,7 +782,7 @@ jobs:
 
   build_windows_vs16:
     needs: source
-    runs-on: windows-2019
+    runs-on: windows-2022
     strategy:
       fail-fast: false
       matrix:
@@ -800,6 +800,12 @@ jobs:
           - default
           - locked
     steps:
+      - name: Install VS 2019
+        run: choco install visualstudio2019buildtools --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended --includeOptional --passive --locale en-US"
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v2
+        with:
+          vs-version: '[16.0,17.0)'
       - name: Install dependencies
         shell: cmd
         run: |
diff --git a/.github/workflows/versions.yml b/.github/workflows/versions.yml
index 626c97ce..87d8dad4 100644
--- a/.github/workflows/versions.yml
+++ b/.github/workflows/versions.yml
@@ -297,7 +297,7 @@ jobs:
 
   build_windows:
     needs: source_abi
-    runs-on: windows-2019
+    runs-on: windows-2022
     strategy:
       fail-fast: false
       matrix:
@@ -306,6 +306,12 @@ jobs:
           - ${{ needs.source_abi.outputs.abi_version }}
           - ${{ needs.source_abi.outputs.alternate_abi_version }}
     steps:
+      - name: Install VS 2019
+        run: choco install visualstudio2019buildtools --package-parameters "--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended --includeOptional --passive --locale en-US"
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v2
+        with:
+          vs-version: '[16.0,17.0)'
       - name: Install dependencies
         shell: cmd
         run: |
@@ -382,7 +388,7 @@ jobs:
     needs:
       - source_abi
       - build_windows
-    runs-on: windows-2019
+    runs-on: windows-2022
     strategy:
       fail-fast: false
     steps: