diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 80f7ddb4..2b6c4cbc 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -4,11 +4,12 @@
 variables:
   solution: '*.sln'
 
+
 jobs:
 - job: 'cppWindows'
   pool:
-    vmImage: windows-latest
-  displayName: 'Solution MSVC 2019'
+    vmImage: windows-2022
+  displayName: 'Solution MSVC 2022'
 
   strategy:
     matrix:
@@ -26,6 +27,12 @@ jobs:
         buildConfiguration: 'Release'
 
   steps:
+  - task: NuGetCommand@2
+    inputs:
+      command: 'restore'
+      includeNuGetOrg: true
+      restoreSolution: '*.sln'
+
   - task: VSBuild@1
     inputs:
       solution: '$(solution)'
@@ -38,10 +45,10 @@ jobs:
       configuration: '$(buildConfiguration)'
 
 
-- job: 'cppVS2019'
+- job: 'cppVS2022'
   pool:
-    vmImage: windows-latest
-  displayName: 'CMake - MSVC 2019'
+    vmImage: windows-2022
+  displayName: 'CMake - MSVC 2022'
 
   strategy:
     matrix:
@@ -86,7 +93,7 @@ jobs:
 
   - task: BatchScript@1
     inputs:
-      filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+      filename: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat"
       arguments: $(Architecture)
       modifyEnvironment: true
     displayName: Setup Environment Variables
@@ -102,7 +109,7 @@ jobs:
         -DCMAKE_BUILD_TYPE=$(buildType)
         -DBUILD_SHARED_LIBS=$(Shared)
         -DCHARLS_PEDANTIC_WARNINGS=On
-        -DCHARLS_THREAT_WARNINGS_AS_ERRORS=On
+        -DCHARLS_TREAT_WARNING_AS_ERROR=On
         $(Build.SourcesDirectory)
 
   - task: CMake@1
@@ -112,10 +119,10 @@ jobs:
       cmakeArgs: --build $(Build.BinariesDirectory)/build
 
 
-- job: 'cppVS2017'
+- job: 'cppVS2019'
   pool:
-    vmImage: vs2017-win2016
-  displayName: 'CMake - MSVC 2017'
+    vmImage: windows-2019
+  displayName: 'CMake - MSVC 2019'
 
   strategy:
     matrix:
@@ -141,7 +148,7 @@ jobs:
 
   - task: BatchScript@1
     inputs:
-      filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+      filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsall.bat"
       arguments: $(Architecture)
       modifyEnvironment: true
     displayName: Setup Environment Variables
@@ -156,7 +163,7 @@ jobs:
         -DCMAKE_CXX_COMPILER="cl.exe"
         -DCMAKE_BUILD_TYPE=$(buildType)
         -DCHARLS_PEDANTIC_WARNINGS=On
-        -DCHARLS_THREAT_WARNINGS_AS_ERRORS=On
+        -DCHARLS_TREAT_WARNING_AS_ERROR=On
         $(Build.SourcesDirectory)
 
   - task: CMake@1
@@ -173,40 +180,40 @@ jobs:
 
   strategy:
     matrix:
-      GCC-7 Debug:
+      GCC-9 Debug:
         buildType: Debug
-        CC: gcc-7
-        CXX: g++-7
+        CC: gcc-9
+        CXX: g++-9
         Shared: 'OFF'
 
-      GCC-7 Release:
+      GCC-9 Release:
         buildType: Release
-        CC: gcc-7
-        CXX: g++-7
+        CC: gcc-9
+        CXX: g++-9
         Shared: 'OFF'
 
-      GCC-7 Release Shared:
+      GCC-9 Release Shared:
         buildType: Release
-        CC: gcc-7
-        CXX: g++-7
+        CC: gcc-9
+        CXX: g++-9
         Shared: 'ON'
 
-      Clang-6 Debug:
+      Clang-10 Debug:
         buildType: Debug
-        CC: clang-6.0
-        CXX: clang++-6.0
+        CC: clang-10
+        CXX: clang++-10
         Shared: 'OFF'
 
-      Clang-6 Release:
+      Clang-11 Release:
         buildType: Release
-        CC: clang-6.0
-        CXX: clang++-6.0
+        CC: clang-11
+        CXX: clang++-11
         Shared: 'OFF'
 
-      Clang-6 Release Shared:
+      Clang-12 Release Shared:
         buildType: Release
-        CC: clang-6.0
-        CXX: clang++-6.0
+        CC: clang-12
+        CXX: clang++-12
         Shared: 'ON'
 
   steps:
@@ -221,7 +228,7 @@ jobs:
         -DCMAKE_BUILD_TYPE=$(buildType)
         -DBUILD_SHARED_LIBS=$(Shared)
         -DCHARLS_PEDANTIC_WARNINGS=On
-        -DCHARLS_THREAT_WARNINGS_AS_ERRORS=On
+        -DCHARLS_TREAT_WARNING_AS_ERROR=On
         $(Build.SourcesDirectory)
 
   - task: CMake@1
@@ -240,9 +247,11 @@ jobs:
     matrix:
       Xcode Debug:
         buildType: Debug
+        Shared: 'OFF'
 
       Xcode Release:
         buildType: Release
+        Shared: 'ON'
 
   steps:
   - script: mkdir $(Build.BinariesDirectory)/build
@@ -254,12 +263,13 @@ jobs:
       workingDirectory: $(Build.BinariesDirectory)/build
       cmakeArgs:
         -DCMAKE_BUILD_TYPE=$(buildType
+        -DBUILD_SHARED_LIBS=$(Shared)
         -DCHARLS_PEDANTIC_WARNINGS=On
-        -DCHARLS_THREAT_WARNINGS_AS_ERRORS=On
+        -DCHARLS_TREAT_WARNING_AS_ERROR=On
         $(Build.SourcesDirectory)
 
   - task: CMake@1
     displayName: "Build CharLS"
     inputs:
       workingDirectory: $(Build.BinariesDirectory)/build
-      cmakeArgs: --build .
+      cmakeArgs: --build .
\ No newline at end of file