Commitcc10ab3

committed

Modify the build script to select msbuild based on Installed VS rather than relying on a search.

1 parent3c8226f commitcc10ab3Copy full SHA for cc10ab3

File tree

+14

-4

lines changed

+14

-4

lines changed

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,10 +3,14 @@`
`3`	`3`	`setAPPVEYOR_CI=1`
`4`	`4`
`5`	`5`	`:: Check prerequisites`
`6`		`-set_msbuildexe="%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe"`
`7`		`-ifnotexist%_msbuildexe%set_msbuildexe="%ProgramFiles%\MSBuild\12.0\Bin\MSBuild.exe"`
	`6`	`+rem by default pick msbuild based on VisualStudioVersion`
	`7`	`+set_msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe"`
	`8`	`+if '%VisualStudioVersion%'='14.0'set_msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe"`
	`9`	`+if '%VisualStudioVersion%'='12.0'set_msbuildexe="%ProgramFiles(x86)%\MSBuild\12.0\Bin\MSBuild.exe"`
	`10`	`+`
	`11`	`+rem manually search if we have no msbuild`
`8`	`12`	`ifnotexist%_msbuildexe%set_msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe"`
`9`		`-ifnotexist%_msbuildexe%set_msbuildexe="%ProgramFiles%\MSBuild\14.0\Bin\MSBuild.exe"`
	`13`	`+ifnotexist%_msbuildexe%set_msbuildexe="%ProgramFiles%\MSBuild\12.0\Bin\MSBuild.exe"`
`10`	`14`	`ifnotexist%_msbuildexe%echo Error: Could not find MSBuild.exe. Please see http://www.microsoft.com/en-us/download/details.aspx?id=40760.&&goto :eof`
`11`	`15`
`12`	`16`	`set_gacutilexe="%ProgramFiles(x86)%\Microsoft SDKs\Windows\v8.1A\bin\NETFX 4.5.1 Tools\gacutil.exe"`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,14 @@`
`1`		`-os:Visual Studio 2015Preview`
	`1`	`+os:Visual Studio 2015CTP`
`2`	`2`
`3`	`3`	`init:`
`4`	`4`	`build_script:`
`5`	`5`	`-cmd:appveyor-build.cmd`
	`6`	`+`
	`7`	`+# scripts that run after cloning repository`
	`8`	`+install:`
	`9`	`+# by default, all script lines are interpreted as batch`
	`10`	`+ -set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%`
	`11`	`+`
`6`	`12`	`test:off`
`7`	`13`	`version:0.0.1.{build}`
`8`	`14`	`artifacts:`

Comments

(0)