[Windows] Stop SoftwareReport script if error (#4801)

* Stop SoftwareReport script if error

* Validate blank versions

* Fix tables parsing
This commit is contained in:
Aleksandr Chebotov
2021-12-24 10:58:19 +03:00
committed by GitHub
parent d4793cf476
commit 7518d04a3a
4 changed files with 66 additions and 14 deletions

View File

@@ -122,7 +122,7 @@ function Get-AndroidPlatformVersions {
function Get-AndroidCommandLineToolsVersion {
$commandLineTools = Get-AndroidSDKManagerPath
(& $commandLineTools --version | Out-String).Trim() -match "(?<version>^(\d+\.){1,}\d+$)" | Out-Null
(cmd /c "$commandLineTools --version 2>NUL" | Out-String).Trim() -match "(?<version>^(\d+\.){1,}\d+$)" | Out-Null
$commandLineToolsVersion = $Matches.Version
return $commandLineToolsVersion
}