From 1118b35a95e07f512d666fcfe3408fcff9fbe2c1 Mon Sep 17 00:00:00 2001 From: Jared Parsons Date: Thu, 27 Oct 2016 10:01:49 -0700 Subject: [PATCH] Don't deploy extensions in Jenkins runs --- cibuild.cmd | 2 +- src/Tools/MicroBuild/Build.proj | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cibuild.cmd b/cibuild.cmd index ff7298cb35d..b6e9280628c 100644 --- a/cibuild.cmd +++ b/cibuild.cmd @@ -112,7 +112,7 @@ if defined TestPerfRun ( REM Temporarily forcing MSBuild 14.0 here to work around a bug in 15.0 REM MSBuild bug: https://github.com/Microsoft/msbuild/issues/1183 REM Roslyn tracking bug: https://github.com/dotnet/roslyn/issues/14451 -"c:\Program Files (x86)\MSBuild\14.0\bin\MSBuild.exe" %MSBuildAdditionalCommandLineArgs% /p:BootstrapBuildPath="%bindir%\Bootstrap" BuildAndTest.proj /p:Configuration=%BuildConfiguration% /p:Test64=%Test64% /p:TestVsi=%TestVsi% /p:RunProcessWatchdog=%RunProcessWatchdog% /p:BuildStartTime=%BuildStartTime% /p:"ProcDumpExe=%ProcDumpExe%" /p:BuildTimeLimit=%BuildTimeLimit% /p:PathMap="%RoslynRoot%=q:\roslyn" /p:Feature=pdb-path-determinism /fileloggerparameters:LogFile="%bindir%\Build.log";verbosity=diagnostic || goto :BuildFailed +"c:\Program Files (x86)\MSBuild\14.0\bin\MSBuild.exe" %MSBuildAdditionalCommandLineArgs% /p:BootstrapBuildPath="%bindir%\Bootstrap" BuildAndTest.proj /p:Configuration=%BuildConfiguration% /p:Test64=%Test64% /p:TestVsi=%TestVsi% /p:RunProcessWatchdog=%RunProcessWatchdog% /p:BuildStartTime=%BuildStartTime% /p:"ProcDumpExe=%ProcDumpExe%" /p:BuildTimeLimit=%BuildTimeLimit% /p:PathMap="%RoslynRoot%=q:\roslyn" /p:Feature=pdb-path-determinism /fileloggerparameters:LogFile="%bindir%\Build.log";verbosity=diagnostic /p:DeployExtension=false || goto :BuildFailed powershell -noprofile -executionPolicy RemoteSigned -file "%RoslynRoot%\build\scripts\check-msbuild.ps1" "%bindir%\Build.log" || goto :BuildFailed call :TerminateBuildProcesses diff --git a/src/Tools/MicroBuild/Build.proj b/src/Tools/MicroBuild/Build.proj index 2e3ef6a0064..4afaafba6fb 100644 --- a/src/Tools/MicroBuild/Build.proj +++ b/src/Tools/MicroBuild/Build.proj @@ -22,14 +22,14 @@ - + - + - + -- GitLab