.NET install script workaround (#4194)

mthalman · web-flow · commit 9b731e901dd4 · 2022-11-08T12:50:12.000-06:00
diff --git a/eng/common/Install-DotNetSdk.ps1 b/eng/common/Install-DotNetSdk.ps1
@@ -40,16 +40,14 @@ if (!(Test-Path $DotnetInstallScriptPath)) {
     & "$PSScriptRoot/Invoke-WithRetry.ps1" "Invoke-WebRequest 'https://dot.net/v1/$DotnetInstallScript' -OutFile $DotnetInstallScriptPath"
 }
 
-$DotnetChannel = "Current"
-
 $InstallFailed = $false
 if ($IsRunningOnUnix) {
     & chmod +x $DotnetInstallScriptPath
-    & $DotnetInstallScriptPath --channel $DotnetChannel --version "latest" --install-dir $InstallPath
+    & $DotnetInstallScriptPath --version "latest" --install-dir $InstallPath
     $InstallFailed = ($LASTEXITCODE -ne 0)
 }
 else {
-    & $DotnetInstallScriptPath -Channel $DotnetChannel -Version "latest" -InstallDir $InstallPath
+    & $DotnetInstallScriptPath -Version "latest" -InstallDir $InstallPath
     $InstallFailed = (-not $?)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -40,16 +40,14 @@ if (!(Test-Path $DotnetInstallScriptPath)) {`
`40`	`40`	`& "$PSScriptRoot/Invoke-WithRetry.ps1" "Invoke-WebRequest 'https://dot.net/v1/$DotnetInstallScript' -OutFile $DotnetInstallScriptPath"`
`41`	`41`	`}`
`42`	`42`
`43`		`-$DotnetChannel = "Current"`
`44`		`-`
`45`	`43`	`$InstallFailed = $false`
`46`	`44`	`if ($IsRunningOnUnix) {`
`47`	`45`	`& chmod +x $DotnetInstallScriptPath`
`48`		`- & $DotnetInstallScriptPath --channel $DotnetChannel --version "latest" --install-dir $InstallPath`
	`46`	`+ & $DotnetInstallScriptPath --version "latest" --install-dir $InstallPath`
`49`	`47`	`$InstallFailed = ($LASTEXITCODE -ne 0)`
`50`	`48`	`}`
`51`	`49`	`else {`
`52`		`- & $DotnetInstallScriptPath -Channel $DotnetChannel -Version "latest" -InstallDir $InstallPath`
	`50`	`+ & $DotnetInstallScriptPath -Version "latest" -InstallDir $InstallPath`
`53`	`51`	`$InstallFailed = (-not $?)`
`54`	`52`	`}`
`55`	`53`