actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-15 14:17:22 +00: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

15
images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1
View File

@@ -1,9 +1,9 @@
function Get-VisualStudioVersion {
$vsVersion = vswhere -format json | ConvertFrom-Json
$vsInstance = Get-VisualStudioInstance
[PSCustomObject]@{
Name = $vsVersion.displayName
Version = $vsVersion.installationVersion
Path = $vsVersion.installationPath
Name = $vsInstance.DisplayName
Version = $vsInstance.InstallationVersion
Path = $vsInstance.InstallationPath
}
}
@@ -20,6 +20,8 @@ function Get-WDKVersion {
}
function Get-VisualStudioExtensions {
$vsPackages = (Get-VisualStudioInstance).Packages
# Additional vsixs
$toolset = Get-ToolsetContent
$vsixUrls = $toolset.visualStudio.vsix
@@ -27,7 +29,8 @@ function Get-VisualStudioExtensions {
{
$vsixs = $vsixUrls | ForEach-Object {
$vsix = Get-VsixExtenstionFromMarketplace -ExtensionMarketPlaceName $_
$vsixVersion = (Get-VisualStudioPackages | Where-Object {$_.Id -match $vsix.VsixId -and $_.type -eq 'vsix'}).Version
$vsixVersion = ($vsPackages | Where-Object {$_.Id -match $vsix.VsixId -and $_.type -eq 'vsix'}).Version
@{
Package = $vsix.ExtensionName
Version = $vsixVersion
@@ -52,7 +55,7 @@ function Get-VisualStudioExtensions {
if (Test-IsWin16 -or Test-IsWin19) {
# Wix
$wixPackageVersion = Get-WixVersion
$wixExtensionVersion = (Get-VisualStudioPackages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version
$wixExtensionVersion = ($vsPackages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version
$wixPackages = @(
@{Package = 'WIX Toolset'; Version = $wixPackageVersion}
@{Package = "WIX Toolset Studio $vs Extension"; Version = $wixExtensionVersion}