aphrody-labs/PowerShell
1
0 Fork 0
mirror of https://github.com/aphrody-labs/PowerShell.git synced 2026-10-13 21:32:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update Install-Dotnet to directly run the install script (#28022)

Browse Source
This commit is contained in:
Dongbo Wang authored and GitHub committed 2026-09-17 14:27:37 -07:00
1 parent 2179219c84
commit 46337f983c
1 file changed
+22 -57
Download Patch File Download Diff File Expand all files Collapse all files
build.psm1
+22 -57
View File
@@ -2778,65 +2778,30 @@ function Install-Dotnet {
Remove-Item -ErrorAction SilentlyContinue -Recurse -Force ~\AppData\Local\Microsoft\dotnet
$installScript = "dotnet-install.ps1"
Invoke-WebRequest -Uri $installObtainUrl/$installScript -OutFile $installScript
if (-not $environment.IsCoreCLR) {
$installArgs = @{}
if ($Version) {
$installArgs += @{ Version = $Version }
} elseif ($Channel) {
$installArgs += @{ Quality = $Quality }
$installArgs += @{ Channel = $Channel }
}
if ($InstallDir) {
$installArgs += @{ InstallDir = $InstallDir }
}
if ($AzureFeed) {
$installArgs += @{AzureFeed = $AzureFeed}
}
if ($FeedCredential) {
$installArgs += @{FeedCredential = $FeedCredential}
}
$installArgs += @{ SkipNonVersionedFiles = $true }
$installArgs | Out-String | Write-Verbose -Verbose
& ./$installScript @installArgs
$installArgs = @{}
if ($Version) {
$installArgs.Version = $Version
}
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 (Convert-Path -Path $PWD.Path) -ChildPath $installScript
if ($Version) {
$psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Version', $Version)
}
elseif ($Channel) {
$psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Channel', $Channel, '-Quality', $Quality)
}
if ($InstallDir) {
$psArgs += @('-InstallDir', $InstallDir)
}
if ($AzureFeed) {
$psArgs += @('-AzureFeed', $AzureFeed)
}
if ($FeedCredential) {
$psArgs += @('-FeedCredential', $FeedCredential)
}
$psArgs += @('-SkipNonVersionedFiles')
# Removing the verbose message to not expose the secret
# $psArgs -join ' ' | Write-Verbose -Verbose
Start-NativeExecution {
& $fullPSPath @psArgs
}
elseif ($Channel) {
$installArgs.Channel = $Channel
$installArgs.Quality = $Quality
}
if ($InstallDir) {
$installArgs.InstallDir = $InstallDir
}
if ($AzureFeed) {
$installArgs.AzureFeed = $AzureFeed
}
if ($FeedCredential) {
$installArgs.FeedCredential = $FeedCredential
}
$installArgs.SkipNonVersionedFiles = $true
& ./$installScript @installArgs
}
Write-LogGroupEnd -Title "Install .NET SDK $Version"
}