From 24408b5ac370d3bbc6c965dc752d7927030de173 Mon Sep 17 00:00:00 2001
From: Erik Bershel <erik-bershel@github.com>
Date: Mon, 18 Nov 2024 22:43:05 +0100
Subject: [PATCH] [macOS] Add .NET 9.0 environment to all images

---
 images/macos/scripts/build/install-dotnet.sh | 18 ++++++------------
 images/macos/toolsets/toolset-13.json        | 10 ++++++----
 images/macos/toolsets/toolset-14.json        | 10 ++++++----
 images/macos/toolsets/toolset-15.json        |  8 +++++---
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/images/macos/scripts/build/install-dotnet.sh b/images/macos/scripts/build/install-dotnet.sh
index 212c40419719..ebfcec6c978d 100644
--- 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://raw.githubusercontent.com/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
index 101462e56944..4e48759a7d44 100644
--- a/images/macos/toolsets/toolset-13.json
+++ b/images/macos/toolsets/toolset-13.json
@@ -94,15 +94,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
index 4367f851061b..6517d22f68d5 100644
--- a/images/macos/toolsets/toolset-14.json
+++ b/images/macos/toolsets/toolset-14.json
@@ -98,15 +98,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
index d1d7edd6b514..5779c1d8c7a8 100644
--- a/images/macos/toolsets/toolset-15.json
+++ b/images/macos/toolsets/toolset-15.json
@@ -89,13 +89,15 @@
     "dotnet": {
         "arch":{
             "x64": {
-               "versions": [
-                   "8.0"
+                "versions": [
+                    "8.0",
+                    "9.0"
                 ]
             },
             "arm64": {
                 "versions": [
-                    "8.0"
+                    "8.0",
+                    "9.0"
                 ]
             }
         }