huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set DOTNET_HOME to repo dir when `--ci` is specified (#1490)

This commit is contained in:
Nate McMaster 2018-10-11 16:20:46 -07:00 committed by GitHub
parent 867a9423f7
commit b833d1df88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
run.ps1
View File

@ -201,6 +201,7 @@ if (Test-Path $ConfigFile) {
if (!$DotNetHome) { if (!$DotNetHome) {
$DotNetHome = if ($env:DOTNET_HOME) { $env:DOTNET_HOME } ` $DotNetHome = if ($env:DOTNET_HOME) { $env:DOTNET_HOME } `
elseif ($CI) { Join-Path $PSScriptRoot '.dotnet' } `
elseif ($env:USERPROFILE) { Join-Path $env:USERPROFILE '.dotnet'} ` elseif ($env:USERPROFILE) { Join-Path $env:USERPROFILE '.dotnet'} `
elseif ($env:HOME) {Join-Path $env:HOME '.dotnet'}` elseif ($env:HOME) {Join-Path $env:HOME '.dotnet'}`
else { Join-Path $PSScriptRoot '.dotnet'} else { Join-Path $PSScriptRoot '.dotnet'}

6
run.sh
View File

@ -11,7 +11,6 @@ RED="\033[0;31m"
YELLOW="\033[0;33m" YELLOW="\033[0;33m"
MAGENTA="\033[0;95m" MAGENTA="\033[0;95m"
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
[ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet"
verbose=false verbose=false
update=false update=false
reinstall=false reinstall=false
@ -220,6 +219,9 @@ while [[ $# -gt 0 ]]; do
;; ;;
--ci|-[Cc][Ii]) --ci|-[Cc][Ii])
ci=true ci=true
if [[ -z "${DOTNET_HOME:-}" ]]; then
DOTNET_HOME="$DIR/.dotnet"
fi
;; ;;
--verbose|-Verbose) --verbose|-Verbose)
verbose=true verbose=true
@ -265,6 +267,8 @@ if [ -f "$config_file" ]; then
[ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source" [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source"
fi fi
[ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet"
if [ ! -z "$package_version_props_url" ]; then if [ ! -z "$package_version_props_url" ]; then
intermediate_dir="$repo_path/obj" intermediate_dir="$repo_path/obj"
props_file_path="$intermediate_dir/external-dependencies.props" props_file_path="$intermediate_dir/external-dependencies.props"