From 825c0c64176eb09bfcd039c54ac1ac3e59801dc3 Mon Sep 17 00:00:00 2001
From: Kaniska <kaniska244@github.com>
Date: Mon, 21 Apr 2025 19:14:11 +0530
Subject: [PATCH] =?UTF-8?q?Revert=20"[dotnet]=20-=20Fixing=20the=20dotnet?=
 =?UTF-8?q?=20smoke=20test=20issue=20with=20changes=20in=20test=20sc?=
 =?UTF-8?q?=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8895eb3d161d28ada3a8de761a83135e811cae3d.
---
 src/dotnet/devcontainer-feature.json |  2 +-
 test/dotnet/dotnet_helpers.sh        | 38 ----------------------------
 test/dotnet/install_dotnet_lts.sh    |  3 +--
 3 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
index fcf480583..5d553bcd0 100644
--- a/src/dotnet/devcontainer-feature.json
+++ b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "2.2.2",
+    "version": "2.2.1",
     "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.",
diff --git a/test/dotnet/dotnet_helpers.sh b/test/dotnet/dotnet_helpers.sh
index 0373d99c7..01e554f66 100644
--- a/test/dotnet/dotnet_helpers.sh
+++ b/test/dotnet/dotnet_helpers.sh
@@ -17,44 +17,6 @@ fetch_latest_version_in_channel() {
     fi
 }
 
-# Function to resolve the actual version from an aka.ms URL
-resolve_version_from_aka_ms() {
-    local normalized_channel="${1:-LTS}"  # defaulting to LTS channel
-    local normalized_product="dotnet-sdk"
-    local normalized_os="linux"
-
-    # Dynamically determine the architecture
-    local normalized_architecture
-    normalized_architecture=$(uname -m)
-    case "$normalized_architecture" in
-        x86_64) normalized_architecture="x64" ;;
-        aarch64) normalized_architecture="arm64" ;;
-        arm*) normalized_architecture="arm" ;;
-        *) 
-            echo "Unsupported architecture: $normalized_architecture"
-            return 1
-            ;;
-    esac
-
-    # Construct the aka.ms link
-    local aka_ms_link="https://aka.ms/dotnet/$normalized_channel/$normalized_product-$normalized_os-$normalized_architecture.tar.gz"
-    echo "Constructed aka.ms link: $aka_ms_link"
-
-    # Resolve the redirect URL using curl
-    local resolved_url
-    resolved_url=$(curl -s -L -o /dev/null -w "%{url_effective}" "$aka_ms_link")
-    echo "Resolved URL: $resolved_url"
-
-    # Extract the version from the resolved URL
-    IFS='/'
-    read -ra pathElems <<< "$resolved_url"
-    local count=${#pathElems[@]}
-    local specific_version="${pathElems[count-2]}"
-    unset IFS
-
-    echo "Extracted version: $specific_version"
-}
-
 # Prints the latest dotnet version
 # Usage: fetch_latest_version [<runtime>]
 # Example: fetch_latest_version
diff --git a/test/dotnet/install_dotnet_lts.sh b/test/dotnet/install_dotnet_lts.sh
index aebc8830a..da9175c15 100644
--- a/test/dotnet/install_dotnet_lts.sh
+++ b/test/dotnet/install_dotnet_lts.sh
@@ -13,8 +13,7 @@ source dev-container-features-test-lib
 source dotnet_env.sh
 source dotnet_helpers.sh
 
-# Changing it as the dotnet SDK CDN url is not showing the right version for LTS
-expected=$(resolve_version_from_aka_ms "LTS" | cut -d' ' -f3)
+expected=$(fetch_latest_version_in_channel "LTS")
 
 check "Latest LTS version installed" \
 is_dotnet_sdk_version_installed "$expected"