Skip to content

Commit

Permalink
Revert "Move bootstrap build to MSBuild 14.0"
Browse files Browse the repository at this point in the history
This reverts commit bb02897.
  • Loading branch information
tannergooding committed Nov 2, 2016
1 parent 3cb2531 commit 5f526a4
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions cibuild.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,7 @@ if defined TestPerfRun (
exit /b 0
)

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 /p:DeployExtension=false || goto :BuildFailed
msbuild %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
Expand Down

0 comments on commit 5f526a4

Please sign in to comment.