mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Download the stage0 dotnet tools from the beta feed for unix.

Browse source 
Set the correct channel so that the stage0 binaries are downloaded
correctly.

** This commit cannot be directly merged from the release branch to the
master branch **
This commit is contained in:
Sridhar Periyasamy 2016-01-20 19:08:00 -08:00
parent a8aea60f14
commit 137336d0d0
5 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
scripts/build/generate-version.sh
View file

@ -4,7 +4,6 @@
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
#
export RELEASE_SUFFIX=beta
export MAJOR_VERSION=1
export MINOR_VERSION=0
export PATCH_VERSION=0

2
scripts/common/_common.sh
View file

@ -23,6 +23,8 @@ export DNX_ROOT=$DNX_DIR/bin
export STAGE1_DIR=$OUTPUT_ROOT/stage1
export STAGE2_DIR=$OUTPUT_ROOT/stage2
export HOST_DIR=$OUTPUT_ROOT/corehost
export RELEASE_SUFFIX=beta
export CHANNEL=$RELEASE_SUFFIX
[ -z "$DOTNET_INSTALL_DIR" ] && export DOTNET_INSTALL_DIR=$REPOROOT/.dotnet_stage0/$RID
[ -z "$DOTNET_CLI_VERSION" ] && export DOTNET_CLI_VERSION=0.1.0.0

2
scripts/compile/compile-stage.sh
View file

@ -118,4 +118,4 @@ fi
# Stamp the output with the commit metadata
COMMIT=$(git rev-parse HEAD)
echo $COMMIT > $OUTPUT_DIR/.version
echo $DOTNET_BUILD_VERSION >> $OUTPUT_DIR/.version
echo $DOTNET_CLI_VERSION >> $OUTPUT_DIR/.version

6
scripts/obtain/install.sh
View file

@ -54,6 +54,8 @@ exec "$MY_TARGET" "$@"
EOF
)
[ -z "$CHANNEL" ] && CHANNEL="dev"
#set default prefix (PREFIX is a fairly standard env-var, but we also want to allow the use the specific "DOTNET_INSTALL_DIR" one)
if [ ! -z "$DOTNET_INSTALL_DIR" ]; then
PREFIX=$DOTNET_INSTALL_DIR
@ -171,13 +173,13 @@ install_dotnet()
fi
local os=$(current_os)
local installLocation="$PREFIX/share/dotnet"
local dotnet_url="https://dotnetcli.blob.core.windows.net/dotnet/dev/Binaries/Latest"
local dotnet_url="https://dotnetcli.blob.core.windows.net/dotnet/$CHANNEL/Binaries/Latest"
local dotnet_filename="dotnet-$os-x64.latest.tar.gz"
if [ "$RELINK" = "0" ]; then
if [ "$FORCE" = "0" ]; then
# Check if we need to bother
local remoteData="$(curl -s https://dotnetcli.blob.core.windows.net/dotnet/dev/dnvm/latest.$os.version)"
local remoteData="$(curl -s https://dotnetcli.blob.core.windows.net/dotnet/$CHANNEL/dnvm/latest.$os.version)"
[ $? != 0 ] && say_err "Unable to determine latest version." && return 1
local remoteVersion=$(IFS="\n" && echo $remoteData | tail -n 1)

4
scripts/package/package-debian.sh
View file

@ -35,7 +35,7 @@ MANPAGE_DIR="$REPOROOT/Documentation/manpages"
NIGHTLY_PACKAGE_NAME="dotnet-nightly"
RELEASE_PACKAGE_NAME="dotnet"
[ -z "$RELEASE_SUFFIX" ] && RELEASE_SUFFIX="dev"
[ -z "$CHANNEL" ] && CHANNEL="dev"
execute_build(){
determine_package_name
@ -97,7 +97,7 @@ test_debian_package(){
header "Testing debian package"
# Set LAST_VERSION_URL to enable upgrade tests
export LAST_VERSION_URL="https://dotnetcli.blob.core.windows.net/dotnet/$RELEASE_SUFFIX/Installers/Latest/dotnet-ubuntu-x64.latest.deb"
export LAST_VERSION_URL="https://dotnetcli.blob.core.windows.net/dotnet/$CHANNEL/Installers/Latest/dotnet-ubuntu-x64.latest.deb"
rm -rf $TEST_STAGE_DIR
git clone https://github.com/sstephenson/bats.git $TEST_STAGE_DIR