Retarget SuppressGCTransitionAttribute to System.Runtime instead of SPCL. (dotnet...

Commit migrated from https://github.com/dotnet/coreclr/commit/5c88b29d1bf3b33359ff5f7248e02a8109cbaba3

diff --git a/src/coreclr/tests/src/Interop/PInvoke/Attributes/SuppressGCTransition/SuppressGCTransitionTest.cs b/src/coreclr/tests/src/Interop/PInvoke/Attributes/SuppressGCTransition/SuppressGCTransitionTest.cs
index 61ce797d6c1e013409d3141410bd4d48d00052d8..e803ff905c3c6632632f2fd9cc5c8540e1baa9d5 100644 (file)
--- a/src/coreclr/tests/src/Interop/PInvoke/Attributes/SuppressGCTransition/SuppressGCTransitionTest.cs
+++ b/src/coreclr/tests/src/Interop/PInvoke/Attributes/SuppressGCTransition/SuppressGCTransitionTest.cs
@@ -9,8 +9,6 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using TestLibrary;
 
-using Console = Internal.Console;
-
 static class SuppressGCTransitionNative
 {
     [DllImport(nameof(SuppressGCTransitionNative), EntryPoint = "NextUInt")]

diff --git a/src/coreclr/tests/src/Interop/PInvoke/Attributes/SuppressGCTransition/SuppressGCTransitionTest.csproj b/src/coreclr/tests/src/Interop/PInvoke/Attributes/SuppressGCTransition/SuppressGCTransitionTest.csproj
index bed83eb131552fb69ca698e41e6a53f266a97f4c..7e2a6dafc6eb8179e74d85a26c176d85859eb590 100644 (file)
--- a/src/coreclr/tests/src/Interop/PInvoke/Attributes/SuppressGCTransition/SuppressGCTransitionTest.csproj
+++ b/src/coreclr/tests/src/Interop/PInvoke/Attributes/SuppressGCTransition/SuppressGCTransitionTest.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <ReferenceSystemPrivateCoreLib>true</ReferenceSystemPrivateCoreLib>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Interop.settings.targets))\Interop.settings.targets" />
   <ItemGroup>

diff --git a/src/coreclr/tests/src/Interop/PInvoke/Attributes/SuppressGCTransition/SuppressGCTransitionUtil.il b/src/coreclr/tests/src/Interop/PInvoke/Attributes/SuppressGCTransition/SuppressGCTransitionUtil.il
index ca836d703879a0b37a628f9e40a7507955d2fcb4..31ffffc50f74d3ee96472eba36e71a2076a16614 100644 (file)
--- a/src/coreclr/tests/src/Interop/PInvoke/Attributes/SuppressGCTransition/SuppressGCTransitionUtil.il
+++ b/src/coreclr/tests/src/Interop/PInvoke/Attributes/SuppressGCTransition/SuppressGCTransitionUtil.il
@@ -3,25 +3,25 @@
 // See the LICENSE file in the project root for more information.
 
 .assembly extern mscorlib { }
-.assembly extern System.Private.CoreLib { auto }
+.assembly extern System.Runtime { auto }
 
 .assembly SuppressGCTransitionUtil { }
 
 .class public auto ansi beforefieldinit FunctionPointer
-       extends [System.Private.CoreLib]System.Object
+       extends [System.Runtime]System.Object
 {
     .method hidebysig specialname rtspecialname 
             instance void .ctor() cil managed
     {
         ldarg.0
-        call instance void [System.Private.CoreLib]System.Object::.ctor()
+        call instance void [System.Runtime]System.Object::.ctor()
         ret
     }
 
     .method public hidebysig static int32  Call_NextUInt(native int fptr,
                                                  int32* n) cil managed
     {
-        .custom instance void [System.Private.CoreLib]System.Runtime.InteropServices.SuppressGCTransitionAttribute::.ctor() = ( 01 00 00 00 )
+        .custom instance void [System.Runtime]System.Runtime.InteropServices.SuppressGCTransitionAttribute::.ctor() = ( 01 00 00 00 )
         .maxstack  8
         ldarg.1
         ldarg.0