From f4b51a85c41a729dc01076cc84efb8ec746ff148 Mon Sep 17 00:00:00 2001
From: Badre BSAILA <54767641+pedrobsaila@users.noreply.github.com>
Date: Sun, 21 Feb 2021 22:45:59 +0100
Subject: [PATCH] Fix #28035 Refactor DLL imports interop classes (#48556)

* refactor interop classes

* move interop files to subdirectory
---
 .../Interop/Unix/System.IO.Ports.Native}/Interop.Serial.cs  | 1 -
 .../Interop/Unix/System.IO.Ports.Native}/Interop.Termios.cs | 1 -
 src/libraries/System.IO.Ports/src/System.IO.Ports.csproj    | 6 ++++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename src/libraries/{System.IO.Ports/src/Interop/Unix => Common/src/Interop/Unix/System.IO.Ports.Native}/Interop.Serial.cs (99%)
 rename src/libraries/{System.IO.Ports/src/Interop/Unix => Common/src/Interop/Unix/System.IO.Ports.Native}/Interop.Termios.cs (98%)

diff --git a/src/libraries/System.IO.Ports/src/Interop/Unix/Interop.Serial.cs b/src/libraries/Common/src/Interop/Unix/System.IO.Ports.Native/Interop.Serial.cs
similarity index 99%
rename from src/libraries/System.IO.Ports/src/Interop/Unix/Interop.Serial.cs
rename to src/libraries/Common/src/Interop/Unix/System.IO.Ports.Native/Interop.Serial.cs
index c8e8ea42971..f21e6a623ad 100644
--- a/src/libraries/System.IO.Ports/src/Interop/Unix/Interop.Serial.cs
+++ b/src/libraries/Common/src/Interop/Unix/System.IO.Ports.Native/Interop.Serial.cs
@@ -5,7 +5,6 @@
 using System.IO.Ports;
 using System.Net.Sockets;
 using System.Runtime.InteropServices;
-using Microsoft.Win32.SafeHandles;
 
 internal static partial class Interop
 {
diff --git a/src/libraries/System.IO.Ports/src/Interop/Unix/Interop.Termios.cs b/src/libraries/Common/src/Interop/Unix/System.IO.Ports.Native/Interop.Termios.cs
similarity index 98%
rename from src/libraries/System.IO.Ports/src/Interop/Unix/Interop.Termios.cs
rename to src/libraries/Common/src/Interop/Unix/System.IO.Ports.Native/Interop.Termios.cs
index fea460a898d..6dbcebadc67 100644
--- a/src/libraries/System.IO.Ports/src/Interop/Unix/Interop.Termios.cs
+++ b/src/libraries/Common/src/Interop/Unix/System.IO.Ports.Native/Interop.Termios.cs
@@ -4,7 +4,6 @@
 using System;
 using System.IO.Ports;
 using System.Runtime.InteropServices;
-using Microsoft.Win32.SafeHandles;
 
 internal static partial class Interop
 {
diff --git a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj
index 2ca1032c21b..9560e277889 100644
--- a/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj
+++ b/src/libraries/System.IO.Ports/src/System.IO.Ports.csproj
@@ -120,8 +120,10 @@
   <ItemGroup Condition="'$(TargetsLinux)' == 'true' or '$(TargetsOSX)' == 'true' or '$(TargetsFreeBSD)' == 'true'">
     <Compile Include="System\IO\Ports\SafeSerialDeviceHandle.Unix.cs" />
     <Compile Include="System\IO\Ports\SerialStream.Unix.cs" />
-    <Compile Include="Interop\Unix\Interop.Termios.cs" />
-    <Compile Include="Interop\Unix\Interop.Serial.cs" />
+    <Compile Include="$(CommonPath)Interop\Unix\System.IO.Ports.Native\Interop.Termios.cs"
+             Link="Common\Interop\Unix\System.IO.Ports.Native\Interop.Termios.cs"/>
+    <Compile Include="$(CommonPath)Interop\Unix\System.IO.Ports.Native\Interop.Serial.cs"
+             Link="Common\Interop\Unix\System.IO.Ports.Native\Interop.Serial.cs"/>
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Libraries.cs"
              Link="Common\Interop\Unix\Interop.Libraries.cs" />
     <Compile Include="$(CommonPath)Interop\Unix\Interop.Errors.cs"
-- 
GitLab