Skip to content

Commit e32c6a6

Browse files
Merge pull request #12003 from dotnet/main
Merge main into live
2 parents ac08965 + ffb55e1 commit e32c6a6

File tree

6 files changed

+77
-128
lines changed

6 files changed

+77
-128
lines changed

xml/System.Net.Sockets/Socket.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8867,7 +8867,7 @@ If you're using a connectionless <xref:System.Net.Sockets.Socket>, <xref:System.
88678867
<Docs>
88688868
<param name="buffer">The buffer for the received data.</param>
88698869
<summary>Receives data from a connected socket.</summary>
8870-
<returns>A task that represents the asynchronous receive operation. The value of its <see cref="P:System.Threading.Tasks.Task`1.Result" /> property contains the total number of bytes read into <paramref name="buffer" /> between zero (0) and the number of bytes requested. The result value is zero (0) only if zero bytes were requested or if no more bytes are available because the peer socket performed a graceful shutdown. If zero bytes are requested, reeceive operations may complete immediately or may not complete until at least one byte is available (but without consuming any data).</returns>
8870+
<returns>A task that represents the asynchronous receive operation. The value of its <see cref="P:System.Threading.Tasks.Task`1.Result" /> property contains the total number of bytes read into <paramref name="buffer" /> between zero (0) and the number of bytes requested. The result value is zero (0) only if zero bytes were requested or if no more bytes are available because the peer socket performed a graceful shutdown. If zero bytes are requested, receive operations may complete immediately or may not complete until at least one byte is available (but without consuming any data).</returns>
88718871
<remarks>To be added.</remarks>
88728872
<exception cref="T:System.ObjectDisposedException">The <see cref="T:System.Net.Sockets.Socket" /> has been closed.</exception>
88738873
<exception cref="T:System.Net.Sockets.SocketException">An error occurred when attempting to access the socket.</exception>
@@ -8913,7 +8913,7 @@ If you're using a connectionless <xref:System.Net.Sockets.Socket>, <xref:System.
89138913
<Docs>
89148914
<param name="buffers">A list of buffers for the received data.</param>
89158915
<summary>Receives data from a connected socket.</summary>
8916-
<returns>A task that represents the asynchronous receive operation. The value of its <see cref="P:System.Threading.Tasks.Task`1.Result" /> property contains the total number of bytes read into the buffers between zero (0) and the number of bytes requested. The result value is zero (0) only if zero bytes were requested or if no more bytes are available because the peer socket performed a graceful shutdown. If zero bytes are requested, reeceive operations may complete immediately or may not complete until at least one byte is available (but without consuming any data).</returns>
8916+
<returns>A task that represents the asynchronous receive operation. The value of its <see cref="P:System.Threading.Tasks.Task`1.Result" /> property contains the total number of bytes read into the buffers between zero (0) and the number of bytes requested. The result value is zero (0) only if zero bytes were requested or if no more bytes are available because the peer socket performed a graceful shutdown. If zero bytes are requested, receive operations may complete immediately or may not complete until at least one byte is available (but without consuming any data).</returns>
89178917
<remarks>This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <see cref="T:System.ArgumentException" />, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <see cref="M:System.Net.Sockets.Socket.Receive(System.Collections.Generic.IList{System.ArraySegment{System.Byte}})" />.</remarks>
89188918
<exception cref="T:System.ArgumentNullException">The <paramref name="buffers" /> parameter was null.</exception>
89198919
<exception cref="T:System.ObjectDisposedException">The <see cref="T:System.Net.Sockets.Socket" /> has been closed.</exception>
@@ -9054,7 +9054,7 @@ If you're using a connectionless <xref:System.Net.Sockets.Socket>, <xref:System.
90549054
<param name="buffer">The buffer for the received data.</param>
90559055
<param name="socketFlags">A bitwise combination of SocketFlags values that will be used when receiving the data.</param>
90569056
<summary>Receives data from a connected socket.</summary>
9057-
<returns>A task that represents the asynchronous receive operation. The value of its <see cref="P:System.Threading.Tasks.Task`1.Result" /> property contains the total number of bytes read into <paramref name="buffer" /> between zero (0) and the number of bytes requested. The result value is zero (0) only if zero bytes were requested or if no more bytes are available because the peer socket performed a graceful shutdown. If zero bytes are requested, reeceive operations may complete immediately or may not complete until at least one byte is available (but without consuming any data).
9057+
<returns>A task that represents the asynchronous receive operation. The value of its <see cref="P:System.Threading.Tasks.Task`1.Result" /> property contains the total number of bytes read into <paramref name="buffer" /> between zero (0) and the number of bytes requested. The result value is zero (0) only if zero bytes were requested or if no more bytes are available because the peer socket performed a graceful shutdown. If zero bytes are requested, receive operations may complete immediately or may not complete until at least one byte is available (but without consuming any data).
90589058
</returns>
90599059
<remarks>To be added.</remarks>
90609060
<exception cref="T:System.ObjectDisposedException">The <see cref="T:System.Net.Sockets.Socket" /> has been closed.</exception>
@@ -9104,7 +9104,7 @@ If you're using a connectionless <xref:System.Net.Sockets.Socket>, <xref:System.
91049104
<param name="buffers">A list of buffers for the received data.</param>
91059105
<param name="socketFlags">A bitwise combination of SocketFlags values that will be used when receiving the data.</param>
91069106
<summary>Receives data from a connected socket.</summary>
9107-
<returns>A task that represents the asynchronous receive operation. The value of its <see cref="P:System.Threading.Tasks.Task`1.Result" /> property contains the total number of bytes read into <paramref name="buffer" /> between zero (0) and the number of bytes requested. The result value is zero (0) only if zero bytes were requested or if no more bytes are available because the peer socket performed a graceful shutdown. If zero bytes are requested, reeceive operations may complete immediately or may not complete until at least one byte is available (but without consuming any data).
9107+
<returns>A task that represents the asynchronous receive operation. The value of its <see cref="P:System.Threading.Tasks.Task`1.Result" /> property contains the total number of bytes read into <paramref name="buffer" /> between zero (0) and the number of bytes requested. The result value is zero (0) only if zero bytes were requested or if no more bytes are available because the peer socket performed a graceful shutdown. If zero bytes are requested, receive operations may complete immediately or may not complete until at least one byte is available (but without consuming any data).
91089108
</returns>
91099109
<remarks>This method stores in the task it returns all non-usage exceptions that the method's synchronous counterpart can throw. If an exception is stored into the returned task, that exception will be thrown when the task is awaited. Usage exceptions, such as <see cref="T:System.ArgumentException" />, are still thrown synchronously. For the stored exceptions, see the exceptions thrown by <see cref="M:System.Net.Sockets.Socket.Receive(System.Collections.Generic.IList{System.ArraySegment{System.Byte}},System.Net.Sockets.SocketFlags)" />.</remarks>
91109110
<exception cref="T:System.ArgumentNullException">The <paramref name="buffers" /> parameter was null.</exception>

xml/System.Runtime.InteropServices.ObjectiveC/ObjectiveCMarshal.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@
7272
7373
## Remarks
7474
75-
The Initialize() must be called prior to calling this function.
75+
The <xref:System.Runtime.InteropServices.ObjectiveC.ObjectiveCMarshal.Initialize*> function must be called prior to calling this function.
7676
77-
The `obj` must have a type in its hierarchy marked with
77+
The `obj` parameter must have a type in its hierarchy marked with
7878
<xref:System.Runtime.InteropServices.ObjectiveC.ObjectiveCTrackedTypeAttribute>.
7979
8080
The "Is Referenced" callback passed to Initialize()

0 commit comments

Comments
 (0)