From 7fac0a26e68551c35dd9e8e39f562ac2a0892410 Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Thu, 14 Mar 2024 19:56:29 -0500 Subject: [PATCH] Add a few more archs. --- .../Runner/Exporter/IkvmExporterLauncherTests.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/IKVM.Tools.Tests/Runner/Exporter/IkvmExporterLauncherTests.cs b/src/IKVM.Tools.Tests/Runner/Exporter/IkvmExporterLauncherTests.cs index b902edb15..083fa4c14 100644 --- a/src/IKVM.Tools.Tests/Runner/Exporter/IkvmExporterLauncherTests.cs +++ b/src/IKVM.Tools.Tests/Runner/Exporter/IkvmExporterLauncherTests.cs @@ -48,10 +48,16 @@ public async System.Threading.Tasks.Task CanExportDll(string toolFramework, stri Directory.CreateDirectory(d); var rid = ""; - if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && RuntimeInformation.ProcessArchitecture == Architecture.X64) rid = "win-x64"; - if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && RuntimeInformation.ProcessArchitecture == Architecture.X86) + rid = "win-x86"; + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && RuntimeInformation.ProcessArchitecture == Architecture.Arm64) + rid = "win-arm64"; + if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) && RuntimeInformation.ProcessArchitecture == Architecture.X64) rid = "linux-x64"; + if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) && RuntimeInformation.ProcessArchitecture == Architecture.Arm64) + rid = "linux-arm64"; if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && RuntimeInformation.ProcessArchitecture == Architecture.X64) rid = "osx-x64"; if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && RuntimeInformation.ProcessArchitecture == Architecture.Arm64)