зеркало из https://github.com/aspnet/KoreBuild.git
Use DOTNET_INSTALL_DIR if available
This commit is contained in:
Родитель
d61df0c89a
Коммит
2bc6069ff7
|
@ -23,7 +23,11 @@ if ($env:KOREBUILD_DOTNET_VERSION)
|
|||
$dotnetVersion = $env:KOREBUILD_DOTNET_VERSION
|
||||
}
|
||||
|
||||
$dotnetLocalInstallFolder = "$env:LOCALAPPDATA\Microsoft\dotnet\"
|
||||
$dotnetLocalInstallFolder = $env:DOTNET_INSTALL_DIR
|
||||
if (!$dotnetLocalInstallFolder)
|
||||
{
|
||||
$dotnetLocalInstallFolder = "$env:LOCALAPPDATA\Microsoft\dotnet\"
|
||||
}
|
||||
$newPath = "$dotnetLocalInstallFolder;$env:PATH"
|
||||
if ($env:KOREBUILD_SKIP_RUNTIME_INSTALL -eq "1")
|
||||
{
|
||||
|
|
|
@ -50,7 +50,8 @@ if [ ! -z "$KOREBUILD_SKIP_RUNTIME_INSTALL" ]; then
|
|||
else
|
||||
# Need to set this variable because by default the install script
|
||||
# requires sudo
|
||||
export DOTNET_INSTALL_DIR=~/.dotnet
|
||||
[ -z "$DOTNET_INSTALL_DIR" ] && DOTNET_INSTALL_DIR=~/.dotnet
|
||||
export DOTNET_INSTALL_DIR=$DOTNET_INSTALL_DIR
|
||||
export KOREBUILD_FOLDER="$(dirname $koreBuildFolder)"
|
||||
chmod +x $koreBuildFolder/dotnet/dotnet-install.sh
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче