From 6f6b2269cf69c8bbcabd57e0e92114d23428f8dd Mon Sep 17 00:00:00 2001
From: Oliver Hamlet <oliver@ortham.io>
Date: Sat, 2 Jul 2022 16:46:00 +0100
Subject: [PATCH] Migrate to windows-2019 GitHub Actions runners

windows-2016 was scheduled for removal in April 2022, though the
previous commit's build still worked.

This also means that the MSVC 2019 redistributable is now required.
Although libloot 0.15 is built with MSVC 2017, 2019 can link code
build with 2017 and the 2019 redistributable effectively replaces
the 2017 redistributable, so there's no compatibility issues.
---
 .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 3a47398..92e7544 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -62,7 +62,7 @@ jobs:
           done
 
   windows:
-    runs-on: windows-2016
+    runs-on: windows-2019
 
     strategy:
       matrix:
@@ -105,7 +105,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -G "Visual Studio 15 2017" -A ${{ matrix.platform }} -DCPACK_PACKAGE_VERSION="${{ steps.get-version.outputs.version }}-python${{ matrix.python-version }}"
+          cmake .. -G "Visual Studio 16 2019" -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 f544bb9..8dca7b2 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 2017 x86 redistributable](https://download.visualstudio.microsoft.com/download/pr/749aa419-f9e4-4578-a417-a43786af205e/d59197078cc425377be301faba7dd87a/vc_redist.x86.exe), and [7-Zip](http://www.7-zip.org/) to extract the archive.
+            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.
 
   windows:
-    runs-on: windows-2016
+    runs-on: windows-2019
     needs: create_release
 
     strategy:
@@ -61,7 +61,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake .. -G "Visual Studio 15 2017" -A ${{ matrix.platform }} -DCPACK_PACKAGE_VERSION="${{ steps.get-version.outputs.version }}-python${{ matrix.python-version }}"
+          cmake .. -G "Visual Studio 16 2019" -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 0548378..6590eab 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 2017 x86 redistributable](https://download.visualstudio.microsoft.com/download/pr/749aa419-f9e4-4578-a417-a43786af205e/d59197078cc425377be301faba7dd87a/vc_redist.x86.exe)
+The DLL requires the [MSVC 2019 x86 redistributable](https://aka.ms/vs/16/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 3da9ef4..21ac492 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++ 2017 Redistributable (x86)`_
+The C++ DLL requires the `Visual C++ 2019 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++ 2017 Redistributable (x86): https://download.visualstudio.microsoft.com/download/pr/749aa419-f9e4-4578-a417-a43786af205e/d59197078cc425377be301faba7dd87a/vc_redist.x86.exe
+.. _Visual C++ 2019 Redistributable (x86): https://aka.ms/vs/16/release/vc_redist.x86.exe
 
 Using the wrapper
 =================