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

[Windows] Implement minor improvements, rev 2 (#3839)

Browse Source 
* implement minor improvements

* Update Install-WDK.ps1

* fix nitpick
This commit is contained in:
Maxim Lobanov
2021-08-04 09:35:16 +03:00
committed by GitHub
parent 924ebc40d1
commit 3b5c4ebd39
7 changed files with 104 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@ function Get-VisualStudioExtensions {
# SSDT extensions for VS2017
$vs = (Get-VisualStudioVersion).Name.Split()[-1]
if ($vs -eq "2017")
if (Test-IsWin16)
{
$analysisPackageVersion = Get-VSExtensionVersion -packageName '04a86fc2-dbd5-4222-848e-911638e487fe'
$reportingPackageVersion = Get-VSExtensionVersion -packageName '717ad572-c4b7-435c-c166-c2969777f718'
@@ -49,21 +49,30 @@ function Get-VisualStudioExtensions {
)
}
# Wix
$wixPackageVersion = Get-WixVersion
$wixExtensionVersion = (Get-VisualStudioPackages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version
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
$wixPackages = @(
@{Package = 'WIX Toolset'; Version = $wixPackageVersion}
@{Package = "WIX Toolset Studio $vs Extension"; Version = $wixExtensionVersion}
)
# WDK
$wdkPackageVersion = Get-VSExtensionVersion -packageName 'Microsoft.Windows.DriverKit'
$wdkExtensionVersion = Get-WDKVersion
# WDK
$wdkPackageVersion = Get-VSExtensionVersion -packageName 'Microsoft.Windows.DriverKit'
$wdkExtensionVersion = Get-WDKVersion
$wdkPackages = @(
@{Package = 'Windows Driver Kit'; Version = $wdkPackageVersion}
@{Package = 'Windows Driver Kit Visual Studio Extension'; Version = $wdkExtensionVersion}
)
}
$extensions = @(
$vsixs
$ssdtPackages
@{Package = 'Windows Driver Kit'; Version = $wdkPackageVersion}
@{Package = 'Windows Driver Kit Visual Studio Extension'; Version = $wdkExtensionVersion}
@{Package = 'WIX Toolset'; Version = $wixPackageVersion}
@{Package = "WIX Toolset Studio $vs Extension"; Version = $wixExtensionVersion}
$wixPackages
$wdkPackages
)
$extensions | Foreach-Object {