diff --git a/.gitignore b/.gitignore index cb255a5..18c98a4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ /dotnet-v7.0.100-rc.1.22431.12-x64-bootstrap.tar.xz /dotnet-arm64-prebuilts-2022-09-17.tar.gz /dotnet-s390x-prebuilts-2022-08-24.tar.gz +/dotnet-v7.0.100-rc.2.22477.23-x64-bootstrap.tar.xz +/dotnet-arm64-prebuilts-2022-10-12.tar.gz +/dotnet-s390x-prebuilts-2022-10-12.tar.gz diff --git a/dotnet7.0.spec b/dotnet7.0.spec index 184ceb4..ff76273 100644 --- a/dotnet7.0.spec +++ b/dotnet7.0.spec @@ -6,12 +6,12 @@ # until that's done, disable LTO. This has to happen before setting the flags below. %define _lto_cflags %{nil} -%global host_version 7.0.0-rc.1.22426.10 -%global runtime_version 7.0.0-rc.1.22426.10 -%global aspnetcore_runtime_version 7.0.0-rc.1.22427.2 -%global sdk_version 7.0.100-rc.1.22464.1 +%global host_version 7.0.0-rc.2.22472.3 +%global runtime_version 7.0.0-rc.2.22472.3 +%global aspnetcore_runtime_version 7.0.0-rc.2.22476.2 +%global sdk_version 7.0.100-rc.2.22511.1 %global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|') -%global templates_version 7.0.0-rc.1.22427.2 +%global templates_version 7.0.0-rc.2.22476.2 #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') %global host_rpm_version 7.0.0 @@ -21,7 +21,7 @@ # upstream can update releases without revving the SDK version so these don't always match #%%global upstream_tag v%%{sdk_version} -%global upstream_tag v7.0.100-rc.1.22431.12 +%global upstream_tag v7.0.100-rc.2.22477.23 %if 0%{?fedora} || 0%{?rhel} < 8 %global use_bundled_libunwind 0 @@ -47,7 +47,7 @@ Name: dotnet7.0 Version: %{sdk_rpm_version} -Release: 0.2.rc1%{?dist} +Release: 0.3.rc2%{?dist} Summary: .NET Runtime and SDK License: MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib URL: https://github.com/dotnet/ @@ -57,9 +57,9 @@ URL: https://github.com/dotnet/ # ./build-dotnet-tarball --bootstrap %%{upstream_tag} Source0: dotnet-%{upstream_tag}-x64-bootstrap.tar.xz # Generated via ./build-arm64-bootstrap-tarball -Source1: dotnet-arm64-prebuilts-2022-09-17.tar.gz +Source1: dotnet-arm64-prebuilts-2022-10-12.tar.gz # Generated manually, same pattern as the arm64 tarball -Source2: dotnet-s390x-prebuilts-2022-08-24.tar.gz +Source2: dotnet-s390x-prebuilts-2022-10-12.tar.gz %else # The source is generated on a Fedora box via: # ./build-dotnet-tarball %%{upstream_tag} @@ -69,9 +69,12 @@ Source0: dotnet-%{upstream_tag}.tar.gz Source10: check-debug-symbols.py Source11: dotnet.sh.in -Patch1: razor-compiler-apphost.patch -# https://github.com/dotnet/runtime/pull/74147 -Patch2: runtime-74147-no-pgo-with-mono.patch +# https://github.com/dotnet/runtime/pull/76916 +Patch1: runtime-76916-mono-s390x-opcheckthis.patch +# https://github.com/microsoft/vstest/pull/4028 +Patch2: vstest-4028-ppc64le.patch +# https://github.com/microsoft/vstest/pull/4066 +Patch3: vstest-4066-s390x-ppc64le.patch %if 0%{?fedora} || 0%{?rhel} >= 8 @@ -368,6 +371,7 @@ rm -rf packages/source-built %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Fix bad hardcoded path in build sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime/src/native/corehost/hostmisc/pal.unix.cpp @@ -592,6 +596,10 @@ export COMPlus_LTTng=0 %changelog +* Thu Oct 13 2022 Omair Majid - 7.0.100-0.3.rc2 +- Update to .NET 7 RC 2 +- Resolves: RHBZ#2134641 + * Sat Sep 17 2022 Omair Majid - 7.0.100-0.2.rc1 - Update to .NET 7 RC 1 - Enable s390x builds diff --git a/razor-compiler-apphost.patch b/razor-compiler-apphost.patch deleted file mode 100644 index 83f6c7f..0000000 --- a/razor-compiler-apphost.patch +++ /dev/null @@ -1,26 +0,0 @@ -Don't use an apphost for RazorSyntaxGenerator - -The RazorSyntaxGenerator tool is excluded from source-build, but the build -system tries to find the apphost matching the TFM anyway. This project targets -netcoreapp3.1, so the build fails on s390x because the no apphost exists for -that on s390x. ---- a/src/razor-compiler/src/tools/RazorSyntaxGenerator/RazorSyntaxGenerator.csproj -+++ a/src/razor-compiler/src/tools/RazorSyntaxGenerator/RazorSyntaxGenerator.csproj -@@ -10,6 +10,7 @@ - - false - true -+ false - - - ---- a/src/razor-compiler/src/perf/Microbenchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks.csproj -+++ a/src/razor-compiler/src/perf/Microbenchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks.csproj -@@ -7,6 +7,7 @@ - true - true - false -+ false - - - diff --git a/runtime-74147-no-pgo-with-mono.patch b/runtime-74147-no-pgo-with-mono.patch deleted file mode 100644 index bca892b..0000000 --- a/runtime-74147-no-pgo-with-mono.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 98c1b3a803cb01232ee40bb4192679fcab3232e7 Mon Sep 17 00:00:00 2001 -From: Jo Shields -Date: Thu, 18 Aug 2022 09:08:36 -0400 -Subject: [PATCH] Don't try to build PGO tools on platforms with no CoreCLR - port. - -Closes: #74102 ---- - eng/Subsets.props | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/runtime/eng/Subsets.props b/src/runtime/eng/Subsets.props -index 911c24dbde6..1e8e5801e57 100644 ---- a/src/runtime/eng/Subsets.props -+++ b/src/runtime/eng/Subsets.props -@@ -62,7 +62,8 @@ - mono.llvm+ - $(DefaultMonoSubsets)mono.wasmruntime+ - $(DefaultMonoSubsets)mono.aotcross+ -- $(DefaultMonoSubsets)mono.runtime+mono.corelib+mono.packages+mono.tools+ -+ $(DefaultMonoSubsets)mono.runtime+mono.corelib+mono.packages+ -+ $(DefaultMonoSubsets)mono.tools+ - $(DefaultMonoSubsets)host.native+ - - ( + () => _executor.Initialize("foo"), +- "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x.", ++ "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x, PPC64le.", + "foo"); + } + +@@ -94,7 +94,7 @@ public void InitializeShouldThrowIfArgumentIsNotASupportedArchitecture() + { + ExceptionUtilities.ThrowsException( + () => _executor.Initialize("AnyCPU"), +- "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x.", ++ "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x, PPC64le.", + "AnyCPU"); + } + + +From 750b193e964a446dad5fc5927b745861eb19a9a9 Mon Sep 17 00:00:00 2001 +From: Sapana Khemkar +Date: Wed, 28 Sep 2022 11:06:08 +0530 +Subject: [PATCH 2/4] change enum name from PPC64le to Ppc64le to match with + System.Runtime.InteropServices.Architecture enum name + +--- + src/Microsoft.TestPlatform.ObjectModel/Architecture.cs | 2 +- + .../Interfaces/System/PlatformArchitecture.cs | 2 +- + .../netcore/System/PlatformEnvironment.cs | 2 +- + .../netcore/System/ProcessHelper.cs | 2 +- + .../Hosting/DefaultTestHostManager.cs | 2 +- + src/vstest.console/TestPlatformHelpers/TestRequestManager.cs | 4 ++-- + .../Processors/PlatformArgumentProcessorTests.cs | 4 ++-- + 7 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/vstest/src/Microsoft.TestPlatform.ObjectModel/Architecture.cs b/src/vstest/src/Microsoft.TestPlatform.ObjectModel/Architecture.cs +index 7879358840..f3d59e7ae4 100644 +--- a/src/vstest/src/Microsoft.TestPlatform.ObjectModel/Architecture.cs ++++ b/src/vstest/src/Microsoft.TestPlatform.ObjectModel/Architecture.cs +@@ -12,5 +12,5 @@ public enum Architecture + AnyCPU, + ARM64, + S390x, +- PPC64le ++ Ppc64le + } +diff --git a/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformArchitecture.cs b/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformArchitecture.cs +index aa81ca0ffc..907ec721dd 100644 +--- a/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformArchitecture.cs ++++ b/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/Interfaces/System/PlatformArchitecture.cs +@@ -13,5 +13,5 @@ public enum PlatformArchitecture + ARM, + ARM64, + S390x, +- PPC64le, ++ Ppc64le, + } +diff --git a/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformEnvironment.cs b/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformEnvironment.cs +index 14d1234ef6..f2163db898 100644 +--- a/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformEnvironment.cs ++++ b/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/PlatformEnvironment.cs +@@ -28,7 +28,7 @@ public PlatformArchitecture Architecture + // preview 6 or later, so use the numerical value for now. + // case System.Runtime.InteropServices.Architecture.S390x: + (Architecture)5 => PlatformArchitecture.S390x, +- (Architecture)6 => PlatformArchitecture.PPC64le, ++ (Architecture)8 => PlatformArchitecture.Ppc64le, + _ => throw new NotSupportedException(), + }; + } +diff --git a/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/ProcessHelper.cs b/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/ProcessHelper.cs +index d1e31bb0f6..d2d048e355 100644 +--- a/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/ProcessHelper.cs ++++ b/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/netcore/System/ProcessHelper.cs +@@ -41,7 +41,7 @@ public PlatformArchitecture GetCurrentProcessArchitecture() + // preview 6 or later, so use the numerical value for now. + // case System.Runtime.InteropServices.Architecture.S390x: + (Architecture)5 => PlatformArchitecture.S390x, +- (Architecture)6 => PlatformArchitecture.PPC64le, ++ (Architecture)8 => PlatformArchitecture.Ppc64le, + _ => throw new NotSupportedException(), + }; + } +diff --git a/src/vstest/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs b/src/vstest/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs +index 54fa36e344..02001d23ab 100644 +--- a/src/vstest/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs ++++ b/src/vstest/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs +@@ -274,7 +274,7 @@ private static string GetTestHostName(Architecture architecture, Framework targe + PlatformArchitecture.ARM => Architecture.ARM, + PlatformArchitecture.ARM64 => Architecture.ARM64, + PlatformArchitecture.S390x => Architecture.S390x, +- PlatformArchitecture.PPC64le => Architecture.PPC64le, ++ PlatformArchitecture.Ppc64le => Architecture.Ppc64le, + _ => throw new NotSupportedException(), + }; + +diff --git a/src/vstest/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs b/src/vstest/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs +index c7a0f93927..25cca0ca07 100644 +--- a/src/vstest/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs ++++ b/src/vstest/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs +@@ -841,8 +841,8 @@ static Architecture TranslateToArchitecture(PlatformArchitecture targetArchitect + return Architecture.ARM64; + case PlatformArchitecture.S390x: + return Architecture.S390x; +- case PlatformArchitecture.PPC64le: +- return Architecture.PPC64le; ++ case PlatformArchitecture.Ppc64le: ++ return Architecture.Ppc64le; + default: + EqtTrace.Error($"TestRequestManager.TranslateToArchitecture: Unhandled architecture '{targetArchitecture}'."); + break; +diff --git a/src/vstest/test/vstest.console.UnitTests/Processors/PlatformArgumentProcessorTests.cs b/src/vstest/test/vstest.console.UnitTests/Processors/PlatformArgumentProcessorTests.cs +index 472688248d..f33166ae6c 100644 +--- a/src/vstest/test/vstest.console.UnitTests/Processors/PlatformArgumentProcessorTests.cs ++++ b/src/vstest/test/vstest.console.UnitTests/Processors/PlatformArgumentProcessorTests.cs +@@ -85,7 +85,7 @@ public void InitializeShouldThrowIfArgumentIsNotAnArchitecture() + { + ExceptionUtilities.ThrowsException( + () => _executor.Initialize("foo"), +- "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x, PPC64le.", ++ "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x, ppc64le.", + "foo"); + } + +@@ -94,7 +94,7 @@ public void InitializeShouldThrowIfArgumentIsNotASupportedArchitecture() + { + ExceptionUtilities.ThrowsException( + () => _executor.Initialize("AnyCPU"), +- "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x, PPC64le.", ++ "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x, ppc64le.", + "AnyCPU"); + } + + +From 4d97db82c39caf0aa6ca7bd3f47f1c3714aa6f2c Mon Sep 17 00:00:00 2001 +From: Sapana Khemkar +Date: Wed, 28 Sep 2022 17:58:27 +0530 +Subject: [PATCH 3/4] add defination of enum + Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture.Ppc64le + and Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.Ppc64le in + Microsoft.TestPlatform.ObjectModel and + /Microsoft.TestPlatform.PlatformAbstractions PublicAPI.Shipped.txt file. + +--- + .../PublicAPI/PublicAPI.Shipped.txt | 1 + + .../PublicAPI/PublicAPI.Shipped.txt | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/vstest/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/PublicAPI.Shipped.txt b/src/vstest/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/PublicAPI.Shipped.txt +index 9df7e09b00..5d69e70774 100644 +--- a/src/vstest/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/PublicAPI.Shipped.txt ++++ b/src/vstest/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/PublicAPI.Shipped.txt +@@ -113,6 +113,7 @@ Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.ARM = 3 -> Microsof + Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.ARM64 = 5 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture + Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.Default = 0 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture + Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.S390x = 6 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture ++Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.Ppc64le = 7 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture + Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.X64 = 2 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture + Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture.X86 = 1 -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Architecture + Microsoft.VisualStudio.TestPlatform.ObjectModel.AttachmentSet +diff --git a/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/PublicAPI.Shipped.txt b/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/PublicAPI.Shipped.txt +index 696ed76517..8f0f763f94 100644 +--- a/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/PublicAPI.Shipped.txt ++++ b/src/vstest/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/PublicAPI.Shipped.txt +@@ -67,6 +67,7 @@ Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture + Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture.ARM = 2 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture + Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture.ARM64 = 3 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture + Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture.S390x = 4 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture ++Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture.Ppc64le = 5 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture + Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture.X64 = 1 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture + Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture.X86 = 0 -> Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformArchitecture + Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyExtensions + +From 389b923569be952cfa6875af209e70d9490bfd73 Mon Sep 17 00:00:00 2001 +From: Sapana Khemkar +Date: Wed, 28 Sep 2022 19:45:55 +0530 +Subject: [PATCH 4/4] corrected typo in ppc64le arch name + +--- + .../Processors/PlatformArgumentProcessorTests.cs | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/vstest/test/vstest.console.UnitTests/Processors/PlatformArgumentProcessorTests.cs b/src/vstest/test/vstest.console.UnitTests/Processors/PlatformArgumentProcessorTests.cs +index f33166ae6c..b452b48408 100644 +--- a/src/vstest/test/vstest.console.UnitTests/Processors/PlatformArgumentProcessorTests.cs ++++ b/src/vstest/test/vstest.console.UnitTests/Processors/PlatformArgumentProcessorTests.cs +@@ -85,7 +85,7 @@ public void InitializeShouldThrowIfArgumentIsNotAnArchitecture() + { + ExceptionUtilities.ThrowsException( + () => _executor.Initialize("foo"), +- "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x, ppc64le.", ++ "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x, Ppc64le.", + "foo"); + } + +@@ -94,7 +94,7 @@ public void InitializeShouldThrowIfArgumentIsNotASupportedArchitecture() + { + ExceptionUtilities.ThrowsException( + () => _executor.Initialize("AnyCPU"), +- "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x, ppc64le.", ++ "Invalid platform type: {0}. Valid platform types are X86, X64, ARM, ARM64, S390x, Ppc64le.", + "AnyCPU"); + } + diff --git a/vstest-4066-s390x-ppc64le.patch b/vstest-4066-s390x-ppc64le.patch new file mode 100644 index 0000000..642beb6 --- /dev/null +++ b/vstest-4066-s390x-ppc64le.patch @@ -0,0 +1,37 @@ +From 7ea33be2e1949d9c63ff58b59deb5b1a84105aae Mon Sep 17 00:00:00 2001 +From: Giridhar Trivedi +Date: Wed, 12 Oct 2022 14:14:40 +0200 +Subject: [PATCH] Fix Invalid target architecture 'S390x' error + +In commit 3ae5c4aef823 ("Add support for s390x processor architecture") +support for S390x architecture was provided for .NET6. This is broken +in .NET7. Add missing case statements to fix this for S390x and also +Power architectures. +--- + .../Hosting/DotnetTestHostManager.cs | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/vstest/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs b/src/vstest/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs +index b4fa53776f..deadfcb684 100644 +--- a/src/vstest/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs ++++ b/src/vstest/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DotnetTestHostManager.cs +@@ -536,6 +536,10 @@ PlatformArchitecture TranslateToPlatformArchitecture(Architecture targetArchitec + return PlatformArchitecture.ARM; + case Architecture.ARM64: + return PlatformArchitecture.ARM64; ++ case Architecture.S390x: ++ return PlatformArchitecture.S390x; ++ case Architecture.Ppc64le: ++ return PlatformArchitecture.Ppc64le; + case Architecture.AnyCPU: + case Architecture.Default: + default: +@@ -552,6 +556,8 @@ static bool IsSameArchitecture(Architecture targetArchitecture, PlatformArchitec + Architecture.X64 => platformAchitecture == PlatformArchitecture.X64, + Architecture.ARM => platformAchitecture == PlatformArchitecture.ARM, + Architecture.ARM64 => platformAchitecture == PlatformArchitecture.ARM64, ++ Architecture.S390x => platformAchitecture == PlatformArchitecture.S390x, ++ Architecture.Ppc64le => platformAchitecture == PlatformArchitecture.Ppc64le, + _ => throw new TestPlatformException($"Invalid target architecture '{targetArchitecture}'"), + }; +