From 929d3ac659d4a46cbcd6ae511b595018c78bb80c Mon Sep 17 00:00:00 2001
From: Oliver Hamlet <git@ortham.net>
Date: Tue, 29 Apr 2025 22:40:08 +0100
Subject: [PATCH] Update Windows CI to windows-2025

windows-2019 will be fully retired by the end of June, and 2025 is the latest version.

This means that Windows build artifacts will be built using MSVC 2022, not MSVC 2019. They should be ABI-compatible across this change, since they expose no third-party types and Microsoft say that their compiler and standard library didn't break ABI between 2019 and 2022, but a newer version of the redistributable might be needed.
---
 .github/workflows/ci.yml      | 4 ++--
 .github/workflows/release.yml | 6 +++---
 docs/README.md                | 2 +-
 docs/usage.rst                | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c7c6978..5ff14ab 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ env:
 
 jobs:
   windows:
-    runs-on: windows-2019
+    runs-on: windows-2025
 
     strategy:
       matrix:
@@ -55,7 +55,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -G "Visual Studio 16 2019" -A ${{ matrix.platform }} -DCPACK_PACKAGE_VERSION="${{ steps.get-version.outputs.version }}-python${{ matrix.python-version }}"
+          cmake .. -G "Visual Studio 17 2022" -A ${{ matrix.platform }} -DCPACK_PACKAGE_VERSION="${{ steps.get-version.outputs.version }}-python${{ matrix.python-version }}"
           cmake --build . --config ${{ env.MSVC_CONFIG }}
 
       - name: Run tests
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 900b920..048e99e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,10 +27,10 @@ jobs:
           tag_name: ${{ steps.get-git-tag.outputs.name }}
           release_name: libloot-python v${{ steps.get-git-tag.outputs.name }}
           body: |
-            Requires Windows 7 or later and the [MSVC 2019 x86 redistributable](https://aka.ms/vs/16/release/vc_redist.x86.exe), and [7-Zip](http://www.7-zip.org/) to extract the archive.
+            Requires Windows 7 or later and the [MSVC 2022 x86 redistributable](https://aka.ms/vs/17/release/vc_redist.x86.exe), and [7-Zip](http://www.7-zip.org/) to extract the archive.
 
   windows:
-    runs-on: windows-2019
+    runs-on: windows-2025
     needs: create_release
 
     strategy:
@@ -61,7 +61,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -G "Visual Studio 16 2019" -A ${{ matrix.platform }} -DCPACK_PACKAGE_VERSION="${{ steps.get-version.outputs.version }}-python${{ matrix.python-version }}"
+          cmake .. -G "Visual Studio 17 2022" -A ${{ matrix.platform }} -DCPACK_PACKAGE_VERSION="${{ steps.get-version.outputs.version }}-python${{ matrix.python-version }}"
           cmake --build . --config ${{ env.MSVC_CONFIG }}
 
       - name: Build archive
diff --git a/docs/README.md b/docs/README.md
index 6590eab..9b01f62 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -3,7 +3,7 @@ libloot-python
 
 This archive contains a build of the libloot-python wrapper module and its corresponding 32-bit Windows build of libloot.
 
-The DLL requires the [MSVC 2019 x86 redistributable](https://aka.ms/vs/16/release/vc_redist.x86.exe)
+The DLL requires the [MSVC 2022 x86 redistributable](https://aka.ms/vs/17/release/vc_redist.x86.exe)
 to be installed.
 
 See the [online documentation](http://loot-api-python.readthedocs.org/) for more information.
diff --git a/docs/usage.rst b/docs/usage.rst
index 21ac492..06cdd90 100644
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -10,13 +10,13 @@ Build archives contain two binaries:
 * ``loot.*.pyd`` is the Python wrapper
 * ``loot.dll`` is the C++ library DLL that the Python wrapper was built against.
 
-The C++ DLL requires the `Visual C++ 2019 Redistributable (x86)`_
+The C++ DLL requires the `Visual C++ 2022 Redistributable (x86)`_
 to be installed.
 
 To use the wrapper, copy both files to wherever you want to import them from
 (they must be in the same folder), and you're done!
 
-.. _Visual C++ 2019 Redistributable (x86): https://aka.ms/vs/16/release/vc_redist.x86.exe
+.. _Visual C++ 2022 Redistributable (x86): https://aka.ms/vs/17/release/vc_redist.x86.exe
 
 Using the wrapper
 =================