Adding Unsafe APIs that are used by System.Memory - CoreRT specific part

9 files changed, 20 insertions, 4 deletions

diff --git a/src/Runtime.Base/src/System/Runtime/CompilerServices/Unsafe.cs b/src/Runtime.Base/src/Internal/Runtime/CompilerServices/Unsafe.cs
index e84cb7729..705193a3c 100644
--- a/src/Runtime.Base/src/System/Runtime/CompilerServices/Unsafe.cs
+++ b/src/Runtime.Base/src/Internal/Runtime/CompilerServices/Unsafe.cs
@@ -2,18 +2,21 @@
 // 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;
+using System.Runtime.CompilerServices;
+
 #if BIT64
 using nint = System.Int64;
 #else
 using nint = System.Int32;
 #endif
 
-namespace System.Runtime.CompilerServices
+namespace Internal.Runtime.CompilerServices
 {
     //
     // Subsetted clone of System.Runtime.CompilerServices.Unsafe for internal runtime use.
     // Keep in sync with https://github.com/dotnet/corefx/tree/master/src/System.Runtime.CompilerServices.Unsafe.
-    // 
+    //
 
     /// <summary>
     /// Contains generic, low-level functionality for manipulating pointers.
diff --git a/src/Runtime.Base/src/Runtime.Base.csproj b/src/Runtime.Base/src/Runtime.Base.csproj
index 1564039e4..6beb92196 100644
--- a/src/Runtime.Base/src/Runtime.Base.csproj
+++ b/src/Runtime.Base/src/Runtime.Base.csproj
@@ -77,7 +77,6 @@
     <Compile Include="System\Runtime\CompilerServices\ManuallyManagedAttribute.cs" />
     <Compile Include="System\Runtime\CompilerServices\MethodImplAttribute.cs" />
     <Compile Include="System\Runtime\CompilerServices\RuntimeHelpers.cs" />
-    <Compile Include="System\Runtime\CompilerServices\Unsafe.cs" />
     <Compile Include="System\Runtime\CompilerServices\UnsafeValueTypeAttribute.cs" />
     <Compile Include="System\Runtime\InteropServices\CallingConvention.cs" />
     <Compile Include="System\Runtime\InteropServices\CharSet.cs" />
@@ -93,6 +92,9 @@
     <Compile Include="RhBaseName.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Internal\Runtime\CompilerServices\Unsafe.cs" />
+  </ItemGroup>
+  <ItemGroup>
     <Compile Include="..\..\Common\src\Internal\Runtime\EEType.Constants.cs" >
       <Link>Common\EEType.Constants.cs</Link>
     </Compile>
diff --git a/src/Runtime.Base/src/System/Array.cs b/src/Runtime.Base/src/System/Array.cs
index e5c86dc84..3d6acdb7b 100644
--- a/src/Runtime.Base/src/System/Array.cs
+++ b/src/Runtime.Base/src/System/Array.cs
@@ -5,6 +5,8 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
+using Internal.Runtime.CompilerServices;
+
 namespace System
 {
     // CONTRACT with Runtime
diff --git a/src/Runtime.Base/src/System/Object.cs b/src/Runtime.Base/src/System/Object.cs
index 2e541f303..5f1732622 100644
--- a/src/Runtime.Base/src/System/Object.cs
+++ b/src/Runtime.Base/src/System/Object.cs
@@ -17,6 +17,8 @@ using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
+using Internal.Runtime.CompilerServices;
+
 // TODO: remove when m_pEEType becomes EETypePtr
 using EEType = Internal.Runtime.EEType;
 using ObjHeader = Internal.Runtime.ObjHeader;
diff --git a/src/Runtime.Base/src/System/Runtime/CachedInterfaceDispatch.cs b/src/Runtime.Base/src/System/Runtime/CachedInterfaceDispatch.cs
index 6c4b21b7d..6ca1646c7 100644
--- a/src/Runtime.Base/src/System/Runtime/CachedInterfaceDispatch.cs
+++ b/src/Runtime.Base/src/System/Runtime/CachedInterfaceDispatch.cs
@@ -7,6 +7,7 @@ using System.Runtime;
 using System.Runtime.CompilerServices;
 
 using Internal.Runtime;
+using Internal.Runtime.CompilerServices;
 
 namespace System.Runtime
 {
diff --git a/src/Runtime.Base/src/System/Runtime/CastableObjectSupport.cs b/src/Runtime.Base/src/System/Runtime/CastableObjectSupport.cs
index ec2720c32..20f0ce285 100644
--- a/src/Runtime.Base/src/System/Runtime/CastableObjectSupport.cs
+++ b/src/Runtime.Base/src/System/Runtime/CastableObjectSupport.cs
@@ -3,9 +3,11 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Internal.Runtime;
 using System.Runtime.CompilerServices;
 
+using Internal.Runtime;
+using Internal.Runtime.CompilerServices;
+
 namespace System.Runtime
 {
     [System.Runtime.CompilerServices.EagerStaticClassConstructionAttribute]
diff --git a/src/Runtime.Base/src/System/Runtime/InteropServices/UnsafeGCHandle.cs b/src/Runtime.Base/src/System/Runtime/InteropServices/UnsafeGCHandle.cs
index b7b07f209..90eea56c3 100644
--- a/src/Runtime.Base/src/System/Runtime/InteropServices/UnsafeGCHandle.cs
+++ b/src/Runtime.Base/src/System/Runtime/InteropServices/UnsafeGCHandle.cs
@@ -6,6 +6,8 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Diagnostics;
 
+using Internal.Runtime.CompilerServices;
+
 namespace System.Runtime.InteropServices
 {
     /// <summary>
diff --git a/src/Runtime.Base/src/System/Runtime/RuntimeExports.cs b/src/Runtime.Base/src/System/Runtime/RuntimeExports.cs
index 3c8868bf5..db9b5de74 100644
--- a/src/Runtime.Base/src/System/Runtime/RuntimeExports.cs
+++ b/src/Runtime.Base/src/System/Runtime/RuntimeExports.cs
@@ -11,6 +11,7 @@ using System.Runtime.InteropServices;
 using System.Runtime.CompilerServices;
 
 using Internal.Runtime;
+using Internal.Runtime.CompilerServices;
 
 namespace System.Runtime
 {
diff --git a/src/Runtime.Base/src/System/Runtime/TypeCast.cs b/src/Runtime.Base/src/System/Runtime/TypeCast.cs
index db68ac4a4..568892a65 100644
--- a/src/Runtime.Base/src/System/Runtime/TypeCast.cs
+++ b/src/Runtime.Base/src/System/Runtime/TypeCast.cs
@@ -7,6 +7,7 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 using Internal.Runtime;
+using Internal.Runtime.CompilerServices;
 
 namespace System.Runtime
 {