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

Revert "Add WiX v3 to Windows 2022. (#4448)" (#4604)

Browse Source 
This reverts commit 4672cb208d.
This commit is contained in:
Mikhail Koliada
2021-11-26 20:37:33 +03:00
committed by GitHub
parent 978ab79564
commit 3063eac712
7 changed files with 59 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
View File

@@ -114,7 +114,6 @@ $toolsList = @(
(Get-VSWhereVersion),
(Get-SwigVersion),
(Get-WinAppDriver),
(Get-WixVersion),
(Get-ZstdVersion),
(Get-YAMLLintVersion)
)

6
images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
View File

@@ -161,12 +161,6 @@ function Get-WinAppDriver {
return "WinAppDriver $winAppDriverVersion"
}
function Get-WixVersion {
$regKey = "HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*"
$installedApplications = Get-ItemProperty -Path $regKey
return ($installedApplications | Where-Object { $_.BundleCachePath -imatch ".*\\WiX\d*\.exe$" } | Select-Object -First 1).DisplayName
}
function Get-ZstdVersion {
$(zstd --version) -match "v(?<version>\d+\.\d+\.\d+)" | Out-Null
$zstdVersion = $Matches.Version

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

@@ -13,6 +13,12 @@ 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
@@ -61,6 +67,14 @@ 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
@@ -75,6 +89,7 @@ function Get-VisualStudioExtensions {
$vsixs
$ssdtPackages
$sdkPackages
$wixPackages
$wdkPackages
)