diff --git a/scripts/dotnet-cli-build/PrepareTargets.cs b/scripts/dotnet-cli-build/PrepareTargets.cs index 0dcfa1538..31a86569e 100644 --- a/scripts/dotnet-cli-build/PrepareTargets.cs +++ b/scripts/dotnet-cli-build/PrepareTargets.cs @@ -99,7 +99,7 @@ namespace Microsoft.DotNet.Cli.Build } // Identify the version - var version = File.ReadAllLines(Path.Combine(stage0, "..", ".version")); + var version = File.ReadAllLines(Path.Combine(stage0, ".version")); c.Info($"Using Stage 0 Version: {version[1]}"); return c.Success(); diff --git a/scripts/dotnet-cli-build/Utils/DotNetCli.cs b/scripts/dotnet-cli-build/Utils/DotNetCli.cs index a84ec89dc..b9dbb079c 100644 --- a/scripts/dotnet-cli-build/Utils/DotNetCli.cs +++ b/scripts/dotnet-cli-build/Utils/DotNetCli.cs @@ -37,11 +37,11 @@ namespace Microsoft.DotNet.Cli.Build { return Path.Combine(Directory.GetCurrentDirectory(), ".dotnet_stage0", PlatformServices.Default.Runtime.OperatingSystemPlatform.ToString(), - PlatformServices.Default.Runtime.RuntimeArchitecture, "cli", "bin"); + PlatformServices.Default.Runtime.RuntimeArchitecture, "cli"); } else { - return Path.Combine(Directory.GetCurrentDirectory(), ".dotnet_stage0", PlatformServices.Default.Runtime.OperatingSystemPlatform.ToString(), "share", "dotnet", "cli", "bin"); + return Path.Combine(Directory.GetCurrentDirectory(), ".dotnet_stage0", PlatformServices.Default.Runtime.OperatingSystemPlatform.ToString(), "cli"); } } } diff --git a/scripts/obtain/install.ps1 b/scripts/obtain/install.ps1 index 648aff8f6..58ae82c5d 100644 --- a/scripts/obtain/install.ps1 +++ b/scripts/obtain/install.ps1 @@ -4,7 +4,7 @@ # param( - [string]$Channel="dev", + [string]$Channel="beta", [string]$version="Latest", [string]$Architecture="x64" ) @@ -17,7 +17,8 @@ if ($fileVersion -eq "Latest") { $fileVersion = "latest" } $Feed="https://dotnetcli.blob.core.windows.net/dotnet" -$DotNetFileName="dotnet-win-$Architecture.$fileVersion.zip" + +$DotNetFileName="dotnet-combined-framework-sdk-host-win-$Architecture.$fileVersion.zip" $DotNetUrl="$Feed/$Channel/Binaries/$Version" function say($str) @@ -105,4 +106,4 @@ if (Test-Path "$InstallDir\$DotNetFileName") { say "The .NET Tools have been installed to $InstallDir\cli!" # New layout -say "Add '$InstallDir\cli\bin' to your PATH to use dotnet" +say "Add '$InstallDir\cli' to your PATH to use dotnet" diff --git a/scripts/obtain/install.sh b/scripts/obtain/install.sh index 706b4c718..e26956481 100755 --- a/scripts/obtain/install.sh +++ b/scripts/obtain/install.sh @@ -4,54 +4,6 @@ # Note: This script should be compatible with the dash shell used in Ubuntu. So avoid bashisms! See https://wiki.ubuntu.com/DashAsBinSh for more info -# This is a herestring Everything from the line AFTER the "read" until the line containing ONLY "EOF" is part of the string -# The quotes around "EOF" ensure that $ is not interpreted as a variable expansion. The indentation of the herestring must be -# kept exactly consistent -LINK_SCRIPT_CONTENT=$(cat <<-"EOF" -#!/usr/bin/env bash - -SOURCE="${BASH_SOURCE[0]}" -while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink - DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" - SOURCE="$(readlink "$SOURCE")" - [[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located -done -DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" - -if [ -z "$DOTNET_TOOLS" ]; then - # We should be in $PREFIX/bin, so just get the directory above us. - PREFIX="$( cd -P "$DIR/.." && pwd)" - - # The tools are in $PREFIX/share/dotnet/cli by default - DOTNET_TOOLS_DEFAULT=$PREFIX/share/dotnet/cli - - # Check the default location - if [ -d "$DOTNET_TOOLS_DEFAULT" ]; then - export DOTNET_TOOLS=$DOTNET_TOOLS_DEFAULT - else - echo "error: the .NET tools installation appears to be corrupt!" 1>&2 - echo "error: specifically, the tools could not be located in the $DOTNET_TOOLS_DEFAULT directory" 1>&2 - exit 1 - fi -fi - -MY_NAME=$(basename ${BASH_SOURCE[0]}) -MY_TARGET=$DOTNET_TOOLS/bin/$MY_NAME - -if [ ! -e "$MY_TARGET" ]; then - echo "error: the tool $MY_TARGET cannot be found" 1>&2 - exit 1 -fi - -if [ ! -x "$MY_TARGET" ]; then - echo "error: the tool $MY_TARGET is not executable" 1>&2 - exit 1 -fi - -exec "$MY_TARGET" "$@" -EOF -) - #setup some colors to use. These need to work in fairly limited shells, like the Ubuntu Docker container where there are only 8 colors. #See if stdout is a terminal if [ -t 1 ]; then @@ -138,18 +90,13 @@ say() { make_link() { local target_name=$1 - local dest=$PREFIX/bin/$target_name - say "Linking $dest -> $PREFIX/share/dotnet/cli/$target_name" + local src=$INSTALLDIR/cli/$target_name + local dest=$BINDIR/$target_name + say "Linking $dest -> $src" if [ -e $dest ]; then rm $dest fi - - [ -d "$PREFIX/bin" ] || mkdir -p $PREFIX/bin - - echo "$LINK_SCRIPT_CONTENT" > $dest - - # Make mode: rwxr-xr-x - chmod 755 $dest + ln -s $src $dest } install_dotnet() @@ -159,7 +106,7 @@ install_dotnet() return 1 fi - say "Preparing to install .NET Tools from '$CHANNEL' channel to '$PREFIX'" + say "Preparing to install .NET Tools from '$CHANNEL' channel to '$INSTALLDIR'" if [ -e "$PREFIX/share/dotnet/cli/dotnet" ] && [ ! -w "$PREFIX/share/dotnet/cli/dotnet" ]; then say_err "dotnet cli is already installed and not writeable. Use 'curl -sSL | sudo sh' to force install." @@ -180,9 +127,9 @@ install_dotnet() fi local os=$(current_os) - local installLocation="$PREFIX/share/dotnet" + local installLocation="$INSTALLDIR" local dotnet_url="https://dotnetcli.blob.core.windows.net/dotnet/$CHANNEL/Binaries/$VERSION" - local dotnet_filename="dotnet-$os-x64.$fileVersion.tar.gz" + local dotnet_filename="dotnet-combined-framework-sdk-host-$os-x64.$fileVersion.tar.gz" if [ "$RELINK" = "0" ]; then if [ "$FORCE" = "0" ]; then @@ -236,11 +183,9 @@ install_dotnet() return 1 fi - for f in $(find "$installLocation/cli" -regex ".*/dotnet[a-z\-]*$") - do - local baseFile=$(basename $f) - make_link $baseFile - done + if [ ! -z "$BINDIR" ]; then + make_link "dotnet" + fi if [ -e "$installLocation/$dotnet_filename" ]; then say "Cleaning $dotnet_filename" @@ -306,13 +251,15 @@ do done #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 -elif [ -z "$PREFIX" ]; then - PREFIX=/usr/local +if [ -z "$DOTNET_INSTALL_DIR" ]; then + INSTALLDIR=/usr/local/share/dotnet + BINDIR=/usr/local/bin +else + INSTALLDIR=$DOTNET_INSTALL_DIR + BINDIR= fi -[ -z "$CHANNEL" ] && CHANNEL="dev" +[ -z "$CHANNEL" ] && CHANNEL="beta" [ -z "$VERSION" ] && VERSION="Latest" install_dotnet diff --git a/scripts/run-build.ps1 b/scripts/run-build.ps1 index 79809e4c6..8e8125c1d 100644 --- a/scripts/run-build.ps1 +++ b/scripts/run-build.ps1 @@ -67,7 +67,7 @@ Write-Host "Installing .NET Core CLI Stage 0 from beta channel" & "$PSScriptRoot\obtain\install.ps1" -Channel $env:CHANNEL -Architecture $Architecture # Put the stage0 on the path -$env:PATH = "$env:DOTNET_INSTALL_DIR\cli\bin;$env:PATH" +$env:PATH = "$env:DOTNET_INSTALL_DIR\cli;$env:PATH" # Restore the build scripts Write-Host "Restoring Build Script projects..." diff --git a/scripts/run-build.sh b/scripts/run-build.sh index 4de0d15a1..1c7e60794 100755 --- a/scripts/run-build.sh +++ b/scripts/run-build.sh @@ -88,7 +88,7 @@ export CHANNEL=$RELEASE_SUFFIX $DIR/obtain/install.sh --channel $CHANNEL # Put stage 0 on the PATH (for this shell only) -PATH="$DOTNET_INSTALL_DIR/bin:$PATH" +PATH="$DOTNET_INSTALL_DIR/cli:$PATH" # Increases the file descriptors limit for this bash. It prevents an issue we were hitting during restore FILE_DESCRIPTOR_LIMIT=$( ulimit -n )