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

fix paths in the build

Browse source
This commit is contained in:
Krzysztof Wicher 2016-03-21 12:40:52 -07:00
parent 369796376b
commit baaf742731
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/dotnet-cli-build/Utils/DotNetCli.cs
View file

@ -37,11 +37,11 @@ namespace Microsoft.DotNet.Cli.Build
{ {
return Path.Combine(Directory.GetCurrentDirectory(), ".dotnet_stage0", return Path.Combine(Directory.GetCurrentDirectory(), ".dotnet_stage0",
PlatformServices.Default.Runtime.OperatingSystemPlatform.ToString(), PlatformServices.Default.Runtime.OperatingSystemPlatform.ToString(),
PlatformServices.Default.Runtime.RuntimeArchitecture, "bin"); PlatformServices.Default.Runtime.RuntimeArchitecture);
} }
else 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());
} }
} }

2
scripts/run-build.ps1
View file

@ -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 & "$PSScriptRoot\obtain\install.ps1" -Channel $env:CHANNEL -Architecture $Architecture -Verbose
# Put the stage0 on the path # 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 # Restore the build scripts
Write-Host "Restoring Build Script projects..." Write-Host "Restoring Build Script projects..."

2
scripts/run-build.sh
View file

@ -88,7 +88,7 @@ export CHANNEL=$RELEASE_SUFFIX
$DIR/obtain/install.sh --channel $CHANNEL --verbose $DIR/obtain/install.sh --channel $CHANNEL --verbose
# Put stage 0 on the PATH (for this shell only) # 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 # Increases the file descriptors limit for this bash. It prevents an issue we were hitting during restore
FILE_DESCRIPTOR_LIMIT=$( ulimit -n ) FILE_DESCRIPTOR_LIMIT=$( ulimit -n )