Merge remote-tracking branch 'upstream/main' into interlockedgeneric

dotnet · Jul 18, 2024 · 1d192f9 · 1d192f9
2 parents 58e341d + 17bcc24
commit 1d192f9
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/src/libraries/System.Private.CoreLib/src/System/ReadOnlySpan.cs b/src/libraries/System.Private.CoreLib/src/System/ReadOnlySpan.cs
@@ -21,9 +21,7 @@ namespace System
     [DebuggerTypeProxy(typeof(SpanDebugView<>))]
     [DebuggerDisplay("{ToString(),raw}")]
     [NonVersionable]
-#pragma warning disable SYSLIB1056 // Specified native type is invalid
     [NativeMarshalling(typeof(ReadOnlySpanMarshaller<,>))]
-#pragma warning restore SYSLIB1056 // Specified native type is invalid
     [Intrinsic]
     public readonly ref struct ReadOnlySpan<T>
     {

diff --git a/src/libraries/System.Private.CoreLib/src/System/Span.cs b/src/libraries/System.Private.CoreLib/src/System/Span.cs
@@ -20,9 +20,7 @@ namespace System
     [DebuggerTypeProxy(typeof(SpanDebugView<>))]
     [DebuggerDisplay("{ToString(),raw}")]
     [NonVersionable]
-#pragma warning disable SYSLIB1056 // Specified native type is invalid
     [NativeMarshalling(typeof(SpanMarshaller<,>))]
-#pragma warning restore SYSLIB1056 // Specified native type is invalid
     [Intrinsic]
     public readonly ref struct Span<T>
     {