From f241025d40d5e2368f14d249d94ef64ff2335251 Mon Sep 17 00:00:00 2001
From: Christoph Wille <christoph.wille@gmail.com>
Date: Mon, 7 Jul 2025 10:46:55 +0200
Subject: [PATCH] Make ILSpy.Tests.csproj look like the other two test projects
 wrt RID

---
 .github/workflows/build-ilspy.yml | 4 ++--
 ILSpy.Tests/ILSpy.Tests.csproj    | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-ilspy.yml b/.github/workflows/build-ilspy.yml
index 8393eb141..5281bab5c 100644
--- a/.github/workflows/build-ilspy.yml
+++ b/.github/workflows/build-ilspy.yml
@@ -72,7 +72,7 @@ jobs:
         name: test-results-${{ matrix.configuration }}
         path: |
           ICSharpCode.Decompiler.Tests/bin/${{ matrix.configuration }}/net10.0-windows/win-x64/TestResults/*.trx
-          ILSpy.Tests/bin/${{ matrix.configuration }}/net10.0-windows/TestResults/*.trx
+          ILSpy.Tests/bin/${{ matrix.configuration }}/net10.0-windows/win-x64/TestResults/*.trx
           ILSpy.BamlDecompiler.Tests/bin/${{ matrix.configuration }}/net10.0-windows/win-x64/TestResults/*.trx
 
     - name: Create Test Report
@@ -81,7 +81,7 @@ jobs:
       with:
         paths: |
           ICSharpCode.Decompiler.Tests/bin/${{ matrix.configuration }}/net10.0-windows/win-x64/TestResults/*.trx
-          ILSpy.Tests/bin/${{ matrix.configuration }}/net10.0-windows/TestResults/*.trx
+          ILSpy.Tests/bin/${{ matrix.configuration }}/net10.0-windows/win-x64/TestResults/*.trx
           ILSpy.BamlDecompiler.Tests/bin/${{ matrix.configuration }}/net10.0-windows/win-x64/TestResults/*.trx
         folded: true
 
diff --git a/ILSpy.Tests/ILSpy.Tests.csproj b/ILSpy.Tests/ILSpy.Tests.csproj
index 2e9af4df7..635dad18f 100644
--- a/ILSpy.Tests/ILSpy.Tests.csproj
+++ b/ILSpy.Tests/ILSpy.Tests.csproj
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <PropertyGroup>
+    <IsWindowsX64 Condition="$([MSBuild]::IsOsPlatform('Windows')) And $([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture) == X64">true</IsWindowsX64>
+    <IsWindowsARM64 Condition="$([MSBuild]::IsOsPlatform('Windows')) And $([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture) == ARM64">true</IsWindowsARM64>
+  </PropertyGroup>
+
   <PropertyGroup>
     <TargetFramework>net10.0-windows</TargetFramework>
     <IsPackable>false</IsPackable>
-    
+    <RuntimeIdentifier Condition="$(IsWindowsX64) == true">win-x64</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="$(IsWindowsARM64) == true">win-arm64</RuntimeIdentifier>
+
     <EnableNUnitRunner>true</EnableNUnitRunner>
     <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
     <OutputType>Exe</OutputType>