From 667c73a7131f65c420e02301d2a8892afc2195d7 Mon Sep 17 00:00:00 2001
From: Mazen El-Kashef <mazen.elkashef@gmail.com>
Date: Tue, 10 Mar 2020 11:26:17 -0500
Subject: [PATCH] Upgrade to widows image to vs2017-win2016

---
 script/vsts/nightly-release.yml      |  2 +-
 script/vsts/platforms/windows.yml    | 12 ++++++++++--
 script/vsts/release-branch-build.yml |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/script/vsts/nightly-release.yml b/script/vsts/nightly-release.yml
index ebbf0819d..5a2b0747b 100644
--- a/script/vsts/nightly-release.yml
+++ b/script/vsts/nightly-release.yml
@@ -18,7 +18,7 @@ jobs:
 
   - job: Release
     pool:
-      vmImage: vs2015-win2012r2 # needed for Python 2.7 and gyp
+      vmImage: vs2017-win2016
 
     dependsOn:
       - GetReleaseVersion
diff --git a/script/vsts/platforms/windows.yml b/script/vsts/platforms/windows.yml
index 746d517a6..35838f190 100644
--- a/script/vsts/platforms/windows.yml
+++ b/script/vsts/platforms/windows.yml
@@ -11,7 +11,7 @@ jobs:
           buildArch: x86
 
     pool:
-      vmImage: vs2015-win2012r2 # needed for python 2.7 and gyp
+      vmImage: vs2017-win2016
 
     variables:
       AppName: $[ dependencies.GetReleaseVersion.outputs['Version.AppName'] ]
@@ -20,6 +20,10 @@ jobs:
       IsSignedZipBranch: $[ dependencies.GetReleaseVersion.outputs['Version.IsSignedZipBranch'] ]
 
     steps:
+      - task: UsePythonVersion@0
+        inputs:
+          versionSpec: '2.7'
+
       - task: NodeTool@0
         inputs:
           versionSpec: 10.2.1
@@ -35,6 +39,10 @@ jobs:
           npm-windows-upgrade --no-spinner --no-prompt --npm-version 6.2.0
         displayName: Install npm 6.2.0
 
+      - script: |
+          npm install --global --production windows-build-tools@4.0
+        displayName: Install windows build tools
+
       - script: |
           cd script\vsts
           npm install
@@ -62,7 +70,7 @@ jobs:
           BUILD_ARCH: $(buildArch)
           CI: true
           CI_PROVIDER: VSTS
-          NPM_BIN_PATH: "D:\\a\\_tool\\node\\10.2.1\\x64\\npm.cmd"
+          NPM_BIN_PATH: "C:\\hostedtoolcache\\windows\\node\\10.2.1\\x64\\npm.cmd"
         displayName: Bootstrap build environment
         condition: ne(variables['CacheRestored'], 'true')
 
diff --git a/script/vsts/release-branch-build.yml b/script/vsts/release-branch-build.yml
index d7727c032..0d4af9456 100644
--- a/script/vsts/release-branch-build.yml
+++ b/script/vsts/release-branch-build.yml
@@ -22,7 +22,7 @@ jobs:
 
   - job: UploadArtifacts
     pool:
-      vmImage: vs2015-win2012r2 # needed for python 2.7 and gyp
+      vmImage: vs2017-win2016
 
     dependsOn:
       - GetReleaseVersion