Update build.cmd/netci.groovy to use VS2017 (microsoft#41)

build.cmd

@@ -1,26 +1,34 @@
 @echo off
 setlocal
 
-if not defined VisualStudioVersion (
-    if defined VS140COMNTOOLS (
-        call "%VS140COMNTOOLS%\VsDevCmd.bat"
-        goto :EnvSet
-    )
+if NOT "%VSINSTALLDIR%"=="" goto InDevPrompt
 
-    echo Error: build.cmd requires Visual Studio 2015.
-    exit /b 1
-)
+set x86ProgramFiles=%ProgramFiles(x86)%
+if "%x86ProgramFiles%"=="" set x86ProgramFiles=%ProgramFiles%
+set VSWherePath=%x86ProgramFiles%\Microsoft Visual Studio\Installer\vswhere.exe
+if NOT exist "%VSWherePath%" echo ERROR: Could not find vswhere.exe (%VSWherePath%). Ensure that Visual Studio 2017 version 15.5 or newer is installed. & exit /b -1 
 
-if not exist "%VSSDK140Install%" (
-    echo Error: build.cmd requires the Visual Studio SDK to be installed.
-    exit /b 1
-)
+for /f "usebackq tokens=1 delims=" %%a in (`"%VSWherePath%" -version [15.0, -prerelease -property installationPath`) do call :ProcessIDE "%%a"
+if NOT "%VSINSTALLDIR%"=="" goto InDevPrompt
 
+echo ERROR: Unable to find a Visual Studio install.
+exit /b -1
+
+:InDevPrompt
 set _buildproj=%~dp0BuildAndTest.proj
 set _buildlog=%~dp0msbuild.log
+set MSBuildCmd=msbuild "%_buildproj%" /nologo /maxcpucount /nodeReuse:false %*
 
-msbuild "%_buildproj%" /nologo /maxcpucount /nodeReuse:false %*
+echo %MSBuildCmd%
+call %MSBuildCmd%
 set BUILDERRORLEVEL=%ERRORLEVEL%
 
 echo Build Exit Code = %BUILDERRORLEVEL%
-exit /b %BUILDERRORLEVEL%
+exit /b %BUILDERRORLEVEL%
+
+:ProcessIDE
+if NOT "%VSINSTALLDIR%"=="" goto :EOF
+if NOT exist "%~1\Common7\Tools\VsDevCmd.bat" goto :EOF
+echo Using Visual Studio from %1
+call "%~1\Common7\Tools\VsDevCmd.bat"
+goto :EOF

netci.groovy

@@ -18,7 +18,7 @@ def branch = GithubBranchName
         // and calls made within that closure apply to the newly created job.
         def newJob = job(newJobName) {
             steps {
-                batchFile("call \"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\Tools\\VsDevCmd.bat\" && build.cmd /p:Configuration=${configuration}")
+                batchFile("call build.cmd /p:Configuration=${configuration}")
             }
         }