Update design and expose new attributes for the CustomTypeMarshaller support (#71682)

Author: jkoritzinsky

.editorconfig

@@ -154,9 +154,6 @@ csharp_space_between_square_brackets = false
 # License header
 file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.
 
-# Marshaller type must have CustomTypeMarshallerAttribute attribute
-dotnet_diagnostic.SYSLIB1056.severity = silent
-
 # C++ Files
 [*.{cpp,h,in}]
 curly_bracket_next_line = true

docs/design/libraries/LibraryImportGenerator/UserTypeMarshallingV2.md

@@ -69,8 +69,6 @@
     </PropertyGroup>
 
     <ItemGroup Condition="'$(NetCoreAppCurrentTargetFrameworkMoniker)' == '$(TargetFrameworkMoniker)' and '$(IncludeLibraryImportGeneratorSources)' != 'false'">
-      <Compile Include="$(LibrariesProjectRoot)System.Runtime.InteropServices/tests/Ancillary.Interop/CustomMarshallerAttribute.cs" />
-      <Compile Include="$(LibrariesProjectRoot)System.Runtime.InteropServices/tests/Ancillary.Interop/Scenario.cs" />
     </ItemGroup>
   </Target>
 

eng/generators.targets

@@ -49,7 +49,7 @@ internal struct SEC_WINNT_AUTH_IDENTITY_EX
         public int packageListLength;
 
 #if NET7_0_OR_GREATER
-        [CustomMarshaller(typeof(SEC_WINNT_AUTH_IDENTITY_EX), Scenario.ManagedToUnmanagedIn, typeof(Marshaller))]
+        [CustomMarshaller(typeof(SEC_WINNT_AUTH_IDENTITY_EX), MarshalMode.ManagedToUnmanagedIn, typeof(Marshaller))]
         internal static class Marshaller
         {
             public static Native ConvertToUnmanaged(SEC_WINNT_AUTH_IDENTITY_EX managed)

src/libraries/Common/src/Interop/Interop.Ldap.cs

@@ -40,7 +40,7 @@ internal struct CRYPTUI_VIEWCERTIFICATE_STRUCTW
             internal uint nStartPage;
 
 #if NET7_0_OR_GREATER
-            [CustomMarshaller(typeof(CRYPTUI_VIEWCERTIFICATE_STRUCTW), Scenario.Default, typeof(Marshaller))]
+            [CustomMarshaller(typeof(CRYPTUI_VIEWCERTIFICATE_STRUCTW), MarshalMode.Default, typeof(Marshaller))]
             public static class Marshaller
             {
                 public static Native ConvertToUnmanaged(CRYPTUI_VIEWCERTIFICATE_STRUCTW managed) => new(managed);
@@ -152,7 +152,7 @@ internal struct CRYPTUI_SELECTCERTIFICATE_STRUCTW
             internal IntPtr hSelectedCertStore;
 
 #if NET7_0_OR_GREATER
-            [CustomMarshaller(typeof(CRYPTUI_SELECTCERTIFICATE_STRUCTW), Scenario.Default, typeof(Marshaller))]
+            [CustomMarshaller(typeof(CRYPTUI_SELECTCERTIFICATE_STRUCTW), MarshalMode.Default, typeof(Marshaller))]
             public static class Marshaller
             {
                 public static Native ConvertToUnmanaged(CRYPTUI_SELECTCERTIFICATE_STRUCTW managed) => new(managed);

src/libraries/Common/src/Interop/Windows/CryptUI/Interop.CryptUIDlgCertificate.cs

@@ -56,7 +56,7 @@ public static partial bool WinHttpAddRequestHeaders(
             uint modifiers);
 
 #if NET7_0_OR_GREATER
-        [CustomMarshaller(typeof(StringBuilder), Scenario.ManagedToUnmanagedIn, typeof(SimpleStringBufferMarshaller))]
+        [CustomMarshaller(typeof(StringBuilder), MarshalMode.ManagedToUnmanagedIn, typeof(SimpleStringBufferMarshaller))]
         private static unsafe class SimpleStringBufferMarshaller
         {
             public static void* ConvertToUnmanaged(StringBuilder builder)

src/libraries/Common/src/Interop/Windows/WinHttp/Interop.winhttp.cs

@@ -262,7 +262,7 @@ public struct WINHTTP_AUTOPROXY_OPTIONS
             [MarshalAs(UnmanagedType.Bool)]
             public bool AutoLoginIfChallenged;
 #if NET7_0_OR_GREATER
-            [CustomMarshaller(typeof(WINHTTP_AUTOPROXY_OPTIONS), Scenario.Default, typeof(Marshaller))]
+            [CustomMarshaller(typeof(WINHTTP_AUTOPROXY_OPTIONS), MarshalMode.Default, typeof(Marshaller))]
             public static class Marshaller
             {
                 public static Native ConvertToUnmanaged(WINHTTP_AUTOPROXY_OPTIONS managed) => new(managed);

src/libraries/Common/src/Interop/Windows/WinHttp/Interop.winhttp_types.cs

@@ -28,7 +28,7 @@ internal struct WAVEOUTCAPS
             private ushort wReserved1;
             private ushort dwSupport;
 #if NET7_0_OR_GREATER
-            [CustomMarshaller(typeof(WAVEOUTCAPS), Scenario.Default, typeof(Marshaller))]
+            [CustomMarshaller(typeof(WAVEOUTCAPS), MarshalMode.Default, typeof(Marshaller))]
             public static class Marshaller
             {
                 public static Native ConvertToUnmanaged(WAVEOUTCAPS managed) => new(managed);

src/libraries/Common/src/Interop/Windows/WinMm/Interop.waveOutGetDevCaps.cs

@@ -75,7 +75,7 @@ internal struct IPv6MulticastRequest
             internal byte[] MulticastAddress; // IP address of group.
             internal int InterfaceIndex; // Local interface index.
 
-            [CustomMarshaller(typeof(IPv6MulticastRequest), Scenario.Default, typeof(Marshaller))]
+            [CustomMarshaller(typeof(IPv6MulticastRequest), MarshalMode.Default, typeof(Marshaller))]
             public static class Marshaller
             {
                 public static Native ConvertToUnmanaged(IPv6MulticastRequest managed) => new(managed);

src/libraries/Common/src/Interop/Windows/WinSock/Interop.WinsockBSD.cs

@@ -703,7 +703,7 @@ internal struct EvtStringVariant
             public uint Type;
 
 #if NET7_0_OR_GREATER
-            [CustomMarshaller(typeof(EvtStringVariant), Scenario.Default, typeof(Marshaller))]
+            [CustomMarshaller(typeof(EvtStringVariant), MarshalMode.Default, typeof(Marshaller))]
             public static class Marshaller
             {
                 public static Native ConvertToUnmanaged(EvtStringVariant managed) => new(managed);