Skip to content

Merge main into live #11925

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
Oct 13, 2025
Merged

Merge main into live #11925

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
e1c071e
Fix use of forInternalUseOnly in ExtensionMarkerAttribute (#11917)
ericstj Oct 10, 2025
9b4828c
Update System.Net.* APIs for .NET 10 (#11915)
CarnaViire Oct 10, 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
3 changes: 3 additions & 0 deletions xml/System.Net.Security/SslStream.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4410,6 +4410,7 @@ This property gets the cipher suite that is going to be used in the communicatio
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
<inheritdoc />
</Docs>
</Member>
<Member MemberName="Read">
Expand Down Expand Up @@ -5162,6 +5163,7 @@ If the property is accessed, the remote certificate will not be disposed when th
<param name="buffer">To be added.</param>
<summary>To be added.</summary>
<remarks>To be added.</remarks>
<inheritdoc />
</Docs>
</Member>
<Member MemberName="Write">
Expand Down Expand Up @@ -5385,6 +5387,7 @@ The <xref:System.Net.Security.SslStream> class does not support multiple simulta
<param name="value">To be added.</param>
<summary>To be added.</summary>
<remarks>To be added.</remarks>
<inheritdoc />
</Docs>
</Member>
<Member MemberName="WriteTimeout">
Expand Down
1 change: 1 addition & 0 deletions xml/System.Net.WebSockets/WebSocketStream.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
<inheritdoc />
</Docs>
</Member>
<Member MemberName="EndRead">
Expand Down
7 changes: 5 additions & 2 deletions xml/System.Net/IPAddress.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1606,7 +1606,8 @@
<Docs>
<param name="ipSpan">The text to parse.</param>
<summary>Determines whether the provided span contains a valid <see cref="T:System.Net.IPAddress" />.</summary>
<returns>To be added.</returns>
<returns>
<see langword="true" /> if <paramref name="ipSpan" /> contains a valid IP address; otherwise, <see langword="false" />.</returns>
<remarks>To be added.</remarks>
</Docs>
</Member>
Expand Down Expand Up @@ -1640,7 +1641,8 @@
<Docs>
<param name="utf8Text">The text to parse.</param>
<summary>Determines whether the provided span contains a valid <see cref="T:System.Net.IPAddress" />.</summary>
<returns>To be added.</returns>
<returns>
<see langword="true" /> if <paramref name="utf8Text" /> contains a valid IP address; otherwise, <see langword="false" />.</returns>
<remarks>To be added.</remarks>
</Docs>
</Member>
Expand Down Expand Up @@ -2774,6 +2776,7 @@ The scope identifier is &gt; 0x00000000FFFFFFFF</exception>
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
<inheritdoc />
</Docs>
</Member>
<Member MemberName="ToString">
Expand Down
1 change: 1 addition & 0 deletions xml/System.Net/IPNetwork.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,6 +717,7 @@
<summary>To be added.</summary>
<returns>To be added.</returns>
<remarks>To be added.</remarks>
<inheritdoc />
</Docs>
</Member>
<Member MemberName="ToString">
Expand Down
2 changes: 1 addition & 1 deletion xml/System.Runtime.CompilerServices/ExtensionMarkerAttribute.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
<Docs>
<summary>
<para>Represents an attribute that's used to mark extension members and associate them with a specific marker type (which provides detailed information about an extension block and its receiver parameter).</para>
<forInternalUseOnly />
</summary>
<remarks>To be added.</remarks>
<forInternalUseOnly />
</Docs>
<Members>
<Member MemberName=".ctor">
Expand Down