NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commitfefae46

authored

Merge pull request #3888 from KevinRansom/revertmsbuild

Revert "use a stable up-to-date version of MSBuild"

2 parentsd356368 +2afdda0 commitfefae46Copy full SHA for fefae46

File tree

2 files changed

+37

-2

lines changed

2 files changed

+37

-2

lines changed

`‎build.cmd‎`

Lines changed: 37 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,43 @@ if "%RestorePackages%"=="" (`
`484`	`484`
`485`	`485`	`@call src\update.cmd signonly`
`486`	`486`
`487`		`-set_msbuildexe=%~dp0packages\RoslynTools.MSBuild.0.4.0-alpha\tools\msbuild\MSBuild.exe`
	`487`	`+:: Check prerequisites`
	`488`	`+ifnot"%VisualStudioVersion%"==""goto vsversionset`
	`489`	`+ifexist"%VS150COMNTOOLS%\..\ide\devenv.exe"setVisualStudioVersion=15.0`
	`490`	`+ifnot"%VisualStudioVersion%"==""goto vsversionset`
	`491`	`+`
	`492`	`+ifnot"%VisualStudioVersion%"==""goto vsversionset`
	`493`	`+ifexist"%VS150COMNTOOLS%\..\..\ide\devenv.exe"setVisualStudioVersion=15.0`
	`494`	`+ifnot"%VisualStudioVersion%"==""goto vsversionset`
	`495`	`+`
	`496`	`+ifexist"%VS140COMNTOOLS%\..\ide\devenv.exe"setVisualStudioVersion=14.0`
	`497`	`+ifexist"%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\common7\ide\devenv.exe"setVisualStudioVersion=14.0`
	`498`	`+ifexist"%ProgramFiles%\Microsoft Visual Studio 14.0\common7\ide\devenv.exe"setVisualStudioVersion=14.0`
	`499`	`+ifnot"%VisualStudioVersion%"==""goto vsversionset`
	`500`	`+`
	`501`	`+ifexist"%VS120COMNTOOLS%\..\ide\devenv.exe"setVisualStudioVersion=12.0`
	`502`	`+ifexist"%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\common7\ide\devenv.exe"setVisualStudioVersion=12.0`
	`503`	`+ifexist"%ProgramFiles%\Microsoft Visual Studio 12.0\common7\ide\devenv.exe"setVisualStudioVersion=12.0`
	`504`	`+`
	`505`	`+:vsversionset`
	`506`	`+if"%VisualStudioVersion%"==""echo Error: Could not find an installation of Visual Studio&&goto :failure`
	`507`	`+`
	`508`	`+ifexist"%VS150COMNTOOLS%\..\..\MSBuild\15.0\Bin\MSBuild.exe" (`
	`509`	`+set_msbuildexe="%VS150COMNTOOLS%\..\..\MSBuild\15.0\Bin\MSBuild.exe"`
	`510`	`+goto :havemsbuild`
	`511`	`+)`
	`512`	`+ifexist"%ProgramFiles(x86)%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe" (`
	`513`	`+set_msbuildexe="%ProgramFiles(x86)%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe"`
	`514`	`+goto :havemsbuild`
	`515`	`+)`
	`516`	`+ifexist"%ProgramFiles%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe" (`
	`517`	`+set_msbuildexe="%ProgramFiles%\MSBuild\%VisualStudioVersion%\Bin\MSBuild.exe"`
	`518`	`+goto :havemsbuild`
	`519`	`+)`
	`520`	`+echo Error: Could not find MSBuild.exe.&&goto :failure`
	`521`	`+goto :eof`
	`522`	`+`
	`523`	`+:havemsbuild`
`488`	`524`	`set_nrswitch=/nr:false`
`489`	`525`
`490`	`526`	`:: See <http://www.appveyor.com/docs/environment-variables>`

`‎packages.config‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`<!-- Build infrastructure-->`
`11`	`11`	`<packageid="MicroBuild.Core"version="0.2.0" />`
`12`	`12`	`<packageid="MicroBuild.Core.Sentinel"version="1.0.0" />`
`13`		`- <packageid="RoslynTools.MSBuild"version="0.4.0-alpha" />`
`14`	`13`
`15`	`14`	<!-- For the internal orchestrated build. This version should be kept in sync with `PublishToBlob.proj`-->
`16`	`15`	`<packageid="Microsoft.DotNet.Build.Tasks.Feed"version="1.0.0-prerelease-02121-01" />`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitfefae46

File tree

2 files changed

2 files changed

`‎build.cmd‎`

`‎packages.config‎`

0 commit comments