actions/runner-images-sangeeth
1
0
Fork 0
mirror of https://github.com/actions/runner-images-sangeeth.git synced 2025-12-29 12:58:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Windows] Improve Visual Studio installation scripts to support Preview versions (#3850)

Browse Source 
* Support Preview versions of Visual Studio

* resolve comments

* Fix test

* fix tests
This commit is contained in:
Maxim Lobanov
2021-08-04 22:35:44 +03:00
committed by GitHub
parent b5a7a67456
commit 8481b2c846
13 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
images/win/scripts/ImageHelpers/ImageHelpers.psm1
View File

@@ -34,11 +34,10 @@ Export-ModuleMember -Function @(
'Get-EnvironmentVariable'
'Invoke-PesterTests'
'Get-VsCatalogJsonPath'
'Get-VisualStudioPath'
'Install-AndroidSDKPackages'
'Get-AndroidPackages'
'Get-AndroidPackagesByName'
'Get-AndroidPackagesByVersion'
'Get-VisualStudioPackages'
'Get-VisualStudioInstance'
'Get-VisualStudioComponents'
)

12
images/win/scripts/ImageHelpers/VisualStudioHelpers.ps1
View File

@@ -72,16 +72,14 @@ function Get-VsCatalogJsonPath {
return Join-Path $instanceFolder.FullName "catalog.json"
}
function Get-VisualStudioPath {
return (Get-VSSetupInstance | Select-VSSetupInstance -Product *).InstallationPath
}
function Get-VisualStudioPackages {
return (Get-VSSetupInstance | Select-VSSetupInstance -Product *).Packages
function Get-VisualStudioInstance {
# Use -Prerelease and -All flags to make sure that Preview versions of VS are found correctly
$vsInstance = Get-VSSetupInstance -Prerelease -All | Where-Object { $_.DisplayName -match "Visual Studio" } | Select-Object -First 1
$vsInstance | Select-VSSetupInstance -Product *
}
function Get-VisualStudioComponents {
Get-VisualStudioPackages | Where-Object type -in 'Component', 'Workload' |
(Get-VisualStudioInstance).Packages | Where-Object type -in 'Component', 'Workload' |
Sort-Object Id, Version | Select-Object @{n = 'Package'; e = {$_.Id}}, Version |
Where-Object { $_.Package -notmatch "[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}" }
}