Fix/macos m2 detection bug (#19369)

* Updated get_machine_architecture to correctly obtain arm64

* Increased Version task.json

* Update task.json

* Update task.loc.json

* generated output

---------

Co-authored-by: MerlynOMsft <[email protected]>
Co-authored-by: Merlyn Oppenheim (from Dev Box) <[email protected]>

Author: cwall-dev

Tasks/UseDotNetV2/externals/get-os-distro.sh

@@ -159,6 +159,7 @@ get_legacy_os_name() {
 get_machine_architecture() {
 
     if command -v uname > /dev/null; then
+        local osn=$(get_current_os_name || echo "")
         CPUName=$(uname -m)
         case $CPUName in
         armv7l)
@@ -169,6 +170,20 @@ get_machine_architecture() {
             echo "arm64"
             return 0
             ;;
+        arm64)
+            echo "arm64"
+            return 0
+            ;;
+        x86_64)
+            if [ "$osn" = "osx" ]; then
+                if [ "$(sysctl -in sysctl.proc_translated)" = "1" ]; then
+                    echo "arm64"
+                else
+                    echo "x64"
+                fi
+                return 0
+            fi
+            ;;
         esac
     fi
 

Tasks/UseDotNetV2/task.json

@@ -13,7 +13,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 232,
+    "Minor": 234,
     "Patch": 0
   },
   "satisfies": [
@@ -194,4 +194,4 @@
     "SupportPhaseNotPresentInChannel": "support-phase is not present in the channel with channel-version %s.",
     "DepricatedVersionNetCore": "NET Core version you specfied %s is out of support and will be removed from hosted agents soon. Please refer to https://aka.ms/dotnet-core-support for more information about the .NET support policy."
   }
-}
+}

Tasks/UseDotNetV2/task.loc.json

@@ -13,7 +13,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 232,
+    "Minor": 234,
     "Patch": 0
   },
   "satisfies": [
@@ -194,4 +194,4 @@
     "SupportPhaseNotPresentInChannel": "ms-resource:loc.messages.SupportPhaseNotPresentInChannel",
     "DepricatedVersionNetCore": "ms-resource:loc.messages.DepricatedVersionNetCore"
   }
-}
+}

_generated/UseDotNetV2.versionmap.txt

@@ -1,2 +1,2 @@
-Default|2.232.0
-Node20_229_3|2.232.1
+Default|2.234.0
+Node20_229_3|2.234.1

_generated/UseDotNetV2/externals/get-os-distro.sh

@@ -159,6 +159,7 @@ get_legacy_os_name() {
 get_machine_architecture() {
 
     if command -v uname > /dev/null; then
+        local osn=$(get_current_os_name || echo "")
         CPUName=$(uname -m)
         case $CPUName in
         armv7l)
@@ -169,6 +170,20 @@ get_machine_architecture() {
             echo "arm64"
             return 0
             ;;
+        arm64)
+            echo "arm64"
+            return 0
+            ;;
+        x86_64)
+            if [ "$osn" = "osx" ]; then
+                if [ "$(sysctl -in sysctl.proc_translated)" = "1" ]; then
+                    echo "arm64"
+                else
+                    echo "x64"
+                fi
+                return 0
+            fi
+            ;;
         esac
     fi
 

_generated/UseDotNetV2/task.json

@@ -13,7 +13,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 232,
+    "Minor": 234,
     "Patch": 0
   },
   "satisfies": [
@@ -195,7 +195,7 @@
     "DepricatedVersionNetCore": "NET Core version you specfied %s is out of support and will be removed from hosted agents soon. Please refer to https://aka.ms/dotnet-core-support for more information about the .NET support policy."
   },
   "_buildConfigMapping": {
-    "Default": "2.232.0",
-    "Node20_229_3": "2.232.1"
+    "Default": "2.234.0",
+    "Node20_229_3": "2.234.1"
   }
 }

_generated/UseDotNetV2/task.loc.json

@@ -13,7 +13,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 232,
+    "Minor": 234,
     "Patch": 0
   },
   "satisfies": [
@@ -195,7 +195,7 @@
     "DepricatedVersionNetCore": "ms-resource:loc.messages.DepricatedVersionNetCore"
   },
   "_buildConfigMapping": {
-    "Default": "2.232.0",
-    "Node20_229_3": "2.232.1"
+    "Default": "2.234.0",
+    "Node20_229_3": "2.234.1"
   }
 }

_generated/UseDotNetV2_Node20/externals/get-os-distro.sh

@@ -159,6 +159,7 @@ get_legacy_os_name() {
 get_machine_architecture() {
 
     if command -v uname > /dev/null; then
+        local osn=$(get_current_os_name || echo "")
         CPUName=$(uname -m)
         case $CPUName in
         armv7l)
@@ -169,6 +170,20 @@ get_machine_architecture() {
             echo "arm64"
             return 0
             ;;
+        arm64)
+            echo "arm64"
+            return 0
+            ;;
+        x86_64)
+            if [ "$osn" = "osx" ]; then
+                if [ "$(sysctl -in sysctl.proc_translated)" = "1" ]; then
+                    echo "arm64"
+                else
+                    echo "x64"
+                fi
+                return 0
+            fi
+            ;;
         esac
     fi
 

_generated/UseDotNetV2_Node20/task.json

@@ -13,7 +13,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 232,
+    "Minor": 234,
     "Patch": 1
   },
   "satisfies": [
@@ -199,7 +199,7 @@
     "DepricatedVersionNetCore": "NET Core version you specfied %s is out of support and will be removed from hosted agents soon. Please refer to https://aka.ms/dotnet-core-support for more information about the .NET support policy."
   },
   "_buildConfigMapping": {
-    "Default": "2.232.0",
-    "Node20_229_3": "2.232.1"
+    "Default": "2.234.0",
+    "Node20_229_3": "2.234.1"
   }
 }

_generated/UseDotNetV2_Node20/task.loc.json

@@ -13,7 +13,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 232,
+    "Minor": 234,
     "Patch": 1
   },
   "satisfies": [
@@ -199,7 +199,7 @@
     "DepricatedVersionNetCore": "ms-resource:loc.messages.DepricatedVersionNetCore"
   },
   "_buildConfigMapping": {
-    "Default": "2.232.0",
-    "Node20_229_3": "2.232.1"
+    "Default": "2.234.0",
+    "Node20_229_3": "2.234.1"
   }
 }