Merge branch 'master' of https://github.com/dotnet/cli into centos-docker

Conflicts:
	scripts/build/build.sh
This commit is contained in:
Sridhar Periyasamy 2016-01-08 10:59:31 -08:00
commit 7fe96d56c3
41 changed files with 497 additions and 243 deletions

View file

@ -12,7 +12,7 @@ if [ -z "$RID" ]; then
if [ -n "$(sw_vers -productVersion | grep 10.10)" ]; then
export RID=osx.10.10-x64
elif [ -n "$(sw_vers -productVersion | grep 10.11)" ]; then
export RID=osx.10.10-x64
export RID=osx.10.11-x64
else
error "unknown OS X: $(sw_vers -productVersion)" 1>&2
fi
@ -34,4 +34,4 @@ fi
if [ -z "$RID" ]; then
exit 1
fi
fi