Skip to content

Fix install-dotnet download #14856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TravisEz13 merged 3 commits into from
Feb 19, 2021
Merged

Fix install-dotnet download #14856

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d60b27a
Fix install-dotnet download
TravisEz13 Feb 19, 2021
77a29c8
Revert "Fix install-dotnet download"
TravisEz13 Feb 19, 2021
e3db525
change to wget
TravisEz13 Feb 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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 {
Expand All @@ -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)

Expand Down