maxmustermann/PowerShell
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add ability to Install-Dotnet to specify directory (#12469)

Browse source
This commit is contained in:
Aditya Patwardhan 2020-04-30 11:28:32 -07:00 committed by GitHub
parent c19a417321
commit 8de0ddc6d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
build.psm1
View file

@ -1628,7 +1628,8 @@ function Install-Dotnet {
param(
[string]$Channel = $dotnetCLIChannel,
[string]$Version = $dotnetCLIRequiredVersion,
[switch]$NoSudo
[switch]$NoSudo,
[string]$InstallDir
)
# This allows sudo install to be optional; needed when running in containers / as root
@ -1662,7 +1663,12 @@ function Install-Dotnet {
$installScript = "dotnet-install.sh"
Start-NativeExecution {
& $curl -sO $installObtainUrl/$installScript
bash ./$installScript -c $Channel -v $Version
if (-not $InstallDir) {
bash ./$installScript -c $Channel -v $Version
} else {
bash ./$installScript -c $Channel -v $Version -i $InstallDir
}
}
} elseif ($environment.IsWindows) {
Remove-Item -ErrorAction SilentlyContinue -Recurse -Force ~\AppData\Local\Microsoft\dotnet
@ -1670,12 +1676,22 @@ function Install-Dotnet {
Invoke-WebRequest -Uri $installObtainUrl/$installScript -OutFile $installScript
if (-not $environment.IsCoreCLR) {
& ./$installScript -Channel $Channel -Version $Version
if (-not $InstallDir) {
& ./$installScript -Channel $Channel -Version $Version
} else {
& ./$installScript -Channel $Channel -Version $Version -InstallDir $InstallDir
}
} else {
# dotnet-install.ps1 uses APIs that are not supported in .NET Core, so we run it with Windows PowerShell
$fullPSPath = Join-Path -Path $env:windir -ChildPath "System32\WindowsPowerShell\v1.0\powershell.exe"
$fullDotnetInstallPath = Join-Path -Path $PWD.Path -ChildPath $installScript
Start-NativeExecution { & $fullPSPath -NoLogo -NoProfile -File $fullDotnetInstallPath -Channel $Channel -Version $Version }
Start-NativeExecution {
if (-not $InstallDir) {
& $fullPSPath -NoLogo -NoProfile -File $fullDotnetInstallPath -Channel $Channel -Version $Version
} else {
& $fullPSPath -NoLogo -NoProfile -File $fullDotnetInstallPath -Channel $Channel -Version $Version -InstallDir $InstallDir
}
}
}
}
}