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

Add WiX v3 to Windows 2022. (#4448)

Browse Source 
Move WiX to tools and stop installing WiX Votive VSIX, which isn't
needed for build.
This commit is contained in:
Bob Arnson
2021-11-10 06:38:26 -05:00
committed by GitHub
parent 48df2547e7
commit 4672cb208d
7 changed files with 15 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,12 +13,6 @@ function Get-SDKVersion {
($installedApplications | Where-Object { $_.DisplayName -eq 'Windows SDK' } | Select-Object -First 1).DisplayVersion
}
function Get-WixVersion {
$regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*"
$installedApplications = Get-ItemProperty -Path $regKey
($installedApplications | Where-Object { $_.DisplayName -match "wix" } | Select-Object -First 1).DisplayVersion
}
function Get-WDKVersion {
$regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*"
$installedApplications = Get-ItemProperty -Path $regKey
@@ -67,14 +61,6 @@ function Get-VisualStudioExtensions {
}
if ((Test-IsWin16) -or (Test-IsWin19)) {
# Wix
$wixPackageVersion = Get-WixVersion
$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}
)
# WDK
$wdkPackageVersion = Get-VSExtensionVersion -packageName 'Microsoft.Windows.DriverKit'
$wdkExtensionVersion = Get-WDKVersion
@@ -89,7 +75,6 @@ function Get-VisualStudioExtensions {
$vsixs
$ssdtPackages
$sdkPackages
$wixPackages
$wdkPackages
)