@@ -65,7 +65,14 @@ def static getBuildJobName(def configuration, def os) {
6565 steps {
6666if (os== ' Windows_NT'
6767// Batch
68- batchFile(buildCommand)
68+ buildCommand= "
69+ echo *** Build Visual F# Tools ***
70+
71+ SET VS150COMNTOOLS=%ProgramFiles(x86)%\\ Microsoft Visual Studio\\ 2017\\ Enterprise\\ Common7\\ Tools\\
72+ SET VSSDK150Install=%ProgramFiles(x86)%\\ Microsoft Visual Studio\\ 2017\\ Enterprise\\ VSSDK\\
73+ SET VSSDKInstall=%ProgramFiles(x86)%\\ Microsoft Visual Studio\\ 2017\\ Enterprise\\ VSSDK\\
74+
75+ .\\ build.cmd${ buildFlavor} ${ build_args} "
6976 }
7077else {
7178// Shell
@@ -77,7 +84,7 @@ def static getBuildJobName(def configuration, def os) {
7784// TODO: set to false after tests are fully enabled
7885def skipIfNoTestFiles= true
7986
80- def affinity= configuration== ' Release_net40_no_vs' ? ' latest-or-auto' : (os== ' Windows_NT' ? ' latest-dev15' : ' latest-or-auto'
87+ def affinity= configuration== ' Release_net40_no_vs' ? ' latest-or-auto' : (os== ' Windows_NT' ? ' latest-dev15' : ' latest-or-auto'
8188Utilities . setMachineAffinity(newJob, os, affinity)
8289Utilities . standardJobSetup(newJob, project, isPullRequest," */${ branch} "
8390Utilities . addArchival(newJob," tests/TestResults/*.*" " " false )