diff --git a/build/dependencies.props b/build/dependencies.props index 2f25755d73..87455c487f 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -6,52 +6,52 @@ 0.10.11 3.1.0 2.1.0-preview2-15726 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-a-preview2-clean-up-proto-abstractions-17574 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 0.5.0-preview2-30301 - 2.1.0-a-preview2-clean-up-proto-abstractions-17574 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-a-preview2-move-transfer-format-17581 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 0.5.0-preview2-30319 + 2.1.0-a-preview2-move-transfer-format-17581 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 4.5.0-preview2-26308-02 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 - 2.1.0-preview2-30301 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 + 2.1.0-preview2-30319 2.0.0 2.1.0-preview2-26308-01 15.6.0 diff --git a/samples/ClientSample/RawSample.cs b/samples/ClientSample/RawSample.cs index 571cfe1ec3..c4d8f614fb 100644 --- a/samples/ClientSample/RawSample.cs +++ b/samples/ClientSample/RawSample.cs @@ -8,6 +8,7 @@ using System.Net.Http; using System.Text; using System.Threading; using System.Threading.Tasks; +using Microsoft.AspNetCore.Protocols; using Microsoft.AspNetCore.Sockets; using Microsoft.AspNetCore.Sockets.Client; using Microsoft.Extensions.CommandLineUtils; diff --git a/samples/SocialWeather/PersistentConnectionLifeTimeManager.cs b/samples/SocialWeather/PersistentConnectionLifeTimeManager.cs index ef77fa9b4c..7924a6e61b 100644 --- a/samples/SocialWeather/PersistentConnectionLifeTimeManager.cs +++ b/samples/SocialWeather/PersistentConnectionLifeTimeManager.cs @@ -4,11 +4,10 @@ using System; using System.Collections.Generic; using System.IO; -using System.IO.Pipelines; using System.Threading.Tasks; using Microsoft.AspNetCore.Protocols; +using Microsoft.AspNetCore.Protocols.Features; using Microsoft.AspNetCore.Sockets; -using Microsoft.AspNetCore.Sockets.Features; namespace SocialWeather { diff --git a/samples/SocialWeather/SocialWeatherEndPoint.cs b/samples/SocialWeather/SocialWeatherEndPoint.cs index 192f6570b5..d8a4e1b80a 100644 --- a/samples/SocialWeather/SocialWeatherEndPoint.cs +++ b/samples/SocialWeather/SocialWeatherEndPoint.cs @@ -5,8 +5,8 @@ using System.Buffers; using System.IO; using System.Threading.Tasks; using Microsoft.AspNetCore.Protocols; +using Microsoft.AspNetCore.Protocols.Features; using Microsoft.AspNetCore.Sockets; -using Microsoft.AspNetCore.Sockets.Features; using Microsoft.Extensions.Logging; namespace SocialWeather diff --git a/samples/SocketsSample/EndPoints/MessagesEndPoint.cs b/samples/SocketsSample/EndPoints/MessagesEndPoint.cs index 411f6541ad..5546571b37 100644 --- a/samples/SocketsSample/EndPoints/MessagesEndPoint.cs +++ b/samples/SocketsSample/EndPoints/MessagesEndPoint.cs @@ -3,12 +3,11 @@ using System.Buffers; using System.Collections.Generic; -using System.IO.Pipelines; using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.Protocols; +using Microsoft.AspNetCore.Protocols.Features; using Microsoft.AspNetCore.Sockets; -using Microsoft.AspNetCore.Sockets.Features; namespace SocketsSample.EndPoints { diff --git a/src/Microsoft.AspNetCore.SignalR.Client.Core/HubConnection.cs b/src/Microsoft.AspNetCore.SignalR.Client.Core/HubConnection.cs index b78db1999f..5192ea5c6f 100644 --- a/src/Microsoft.AspNetCore.SignalR.Client.Core/HubConnection.cs +++ b/src/Microsoft.AspNetCore.SignalR.Client.Core/HubConnection.cs @@ -8,11 +8,10 @@ using System.IO; using System.Threading; using System.Threading.Channels; using System.Threading.Tasks; +using Microsoft.AspNetCore.Protocols.Features; using Microsoft.AspNetCore.SignalR.Internal; using Microsoft.AspNetCore.SignalR.Internal.Protocol; -using Microsoft.AspNetCore.Sockets; using Microsoft.AspNetCore.Sockets.Client; -using Microsoft.AspNetCore.Sockets.Features; using Microsoft.AspNetCore.Sockets.Internal; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; diff --git a/src/Microsoft.AspNetCore.SignalR.Common/Internal/Protocol/IHubProtocol.cs b/src/Microsoft.AspNetCore.SignalR.Common/Internal/Protocol/IHubProtocol.cs index 8456f368f8..f5651bfab0 100644 --- a/src/Microsoft.AspNetCore.SignalR.Common/Internal/Protocol/IHubProtocol.cs +++ b/src/Microsoft.AspNetCore.SignalR.Common/Internal/Protocol/IHubProtocol.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.IO; -using Microsoft.AspNetCore.Sockets; +using Microsoft.AspNetCore.Protocols; namespace Microsoft.AspNetCore.SignalR.Internal.Protocol { diff --git a/src/Microsoft.AspNetCore.SignalR.Common/Internal/Protocol/JsonHubProtocol.cs b/src/Microsoft.AspNetCore.SignalR.Common/Internal/Protocol/JsonHubProtocol.cs index 7f86de800d..d9c49a5d7c 100644 --- a/src/Microsoft.AspNetCore.SignalR.Common/Internal/Protocol/JsonHubProtocol.cs +++ b/src/Microsoft.AspNetCore.SignalR.Common/Internal/Protocol/JsonHubProtocol.cs @@ -6,8 +6,8 @@ using System.Collections.Generic; using System.IO; using System.Runtime.ExceptionServices; using System.Text; +using Microsoft.AspNetCore.Protocols; using Microsoft.AspNetCore.SignalR.Internal.Formatters; -using Microsoft.AspNetCore.Sockets; using Microsoft.Extensions.Options; using Newtonsoft.Json; using Newtonsoft.Json.Linq; diff --git a/src/Microsoft.AspNetCore.SignalR.Core/HubConnectionContext.cs b/src/Microsoft.AspNetCore.SignalR.Core/HubConnectionContext.cs index 25d5689f18..8ac0995832 100644 --- a/src/Microsoft.AspNetCore.SignalR.Core/HubConnectionContext.cs +++ b/src/Microsoft.AspNetCore.SignalR.Core/HubConnectionContext.cs @@ -14,10 +14,10 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Protocols; +using Microsoft.AspNetCore.Protocols.Features; using Microsoft.AspNetCore.SignalR.Core; using Microsoft.AspNetCore.SignalR.Internal; using Microsoft.AspNetCore.SignalR.Internal.Protocol; -using Microsoft.AspNetCore.Sockets.Features; using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.SignalR diff --git a/src/Microsoft.AspNetCore.SignalR.Protocols.MsgPack/Internal/Protocol/MessagePackHubProtocol.cs b/src/Microsoft.AspNetCore.SignalR.Protocols.MsgPack/Internal/Protocol/MessagePackHubProtocol.cs index 94370f1831..bf5c45f537 100644 --- a/src/Microsoft.AspNetCore.SignalR.Protocols.MsgPack/Internal/Protocol/MessagePackHubProtocol.cs +++ b/src/Microsoft.AspNetCore.SignalR.Protocols.MsgPack/Internal/Protocol/MessagePackHubProtocol.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Runtime.ExceptionServices; +using Microsoft.AspNetCore.Protocols; using Microsoft.AspNetCore.SignalR.Internal.Formatters; using Microsoft.AspNetCore.Sockets; using Microsoft.Extensions.Options; diff --git a/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/ConnectionInherentKeepAliveFeature.cs b/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/ConnectionInherentKeepAliveFeature.cs index 12c6fbe087..7de46e5385 100644 --- a/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/ConnectionInherentKeepAliveFeature.cs +++ b/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/ConnectionInherentKeepAliveFeature.cs @@ -3,9 +3,9 @@ using System; -namespace Microsoft.AspNetCore.Sockets.Features +namespace Microsoft.AspNetCore.Protocols.Features { - public class ConnectionInherentKeepAliveFeature : Microsoft.AspNetCore.Sockets.Features.IConnectionInherentKeepAliveFeature + public class ConnectionInherentKeepAliveFeature : IConnectionInherentKeepAliveFeature { public TimeSpan KeepAliveInterval { get; } diff --git a/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/IConnectionHeartbeatFeature.cs b/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/IConnectionHeartbeatFeature.cs deleted file mode 100644 index 016a63b869..0000000000 --- a/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/IConnectionHeartbeatFeature.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; - -namespace Microsoft.AspNetCore.Sockets.Features -{ - public interface IConnectionHeartbeatFeature - { - void OnHeartbeat(Action action, object state); - } -} diff --git a/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/IConnectionIdFeature.cs b/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/IConnectionIdFeature.cs deleted file mode 100644 index 5dccb32388..0000000000 --- a/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/IConnectionIdFeature.cs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Text; - -namespace Microsoft.AspNetCore.Sockets.Features -{ - public interface IConnectionIdFeature - { - string ConnectionId { get; set; } - } -} diff --git a/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/IConnectionInherentKeepAliveFeature.cs b/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/IConnectionInherentKeepAliveFeature.cs deleted file mode 100644 index b1f39bf567..0000000000 --- a/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/IConnectionInherentKeepAliveFeature.cs +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.Text; - -namespace Microsoft.AspNetCore.Sockets.Features -{ - /// - /// Indicates if the connection transport has an "inherent keep-alive", which means that the transport will automatically - /// inform the client that it is still present. - /// - /// - /// The most common example of this feature is the Long Polling HTTP transport, which must (due to HTTP limitations) terminate - /// each poll within a particular interval and return a signal indicating "the server is still here, but there is no data yet". - /// This feature allows applications to add keep-alive functionality, but limit it only to transports that don't have some kind - /// of inherent keep-alive. - /// - public interface IConnectionInherentKeepAliveFeature - { - TimeSpan KeepAliveInterval { get; } - } -} diff --git a/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/IConnectionMetadataFeature.cs b/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/IConnectionMetadataFeature.cs deleted file mode 100644 index 78b59cd668..0000000000 --- a/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/IConnectionMetadataFeature.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; - -namespace Microsoft.AspNetCore.Sockets.Features -{ - public interface IConnectionMetadataFeature - { - IDictionary Metadata { get; set; } - } -} diff --git a/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/IConnectionTransportFeature.cs b/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/IConnectionTransportFeature.cs deleted file mode 100644 index 58114d438e..0000000000 --- a/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/IConnectionTransportFeature.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.IO.Pipelines; - -namespace Microsoft.AspNetCore.Sockets.Features -{ - public interface IConnectionTransportFeature - { - IDuplexPipe Transport { get; set; } - } -} diff --git a/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/IConnectionUserFeature.cs b/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/IConnectionUserFeature.cs deleted file mode 100644 index 78fd8bd382..0000000000 --- a/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/IConnectionUserFeature.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.Security.Claims; - -namespace Microsoft.AspNetCore.Sockets.Features -{ - public interface IConnectionUserFeature - { - ClaimsPrincipal User { get; set; } - } -} diff --git a/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/ITransferFormatFeature.cs b/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/ITransferFormatFeature.cs deleted file mode 100644 index b6faf614fd..0000000000 --- a/src/Microsoft.AspNetCore.Sockets.Abstractions/Features/ITransferFormatFeature.cs +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -namespace Microsoft.AspNetCore.Sockets.Features -{ - public interface ITransferFormatFeature - { - TransferFormat SupportedFormats { get; } - TransferFormat ActiveFormat { get; set; } - } -} diff --git a/src/Microsoft.AspNetCore.Sockets.Abstractions/IConnection.cs b/src/Microsoft.AspNetCore.Sockets.Abstractions/IConnection.cs index 76b5100b6b..5f6a558f1a 100644 --- a/src/Microsoft.AspNetCore.Sockets.Abstractions/IConnection.cs +++ b/src/Microsoft.AspNetCore.Sockets.Abstractions/IConnection.cs @@ -5,6 +5,7 @@ using System; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Protocols; namespace Microsoft.AspNetCore.Sockets.Client { diff --git a/src/Microsoft.AspNetCore.Sockets.Abstractions/TransferFormat.cs b/src/Microsoft.AspNetCore.Sockets.Abstractions/TransferFormat.cs deleted file mode 100644 index cbec2913d3..0000000000 --- a/src/Microsoft.AspNetCore.Sockets.Abstractions/TransferFormat.cs +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; - -namespace Microsoft.AspNetCore.Sockets -{ - [Flags] - public enum TransferFormat - { - Binary = 0x01, - Text = 0x02 - } -} diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/HttpConnection.Log.cs b/src/Microsoft.AspNetCore.Sockets.Client.Http/HttpConnection.Log.cs index 223a7caa2f..0722372b07 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/HttpConnection.Log.cs +++ b/src/Microsoft.AspNetCore.Sockets.Client.Http/HttpConnection.Log.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using Microsoft.AspNetCore.Protocols; using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Sockets.Client diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/HttpConnection.cs b/src/Microsoft.AspNetCore.Sockets.Client.Http/HttpConnection.cs index e2600847e2..227c0e619f 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/HttpConnection.cs +++ b/src/Microsoft.AspNetCore.Sockets.Client.Http/HttpConnection.cs @@ -11,6 +11,7 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Protocols; using Microsoft.AspNetCore.Sockets.Client.Http; using Microsoft.AspNetCore.Sockets.Client.Internal; using Microsoft.AspNetCore.Sockets.Http.Internal; diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/ITransport.cs b/src/Microsoft.AspNetCore.Sockets.Client.Http/ITransport.cs index 3b2efd8aef..411a7d0925 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/ITransport.cs +++ b/src/Microsoft.AspNetCore.Sockets.Client.Http/ITransport.cs @@ -4,6 +4,7 @@ using System; using System.Threading.Tasks; using System.IO.Pipelines; +using Microsoft.AspNetCore.Protocols; namespace Microsoft.AspNetCore.Sockets.Client { diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/LongPollingTransport.Log.cs b/src/Microsoft.AspNetCore.Sockets.Client.Http/LongPollingTransport.Log.cs index 5eaaf9a369..1e333fdb32 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/LongPollingTransport.Log.cs +++ b/src/Microsoft.AspNetCore.Sockets.Client.Http/LongPollingTransport.Log.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using Microsoft.AspNetCore.Protocols; using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Sockets.Client diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/LongPollingTransport.cs b/src/Microsoft.AspNetCore.Sockets.Client.Http/LongPollingTransport.cs index aa64dd9d9d..d946f67704 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/LongPollingTransport.cs +++ b/src/Microsoft.AspNetCore.Sockets.Client.Http/LongPollingTransport.cs @@ -8,9 +8,10 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Sockets.Client.Http; -using Microsoft.AspNetCore.Sockets.Features; +using Microsoft.AspNetCore.Protocols.Features; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; +using Microsoft.AspNetCore.Protocols; namespace Microsoft.AspNetCore.Sockets.Client { diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/ServerSentEventsTransport.Log.cs b/src/Microsoft.AspNetCore.Sockets.Client.Http/ServerSentEventsTransport.Log.cs index 7cdfe06acb..416c92d8d7 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/ServerSentEventsTransport.Log.cs +++ b/src/Microsoft.AspNetCore.Sockets.Client.Http/ServerSentEventsTransport.Log.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using Microsoft.AspNetCore.Protocols; using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Sockets.Client diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/ServerSentEventsTransport.cs b/src/Microsoft.AspNetCore.Sockets.Client.Http/ServerSentEventsTransport.cs index 84ad6fac2e..f8784756e2 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/ServerSentEventsTransport.cs +++ b/src/Microsoft.AspNetCore.Sockets.Client.Http/ServerSentEventsTransport.cs @@ -7,6 +7,7 @@ using System.Net.Http; using System.Net.Http.Headers; using System.Threading; using System.Threading.Tasks; +using Microsoft.AspNetCore.Protocols; using Microsoft.AspNetCore.Sockets.Client.Http; using Microsoft.AspNetCore.Sockets.Internal.Formatters; using Microsoft.Extensions.Logging; diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/WebSocketsTransport.Log.cs b/src/Microsoft.AspNetCore.Sockets.Client.Http/WebSocketsTransport.Log.cs index 68f01dfecf..7b4b8adc88 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/WebSocketsTransport.Log.cs +++ b/src/Microsoft.AspNetCore.Sockets.Client.Http/WebSocketsTransport.Log.cs @@ -3,6 +3,7 @@ using System; using System.Net.WebSockets; +using Microsoft.AspNetCore.Protocols; using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Sockets.Client diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/WebSocketsTransport.cs b/src/Microsoft.AspNetCore.Sockets.Client.Http/WebSocketsTransport.cs index e8c30cb08f..8475dc7e23 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/WebSocketsTransport.cs +++ b/src/Microsoft.AspNetCore.Sockets.Client.Http/WebSocketsTransport.cs @@ -9,6 +9,7 @@ using System.Net.WebSockets; using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; +using Microsoft.AspNetCore.Protocols; using Microsoft.AspNetCore.Sockets.Client.Http; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; diff --git a/src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionDispatcher.cs b/src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionDispatcher.cs index 54bcd7d94b..a3c3396520 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionDispatcher.cs +++ b/src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionDispatcher.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Protocols; -using Microsoft.AspNetCore.Sockets.Features; +using Microsoft.AspNetCore.Protocols.Features; using Microsoft.AspNetCore.Sockets.Internal; using Microsoft.AspNetCore.Sockets.Internal.Transports; using Microsoft.Extensions.Logging; diff --git a/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/WebSocketsTransport.cs b/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/WebSocketsTransport.cs index db53e5cd9a..248c2993be 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/WebSocketsTransport.cs +++ b/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/WebSocketsTransport.cs @@ -9,6 +9,7 @@ using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Protocols; using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Sockets.Internal.Transports diff --git a/src/Microsoft.AspNetCore.Sockets/DefaultConnectionContext.cs b/src/Microsoft.AspNetCore.Sockets/DefaultConnectionContext.cs index 9a6614a958..1a79f5f059 100644 --- a/src/Microsoft.AspNetCore.Sockets/DefaultConnectionContext.cs +++ b/src/Microsoft.AspNetCore.Sockets/DefaultConnectionContext.cs @@ -9,7 +9,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Protocols; -using Microsoft.AspNetCore.Sockets.Features; +using Microsoft.AspNetCore.Protocols.Features; using Microsoft.Extensions.Internal; namespace Microsoft.AspNetCore.Sockets diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.AbortAsync.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.AbortAsync.cs index 54052ef59a..349d5db667 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.AbortAsync.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.AbortAsync.cs @@ -3,6 +3,7 @@ using System; using System.Threading.Tasks; +using Microsoft.AspNetCore.Protocols; using Microsoft.AspNetCore.Sockets; using Xunit; diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.ConnectionLifecycle.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.ConnectionLifecycle.cs index b5634b311f..db2cb3879b 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.ConnectionLifecycle.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.ConnectionLifecycle.cs @@ -6,6 +6,7 @@ using System.Net; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Client.Tests; +using Microsoft.AspNetCore.Protocols; using Microsoft.AspNetCore.Sockets; using Microsoft.AspNetCore.Sockets.Client; using Microsoft.Extensions.Logging.Testing; diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Negotiate.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Negotiate.cs index a654f64afc..5e04044fa5 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Negotiate.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Negotiate.cs @@ -5,6 +5,7 @@ using System; using System.Net; using System.Threading.Tasks; using Microsoft.AspNetCore.Client.Tests; +using Microsoft.AspNetCore.Protocols; using Microsoft.AspNetCore.Sockets; using Microsoft.AspNetCore.Sockets.Client; using Moq; diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.OnReceived.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.OnReceived.cs index da63760462..56b7b03fe3 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.OnReceived.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.OnReceived.cs @@ -6,6 +6,7 @@ using System.Net; using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.Client.Tests; +using Microsoft.AspNetCore.Protocols; using Microsoft.AspNetCore.Sockets; using Xunit; diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.SendAsync.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.SendAsync.cs index f3b51cb62f..a59fc103dd 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.SendAsync.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.SendAsync.cs @@ -6,6 +6,7 @@ using System.Net; using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Client.Tests; +using Microsoft.AspNetCore.Protocols; using Microsoft.AspNetCore.Sockets; using Xunit; diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.cs index 9286b372b0..9c76472215 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Collections.Generic; using System.IO.Pipelines; using System.Net; using System.Net.Http; @@ -10,10 +9,9 @@ using System.Security.Cryptography.X509Certificates; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Client.Tests; -using Microsoft.AspNetCore.Sockets; +using Microsoft.AspNetCore.Protocols; using Microsoft.AspNetCore.Sockets.Client; using Microsoft.AspNetCore.Sockets.Client.Http; -using Microsoft.AspNetCore.Sockets.Features; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; using Moq; diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HubConnectionTests.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HubConnectionTests.cs index 94ff151401..6d3428d120 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HubConnectionTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HubConnectionTests.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.IO; using System.Threading.Tasks; using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Protocols; using Microsoft.AspNetCore.SignalR.Internal; using Microsoft.AspNetCore.SignalR.Internal.Protocol; using Microsoft.AspNetCore.Sockets; diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/LongPollingTransportTests.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/LongPollingTransportTests.cs index a40aaecdba..2a76e1b37a 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/LongPollingTransportTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/LongPollingTransportTests.cs @@ -13,6 +13,7 @@ using System.Text; using System.Threading; using System.Threading.Channels; using System.Threading.Tasks; +using Microsoft.AspNetCore.Protocols; using Microsoft.AspNetCore.SignalR.Client.Tests; using Microsoft.AspNetCore.Sockets; using Microsoft.AspNetCore.Sockets.Client; diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/ResponseUtils.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/ResponseUtils.cs index b24c6ab104..5a3df4bed2 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/ResponseUtils.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/ResponseUtils.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Net; using System.Net.Http; +using Microsoft.AspNetCore.Protocols; using Microsoft.AspNetCore.Sockets; using Newtonsoft.Json; using SocketsTransportType = Microsoft.AspNetCore.Sockets.TransportType; diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/ServerSentEventsTransportTests.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/ServerSentEventsTransportTests.cs index ce8e0d012b..a4955dbf48 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/ServerSentEventsTransportTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/ServerSentEventsTransportTests.cs @@ -13,6 +13,7 @@ using System.Threading; using System.Threading.Channels; using System.Threading.Tasks; using Microsoft.AspNetCore.Client.Tests; +using Microsoft.AspNetCore.Protocols; using Microsoft.AspNetCore.Sockets; using Microsoft.AspNetCore.Sockets.Client; using Microsoft.AspNetCore.Sockets.Client.Http; diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/TestConnection.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/TestConnection.cs index 3caf22d4ec..9e9b512c90 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/TestConnection.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/TestConnection.cs @@ -6,14 +6,12 @@ using System.Collections.Generic; using System.IO; using System.Text; using System.Threading; -using System.Threading.Tasks; using System.Threading.Channels; +using System.Threading.Tasks; using Microsoft.AspNetCore.Http.Features; -using Microsoft.AspNetCore.SignalR.Internal; +using Microsoft.AspNetCore.Protocols; using Microsoft.AspNetCore.SignalR.Internal.Formatters; -using Microsoft.AspNetCore.Sockets; using Microsoft.AspNetCore.Sockets.Client; -using Microsoft.AspNetCore.Sockets.Features; using Newtonsoft.Json; namespace Microsoft.AspNetCore.SignalR.Client.Tests diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/TestTransport.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/TestTransport.cs index e5cc1d01fe..8e0c327771 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/TestTransport.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/TestTransport.cs @@ -1,6 +1,7 @@ using System; using System.IO.Pipelines; using System.Threading.Tasks; +using Microsoft.AspNetCore.Protocols; using Microsoft.AspNetCore.Sockets; using Microsoft.AspNetCore.Sockets.Client; diff --git a/test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs b/test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs index ee379186fe..4161572187 100644 --- a/test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs @@ -9,11 +9,11 @@ using System.Net.WebSockets; using System.Text; using System.Threading; using System.Threading.Tasks; +using Microsoft.AspNetCore.Protocols; using Microsoft.AspNetCore.SignalR.Client; using Microsoft.AspNetCore.Sockets; using Microsoft.AspNetCore.Sockets.Client; using Microsoft.AspNetCore.Sockets.Client.Http; -using Microsoft.AspNetCore.Sockets.Features; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.AspNetCore.WebUtilities; using Microsoft.Extensions.Logging; diff --git a/test/Microsoft.AspNetCore.SignalR.Tests/HubEndpointTests.cs b/test/Microsoft.AspNetCore.SignalR.Tests/HubEndpointTests.cs index 3901499ec4..785d620223 100644 --- a/test/Microsoft.AspNetCore.SignalR.Tests/HubEndpointTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Tests/HubEndpointTests.cs @@ -4,15 +4,14 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Runtime.Serialization; using System.Security.Claims; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Protocols; using Microsoft.AspNetCore.SignalR.Internal; using Microsoft.AspNetCore.SignalR.Internal.Protocol; using Microsoft.AspNetCore.SignalR.Tests.HubEndpointTestUtils; using Microsoft.AspNetCore.Sockets; -using Microsoft.AspNetCore.Sockets.Features; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Moq; diff --git a/test/Microsoft.AspNetCore.SignalR.Tests/WebSocketsTransportTests.cs b/test/Microsoft.AspNetCore.SignalR.Tests/WebSocketsTransportTests.cs index 7b39ba6c8e..7f9b589e79 100644 --- a/test/Microsoft.AspNetCore.SignalR.Tests/WebSocketsTransportTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Tests/WebSocketsTransportTests.cs @@ -13,6 +13,7 @@ using System.Reflection; using System.Security.Cryptography.X509Certificates; using System.Text; using System.Threading.Tasks; +using Microsoft.AspNetCore.Protocols; using Microsoft.AspNetCore.Sockets; using Microsoft.AspNetCore.Sockets.Client; using Microsoft.AspNetCore.Sockets.Client.Http; diff --git a/test/Microsoft.AspNetCore.Sockets.Tests/HttpConnectionDispatcherTests.cs b/test/Microsoft.AspNetCore.Sockets.Tests/HttpConnectionDispatcherTests.cs index ddc47335ca..71dcbec08c 100644 --- a/test/Microsoft.AspNetCore.Sockets.Tests/HttpConnectionDispatcherTests.cs +++ b/test/Microsoft.AspNetCore.Sockets.Tests/HttpConnectionDispatcherTests.cs @@ -17,7 +17,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Http.Internal; using Microsoft.AspNetCore.Protocols; -using Microsoft.AspNetCore.Sockets.Features; +using Microsoft.AspNetCore.Protocols.Features; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; diff --git a/test/Microsoft.AspNetCore.Sockets.Tests/WebSocketsTests.cs b/test/Microsoft.AspNetCore.Sockets.Tests/WebSocketsTests.cs index 35961acb85..63918075e3 100644 --- a/test/Microsoft.AspNetCore.Sockets.Tests/WebSocketsTests.cs +++ b/test/Microsoft.AspNetCore.Sockets.Tests/WebSocketsTests.cs @@ -8,8 +8,7 @@ using System.Net.WebSockets; using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Sockets.Features; -using Microsoft.AspNetCore.Sockets.Internal; +using Microsoft.AspNetCore.Protocols; using Microsoft.AspNetCore.Sockets.Internal.Transports; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing;