diff --git a/.github/workflows/argon2.yml b/.github/workflows/argon2.yml
index fec3233..eee292f 100644
--- a/.github/workflows/argon2.yml
+++ b/.github/workflows/argon2.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/curl.yml b/.github/workflows/curl.yml
index 00f2dbc..339f457 100644
--- a/.github/workflows/curl.yml
+++ b/.github/workflows/curl.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/cyrus-sasl.yml b/.github/workflows/cyrus-sasl.yml
index 7d5efbb..d86012e 100644
--- a/.github/workflows/cyrus-sasl.yml
+++ b/.github/workflows/cyrus-sasl.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/enchant.yml b/.github/workflows/enchant.yml
index 4ca9ab3..23f34fa 100644
--- a/.github/workflows/enchant.yml
+++ b/.github/workflows/enchant.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/freetype.yml b/.github/workflows/freetype.yml
index a75c04e..83c2f20 100644
--- a/.github/workflows/freetype.yml
+++ b/.github/workflows/freetype.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/freetype_cmake.yml b/.github/workflows/freetype_cmake.yml
index 668a7b3..8727a6e 100644
--- a/.github/workflows/freetype_cmake.yml
+++ b/.github/workflows/freetype_cmake.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
@@ -32,7 +32,7 @@ jobs:
         id: virtuals
         run: powershell winlib-builder/scripts/compute-virtuals -version ${{github.event.inputs.php}} -arch ${{matrix.arch}}
       - name: Configure freetype
-        run: cd freetype && md build && cd build && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} ..
+        run: cd freetype && md build && cd build && cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} ..
       - name: Build freetype
         run: cd freetype\build && cmake --build . --config RelWithDebInfo
       - name: Install freetype
diff --git a/.github/workflows/gettext.yml b/.github/workflows/gettext.yml
index 72bedda..2f6ae9e 100644
--- a/.github/workflows/gettext.yml
+++ b/.github/workflows/gettext.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/glib.yml b/.github/workflows/glib.yml
index 20ce05d..200f0e0 100644
--- a/.github/workflows/glib.yml
+++ b/.github/workflows/glib.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/icu4c.yml b/.github/workflows/icu4c.yml
index 677e03f..07b05cb 100644
--- a/.github/workflows/icu4c.yml
+++ b/.github/workflows/icu4c.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/imagemagick.yml b/.github/workflows/imagemagick.yml
index 03a9a3a..73645cd 100644
--- a/.github/workflows/imagemagick.yml
+++ b/.github/workflows/imagemagick.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/imap.yml b/.github/workflows/imap.yml
index 475deff..910372e 100644
--- a/.github/workflows/imap.yml
+++ b/.github/workflows/imap.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/libavif.yml b/.github/workflows/libavif.yml
index 1c68d08..b2d364a 100644
--- a/.github/workflows/libavif.yml
+++ b/.github/workflows/libavif.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
@@ -40,10 +40,10 @@ jobs:
         uses: ilammy/setup-nasm@v1
       - name: Configure aom for x64
         if: matrix.arch == 'x64'
-        run: cd libavif\ext\aom && md build.libavif && cd build.libavif && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -DENABLE_DOCS=0 -DENABLE_EXAMPLES=0 -DENABLE_TESTDATA=0 -DENABLE_TESTS=0 -DENABLE_TOOLS=0 -DENABLE_NASM=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE4_1=1 -DENABLE_SSE4_2=1 -DENABLE_AVX=1 -DENABLE_AVX2=1 ..
+        run: cd libavif\ext\aom && md build.libavif && cd build.libavif && cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}} -DENABLE_DOCS=0 -DENABLE_EXAMPLES=0 -DENABLE_TESTDATA=0 -DENABLE_TESTS=0 -DENABLE_TOOLS=0 -DENABLE_NASM=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE4_1=1 -DENABLE_SSE4_2=1 -DENABLE_AVX=1 -DENABLE_AVX2=1 ..
       - name: Configure aom for x86
         if: matrix.arch == 'x86'
-        run: cd libavif\ext\aom && md build.libavif && cd build.libavif && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -DENABLE_DOCS=0 -DENABLE_EXAMPLES=0 -DENABLE_TESTDATA=0 -DENABLE_TESTS=0 -DENABLE_TOOLS=0 -DENABLE_NASM=1 -DENABLE_SSE2=0 -DENABLE_SSE3=0 -DENABLE_SSSE3=0 -DENABLE_SSE4_1=0 -DENABLE_SSE4_2=0 -DENABLE_AVX=0 -DENABLE_AVX2=0 ..
+        run: cd libavif\ext\aom && md build.libavif && cd build.libavif && cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}} -DENABLE_DOCS=0 -DENABLE_EXAMPLES=0 -DENABLE_TESTDATA=0 -DENABLE_TESTS=0 -DENABLE_TOOLS=0 -DENABLE_NASM=1 -DENABLE_SSE2=0 -DENABLE_SSE3=0 -DENABLE_SSSE3=0 -DENABLE_SSE4_1=0 -DENABLE_SSE4_2=0 -DENABLE_AVX=0 -DENABLE_AVX2=0 ..
       - name: Build aom
         run: cd libavif\ext\aom\build.libavif && cmake --build . --config Release
       - name: Install aom
@@ -53,7 +53,7 @@ jobs:
           xcopy Release\aom.lib .\aom_a.lib*
           xcopy .\aom_a.lib ..\..\..\..\install\lib\
       - name: Configure libavif
-        run: cd libavif && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DAVIF_CODEC_AOM=1 -DAVIF_LOCAL_AOM=1 -DAVIF_ENABLE_WERROR=0 -DBUILD_SHARED_LIBS=0 .
+        run: cd libavif && cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DAVIF_CODEC_AOM=1 -DAVIF_LOCAL_AOM=1 -DAVIF_ENABLE_WERROR=0 -DBUILD_SHARED_LIBS=0 .
       - name: Build libavif
         run: cd libavif && cmake --build . --config RelWithDebInfo
       - name: Install libavif
diff --git a/.github/workflows/libffi.yml b/.github/workflows/libffi.yml
index 2ec3bbc..27470a4 100644
--- a/.github/workflows/libffi.yml
+++ b/.github/workflows/libffi.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/libiconv.yml b/.github/workflows/libiconv.yml
index 05a95cd..4114a4f 100644
--- a/.github/workflows/libiconv.yml
+++ b/.github/workflows/libiconv.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/libjpeg.yml b/.github/workflows/libjpeg.yml
index 7e0272a..dffb72c 100644
--- a/.github/workflows/libjpeg.yml
+++ b/.github/workflows/libjpeg.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
@@ -32,7 +32,7 @@ jobs:
         id: virtuals
         run: powershell winlib-builder/scripts/compute-virtuals -version ${{github.event.inputs.php}} -arch ${{matrix.arch}}
       - name: Configure libjpeg
-        run: cd libjpeg && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DWITH_JPEG8=1 -DWITH_CRT_DLL=1 -DENABLE_SHARED=0 -DWITH_TURBOJPEG=0 .
+        run: cd libjpeg && cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DWITH_JPEG8=1 -DWITH_CRT_DLL=1 -DENABLE_SHARED=0 -DWITH_TURBOJPEG=0 .
       - name: Build libjpeg
         run: cd libjpeg && cmake --build . --config RelWithDebInfo
       - name: Install libjpeg
diff --git a/.github/workflows/liblzma.yml b/.github/workflows/liblzma.yml
index 5c938a9..b968588 100644
--- a/.github/workflows/liblzma.yml
+++ b/.github/workflows/liblzma.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
@@ -32,7 +32,7 @@ jobs:
         id: virtuals
         run: powershell winlib-builder/scripts/compute-virtuals -version ${{github.event.inputs.php}} -arch ${{matrix.arch}}
       - name: Configure liblzma
-        run: cd liblzma && md build && cd build && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} ..
+        run: cd liblzma && md build && cd build && cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} ..
       - name: Build liblzma
         run: cd liblzma\build && cmake --build . --config RelWithDebInfo
       - name: Install liblzma
diff --git a/.github/workflows/libmemcached.yml b/.github/workflows/libmemcached.yml
index fb81266..5f6f9b9 100644
--- a/.github/workflows/libmemcached.yml
+++ b/.github/workflows/libmemcached.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
@@ -39,7 +39,7 @@ jobs:
         run: choco install winflexbison3
       - run: path
       - name: Configure libmemcached
-        run: cd libmemcached && md build && cd build && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} ..
+        run: cd libmemcached && md build && cd build && cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} ..
       - name: Build libmemcached
         run: cd libmemcached\build && cmake --build . --config RelWithDebInfo
       - name: Install libmemcached
diff --git a/.github/workflows/libpng.yml b/.github/workflows/libpng.yml
index 4bafeb5..773506a 100644
--- a/.github/workflows/libpng.yml
+++ b/.github/workflows/libpng.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/librdkafka.yml b/.github/workflows/librdkafka.yml
index bca12a8..725af96 100644
--- a/.github/workflows/librdkafka.yml
+++ b/.github/workflows/librdkafka.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
@@ -40,7 +40,7 @@ jobs:
       - name: Patch librdkafka
         run: cd librdkafka && git apply --ignore-whitespace ..\winlib-builder\patches\librdkafka.patch
       - name: Configure librdkafka
-        run: cd librdkafka && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DWITH_ZSTD=ON -DWITH_SSL=ON -DWITH_ZLIB=ON -DCMAKE_PREFIX_PATH:PATH=${{github.workspace}}\deps -DZLIB_LIBRARY:PATH=${{github.workspace}}\deps\lib\zlib_a.lib -DZSTD_LIBRARY:PATH=${{github.workspace}}\deps\lib\libzstd_a.lib .
+        run: cd librdkafka && cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DWITH_ZSTD=ON -DWITH_SSL=ON -DWITH_ZLIB=ON -DCMAKE_PREFIX_PATH:PATH=${{github.workspace}}\deps -DZLIB_LIBRARY:PATH=${{github.workspace}}\deps\lib\zlib_a.lib -DZSTD_LIBRARY:PATH=${{github.workspace}}\deps\lib\libzstd_a.lib .
       - name: Build librdkafka
         run: cd librdkafka && cmake --build . --config RelWithDebInfo
       - name: Install librdkafka
diff --git a/.github/workflows/libsodium.yml b/.github/workflows/libsodium.yml
index 321554f..81cea8b 100644
--- a/.github/workflows/libsodium.yml
+++ b/.github/workflows/libsodium.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/libssh2.yml b/.github/workflows/libssh2.yml
index 563fb31..0a2106d 100644
--- a/.github/workflows/libssh2.yml
+++ b/.github/workflows/libssh2.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
@@ -38,7 +38,7 @@ jobs:
       - name: Fetch dependencies
         run: powershell winlib-builder/scripts/fetch-deps -lib libssh2 -version ${{github.event.inputs.php}} -vs ${{steps.virtuals.outputs.vs}} -arch ${{matrix.arch}} -stability ${{github.event.inputs.stability}}
       - name: Configure libssh2
-        run: cd libssh2 && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCRYPTO_BACKEND=OpenSSL -DOPENSSL_ROOT_DIR:PATH=${{github.workspace}}/deps -DENABLE_ZLIB_COMPRESSION=ON -DZLIB_INCLUDE_DIR:PATH=${{github.workspace}}/deps/include -DZLIB_LIBRARY:FILEPATH=${{github.workspace}}/deps/lib/zlib_a.lib -DBUILD_SHARED_LIBS=ON .
+        run: cd libssh2 && cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DCRYPTO_BACKEND=OpenSSL -DOPENSSL_ROOT_DIR:PATH=${{github.workspace}}/deps -DENABLE_ZLIB_COMPRESSION=ON -DZLIB_INCLUDE_DIR:PATH=${{github.workspace}}/deps/include -DZLIB_LIBRARY:FILEPATH=${{github.workspace}}/deps/lib/zlib_a.lib -DBUILD_SHARED_LIBS=ON .
       - name: Build libssh2
         run: cd libssh2 && cmake --build . --config RelWithDebInfo
       - name: Install libssh2
diff --git a/.github/workflows/libssh2_msbuild.yml b/.github/workflows/libssh2_msbuild.yml
index 5de09a5..cd42121 100644
--- a/.github/workflows/libssh2_msbuild.yml
+++ b/.github/workflows/libssh2_msbuild.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/libtidy.yml b/.github/workflows/libtidy.yml
index 8c7c5a5..f55e2ef 100644
--- a/.github/workflows/libtidy.yml
+++ b/.github/workflows/libtidy.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
@@ -38,7 +38,7 @@ jobs:
       - name: Fetch dependencies
         run: powershell winlib-builder/scripts/fetch-deps -lib libtidy -version ${{github.event.inputs.php}} -vs ${{steps.virtuals.outputs.vs}} -arch ${{matrix.arch}} -stability ${{github.event.inputs.stability}}
       - name: Configure libtidy
-        run: cd libtidy && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} .
+        run: cd libtidy && cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} .
       - name: Build libtidy
         run: cd libtidy && cmake --build . --config RelWithDebInfo
       - name: Install libtidy
diff --git a/.github/workflows/libwebp.yml b/.github/workflows/libwebp.yml
index d2b126b..468106f 100644
--- a/.github/workflows/libwebp.yml
+++ b/.github/workflows/libwebp.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/libxml2.yml b/.github/workflows/libxml2.yml
index 8efab13..0abe7b9 100644
--- a/.github/workflows/libxml2.yml
+++ b/.github/workflows/libxml2.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/libxpm.yml b/.github/workflows/libxpm.yml
index 6912f95..b279421 100644
--- a/.github/workflows/libxpm.yml
+++ b/.github/workflows/libxpm.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/libxslt.yml b/.github/workflows/libxslt.yml
index cbf98f5..101626d 100644
--- a/.github/workflows/libxslt.yml
+++ b/.github/workflows/libxslt.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/libzip.yml b/.github/workflows/libzip.yml
index ca52ba2..f728671 100644
--- a/.github/workflows/libzip.yml
+++ b/.github/workflows/libzip.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
@@ -39,10 +39,10 @@ jobs:
         run: powershell winlib-builder/scripts/fetch-deps -lib libzip -version ${{github.event.inputs.php}} -vs ${{steps.virtuals.outputs.vs}} -arch ${{matrix.arch}} -stability ${{github.event.inputs.stability}}
       - name: Configure libzip for PHP < 8.0
         if: github.event.inputs.php < 8.0
-        run: cd libzip && md build && cd build && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DZLIB_INCLUDE_DIR:PATH=${{github.workspace}}\deps\include -DZLIB_LIBRARY:PATH=${{github.workspace}}\deps\lib\zlib_a.lib -DBZIP2_INCLUDE_DIR:PATH=${{github.workspace}}\deps\include -DBZIP2_LIBRARIES:PATH=${{github.workspace}}\deps\lib\libbz2_a.lib -DBUILD_TOOLS=OFF -DBUILD_REGRESS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOC=OFF ..
+        run: cd libzip && md build && cd build && cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DZLIB_INCLUDE_DIR:PATH=${{github.workspace}}\deps\include -DZLIB_LIBRARY:PATH=${{github.workspace}}\deps\lib\zlib_a.lib -DBZIP2_INCLUDE_DIR:PATH=${{github.workspace}}\deps\include -DBZIP2_LIBRARIES:PATH=${{github.workspace}}\deps\lib\libbz2_a.lib -DBUILD_TOOLS=OFF -DBUILD_REGRESS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOC=OFF ..
       - name: Configure libzip for PHP >= 8.0
         if: github.event.inputs.php >= 8.0
-        run: cd libzip && md build && cd build && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DZLIB_INCLUDE_DIR:PATH=${{github.workspace}}\deps\include -DZLIB_LIBRARY:PATH=${{github.workspace}}\deps\lib\zlib_a.lib -DBZIP2_INCLUDE_DIR:PATH=${{github.workspace}}\deps\include -DBZIP2_LIBRARIES:PATH=${{github.workspace}}\deps\lib\libbz2_a.lib -DLIBLZMA_INCLUDE_DIR:PATH=${{github.workspace}}\deps\include -DLIBLZMA_LIBRARY:PATH=${{github.workspace}}\deps\lib\liblzma_a.lib -DBUILD_TOOLS=OFF -DBUILD_REGRESS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOC=OFF ..
+        run: cd libzip && md build && cd build && cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} -DZLIB_INCLUDE_DIR:PATH=${{github.workspace}}\deps\include -DZLIB_LIBRARY:PATH=${{github.workspace}}\deps\lib\zlib_a.lib -DBZIP2_INCLUDE_DIR:PATH=${{github.workspace}}\deps\include -DBZIP2_LIBRARIES:PATH=${{github.workspace}}\deps\lib\libbz2_a.lib -DLIBLZMA_INCLUDE_DIR:PATH=${{github.workspace}}\deps\include -DLIBLZMA_LIBRARY:PATH=${{github.workspace}}\deps\lib\liblzma_a.lib -DBUILD_TOOLS=OFF -DBUILD_REGRESS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOC=OFF ..
       - name: Build libzip
         run: cd libzip\build && cmake --build . --config RelWithDebInfo
       - name: Install libzip
diff --git a/.github/workflows/libzstd.yml b/.github/workflows/libzstd.yml
index d98e3ad..0d3e452 100644
--- a/.github/workflows/libzstd.yml
+++ b/.github/workflows/libzstd.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
@@ -38,7 +38,7 @@ jobs:
       - name: Patch libzstd
         run: cd libzstd && git apply --ignore-whitespace ..\winlib-builder\patches\libzstd.patch
       - name: Configure libzstd
-        run: cd libzstd\build\cmake && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} .
+        run: cd libzstd\build\cmake && cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} .
       - name: Build libzstd
         run: cd libzstd\build\cmake && cmake --build . --config RelWithDebInfo
       - name: Install libzstd
diff --git a/.github/workflows/lmdb.yml b/.github/workflows/lmdb.yml
index df02f2a..f1726a9 100644
--- a/.github/workflows/lmdb.yml
+++ b/.github/workflows/lmdb.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/mpir.yml b/.github/workflows/mpir.yml
index bb60bde..3a446ed 100644
--- a/.github/workflows/mpir.yml
+++ b/.github/workflows/mpir.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/net-snmp.yml b/.github/workflows/net-snmp.yml
index 6aaeff1..741acbf 100644
--- a/.github/workflows/net-snmp.yml
+++ b/.github/workflows/net-snmp.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/nghttp2.yml b/.github/workflows/nghttp2.yml
index 761b553..a8b57b4 100644
--- a/.github/workflows/nghttp2.yml
+++ b/.github/workflows/nghttp2.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
@@ -38,7 +38,7 @@ jobs:
       - name: Fetch dependencies
         run: powershell winlib-builder/scripts/fetch-deps -lib nghttp2 -version ${{github.event.inputs.php}} -vs ${{steps.virtuals.outputs.vs}} -arch ${{matrix.arch}} -stability ${{github.event.inputs.stability}}
       - name: Configure nghttp2
-        run: cd nghttp2 && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} .
+        run: cd nghttp2 && cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} .
       - name: Build nghttp2
         run: cd nghttp2 && cmake --build . --config RelWithDebInfo --target nghttp2
       - name: Install nghttp2
diff --git a/.github/workflows/oniguruma.yml b/.github/workflows/oniguruma.yml
index ce3b89a..7a8db03 100644
--- a/.github/workflows/oniguruma.yml
+++ b/.github/workflows/oniguruma.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/openldap.yml b/.github/workflows/openldap.yml
index 883b9f0..dfec530 100644
--- a/.github/workflows/openldap.yml
+++ b/.github/workflows/openldap.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/openssl.yml b/.github/workflows/openssl.yml
index b7cdf36..f82728c 100644
--- a/.github/workflows/openssl.yml
+++ b/.github/workflows/openssl.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/postgresql.yml b/.github/workflows/postgresql.yml
index d1da005..693dd1d 100644
--- a/.github/workflows/postgresql.yml
+++ b/.github/workflows/postgresql.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/pslib.yml b/.github/workflows/pslib.yml
index 895faf6..2ab6d3d 100644
--- a/.github/workflows/pslib.yml
+++ b/.github/workflows/pslib.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
@@ -36,7 +36,7 @@ jobs:
         id: virtuals
         run: powershell winlib-builder/scripts/compute-virtuals -version ${{github.event.inputs.php}} -arch ${{matrix.arch}}
       - name: Configure pslib
-        run: cd pslib && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} .
+        run: cd pslib && cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} .
       - name: Build pslib
         run: cd pslib && cmake --build . --config RelWithDebInfo
       - name: Install pslib
diff --git a/.github/workflows/pthreads.yml b/.github/workflows/pthreads.yml
index 12f5b65..28a7bed 100644
--- a/.github/workflows/pthreads.yml
+++ b/.github/workflows/pthreads.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/qdbm.yml b/.github/workflows/qdbm.yml
index d081bf6..57d6dfb 100644
--- a/.github/workflows/qdbm.yml
+++ b/.github/workflows/qdbm.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/sqlite3.yml b/.github/workflows/sqlite3.yml
index 43d8d29..3d9729a 100644
--- a/.github/workflows/sqlite3.yml
+++ b/.github/workflows/sqlite3.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/.github/workflows/wineditline.yml b/.github/workflows/wineditline.yml
index 9a6b72d..249785c 100644
--- a/.github/workflows/wineditline.yml
+++ b/.github/workflows/wineditline.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
@@ -32,7 +32,7 @@ jobs:
         id: virtuals
         run: powershell winlib-builder/scripts/compute-virtuals -version ${{github.event.inputs.php}} -arch ${{matrix.arch}}
       - name: Configure wineditline
-        run: cd wineditline && md build && cd build && cmake -G "Visual Studio 16 2019" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} ..
+        run: cd wineditline && md build && cd build && cmake -G "Visual Studio 17 2022" -A ${{steps.virtuals.outputs.msarch}} -T ${{steps.virtuals.outputs.msts}} ..
       - name: Build wineditline
         run: cd wineditline\build && cmake --build . --config RelWithDebInfo
       - name: Install wineditline
diff --git a/.github/workflows/zlib.yml b/.github/workflows/zlib.yml
index fa36080..59f9216 100644
--- a/.github/workflows/zlib.yml
+++ b/.github/workflows/zlib.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
           arch: [x64, x86]
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
       - name: Checkout winlib-builder
         uses: actions/checkout@v4
diff --git a/scripts/compute-virtuals.ps1 b/scripts/compute-virtuals.ps1
index 486f1a5..9041ce7 100644
--- a/scripts/compute-virtuals.ps1
+++ b/scripts/compute-virtuals.ps1
@@ -12,7 +12,8 @@ $versions = @{
     "8.1" = "vs16"
     "8.2" = "vs16"
     "8.3" = "vs16"
-    "master" = "vs16"
+    "8.4" = "vs17"
+    "master" = "vs17"
 }
 $vs = $versions.$version
 if (-not $vs) {
@@ -23,6 +24,7 @@ $vsnum = $vs.substring(2)
 $years = @{
     "vc15" = "2017"
     "vs16" = "2019"
+    "vs17" = "2022"
 }
 $vsyear = $years.$vs
 
@@ -36,8 +38,10 @@ foreach ($ts in (Get-ChildItem $dir)) {
         $toolsets."vc14" = $ts
     } elseif ((14 -eq $tsv[0]) -and (19 -ge $tsv[1])) {
         $toolsets."vc15" = $ts
-    } elseif (14 -eq $tsv[0]) {
+    } elseif ((14 -eq $tsv[0]) -and (39 -ge $tsv[1])) {
         $toolsets."vs16" = $ts
+    } elseif (14 -eq $tsv[0]) {
+        $toolsets."vs17" = $ts
     }
 }
 $toolset = $toolsets.$vs
@@ -48,6 +52,7 @@ if (-not $toolset) {
 $mstoolsets = @{
     "vc15" = "v141"
     "vs16" = "v142"
+    "vs17" = "v143"
 }
 $msts = $mstoolsets.$vs
 if (-not $msts) {
@@ -56,7 +61,8 @@ if (-not $msts) {
 
 $winsdks = @{
     "vc15" = "10.0.17763.0"
-    "vs16" = "10.0.18362.0"
+    "vs16" = "10.0.20348.0"
+    "vs17" = "10.0.20348.0"
 }
 $winsdk = $winsdks.$vs
 if (-not $winsdk) {