Merge pull request #1883 from mellinoe/fix-osx-buildscripts

Fix a couple build issues on OSX/non-Windows
This commit is contained in:
Sridhar Periyasamy 2016-03-15 15:22:53 -07:00
commit 93738ff48f
2 changed files with 2 additions and 2 deletions

View file

@ -189,7 +189,7 @@ install_dotnet()
local localVersion=$(tail -n 1 "$installLocation/cli/.version" 2>/dev/null)
if [ "$VERSION" == "Latest" ]; then
# Check if we need to bother
local remoteData="$(curl -s https://dotnetcli.blob.core.windows.net/dotnet/$CHANNEL/dnvm/latest.$os.version)"
local remoteData="$(curl -s https://dotnetcli.blob.core.windows.net/dotnet/$CHANNEL/dnvm/latest.$os.x64.version)"
[ $? != 0 ] && say_err "Unable to determine latest version." && return 1
local remoteVersion=$(IFS="\n" && echo $remoteData | tail -n 1)

View file

@ -114,7 +114,7 @@ echo "Invoking Build Scripts..."
echo "Configuration: $CONFIGURATION"
if [ -f "$DIR/dotnet-cli-build/bin/dotnet-cli-build" ]; then
$DIR/dotnet-cli-build/bin/dotnet-cli-build "${targets[@]}"
$DIR/dotnet-cli-build/bin/dotnet-cli-build ${targets[@]}
exit $?
else
# We're on an older CLI. This is temporary while Ubuntu and CentOS VSO builds are stalled.