diff --git a/appveyor.yml b/appveyor.yml
index 22d6fdc6..0e6b4fd0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -52,32 +52,6 @@ configuration: Debug
 # https://cmake.org/cmake/help/latest/manual/cmake-generators.7.html#visual-studio-generators
 environment:
   matrix:
-    # Visual Studio 2017 Win32
-    - GENERATOR: Visual Studio 15 2017
-      PLATFORM: Win32
-      EXPAT_DLL: libexpatd.dll
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-
-    # Visual Studio 2017 Win32 XML_UNICODE_WCHAR_T
-    - GENERATOR: Visual Studio 15 2017
-      PLATFORM: Win32
-      CMAKE_ARGS: -DEXPAT_CHAR_TYPE=wchar_t
-      EXPAT_DLL: libexpatwd.dll
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-
-    # Visual Studio 2017 x64
-    - GENERATOR: Visual Studio 15 2017 Win64
-      PLATFORM: x64
-      EXPAT_DLL: libexpatd.dll
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-
-    # Visual Studio 2017 x64 XML_UNICODE_WCHAR_T
-    - GENERATOR: Visual Studio 15 2017 Win64
-      PLATFORM: x64
-      CMAKE_ARGS: -DEXPAT_CHAR_TYPE=wchar_t
-      EXPAT_DLL: libexpatwd.dll
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-
     # Visual Studio 2019 Win32
     - GENERATOR: Visual Studio 16 2019
       PLATFORM: Win32
diff --git a/expat/CMake.README b/expat/CMake.README
index 5d5f43e8..3998f4ea 100644
--- a/expat/CMake.README
+++ b/expat/CMake.README
@@ -36,7 +36,7 @@ Visual Studio Command Prompt or when using mingw, you must open a cmd.exe and
 make sure that gcc can be called. On Windows, you also might want to specify a
 special Generator for CMake:
 for Visual Studio builds do:
-cmake .. -G "Visual Studio 15 2017" && msbuild /m expat.sln
+cmake .. -G "Visual Studio 16 2019" && msbuild /m expat.sln
 for mingw builds do:
 cmake .. -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:\expat-install
     && gmake && gmake install
diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt
index ff081550..afc0fcc4 100644
--- a/expat/CMakeLists.txt
+++ b/expat/CMakeLists.txt
@@ -201,8 +201,8 @@ if(MSVC)
     # - https://sourceforge.net/p/predef/wiki/Compilers/
     # - https://en.wikipedia.org/wiki/Microsoft_Visual_Studio#History
     set(_EXPAT_MSVC_REQUIRED_INT 1800)  # i.e. 12.0/2013/1800; see PR #426
-    set(_EXPAT_MSVC_SUPPORTED_INT 1910)
-    set(_EXPAT_MSVC_SUPPORTED_DISPLAY "Visual Studio 15.0/2017/${_EXPAT_MSVC_SUPPORTED_INT}")
+    set(_EXPAT_MSVC_SUPPORTED_INT 1920)
+    set(_EXPAT_MSVC_SUPPORTED_DISPLAY "Visual Studio 16.0/2019/${_EXPAT_MSVC_SUPPORTED_INT}")
 
     if(MSVC_VERSION VERSION_LESS ${_EXPAT_MSVC_SUPPORTED_INT})
         if(MSVC_VERSION VERSION_LESS ${_EXPAT_MSVC_REQUIRED_INT})
diff --git a/expat/README.md b/expat/README.md
index 3c20adbe..3944d021 100644
--- a/expat/README.md
+++ b/expat/README.md
@@ -20,7 +20,7 @@ Expat supports the following compilers:
 
 - GNU GCC >=4.5
 - LLVM Clang >=3.5
-- Microsoft Visual Studio >=15.0/2017 (rolling `${today} minus 5 years`)
+- Microsoft Visual Studio >=16.0/2019 (rolling `${today} minus 5 years`)
 
 Windows users can use the
 [`expat-win32bin-*.*.*.{exe,zip}` download](https://github.com/libexpat/libexpat/releases),
diff --git a/expat/doc/reference.html b/expat/doc/reference.html
index 5614dc34..bd205ed4 100644
--- a/expat/doc/reference.html
+++ b/expat/doc/reference.html
@@ -319,7 +319,7 @@ directions in the next section. Otherwise if you have Microsoft's
 Developer Studio installed,
 you can use CMake to generate a <code>.sln</code> file, e.g.
 <code>
-cmake -G"Visual Studio 15 2017" -DCMAKE_BUILD_TYPE=RelWithDebInfo .
+cmake -G"Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=RelWithDebInfo .
 </code>, and build Expat using <code>msbuild /m expat.sln</code> after.</p>
 
 <p>Alternatively, you may download the Win32 binary package that
diff --git a/expat/win32/README.txt b/expat/win32/README.txt
index 1d725f38..7a8a0df6 100644
--- a/expat/win32/README.txt
+++ b/expat/win32/README.txt
@@ -5,13 +5,13 @@ Expat can be built on Windows in two ways:
 * Cygwin:
   This follows the Unix build procedures.
 
-* MS Visual Studio 2013, 2015 and 2017:
+* MS Visual Studio 2019 and 2022:
   Use CMake to generate a solution file for Visual Studio, then use msbuild
   to compile.  For example:
 
   md build
   cd build
-  cmake -G"Visual Studio 15 2017" -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
+  cmake -G"Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
   msbuild /m expat.sln
 
 * All MS C/C++ compilers:
diff --git a/expat/win32/build_expat_iss.bat b/expat/win32/build_expat_iss.bat
index 53e4351f..6ad804c1 100644
--- a/expat/win32/build_expat_iss.bat
+++ b/expat/win32/build_expat_iss.bat
@@ -29,7 +29,7 @@ REM DAMAGES OR  OTHER LIABILITY, WHETHER  IN AN  ACTION OF CONTRACT,  TORT OR
 REM OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 REM USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-SET GENERATOR=Visual Studio 15 2017
+SET GENERATOR=Visual Studio 16 2019
 
 REM Read by msbuild!
 SET CONFIGURATION=RelWithDebInfo