From cabcc428fe47f5485d244e557de44080cbc1f51a Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 11 Jul 2022 15:42:14 -0700 Subject: [PATCH] cleanup ref assembly attributes --- .../Marshalling/ArrayMarshaller.cs | 4 +-- .../Marshalling/PointerArrayMarshaller.cs | 4 +-- .../ref/System.Runtime.InteropServices.cs | 32 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshalling/ArrayMarshaller.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshalling/ArrayMarshaller.cs index 0f177dc522510..b7c060b67cb8c 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshalling/ArrayMarshaller.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshalling/ArrayMarshaller.cs @@ -12,10 +12,10 @@ namespace System.Runtime.InteropServices.Marshalling /// Array element type /// The unmanaged type for the element type [CLSCompliant(false)] - [CustomMarshaller(typeof(CustomTypeMarshallerAttribute.GenericPlaceholder[]), + [CustomMarshaller(typeof(CustomMarshallerAttribute.GenericPlaceholder[]), MarshalMode.Default, typeof(ArrayMarshaller<,>))] - [CustomMarshaller(typeof(CustomTypeMarshallerAttribute.GenericPlaceholder[]), + [CustomMarshaller(typeof(CustomMarshallerAttribute.GenericPlaceholder[]), MarshalMode.ManagedToUnmanagedIn, typeof(ArrayMarshaller<,>.ManagedToUnmanagedIn))] [ContiguousCollectionMarshaller] diff --git a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshalling/PointerArrayMarshaller.cs b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshalling/PointerArrayMarshaller.cs index e93ca95d5aa2f..730ccd170fead 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshalling/PointerArrayMarshaller.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshalling/PointerArrayMarshaller.cs @@ -12,10 +12,10 @@ namespace System.Runtime.InteropServices.Marshalling /// Array element pointer type /// The unmanaged type for the element pointer type [CLSCompliant(false)] - [CustomMarshaller(typeof(CustomTypeMarshallerAttribute.GenericPlaceholder*[]), + [CustomMarshaller(typeof(CustomMarshallerAttribute.GenericPlaceholder*[]), MarshalMode.Default, typeof(PointerArrayMarshaller<,>))] - [CustomMarshaller(typeof(CustomTypeMarshallerAttribute.GenericPlaceholder*[]), + [CustomMarshaller(typeof(CustomMarshallerAttribute.GenericPlaceholder*[]), MarshalMode.ManagedToUnmanagedIn, typeof(PointerArrayMarshaller<,>.ManagedToUnmanagedIn))] [ContiguousCollectionMarshaller] diff --git a/src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs b/src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs index c06eddc93684e..4983471346737 100644 --- a/src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs +++ b/src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs @@ -2146,14 +2146,14 @@ public ref struct ManagedToUnmanagedIn } } - [CLSCompliant(false)] - [CustomMarshaller(typeof(CustomTypeMarshallerAttribute.GenericPlaceholder[]), - MarshalMode.Default, - typeof(ArrayMarshaller<,>))] - [CustomMarshaller(typeof(CustomTypeMarshallerAttribute.GenericPlaceholder[]), - MarshalMode.ManagedToUnmanagedIn, - typeof(ArrayMarshaller<,>.ManagedToUnmanagedIn))] - [ContiguousCollectionMarshaller] + [System.CLSCompliant(false)] + [System.Runtime.InteropServices.Marshalling.CustomMarshallerAttribute(typeof(CustomMarshallerAttribute.GenericPlaceholder[]), + System.Runtime.InteropServices.Marshalling.MarshalMode.Default, + typeof(System.Runtime.InteropServices.Marshalling.ArrayMarshaller<,>))] + [System.Runtime.InteropServices.Marshalling.CustomMarshallerAttribute(typeof(CustomMarshallerAttribute.GenericPlaceholder[]), + System.Runtime.InteropServices.Marshalling.MarshalMode.ManagedToUnmanagedIn, + typeof(System.Runtime.InteropServices.Marshalling.ArrayMarshaller<,>.ManagedToUnmanagedIn))] + [System.Runtime.InteropServices.Marshalling.ContiguousCollectionMarshaller] public static unsafe class ArrayMarshaller where TUnmanagedElement : unmanaged { @@ -2283,14 +2283,14 @@ public sealed partial class NativeMarshallingAttribute : System.Attribute public NativeMarshallingAttribute(System.Type nativeType) { } public System.Type NativeType { get { throw null; } } } - [CLSCompliant(false)] - [CustomMarshaller(typeof(CustomTypeMarshallerAttribute.GenericPlaceholder*[]), - MarshalMode.Default, - typeof(PointerArrayMarshaller<,>))] - [CustomMarshaller(typeof(CustomTypeMarshallerAttribute.GenericPlaceholder*[]), - MarshalMode.ManagedToUnmanagedIn, - typeof(PointerArrayMarshaller<,>.ManagedToUnmanagedIn))] - [ContiguousCollectionMarshaller] + [System.CLSCompliant(false)] + [System.Runtime.InteropServices.Marshalling.CustomMarshallerAttribute(typeof(CustomMarshallerAttribute.GenericPlaceholder*[]), + System.Runtime.InteropServices.Marshalling.MarshalMode.Default, + typeof(System.Runtime.InteropServices.Marshalling.PointerArrayMarshaller<,>))] + [System.Runtime.InteropServices.Marshalling.CustomMarshallerAttribute(typeof(CustomMarshallerAttribute.GenericPlaceholder*[]), + System.Runtime.InteropServices.Marshalling.MarshalMode.ManagedToUnmanagedIn, + typeof(System.Runtime.InteropServices.Marshalling.PointerArrayMarshaller<,>.ManagedToUnmanagedIn))] + [System.Runtime.InteropServices.Marshalling.ContiguousCollectionMarshaller] public static unsafe class PointerArrayMarshaller where T : unmanaged where TUnmanagedElement : unmanaged