diff --git a/NuGet.Config b/NuGet.Config index 62fc399a04..f2f531821f 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -6,6 +6,7 @@ + diff --git a/scripts/cake-bootstrap.sh b/scripts/cake-bootstrap.sh index 52a72c1ff7..51d0c4c1e6 100644 --- a/scripts/cake-bootstrap.sh +++ b/scripts/cake-bootstrap.sh @@ -8,7 +8,7 @@ # Define directories. SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -TOOLS_DIR=$SCRIPT_DIR/tools +TOOLS_DIR=$SCRIPT_DIR/../tools NUGET_EXE=$TOOLS_DIR/nuget.exe CAKE_EXE=$TOOLS_DIR/Cake/Cake.exe PACKAGES_CONFIG=$TOOLS_DIR/packages.config @@ -26,7 +26,7 @@ fi SCRIPT="build.cake" TARGET="Default" CONFIGURATION="Release" -VERBOSITY="verbose" +VERBOSITY="Verbose" DRYRUN= SHOW_VERSION=false SCRIPT_ARGUMENTS=() @@ -73,7 +73,7 @@ fi # Restore tools from NuGet. pushd "$TOOLS_DIR" >/dev/null -if [ ! -f $PACKAGES_CONFIG_MD5 ] || [ "$( cat $PACKAGES_CONFIG_MD5 | sed 's/\r$//' )" != "$( $MD5_EXE $PACKAGES_CONFIG | awk '{ print $1 }' )" ]; then +if [ ! -f "$PACKAGES_CONFIG_MD5" ] || [ "$( cat "$PACKAGES_CONFIG_MD5" | sed 's/\r$//' )" != "$( $MD5_EXE "$PACKAGES_CONFIG" | awk '{ print $1 }' )" ]; then find . -type d ! -name . | xargs rm -rf fi @@ -83,7 +83,7 @@ if [ $? -ne 0 ]; then exit 1 fi -$MD5_EXE $PACKAGES_CONFIG | awk '{ print $1 }' >| $PACKAGES_CONFIG_MD5 +$MD5_EXE "$PACKAGES_CONFIG" | awk '{ print $1 }' >| "$PACKAGES_CONFIG_MD5" popd >/dev/null @@ -95,7 +95,7 @@ fi # Start Cake if $SHOW_VERSION; then - exec mono "$CAKE_EXE" -version + exec mono "$CAKE_EXE" --version else exec mono "$CAKE_EXE" $SCRIPT --verbosity=$VERBOSITY --configuration=$CONFIGURATION --target=$TARGET $DRYRUN "${SCRIPT_ARGUMENTS[@]}" fi diff --git a/tools/packages.config b/tools/packages.config index d523504d0b..003dd01c46 100644 --- a/tools/packages.config +++ b/tools/packages.config @@ -2,44 +2,44 @@ - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - +