From 646f3bc0af4f283d72bb0d67966908f74471bef7 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Thu, 29 Aug 2019 23:03:09 -0400
Subject: [PATCH] Update Windows image and compiler

---
 azure-pipelines.yml               | 2 +-
 azure-pipelines/build-windows.bat | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 96f370f6..6b1fe722 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -23,7 +23,7 @@ jobs:
       buildPlatform: Linux
 - job: Windows
   pool:
-    vmImage: vs2017-win2016
+    vmImage: windows-2019
   strategy:
     matrix:
       msvc32:
diff --git a/azure-pipelines/build-windows.bat b/azure-pipelines/build-windows.bat
index ba11b4fd..e646f0a2 100644
--- a/azure-pipelines/build-windows.bat
+++ b/azure-pipelines/build-windows.bat
@@ -2,9 +2,9 @@
 @rem Usage: build-windows {32|64} {msvc|mingw}
 if %2 == msvc (
     if %1 == 64 (
-       call "%VS140COMNTOOLS%\..\..\VC\bin\amd64\vcvars64.bat"
+       call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
     ) else (
-       call "%VS140COMNTOOLS%\..\..\VC\bin\vcvars32.bat"
+       call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
     )
     choco install zip
     bash ./azure-pipelines/build-windows %1 %2