actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-14 13:17:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

some variable names clarifications

Browse Source
This commit is contained in:
Leonid Lapshin
2020-09-01 22:05:26 +03:00
parent 425d62e593
commit fdf40a931b
9 changed files with 46 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,31 +61,26 @@ Function Install-VisualStudio
}
function Get-VsCatalogJsonPath {
$instanceFolder = "C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances\" + (Get-VisualStudioInstallation -VSInstallType "VS").InstanceId
$instanceFolder = "C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances\" + (Get-VisualStudioProduct -ProductType "VisualStudio").InstanceId
return Join-Path $instanceFolder "catalog.json"
}
function Get-VisualStudioInstallation {
function Get-VisualStudioProduct {
Param
(
[Parameter(Mandatory)]
[ValidateSet('VS','BuildTools')]
[String] $VSInstallType
[ValidateSet('VisualStudio','BuildTools')]
[String] $ProductType
)
if ($VSInstallType -eq "VS")
if ($ProductType -eq "VisualStudio")
{
$VSSelectionType = "*Enterprise*"
}
elseif ($VSInstallType -eq "BuildTools")
elseif ($ProductType -eq "BuildTools")
{
$VSSelectionType = "*Build*"
}
else
{
Write-Output "Visual Studio Installation type have to be 'VS' or 'BuildTools'"
exit 1
}
return Get-VSSetupInstance | Select-VSSetupInstance -Product * | Where-Object -Property DisplayName -like $VSSelectionType
}
@@ -93,10 +88,30 @@ function Get-VisualStudioComponents {
Param
(
[Parameter(Mandatory)]
[ValidateSet('VS','BuildTools')]
[String] $VSInstallType
[String] $ProductType
)
(Get-VisualStudioInstallation -VSInstallType $VSInstallType).Packages | Where-Object type -in 'Component', 'Workload' |
(Get-VisualStudioProduct -ProductType $ProductType).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}" }
}
function Get-VSExtensionVersion
{
Param
(
[Parameter(Mandatory=$true)]
[string] $packageName
)
$instanceFolders = "C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances\" + (Get-VisualStudioProduct -ProductType "VisualStudio").InstanceId
$state = Get-Content -Path (Join-Path $instanceFolders '\state.packages.json') | ConvertFrom-Json
$packageVersion = ($state.packages | Where-Object { $_.id -eq $packageName }).version
if (-not $packageVersion)
{
Write-Host "installed package $packageName for Visual Studio 2019 was not found"
exit 1
}
return $packageVersion
}