diff --git a/CMakeLists.txt b/CMakeLists.txt
index a997aaee..b7023009 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,7 +73,7 @@ endif()
 # Process options
 # -----------------------------------------------------------------------------
 
-if(CMAKE_C_COMPILER_ID MATCHES "Intel")
+if(CMAKE_C_COMPILER_ID MATCHES "MSVC|Intel")
   set(MI_USE_CXX "ON")
 endif()
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index cfaf1876..6e99c9d9 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -18,7 +18,7 @@ jobs:
   displayName: Windows
   pool:
     vmImage:
-      windows-2019
+      windows-2022
   strategy:
     matrix:
       Debug: