Delete the V1 marshalling model

You served us well, but your time has passed.
dotnet · Jul 12, 2022 · 1ad0f2e · 1ad0f2e
1 parent f0fa20a
commit 1ad0f2e
Show file tree

Hide file tree

Showing 29 changed files with 115 additions and 5,560 deletions.
diff --git a/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems b/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
@@ -877,10 +877,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\Marshalling\BStrStringMarshaller.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\Marshalling\ContiguousCollectionMarshallerAttribute.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\Marshalling\CustomMarshallerAttribute.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\Marshalling\CustomTypeMarshallerAttribute.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\Marshalling\CustomTypeMarshallerDirection.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\Marshalling\CustomTypeMarshallerFeatures.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\Marshalling\CustomTypeMarshallerKind.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\Marshalling\MarshalMode.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\Marshalling\MarshalUsingAttribute.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Runtime\InteropServices\Marshalling\NativeMarshallingAttribute.cs" />

diff --git a/...e.CoreLib/src/System/Runtime/InteropServices/Marshalling/CustomTypeMarshallerAttribute.cs b/...e.CoreLib/src/System/Runtime/InteropServices/Marshalling/CustomTypeMarshallerAttribute.cs
diff --git a/...te.CoreLib/src/System/Runtime/InteropServices/Marshalling/CustomTypeMarshallerFeatures.cs b/...te.CoreLib/src/System/Runtime/InteropServices/Marshalling/CustomTypeMarshallerFeatures.cs
diff --git a/...rivate.CoreLib/src/System/Runtime/InteropServices/Marshalling/CustomTypeMarshallerKind.cs b/...rivate.CoreLib/src/System/Runtime/InteropServices/Marshalling/CustomTypeMarshallerKind.cs
diff --git a/...m.Private.CoreLib/src/System/Runtime/InteropServices/Marshalling/MarshalUsingAttribute.cs b/...m.Private.CoreLib/src/System/Runtime/InteropServices/Marshalling/MarshalUsingAttribute.cs
@@ -10,7 +10,7 @@ namespace System.Runtime.InteropServices.Marshalling
     /// This attribute is recognized by the runtime-provided source generators for source-generated interop scenarios.
     /// It is not used by the interop marshalling system at runtime.
     /// <seealso cref="LibraryImportAttribute"/>
-    /// <seealso cref="CustomTypeMarshallerAttribute" />
+    /// <seealso cref="CustomMarshallerAttribute" />
     /// </remarks>
     [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.ReturnValue, AllowMultiple = true)]
     public sealed class MarshalUsingAttribute : Attribute
@@ -26,15 +26,15 @@ public MarshalUsingAttribute()
         /// <summary>
         /// Create a <see cref="MarshalUsingAttribute" /> that provides a native marshalling type and optionally size information.
         /// </summary>
-        /// <param name="nativeType">The marshaller type used to convert the attributed type from managed to native code. This type must be attributed with <see cref="CustomTypeMarshallerAttribute" /></param>
+        /// <param name="nativeType">The marshaller type used to convert the attributed type from managed to native code. This type must be attributed with <see cref="CustomMarshallerAttribute" /></param>
         public MarshalUsingAttribute(Type nativeType)
             : this()
         {
             NativeType = nativeType;
         }
 
         /// <summary>
-        /// The marshaller type used to convert the attributed type from managed to native code. This type must be attributed with <see cref="CustomTypeMarshallerAttribute" />
+        /// The marshaller type used to convert the attributed type from managed to native code. This type must be attributed with <see cref="CustomMarshallerAttribute" />
         /// </summary>
         public Type? NativeType { get; }
 

diff --git a/...vate.CoreLib/src/System/Runtime/InteropServices/Marshalling/NativeMarshallingAttribute.cs b/...vate.CoreLib/src/System/Runtime/InteropServices/Marshalling/NativeMarshallingAttribute.cs
@@ -10,22 +10,22 @@ namespace System.Runtime.InteropServices.Marshalling
     /// This attribute is recognized by the runtime-provided source generators for source-generated interop scenarios.
     /// It is not used by the interop marshalling system at runtime.
     /// <seealso cref="LibraryImportAttribute"/>
-    /// <seealso cref="CustomTypeMarshallerAttribute" />
+    /// <seealso cref="CustomMarshallerAttribute" />
     /// </remarks>
     [AttributeUsage(AttributeTargets.Struct | AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Delegate)]
     public sealed class NativeMarshallingAttribute : Attribute
     {
         /// <summary>
         /// Create a <see cref="NativeMarshallingAttribute" /> that provides a native marshalling type.
         /// </summary>
-        /// <param name="nativeType">The marshaller type used to convert the attributed type from managed to native code. This type must be attributed with <see cref="CustomTypeMarshallerAttribute" /></param>
+        /// <param name="nativeType">The marshaller type used to convert the attributed type from managed to native code. This type must be attributed with <see cref="CustomMarshallerAttribute" /></param>
         public NativeMarshallingAttribute(Type nativeType)
         {
             NativeType = nativeType;
         }
 
         /// <summary>
-        /// The marshaller type used to convert the attributed type from managed to native code. This type must be attributed with <see cref="CustomTypeMarshallerAttribute" />
+        /// The marshaller type used to convert the attributed type from managed to native code. This type must be attributed with <see cref="CustomMarshallerAttribute" />
         /// </summary>
         public Type NativeType { get; }
     }