diff --git a/scripts/dotnet-cli-build/Utils/DotNetCli.cs b/scripts/dotnet-cli-build/Utils/DotNetCli.cs index a256a7df7..6a1a69450 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, "bin"); + PlatformServices.Default.Runtime.RuntimeArchitecture); } else { - return Path.Combine(Directory.GetCurrentDirectory(), ".dotnet_stage0", PlatformServices.Default.Runtime.OperatingSystemPlatform.ToString(), "bin"); + return Path.Combine(Directory.GetCurrentDirectory(), ".dotnet_stage0", PlatformServices.Default.Runtime.OperatingSystemPlatform.ToString()); } } diff --git a/scripts/run-build.ps1 b/scripts/run-build.ps1 index 8e5621edd..936596f7f 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 -Verbose # Put the stage0 on the path -$env:PATH = "$env:DOTNET_INSTALL_DIR\cli;$env:PATH" +$env:PATH = "$env:DOTNET_INSTALL_DIR;$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 c55e2f3d8..58fae0bea 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 --verbose # Put stage 0 on the PATH (for this shell only) -PATH="$DOTNET_INSTALL_DIR/cli:$PATH" +PATH="$DOTNET_INSTALL_DIR:$PATH" # Increases the file descriptors limit for this bash. It prevents an issue we were hitting during restore FILE_DESCRIPTOR_LIMIT=$( ulimit -n )