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

style and syntax improvments

Browse Source
This commit is contained in:
Leonid Lapshin
2020-09-03 10:34:05 +03:00
parent 26183d0fa7
commit e438bd4302
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,9 +60,12 @@ Function Install-VisualStudio
} }
} }
function Get-VisualStudioInstancePath {
return "C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances\" + (Get-VisualStudioProduct -ProductType "VisualStudio").InstanceId
}
function Get-VsCatalogJsonPath { function Get-VsCatalogJsonPath {
$instanceFolder = "C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances\" + (Get-VisualStudioProduct -ProductType "VisualStudio").InstanceId return Join-Path (Get-VisualStudioInstancePath) "catalog.json"
return Join-Path $instanceFolder "catalog.json"
} }
function Get-VisualStudioProduct { function Get-VisualStudioProduct {
@@ -81,7 +84,7 @@ function Get-VisualStudioProduct {
{ {
$VSSelectionType = "*Build*" $VSSelectionType = "*Build*"
} }
return Get-VSSetupInstance | Select-VSSetupInstance -Product * | Where-Object -Property DisplayName -like $VSSelectionType return Get-VSSetupInstance | Where-Object -Property DisplayName -like $VSSelectionType
} }
function Get-VisualStudioComponents { function Get-VisualStudioComponents {
@@ -103,8 +106,7 @@ function Get-VSExtensionVersion
[string] $packageName [string] $packageName
) )
$instanceFolders = "C:\ProgramData\Microsoft\VisualStudio\Packages\_Instances\" + (Get-VisualStudioProduct -ProductType "VisualStudio").InstanceId $state = Get-Content -Path (Join-Path (Get-VisualStudioInstancePath) '\state.packages.json') | ConvertFrom-Json
$state = Get-Content -Path (Join-Path $instanceFolders '\state.packages.json') | ConvertFrom-Json
$packageVersion = ($state.packages | Where-Object { $_.id -eq $packageName }).version $packageVersion = ($state.packages | Where-Object { $_.id -eq $packageName }).version
if (-not $packageVersion) if (-not $packageVersion)

6
images/win/scripts/Tests/VisualStudio.Tests.ps1
View File

@@ -12,8 +12,7 @@ Describe "Visual Studio" {
} }
Context "Visual Studio components" { Context "Visual Studio components" {
$expectedComponents = Get-ToolsetContent | Select-Object -ExpandProperty visualStudio | Select-Object -ExpandProperty workloads $testCases = (Get-ToolsetContent).visualStudio.workloads | ForEach-Object { @{ComponentName = $_} }
$testCases = $expectedComponents | ForEach-Object { @{ComponentName = $_} }
BeforeAll { BeforeAll {
$installedComponents = Get-VisualStudioComponents -ProductType "VisualStudio" | Select-Object -ExpandProperty Package $installedComponents = Get-VisualStudioComponents -ProductType "VisualStudio" | Select-Object -ExpandProperty Package
} }
@@ -24,8 +23,7 @@ Describe "Visual Studio" {
} }
Context "Visual Studio Build Tools components" { Context "Visual Studio Build Tools components" {
$expectedComponents = Get-ToolsetContent | Select-Object -ExpandProperty visualStudio | Select-Object -ExpandProperty buildtools_workloads $testCases = (Get-ToolsetContent).visualStudio.buildtools_workloads | ForEach-Object { @{ComponentName = $_} }
$testCases = $expectedComponents | ForEach-Object { @{ComponentName = $_} }
BeforeAll { BeforeAll {
$installedComponents = Get-VisualStudioComponents -ProductType "BuildTools" | Select-Object -ExpandProperty Package $installedComponents = Get-VisualStudioComponents -ProductType "BuildTools" | Select-Object -ExpandProperty Package
} }