actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-20 06:35:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[windows] cleanup DotNETSdk install script (#8200)

Browse Source 
* [win] some cleanup of DonetSDK installer

FixPublish workaround not needed anymore, we do not install 3.1
C:\Temp not needed as well
This commit is contained in:
ilia-shipitsin
2023-09-01 11:44:00 +02:00
committed by GitHub
parent 8077d7b42b
commit 587a8c8e6f
1 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
images/win/scripts/Installers/Install-DotnetSDK.ps1
View File

@@ -4,9 +4,6 @@
## cache. Should run after VS and Node ## cache. Should run after VS and Node
################################################################################ ################################################################################
# ensure temp
New-Item -Path C:\Temp -Force -ItemType Directory
# Set environment variables # Set environment variables
Set-SystemVariable -SystemVariable DOTNET_MULTILEVEL_LOOKUP -Value "0" Set-SystemVariable -SystemVariable DOTNET_MULTILEVEL_LOOKUP -Value "0"
Set-SystemVariable -SystemVariable DOTNET_NOLOGO -Value "1" Set-SystemVariable -SystemVariable DOTNET_NOLOGO -Value "1"
@@ -14,6 +11,7 @@ Set-SystemVariable -SystemVariable DOTNET_SKIP_FIRST_TIME_EXPERIENCE -Value "1"
[Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12" [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor "Tls12"
#region "Functions"
function Get-SDKVersionsToInstall ( function Get-SDKVersionsToInstall (
$DotnetVersion $DotnetVersion
) { ) {
@@ -52,18 +50,6 @@ function Invoke-Warmup (
} }
} }
function Fix-ImportPublishProfile (
$SdkVersion
) {
if (Test-IsWin19) {
# Fix for issue https://github.com/dotnet/sdk/issues/1276. This will be fixed in 3.1.
$sdkTargetsName = "Microsoft.NET.Sdk.ImportPublishProfile.targets"
$sdkTargetsUrl = "https://raw.githubusercontent.com/dotnet/sdk/82bc30c99f1325dfaa7ad450be96857a4fca2845/src/Tasks/Microsoft.NET.Build.Tasks/targets/${sdkTargetsName}"
$sdkTargetsPath = "C:\Program Files\dotnet\sdk\$sdkVersion\Sdks\Microsoft.NET.Sdk\targets"
Start-DownloadWithRetry -Url $sdkTargetsUrl -DownloadPath $sdkTargetsPath -Name $sdkTargetsName
}
}
function InstallSDKVersion ( function InstallSDKVersion (
$SdkVersion, $SdkVersion,
$Warmup $Warmup
@@ -72,15 +58,13 @@ function InstallSDKVersion (
if (!(Test-Path -Path "C:\Program Files\dotnet\sdk\$sdkVersion")) if (!(Test-Path -Path "C:\Program Files\dotnet\sdk\$sdkVersion"))
{ {
Write-Host "Installing dotnet $sdkVersion" Write-Host "Installing dotnet $sdkVersion"
.\dotnet-install.ps1 -Architecture x64 -Version $sdkVersion -InstallDir $(Join-Path -Path $env:ProgramFiles -ChildPath 'dotnet') .\dotnet-install.ps1 -Version $sdkVersion -InstallDir $(Join-Path -Path $env:ProgramFiles -ChildPath 'dotnet')
} }
else else
{ {
Write-Host "Sdk version $sdkVersion already installed" Write-Host "Sdk version $sdkVersion already installed"
} }
Fix-ImportPublishProfile -SdkVersion $SdkVersion
if ($Warmup) { if ($Warmup) {
Invoke-Warmup -SdkVersion $SdkVersion Invoke-Warmup -SdkVersion $SdkVersion
} }
@@ -138,6 +122,7 @@ function RunPostInstallationSteps()
# Add %USERPROFILE%\.dotnet\tools to USER PATH # Add %USERPROFILE%\.dotnet\tools to USER PATH
Add-DefaultPathItem "%USERPROFILE%\.dotnet\tools" Add-DefaultPathItem "%USERPROFILE%\.dotnet\tools"
} }
#endregion
InstallAllValidSdks InstallAllValidSdks
RunPostInstallationSteps RunPostInstallationSteps