Merge pull request #1995 from dibir-magomedsaygitov/v-dimago/add-dotnet-core-5.0-macos

[macOS] Move list of .Net Core versions to install to toolset

images/macos/provision/core/dotnet.sh

@@ -19,35 +19,20 @@ chmod +x ./dotnet-install.sh
 ARGS_LIST=()
 echo "Parsing dotnet SDK (except rc and preview versions) from .json..."
 
-# TO-DO: move the list of versions to install to toolset
-if is_BigSur; then
-    DOTNET_CHANNELS=(
-    'https://raw.githubusercontent.com/dotnet/core/master/release-notes/2.1/releases.json'
-    'https://raw.githubusercontent.com/dotnet/core/master/release-notes/3.1/releases.json'
-    )
-elif is_Less_Catalina; then
-    DOTNET_CHANNELS=(
-    'https://raw.githubusercontent.com/dotnet/core/master/release-notes/2.1/releases.json'
-    )
-else
-    DOTNET_CHANNELS=(
-    'https://raw.githubusercontent.com/dotnet/core/master/release-notes/2.1/releases.json'
-    'https://raw.githubusercontent.com/dotnet/core/master/release-notes/3.0/releases.json'
-    'https://raw.githubusercontent.com/dotnet/core/master/release-notes/3.1/releases.json'
-    )
-fi
+DOTNET_VERSIONS=($(get_toolset_value '.dotnet.versions | .[]'))
 
-for DOTNET_CHANNEL in "${DOTNET_CHANNELS[@]}"; do
+for DOTNET_VERSION in "${DOTNET_VERSIONS[@]}"; do
+    RELEASE_URL="https://raw.githubusercontent.com/dotnet/core/master/release-notes/${DOTNET_VERSION}/releases.json"
     # Old Mono versions don't support NuGet versions from .Net sdk >=2.1.6**, exclude them explicitly from Mojave and HS images
     # https://rider-support.jetbrains.com/hc/en-us/articles/360004180039
     if is_Less_Catalina; then
         ARGS_LIST+=(
-        $(curl -s "$DOTNET_CHANNEL" | \
+        $(curl -s "$RELEASE_URL" | \
         jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | grep -v -E '2.1.[6-9]\d*')
     )
     else
         ARGS_LIST+=(
-        $(curl -s "$DOTNET_CHANNEL" | \
+        $(curl -s "$RELEASE_URL" | \
         jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*')
     )
     fi

images/macos/toolsets/toolset-10.13.json

@@ -205,5 +205,10 @@
             "package": "yamllint",
             "cmd": "yamllint --version"
         }
-    ]
+    ],
+    "dotnet": {
+        "versions": [
+            "2.1"
+        ]
+    }
 }

images/macos/toolsets/toolset-10.14.json

@@ -265,5 +265,10 @@
             "package": "yamllint",
             "cmd": "yamllint --version"
         }
-    ]
+    ],
+    "dotnet": {
+        "versions": [
+            "2.1"
+        ]
+    }
 }

images/macos/toolsets/toolset-10.15.json

@@ -179,5 +179,12 @@
             "package": "yamllint",
             "cmd": "yamllint --version"
         }
-    ]
+    ],
+    "dotnet": {
+        "versions": [
+            "2.1",
+            "3.0",
+            "3.1"
+        ]
+    }
 }

images/macos/toolsets/toolset-11.0.json

@@ -106,5 +106,11 @@
             "package": "yamllint",
             "cmd": "yamllint --version"
         }
-    ]
+    ],
+    "dotnet": {
+        "versions": [
+            "2.1",
+            "3.1"
+        ]
+    }
 }