Skip to content

Merge main into live #11777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 7, 2025
Merged

Merge main into live #11777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a397890
fix length description for string constructors with sbyte* (#11756)
StuartMosquera Sep 5, 2025
9654822
Recommend LibraryImportAttribute in DllImportAttribute docs (#11772)
AdmiralSnyder Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion xml/System.Runtime.InteropServices/DllImportAttribute.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
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.

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.

Consider using the <xref:System.Runtime.InteropServices.LibraryImportAttribute> attribute instead.
> [!NOTE]
> JScript does not support this attribute. You can use C# or Visual Basic wrapper classes to access unmanaged API methods from JScript programs.

Expand Down
4 changes: 2 additions & 2 deletions xml/System/String.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ The sum of <paramref name="startIndex" /> and <paramref name="length" /> is grea
<Docs>
<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>
<param name="startIndex">The starting position within <paramref name="value" />.</param>
<param name="length">The number of characters within <paramref name="value" /> to use.</param>
<param name="length">The number of sbytes within <paramref name="value" /> to use.</param>
<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>
<remarks>
<format type="text/markdown"><![CDATA[
Expand Down Expand Up @@ -723,7 +723,7 @@ A new instance of <see cref="T:System.String" /> could not be initialized using
<Docs>
<param name="value">A pointer to an array of 8-bit signed integers.</param>
<param name="startIndex">The starting position within <paramref name="value" />.</param>
<param name="length">The number of characters within <paramref name="value" /> to use.</param>
<param name="length">The number of sbytes within <paramref name="value" /> to use.</param>
<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>
<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>
<remarks>
Expand Down