Fix install-dotnet download (#14856)

This commit is contained in:
Travis Plunk
2021-02-19 11:20:02 -08:00
committed by GitHub
parent 39509a93b9
commit a6fec84d8a
+8 -3
View File
@@ -1678,7 +1678,7 @@ function Install-Dotnet {
# Install for Linux and OS X
if ($environment.IsLinux -or $environment.IsMacOS) {
$curl = Get-Command -Name curl -CommandType Application -TotalCount 1 -ErrorAction Stop
$wget = Get-Command -Name wget -CommandType Application -TotalCount 1 -ErrorAction Stop
# Uninstall all previous dotnet packages
$uninstallScript = if ($environment.IsLinux -and $environment.IsUbuntu) {
@@ -1689,7 +1689,7 @@ function Install-Dotnet {
if ($uninstallScript) {
Start-NativeExecution {
& $curl -sO $uninstallObtainUrl/uninstall/$uninstallScript
& $wget $uninstallObtainUrl/uninstall/$uninstallScript
Invoke-Expression "$sudo bash ./$uninstallScript"
}
} else {
@@ -1699,7 +1699,12 @@ function Install-Dotnet {
# Install new dotnet 1.1.0 preview packages
$installScript = "dotnet-install.sh"
Start-NativeExecution {
& $curl -sO $installObtainUrl/$installScript
Write-Verbose -Message "downloading install script from $installObtainUrl/$installScript ..." -Verbose
& $wget $installObtainUrl/$installScript
if ((Get-ChildItem "./$installScript").Length -eq 0) {
throw "./$installScript was 0 length"
}
$bashArgs = @("./$installScript", '-c', $Channel, '-v', $Version)