Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[macOS] Add .NET 9.0 environment to all images #11001

Closed
wants to merge 1 commit into from
+23 −23
Closed

[macOS] Add .NET 9.0 environment to all images #11001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions images/macos/scripts/build/install-dotnet.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions images/macos/toolsets/toolset-13.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
}
Expand Down
10 changes: 6 additions & 4 deletions images/macos/toolsets/toolset-14.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
}
Expand Down
8 changes: 5 additions & 3 deletions images/macos/toolsets/toolset-15.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,15 @@
"dotnet": {
"arch":{
"x64": {
"versions": [
"8.0"
"versions": [
"8.0",
"9.0"
]
},
"arm64": {
"versions": [
"8.0"
"8.0",
"9.0"
]
}
}
Expand Down