Skip to content

Merge v2.13 to main #1126

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
AArnott merged 3 commits into from
Jul 27, 2026
Merged

Merge v2.13 to main #1126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03f2bb9
Update messagepack submodule
AArnott Jul 27, 2026
5fe6220
Merge pull request #1125 from dotnet/updateMsgPack_v2.13
AArnott Jul 27, 2026
809c262
Merge remote-tracking branch 'origin/v2.13' into v2.13-to-main
AArnott Jul 27, 2026
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 ext/MessagePack
Open in desktop
Submodule MessagePack updated 419 files
6 changes: 3 additions & 3 deletions src/Nerdbank.Streams/MultiplexingStream.Formatters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ internal ReadOnlySequence<byte> SerializeException(Exception? exception)
}

// Get the exception message and return it as an exception.
string remoteErrorMsg = reader.ReadString();
string? remoteErrorMsg = reader.ReadString();
return new MultiplexingProtocolException($"Received error from remote side: {remoteErrorMsg}");
}

Expand Down Expand Up @@ -610,14 +610,14 @@ internal override Channel.OfferParameters DeserializeOfferParameters(ReadOnlySeq
throw new MultiplexingProtocolException("Insufficient elements in offer parameter payload.");
}

string name = reader.ReadString();
string? name = reader.ReadString();
long? remoteWindowSize = null;
if (elementsCount > 1)
{
remoteWindowSize = reader.ReadInt64();
}

return new Channel.OfferParameters(name, remoteWindowSize);
return new Channel.OfferParameters(name ?? string.Empty, remoteWindowSize);
}

internal override ReadOnlySequence<byte> Serialize(Channel.AcceptanceParameters acceptanceParameters)
Expand Down
2 changes: 1 addition & 1 deletion src/Nerdbank.Streams/Nerdbank.Streams.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFrameworks>net8.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<PackageValidationBaselineVersion>2.13.16</PackageValidationBaselineVersion>
<DefineConstants>$(DefineConstants);MESSAGEPACK_INTERNAL;CSHARP8</DefineConstants>
<DefineConstants>$(DefineConstants);MESSAGEPACK_INTERNAL</DefineConstants>

<Summary>Streams for full duplex in-proc communication, wrap a WebSocket, split a stream into multiple channels, etc.</Summary>
<Description>$(Summary)</Description>
Expand Down
Loading