From ee314d4c78b1ee44f28b813461aa8c10b2e96631 Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com>
Date: Fri, 19 Feb 2021 21:27:58 +0300
Subject: [PATCH] [windows] Fix tests, remove cmake 3.6 (#2758)

---
 images/win/scripts/Installers/Update-AndroidSDK.ps1 | 5 ++++-
 images/win/scripts/Tests/Android.Tests.ps1          | 5 ++++-
 images/win/toolsets/toolset-2016.json               | 1 -
 images/win/toolsets/toolset-2019.json               | 1 -
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/images/win/scripts/Installers/Update-AndroidSDK.ps1 b/images/win/scripts/Installers/Update-AndroidSDK.ps1
index 9d9d2f5f..f20c22ce 100644
--- a/images/win/scripts/Installers/Update-AndroidSDK.ps1
+++ b/images/win/scripts/Installers/Update-AndroidSDK.ps1
@@ -39,11 +39,14 @@ $androidPackages = Get-AndroidPackages -AndroidSDKManagerPath $sdkManager
 
 # platforms
 [int]$platformMinVersion = $androidToolset.platform_min_version
-$platformList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages `
+$platformListByVersion = 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 02f0f4b5..3a56c039 100644
--- a/images/win/scripts/Tests/Android.Tests.ps1
+++ b/images/win/scripts/Tests/Android.Tests.ps1
@@ -10,11 +10,14 @@ Describe "Android SDK" {
 
     $platformTestCases = @()
     [int]$platformMinVersion = $androidToolset.platform_min_version
-    $platformList = Get-AndroidPackagesByVersion -AndroidPackages $androidPackages `
+    $platformListByVersion = 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 }
     }
diff --git a/images/win/toolsets/toolset-2016.json b/images/win/toolsets/toolset-2016.json
index 63843fee..f65b87e9 100644
--- a/images/win/toolsets/toolset-2016.json
+++ b/images/win/toolsets/toolset-2016.json
@@ -163,7 +163,6 @@
             "addon-google_apis-google-21"
         ],
         "additional_tools": [
-            "cmake;3.6.4111459",
             "cmake;3.10.2.4988404",
             "patcher;v4",
             "cmdline-tools;latest"
diff --git a/images/win/toolsets/toolset-2019.json b/images/win/toolsets/toolset-2019.json
index 1c9edeb6..8a1de5df 100644
--- a/images/win/toolsets/toolset-2019.json
+++ b/images/win/toolsets/toolset-2019.json
@@ -163,7 +163,6 @@
             "addon-google_apis-google-21"
         ],
         "additional_tools": [
-            "cmake;3.6.4111459",
             "cmake;3.10.2.4988404",
             "patcher;v4",
             "cmdline-tools;latest"