Skip to content

Commit 4816496

Browse files
committed
Add FrameworkAlternate for nint/IntPtr in Marshal
Use `nint`/`nuint` from .NET 7 to clarify intent; they became full aliases to `IntPtr`/`UIntPtr` from this version. Follow-up dotnet#11652
1 parent 369ed46 commit 4816496

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

xml/System.Runtime.InteropServices/Marshal.xml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -329,12 +329,13 @@
329329
</Docs>
330330
</Member>
331331
<Member MemberName="AllocHGlobal">
332-
<MemberSignature Language="C#" Value="public static IntPtr AllocHGlobal (nint cb);" />
332+
<MemberSignature Language="C#" Value="public static IntPtr AllocHGlobal (IntPtr cb);" FrameworkAlternate="dotnet-uwp-10.0;net-5.0;net-6.0;netcore-1.0;netcore-1.1;netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netcore-3.1;netframework-1.1;netframework-2.0;netframework-3.0;netframework-3.5;netframework-4.0;netframework-4.5;netframework-4.5.1;netframework-4.5.2;netframework-4.6;netframework-4.6.1;netframework-4.6.2;netframework-4.7;netframework-4.7.1;netframework-4.7.2;netframework-4.8;netframework-4.8.1;netstandard-1.0;netstandard-1.1;netstandard-1.2;netstandard-1.3;netstandard-1.4;netstandard-1.5;netstandard-1.6;netstandard-2.0;netstandard-2.1" />
333333
<MemberSignature Language="ILAsm" Value=".method public static hidebysig native int AllocHGlobal(native int cb) cil managed" />
334334
<MemberSignature Language="DocId" Value="M:System.Runtime.InteropServices.Marshal.AllocHGlobal(System.IntPtr)" />
335335
<MemberSignature Language="VB.NET" Value="Public Shared Function AllocHGlobal (cb As IntPtr) As IntPtr" />
336336
<MemberSignature Language="F#" Value="static member AllocHGlobal : nativeint -&gt; nativeint" Usage="System.Runtime.InteropServices.Marshal.AllocHGlobal cb" />
337337
<MemberSignature Language="C++ CLI" Value="public:&#xA; static IntPtr AllocHGlobal(IntPtr cb);" />
338+
<MemberSignature Language="C#" Value="public static IntPtr AllocHGlobal (nint cb);" FrameworkAlternate="net-10.0;net-7.0;net-8.0;net-9.0" />
338339
<MemberType>Method</MemberType>
339340
<AssemblyInfo>
340341
<AssemblyName>System.Runtime.InteropServices</AssemblyName>
@@ -9249,12 +9250,13 @@ On .NET 6 and later versions, this method is functionally equivalent to <xref:Sy
92499250
</Docs>
92509251
</MemberGroup>
92519252
<Member MemberName="ReadIntPtr">
9252-
<MemberSignature Language="C#" Value="public static nint ReadIntPtr (IntPtr ptr);" />
9253+
<MemberSignature Language="C#" Value="public static IntPtr ReadIntPtr (IntPtr ptr);" FrameworkAlternate="dotnet-uwp-10.0;net-5.0;net-6.0;netcore-1.0;netcore-1.1;netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netcore-3.1;netframework-1.1;netframework-2.0;netframework-3.0;netframework-3.5;netframework-4.0;netframework-4.5;netframework-4.5.1;netframework-4.5.2;netframework-4.6;netframework-4.6.1;netframework-4.6.2;netframework-4.7;netframework-4.7.1;netframework-4.7.2;netframework-4.8;netframework-4.8.1;netstandard-1.0;netstandard-1.1;netstandard-1.2;netstandard-1.3;netstandard-1.4;netstandard-1.5;netstandard-1.6;netstandard-2.0;netstandard-2.1" />
92539254
<MemberSignature Language="ILAsm" Value=".method public static hidebysig native int ReadIntPtr(native int ptr) cil managed" />
92549255
<MemberSignature Language="DocId" Value="M:System.Runtime.InteropServices.Marshal.ReadIntPtr(System.IntPtr)" />
92559256
<MemberSignature Language="VB.NET" Value="Public Shared Function ReadIntPtr (ptr As IntPtr) As IntPtr" />
92569257
<MemberSignature Language="F#" Value="static member ReadIntPtr : nativeint -&gt; nativeint" Usage="System.Runtime.InteropServices.Marshal.ReadIntPtr ptr" />
92579258
<MemberSignature Language="C++ CLI" Value="public:&#xA; static IntPtr ReadIntPtr(IntPtr ptr);" />
9259+
<MemberSignature Language="C#" Value="public static nint ReadIntPtr (IntPtr ptr);" FrameworkAlternate="net-10.0;net-7.0;net-8.0;net-9.0" />
92589260
<MemberType>Method</MemberType>
92599261
<AssemblyInfo>
92609262
<AssemblyName>System.Runtime.InteropServices</AssemblyName>
@@ -9337,12 +9339,13 @@ On .NET 6 and later versions, this method is functionally equivalent to <xref:Sy
93379339
</Docs>
93389340
</Member>
93399341
<Member MemberName="ReadIntPtr">
9340-
<MemberSignature Language="C#" Value="public static nint ReadIntPtr (IntPtr ptr, int ofs);" />
9342+
<MemberSignature Language="C#" Value="public static IntPtr ReadIntPtr (IntPtr ptr, int ofs);" FrameworkAlternate="dotnet-uwp-10.0;net-5.0;net-6.0;netcore-1.0;netcore-1.1;netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netcore-3.1;netframework-1.1;netframework-2.0;netframework-3.0;netframework-3.5;netframework-4.0;netframework-4.5;netframework-4.5.1;netframework-4.5.2;netframework-4.6;netframework-4.6.1;netframework-4.6.2;netframework-4.7;netframework-4.7.1;netframework-4.7.2;netframework-4.8;netframework-4.8.1;netstandard-1.0;netstandard-1.1;netstandard-1.2;netstandard-1.3;netstandard-1.4;netstandard-1.5;netstandard-1.6;netstandard-2.0;netstandard-2.1" />
93419343
<MemberSignature Language="ILAsm" Value=".method public static hidebysig native int ReadIntPtr(native int ptr, int32 ofs) cil managed" />
93429344
<MemberSignature Language="DocId" Value="M:System.Runtime.InteropServices.Marshal.ReadIntPtr(System.IntPtr,System.Int32)" />
93439345
<MemberSignature Language="VB.NET" Value="Public Shared Function ReadIntPtr (ptr As IntPtr, ofs As Integer) As IntPtr" />
93449346
<MemberSignature Language="F#" Value="static member ReadIntPtr : nativeint * int -&gt; nativeint" Usage="System.Runtime.InteropServices.Marshal.ReadIntPtr (ptr, ofs)" />
93459347
<MemberSignature Language="C++ CLI" Value="public:&#xA; static IntPtr ReadIntPtr(IntPtr ptr, int ofs);" />
9348+
<MemberSignature Language="C#" Value="public static nint ReadIntPtr (IntPtr ptr, int ofs);" FrameworkAlternate="net-10.0;net-7.0;net-8.0;net-9.0" />
93469349
<MemberType>Method</MemberType>
93479350
<AssemblyInfo>
93489351
<AssemblyName>System.Runtime.InteropServices</AssemblyName>
@@ -9419,13 +9422,14 @@ On .NET 6 and later versions, this method is functionally equivalent to <xref:Sy
94199422
</Docs>
94209423
</Member>
94219424
<Member MemberName="ReadIntPtr">
9422-
<MemberSignature Language="C#" Value="public static nint ReadIntPtr (object ptr, int ofs);" />
9425+
<MemberSignature Language="C#" Value="public static IntPtr ReadIntPtr (object ptr, int ofs);" FrameworkAlternate="dotnet-uwp-10.0;netcore-1.0;netcore-1.1;netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netcore-3.1;netframework-1.1;netframework-2.0;netframework-3.0;netframework-3.5;netframework-4.0;netframework-4.5;netframework-4.5.1;netframework-4.5.2;netframework-4.6;netframework-4.6.1;netframework-4.6.2;netframework-4.7;netframework-4.7.1;netframework-4.7.2;netframework-4.8;netframework-4.8.1;netstandard-1.1;netstandard-1.2;netstandard-1.3;netstandard-1.4;netstandard-1.5;netstandard-1.6;netstandard-2.0;netstandard-2.1" />
94239426
<MemberSignature Language="ILAsm" Value=".method public static hidebysig native int ReadIntPtr(object ptr, int32 ofs) cil managed" FrameworkAlternate="dotnet-uwp-10.0;net-10.0;net-5.0;net-6.0;net-7.0;net-8.0;net-9.0;netcore-1.0;netcore-1.1;netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netcore-3.1;netframework-4.6.2-pp;netframework-4.7.1-pp;netframework-4.7.2-pp;netframework-4.7-pp;netframework-4.8.1-pp;netframework-4.8-pp;netstandard-1.1;netstandard-1.2;netstandard-1.3;netstandard-1.4;netstandard-1.5;netstandard-1.6;netstandard-2.0;netstandard-2.1" />
94249427
<MemberSignature Language="DocId" Value="M:System.Runtime.InteropServices.Marshal.ReadIntPtr(System.Object,System.Int32)" />
94259428
<MemberSignature Language="VB.NET" Value="Public Shared Function ReadIntPtr (ptr As Object, ofs As Integer) As IntPtr" />
94269429
<MemberSignature Language="F#" Value="static member ReadIntPtr : obj * int -&gt; nativeint" Usage="System.Runtime.InteropServices.Marshal.ReadIntPtr (ptr, ofs)" />
94279430
<MemberSignature Language="C++ CLI" Value="public:&#xA; static IntPtr ReadIntPtr(System::Object ^ ptr, int ofs);" />
94289431
<MemberSignature Language="ILAsm" Value=".method public static hidebysig native int ReadIntPtr([in]object ptr, int32 ofs) cil managed" FrameworkAlternate="netframework-1.1;netframework-2.0;netframework-3.0;netframework-3.5;netframework-4.0;netframework-4.5;netframework-4.5.1;netframework-4.5.2;netframework-4.6;netframework-4.6.1;netframework-4.6.2;netframework-4.7;netframework-4.7.1;netframework-4.7.2;netframework-4.8;netframework-4.8.1" />
9432+
<MemberSignature Language="C#" Value="public static nint ReadIntPtr (object ptr, int ofs);" FrameworkAlternate="net-10.0;net-7.0;net-8.0;net-9.0" />
94299433
<MemberType>Method</MemberType>
94309434
<AssemblyInfo>
94319435
<AssemblyName>System.Runtime.InteropServices</AssemblyName>
@@ -9575,12 +9579,13 @@ On .NET 6 and later versions, this method is functionally equivalent to <xref:Sy
95759579
</Docs>
95769580
</Member>
95779581
<Member MemberName="ReAllocHGlobal">
9578-
<MemberSignature Language="C#" Value="public static IntPtr ReAllocHGlobal (IntPtr pv, nint cb);" />
9582+
<MemberSignature Language="C#" Value="public static IntPtr ReAllocHGlobal (IntPtr pv, IntPtr cb);" FrameworkAlternate="dotnet-uwp-10.0;net-5.0;net-6.0;netcore-1.0;netcore-1.1;netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netcore-3.1;netframework-1.1;netframework-2.0;netframework-3.0;netframework-3.5;netframework-4.0;netframework-4.5;netframework-4.5.1;netframework-4.5.2;netframework-4.6;netframework-4.6.1;netframework-4.6.2;netframework-4.7;netframework-4.7.1;netframework-4.7.2;netframework-4.8;netframework-4.8.1;netstandard-1.0;netstandard-1.1;netstandard-1.2;netstandard-1.3;netstandard-1.4;netstandard-1.5;netstandard-1.6;netstandard-2.0;netstandard-2.1" />
95799583
<MemberSignature Language="ILAsm" Value=".method public static hidebysig native int ReAllocHGlobal(native int pv, native int cb) cil managed" />
95809584
<MemberSignature Language="DocId" Value="M:System.Runtime.InteropServices.Marshal.ReAllocHGlobal(System.IntPtr,System.IntPtr)" />
95819585
<MemberSignature Language="VB.NET" Value="Public Shared Function ReAllocHGlobal (pv As IntPtr, cb As IntPtr) As IntPtr" />
95829586
<MemberSignature Language="F#" Value="static member ReAllocHGlobal : nativeint * nativeint -&gt; nativeint" Usage="System.Runtime.InteropServices.Marshal.ReAllocHGlobal (pv, cb)" />
95839587
<MemberSignature Language="C++ CLI" Value="public:&#xA; static IntPtr ReAllocHGlobal(IntPtr pv, IntPtr cb);" />
9588+
<MemberSignature Language="C#" Value="public static IntPtr ReAllocHGlobal (IntPtr pv, nint cb);" FrameworkAlternate="net-10.0;net-7.0;net-8.0;net-9.0" />
95849589
<MemberType>Method</MemberType>
95859590
<AssemblyInfo>
95869591
<AssemblyName>System.Runtime.InteropServices</AssemblyName>
@@ -13233,12 +13238,13 @@ public static void ThrowExceptionForHR(interrorCode,IntPtrerrorInfo)
1323313238
</Docs>
1323413239
</MemberGroup>
1323513240
<Member MemberName="WriteIntPtr">
13236-
<MemberSignature Language="C#" Value="public static void WriteIntPtr (IntPtr ptr, nint val);" />
13241+
<MemberSignature Language="C#" Value="public static void WriteIntPtr (IntPtr ptr, IntPtr val);" FrameworkAlternate="dotnet-uwp-10.0;net-5.0;net-6.0;netcore-1.0;netcore-1.1;netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netcore-3.1;netframework-1.1;netframework-2.0;netframework-3.0;netframework-3.5;netframework-4.0;netframework-4.5;netframework-4.5.1;netframework-4.5.2;netframework-4.6;netframework-4.6.1;netframework-4.6.2;netframework-4.7;netframework-4.7.1;netframework-4.7.2;netframework-4.8;netframework-4.8.1;netstandard-1.0;netstandard-1.1;netstandard-1.2;netstandard-1.3;netstandard-1.4;netstandard-1.5;netstandard-1.6;netstandard-2.0;netstandard-2.1" />
1323713242
<MemberSignature Language="ILAsm" Value=".method public static hidebysig void WriteIntPtr(native int ptr, native int val) cil managed" />
1323813243
<MemberSignature Language="DocId" Value="M:System.Runtime.InteropServices.Marshal.WriteIntPtr(System.IntPtr,System.IntPtr)" />
1323913244
<MemberSignature Language="VB.NET" Value="Public Shared Sub WriteIntPtr (ptr As IntPtr, val As IntPtr)" />
1324013245
<MemberSignature Language="F#" Value="static member WriteIntPtr : nativeint * nativeint -&gt; unit" Usage="System.Runtime.InteropServices.Marshal.WriteIntPtr (ptr, val)" />
1324113246
<MemberSignature Language="C++ CLI" Value="public:&#xA; static void WriteIntPtr(IntPtr ptr, IntPtr val);" />
13247+
<MemberSignature Language="C#" Value="public static void WriteIntPtr (IntPtr ptr, nint val);" FrameworkAlternate="net-10.0;net-7.0;net-8.0;net-9.0" />
1324213248
<MemberType>Method</MemberType>
1324313249
<AssemblyInfo>
1324413250
<AssemblyName>System.Runtime.InteropServices</AssemblyName>
@@ -13318,12 +13324,13 @@ public static void ThrowExceptionForHR(interrorCode,IntPtrerrorInfo)
1331813324
</Docs>
1331913325
</Member>
1332013326
<Member MemberName="WriteIntPtr">
13321-
<MemberSignature Language="C#" Value="public static void WriteIntPtr (IntPtr ptr, int ofs, nint val);" />
13327+
<MemberSignature Language="C#" Value="public static void WriteIntPtr (IntPtr ptr, int ofs, IntPtr val);" FrameworkAlternate="dotnet-uwp-10.0;net-5.0;net-6.0;netcore-1.0;netcore-1.1;netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netcore-3.1;netframework-1.1;netframework-2.0;netframework-3.0;netframework-3.5;netframework-4.0;netframework-4.5;netframework-4.5.1;netframework-4.5.2;netframework-4.6;netframework-4.6.1;netframework-4.6.2;netframework-4.7;netframework-4.7.1;netframework-4.7.2;netframework-4.8;netframework-4.8.1;netstandard-1.0;netstandard-1.1;netstandard-1.2;netstandard-1.3;netstandard-1.4;netstandard-1.5;netstandard-1.6;netstandard-2.0;netstandard-2.1" />
1332213328
<MemberSignature Language="ILAsm" Value=".method public static hidebysig void WriteIntPtr(native int ptr, int32 ofs, native int val) cil managed" />
1332313329
<MemberSignature Language="DocId" Value="M:System.Runtime.InteropServices.Marshal.WriteIntPtr(System.IntPtr,System.Int32,System.IntPtr)" />
1332413330
<MemberSignature Language="VB.NET" Value="Public Shared Sub WriteIntPtr (ptr As IntPtr, ofs As Integer, val As IntPtr)" />
1332513331
<MemberSignature Language="F#" Value="static member WriteIntPtr : nativeint * int * nativeint -&gt; unit" Usage="System.Runtime.InteropServices.Marshal.WriteIntPtr (ptr, ofs, val)" />
1332613332
<MemberSignature Language="C++ CLI" Value="public:&#xA; static void WriteIntPtr(IntPtr ptr, int ofs, IntPtr val);" />
13333+
<MemberSignature Language="C#" Value="public static void WriteIntPtr (IntPtr ptr, int ofs, nint val);" FrameworkAlternate="net-10.0;net-7.0;net-8.0;net-9.0" />
1332713334
<MemberType>Method</MemberType>
1332813335
<AssemblyInfo>
1332913336
<AssemblyName>System.Runtime.InteropServices</AssemblyName>
@@ -13399,13 +13406,14 @@ public static void ThrowExceptionForHR(interrorCode,IntPtrerrorInfo)
1339913406
</Docs>
1340013407
</Member>
1340113408
<Member MemberName="WriteIntPtr">
13402-
<MemberSignature Language="C#" Value="public static void WriteIntPtr (object ptr, int ofs, nint val);" />
13409+
<MemberSignature Language="C#" Value="public static void WriteIntPtr (object ptr, int ofs, IntPtr val);" FrameworkAlternate="dotnet-uwp-10.0;netcore-1.0;netcore-1.1;netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netcore-3.1;netframework-1.1;netframework-2.0;netframework-3.0;netframework-3.5;netframework-4.0;netframework-4.5;netframework-4.5.1;netframework-4.5.2;netframework-4.6;netframework-4.6.1;netframework-4.6.2;netframework-4.7;netframework-4.7.1;netframework-4.7.2;netframework-4.8;netframework-4.8.1;netstandard-1.1;netstandard-1.2;netstandard-1.3;netstandard-1.4;netstandard-1.5;netstandard-1.6;netstandard-2.0;netstandard-2.1" />
1340313410
<MemberSignature Language="ILAsm" Value=".method public static hidebysig void WriteIntPtr(object ptr, int32 ofs, native int val) cil managed" FrameworkAlternate="dotnet-uwp-10.0;net-10.0;net-5.0;net-6.0;net-7.0;net-8.0;net-9.0;netcore-1.0;netcore-1.1;netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netcore-3.1;netframework-4.6.2-pp;netframework-4.7.1-pp;netframework-4.7.2-pp;netframework-4.7-pp;netframework-4.8.1-pp;netframework-4.8-pp;netstandard-1.1;netstandard-1.2;netstandard-1.3;netstandard-1.4;netstandard-1.5;netstandard-1.6;netstandard-2.0;netstandard-2.1" />
1340413411
<MemberSignature Language="DocId" Value="M:System.Runtime.InteropServices.Marshal.WriteIntPtr(System.Object,System.Int32,System.IntPtr)" />
1340513412
<MemberSignature Language="VB.NET" Value="Public Shared Sub WriteIntPtr (ptr As Object, ofs As Integer, val As IntPtr)" />
1340613413
<MemberSignature Language="F#" Value="static member WriteIntPtr : obj * int * nativeint -&gt; unit" Usage="System.Runtime.InteropServices.Marshal.WriteIntPtr (ptr, ofs, val)" />
1340713414
<MemberSignature Language="C++ CLI" Value="public:&#xA; static void WriteIntPtr(System::Object ^ ptr, int ofs, IntPtr val);" />
1340813415
<MemberSignature Language="ILAsm" Value=".method public static hidebysig void WriteIntPtr([out] object ptr, int32 ofs, native int val) cil managed" FrameworkAlternate="netframework-1.1;netframework-2.0;netframework-3.0;netframework-3.5;netframework-4.0;netframework-4.5;netframework-4.5.1;netframework-4.5.2;netframework-4.6;netframework-4.6.1;netframework-4.6.2;netframework-4.7;netframework-4.7.1;netframework-4.7.2;netframework-4.8;netframework-4.8.1" />
13416+
<MemberSignature Language="C#" Value="public static void WriteIntPtr (object ptr, int ofs, nint val);" FrameworkAlternate="net-10.0;net-7.0;net-8.0;net-9.0" />
1340913417
<MemberType>Method</MemberType>
1341013418
<AssemblyInfo>
1341113419
<AssemblyName>System.Runtime.InteropServices</AssemblyName>

0 commit comments

Comments
 (0)