diff --git a/images/win/scripts/Installers/Install-AndroidSDK.ps1 b/images/win/scripts/Installers/Install-AndroidSDK.ps1 index dfb163cf1..6f70e77a4 100644 --- a/images/win/scripts/Installers/Install-AndroidSDK.ps1 +++ b/images/win/scripts/Installers/Install-AndroidSDK.ps1 @@ -58,14 +58,11 @@ $androidPackages = Get-AndroidPackages -AndroidSDKManagerPath $sdkManager # platforms [int]$platformMinVersion = $androidToolset.platform_min_version -$platformListByVersion = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` +$platformList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` -PrefixPackageName "platforms;" ` -MinimumVersion $platformMinVersion ` -Delimiter "-" ` -Index 1 -$platformListByName = Get-AndroidPackagesByName -AndroidPackages $androidPackages ` - -PrefixPackageName "platforms;" | Where-Object {$_ -match "-\D+$"} -$platformList = $platformListByVersion + $platformListByName # build-tools [version]$buildToolsMinVersion = $androidToolset.build_tools_min_version diff --git a/images/win/scripts/Tests/Android.Tests.ps1 b/images/win/scripts/Tests/Android.Tests.ps1 index 6ca51c2fe..89f08d59e 100644 --- a/images/win/scripts/Tests/Android.Tests.ps1 +++ b/images/win/scripts/Tests/Android.Tests.ps1 @@ -14,14 +14,12 @@ Describe "Android SDK" { $platformTestCases = @() [int]$platformMinVersion = $androidToolset.platform_min_version - $platformListByVersion = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` + $platformList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` -PrefixPackageName "platforms;" ` -MinimumVersion $platformMinVersion ` -Delimiter "-" ` -Index 1 - $platformListByName = Get-AndroidPackagesByName -AndroidPackages $androidPackages ` - -PrefixPackageName "platforms;" | Where-Object {$_ -match "-\D+$"} - $platformList = $platformListByVersion + $platformListByName + $platformList | ForEach-Object { $platformTestCases += @{ platformVersion = $_; installedPackages = $androidInstalledPackages } }