Merge remote-tracking branch 'origin/v2.13' into v2.13-to-main

Author: AArnott

ext/MessagePack

@@ -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}");
             }
 
@@ -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)

src/Nerdbank.Streams/MultiplexingStream.Formatters.cs

@@ -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>