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

Changed dotnet stage0 to no longer pivot on OS. We just place it under dotnet_stage0/

Browse source
This commit is contained in:
Livar Cunha 2016-07-05 16:28:00 -07:00
parent cc1bb54f1a
commit aebb42335c
4 changed files with 9 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build.proj
View file

@ -31,9 +31,7 @@
<CoreCLRVersion>1.0.2</CoreCLRVersion> <CoreCLRVersion>1.0.2</CoreCLRVersion>
<JitVersion>1.0.2</JitVersion> <JitVersion>1.0.2</JitVersion>
<Stage0Path Condition=" '$(OS)' == 'Windows_NT' ">$(RepoRoot)/.dotnet_stage0/Windows/$(Architecture)</Stage0Path> <Stage0Path>$(RepoRoot)/.dotnet_stage0/$(Architecture)</Stage0Path>
<Stage0Path Condition=" '$(OSName)' == 'osx' ">$(RepoRoot)/.dotnet_stage0/Darwin</Stage0Path>
<Stage0Path Condition=" '$(Stage0Path)' == '' ">$(RepoRoot)/.dotnet_stage0/Linux</Stage0Path>
<ExeExtension>.exe</ExeExtension> <ExeExtension>.exe</ExeExtension>
<ExeExtension Condition=" '$(OS)' != 'Windows_NT' "></ExeExtension> <ExeExtension Condition=" '$(OS)' != 'Windows_NT' "></ExeExtension>
<DotnetStage0>$(Stage0Path)/dotnet$(ExeExtension)</DotnetStage0> <DotnetStage0>$(Stage0Path)/dotnet$(ExeExtension)</DotnetStage0>

14
build_projects/shared-build-targets-utils/Utils/DotNetCli.cs
View file

@ -55,17 +55,9 @@ namespace Microsoft.DotNet.Cli.Build
private static string GetStage0Path() private static string GetStage0Path()
{ {
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) return Path.Combine(Directory.GetCurrentDirectory(),
{ ".dotnet_stage0",
return Path.Combine(Directory.GetCurrentDirectory(), ".dotnet_stage0", RuntimeEnvironment.RuntimeArchitecture);
RuntimeEnvironment.OperatingSystemPlatform.ToString(),
RuntimeEnvironment.RuntimeArchitecture);
}
else
{
return Path.Combine(Directory.GetCurrentDirectory(), ".dotnet_stage0", RuntimeEnvironment.OperatingSystemPlatform.ToString());
}
} }
} }
} }

2
run_build.ps1
View file

@ -45,7 +45,7 @@ cat "$RepoRoot\branchinfo.txt" | ForEach-Object {
# Use a repo-local install directory (but not the artifacts directory because that gets cleaned a lot # Use a repo-local install directory (but not the artifacts directory because that gets cleaned a lot
if (!$env:DOTNET_INSTALL_DIR) if (!$env:DOTNET_INSTALL_DIR)
{ {
$env:DOTNET_INSTALL_DIR="$RepoRoot\.dotnet_stage0\Windows\$Architecture" $env:DOTNET_INSTALL_DIR="$RepoRoot\.dotnet_stage0\$Architecture"
} }
if (!(Test-Path $env:DOTNET_INSTALL_DIR)) if (!(Test-Path $env:DOTNET_INSTALL_DIR))

7
run_build.sh Normal file → Executable file
View file

@ -15,7 +15,8 @@ done
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
OLDPATH="$PATH" OLDPATH="$PATH"
REPOROOT="$DIR/../.." ARCHITECTURE="x64"
REPOROOT="$DIR"
source "$REPOROOT/scripts/common/_prettyprint.sh" source "$REPOROOT/scripts/common/_prettyprint.sh"
while [[ $# > 0 ]]; do while [[ $# > 0 ]]; do
@ -79,7 +80,7 @@ while read line; do
done < "$REPOROOT/branchinfo.txt" done < "$REPOROOT/branchinfo.txt"
# Use a repo-local install directory (but not the artifacts directory because that gets cleaned a lot # Use a repo-local install directory (but not the artifacts directory because that gets cleaned a lot
[ -z "$DOTNET_INSTALL_DIR" ] && export DOTNET_INSTALL_DIR=$REPOROOT/.dotnet_stage0/$(uname) [ -z "$DOTNET_INSTALL_DIR" ] && export DOTNET_INSTALL_DIR=$REPOROOT/.dotnet_stage0/$ARCHITECTURE
[ -d "$DOTNET_INSTALL_DIR" ] || mkdir -p $DOTNET_INSTALL_DIR [ -d "$DOTNET_INSTALL_DIR" ] || mkdir -p $DOTNET_INSTALL_DIR
$REPOROOT/scripts/obtain/dotnet-install.sh --channel $CHANNEL --verbose $REPOROOT/scripts/obtain/dotnet-install.sh --channel $CHANNEL --verbose
@ -98,4 +99,4 @@ fi
# Disable first run since we want to control all package sources # Disable first run since we want to control all package sources
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
dotnet build3 build.proj /p:Architecture=x64 dotnet build3 build.proj /p:Architecture=$ARCHITECTURE