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

[Windows] win: add validation InstalledSoftware.md and testResults.xml files (#3960)

Browse Source 
* win: add validation InstalledSoftware.md file
This commit is contained in:
Aleksandr Chebotov
2021-08-27 09:38:18 +03:00
committed by GitHub
parent ca51829236
commit 5aa96839a8
9 changed files with 50 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
images/win/scripts/SoftwareReport/SoftwareReport.Android.psm1
View File

@@ -21,7 +21,7 @@ function Get-AndroidSDKManagerPath {
function Get-AndroidInstalledPackages {
$androidSDKManagerPath = Get-AndroidSDKManagerPath
$androidSDKManagerList = & $androidSDKManagerPath --list_installed
$androidSDKManagerList = cmd /c "$androidSDKManagerPath --list_installed 2>&1"
return $androidSDKManagerList
}

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

@@ -271,8 +271,7 @@ function Get-VisualCPPComponents {
}
function Get-DacFxVersion {
cd "C:\Program Files\Microsoft SQL Server\150\DAC\bin\"
$dacfxversion = (./sqlpackage.exe /version)
$dacfxversion = & "$env:ProgramFiles\Microsoft SQL Server\150\DAC\bin\sqlpackage.exe" /version
return "DacFx $dacfxversion"
}

4
images/win/scripts/SoftwareReport/SoftwareReport.WebServers.psm1
View File

@@ -13,8 +13,8 @@ function Get-ApacheVersion {
}
function Get-NginxVersion {
$nginxBinPath = Join-Path (Get-NginxPath) "\nginx"
(. $nginxBinPath -v 2>&1 | Select-String -Pattern "nginx/") -match "nginx/(?<version>\d+\.\d+\.\d+)" | Out-Null
$nginxBinPath = Join-Path (Get-NginxPath) "nginx"
(cmd /c "$nginxBinPath -v 2>&1") -match "nginx/(?<version>\d+\.\d+\.\d+)" | Out-Null
return $Matches.Version
}