Corrected OS arch in Common.props

microsoft · Nov 19, 2024 · c27847f · c27847f
1 parent 71b3ac6
commit c27847f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Common.props b/src/Common.props
@@ -41,6 +41,10 @@
   <PropertyGroup Condition="'$(OSPlatform)' == 'OS_WINDOWS' AND '$(PROCESSOR_ARCHITECTURE)' == 'ARM64'">
     <OSArchitecture>ARM64</OSArchitecture>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(OSPlatform)' == 'OS_WINDOWS' AND '$(PackageRuntime)' == 'win-arm64'">
+    <OSArchitecture>ARM64</OSArchitecture>
+  </PropertyGroup>
+  <!-- PROCESSOR_ARCHITECTURE does not always return ARM64 on all ARM-64 machines. So added a fallback condition to check the PackageRuntime variable -->
 
   <PropertyGroup Condition="'$(OSPlatform)' == 'OS_OSX' AND '$(PackageRuntime)' == 'osx-x64'">
     <OSArchitecture>X64</OSArchitecture>

diff --git a/src/dev.sh b/src/dev.sh
@@ -374,10 +374,8 @@ echo "Current runtime ID: $DETECTED_RUNTIME_ID"
 
 if [ "$DEV_RUNTIME_ID" ]; then
     RUNTIME_ID=$DEV_RUNTIME_ID
-    echo "Proceeding with DEV_RUNTIME_ID"
 else
     RUNTIME_ID=$DETECTED_RUNTIME_ID
-    echo "Proceeding with detected DETECTED_RUNTIME_ID"
 fi
 
 _VALID_RIDS='linux-x64:linux-arm:linux-arm64:linux-musl-x64:linux-musl-arm64:osx-x64:osx-arm64:win-x64:win-x86:win-arm64'