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

removed Location column

Browse Source
This commit is contained in:
Nikita Bykov
2020-09-15 12:03:42 +03:00
parent 1f73b64e5c
commit 6b0d1e5a78
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,6 +43,10 @@ function Get-AndroidInstalledPackages {
function Build-AndroidTable { function Build-AndroidTable {
$packageInfo = Get-AndroidInstalledPackages $packageInfo = Get-AndroidInstalledPackages
return @( return @(
@{
"Package" = "Android SDK Platform-Tools"
"Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Platform-Tools"
},
@{ @{
"Package" = "Android SDK Tools" "Package" = "Android SDK Tools"
"Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Tools" "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Tools"
@@ -50,25 +54,23 @@ function Build-AndroidTable {
@{ @{
"Package" = "Android SDK Platforms" "Package" = "Android SDK Platforms"
"Version" = Get-AndroidPlatformVersions -PackageInfo $packageInfo "Version" = Get-AndroidPlatformVersions -PackageInfo $packageInfo
"Location" = Get-AndroidComponentLocation -ComponentName "platforms"
}, },
@{ @{
"Package" = "Android SDK Build-tools" "Package" = "Android SDK Build-tools"
"Version" = Get-AndroidBuildToolVersions -PackageInfo $packageInfo "Version" = Get-AndroidBuildToolVersions -PackageInfo $packageInfo
"Location" = Get-AndroidComponentLocation -ComponentName "build-tools"
}, },
@{ @{
"Package" = "Android SDK Platform-Tools" "Package" = "NDK"
"Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android SDK Platform-Tools" "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "ndk-bundle"
},
@{
"Package" = "Google APIs"
"Version" = Get-AndroidGoogleAPIsVersions -PackageInfo $packageInfo
}, },
@{ @{
"Package" = "Android Support Repository" "Package" = "Android Support Repository"
"Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android Support Repository" "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Android Support Repository"
}, },
@{
"Package" = "Google APIs"
"Version" = Get-AndroidGoogleAPIsVersions -PackageInfo $packageInfo
},
@{ @{
"Package" = "Google Play services" "Package" = "Google Play services"
"Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Google Play services" "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "Google Play services"
@@ -84,16 +86,11 @@ function Build-AndroidTable {
@{ @{
"Package" = "CMake" "Package" = "CMake"
"Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "cmake" "Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "cmake"
},
@{
"Package" = "NDK"
"Version" = Get-AndroidPackageVersions -PackageInfo $packageInfo -MatchedString "ndk-bundle"
} }
) | Where-Object { $_.Version } | ForEach-Object { ) | Where-Object { $_.Version } | ForEach-Object {
[PSCustomObject] @{ [PSCustomObject] @{
"Package Name" = $_.Package "Package Name" = $_.Package
"Version" = $_.Version "Version" = $_.Version
"Location" = $_.Location
} }
} }
} }