[macOS] Fix Android tests to work with platform version S and remove Cmake 3.6 (#2757)

* Fix tests, move cmake to toolset

* add -L to curl

images/macos/provision/core/android-toolsets.sh

@@ -69,9 +69,6 @@ echo "84831b9409646a918e30573bab4c9c91346d8abd" >> $ANDROID_HOME/licenses/androi
 echo "Installing latest tools & platform tools..."
 echo y | $SDKMANAGER "tools" "platform-tools"
 
-echo "Installing latest CMake..."
-echo y | $SDKMANAGER "cmake;3.6.4111459"
-
 echo "Installing latest ndk..."
 ndkLtsLatest=$(get_full_ndk_version  $ANDROID_NDK_MAJOR_LTS)
 ndkLatest=$(get_full_ndk_version  $ANDROID_NDK_MAJOR_LATEST)

images/macos/provision/core/dotnet.sh

@@ -12,7 +12,7 @@ export DOTNET_CLI_TELEMETRY_OPTOUT=1
 
 # Download installer from dot.net and keep it locally
 DOTNET_INSTALL_SCRIPT="https://dotnet.microsoft.com/download/dotnet-core/scripts/v1/dotnet-install.sh"
-curl -o "dotnet-install.sh" "$DOTNET_INSTALL_SCRIPT"
+curl -L -o "dotnet-install.sh" "$DOTNET_INSTALL_SCRIPT"
 chmod +x ./dotnet-install.sh
 
 ARGS_LIST=()

images/macos/tests/Android.Tests.ps1

@@ -13,13 +13,14 @@ Describe "Android" {
     $ndkLatestFullVersion = (Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkLatestVersion.*" | Select-Object -Last 1).Name
     $ndkLtsFullVersion = (Get-ChildItem "$env:ANDROID_HOME/ndk/$ndkLtsVersion.*" | Select-Object -Last 1).Name
 
-    $platforms = (($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;', '' |
+    $platformVersionsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("platforms;") }) -replace 'platforms;android-', ''
-    Where-Object { [int]$_.Split("-")[1] -ge $platformMinVersion } | Sort-Object { [int]$_.Split("-")[1] } -Unique |
+    $platformNumericList = $platformVersionsList | Where-Object { $_ -match "\d+" } | Where-Object { [int]$_ -ge $platformMinVersion } | Sort-Object -Unique
-    ForEach-Object { "platforms/${_}" })
+    $platformLetterList = $platformVersionsList | Where-Object { $_ -match "\D+" } | Sort-Object -Unique
+    $platforms = $platformNumericList + $platformLetterList | ForEach-Object { "platforms/android-${_}" }
 
-    $buildTools = (($androidSdkManagerPackages | Where-Object { "$_".StartsWith("build-tools;") }) -replace 'build-tools;', '' |
+    $buildToolsList = ($androidSdkManagerPackages | Where-Object { "$_".StartsWith("build-tools;") }) -replace 'build-tools;', ''
-    Where-Object { [version]$_ -ge $buildToolsMinVersion } | Sort-Object { [version]$_ } -Unique |
+    $buildTools = $buildToolsList | Where-Object { $_ -match "\d+(\.\d+){2,}$"} | Where-Object { [version]$_ -ge $buildToolsMinVersion } | Sort-Object -Unique |
-    ForEach-Object { "build-tools/${_}" })
+    ForEach-Object { "build-tools/${_}" }
 
     $androidPackages = @(
         "tools",

images/macos/toolsets/toolset-10.13.json

@@ -190,6 +190,9 @@
         "addon-list": [
             "addon-google_apis-google-24", "addon-google_apis-google-23", "addon-google_apis-google-22", "addon-google_apis-google-21"
         ],
+        "additional-tools": [
+            "cmake;3.10.2.4988404"
+        ],
         "ndk": {
             "lts": "21",
             "latest": "22"

images/macos/toolsets/toolset-10.14.json

@@ -211,6 +211,7 @@
             "addon-google_apis-google-24", "addon-google_apis-google-23", "addon-google_apis-google-22", "addon-google_apis-google-21"
         ],
         "additional-tools": [
+            "cmake;3.10.2.4988404",
             "cmdline-tools;latest"
         ],
         "ndk": {

images/macos/toolsets/toolset-10.15.json

@@ -156,6 +156,7 @@
             "addon-google_apis-google-24", "addon-google_apis-google-23", "addon-google_apis-google-22", "addon-google_apis-google-21"
         ],
         "additional-tools": [
+            "cmake;3.10.2.4988404",
             "cmdline-tools;latest"
         ],
         "ndk": {

images/macos/toolsets/toolset-11.0.json

@@ -90,6 +90,7 @@
         ],
         "addon-list": [],
         "additional-tools": [
+            "cmake;3.10.2.4988404",
             "cmdline-tools;latest"
         ],
         "ndk": {