This commit is contained in:
Aleksandr Chebotov
2020-09-30 23:47:14 +03:00
parent c50e6e62b5
commit 5524108024
3 changed files with 7 additions and 7 deletions

View File

@@ -447,12 +447,12 @@ function Get-AndroidPackagesByVersion {
[Parameter(Mandatory=$true)] [Parameter(Mandatory=$true)]
[string]$PrefixPackageName, [string]$PrefixPackageName,
[object]$MinimumVersion, [object]$MinimumVersion,
[char]$Delimeter, [char]$Delimiter,
[int]$Index = 0 [int]$Index = 0
) )
$Type = $MinimumVersion.GetType() $Type = $MinimumVersion.GetType()
$packagesByName = Get-AndroidPackagesByName -AndroidPackages $AndroidPackages -PrefixPackageName $PrefixPackageName $packagesByName = Get-AndroidPackagesByName -AndroidPackages $AndroidPackages -PrefixPackageName $PrefixPackageName
$packagesByVersion = $packagesByName | Where-Object { ($_.Split($Delimeter)[$Index] -as $Type) -ge $MinimumVersion } $packagesByVersion = $packagesByName | Where-Object { ($_.Split($Delimiter)[$Index] -as $Type) -ge $MinimumVersion }
return $packagesByVersion | Sort-Object { $_.Split($Delimeter)[$Index] -as $Type} -Unique return $packagesByVersion | Sort-Object { $_.Split($Delimiter)[$Index] -as $Type} -Unique
} }

View File

@@ -42,7 +42,7 @@ $androidPackages = Get-AndroidPackages -AndroidSDKManagerPath $sdkManager
$platformList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` $platformList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages `
-PrefixPackageName "platforms;" ` -PrefixPackageName "platforms;" `
-MinimumVersion $platformMinVersion ` -MinimumVersion $platformMinVersion `
-Delimeter "-" ` -Delimiter "-" `
-Index 1 -Index 1
# build-tools # build-tools
@@ -50,7 +50,7 @@ $platformList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages `
$buildToolsList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` $buildToolsList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages `
-PrefixPackageName "build-tools;" ` -PrefixPackageName "build-tools;" `
-MinimumVersion $buildToolsMinVersion ` -MinimumVersion $buildToolsMinVersion `
-Delimeter ";" ` -Delimiter ";" `
-Index 1 -Index 1
Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager ` Install-AndroidSDKPackages -AndroidSDKManagerPath $sdkManager `

View File

@@ -10,7 +10,7 @@ Describe "Android SDK" {
$platformList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` $platformList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages `
-PrefixPackageName "platforms;" ` -PrefixPackageName "platforms;" `
-MinimumVersion $platformMinVersion ` -MinimumVersion $platformMinVersion `
-Delimeter "-" ` -Delimiter "-" `
-Index 1 -Index 1
$platformList | ForEach-Object { $platformList | ForEach-Object {
$platformTestCases += @{ platformVersion = $_; installedPackages = $androidInstalledPackages } $platformTestCases += @{ platformVersion = $_; installedPackages = $androidInstalledPackages }
@@ -21,7 +21,7 @@ Describe "Android SDK" {
$buildToolsList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages ` $buildToolsList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages `
-PrefixPackageName "build-tools;" ` -PrefixPackageName "build-tools;" `
-MinimumVersion $buildToolsMinVersion ` -MinimumVersion $buildToolsMinVersion `
-Delimeter ";" ` -Delimiter ";" `
-Index 1 -Index 1
$buildToolsList | ForEach-Object { $buildToolsList | ForEach-Object {
$buildToolsTestCases += @{ buildToolsVersion = $_; installedPackages = $androidInstalledPackages } $buildToolsTestCases += @{ buildToolsVersion = $_; installedPackages = $androidInstalledPackages }