Address PR review feedback for ARM64 support

- Use ProcessArchitecture instead of OSArchitecture for nativeRid to
  correctly handle x64 emulation on ARM64 Windows
- Add missing '-c Release' configuration to Windows_arm64 CI job
- Consolidate duplicate TargetRuntimeID blocks into single block with
  mutually exclusive conditions
- Update VS version list in gen-buildsys-win.bat usage text to include
  VS2022 and VS2026

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: alinpahontu2912

Directory.Build.props

@@ -54,12 +54,7 @@
 
     <TargetPlatform Condition="'$(TargetPlatform)' == ''">$(TargetOS)-$(TargetArchitecture)</TargetPlatform>
 
-    <TargetRuntimeID Condition="'$(TargetOS)' == 'windows'">win-x64</TargetRuntimeID>
-    <TargetRuntimeID Condition="'$(TargetPlatform)' == 'windows-arm64'">win-arm64</TargetRuntimeID>
-    <TargetRuntimeID Condition="'$(TargetOS)' == 'linux'">linux-x64</TargetRuntimeID>
-    <TargetRuntimeID Condition="'$(TargetPlatform)' == 'mac-arm64'">osx-arm64</TargetRuntimeID>
-
-    <TargetRuntimeID Condition="'$(TargetOS)' == 'windows'">win-x64</TargetRuntimeID>
+    <TargetRuntimeID Condition="'$(TargetOS)' == 'windows' AND '$(TargetPlatform)' != 'windows-arm64'">win-x64</TargetRuntimeID>
     <TargetRuntimeID Condition="'$(TargetPlatform)' == 'windows-arm64'">win-arm64</TargetRuntimeID>
     <TargetRuntimeID Condition="'$(TargetOS)' == 'linux'">linux-x64</TargetRuntimeID>
     <TargetRuntimeID Condition="'$(TargetOS)' == 'mac'">osx-$(TargetArchitecture)</TargetRuntimeID>

azure-pipelines.yml

@@ -93,7 +93,7 @@ jobs:
   parameters:
     prepScript: echo "no prep needed"
     name: Windows_arm64
-    buildScript: dotnet build /p:SkipCuda=true /p:TargetArchitecture=arm64 /p:SkipNetFxBuild=true -c
+    buildScript: dotnet build /p:SkipCuda=true /p:TargetArchitecture=arm64 /p:SkipNetFxBuild=true -c Release
     testScript: echo "Cannot run ARM64 tests on x64 Azure Pipelines agent"
     pool:
       vmImage: 'windows-latest'

src/Native/gen-buildsys-win.bat

@@ -40,7 +40,7 @@ GOTO :DONE
 :USAGE
   echo "Usage..."
   echo "gen-buildsys-win.bat <VSVersion> <Target Architecture>"
-  echo "Specify the VSVersion to be used - VS2015, VS2017 or VS2019"
+  echo "Specify the VSVersion to be used - VS2015, VS2017, VS2019, VS2022, or VS2026"
   echo "Specify the Target Architecture - x86, x64, or ARM64."
   EXIT /B 1
 

src/TorchSharp/Torch.cs

@@ -39,7 +39,7 @@ public static partial class torch
 
         static string nativeRid =>
             RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
-                ? (RuntimeInformation.OSArchitecture == Architecture.Arm64 ? "win-arm64" : "win-x64") :
+                ? (RuntimeInformation.ProcessArchitecture == Architecture.Arm64 ? "win-arm64" : "win-x64") :
             RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? $"linux-x64" :
             isAppleSilicon ? "osx-arm64" :
             "any";