Move PInvoke interop related attributes to shared CoreLib partition

[tfs-changeset: 1673253]

7 files changed, 6 insertions, 115 deletions

diff --git a/src/System.Private.Interop/src/System.Private.Interop.csproj b/src/System.Private.Interop/src/System.Private.Interop.csproj
index 78997ec98..69e64aac3 100644
--- a/src/System.Private.Interop/src/System.Private.Interop.csproj
+++ b/src/System.Private.Interop/src/System.Private.Interop.csproj
@@ -98,11 +98,8 @@
     <Compile Include="System\Runtime\InteropServices\CurrencyWrapper.cs" />
     <Compile Include="System\Runtime\InteropServices\CustomQueryInterfaceMode.cs" />
     <Compile Include="System\Runtime\InteropServices\CustomQueryInterfaceResult.cs" />
-    <Compile Include="System\Runtime\InteropServices\DefaultCharSetAttribute.cs" />
-    <Compile Include="System\Runtime\InteropServices\DefaultDllImportSearchPathAttribute.cs" />
     <Compile Include="System\Runtime\InteropServices\DispatchWrapper.cs" />
     <Compile Include="System\Runtime\InteropServices\DispIdAttribute.cs" />
-    <Compile Include="System\Runtime\InteropServices\DllImportSearchPath.cs" />
     <Compile Include="System\Runtime\InteropServices\ErrorWrapper.cs" />
     <Compile Include="System\Runtime\InteropServices\HandleRef.cs" />
     <Compile Include="System\Runtime\InteropServices\InteropEventProvider.cs" />
@@ -119,8 +116,6 @@
     <Compile Include="System\Runtime\InteropServices\MarshalAdapter.cs" />
     <Compile Include="System\Runtime\InteropServices\MarshalImpl.cs" />
     <Compile Include="System\Runtime\InteropServices\MissingInteropDataException.cs" />
-    <Compile Include="System\Runtime\InteropServices\OptionalAttribute.cs" />
-    <Compile Include="System\Runtime\InteropServices\PreserveSigAttribute.cs" />
     <Compile Include="System\Runtime\InteropServices\ProgIdAttribute.cs" />
     <Compile Include="System\Runtime\InteropServices\SafeArrayRankMismatchException.cs" />
     <Compile Include="System\Runtime\InteropServices\SafeArrayTypeMismatchException.cs" />
diff --git a/src/System.Private.Interop/src/System/Runtime/InteropServices/DefaultCharSetAttribute.cs b/src/System.Private.Interop/src/System/Runtime/InteropServices/DefaultCharSetAttribute.cs
deleted file mode 100644
index 98b39ef18..000000000
--- a/src/System.Private.Interop/src/System/Runtime/InteropServices/DefaultCharSetAttribute.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-//
-
-//
-
-using System;
-
-namespace System.Runtime.InteropServices
-{
-    [AttributeUsage(AttributeTargets.Module, Inherited = false)]
-    public sealed class DefaultCharSetAttribute : Attribute
-    {
-        internal CharSet _CharSet;
-
-        public DefaultCharSetAttribute(CharSet charSet)
-        {
-            _CharSet = charSet;
-        }
-
-        public CharSet CharSet { get { return _CharSet; } }
-    }
-}
diff --git a/src/System.Private.Interop/src/System/Runtime/InteropServices/DefaultDllImportSearchPathAttribute.cs b/src/System.Private.Interop/src/System/Runtime/InteropServices/DefaultDllImportSearchPathAttribute.cs
deleted file mode 100644
index c77baf859..000000000
--- a/src/System.Private.Interop/src/System/Runtime/InteropServices/DefaultDllImportSearchPathAttribute.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-//
-
-//
-
-using System;
-
-namespace System.Runtime.InteropServices
-{
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Method, AllowMultiple = false)]
-    public sealed class DefaultDllImportSearchPathsAttribute : Attribute
-    {
-        internal DllImportSearchPath _paths;
-        public DefaultDllImportSearchPathsAttribute(DllImportSearchPath paths)
-        {
-            _paths = paths;
-        }
-
-        public DllImportSearchPath Paths { get { return _paths; } }
-    }
-}
diff --git a/src/System.Private.Interop/src/System/Runtime/InteropServices/DllImportSearchPath.cs b/src/System.Private.Interop/src/System/Runtime/InteropServices/DllImportSearchPath.cs
deleted file mode 100644
index a2f98a064..000000000
--- a/src/System.Private.Interop/src/System/Runtime/InteropServices/DllImportSearchPath.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-//
-
-//
-
-using System;
-
-namespace System.Runtime.InteropServices
-{
-    [Flags]
-    public enum DllImportSearchPath
-    {
-        UseDllDirectoryForDependencies = 0x100,
-        ApplicationDirectory = 0x200,
-        UserDirectories = 0x400,
-        System32 = 0x800,
-        SafeDirectories = 0x1000,
-        AssemblyDirectory = 0x2,
-        LegacyBehavior = 0x0
-    }
-}
diff --git a/src/System.Private.Interop/src/System/Runtime/InteropServices/OptionalAttribute.cs b/src/System.Private.Interop/src/System/Runtime/InteropServices/OptionalAttribute.cs
deleted file mode 100644
index b404ceb8f..000000000
--- a/src/System.Private.Interop/src/System/Runtime/InteropServices/OptionalAttribute.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-
-namespace System.Runtime.InteropServices
-{
-    [AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
-    public sealed class OptionalAttribute : Attribute
-    {
-    }
-}
diff --git a/src/System.Private.Interop/src/System/Runtime/InteropServices/PreserveSigAttribute.cs b/src/System.Private.Interop/src/System/Runtime/InteropServices/PreserveSigAttribute.cs
deleted file mode 100644
index 902fa3780..000000000
--- a/src/System.Private.Interop/src/System/Runtime/InteropServices/PreserveSigAttribute.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-
-namespace System.Runtime.InteropServices
-{
-    [AttributeUsage(AttributeTargets.Method, Inherited = false)]
-    public sealed class PreserveSigAttribute : Attribute
-    {
-    }
-}
diff --git a/src/System.Private.Interop/src/TypeForwarders.cs b/src/System.Private.Interop/src/TypeForwarders.cs
index badf60477..064ea9589 100644
--- a/src/System.Private.Interop/src/TypeForwarders.cs
+++ b/src/System.Private.Interop/src/TypeForwarders.cs
@@ -1,14 +1,9 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.SafeBuffer))]
-[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.MarshalAsAttribute))]
-[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.UnmanagedType))]
-[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.VarEnum))]
-[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.CriticalHandle))]
-[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.InAttribute))]
-[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.DllNotFoundException))]
-[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.EntryPointNotFoundException))]
-[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.MarshalDirectiveException))]
-[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.BestFitMappingAttribute))]
\ No newline at end of file
+[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.DefaultCharSetAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.DefaultDllImportSearchPathsAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.DllImportSearchPath))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.OptionalAttribute))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.PreserveSigAttribute))]