From f9529f00b93617dfbedcaf5dbb768e8cfdbf8940 Mon Sep 17 00:00:00 2001 From: David Fowler Date: Mon, 20 Feb 2017 00:31:06 -0800 Subject: [PATCH] Revert "React to CoreFxLab changes (#225)" This reverts commit 28455f647ec83e8dbb4ece16bb247f12b65df9e1. --- .../TextMessageFormatter.cs | 4 ++-- .../WebSocketCloseResult.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.AspNetCore.Sockets.Common/TextMessageFormatter.cs b/src/Microsoft.AspNetCore.Sockets.Common/TextMessageFormatter.cs index c401b3c845..bfa9e0bbba 100644 --- a/src/Microsoft.AspNetCore.Sockets.Common/TextMessageFormatter.cs +++ b/src/Microsoft.AspNetCore.Sockets.Common/TextMessageFormatter.cs @@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Sockets // Write the length as a string int written = 0; - if (!length.TryFormat(buffer, out int lengthLen, default(TextFormat), TextEncoder.Utf8)) + if (!length.TryFormat(buffer, out int lengthLen, default(TextFormat), EncodingData.InvariantUtf8)) { bytesWritten = 0; return false; @@ -106,7 +106,7 @@ namespace Microsoft.AspNetCore.Sockets buffer = buffer.Slice(colonIndex); // Parse the length - if (!PrimitiveParser.TryParseInt32(lengthSpan, out var length, out var consumedByLength, encoder: TextEncoder.Utf8) || consumedByLength < lengthSpan.Length) + if (!PrimitiveParser.TryParseInt32(lengthSpan, out var length, out var consumedByLength, encoding: EncodingData.InvariantUtf8) || consumedByLength < lengthSpan.Length) { message = default(Message); bytesConsumed = 0; diff --git a/src/Microsoft.Extensions.WebSockets.Internal/WebSocketCloseResult.cs b/src/Microsoft.Extensions.WebSockets.Internal/WebSocketCloseResult.cs index cffda13f7e..f01b2425a9 100644 --- a/src/Microsoft.Extensions.WebSockets.Internal/WebSocketCloseResult.cs +++ b/src/Microsoft.Extensions.WebSockets.Internal/WebSocketCloseResult.cs @@ -71,7 +71,7 @@ namespace Microsoft.Extensions.WebSockets.Internal buffer.WriteBigEndian((ushort)Status); if (!string.IsNullOrEmpty(Description)) { - buffer.Append(Description, TextEncoder.Utf8); + buffer.Append(Description, EncodingData.InvariantUtf8); } } }