From 388a9c96b04933ca539fdb69ff8d7b2794e6454e Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Wed, 18 May 2016 14:56:44 +0100 Subject: [PATCH] [jenkins] Use VS2015, not 2013 --- scripts/ci/run-jenkins.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci/run-jenkins.sh b/scripts/ci/run-jenkins.sh index c28543d35fd..726cad778b2 100755 --- a/scripts/ci/run-jenkins.sh +++ b/scripts/ci/run-jenkins.sh @@ -26,8 +26,8 @@ fi ${TESTCMD} --label=configure --timeout=60m --fatal ./autogen.sh $EXTRA_CONF_FLAGS if [[ ${label} == w* ]]; then - ${TESTCMD} --label=make-msvc --timeout=60m --fatal /cygdrive/c/Program\ Files\ \(x86\)/MSBuild/12.0/Bin/MSBuild.exe /p:Platform=${PLATFORM} /p:Configuration=Release msvc/mono.sln - ${TESTCMD} --label=make-msvc-sgen --timeout=60m --fatal /cygdrive/c/Program\ Files\ \(x86\)/MSBuild/12.0/Bin/MSBuild.exe /p:Platform=${PLATFORM} /p:Configuration=Release_SGen msvc/mono.sln + ${TESTCMD} --label=make-msvc --timeout=60m --fatal /cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:PlatformToolset=v140 /p:Platform=${PLATFORM} /p:Configuration=Release msvc/mono.sln + ${TESTCMD} --label=make-msvc-sgen --timeout=60m --fatal /cygdrive/c/Program\ Files\ \(x86\)/MSBuild/14.0/Bin/MSBuild.exe /p:PlatformToolset=v140 /p:Platform=${PLATFORM} /p:Configuration=Release_SGen msvc/mono.sln fi ${TESTCMD} --label=make --timeout=300m --fatal make -w V=1 if [[ -n "${ghprbPullId}" ]] && [[ ${label} == w* ]]; -- 2.25.1