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] fix choco installation (#7657)

Browse Source
This commit is contained in:
Alexey-Ayupov
2023-06-01 17:55:44 +02:00
committed by GitHub
parent d5f4ac3924
commit 9eaafb739e
3 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
images/win/scripts/Installers/Install-NET48-devpack.ps1 Normal file
View File

@@ -0,0 +1,13 @@
################################################################################
## File: Install-NET48-devpack.ps1
## Desc: Install .NET 4.8 devpack
################################################################################
# .NET 4.8 Dev pack
$InstallerName = "ndp48-devpack-enu.exe"
$InstallerUrl = "https://download.visualstudio.microsoft.com/download/pr/014120d7-d689-4305-befd-3cb711108212/0307177e14752e359fde5423ab583e43/${InstallerName}"
$ArgumentList = ("Setup", "/passive", "/norestart")
Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList
Invoke-PesterTests -TestFile "Tools" -TestName "NET48"

6
images/win/scripts/Installers/Install-NET48.ps1
View File

@@ -4,10 +4,8 @@
################################################################################ ################################################################################
# .NET 4.8 Dev pack # .NET 4.8 Dev pack
$InstallerName = "ndp48-devpack-enu.exe" $InstallerName = "ndp48-x86-x64-allos-enu.exe"
$InstallerUrl = "https://download.visualstudio.microsoft.com/download/pr/014120d7-d689-4305-befd-3cb711108212/0307177e14752e359fde5423ab583e43/${InstallerName}" $InstallerUrl = "https://download.visualstudio.microsoft.com/download/pr/2d6bb6b2-226a-4baa-bdec-798822606ff1/8494001c276a4b96804cde7829c04d7f/${InstallerName}"
$ArgumentList = ("Setup", "/passive", "/norestart") $ArgumentList = ("Setup", "/passive", "/norestart")
Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList Install-Binary -Url $InstallerUrl -Name $InstallerName -ArgumentList $ArgumentList
Invoke-PesterTests -TestFile "Tools" -TestName "NET48"

18
images/win/windows2019.json
View File

@@ -125,6 +125,22 @@
"elevated_user": "{{user `install_user`}}", "elevated_user": "{{user `install_user`}}",
"elevated_password": "{{user `install_password`}}" "elevated_password": "{{user `install_password`}}"
}, },
{
"type": "powershell",
"valid_exit_codes": [
0,
3010
],
"scripts": [
"{{ template_dir }}/scripts/Installers/Install-NET48.ps1"
],
"elevated_user": "{{user `install_user`}}",
"elevated_password": "{{user `install_password`}}"
},
{
"type": "windows-restart",
"restart_timeout": "10m"
},
{ {
"type": "powershell", "type": "powershell",
"environment_vars": [ "environment_vars": [
@@ -170,7 +186,7 @@
"scripts": [ "scripts": [
"{{ template_dir }}/scripts/Installers/Install-VS.ps1", "{{ template_dir }}/scripts/Installers/Install-VS.ps1",
"{{ template_dir }}/scripts/Installers/Install-KubernetesTools.ps1", "{{ template_dir }}/scripts/Installers/Install-KubernetesTools.ps1",
"{{ template_dir }}/scripts/Installers/Install-NET48.ps1" "{{ template_dir }}/scripts/Installers/Install-NET48-devpack.ps1"
], ],
"elevated_user": "{{user `install_user`}}", "elevated_user": "{{user `install_user`}}",
"elevated_password": "{{user `install_password`}}" "elevated_password": "{{user `install_password`}}"