Skip to content

[Updates] Automated vendor dotnet-install script #936

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

Closed
Dev containers Bot (devcontainers-bot) wants to merge 2 commits into from
Closed

[Updates] Automated vendor dotnet-install script #936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23d2c9a
Automated dotnet-install script update
invalid-email-address Apr 7, 2024
df58237
Bump version
invalid-email-address Apr 7, 2024
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
2 changes: 1 addition & 1 deletion src/dotnet/devcontainer-feature.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "dotnet",
"version": "2.0.5",
"version": "2.0.6",
"name": "Dotnet CLI",
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
"description": "This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.",
Expand Down
20 changes: 15 additions & 5 deletions src/dotnet/scripts/vendor/dotnet-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,10 @@ get_machine_architecture() {
if command -v uname > /dev/null; then
CPUName=$(uname -m)
case $CPUName in
armv1*|armv2*|armv3*|armv4*|armv5*|armv6*)
echo "armv6-or-below"
return 0
;;
armv*l)
echo "arm"
return 0
Expand Down Expand Up @@ -339,7 +343,13 @@ get_normalized_architecture_from_architecture() {
local architecture="$(to_lowercase "$1")"

if [[ $architecture == \<auto\> ]]; then
echo "$(get_machine_architecture)"
machine_architecture="$(get_machine_architecture)"
if [[ "$machine_architecture" == "armv6-or-below" ]]; then
say_err "Architecture \`$machine_architecture\` not supported. If you think this is a bug, report it at https://github.com/dotnet/install-scripts/issues"
return 1
fi

echo $machine_architecture
return 0
fi

Expand Down Expand Up @@ -1013,7 +1023,7 @@ extract_dotnet_package() {

rm -rf "$temp_out_path"
if [ -z ${keep_zip+x} ]; then
rm -f "$zip_path" && say_verbose "Temporary zip file $zip_path was removed"
rm -f "$zip_path" && say_verbose "Temporary archive file $zip_path was removed"
fi

if [ "$failed" = true ]; then
Expand Down Expand Up @@ -1512,7 +1522,7 @@ install_dotnet() {

mkdir -p "$install_root"
zip_path="${zip_path:-$(mktemp "$temporary_file_template")}"
say_verbose "Zip path: $zip_path"
say_verbose "Archive path: $zip_path"

for link_index in "${!download_links[@]}"
do
Expand All @@ -1536,7 +1546,7 @@ install_dotnet() {
say "Failed to download $link_type link '$download_link': $download_error_msg"
;;
esac
rm -f "$zip_path" 2>&1 && say_verbose "Temporary zip file $zip_path was removed"
rm -f "$zip_path" 2>&1 && say_verbose "Temporary archive file $zip_path was removed"
else
download_completed=true
break
Expand All @@ -1551,7 +1561,7 @@ install_dotnet() {

remote_file_size="$(get_remote_file_size "$download_link")"

say "Extracting zip from $download_link"
say "Extracting archive from $download_link"
extract_dotnet_package "$zip_path" "$install_root" "$remote_file_size" || return 1

# Check if the SDK version is installed; if not, fail the installation.
Expand Down
2 changes: 1 addition & 1 deletion src/oryx/devcontainer-feature.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "oryx",
"version": "1.3.2",
"version": "1.3.3",
"name": "Oryx",
"description": "Installs the oryx CLI",
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/oryx",
Expand Down