From 5d2229e2170d4d8eb3e187ad34f1f7dbcc9b3c65 Mon Sep 17 00:00:00 2001
From: Ulrich Weigand <ulrich.weigand@de.ibm.com>
Date: Wed, 28 Jul 2021 16:31:32 +0200
Subject: [PATCH] Build runtime.native.System.IO.Ports on linux-s390x (#56424)

* Add RID to runtime.native.System.IO.Ports/netcoreapp.rids.props

* Update runtime.native.System.IO.Ports.pkgproj file.
---
 .../pkg/runtime.native.System.IO.Ports/netcoreapp.rids.props   | 3 +++
 .../runtime.native.System.IO.Ports.pkgproj                     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/libraries/pkg/runtime.native.System.IO.Ports/netcoreapp.rids.props b/src/libraries/pkg/runtime.native.System.IO.Ports/netcoreapp.rids.props
index c5cf15fa7356c..b227bfc1ff3ff 100644
--- a/src/libraries/pkg/runtime.native.System.IO.Ports/netcoreapp.rids.props
+++ b/src/libraries/pkg/runtime.native.System.IO.Ports/netcoreapp.rids.props
@@ -6,6 +6,9 @@
     <BuildRID Include="linux-arm64">
       <Platform>arm64</Platform>
     </BuildRID>
+    <BuildRID Include="linux-s390x">
+      <Platform>s390x</Platform>
+    </BuildRID>
     <BuildRID Include="linux-x64" />
     <BuildRID Include="osx-x64" />
   </ItemGroup>
diff --git a/src/libraries/pkg/runtime.native.System.IO.Ports/runtime.native.System.IO.Ports.pkgproj b/src/libraries/pkg/runtime.native.System.IO.Ports/runtime.native.System.IO.Ports.pkgproj
index b7b43e933dfd8..4cddbb71d9ad9 100644
--- a/src/libraries/pkg/runtime.native.System.IO.Ports/runtime.native.System.IO.Ports.pkgproj
+++ b/src/libraries/pkg/runtime.native.System.IO.Ports/runtime.native.System.IO.Ports.pkgproj
@@ -4,7 +4,7 @@
     <SkipPackageFileCheck>true</SkipPackageFileCheck>
     <SkipValidatePackage>true</SkipValidatePackage>
   </PropertyGroup>
-  <ItemGroup Condition="'$(PackageTargetRuntime)' == 'linux-arm' or '$(PackageTargetRuntime)' == 'linux-arm64' or '$(PackageTargetRuntime)' == 'linux-x64' or '$(PackageTargetRuntime)' == 'osx-x64' or '$(PackageTargetRuntime)' == 'freebsd-x64'">
+  <ItemGroup Condition="'$(PackageTargetRuntime)' == 'linux-arm' or '$(PackageTargetRuntime)' == 'linux-arm64' or '$(PackageTargetRuntime)' == 'linux-s390x' or '$(PackageTargetRuntime)' == 'linux-x64' or '$(PackageTargetRuntime)' == 'osx-x64' or '$(PackageTargetRuntime)' == 'freebsd-x64'">
     <File Include="$(NativeBinDir)$(LibPrefix)System.IO.Ports.Native$(LibSuffix)" >
       <TargetPath>runtimes/$(OutputRid)/native</TargetPath>
     </File>