Skip to content

Merging internal commits for release/8.0 #106356

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 8 commits into from
Aug 13, 2024
Merged

Merging internal commits for release/8.0 #106356

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
40a8492
Merge commit '4a37e7305c99720bb14e328353a33456c49cb652'
Jul 2, 2024
d48f712
Merge commit '1d8fcf1017d5c47233743470af1dc29382249fd0'
Jul 3, 2024
aa9fffc
Merge commit '2b93b01f11df2358ac8cc7b75d23e8494405255c'
Jul 9, 2024
76f50f6
[release/8.0] Add missing delegating/override method in TlsStream
rokonec Jul 12, 2024
c188d43
Merge commit 'd869bd0d366e2dc8daf13ddb29842467ff64a044'
Jul 12, 2024
509fea1
Merge commit 'fb323df64afbc798bf487d2af5a6e88a54de7dac'
Jul 16, 2024
08338fc
Merge commit '2d5c0b720cf0c7244996512dabcb504acdbaa221'
Jul 16, 2024
6bbdb7b
Merge commit '08338fcaa5c9b9a8190abb99222fed12aaba956c' into internal…
vseanreesermsft Aug 13, 2024
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
5 changes: 5 additions & 0 deletions src/libraries/Common/src/System/Net/TlsStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ public override Task WriteAsync(byte[] buffer, int offset, int count, Cancellati
return _sslStream.WriteAsync(buffer, offset, count, cancellationToken);
}

public override ValueTask WriteAsync(ReadOnlyMemory<byte> buffer, CancellationToken cancellationToken = default(CancellationToken))
{
return _sslStream.WriteAsync(buffer, cancellationToken);
}

public override int Read(byte[] buffer, int offset, int size)
{
return _sslStream.Read(buffer, offset, size);
Expand Down
Loading