Skip to content

Commit ab452c0

Browse files
Merge pull request #11777 from dotnet/main
Merge main into live
2 parents 7bdbcbd + 9654822 commit ab452c0

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

xml/System.Runtime.InteropServices/DllImportAttribute.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
The <xref:System.Runtime.InteropServices.DllImportAttribute> attribute provides the information needed to call a function exported from an unmanaged DLL. As a minimum requirement, you must supply the name of the DLL containing the entry point.
7575
7676
You apply this attribute directly to C# method definitions; however, the Visual Basic compiler emits this attribute when you use the `Declare` statement. For complex method definitions that include <xref:System.Runtime.InteropServices.DllImportAttribute.BestFitMapping>, <xref:System.Runtime.InteropServices.DllImportAttribute.CallingConvention>, <xref:System.Runtime.InteropServices.DllImportAttribute.ExactSpelling>, <xref:System.Runtime.InteropServices.DllImportAttribute.PreserveSig>, <xref:System.Runtime.InteropServices.DllImportAttribute.SetLastError>, or <xref:System.Runtime.InteropServices.DllImportAttribute.ThrowOnUnmappableChar> fields, you apply this attribute directly to Visual Basic method definitions.
77-
77+
Consider using the <xref:System.Runtime.InteropServices.LibraryImportAttribute> attribute instead.
7878
> [!NOTE]
7979
> JScript does not support this attribute. You can use C# or Visual Basic wrapper classes to access unmanaged API methods from JScript programs.
8080

xml/System/String.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ The sum of <paramref name="startIndex" /> and <paramref name="length" /> is grea
633633
<Docs>
634634
<param name="value">A pointer to an array of 8-bit signed integers. The integers are interpreted using the current system code page encoding on Windows (referred to as CP_ACP) and as UTF-8 encoding on non-Windows.</param>
635635
<param name="startIndex">The starting position within <paramref name="value" />.</param>
636-
<param name="length">The number of characters within <paramref name="value" /> to use.</param>
636+
<param name="length">The number of sbytes within <paramref name="value" /> to use.</param>
637637
<summary>Initializes a new instance of the <see cref="T:System.String" /> class to the value indicated by a specified pointer to an array of 8-bit signed integers, a starting position within that array, and a length.</summary>
638638
<remarks>
639639
<format type="text/markdown"><![CDATA[
@@ -723,7 +723,7 @@ A new instance of <see cref="T:System.String" /> could not be initialized using
723723
<Docs>
724724
<param name="value">A pointer to an array of 8-bit signed integers.</param>
725725
<param name="startIndex">The starting position within <paramref name="value" />.</param>
726-
<param name="length">The number of characters within <paramref name="value" /> to use.</param>
726+
<param name="length">The number of sbytes within <paramref name="value" /> to use.</param>
727727
<param name="enc">An object that specifies how the array referenced by <paramref name="value" /> is encoded. If <paramref name="enc" /> is <see langword="null" />, ANSI encoding is assumed.</param>
728728
<summary>Initializes a new instance of the <see cref="T:System.String" /> class to the value indicated by a specified pointer to an array of 8-bit signed integers, a starting position within that array, a length, and an <see cref="T:System.Text.Encoding" /> object.</summary>
729729
<remarks>

0 commit comments

Comments
 (0)