diff --git a/SignalR.sln b/SignalR.sln index 04cc439a20..3a2b804d30 100644 --- a/SignalR.sln +++ b/SignalR.sln @@ -20,14 +20,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C4BC9889-B49F-41B6-806B-F84941B2549B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SocketsSample", "samples\SocketsSample\SocketsSample.csproj", "{C4AEAB04-F341-4539-B6C0-52368FB4BF9E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SignalRSamples", "samples\SignalRSamples\SignalRSamples.csproj", "{C4AEAB04-F341-4539-B6C0-52368FB4BF9E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6A35B453-52EC-48AF-89CA-D4A69800F131}" ProjectSection(SolutionItems) = preProject test\Directory.Build.props = test\Directory.Build.props EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Sockets.Tests", "test\Microsoft.AspNetCore.Sockets.Tests\Microsoft.AspNetCore.Sockets.Tests.csproj", "{AAD719D5-5E31-4ED1-A60F-6EB92EFA66D9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Connections.Tests", "test\Microsoft.AspNetCore.Http.Connections.Tests\Microsoft.AspNetCore.Http.Connections.Tests.csproj", "{AAD719D5-5E31-4ED1-A60F-6EB92EFA66D9}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Core", "src\Microsoft.AspNetCore.SignalR.Core\Microsoft.AspNetCore.SignalR.Core.csproj", "{42E76F87-92B6-45AB-BF07-6B811C0F2CAC}" EndProject @@ -57,15 +57,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Signal EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Common.Tests", "test\Microsoft.AspNetCore.SignalR.Common.Tests\Microsoft.AspNetCore.SignalR.Common.Tests.csproj", "{75E342F6-5445-4E7E-9143-6D9AE62C2B1E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Sockets.Abstractions", "src\Microsoft.AspNetCore.Sockets.Abstractions\Microsoft.AspNetCore.Sockets.Abstractions.csproj", "{F2E4FBD6-9AEA-4A82-BAC9-3FAACA677DF8}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR", "src\Microsoft.AspNetCore.SignalR\Microsoft.AspNetCore.SignalR.csproj", "{FD80BB0F-0876-4F11-8D84-6657C8EF84CA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Sockets.Http", "src\Microsoft.AspNetCore.Sockets.Http\Microsoft.AspNetCore.Sockets.Http.csproj", "{9E403E93-3284-486F-9A5F-1E15FCE426A5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Connections", "src\Microsoft.AspNetCore.Http.Connections\Microsoft.AspNetCore.Http.Connections.csproj", "{9E403E93-3284-486F-9A5F-1E15FCE426A5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Sockets.Client.Http", "src\Microsoft.AspNetCore.Sockets.Client.Http\Microsoft.AspNetCore.Sockets.Client.Http.csproj", "{B0243F99-2D3F-4CC6-AD71-E3F891B64724}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Connections.Client", "src\Microsoft.AspNetCore.Http.Connections.Client\Microsoft.AspNetCore.Http.Connections.Client.csproj", "{B0243F99-2D3F-4CC6-AD71-E3F891B64724}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Sockets.Common.Http", "src\Microsoft.AspNetCore.Sockets.Common.Http\Microsoft.AspNetCore.Sockets.Common.Http.csproj", "{E081EE41-D95F-4AD2-BC0B-4B562C0A2A47}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http.Connections.Common", "src\Microsoft.AspNetCore.Http.Connections.Common\Microsoft.AspNetCore.Http.Connections.Common.csproj", "{E081EE41-D95F-4AD2-BC0B-4B562C0A2A47}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{8A4582C8-DC59-4B61-BCE7-119FBAA99EFB}" EndProject @@ -87,7 +85,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Signal EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests", "clients\ts\FunctionalTests\FunctionalTests.csproj", "{D0C7B22E-B0B6-4D62-BF7D-79EE4AAF1981}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BenchmarkServer", "benchmarks\BenchmarkServer\BenchmarkServer.csproj", "{B5286020-C218-443C-91A9-B65751FB9B29}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BenchmarkServer", "benchmarks\BenchmarkServer\BenchmarkServer.csproj", "{B5286020-C218-443C-91A9-B65751FB9B29}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -155,10 +153,6 @@ Global {75E342F6-5445-4E7E-9143-6D9AE62C2B1E}.Debug|Any CPU.Build.0 = Debug|Any CPU {75E342F6-5445-4E7E-9143-6D9AE62C2B1E}.Release|Any CPU.ActiveCfg = Release|Any CPU {75E342F6-5445-4E7E-9143-6D9AE62C2B1E}.Release|Any CPU.Build.0 = Release|Any CPU - {F2E4FBD6-9AEA-4A82-BAC9-3FAACA677DF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F2E4FBD6-9AEA-4A82-BAC9-3FAACA677DF8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F2E4FBD6-9AEA-4A82-BAC9-3FAACA677DF8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F2E4FBD6-9AEA-4A82-BAC9-3FAACA677DF8}.Release|Any CPU.Build.0 = Release|Any CPU {FD80BB0F-0876-4F11-8D84-6657C8EF84CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FD80BB0F-0876-4F11-8D84-6657C8EF84CA}.Debug|Any CPU.Build.0 = Debug|Any CPU {FD80BB0F-0876-4F11-8D84-6657C8EF84CA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -235,7 +229,6 @@ Global {455B68D2-C5B6-4BF4-A685-964B07AFAAF8} = {6A35B453-52EC-48AF-89CA-D4A69800F131} {96771B3F-4D18-41A7-A75B-FF38E76AAC89} = {8A4582C8-DC59-4B61-BCE7-119FBAA99EFB} {75E342F6-5445-4E7E-9143-6D9AE62C2B1E} = {6A35B453-52EC-48AF-89CA-D4A69800F131} - {F2E4FBD6-9AEA-4A82-BAC9-3FAACA677DF8} = {DA69F624-5398-4884-87E4-B816698CDE65} {FD80BB0F-0876-4F11-8D84-6657C8EF84CA} = {DA69F624-5398-4884-87E4-B816698CDE65} {9E403E93-3284-486F-9A5F-1E15FCE426A5} = {DA69F624-5398-4884-87E4-B816698CDE65} {B0243F99-2D3F-4CC6-AD71-E3F891B64724} = {DA69F624-5398-4884-87E4-B816698CDE65} diff --git a/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/BroadcastBenchmark.cs b/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/BroadcastBenchmark.cs index 4e6f1afaf4..48e55e1ec8 100644 --- a/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/BroadcastBenchmark.cs +++ b/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/BroadcastBenchmark.cs @@ -4,14 +4,10 @@ using System; using System.IO.Pipelines; using System.Threading; -using System.Threading.Channels; using System.Threading.Tasks; using BenchmarkDotNet.Attributes; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.SignalR.Internal; using Microsoft.AspNetCore.SignalR.Internal.Protocol; -using Microsoft.AspNetCore.Sockets; -using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; namespace Microsoft.AspNetCore.SignalR.Microbenchmarks diff --git a/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/DefaultHubActivatorBenchmark.cs b/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/DefaultHubActivatorBenchmark.cs index 84a9b10b7e..d7c95f80f3 100644 --- a/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/DefaultHubActivatorBenchmark.cs +++ b/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/DefaultHubActivatorBenchmark.cs @@ -1,9 +1,6 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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; using BenchmarkDotNet.Attributes; using Microsoft.Extensions.DependencyInjection; diff --git a/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/DefaultHubDispatcherBenchmark.cs b/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/DefaultHubDispatcherBenchmark.cs index fecd94f8bd..237b86771d 100644 --- a/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/DefaultHubDispatcherBenchmark.cs +++ b/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/DefaultHubDispatcherBenchmark.cs @@ -3,7 +3,6 @@ using System; using System.Buffers; -using System.Collections.Generic; using System.IO; using System.IO.Pipelines; using System.Reactive.Linq; @@ -13,7 +12,6 @@ using BenchmarkDotNet.Attributes; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.SignalR.Internal; using Microsoft.AspNetCore.SignalR.Internal.Protocol; -using Microsoft.AspNetCore.Sockets; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; diff --git a/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/HubConnectionContextBenchmark.cs b/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/HubConnectionContextBenchmark.cs index 354e66d545..ba161e8096 100644 --- a/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/HubConnectionContextBenchmark.cs +++ b/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/HubConnectionContextBenchmark.cs @@ -4,21 +4,15 @@ using System; using System.Buffers; using System.Collections.Generic; -using System.IO; using System.IO.Pipelines; -using System.Text; using System.Threading; using System.Threading.Tasks; using BenchmarkDotNet.Attributes; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Http.Features; -using Microsoft.AspNetCore.SignalR.Client; using Microsoft.AspNetCore.SignalR.Core; using Microsoft.AspNetCore.SignalR.Internal; -using Microsoft.AspNetCore.SignalR.Internal.Formatters; using Microsoft.AspNetCore.SignalR.Internal.Protocol; using Microsoft.AspNetCore.SignalR.Microbenchmarks.Shared; -using Microsoft.AspNetCore.Sockets.Client; using Microsoft.Extensions.Logging.Abstractions; namespace Microsoft.AspNetCore.SignalR.Microbenchmarks @@ -92,4 +86,4 @@ namespace Microsoft.AspNetCore.SignalR.Microbenchmarks return _instance; } } -} \ No newline at end of file +} diff --git a/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/HubConnectionSendBenchmark.cs b/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/HubConnectionSendBenchmark.cs index 3be5712f02..fa0ff6a205 100644 --- a/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/HubConnectionSendBenchmark.cs +++ b/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/HubConnectionSendBenchmark.cs @@ -1,12 +1,8 @@ // 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.Buffers; -using System.Collections.Generic; -using System.IO; using System.IO.Pipelines; -using System.Threading; using System.Threading.Tasks; using BenchmarkDotNet.Attributes; using Microsoft.AspNetCore.Connections.Features; @@ -73,4 +69,4 @@ namespace Microsoft.AspNetCore.SignalR.Microbenchmarks return _hubConnection.SendAsync("Dummy", _arguments); } } -} \ No newline at end of file +} diff --git a/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/HubConnectionStartBenchmark.cs b/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/HubConnectionStartBenchmark.cs index bf5dcf2215..7a29f3635c 100644 --- a/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/HubConnectionStartBenchmark.cs +++ b/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/HubConnectionStartBenchmark.cs @@ -3,10 +3,7 @@ using System; using System.Buffers; -using System.Collections.Generic; -using System.IO; using System.IO.Pipelines; -using System.Threading; using System.Threading.Tasks; using BenchmarkDotNet.Attributes; using Microsoft.AspNetCore.Connections; @@ -16,7 +13,6 @@ using Microsoft.AspNetCore.SignalR.Client; using Microsoft.AspNetCore.SignalR.Internal; using Microsoft.AspNetCore.SignalR.Internal.Protocol; using Microsoft.AspNetCore.SignalR.Microbenchmarks.Shared; -using Microsoft.AspNetCore.Sockets.Client; using Microsoft.Extensions.Logging.Abstractions; namespace Microsoft.AspNetCore.SignalR.Microbenchmarks @@ -85,4 +81,4 @@ namespace Microsoft.AspNetCore.SignalR.Microbenchmarks public IFeatureCollection Features { get; } = new FeatureCollection(); } -} \ No newline at end of file +} diff --git a/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/HubProtocolBenchmark.cs b/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/HubProtocolBenchmark.cs index 07003d01c4..8647f62fdc 100644 --- a/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/HubProtocolBenchmark.cs +++ b/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/HubProtocolBenchmark.cs @@ -3,10 +3,7 @@ using System; using System.Buffers; -using System.Collections.Generic; -using System.IO; using BenchmarkDotNet.Attributes; -using Microsoft.AspNetCore.SignalR.Internal; using Microsoft.AspNetCore.SignalR.Internal.Protocol; namespace Microsoft.AspNetCore.SignalR.Microbenchmarks diff --git a/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/MessageParserBenchmark.cs b/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/MessageParserBenchmark.cs index a00ca8eba0..9d6ccc0c4d 100644 --- a/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/MessageParserBenchmark.cs +++ b/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/MessageParserBenchmark.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Buffers; using System.IO; using BenchmarkDotNet.Attributes; diff --git a/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/Shared/TestConnection.cs b/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/Shared/TestConnection.cs index ec141a2be3..1eb04e612b 100644 --- a/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/Shared/TestConnection.cs +++ b/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/Shared/TestConnection.cs @@ -3,7 +3,6 @@ using System.IO.Pipelines; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Http.Features; -using Microsoft.AspNetCore.Sockets.Client; namespace Microsoft.AspNetCore.SignalR.Microbenchmarks.Shared { @@ -28,4 +27,4 @@ namespace Microsoft.AspNetCore.SignalR.Microbenchmarks.Shared public IFeatureCollection Features { get; } = new FeatureCollection(); } -} \ No newline at end of file +} diff --git a/clients/ts/FunctionalTests/EchoConnectionHandler.cs b/clients/ts/FunctionalTests/EchoConnectionHandler.cs index 1dcf340e04..43ceb72e16 100644 --- a/clients/ts/FunctionalTests/EchoConnectionHandler.cs +++ b/clients/ts/FunctionalTests/EchoConnectionHandler.cs @@ -4,8 +4,6 @@ using System.Buffers; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Connections.Features; -using Microsoft.AspNetCore.Sockets; namespace FunctionalTests { diff --git a/clients/ts/FunctionalTests/FunctionalTests.csproj b/clients/ts/FunctionalTests/FunctionalTests.csproj index 250728200b..8dd6198af8 100644 --- a/clients/ts/FunctionalTests/FunctionalTests.csproj +++ b/clients/ts/FunctionalTests/FunctionalTests.csproj @@ -12,6 +12,7 @@ + @@ -44,6 +45,7 @@ + diff --git a/clients/ts/FunctionalTests/Startup.cs b/clients/ts/FunctionalTests/Startup.cs index 6c65dc518e..7b07fd5abc 100644 --- a/clients/ts/FunctionalTests/Startup.cs +++ b/clients/ts/FunctionalTests/Startup.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Sockets; +using Microsoft.AspNetCore.Http.Connections; using Microsoft.Extensions.DependencyInjection; using Microsoft.IdentityModel.Tokens; using Newtonsoft.Json.Serialization; diff --git a/clients/ts/FunctionalTests/TestHub.cs b/clients/ts/FunctionalTests/TestHub.cs index a963f66c07..8cb5b3c90f 100644 --- a/clients/ts/FunctionalTests/TestHub.cs +++ b/clients/ts/FunctionalTests/TestHub.cs @@ -4,8 +4,8 @@ using System; using System.Reactive.Linq; using System.Threading.Tasks; +using Microsoft.AspNetCore.Http.Connections; using Microsoft.AspNetCore.SignalR; -using Microsoft.AspNetCore.Sockets; namespace FunctionalTests { diff --git a/samples/ChatSample/InMemoryUserTracker.cs b/samples/ChatSample/InMemoryUserTracker.cs index 484186e47a..bb4a4c46a5 100644 --- a/samples/ChatSample/InMemoryUserTracker.cs +++ b/samples/ChatSample/InMemoryUserTracker.cs @@ -1,4 +1,7 @@ -using System; +// 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.Concurrent; using System.Collections.Generic; using System.Linq; diff --git a/samples/ClientSample/RawSample.cs b/samples/ClientSample/RawSample.cs index b72804e7a9..ca04f50caf 100644 --- a/samples/ClientSample/RawSample.cs +++ b/samples/ClientSample/RawSample.cs @@ -9,9 +9,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Sockets; -using Microsoft.AspNetCore.Sockets.Client; -using Microsoft.AspNetCore.Sockets.Client.Http; +using Microsoft.AspNetCore.Http.Connections.Client; using Microsoft.Extensions.CommandLineUtils; using Microsoft.Extensions.Logging; diff --git a/samples/JwtClientSample/Program.cs b/samples/JwtClientSample/Program.cs index a330cbe795..98225fef7c 100644 --- a/samples/JwtClientSample/Program.cs +++ b/samples/JwtClientSample/Program.cs @@ -1,9 +1,12 @@ -using System; +// 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.Concurrent; using System.Net.Http; using System.Threading.Tasks; +using Microsoft.AspNetCore.Http.Connections; using Microsoft.AspNetCore.SignalR.Client; -using Microsoft.AspNetCore.Sockets; namespace JwtClientSample { diff --git a/samples/SocketsSample/.gitignore b/samples/SignalRSamples/.gitignore similarity index 100% rename from samples/SocketsSample/.gitignore rename to samples/SignalRSamples/.gitignore diff --git a/samples/SocketsSample/ConnectionHandlers/MessagesConnectionHandler.cs b/samples/SignalRSamples/ConnectionHandlers/MessagesConnectionHandler.cs similarity index 94% rename from samples/SocketsSample/ConnectionHandlers/MessagesConnectionHandler.cs rename to samples/SignalRSamples/ConnectionHandlers/MessagesConnectionHandler.cs index 9a7b711116..4df01bfd5c 100644 --- a/samples/SocketsSample/ConnectionHandlers/MessagesConnectionHandler.cs +++ b/samples/SignalRSamples/ConnectionHandlers/MessagesConnectionHandler.cs @@ -6,10 +6,9 @@ using System.Collections.Generic; using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Connections.Features; -using Microsoft.AspNetCore.Sockets; +using Microsoft.AspNetCore.Http.Connections; -namespace SocketsSample.ConnectionHandlers +namespace SignalRSamples.ConnectionHandlers { public class MessagesConnectionHandler : ConnectionHandler { diff --git a/samples/SocketsSample/ConnectionList.cs b/samples/SignalRSamples/ConnectionList.cs similarity index 97% rename from samples/SocketsSample/ConnectionList.cs rename to samples/SignalRSamples/ConnectionList.cs index 7806439a33..995d57fab4 100644 --- a/samples/SocketsSample/ConnectionList.cs +++ b/samples/SignalRSamples/ConnectionList.cs @@ -7,7 +7,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using Microsoft.AspNetCore.Connections; -namespace Microsoft.AspNetCore.Sockets +namespace SignalRSamples { internal class ConnectionList : IReadOnlyCollection { diff --git a/samples/SocketsSample/Hubs/Chat.cs b/samples/SignalRSamples/Hubs/Chat.cs similarity index 97% rename from samples/SocketsSample/Hubs/Chat.cs rename to samples/SignalRSamples/Hubs/Chat.cs index 8804bbe197..373bfad78b 100644 --- a/samples/SocketsSample/Hubs/Chat.cs +++ b/samples/SignalRSamples/Hubs/Chat.cs @@ -3,10 +3,9 @@ using System; using System.Threading.Tasks; -using System.Collections.Generic; using Microsoft.AspNetCore.SignalR; -namespace SocketsSample.Hubs +namespace SignalRSamples.Hubs { public class Chat : Hub { diff --git a/samples/SocketsSample/Hubs/DynamicChat.cs b/samples/SignalRSamples/Hubs/DynamicChat.cs similarity index 95% rename from samples/SocketsSample/Hubs/DynamicChat.cs rename to samples/SignalRSamples/Hubs/DynamicChat.cs index e1b11956c8..c6d7a105d9 100644 --- a/samples/SocketsSample/Hubs/DynamicChat.cs +++ b/samples/SignalRSamples/Hubs/DynamicChat.cs @@ -1,11 +1,11 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Threading.Tasks; using Microsoft.AspNetCore.SignalR; -namespace SocketsSample.Hubs +namespace SignalRSamples.Hubs { public class DynamicChat : DynamicHub { diff --git a/samples/SocketsSample/Hubs/HubTChat.cs b/samples/SignalRSamples/Hubs/HubTChat.cs similarity index 95% rename from samples/SocketsSample/Hubs/HubTChat.cs rename to samples/SignalRSamples/Hubs/HubTChat.cs index b352bf7747..79bd59a2e3 100644 --- a/samples/SocketsSample/Hubs/HubTChat.cs +++ b/samples/SignalRSamples/Hubs/HubTChat.cs @@ -1,11 +1,11 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Threading.Tasks; using Microsoft.AspNetCore.SignalR; -namespace SocketsSample.Hubs +namespace SignalRSamples.Hubs { public class HubTChat : Hub { diff --git a/samples/SocketsSample/Hubs/Streaming.cs b/samples/SignalRSamples/Hubs/Streaming.cs similarity index 82% rename from samples/SocketsSample/Hubs/Streaming.cs rename to samples/SignalRSamples/Hubs/Streaming.cs index cee2c42cdf..00d81fba3d 100644 --- a/samples/SocketsSample/Hubs/Streaming.cs +++ b/samples/SignalRSamples/Hubs/Streaming.cs @@ -1,10 +1,13 @@ +// 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.Reactive.Linq; -using System.Threading.Tasks; using System.Threading.Channels; +using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; -namespace SocketsSample.Hubs +namespace SignalRSamples.Hubs { public class Streaming : Hub { diff --git a/samples/SocketsSample/Program.cs b/samples/SignalRSamples/Program.cs similarity index 93% rename from samples/SocketsSample/Program.cs rename to samples/SignalRSamples/Program.cs index 3aea9e8472..7b3cd23722 100644 --- a/samples/SocketsSample/Program.cs +++ b/samples/SignalRSamples/Program.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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; @@ -6,9 +6,9 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.SignalR; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -using SocketsSample.Hubs; +using SignalRSamples.Hubs; -namespace SocketsSample +namespace SignalRSamples { public class Program { diff --git a/samples/SocketsSample/SocketsSample.csproj b/samples/SignalRSamples/SignalRSamples.csproj similarity index 95% rename from samples/SocketsSample/SocketsSample.csproj rename to samples/SignalRSamples/SignalRSamples.csproj index abc4a6199f..1d087e50a0 100644 --- a/samples/SocketsSample/SocketsSample.csproj +++ b/samples/SignalRSamples/SignalRSamples.csproj @@ -9,7 +9,7 @@ - + diff --git a/samples/SocketsSample/Startup.cs b/samples/SignalRSamples/Startup.cs similarity index 93% rename from samples/SocketsSample/Startup.cs rename to samples/SignalRSamples/Startup.cs index 91e7023939..e1233d8732 100644 --- a/samples/SocketsSample/Startup.cs +++ b/samples/SignalRSamples/Startup.cs @@ -4,14 +4,12 @@ using System; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Sockets; using Microsoft.Extensions.DependencyInjection; using MsgPack.Serialization; -using SocketsSample.ConnectionHandlers; -using SocketsSample.Hubs; -using StackExchange.Redis; +using SignalRSamples.ConnectionHandlers; +using SignalRSamples.Hubs; -namespace SocketsSample +namespace SignalRSamples { public class Startup { diff --git a/samples/SocketsSample/web.config b/samples/SignalRSamples/web.config similarity index 100% rename from samples/SocketsSample/web.config rename to samples/SignalRSamples/web.config diff --git a/samples/SocketsSample/wwwroot/hubs.html b/samples/SignalRSamples/wwwroot/hubs.html similarity index 100% rename from samples/SocketsSample/wwwroot/hubs.html rename to samples/SignalRSamples/wwwroot/hubs.html diff --git a/samples/SocketsSample/wwwroot/index.html b/samples/SignalRSamples/wwwroot/index.html similarity index 100% rename from samples/SocketsSample/wwwroot/index.html rename to samples/SignalRSamples/wwwroot/index.html diff --git a/samples/SocketsSample/wwwroot/sockets.html b/samples/SignalRSamples/wwwroot/sockets.html similarity index 100% rename from samples/SocketsSample/wwwroot/sockets.html rename to samples/SignalRSamples/wwwroot/sockets.html diff --git a/samples/SocketsSample/wwwroot/streaming.html b/samples/SignalRSamples/wwwroot/streaming.html similarity index 100% rename from samples/SocketsSample/wwwroot/streaming.html rename to samples/SignalRSamples/wwwroot/streaming.html diff --git a/samples/SocketsSample/wwwroot/utils.js b/samples/SignalRSamples/wwwroot/utils.js similarity index 100% rename from samples/SocketsSample/wwwroot/utils.js rename to samples/SignalRSamples/wwwroot/utils.js diff --git a/samples/SocketsSample/wwwroot/ws.html b/samples/SignalRSamples/wwwroot/ws.html similarity index 100% rename from samples/SocketsSample/wwwroot/ws.html rename to samples/SignalRSamples/wwwroot/ws.html diff --git a/samples/SocialWeather/ConnectionList.cs b/samples/SocialWeather/ConnectionList.cs index 7806439a33..63d1d27c20 100644 --- a/samples/SocialWeather/ConnectionList.cs +++ b/samples/SocialWeather/ConnectionList.cs @@ -7,7 +7,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using Microsoft.AspNetCore.Connections; -namespace Microsoft.AspNetCore.Sockets +namespace SocialWeather { internal class ConnectionList : IReadOnlyCollection { diff --git a/samples/SocialWeather/PersistentConnectionLifeTimeManager.cs b/samples/SocialWeather/PersistentConnectionLifeTimeManager.cs index c95e16a738..68a97ae9fc 100644 --- a/samples/SocialWeather/PersistentConnectionLifeTimeManager.cs +++ b/samples/SocialWeather/PersistentConnectionLifeTimeManager.cs @@ -7,7 +7,7 @@ using System.IO; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Connections.Features; -using Microsoft.AspNetCore.Sockets; +using Microsoft.AspNetCore.Http.Connections; namespace SocialWeather { diff --git a/samples/SocialWeather/SocialWeather.csproj b/samples/SocialWeather/SocialWeather.csproj index 47fd2efb8f..1b6413a83c 100644 --- a/samples/SocialWeather/SocialWeather.csproj +++ b/samples/SocialWeather/SocialWeather.csproj @@ -7,7 +7,7 @@ - + diff --git a/samples/SocialWeather/SocialWeatherConnectionHandler.cs b/samples/SocialWeather/SocialWeatherConnectionHandler.cs index 42bf01052e..62dbce825a 100644 --- a/samples/SocialWeather/SocialWeatherConnectionHandler.cs +++ b/samples/SocialWeather/SocialWeatherConnectionHandler.cs @@ -5,8 +5,6 @@ using System.Buffers; using System.IO; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Connections.Features; -using Microsoft.AspNetCore.Sockets; using Microsoft.Extensions.Logging; namespace SocialWeather diff --git a/samples/SocketsSample/Properties/launchSettings.json b/samples/SocketsSample/Properties/launchSettings.json deleted file mode 100644 index 82c2318f07..0000000000 --- a/samples/SocketsSample/Properties/launchSettings.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:8718/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "SocketsSample": { - "commandName": "Project", - "launchBrowser": true, - "launchUrl": "http://localhost:5000", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} \ No newline at end of file diff --git a/src/Common/ForceAsyncAwaiter.cs b/src/Common/ForceAsyncAwaiter.cs index 4515637e59..8cf620333e 100644 --- a/src/Common/ForceAsyncAwaiter.cs +++ b/src/Common/ForceAsyncAwaiter.cs @@ -1,11 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Runtime.CompilerServices; -using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Sockets.Internal +namespace System.Threading.Tasks { internal static class ForceAsyncTaskExtensions { @@ -72,4 +71,4 @@ namespace Microsoft.AspNetCore.Sockets.Internal _task.ConfigureAwait(false).GetAwaiter().UnsafeOnCompleted(action); } } -} \ No newline at end of file +} diff --git a/src/Common/JsonUtils.cs b/src/Common/JsonUtils.cs index 98fb2199b4..97851fd8b1 100644 --- a/src/Common/JsonUtils.cs +++ b/src/Common/JsonUtils.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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; @@ -7,7 +7,7 @@ using System.IO; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace Microsoft.AspNetCore.SignalR.Internal +namespace Microsoft.AspNetCore.Internal { internal static class JsonUtils { @@ -174,4 +174,4 @@ namespace Microsoft.AspNetCore.SignalR.Internal } } } -} \ No newline at end of file +} diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/Constants.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/Constants.cs similarity index 84% rename from src/Microsoft.AspNetCore.Sockets.Client.Http/Constants.cs rename to src/Microsoft.AspNetCore.Http.Connections.Client/Constants.cs index ad61ab3f9e..3c6b80ffd0 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/Constants.cs +++ b/src/Microsoft.AspNetCore.Http.Connections.Client/Constants.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Diagnostics; @@ -6,7 +6,7 @@ using System.Linq; using System.Net.Http.Headers; using System.Reflection; -namespace Microsoft.AspNetCore.Sockets.Client.Http +namespace Microsoft.AspNetCore.Http.Connections.Client { public static class Constants { @@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Sockets.Client.Http static Constants() { - var userAgent = "Microsoft.AspNetCore.Sockets.Client.Http"; + var userAgent = "Microsoft.AspNetCore.Http.Connections.Client"; var assemblyVersion = typeof(Constants) .Assembly diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/DefaultTransportFactory.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/DefaultTransportFactory.cs similarity index 89% rename from src/Microsoft.AspNetCore.Sockets.Client.Http/DefaultTransportFactory.cs rename to src/Microsoft.AspNetCore.Http.Connections.Client/DefaultTransportFactory.cs index e91a9e965b..402aa7d607 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/DefaultTransportFactory.cs +++ b/src/Microsoft.AspNetCore.Http.Connections.Client/DefaultTransportFactory.cs @@ -1,13 +1,14 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Net.Http; -using Microsoft.AspNetCore.Sockets.Client.Http; -using Microsoft.AspNetCore.Sockets.Client.Internal; +using Microsoft.AspNetCore.Http.Connections.Client; +using Microsoft.AspNetCore.Http.Connections.Client.Internal; +using Microsoft.AspNetCore.Http.Connections.Internal; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Sockets.Client +namespace Microsoft.AspNetCore.Http.Connections.Client { public class DefaultTransportFactory : ITransportFactory { diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/HttpConnection.Log.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/HttpConnection.Log.cs similarity index 99% rename from src/Microsoft.AspNetCore.Sockets.Client.Http/HttpConnection.Log.cs rename to src/Microsoft.AspNetCore.Http.Connections.Client/HttpConnection.Log.cs index 814389dc74..4b53b50d2d 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/HttpConnection.Log.cs +++ b/src/Microsoft.AspNetCore.Http.Connections.Client/HttpConnection.Log.cs @@ -5,7 +5,7 @@ using System; using Microsoft.AspNetCore.Connections; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Sockets.Client.Http +namespace Microsoft.AspNetCore.Http.Connections.Client { public partial class HttpConnection { diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/HttpConnection.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/HttpConnection.cs similarity index 98% rename from src/Microsoft.AspNetCore.Sockets.Client.Http/HttpConnection.cs rename to src/Microsoft.AspNetCore.Http.Connections.Client/HttpConnection.cs index e8f98d49d9..e7c27a5146 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/HttpConnection.cs +++ b/src/Microsoft.AspNetCore.Http.Connections.Client/HttpConnection.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.IO; using System.IO.Pipelines; using System.Linq; using System.Net.Http; @@ -10,15 +9,13 @@ using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; +using Microsoft.AspNetCore.Http.Connections.Client.Internal; +using Microsoft.AspNetCore.Http.Connections.Internal; using Microsoft.AspNetCore.Http.Features; -using Microsoft.AspNetCore.Sockets.Client.Http.Internal; -using Microsoft.AspNetCore.Sockets.Http.Internal; -using Microsoft.AspNetCore.Sockets.Internal; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -using Newtonsoft.Json; -namespace Microsoft.AspNetCore.Sockets.Client.Http +namespace Microsoft.AspNetCore.Http.Connections.Client { public partial class HttpConnection : IConnection { diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/HttpOptions.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/HttpOptions.cs similarity index 96% rename from src/Microsoft.AspNetCore.Sockets.Client.Http/HttpOptions.cs rename to src/Microsoft.AspNetCore.Http.Connections.Client/HttpOptions.cs index 9eeac8276d..efa127f0be 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/HttpOptions.cs +++ b/src/Microsoft.AspNetCore.Http.Connections.Client/HttpOptions.cs @@ -8,7 +8,7 @@ using System.Net.Http; using System.Net.WebSockets; using System.Security.Cryptography.X509Certificates; -namespace Microsoft.AspNetCore.Sockets.Client.Http +namespace Microsoft.AspNetCore.Http.Connections.Client { public class HttpOptions { diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/ITransport.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/ITransport.cs similarity index 89% rename from src/Microsoft.AspNetCore.Sockets.Client.Http/ITransport.cs rename to src/Microsoft.AspNetCore.Http.Connections.Client/ITransport.cs index 9f6e3cfeb9..a86cc089fb 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/ITransport.cs +++ b/src/Microsoft.AspNetCore.Http.Connections.Client/ITransport.cs @@ -2,11 +2,11 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Threading.Tasks; using System.IO.Pipelines; +using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -namespace Microsoft.AspNetCore.Sockets.Client +namespace Microsoft.AspNetCore.Http.Connections.Client { public interface ITransport { diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/ITransportFactory.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/ITransportFactory.cs similarity index 69% rename from src/Microsoft.AspNetCore.Sockets.Client.Http/ITransportFactory.cs rename to src/Microsoft.AspNetCore.Http.Connections.Client/ITransportFactory.cs index f701951f67..847cf591f7 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/ITransportFactory.cs +++ b/src/Microsoft.AspNetCore.Http.Connections.Client/ITransportFactory.cs @@ -1,7 +1,7 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Client +namespace Microsoft.AspNetCore.Http.Connections.Client { public interface ITransportFactory { diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/ConnectionLogScope.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/ConnectionLogScope.cs similarity index 94% rename from src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/ConnectionLogScope.cs rename to src/Microsoft.AspNetCore.Http.Connections.Client/Internal/ConnectionLogScope.cs index cc040296b8..f2233f3f64 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/ConnectionLogScope.cs +++ b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/ConnectionLogScope.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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; @@ -6,7 +6,7 @@ using System.Collections; using System.Collections.Generic; using System.Globalization; -namespace Microsoft.AspNetCore.Sockets.Http.Internal +namespace Microsoft.AspNetCore.Http.Connections.Client.Internal { public class ConnectionLogScope : IReadOnlyList> { diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/LoggingHttpMessageHandler.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/LoggingHttpMessageHandler.cs similarity index 91% rename from src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/LoggingHttpMessageHandler.cs rename to src/Microsoft.AspNetCore.Http.Connections.Client/Internal/LoggingHttpMessageHandler.cs index 4528821cb4..360ea26cdf 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/LoggingHttpMessageHandler.cs +++ b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/LoggingHttpMessageHandler.cs @@ -1,17 +1,14 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Net; using System.Net.Http; -using System.Text; using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Logging.Abstractions; -namespace Microsoft.AspNetCore.Sockets.Client.Http.Internal +namespace Microsoft.AspNetCore.Http.Connections.Client.Internal { public class LoggingHttpMessageHandler : DelegatingHandler { diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/LongPollingTransport.Log.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/LongPollingTransport.Log.cs similarity index 98% rename from src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/LongPollingTransport.Log.cs rename to src/Microsoft.AspNetCore.Http.Connections.Client/Internal/LongPollingTransport.Log.cs index c41df896d6..3d71c82c2d 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/LongPollingTransport.Log.cs +++ b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/LongPollingTransport.Log.cs @@ -6,7 +6,7 @@ using System.Net.Http; using Microsoft.AspNetCore.Connections; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Sockets.Client.Internal +namespace Microsoft.AspNetCore.Http.Connections.Client.Internal { public partial class LongPollingTransport { diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/LongPollingTransport.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/LongPollingTransport.cs similarity index 98% rename from src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/LongPollingTransport.cs rename to src/Microsoft.AspNetCore.Http.Connections.Client/Internal/LongPollingTransport.cs index 3b2d533b67..6b993f2f03 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/LongPollingTransport.cs +++ b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/LongPollingTransport.cs @@ -7,13 +7,13 @@ using System.Net; using System.Net.Http; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Sockets.Client.Http; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Connections.Features; +using Microsoft.AspNetCore.Http.Connections.Features; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -using Microsoft.AspNetCore.Connections; -namespace Microsoft.AspNetCore.Sockets.Client.Internal +namespace Microsoft.AspNetCore.Http.Connections.Client.Internal { public partial class LongPollingTransport : ITransport { diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/ServerSentEventsMessageParser.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/ServerSentEventsMessageParser.cs similarity index 97% rename from src/Microsoft.AspNetCore.Sockets.Client.Http/ServerSentEventsMessageParser.cs rename to src/Microsoft.AspNetCore.Http.Connections.Client/Internal/ServerSentEventsMessageParser.cs index 2a150d2ff3..64fbba5914 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/ServerSentEventsMessageParser.cs +++ b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/ServerSentEventsMessageParser.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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; @@ -7,9 +7,9 @@ using System.Collections.Generic; using System.Runtime.CompilerServices; using System.Text; -namespace Microsoft.AspNetCore.Sockets.Internal.Formatters +namespace Microsoft.AspNetCore.Http.Connections.Client.Internal { - public class ServerSentEventsMessageParser + internal class ServerSentEventsMessageParser { private const byte ByteCR = (byte)'\r'; private const byte ByteLF = (byte)'\n'; diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/ServerSentEventsTransport.Log.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/ServerSentEventsTransport.Log.cs similarity index 98% rename from src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/ServerSentEventsTransport.Log.cs rename to src/Microsoft.AspNetCore.Http.Connections.Client/Internal/ServerSentEventsTransport.Log.cs index e644722362..03edd6c455 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/ServerSentEventsTransport.Log.cs +++ b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/ServerSentEventsTransport.Log.cs @@ -5,7 +5,7 @@ using System; using Microsoft.AspNetCore.Connections; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Sockets.Client.Internal +namespace Microsoft.AspNetCore.Http.Connections.Client.Internal { public partial class ServerSentEventsTransport { diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/ServerSentEventsTransport.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/ServerSentEventsTransport.cs similarity index 98% rename from src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/ServerSentEventsTransport.cs rename to src/Microsoft.AspNetCore.Http.Connections.Client/Internal/ServerSentEventsTransport.cs index 0d2b374408..fbfce76c27 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/ServerSentEventsTransport.cs +++ b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/ServerSentEventsTransport.cs @@ -8,12 +8,10 @@ using System.Net.Http.Headers; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Sockets.Client.Http; -using Microsoft.AspNetCore.Sockets.Internal.Formatters; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -namespace Microsoft.AspNetCore.Sockets.Client.Internal +namespace Microsoft.AspNetCore.Http.Connections.Client.Internal { public partial class ServerSentEventsTransport : ITransport { diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/StreamExtensions.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/StreamExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/StreamExtensions.cs rename to src/Microsoft.AspNetCore.Http.Connections.Client/Internal/StreamExtensions.cs diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/StreamPipeConnection.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/StreamPipeConnection.cs similarity index 100% rename from src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/StreamPipeConnection.cs rename to src/Microsoft.AspNetCore.Http.Connections.Client/Internal/StreamPipeConnection.cs diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/TaskExtensions.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/TaskExtensions.cs similarity index 82% rename from src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/TaskExtensions.cs rename to src/Microsoft.AspNetCore.Http.Connections.Client/Internal/TaskExtensions.cs index abd244c6bd..c79e2f66c4 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/TaskExtensions.cs +++ b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/TaskExtensions.cs @@ -1,13 +1,12 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Runtime.CompilerServices; -using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Sockets.Http.Internal +namespace System.Threading.Tasks { - public static class TaskExtensions + internal static class TaskExtensions { public static async Task NoThrow(this Task task) { @@ -26,4 +25,4 @@ namespace Microsoft.AspNetCore.Sockets.Http.Internal public void OnCompleted(Action continuation) => _task.GetAwaiter().OnCompleted(continuation); public void UnsafeOnCompleted(Action continuation) => OnCompleted(continuation); } -} \ No newline at end of file +} diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/WebSocketsTransport.Log.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/WebSocketsTransport.Log.cs similarity index 99% rename from src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/WebSocketsTransport.Log.cs rename to src/Microsoft.AspNetCore.Http.Connections.Client/Internal/WebSocketsTransport.Log.cs index 42fefbe8ba..13ce089d6c 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/WebSocketsTransport.Log.cs +++ b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/WebSocketsTransport.Log.cs @@ -6,7 +6,7 @@ using System.Net.WebSockets; using Microsoft.AspNetCore.Connections; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Sockets.Client.Internal +namespace Microsoft.AspNetCore.Http.Connections.Client.Internal { public partial class WebSocketsTransport { diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/WebSocketsTransport.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/WebSocketsTransport.cs similarity index 99% rename from src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/WebSocketsTransport.cs rename to src/Microsoft.AspNetCore.Http.Connections.Client/Internal/WebSocketsTransport.cs index f569625849..c04862a961 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/Internal/WebSocketsTransport.cs +++ b/src/Microsoft.AspNetCore.Http.Connections.Client/Internal/WebSocketsTransport.cs @@ -4,17 +4,15 @@ using System; using System.Diagnostics; using System.IO.Pipelines; -using System.Net; using System.Net.WebSockets; using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Sockets.Client.Http; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -namespace Microsoft.AspNetCore.Sockets.Client.Internal +namespace Microsoft.AspNetCore.Http.Connections.Client.Internal { public partial class WebSocketsTransport : ITransport { diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/Microsoft.AspNetCore.Sockets.Client.Http.csproj b/src/Microsoft.AspNetCore.Http.Connections.Client/Microsoft.AspNetCore.Http.Connections.Client.csproj similarity index 75% rename from src/Microsoft.AspNetCore.Sockets.Client.Http/Microsoft.AspNetCore.Sockets.Client.Http.csproj rename to src/Microsoft.AspNetCore.Http.Connections.Client/Microsoft.AspNetCore.Http.Connections.Client.csproj index 2a071e0bad..c7d10e7649 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/Microsoft.AspNetCore.Sockets.Client.Http.csproj +++ b/src/Microsoft.AspNetCore.Http.Connections.Client/Microsoft.AspNetCore.Http.Connections.Client.csproj @@ -1,7 +1,7 @@  - Client for ASP.NET Core SignalR + Client for ASP.NET Core Connection Handlers netstandard2.0;netcoreapp2.1 @@ -14,8 +14,7 @@ - - + diff --git a/src/Microsoft.AspNetCore.Http.Connections.Client/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..8bc7094d90 --- /dev/null +++ b/src/Microsoft.AspNetCore.Http.Connections.Client/Properties/AssemblyInfo.cs @@ -0,0 +1,6 @@ +// 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.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.SignalR.Client.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/SendUtils.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/SendUtils.cs similarity index 98% rename from src/Microsoft.AspNetCore.Sockets.Client.Http/SendUtils.cs rename to src/Microsoft.AspNetCore.Http.Connections.Client/SendUtils.cs index f6e3f24f35..84da797562 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/SendUtils.cs +++ b/src/Microsoft.AspNetCore.Http.Connections.Client/SendUtils.cs @@ -9,10 +9,9 @@ using System.Net; using System.Net.Http; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Sockets.Client.Http; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Sockets.Client +namespace Microsoft.AspNetCore.Http.Connections.Client { internal static class SendUtils { diff --git a/src/Microsoft.AspNetCore.Sockets.Client.Http/Utils.cs b/src/Microsoft.AspNetCore.Http.Connections.Client/Utils.cs similarity index 91% rename from src/Microsoft.AspNetCore.Sockets.Client.Http/Utils.cs rename to src/Microsoft.AspNetCore.Http.Connections.Client/Utils.cs index 71280862a1..385ccf145e 100644 --- a/src/Microsoft.AspNetCore.Sockets.Client.Http/Utils.cs +++ b/src/Microsoft.AspNetCore.Http.Connections.Client/Utils.cs @@ -1,9 +1,9 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Client +namespace Microsoft.AspNetCore.Http.Connections.Client { internal static class Utils { diff --git a/src/Microsoft.AspNetCore.Sockets.Common.Http/ConnectionInherentKeepAliveFeature.cs b/src/Microsoft.AspNetCore.Http.Connections.Common/ConnectionInherentKeepAliveFeature.cs similarity index 82% rename from src/Microsoft.AspNetCore.Sockets.Common.Http/ConnectionInherentKeepAliveFeature.cs rename to src/Microsoft.AspNetCore.Http.Connections.Common/ConnectionInherentKeepAliveFeature.cs index c5785c3450..72f6d547c6 100644 --- a/src/Microsoft.AspNetCore.Sockets.Common.Http/ConnectionInherentKeepAliveFeature.cs +++ b/src/Microsoft.AspNetCore.Http.Connections.Common/ConnectionInherentKeepAliveFeature.cs @@ -2,8 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using Microsoft.AspNetCore.Connections.Features; -namespace Microsoft.AspNetCore.Connections.Features +namespace Microsoft.AspNetCore.Http.Connections.Features { public class ConnectionInherentKeepAliveFeature : IConnectionInherentKeepAliveFeature { diff --git a/src/Microsoft.AspNetCore.Sockets.Common.Http/Internal/AvailableTransport.cs b/src/Microsoft.AspNetCore.Http.Connections.Common/Internal/AvailableTransport.cs similarity index 72% rename from src/Microsoft.AspNetCore.Sockets.Common.Http/Internal/AvailableTransport.cs rename to src/Microsoft.AspNetCore.Http.Connections.Common/Internal/AvailableTransport.cs index 055688d1e8..62e68b0ca3 100644 --- a/src/Microsoft.AspNetCore.Sockets.Common.Http/Internal/AvailableTransport.cs +++ b/src/Microsoft.AspNetCore.Http.Connections.Common/Internal/AvailableTransport.cs @@ -1,13 +1,13 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Collections.Generic; -namespace Microsoft.AspNetCore.Sockets.Internal +namespace Microsoft.AspNetCore.Http.Connections.Internal { public class AvailableTransport { public string Transport { get; set; } public List TransferFormats { get; set; } } -} \ No newline at end of file +} diff --git a/src/Microsoft.AspNetCore.Sockets.Common.Http/Internal/NegotiateProtocol.cs b/src/Microsoft.AspNetCore.Http.Connections.Common/Internal/NegotiateProtocol.cs similarity index 98% rename from src/Microsoft.AspNetCore.Sockets.Common.Http/Internal/NegotiateProtocol.cs rename to src/Microsoft.AspNetCore.Http.Connections.Common/Internal/NegotiateProtocol.cs index 87f6a337ab..a8ba5e66fa 100644 --- a/src/Microsoft.AspNetCore.Sockets.Common.Http/Internal/NegotiateProtocol.cs +++ b/src/Microsoft.AspNetCore.Http.Connections.Common/Internal/NegotiateProtocol.cs @@ -1,14 +1,14 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.IO; using System.Text; -using Microsoft.AspNetCore.SignalR.Internal; +using Microsoft.AspNetCore.Internal; using Newtonsoft.Json; -namespace Microsoft.AspNetCore.Sockets.Internal +namespace Microsoft.AspNetCore.Http.Connections.Internal { public static class NegotiateProtocol { @@ -193,4 +193,4 @@ namespace Microsoft.AspNetCore.Sockets.Internal throw new InvalidDataException("Unexpected end when reading JSON."); } } -} \ No newline at end of file +} diff --git a/src/Microsoft.AspNetCore.Sockets.Common.Http/Internal/NegotiationResponse.cs b/src/Microsoft.AspNetCore.Http.Connections.Common/Internal/NegotiationResponse.cs similarity index 86% rename from src/Microsoft.AspNetCore.Sockets.Common.Http/Internal/NegotiationResponse.cs rename to src/Microsoft.AspNetCore.Http.Connections.Common/Internal/NegotiationResponse.cs index 11552c2e70..528ea3cca0 100644 --- a/src/Microsoft.AspNetCore.Sockets.Common.Http/Internal/NegotiationResponse.cs +++ b/src/Microsoft.AspNetCore.Http.Connections.Common/Internal/NegotiationResponse.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.AspNetCore.Sockets.Internal +namespace Microsoft.AspNetCore.Http.Connections.Internal { public class NegotiationResponse { diff --git a/src/Microsoft.AspNetCore.Sockets.Common.Http/Microsoft.AspNetCore.Sockets.Common.Http.csproj b/src/Microsoft.AspNetCore.Http.Connections.Common/Microsoft.AspNetCore.Http.Connections.Common.csproj similarity index 78% rename from src/Microsoft.AspNetCore.Sockets.Common.Http/Microsoft.AspNetCore.Sockets.Common.Http.csproj rename to src/Microsoft.AspNetCore.Http.Connections.Common/Microsoft.AspNetCore.Http.Connections.Common.csproj index 19b4144274..8eec6602bc 100644 --- a/src/Microsoft.AspNetCore.Sockets.Common.Http/Microsoft.AspNetCore.Sockets.Common.Http.csproj +++ b/src/Microsoft.AspNetCore.Http.Connections.Common/Microsoft.AspNetCore.Http.Connections.Common.csproj @@ -1,9 +1,9 @@  - Common primitives for Sockets clients and servers + Common primitives for ASP.NET Connection Handlers and clients netstandard2.0 - Microsoft.AspNetCore.Sockets + Microsoft.AspNetCore.Http.Connections diff --git a/src/Microsoft.AspNetCore.Sockets.Common.Http/TransportType.cs b/src/Microsoft.AspNetCore.Http.Connections.Common/TransportType.cs similarity index 75% rename from src/Microsoft.AspNetCore.Sockets.Common.Http/TransportType.cs rename to src/Microsoft.AspNetCore.Http.Connections.Common/TransportType.cs index 7b95904de0..e6de2955e9 100644 --- a/src/Microsoft.AspNetCore.Sockets.Common.Http/TransportType.cs +++ b/src/Microsoft.AspNetCore.Http.Connections.Common/TransportType.cs @@ -1,9 +1,9 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 +namespace Microsoft.AspNetCore.Http.Connections { [Flags] public enum TransportType diff --git a/src/Microsoft.AspNetCore.Sockets.Http/ConnectionMetadataNames.cs b/src/Microsoft.AspNetCore.Http.Connections/ConnectionMetadataNames.cs similarity index 86% rename from src/Microsoft.AspNetCore.Sockets.Http/ConnectionMetadataNames.cs rename to src/Microsoft.AspNetCore.Http.Connections/ConnectionMetadataNames.cs index 5074b739c9..33aa7a0529 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/ConnectionMetadataNames.cs +++ b/src/Microsoft.AspNetCore.Http.Connections/ConnectionMetadataNames.cs @@ -1,7 +1,7 @@ // 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 +namespace Microsoft.AspNetCore.Http.Connections { public static class ConnectionMetadataNames { diff --git a/src/Microsoft.AspNetCore.Sockets.Http/ConnectionsAppBuilderExtensions.cs b/src/Microsoft.AspNetCore.Http.Connections/ConnectionsAppBuilderExtensions.cs similarity index 94% rename from src/Microsoft.AspNetCore.Sockets.Http/ConnectionsAppBuilderExtensions.cs rename to src/Microsoft.AspNetCore.Http.Connections/ConnectionsAppBuilderExtensions.cs index e97b0e5ecb..7242afef6b 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/ConnectionsAppBuilderExtensions.cs +++ b/src/Microsoft.AspNetCore.Http.Connections/ConnectionsAppBuilderExtensions.cs @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using Microsoft.AspNetCore.Http.Connections; using Microsoft.AspNetCore.Routing; -using Microsoft.AspNetCore.Sockets; using Microsoft.Extensions.DependencyInjection; namespace Microsoft.AspNetCore.Builder diff --git a/src/Microsoft.AspNetCore.Sockets.Http/ConnectionsDependencyInjectionExtensions.cs b/src/Microsoft.AspNetCore.Http.Connections/ConnectionsDependencyInjectionExtensions.cs similarity index 86% rename from src/Microsoft.AspNetCore.Sockets.Http/ConnectionsDependencyInjectionExtensions.cs rename to src/Microsoft.AspNetCore.Http.Connections/ConnectionsDependencyInjectionExtensions.cs index 0d951e8693..6c57058cf1 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/ConnectionsDependencyInjectionExtensions.cs +++ b/src/Microsoft.AspNetCore.Http.Connections/ConnectionsDependencyInjectionExtensions.cs @@ -1,7 +1,7 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 Microsoft.AspNetCore.Sockets; +using Microsoft.AspNetCore.Http.Connections; using Microsoft.Extensions.DependencyInjection.Extensions; namespace Microsoft.Extensions.DependencyInjection diff --git a/src/Microsoft.AspNetCore.Sockets.Http/ConnectionsRouteBuilder.cs b/src/Microsoft.AspNetCore.Http.Connections/ConnectionsRouteBuilder.cs similarity index 96% rename from src/Microsoft.AspNetCore.Sockets.Http/ConnectionsRouteBuilder.cs rename to src/Microsoft.AspNetCore.Http.Connections/ConnectionsRouteBuilder.cs index 0d66ba04ab..f2f15e4c09 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/ConnectionsRouteBuilder.cs +++ b/src/Microsoft.AspNetCore.Http.Connections/ConnectionsRouteBuilder.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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; @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Routing; -namespace Microsoft.AspNetCore.Sockets +namespace Microsoft.AspNetCore.Http.Connections { public class ConnectionsRouteBuilder { diff --git a/src/Microsoft.AspNetCore.Sockets.Http/Features/IHttpContextFeature.cs b/src/Microsoft.AspNetCore.Http.Connections/Features/IHttpContextFeature.cs similarity index 89% rename from src/Microsoft.AspNetCore.Sockets.Http/Features/IHttpContextFeature.cs rename to src/Microsoft.AspNetCore.Http.Connections/Features/IHttpContextFeature.cs index d18ebb62d6..5650f63056 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/Features/IHttpContextFeature.cs +++ b/src/Microsoft.AspNetCore.Http.Connections/Features/IHttpContextFeature.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Text; using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNetCore.Sockets.Http.Features +namespace Microsoft.AspNetCore.Http.Connections.Features { public interface IHttpContextFeature { diff --git a/src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionContext.cs b/src/Microsoft.AspNetCore.Http.Connections/HttpConnectionContext.cs similarity index 98% rename from src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionContext.cs rename to src/Microsoft.AspNetCore.Http.Connections/HttpConnectionContext.cs index 982c9c4dd0..c406dae6f7 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionContext.cs +++ b/src/Microsoft.AspNetCore.Http.Connections/HttpConnectionContext.cs @@ -11,10 +11,10 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Connections.Features; -using Microsoft.AspNetCore.Sockets.Http.Features; +using Microsoft.AspNetCore.Http.Connections.Features; using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNetCore.Sockets +namespace Microsoft.AspNetCore.Http.Connections { public class HttpConnectionContext : ConnectionContext, IConnectionIdFeature, diff --git a/src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionContextExtensions.cs b/src/Microsoft.AspNetCore.Http.Connections/HttpConnectionContextExtensions.cs similarity index 84% rename from src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionContextExtensions.cs rename to src/Microsoft.AspNetCore.Http.Connections/HttpConnectionContextExtensions.cs index d0b1fa339c..79fb03f5b5 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionContextExtensions.cs +++ b/src/Microsoft.AspNetCore.Http.Connections/HttpConnectionContextExtensions.cs @@ -1,11 +1,11 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Sockets.Http.Features; +using Microsoft.AspNetCore.Http.Connections.Features; -namespace Microsoft.AspNetCore.Sockets +namespace Microsoft.AspNetCore.Http.Connections { public static class DefaultConnectionContextExtensions { diff --git a/src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionDispatcher.Log.cs b/src/Microsoft.AspNetCore.Http.Connections/HttpConnectionDispatcher.Log.cs similarity index 94% rename from src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionDispatcher.Log.cs rename to src/Microsoft.AspNetCore.Http.Connections/HttpConnectionDispatcher.Log.cs index 1bb37df6c0..e2835055eb 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionDispatcher.Log.cs +++ b/src/Microsoft.AspNetCore.Http.Connections/HttpConnectionDispatcher.Log.cs @@ -4,20 +4,20 @@ using System; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Sockets +namespace Microsoft.AspNetCore.Http.Connections { public partial class HttpConnectionDispatcher { private static class Log { private static readonly Action _connectionDisposed = - LoggerMessage.Define(LogLevel.Debug, new EventId(1, "ConnectionDisposed"), "Connection Id {SocketsConnectionId} was disposed."); + LoggerMessage.Define(LogLevel.Debug, new EventId(1, "ConnectionDisposed"), "Connection Id {TransportConnectionId} was disposed."); private static readonly Action _connectionAlreadyActive = - LoggerMessage.Define(LogLevel.Debug, new EventId(2, "ConnectionAlreadyActive"), "Connection Id {SocketsConnectionId} is already active via {RequestId}."); + LoggerMessage.Define(LogLevel.Debug, new EventId(2, "ConnectionAlreadyActive"), "Connection Id {TransportConnectionId} is already active via {RequestId}."); private static readonly Action _pollCanceled = - LoggerMessage.Define(LogLevel.Trace, new EventId(3, "PollCanceled"), "Previous poll canceled for {SocketsConnectionId} on {RequestId}."); + LoggerMessage.Define(LogLevel.Trace, new EventId(3, "PollCanceled"), "Previous poll canceled for {TransportConnectionId} on {RequestId}."); private static readonly Action _establishedConnection = LoggerMessage.Define(LogLevel.Debug, new EventId(4, "EstablishedConnection"), "Establishing new connection."); diff --git a/src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionDispatcher.cs b/src/Microsoft.AspNetCore.Http.Connections/HttpConnectionDispatcher.cs similarity index 99% rename from src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionDispatcher.cs rename to src/Microsoft.AspNetCore.Http.Connections/HttpConnectionDispatcher.cs index 15aab4ea1f..9ba8182277 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionDispatcher.cs +++ b/src/Microsoft.AspNetCore.Http.Connections/HttpConnectionDispatcher.cs @@ -6,21 +6,18 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.IO.Pipelines; -using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Features; -using Microsoft.AspNetCore.Http.Internal; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Connections.Features; -using Microsoft.AspNetCore.Sockets.Internal; -using Microsoft.AspNetCore.Sockets.Internal.Transports; +using Microsoft.AspNetCore.Http.Connections.Features; +using Microsoft.AspNetCore.Http.Connections.Internal; +using Microsoft.AspNetCore.Http.Connections.Internal.Transports; +using Microsoft.AspNetCore.Http.Features; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Primitives; -using Newtonsoft.Json; -namespace Microsoft.AspNetCore.Sockets +namespace Microsoft.AspNetCore.Http.Connections { public partial class HttpConnectionDispatcher { diff --git a/src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionManager.cs b/src/Microsoft.AspNetCore.Http.Connections/HttpConnectionManager.cs similarity index 94% rename from src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionManager.cs rename to src/Microsoft.AspNetCore.Http.Connections/HttpConnectionManager.cs index 72389bd154..d3b9de1b3f 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionManager.cs +++ b/src/Microsoft.AspNetCore.Http.Connections/HttpConnectionManager.cs @@ -13,11 +13,11 @@ using System.Security.Cryptography; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Sockets.Internal; +using Microsoft.AspNetCore.Http.Connections.Internal; using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Sockets +namespace Microsoft.AspNetCore.Http.Connections { public class HttpConnectionManager { @@ -76,7 +76,7 @@ namespace Microsoft.AspNetCore.Sockets var id = MakeNewConnectionId(); _logger.CreatedNewConnection(id); - var connectionTimer = SocketEventSource.Log.ConnectionStart(id); + var connectionTimer = HttpConnectionsEventSource.Log.ConnectionStart(id); var connection = new HttpConnectionContext(id); @@ -99,7 +99,7 @@ namespace Microsoft.AspNetCore.Sockets if (_connections.TryRemove(id, out var pair)) { // Remove the connection completely - SocketEventSource.Log.ConnectionStop(id, pair.Timer); + HttpConnectionsEventSource.Log.ConnectionStop(id, pair.Timer); _logger.RemovedConnection(id); } } @@ -142,7 +142,7 @@ namespace Microsoft.AspNetCore.Sockets // Time the scan so we know if it gets slower than 1sec var timer = ValueStopwatch.StartNew(); - SocketEventSource.Log.ScanningConnections(); + HttpConnectionsEventSource.Log.ScanningConnections(); _logger.ScanningConnections(); // Scan the registered connections looking for ones that have timed out @@ -171,7 +171,7 @@ namespace Microsoft.AspNetCore.Sockets if (!Debugger.IsAttached && status == HttpConnectionContext.ConnectionStatus.Inactive && (DateTimeOffset.UtcNow - lastSeenUtc).TotalSeconds > 5) { _logger.ConnectionTimedOut(connection.ConnectionId); - SocketEventSource.Log.ConnectionTimedOut(connection.ConnectionId); + HttpConnectionsEventSource.Log.ConnectionTimedOut(connection.ConnectionId); var ignore = DisposeAndRemoveAsync(connection); } else @@ -183,7 +183,7 @@ namespace Microsoft.AspNetCore.Sockets // TODO: We could use this timer to determine if the connection scanner is too slow, but we need an idea of what "too slow" is. var elapsed = timer.GetElapsedTime(); - SocketEventSource.Log.ScannedConnections(elapsed); + HttpConnectionsEventSource.Log.ScannedConnections(elapsed); _logger.ScannedConnections(elapsed); // Resume once we finished processing all connections diff --git a/src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionOptions.cs b/src/Microsoft.AspNetCore.Http.Connections/HttpConnectionOptions.cs similarity index 94% rename from src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionOptions.cs rename to src/Microsoft.AspNetCore.Http.Connections/HttpConnectionOptions.cs index c4ac05b09e..61d712b0e8 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/HttpConnectionOptions.cs +++ b/src/Microsoft.AspNetCore.Http.Connections/HttpConnectionOptions.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Authorization; -namespace Microsoft.AspNetCore.Sockets +namespace Microsoft.AspNetCore.Http.Connections { public class HttpConnectionOptions { diff --git a/src/Microsoft.AspNetCore.Sockets.Http/Internal/AuthorizeHelper.cs b/src/Microsoft.AspNetCore.Http.Connections/Internal/AuthorizeHelper.cs similarity index 97% rename from src/Microsoft.AspNetCore.Sockets.Http/Internal/AuthorizeHelper.cs rename to src/Microsoft.AspNetCore.Http.Connections/Internal/AuthorizeHelper.cs index 600f46b3c9..f52b65789a 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/Internal/AuthorizeHelper.cs +++ b/src/Microsoft.AspNetCore.Http.Connections/Internal/AuthorizeHelper.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Authorization.Policy; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; -namespace Microsoft.AspNetCore.Sockets.Internal +namespace Microsoft.AspNetCore.Http.Connections.Internal { public static class AuthorizeHelper { diff --git a/src/Microsoft.AspNetCore.Sockets.Http/Internal/AwaitableThreadPool.cs b/src/Microsoft.AspNetCore.Http.Connections/Internal/AwaitableThreadPool.cs similarity index 94% rename from src/Microsoft.AspNetCore.Sockets.Http/Internal/AwaitableThreadPool.cs rename to src/Microsoft.AspNetCore.Http.Connections/Internal/AwaitableThreadPool.cs index 7d57cd6404..81c6108189 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/Internal/AwaitableThreadPool.cs +++ b/src/Microsoft.AspNetCore.Http.Connections/Internal/AwaitableThreadPool.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Runtime.CompilerServices; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Sockets.Internal +namespace Microsoft.AspNetCore.Http.Connections.Internal { public static class AwaitableThreadPool { diff --git a/src/Microsoft.AspNetCore.Sockets.Http/Internal/ConnectionLogScope.cs b/src/Microsoft.AspNetCore.Http.Connections/Internal/ConnectionLogScope.cs similarity index 85% rename from src/Microsoft.AspNetCore.Sockets.Http/Internal/ConnectionLogScope.cs rename to src/Microsoft.AspNetCore.Http.Connections/Internal/ConnectionLogScope.cs index 16303f2404..a7d30525dc 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/Internal/ConnectionLogScope.cs +++ b/src/Microsoft.AspNetCore.Http.Connections/Internal/ConnectionLogScope.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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; @@ -6,7 +6,7 @@ using System.Collections; using System.Collections.Generic; using System.Globalization; -namespace Microsoft.AspNetCore.Sockets.Internal +namespace Microsoft.AspNetCore.Http.Connections.Internal { public class ConnectionLogScope : IReadOnlyList> { @@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Sockets.Internal { if (Count == 1 && index == 0) { - return new KeyValuePair("SocketsConnectionId", ConnectionId); + return new KeyValuePair("TransportConnectionId", ConnectionId); } throw new ArgumentOutOfRangeException(nameof(index)); @@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore.Sockets.Internal { _cachedToString = string.Format( CultureInfo.InvariantCulture, - "SocketsConnectionId:{0}", + "TransportConnectionId:{0}", ConnectionId); } } diff --git a/src/Microsoft.AspNetCore.Sockets.Http/Internal/SocketEventSource.cs b/src/Microsoft.AspNetCore.Http.Connections/Internal/HttpConnectionsEventSource.cs similarity index 91% rename from src/Microsoft.AspNetCore.Sockets.Http/Internal/SocketEventSource.cs rename to src/Microsoft.AspNetCore.Http.Connections/Internal/HttpConnectionsEventSource.cs index 1f9f22cc38..6ee256dbe2 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/Internal/SocketEventSource.cs +++ b/src/Microsoft.AspNetCore.Http.Connections/Internal/HttpConnectionsEventSource.cs @@ -5,19 +5,19 @@ using System; using System.Diagnostics.Tracing; using Microsoft.Extensions.Internal; -namespace Microsoft.AspNetCore.Sockets.Internal +namespace Microsoft.AspNetCore.Http.Connections.Internal { - [EventSource(Name = "Microsoft-AspNetCore-Sockets")] - internal class SocketEventSource : EventSource + [EventSource(Name = "Microsoft-AspNetCore-Http-Connections")] + internal class HttpConnectionsEventSource : EventSource { - public static readonly SocketEventSource Log = new SocketEventSource(); + public static readonly HttpConnectionsEventSource Log = new HttpConnectionsEventSource(); private readonly EventCounter _connectionsStarted; private readonly EventCounter _connectionsStopped; private readonly EventCounter _connectionsTimedOut; private readonly EventCounter _connectionDuration; - private SocketEventSource() + private HttpConnectionsEventSource() { _connectionsStarted = new EventCounter("ConnectionsStarted", this); _connectionsStopped = new EventCounter("ConnectionsStopped", this); diff --git a/src/Microsoft.AspNetCore.Sockets.Http/Internal/SocketLoggerExtensions.cs b/src/Microsoft.AspNetCore.Http.Connections/Internal/SocketLoggerExtensions.cs similarity index 83% rename from src/Microsoft.AspNetCore.Sockets.Http/Internal/SocketLoggerExtensions.cs rename to src/Microsoft.AspNetCore.Http.Connections/Internal/SocketLoggerExtensions.cs index 5082a1454f..f58d0f5beb 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/Internal/SocketLoggerExtensions.cs +++ b/src/Microsoft.AspNetCore.Http.Connections/Internal/SocketLoggerExtensions.cs @@ -4,25 +4,25 @@ using System; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Sockets.Internal +namespace Microsoft.AspNetCore.Http.Connections.Internal { internal static class SocketLoggerExtensions { // Category: ConnectionManager private static readonly Action _createdNewConnection = - LoggerMessage.Define(LogLevel.Debug, new EventId(1, nameof(CreatedNewConnection)), "New connection {SocketsConnectionId} created."); + LoggerMessage.Define(LogLevel.Debug, new EventId(1, nameof(CreatedNewConnection)), "New connection {TransportConnectionId} created."); private static readonly Action _removedConnection = - LoggerMessage.Define(LogLevel.Debug, new EventId(2, nameof(RemovedConnection)), "Removing connection {SocketsConnectionId} from the list of connections."); + LoggerMessage.Define(LogLevel.Debug, new EventId(2, nameof(RemovedConnection)), "Removing connection {TransportConnectionId} from the list of connections."); private static readonly Action _failedDispose = - LoggerMessage.Define(LogLevel.Error, new EventId(3, nameof(FailedDispose)), "Failed disposing connection {SocketsConnectionId}."); + LoggerMessage.Define(LogLevel.Error, new EventId(3, nameof(FailedDispose)), "Failed disposing connection {TransportConnectionId}."); private static readonly Action _connectionReset = - LoggerMessage.Define(LogLevel.Trace, new EventId(4, nameof(ConnectionReset)), "Connection {SocketsConnectionId} was reset."); + LoggerMessage.Define(LogLevel.Trace, new EventId(4, nameof(ConnectionReset)), "Connection {TransportConnectionId} was reset."); private static readonly Action _connectionTimedOut = - LoggerMessage.Define(LogLevel.Trace, new EventId(5, nameof(ConnectionTimedOut)), "Connection {SocketsConnectionId} timed out."); + LoggerMessage.Define(LogLevel.Trace, new EventId(5, nameof(ConnectionTimedOut)), "Connection {TransportConnectionId} timed out."); private static readonly Action _scanningConnections = LoggerMessage.Define(LogLevel.Trace, new EventId(6, nameof(ScanningConnections)), "Scanning connections."); diff --git a/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/IHttpTransport.cs b/src/Microsoft.AspNetCore.Http.Connections/Internal/Transports/IHttpTransport.cs similarity index 90% rename from src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/IHttpTransport.cs rename to src/Microsoft.AspNetCore.Http.Connections/Internal/Transports/IHttpTransport.cs index d4573e34a5..cfaf483f0e 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/IHttpTransport.cs +++ b/src/Microsoft.AspNetCore.Http.Connections/Internal/Transports/IHttpTransport.cs @@ -5,7 +5,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -namespace Microsoft.AspNetCore.Sockets.Internal.Transports +namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports { public interface IHttpTransport { diff --git a/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/LongPollingTransport.cs b/src/Microsoft.AspNetCore.Http.Connections/Internal/Transports/LongPollingTransport.cs similarity index 98% rename from src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/LongPollingTransport.cs rename to src/Microsoft.AspNetCore.Http.Connections/Internal/Transports/LongPollingTransport.cs index be17496883..9ee5be2deb 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/LongPollingTransport.cs +++ b/src/Microsoft.AspNetCore.Http.Connections/Internal/Transports/LongPollingTransport.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Sockets.Internal.Transports +namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports { public class LongPollingTransport : IHttpTransport { diff --git a/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/ServerSentEventsMessageFormatter.cs b/src/Microsoft.AspNetCore.Http.Connections/Internal/Transports/ServerSentEventsMessageFormatter.cs similarity index 98% rename from src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/ServerSentEventsMessageFormatter.cs rename to src/Microsoft.AspNetCore.Http.Connections/Internal/Transports/ServerSentEventsMessageFormatter.cs index bc6f382ad3..83d9ec681b 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/ServerSentEventsMessageFormatter.cs +++ b/src/Microsoft.AspNetCore.Http.Connections/Internal/Transports/ServerSentEventsMessageFormatter.cs @@ -8,7 +8,7 @@ using System.IO; using System.Runtime.InteropServices; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Sockets.Internal.Formatters +namespace Microsoft.AspNetCore.Http.Connections.Internal { public static class ServerSentEventsMessageFormatter { diff --git a/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/ServerSentEventsTransport.cs b/src/Microsoft.AspNetCore.Http.Connections/Internal/Transports/ServerSentEventsTransport.cs similarity index 94% rename from src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/ServerSentEventsTransport.cs rename to src/Microsoft.AspNetCore.Http.Connections/Internal/Transports/ServerSentEventsTransport.cs index 5c35033b16..1c0dd85719 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/ServerSentEventsTransport.cs +++ b/src/Microsoft.AspNetCore.Http.Connections/Internal/Transports/ServerSentEventsTransport.cs @@ -2,16 +2,13 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.IO; using System.IO.Pipelines; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; -using Microsoft.AspNetCore.Sockets.Internal.Formatters; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Sockets.Internal.Transports +namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports { public class ServerSentEventsTransport : IHttpTransport { diff --git a/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/WebSocketsTransport.Log.cs b/src/Microsoft.AspNetCore.Http.Connections/Internal/Transports/WebSocketsTransport.Log.cs similarity index 98% rename from src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/WebSocketsTransport.Log.cs rename to src/Microsoft.AspNetCore.Http.Connections/Internal/Transports/WebSocketsTransport.Log.cs index 3de933a1a1..b7cb21ab19 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/WebSocketsTransport.Log.cs +++ b/src/Microsoft.AspNetCore.Http.Connections/Internal/Transports/WebSocketsTransport.Log.cs @@ -5,7 +5,7 @@ using System; using System.Net.WebSockets; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Sockets.Internal.Transports +namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports { public partial class WebSocketsTransport { diff --git a/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/WebSocketsTransport.cs b/src/Microsoft.AspNetCore.Http.Connections/Internal/Transports/WebSocketsTransport.cs similarity index 99% rename from src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/WebSocketsTransport.cs rename to src/Microsoft.AspNetCore.Http.Connections/Internal/Transports/WebSocketsTransport.cs index 3493d16475..24812e93b8 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/Internal/Transports/WebSocketsTransport.cs +++ b/src/Microsoft.AspNetCore.Http.Connections/Internal/Transports/WebSocketsTransport.cs @@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Connections; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Sockets.Internal.Transports +namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports { public partial class WebSocketsTransport : IHttpTransport { diff --git a/src/Microsoft.AspNetCore.Sockets.Http/LongPollingOptions.cs b/src/Microsoft.AspNetCore.Http.Connections/LongPollingOptions.cs similarity index 74% rename from src/Microsoft.AspNetCore.Sockets.Http/LongPollingOptions.cs rename to src/Microsoft.AspNetCore.Http.Connections/LongPollingOptions.cs index ac3718e210..3cfe70dd02 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/LongPollingOptions.cs +++ b/src/Microsoft.AspNetCore.Http.Connections/LongPollingOptions.cs @@ -1,8 +1,8 @@ -using System; +using System; using System.Collections.Generic; using System.Text; -namespace Microsoft.AspNetCore.Sockets +namespace Microsoft.AspNetCore.Http.Connections { public class LongPollingOptions { diff --git a/src/Microsoft.AspNetCore.Sockets.Http/Microsoft.AspNetCore.Sockets.Http.csproj b/src/Microsoft.AspNetCore.Http.Connections/Microsoft.AspNetCore.Http.Connections.csproj similarity index 88% rename from src/Microsoft.AspNetCore.Sockets.Http/Microsoft.AspNetCore.Sockets.Http.csproj rename to src/Microsoft.AspNetCore.Http.Connections/Microsoft.AspNetCore.Http.Connections.csproj index e9142d0abd..8cf00e91c9 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/Microsoft.AspNetCore.Sockets.Http.csproj +++ b/src/Microsoft.AspNetCore.Http.Connections/Microsoft.AspNetCore.Http.Connections.csproj @@ -13,8 +13,7 @@ - - + diff --git a/src/Microsoft.AspNetCore.Sockets.Http/WebSocketOptions.cs b/src/Microsoft.AspNetCore.Http.Connections/WebSocketOptions.cs similarity index 74% rename from src/Microsoft.AspNetCore.Sockets.Http/WebSocketOptions.cs rename to src/Microsoft.AspNetCore.Http.Connections/WebSocketOptions.cs index b49eb4a304..82f94f2213 100644 --- a/src/Microsoft.AspNetCore.Sockets.Http/WebSocketOptions.cs +++ b/src/Microsoft.AspNetCore.Http.Connections/WebSocketOptions.cs @@ -1,9 +1,9 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 +namespace Microsoft.AspNetCore.Http.Connections { public class WebSocketOptions { diff --git a/src/Microsoft.AspNetCore.SignalR.Client.Core/HubConnection.cs b/src/Microsoft.AspNetCore.SignalR.Client.Core/HubConnection.cs index c05e30158e..90f16c24af 100644 --- a/src/Microsoft.AspNetCore.SignalR.Client.Core/HubConnection.cs +++ b/src/Microsoft.AspNetCore.SignalR.Client.Core/HubConnection.cs @@ -2,22 +2,18 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Buffers; using System.Collections.Concurrent; using System.Collections.Generic; using System.Diagnostics; -using System.IO; using System.IO.Pipelines; using System.Runtime.CompilerServices; using System.Threading; using System.Threading.Channels; using System.Threading.Tasks; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Connections.Features; using Microsoft.AspNetCore.SignalR.Internal; -using Microsoft.AspNetCore.SignalR.Internal.Formatters; using Microsoft.AspNetCore.SignalR.Internal.Protocol; -using Microsoft.AspNetCore.Sockets.Client; -using Microsoft.AspNetCore.Sockets.Internal; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; diff --git a/src/Microsoft.AspNetCore.SignalR.Client.Core/HubConnectionBuilder.cs b/src/Microsoft.AspNetCore.SignalR.Client.Core/HubConnectionBuilder.cs index b1cdf7d7e1..02c6902721 100644 --- a/src/Microsoft.AspNetCore.SignalR.Client.Core/HubConnectionBuilder.cs +++ b/src/Microsoft.AspNetCore.SignalR.Client.Core/HubConnectionBuilder.cs @@ -4,8 +4,8 @@ using System; using System.Collections.Generic; using System.ComponentModel; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.SignalR.Internal.Protocol; -using Microsoft.AspNetCore.Sockets.Client; using Newtonsoft.Json; namespace Microsoft.AspNetCore.SignalR.Client diff --git a/src/Microsoft.AspNetCore.SignalR.Client.Core/IHubConnectionBuilder.cs b/src/Microsoft.AspNetCore.SignalR.Client.Core/IHubConnectionBuilder.cs index f4463478fd..37f24b13b1 100644 --- a/src/Microsoft.AspNetCore.SignalR.Client.Core/IHubConnectionBuilder.cs +++ b/src/Microsoft.AspNetCore.SignalR.Client.Core/IHubConnectionBuilder.cs @@ -1,8 +1,8 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 Microsoft.AspNetCore.Sockets.Client; +using Microsoft.AspNetCore.Connections; namespace Microsoft.AspNetCore.SignalR.Client { diff --git a/src/Microsoft.AspNetCore.SignalR.Client.Core/Microsoft.AspNetCore.SignalR.Client.Core.csproj b/src/Microsoft.AspNetCore.SignalR.Client.Core/Microsoft.AspNetCore.SignalR.Client.Core.csproj index 455b7599db..e74f553f14 100644 --- a/src/Microsoft.AspNetCore.SignalR.Client.Core/Microsoft.AspNetCore.SignalR.Client.Core.csproj +++ b/src/Microsoft.AspNetCore.SignalR.Client.Core/Microsoft.AspNetCore.SignalR.Client.Core.csproj @@ -13,7 +13,6 @@ - diff --git a/src/Microsoft.AspNetCore.SignalR.Client/HubConnectionBuilderHttpExtensions.cs b/src/Microsoft.AspNetCore.SignalR.Client/HubConnectionBuilderHttpExtensions.cs index 067755b8af..a871a393a1 100644 --- a/src/Microsoft.AspNetCore.SignalR.Client/HubConnectionBuilderHttpExtensions.cs +++ b/src/Microsoft.AspNetCore.SignalR.Client/HubConnectionBuilderHttpExtensions.cs @@ -8,9 +8,8 @@ using System.Net; using System.Net.Http; using System.Net.WebSockets; using System.Security.Cryptography.X509Certificates; -using Microsoft.AspNetCore.Sockets; -using Microsoft.AspNetCore.Sockets.Client; -using Microsoft.AspNetCore.Sockets.Client.Http; +using Microsoft.AspNetCore.Http.Connections; +using Microsoft.AspNetCore.Http.Connections.Client; namespace Microsoft.AspNetCore.SignalR.Client { diff --git a/src/Microsoft.AspNetCore.SignalR.Client/Microsoft.AspNetCore.SignalR.Client.csproj b/src/Microsoft.AspNetCore.SignalR.Client/Microsoft.AspNetCore.SignalR.Client.csproj index bf40e005ca..f7a910bece 100644 --- a/src/Microsoft.AspNetCore.SignalR.Client/Microsoft.AspNetCore.SignalR.Client.csproj +++ b/src/Microsoft.AspNetCore.SignalR.Client/Microsoft.AspNetCore.SignalR.Client.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Microsoft.AspNetCore.SignalR.Common/Internal/Protocol/HandshakeProtocol.cs b/src/Microsoft.AspNetCore.SignalR.Common/Internal/Protocol/HandshakeProtocol.cs index de181f4603..932d502c65 100644 --- a/src/Microsoft.AspNetCore.SignalR.Common/Internal/Protocol/HandshakeProtocol.cs +++ b/src/Microsoft.AspNetCore.SignalR.Common/Internal/Protocol/HandshakeProtocol.cs @@ -1,13 +1,11 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Buffers; using System.IO; -using System.Text; +using Microsoft.AspNetCore.Internal; using Microsoft.AspNetCore.SignalR.Internal.Formatters; using Newtonsoft.Json; -using Newtonsoft.Json.Linq; namespace Microsoft.AspNetCore.SignalR.Internal.Protocol { diff --git a/src/Microsoft.AspNetCore.SignalR.Common/Internal/Protocol/IHubProtocol.cs b/src/Microsoft.AspNetCore.SignalR.Common/Internal/Protocol/IHubProtocol.cs index b369714979..f05481b20c 100644 --- a/src/Microsoft.AspNetCore.SignalR.Common/Internal/Protocol/IHubProtocol.cs +++ b/src/Microsoft.AspNetCore.SignalR.Common/Internal/Protocol/IHubProtocol.cs @@ -1,9 +1,7 @@ // 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.Buffers; -using System.Collections.Generic; using System.IO; using Microsoft.AspNetCore.Connections; diff --git a/src/Microsoft.AspNetCore.SignalR.Common/Internal/Protocol/JsonHubProtocol.cs b/src/Microsoft.AspNetCore.SignalR.Common/Internal/Protocol/JsonHubProtocol.cs index f4e5df07b8..b16f1644c5 100644 --- a/src/Microsoft.AspNetCore.SignalR.Common/Internal/Protocol/JsonHubProtocol.cs +++ b/src/Microsoft.AspNetCore.SignalR.Common/Internal/Protocol/JsonHubProtocol.cs @@ -8,6 +8,7 @@ using System.IO; using System.Runtime.ExceptionServices; using System.Text; using Microsoft.AspNetCore.Connections; +using Microsoft.AspNetCore.Internal; using Microsoft.AspNetCore.SignalR.Internal.Formatters; using Microsoft.Extensions.Options; using Newtonsoft.Json; diff --git a/src/Microsoft.AspNetCore.SignalR.Common/Microsoft.AspNetCore.SignalR.Common.csproj b/src/Microsoft.AspNetCore.SignalR.Common/Microsoft.AspNetCore.SignalR.Common.csproj index 440fc39440..046f28c120 100644 --- a/src/Microsoft.AspNetCore.SignalR.Common/Microsoft.AspNetCore.SignalR.Common.csproj +++ b/src/Microsoft.AspNetCore.SignalR.Common/Microsoft.AspNetCore.SignalR.Common.csproj @@ -1,4 +1,4 @@ - + Common serialiation primitives for SignalR Clients Servers @@ -16,11 +16,8 @@ + - - - - diff --git a/src/Microsoft.AspNetCore.SignalR.Core/Microsoft.AspNetCore.SignalR.Core.csproj b/src/Microsoft.AspNetCore.SignalR.Core/Microsoft.AspNetCore.SignalR.Core.csproj index 6bec6d322f..a4e3752857 100644 --- a/src/Microsoft.AspNetCore.SignalR.Core/Microsoft.AspNetCore.SignalR.Core.csproj +++ b/src/Microsoft.AspNetCore.SignalR.Core/Microsoft.AspNetCore.SignalR.Core.csproj @@ -7,7 +7,6 @@ - diff --git a/src/Microsoft.AspNetCore.SignalR.Core/SignalRSocketBuilderExtensions.cs b/src/Microsoft.AspNetCore.SignalR.Core/SignalRSocketBuilderExtensions.cs index ed90edea45..fdd2d54f5a 100644 --- a/src/Microsoft.AspNetCore.SignalR.Core/SignalRSocketBuilderExtensions.cs +++ b/src/Microsoft.AspNetCore.SignalR.Core/SignalRSocketBuilderExtensions.cs @@ -1,9 +1,7 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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 Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Sockets; -using Microsoft.Extensions.DependencyInjection; namespace Microsoft.AspNetCore.SignalR { diff --git a/src/Microsoft.AspNetCore.SignalR.Redis/RedisHubLifetimeManager.cs b/src/Microsoft.AspNetCore.SignalR.Redis/RedisHubLifetimeManager.cs index d8c8cce8ba..568e2be14e 100644 --- a/src/Microsoft.AspNetCore.SignalR.Redis/RedisHubLifetimeManager.cs +++ b/src/Microsoft.AspNetCore.SignalR.Redis/RedisHubLifetimeManager.cs @@ -9,7 +9,7 @@ using System.Linq; using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.SignalR.Internal; +using Microsoft.AspNetCore.Internal; using Microsoft.AspNetCore.SignalR.Internal.Protocol; using Microsoft.AspNetCore.SignalR.Redis.Internal; using Microsoft.Extensions.Logging; diff --git a/src/Microsoft.AspNetCore.SignalR/HubCallerContextExtensions.cs b/src/Microsoft.AspNetCore.SignalR/HubCallerContextExtensions.cs index 45ef53def2..ab1754b972 100644 --- a/src/Microsoft.AspNetCore.SignalR/HubCallerContextExtensions.cs +++ b/src/Microsoft.AspNetCore.SignalR/HubCallerContextExtensions.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Sockets.Http.Features; +using Microsoft.AspNetCore.Http.Connections.Features; namespace Microsoft.AspNetCore.SignalR { diff --git a/src/Microsoft.AspNetCore.SignalR/HubRouteBuilder.cs b/src/Microsoft.AspNetCore.SignalR/HubRouteBuilder.cs index e6ea9c2566..8e5d641f06 100644 --- a/src/Microsoft.AspNetCore.SignalR/HubRouteBuilder.cs +++ b/src/Microsoft.AspNetCore.SignalR/HubRouteBuilder.cs @@ -1,11 +1,11 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Reflection; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Sockets; +using Microsoft.AspNetCore.Http.Connections; namespace Microsoft.AspNetCore.SignalR { diff --git a/src/Microsoft.AspNetCore.SignalR/Microsoft.AspNetCore.SignalR.csproj b/src/Microsoft.AspNetCore.SignalR/Microsoft.AspNetCore.SignalR.csproj index d588565bb8..885b476430 100644 --- a/src/Microsoft.AspNetCore.SignalR/Microsoft.AspNetCore.SignalR.csproj +++ b/src/Microsoft.AspNetCore.SignalR/Microsoft.AspNetCore.SignalR.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Microsoft.AspNetCore.Sockets.Abstractions/IConnection.cs b/src/Microsoft.AspNetCore.Sockets.Abstractions/IConnection.cs deleted file mode 100644 index 44142424c8..0000000000 --- a/src/Microsoft.AspNetCore.Sockets.Abstractions/IConnection.cs +++ /dev/null @@ -1,22 +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.IO.Pipelines; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Http.Features; -using Microsoft.AspNetCore.Connections; - -namespace Microsoft.AspNetCore.Sockets.Client -{ - public interface IConnection - { - IDuplexPipe Transport { get; } - IFeatureCollection Features { get; } - - Task StartAsync(); - Task StartAsync(TransferFormat transferFormat); - Task DisposeAsync(); - } -} diff --git a/src/Microsoft.AspNetCore.Sockets.Abstractions/Microsoft.AspNetCore.Sockets.Abstractions.csproj b/src/Microsoft.AspNetCore.Sockets.Abstractions/Microsoft.AspNetCore.Sockets.Abstractions.csproj deleted file mode 100644 index 94f6277253..0000000000 --- a/src/Microsoft.AspNetCore.Sockets.Abstractions/Microsoft.AspNetCore.Sockets.Abstractions.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - Components for providing real-time bi-directional communication across the Web. - netstandard2.0 - Microsoft.AspNetCore.Sockets - - - - - - - diff --git a/test/Microsoft.AspNetCore.Sockets.Tests/ApplicationLifetime.cs b/test/Microsoft.AspNetCore.Http.Connections.Tests/ApplicationLifetime.cs similarity index 92% rename from test/Microsoft.AspNetCore.Sockets.Tests/ApplicationLifetime.cs rename to test/Microsoft.AspNetCore.Http.Connections.Tests/ApplicationLifetime.cs index b112ea6aa4..15c3343790 100644 --- a/test/Microsoft.AspNetCore.Sockets.Tests/ApplicationLifetime.cs +++ b/test/Microsoft.AspNetCore.Http.Connections.Tests/ApplicationLifetime.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Threading; using Microsoft.AspNetCore.Hosting; -namespace Microsoft.AspNetCore.Sockets.Tests +namespace Microsoft.AspNetCore.Http.Connections.Tests { public class TestApplicationLifetime : IApplicationLifetime { diff --git a/test/Microsoft.AspNetCore.Sockets.Tests/HttpConnectionDispatcherTests.cs b/test/Microsoft.AspNetCore.Http.Connections.Tests/HttpConnectionDispatcherTests.cs similarity index 99% rename from test/Microsoft.AspNetCore.Sockets.Tests/HttpConnectionDispatcherTests.cs rename to test/Microsoft.AspNetCore.Http.Connections.Tests/HttpConnectionDispatcherTests.cs index 0c53685818..40a4cdc8a6 100644 --- a/test/Microsoft.AspNetCore.Sockets.Tests/HttpConnectionDispatcherTests.cs +++ b/test/Microsoft.AspNetCore.Http.Connections.Tests/HttpConnectionDispatcherTests.cs @@ -15,11 +15,10 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Http.Features; -using Microsoft.AspNetCore.Http.Internal; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Connections.Features; +using Microsoft.AspNetCore.Http.Features; +using Microsoft.AspNetCore.Http.Internal; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; @@ -29,7 +28,7 @@ using Newtonsoft.Json.Linq; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Sockets.Tests +namespace Microsoft.AspNetCore.Http.Connections.Tests { public class HttpConnectionDispatcherTests : LoggedTest { diff --git a/test/Microsoft.AspNetCore.Sockets.Tests/HttpConnectionManagerTests.cs b/test/Microsoft.AspNetCore.Http.Connections.Tests/HttpConnectionManagerTests.cs similarity index 99% rename from test/Microsoft.AspNetCore.Sockets.Tests/HttpConnectionManagerTests.cs rename to test/Microsoft.AspNetCore.Http.Connections.Tests/HttpConnectionManagerTests.cs index a819625e4b..72ae778f84 100644 --- a/test/Microsoft.AspNetCore.Sockets.Tests/HttpConnectionManagerTests.cs +++ b/test/Microsoft.AspNetCore.Http.Connections.Tests/HttpConnectionManagerTests.cs @@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Logging; using Xunit; -namespace Microsoft.AspNetCore.Sockets.Tests +namespace Microsoft.AspNetCore.Http.Connections.Tests { public class HttpConnectionManagerTests { diff --git a/test/Microsoft.AspNetCore.Sockets.Tests/LongPollingTests.cs b/test/Microsoft.AspNetCore.Http.Connections.Tests/LongPollingTests.cs similarity index 97% rename from test/Microsoft.AspNetCore.Sockets.Tests/LongPollingTests.cs rename to test/Microsoft.AspNetCore.Http.Connections.Tests/LongPollingTests.cs index b37c132e14..3712313a73 100644 --- a/test/Microsoft.AspNetCore.Sockets.Tests/LongPollingTests.cs +++ b/test/Microsoft.AspNetCore.Http.Connections.Tests/LongPollingTests.cs @@ -8,12 +8,11 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Sockets.Internal.Transports; +using Microsoft.AspNetCore.Http.Connections.Internal.Transports; using Microsoft.Extensions.Logging; using Xunit; -namespace Microsoft.AspNetCore.Sockets.Tests +namespace Microsoft.AspNetCore.Http.Connections.Tests { public class LongPollingTests { diff --git a/test/Microsoft.AspNetCore.Sockets.Tests/MapConnectionHandlerTests.cs b/test/Microsoft.AspNetCore.Http.Connections.Tests/MapConnectionHandlerTests.cs similarity index 99% rename from test/Microsoft.AspNetCore.Sockets.Tests/MapConnectionHandlerTests.cs rename to test/Microsoft.AspNetCore.Http.Connections.Tests/MapConnectionHandlerTests.cs index 0e27f32aed..57adeb80ef 100644 --- a/test/Microsoft.AspNetCore.Sockets.Tests/MapConnectionHandlerTests.cs +++ b/test/Microsoft.AspNetCore.Http.Connections.Tests/MapConnectionHandlerTests.cs @@ -8,9 +8,9 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.Server.Features; -using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.SignalR.Tests; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.DependencyInjection; @@ -18,7 +18,7 @@ using Microsoft.Extensions.Logging; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Sockets.Tests +namespace Microsoft.AspNetCore.Http.Connections.Tests { public class MapConnectionHandlerTests { diff --git a/test/Microsoft.AspNetCore.Sockets.Tests/Microsoft.AspNetCore.Sockets.Tests.csproj b/test/Microsoft.AspNetCore.Http.Connections.Tests/Microsoft.AspNetCore.Http.Connections.Tests.csproj similarity index 89% rename from test/Microsoft.AspNetCore.Sockets.Tests/Microsoft.AspNetCore.Sockets.Tests.csproj rename to test/Microsoft.AspNetCore.Http.Connections.Tests/Microsoft.AspNetCore.Http.Connections.Tests.csproj index d4fbac0ce0..c220956468 100644 --- a/test/Microsoft.AspNetCore.Sockets.Tests/Microsoft.AspNetCore.Sockets.Tests.csproj +++ b/test/Microsoft.AspNetCore.Http.Connections.Tests/Microsoft.AspNetCore.Http.Connections.Tests.csproj @@ -16,7 +16,7 @@ - + diff --git a/test/Microsoft.AspNetCore.Sockets.Tests/NegotiateProtocolTests.cs b/test/Microsoft.AspNetCore.Http.Connections.Tests/NegotiateProtocolTests.cs similarity index 91% rename from test/Microsoft.AspNetCore.Sockets.Tests/NegotiateProtocolTests.cs rename to test/Microsoft.AspNetCore.Http.Connections.Tests/NegotiateProtocolTests.cs index cb6b92d804..c52783fa65 100644 --- a/test/Microsoft.AspNetCore.Sockets.Tests/NegotiateProtocolTests.cs +++ b/test/Microsoft.AspNetCore.Http.Connections.Tests/NegotiateProtocolTests.cs @@ -1,14 +1,10 @@ -using System; -using System.Buffers; -using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; -using Microsoft.AspNetCore.SignalR.Internal.Protocol; -using Microsoft.AspNetCore.Sockets.Internal; +using Microsoft.AspNetCore.Http.Connections.Internal; using Xunit; -namespace Microsoft.AspNetCore.Sockets.Tests +namespace Microsoft.AspNetCore.Http.Connections.Tests { public class NegotiateProtocolTests { diff --git a/test/Microsoft.AspNetCore.Sockets.Tests/ServerSentEventsMessageFormatterTests.cs b/test/Microsoft.AspNetCore.Http.Connections.Tests/ServerSentEventsMessageFormatterTests.cs similarity index 83% rename from test/Microsoft.AspNetCore.Sockets.Tests/ServerSentEventsMessageFormatterTests.cs rename to test/Microsoft.AspNetCore.Http.Connections.Tests/ServerSentEventsMessageFormatterTests.cs index b2fe3957db..c70a219c1e 100644 --- a/test/Microsoft.AspNetCore.Sockets.Tests/ServerSentEventsMessageFormatterTests.cs +++ b/test/Microsoft.AspNetCore.Http.Connections.Tests/ServerSentEventsMessageFormatterTests.cs @@ -1,13 +1,12 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.IO; using System.Text; -using Microsoft.AspNetCore.Sockets.Internal.Formatters; +using Microsoft.AspNetCore.Http.Connections.Internal; using Xunit; -namespace Microsoft.AspNetCore.Sockets.Tests.Internal.Formatters +namespace Microsoft.AspNetCore.Http.Connections.Tests { public class ServerSentEventsMessageFormatterTests { diff --git a/test/Microsoft.AspNetCore.Sockets.Tests/ServerSentEventsTests.cs b/test/Microsoft.AspNetCore.Http.Connections.Tests/ServerSentEventsTests.cs similarity index 97% rename from test/Microsoft.AspNetCore.Sockets.Tests/ServerSentEventsTests.cs rename to test/Microsoft.AspNetCore.Http.Connections.Tests/ServerSentEventsTests.cs index 4495c85e94..32ebbcf208 100644 --- a/test/Microsoft.AspNetCore.Sockets.Tests/ServerSentEventsTests.cs +++ b/test/Microsoft.AspNetCore.Http.Connections.Tests/ServerSentEventsTests.cs @@ -8,11 +8,11 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; -using Microsoft.AspNetCore.Sockets.Internal.Transports; +using Microsoft.AspNetCore.Http.Connections.Internal.Transports; using Microsoft.Extensions.Logging; using Xunit; -namespace Microsoft.AspNetCore.Sockets.Tests +namespace Microsoft.AspNetCore.Http.Connections.Tests { public class ServerSentEventsTests { diff --git a/test/Microsoft.AspNetCore.Sockets.Tests/TestWebSocketConnectionFeature.cs b/test/Microsoft.AspNetCore.Http.Connections.Tests/TestWebSocketConnectionFeature.cs similarity index 99% rename from test/Microsoft.AspNetCore.Sockets.Tests/TestWebSocketConnectionFeature.cs rename to test/Microsoft.AspNetCore.Http.Connections.Tests/TestWebSocketConnectionFeature.cs index 80b1bfa114..e9be9faa71 100644 --- a/test/Microsoft.AspNetCore.Sockets.Tests/TestWebSocketConnectionFeature.cs +++ b/test/Microsoft.AspNetCore.Http.Connections.Tests/TestWebSocketConnectionFeature.cs @@ -2,12 +2,11 @@ using System; using System.Collections.Generic; using System.Net.WebSockets; using System.Threading; -using System.Threading.Tasks; using System.Threading.Channels; -using Microsoft.AspNetCore.Http; +using System.Threading.Tasks; using Microsoft.AspNetCore.Http.Features; -namespace Microsoft.AspNetCore.Sockets.Tests +namespace Microsoft.AspNetCore.Http.Connections.Tests { internal class TestWebSocketConnectionFeature : IHttpWebSocketFeature, IDisposable { diff --git a/test/Microsoft.AspNetCore.Sockets.Tests/WebSocketsTests.cs b/test/Microsoft.AspNetCore.Http.Connections.Tests/WebSocketsTests.cs similarity index 99% rename from test/Microsoft.AspNetCore.Sockets.Tests/WebSocketsTests.cs rename to test/Microsoft.AspNetCore.Http.Connections.Tests/WebSocketsTests.cs index 866c730ffa..14ff7502be 100644 --- a/test/Microsoft.AspNetCore.Sockets.Tests/WebSocketsTests.cs +++ b/test/Microsoft.AspNetCore.Http.Connections.Tests/WebSocketsTests.cs @@ -9,13 +9,13 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Sockets.Internal.Transports; +using Microsoft.AspNetCore.Http.Connections.Internal.Transports; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; using Xunit; using Xunit.Abstractions; -namespace Microsoft.AspNetCore.Sockets.Tests +namespace Microsoft.AspNetCore.Http.Connections.Tests { public class WebSocketsTests : LoggedTest { diff --git a/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/HubConnectionTests.cs b/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/HubConnectionTests.cs index 1d2f556dac..4fc1d4bc7e 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/HubConnectionTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/HubConnectionTests.cs @@ -8,11 +8,11 @@ using System.Net.Http; using System.Threading; using System.Threading.Channels; using System.Threading.Tasks; +using Microsoft.AspNetCore.Connections; +using Microsoft.AspNetCore.Http.Connections; +using Microsoft.AspNetCore.Http.Connections.Client; using Microsoft.AspNetCore.SignalR.Internal.Protocol; using Microsoft.AspNetCore.SignalR.Tests; -using Microsoft.AspNetCore.Sockets; -using Microsoft.AspNetCore.Sockets.Client; -using Microsoft.AspNetCore.Sockets.Client.Http; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; diff --git a/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/Hubs.cs b/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/Hubs.cs index 58f7358234..b8579ff3bc 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/Hubs.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/Hubs.cs @@ -9,8 +9,8 @@ using System.Threading.Channels; using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Http.Connections; using Microsoft.AspNetCore.Http.Features; -using Microsoft.AspNetCore.Sockets; namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests { diff --git a/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/Startup.cs b/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/Startup.cs index 41e05ab74c..1d7bbb644f 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/Startup.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.FunctionalTests/Startup.cs @@ -7,7 +7,7 @@ using System.Security.Claims; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Sockets; +using Microsoft.AspNetCore.Http.Connections; using Microsoft.Extensions.DependencyInjection; using Microsoft.IdentityModel.Tokens; diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.ConnectionLifecycle.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.ConnectionLifecycle.cs index 0ee8a4c02a..1d7ef85ac8 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.ConnectionLifecycle.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.ConnectionLifecycle.cs @@ -5,13 +5,11 @@ using System; using System.IO.Pipelines; using System.Net; using System.Net.Http; -using System.Runtime.InteropServices; using System.Threading.Tasks; -using Microsoft.AspNetCore.Client.Tests; using Microsoft.AspNetCore.Connections; +using Microsoft.AspNetCore.Http.Connections.Client; +using Microsoft.AspNetCore.Http.Connections.Client.Internal; using Microsoft.AspNetCore.SignalR.Tests; -using Microsoft.AspNetCore.Sockets.Client.Http; -using Microsoft.AspNetCore.Sockets.Client.Internal; using Microsoft.Extensions.Logging.Testing; using Xunit; using Xunit.Abstractions; diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Helpers.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Helpers.cs index 39137ac18b..59d72e536e 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Helpers.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Helpers.cs @@ -4,9 +4,8 @@ using System; using System.Net.Http; using System.Threading.Tasks; -using Microsoft.AspNetCore.Sockets; -using Microsoft.AspNetCore.Sockets.Client; -using Microsoft.AspNetCore.Sockets.Client.Http; +using Microsoft.AspNetCore.Http.Connections; +using Microsoft.AspNetCore.Http.Connections.Client; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Negotiate.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Negotiate.cs index 1f0cf5a36e..43c2f2f793 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Negotiate.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Negotiate.cs @@ -5,15 +5,13 @@ using System; using System.IO; using System.Net; using System.Threading.Tasks; -using Microsoft.AspNetCore.Client.Tests; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Sockets; -using Microsoft.AspNetCore.Sockets.Client; +using Microsoft.AspNetCore.Http.Connections.Client; using Moq; using Newtonsoft.Json; using Xunit; -using TransportType = Microsoft.AspNetCore.Sockets.TransportType; +using TransportType = Microsoft.AspNetCore.Http.Connections.TransportType; namespace Microsoft.AspNetCore.SignalR.Client.Tests { diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Transport.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Transport.cs index a4ced7e517..0cb6e82602 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Transport.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.Transport.cs @@ -7,10 +7,8 @@ using System.Net; using System.Net.Http; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNetCore.Client.Tests; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Sockets; -using Microsoft.AspNetCore.Sockets.Client.Http; +using Microsoft.AspNetCore.Http.Connections.Client; using Xunit; namespace Microsoft.AspNetCore.SignalR.Client.Tests diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.cs index 381ec22886..a0c87cf8ab 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HttpConnectionTests.cs @@ -6,9 +6,8 @@ using System.Net; using System.Net.Http; using System.Security.Cryptography.X509Certificates; using System.Threading.Tasks; -using Microsoft.AspNetCore.Client.Tests; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Sockets.Client.Http; +using Microsoft.AspNetCore.Http.Connections.Client; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Logging.Testing; @@ -17,7 +16,7 @@ using Xunit; using Xunit.Abstractions; // This is needed because there's a System.Net.TransportType in net461 (it's internal in netcoreapp). -using TransportType = Microsoft.AspNetCore.Sockets.TransportType; +using TransportType = Microsoft.AspNetCore.Http.Connections.TransportType; namespace Microsoft.AspNetCore.SignalR.Client.Tests { @@ -104,7 +103,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests var httpOptions = new HttpOptions(); httpOptions.HttpMessageHandler = inner => testHttpHandler; - const string loggerName = "Microsoft.AspNetCore.Sockets.Client.Http.Internal.LoggingHttpMessageHandler"; + const string loggerName = "Microsoft.AspNetCore.Http.Connections.Client.Internal.LoggingHttpMessageHandler"; var testSink = new TestSink(); var logger = new TestLogger(loggerName, testSink, true); diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HubConnectionBuilderExtensionsTests.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HubConnectionBuilderExtensionsTests.cs index bfca9f5be0..1e5f673779 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HubConnectionBuilderExtensionsTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HubConnectionBuilderExtensionsTests.cs @@ -7,12 +7,11 @@ using System.Net; using System.Net.Http; using System.Security.Cryptography.X509Certificates; using Microsoft.AspNetCore.SignalR.Internal.Protocol; -using Microsoft.AspNetCore.Sockets; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Console; using Moq; using Xunit; -using TransportType = Microsoft.AspNetCore.Sockets.TransportType; +using TransportType = Microsoft.AspNetCore.Http.Connections.TransportType; namespace Microsoft.AspNetCore.SignalR.Client.Tests { diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HubConnectionTests.ConnectionLifecycle.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HubConnectionTests.ConnectionLifecycle.cs index 2c8e91906a..a672ec4bcc 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HubConnectionTests.ConnectionLifecycle.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HubConnectionTests.ConnectionLifecycle.cs @@ -2,8 +2,8 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.SignalR.Internal.Protocol; -using Microsoft.AspNetCore.Sockets.Client; using Newtonsoft.Json.Linq; using Xunit; diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HubConnectionTests.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HubConnectionTests.cs index 1c7f7ed669..7fe884500f 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/HubConnectionTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/HubConnectionTests.cs @@ -3,15 +3,11 @@ using System; using System.Buffers; -using System.Collections.Generic; using System.IO; using System.Threading.Tasks; -using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.SignalR.Internal; using Microsoft.AspNetCore.SignalR.Internal.Protocol; -using Microsoft.AspNetCore.Sockets.Client; -using Microsoft.Extensions.Logging; using Moq; using Xunit; diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/LongPollingTransportTests.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/LongPollingTransportTests.cs index 193f741125..2f3f910448 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/LongPollingTransportTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/LongPollingTransportTests.cs @@ -10,12 +10,10 @@ using System.Net.Http.Headers; using System.Reflection; using System.Text; using System.Threading; -using System.Threading.Channels; using System.Threading.Tasks; -using Microsoft.AspNetCore.Client.Tests; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Sockets.Client.Http; -using Microsoft.AspNetCore.Sockets.Client.Internal; +using Microsoft.AspNetCore.Http.Connections.Client; +using Microsoft.AspNetCore.Http.Connections.Client.Internal; using Moq; using Moq.Protected; using Xunit; @@ -422,7 +420,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests Assert.NotNull(userAgentHeaderCollection); var userAgentHeader = Assert.Single(userAgentHeaderCollection); - Assert.Equal("Microsoft.AspNetCore.Sockets.Client.Http", userAgentHeader.Product.Name); + Assert.Equal("Microsoft.AspNetCore.Http.Connections.Client", userAgentHeader.Product.Name); // user agent version should come from version embedded in assembly metadata var assemblyVersion = typeof(Constants) diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj b/test/Microsoft.AspNetCore.SignalR.Client.Tests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj index 7731393e9d..ac67f9b7a7 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/Microsoft.AspNetCore.SignalR.Client.Tests.csproj @@ -10,10 +10,6 @@ - - - - diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/ResponseUtils.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/ResponseUtils.cs index 9734282c1a..7224056e2b 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/ResponseUtils.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/ResponseUtils.cs @@ -6,11 +6,11 @@ using System.Collections.Generic; using System.Net; using System.Net.Http; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Sockets; using Newtonsoft.Json; -using SocketsTransportType = Microsoft.AspNetCore.Sockets.TransportType; -namespace Microsoft.AspNetCore.Client.Tests +using TransportType = Microsoft.AspNetCore.Http.Connections.TransportType; + +namespace Microsoft.AspNetCore.SignalR.Client.Tests { internal static class ResponseUtils { @@ -38,31 +38,31 @@ namespace Microsoft.AspNetCore.Client.Tests } public static string CreateNegotiationContent(string connectionId = "00000000-0000-0000-0000-000000000000", - SocketsTransportType transportTypes = SocketsTransportType.All) + TransportType transportTypes = TransportType.All) { var availableTransports = new List(); - if ((transportTypes & SocketsTransportType.WebSockets) != 0) + if ((transportTypes & TransportType.WebSockets) != 0) { availableTransports.Add(new { - transport = nameof(SocketsTransportType.WebSockets), + transport = nameof(TransportType.WebSockets), transferFormats = new[] { nameof(TransferFormat.Text), nameof(TransferFormat.Binary) } }); } - if ((transportTypes & SocketsTransportType.ServerSentEvents) != 0) + if ((transportTypes & TransportType.ServerSentEvents) != 0) { availableTransports.Add(new { - transport = nameof(SocketsTransportType.ServerSentEvents), + transport = nameof(TransportType.ServerSentEvents), transferFormats = new[] { nameof(TransferFormat.Text) } }); } - if ((transportTypes & SocketsTransportType.LongPolling) != 0) + if ((transportTypes & TransportType.LongPolling) != 0) { availableTransports.Add(new { - transport = nameof(SocketsTransportType.LongPolling), + transport = nameof(TransportType.LongPolling), transferFormats = new[] { nameof(TransferFormat.Text), nameof(TransferFormat.Binary) } }); } diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/ServerSentEventsParserTests.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/ServerSentEventsParserTests.cs index 6c950800f6..4c2863b46d 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/ServerSentEventsParserTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/ServerSentEventsParserTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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; @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.IO.Pipelines; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNetCore.Sockets.Internal.Formatters; +using Microsoft.AspNetCore.Http.Connections.Client.Internal; using Xunit; namespace Microsoft.AspNetCore.SignalR.Client.Tests @@ -110,31 +110,31 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests var parser = new ServerSentEventsMessageParser(); var pipe = new Pipe(); - byte[] message = null; - SequencePosition consumed = default, examined = default; + byte[] message = null; + SequencePosition consumed = default, examined = default; - for (var i = 0; i < messageParts.Length; i++) - { - var messagePart = messageParts[i]; - await pipe.Writer.WriteAsync(Encoding.UTF8.GetBytes(messagePart)); - var result = await pipe.Reader.ReadAsync(); + for (var i = 0; i < messageParts.Length; i++) + { + var messagePart = messageParts[i]; + await pipe.Writer.WriteAsync(Encoding.UTF8.GetBytes(messagePart)); + var result = await pipe.Reader.ReadAsync(); - var parseResult = parser.ParseMessage(result.Buffer, out consumed, out examined, out message); - pipe.Reader.AdvanceTo(consumed, examined); + var parseResult = parser.ParseMessage(result.Buffer, out consumed, out examined, out message); + pipe.Reader.AdvanceTo(consumed, examined); - // parse result should be complete only after we parsed the last message part - var expectedResult = - i == messageParts.Length - 1 - ? ServerSentEventsMessageParser.ParseResult.Completed - : ServerSentEventsMessageParser.ParseResult.Incomplete; + // parse result should be complete only after we parsed the last message part + var expectedResult = + i == messageParts.Length - 1 + ? ServerSentEventsMessageParser.ParseResult.Completed + : ServerSentEventsMessageParser.ParseResult.Incomplete; - Assert.Equal(expectedResult, parseResult); - } + Assert.Equal(expectedResult, parseResult); + } - Assert.Equal(consumed, examined); + Assert.Equal(consumed, examined); - var resultMessage = Encoding.UTF8.GetString(message); - Assert.Equal(expectedMessage, resultMessage); + var resultMessage = Encoding.UTF8.GetString(message); + Assert.Equal(expectedMessage, resultMessage); } [Theory] @@ -152,23 +152,23 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests { var pipe = new Pipe(); - // Read the first part of the message - await pipe.Writer.WriteAsync(Encoding.UTF8.GetBytes(encodedMessagePart1)); + // Read the first part of the message + await pipe.Writer.WriteAsync(Encoding.UTF8.GetBytes(encodedMessagePart1)); - var result = await pipe.Reader.ReadAsync(); - var parser = new ServerSentEventsMessageParser(); + var result = await pipe.Reader.ReadAsync(); + var parser = new ServerSentEventsMessageParser(); - var parseResult = parser.ParseMessage(result.Buffer, out var consumed, out var examined, out var buffer); - Assert.Equal(ServerSentEventsMessageParser.ParseResult.Incomplete, parseResult); + var parseResult = parser.ParseMessage(result.Buffer, out var consumed, out var examined, out var buffer); + Assert.Equal(ServerSentEventsMessageParser.ParseResult.Incomplete, parseResult); - pipe.Reader.AdvanceTo(consumed, examined); + pipe.Reader.AdvanceTo(consumed, examined); - // Send the rest of the data and parse the complete message - await pipe.Writer.WriteAsync(Encoding.UTF8.GetBytes(encodedMessagePart2)); - result = await pipe.Reader.ReadAsync(); + // Send the rest of the data and parse the complete message + await pipe.Writer.WriteAsync(Encoding.UTF8.GetBytes(encodedMessagePart2)); + result = await pipe.Reader.ReadAsync(); - var ex = Assert.Throws(() => parser.ParseMessage(result.Buffer, out consumed, out examined, out buffer)); - Assert.Equal(expectedMessage, ex.Message); + var ex = Assert.Throws(() => parser.ParseMessage(result.Buffer, out consumed, out examined, out buffer)); + Assert.Equal(expectedMessage, ex.Message); } [Theory] @@ -177,26 +177,26 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests { var pipe = new Pipe(); - // Read the first part of the message - await pipe.Writer.WriteAsync(Encoding.UTF8.GetBytes(message1 + message2)); + // Read the first part of the message + await pipe.Writer.WriteAsync(Encoding.UTF8.GetBytes(message1 + message2)); - var result = await pipe.Reader.ReadAsync(); - var parser = new ServerSentEventsMessageParser(); + var result = await pipe.Reader.ReadAsync(); + var parser = new ServerSentEventsMessageParser(); - var parseResult = parser.ParseMessage(result.Buffer, out var consumed, out var examined, out var message); - Assert.Equal(ServerSentEventsMessageParser.ParseResult.Completed, parseResult); - Assert.Equal("foo", Encoding.UTF8.GetString(message)); - Assert.Equal(consumed, result.Buffer.GetPosition(message1.Length)); - pipe.Reader.AdvanceTo(consumed, examined); - Assert.Equal(consumed, examined); + var parseResult = parser.ParseMessage(result.Buffer, out var consumed, out var examined, out var message); + Assert.Equal(ServerSentEventsMessageParser.ParseResult.Completed, parseResult); + Assert.Equal("foo", Encoding.UTF8.GetString(message)); + Assert.Equal(consumed, result.Buffer.GetPosition(message1.Length)); + pipe.Reader.AdvanceTo(consumed, examined); + Assert.Equal(consumed, examined); - parser.Reset(); + parser.Reset(); - result = await pipe.Reader.ReadAsync(); - parseResult = parser.ParseMessage(result.Buffer, out consumed, out examined, out message); - Assert.Equal(ServerSentEventsMessageParser.ParseResult.Completed, parseResult); - Assert.Equal("bar", Encoding.UTF8.GetString(message)); - pipe.Reader.AdvanceTo(consumed, examined); + result = await pipe.Reader.ReadAsync(); + parseResult = parser.ParseMessage(result.Buffer, out consumed, out examined, out message); + Assert.Equal(ServerSentEventsMessageParser.ParseResult.Completed, parseResult); + Assert.Equal("bar", Encoding.UTF8.GetString(message)); + pipe.Reader.AdvanceTo(consumed, examined); } public static IEnumerable MultilineMessages diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/ServerSentEventsTransportTests.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/ServerSentEventsTransportTests.cs index 2bc9df7dd9..b83f98b3c3 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/ServerSentEventsTransportTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/ServerSentEventsTransportTests.cs @@ -9,14 +9,10 @@ using System.Net.Http.Headers; using System.Reflection; using System.Text; using System.Threading; -using System.Threading.Channels; using System.Threading.Tasks; -using Microsoft.AspNetCore.Client.Tests; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Sockets; -using Microsoft.AspNetCore.Sockets.Client; -using Microsoft.AspNetCore.Sockets.Client.Http; -using Microsoft.AspNetCore.Sockets.Client.Internal; +using Microsoft.AspNetCore.Http.Connections.Client; +using Microsoft.AspNetCore.Http.Connections.Client.Internal; using Moq; using Moq.Protected; using Xunit; @@ -329,7 +325,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.Tests Assert.NotNull(userAgentHeaderCollection); var userAgentHeader = Assert.Single(userAgentHeaderCollection); - Assert.Equal("Microsoft.AspNetCore.Sockets.Client.Http", userAgentHeader.Product.Name); + Assert.Equal("Microsoft.AspNetCore.Http.Connections.Client", userAgentHeader.Product.Name); // user agent version should come from version embedded in assembly metadata var assemblyVersion = typeof(Constants) diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/TestConnection.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/TestConnection.cs index c7dc4f2d96..a97a8f0d1a 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/TestConnection.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/TestConnection.cs @@ -8,12 +8,11 @@ using System.IO.Pipelines; using System.Text; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Connections; +using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.SignalR.Internal; using Microsoft.AspNetCore.SignalR.Internal.Formatters; using Microsoft.AspNetCore.SignalR.Internal.Protocol; -using Microsoft.AspNetCore.Sockets.Client; using Newtonsoft.Json; namespace Microsoft.AspNetCore.SignalR.Client.Tests diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/TestHttpMessageHandler.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/TestHttpMessageHandler.cs index b255f00906..4c8c2ab035 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/TestHttpMessageHandler.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/TestHttpMessageHandler.cs @@ -3,7 +3,6 @@ using System.Net; using System.Net.Http; using System.Threading; using System.Threading.Tasks; -using Microsoft.AspNetCore.Client.Tests; 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 4417be8593..18902e462a 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/TestTransport.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/TestTransport.cs @@ -2,8 +2,7 @@ using System; using System.IO.Pipelines; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Sockets; -using Microsoft.AspNetCore.Sockets.Client; +using Microsoft.AspNetCore.Http.Connections.Client; namespace Microsoft.AspNetCore.SignalR.Client.Tests { diff --git a/test/Microsoft.AspNetCore.SignalR.Client.Tests/TestTransportFactory.cs b/test/Microsoft.AspNetCore.SignalR.Client.Tests/TestTransportFactory.cs index 82b7fc1d31..3668c54fb8 100644 --- a/test/Microsoft.AspNetCore.SignalR.Client.Tests/TestTransportFactory.cs +++ b/test/Microsoft.AspNetCore.SignalR.Client.Tests/TestTransportFactory.cs @@ -1,10 +1,8 @@ // 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.Net.Http; -using Microsoft.AspNetCore.Sockets; -using Microsoft.AspNetCore.Sockets.Client; -using Microsoft.Extensions.Logging; +using Microsoft.AspNetCore.Http.Connections; +using Microsoft.AspNetCore.Http.Connections.Client; namespace Microsoft.AspNetCore.SignalR.Client.Tests { diff --git a/test/Microsoft.AspNetCore.SignalR.Common.Tests/Internal/Formatters/BinaryMessageFormatterTests.cs b/test/Microsoft.AspNetCore.SignalR.Common.Tests/Internal/Formatters/BinaryMessageFormatterTests.cs index 9d55c0a186..3d14e94458 100644 --- a/test/Microsoft.AspNetCore.SignalR.Common.Tests/Internal/Formatters/BinaryMessageFormatterTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Common.Tests/Internal/Formatters/BinaryMessageFormatterTests.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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; @@ -10,7 +10,7 @@ using System.Text; using Microsoft.AspNetCore.SignalR.Internal.Formatters; using Xunit; -namespace Microsoft.AspNetCore.Sockets.Tests.Internal.Formatters +namespace Microsoft.AspNetCore.SignalR.Common.Tests.Internal.Formatters { public partial class BinaryMessageFormatterTests { diff --git a/test/Microsoft.AspNetCore.SignalR.Redis.Tests/RedisEndToEnd.cs b/test/Microsoft.AspNetCore.SignalR.Redis.Tests/RedisEndToEnd.cs index 08128bcb95..4817760350 100644 --- a/test/Microsoft.AspNetCore.SignalR.Redis.Tests/RedisEndToEnd.cs +++ b/test/Microsoft.AspNetCore.SignalR.Redis.Tests/RedisEndToEnd.cs @@ -4,10 +4,10 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; +using Microsoft.AspNetCore.Http.Connections; using Microsoft.AspNetCore.SignalR.Client; using Microsoft.AspNetCore.SignalR.Internal.Protocol; using Microsoft.AspNetCore.SignalR.Tests; -using Microsoft.AspNetCore.Sockets; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; diff --git a/test/Microsoft.AspNetCore.SignalR.Tests.Utils/HubConnectionContextUtils.cs b/test/Microsoft.AspNetCore.SignalR.Tests.Utils/HubConnectionContextUtils.cs index d49e1f67ca..8529ccaf1d 100644 --- a/test/Microsoft.AspNetCore.SignalR.Tests.Utils/HubConnectionContextUtils.cs +++ b/test/Microsoft.AspNetCore.SignalR.Tests.Utils/HubConnectionContextUtils.cs @@ -3,9 +3,7 @@ using System; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.SignalR.Internal; using Microsoft.AspNetCore.SignalR.Internal.Protocol; -using Microsoft.AspNetCore.Sockets; using Microsoft.Extensions.Logging.Abstractions; using Moq; diff --git a/test/Microsoft.AspNetCore.SignalR.Tests.Utils/TestClient.cs b/test/Microsoft.AspNetCore.SignalR.Tests.Utils/TestClient.cs index 31eafa92fc..331d6ec7ce 100644 --- a/test/Microsoft.AspNetCore.SignalR.Tests.Utils/TestClient.cs +++ b/test/Microsoft.AspNetCore.SignalR.Tests.Utils/TestClient.cs @@ -2,9 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Buffers; using System.Collections.Generic; -using System.IO; using System.IO.Pipelines; using System.Security.Claims; using System.Threading; @@ -12,9 +10,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Connections.Features; using Microsoft.AspNetCore.SignalR.Internal; -using Microsoft.AspNetCore.SignalR.Internal.Formatters; using Microsoft.AspNetCore.SignalR.Internal.Protocol; -using Microsoft.AspNetCore.Sockets; namespace Microsoft.AspNetCore.SignalR.Tests { diff --git a/test/Microsoft.AspNetCore.SignalR.Tests/DefaultTransportFactoryTests.cs b/test/Microsoft.AspNetCore.SignalR.Tests/DefaultTransportFactoryTests.cs index 2904a6cb89..15e8bcf2af 100644 --- a/test/Microsoft.AspNetCore.SignalR.Tests/DefaultTransportFactoryTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Tests/DefaultTransportFactoryTests.cs @@ -3,9 +3,9 @@ using System; using System.Net.Http; -using Microsoft.AspNetCore.Sockets; -using Microsoft.AspNetCore.Sockets.Client; -using Microsoft.AspNetCore.Sockets.Client.Internal; +using Microsoft.AspNetCore.Http.Connections; +using Microsoft.AspNetCore.Http.Connections.Client; +using Microsoft.AspNetCore.Http.Connections.Client.Internal; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging; using Xunit; diff --git a/test/Microsoft.AspNetCore.SignalR.Tests/EchoConnectionHandler.cs b/test/Microsoft.AspNetCore.SignalR.Tests/EchoConnectionHandler.cs index 398ccc60f1..61c22db5e6 100644 --- a/test/Microsoft.AspNetCore.SignalR.Tests/EchoConnectionHandler.cs +++ b/test/Microsoft.AspNetCore.SignalR.Tests/EchoConnectionHandler.cs @@ -2,10 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Buffers; -using System.IO.Pipelines; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Sockets; namespace Microsoft.AspNetCore.SignalR.Tests { diff --git a/test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs b/test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs index 070821f81d..8745210955 100644 --- a/test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Tests/EndToEndTests.cs @@ -11,10 +11,9 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; +using Microsoft.AspNetCore.Http.Connections; +using Microsoft.AspNetCore.Http.Connections.Client; using Microsoft.AspNetCore.SignalR.Client; -using Microsoft.AspNetCore.Sockets; -using Microsoft.AspNetCore.Sockets.Client; -using Microsoft.AspNetCore.Sockets.Client.Http; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.AspNetCore.WebUtilities; using Microsoft.Extensions.Logging; diff --git a/test/Microsoft.AspNetCore.SignalR.Tests/HttpHeaderConnectionHandler.cs b/test/Microsoft.AspNetCore.SignalR.Tests/HttpHeaderConnectionHandler.cs index 7b6879f452..266018eec0 100644 --- a/test/Microsoft.AspNetCore.SignalR.Tests/HttpHeaderConnectionHandler.cs +++ b/test/Microsoft.AspNetCore.SignalR.Tests/HttpHeaderConnectionHandler.cs @@ -3,13 +3,11 @@ using System; using System.Buffers; -using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Sockets; -using Microsoft.AspNetCore.Sockets.Http.Features; +using Microsoft.AspNetCore.Http.Connections.Features; namespace Microsoft.AspNetCore.SignalR.Tests { diff --git a/test/Microsoft.AspNetCore.SignalR.Tests/HubConnectionHandlerTests.cs b/test/Microsoft.AspNetCore.SignalR.Tests/HubConnectionHandlerTests.cs index d2367de745..3006234f28 100644 --- a/test/Microsoft.AspNetCore.SignalR.Tests/HubConnectionHandlerTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Tests/HubConnectionHandlerTests.cs @@ -4,17 +4,15 @@ using System; using System.Buffers; using System.Collections.Generic; -using System.IO; using System.Linq; using System.Security.Claims; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Connections; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Http.Connections; using Microsoft.AspNetCore.SignalR.Internal; using Microsoft.AspNetCore.SignalR.Internal.Protocol; -using Microsoft.AspNetCore.SignalR.Tests; -using Microsoft.AspNetCore.Sockets; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Moq; @@ -364,8 +362,8 @@ namespace Microsoft.AspNetCore.SignalR.Tests { client.SupportedFormats = TransferFormat.Text; - var connectionHandlerTask = await client.ConnectAsync(connectionHandler, - sendHandshakeRequestMessage: false, + var connectionHandlerTask = await client.ConnectAsync(connectionHandler, + sendHandshakeRequestMessage: false, expectedHandshakeResponseMessage: false); // Wait for the handshake response @@ -442,8 +440,8 @@ namespace Microsoft.AspNetCore.SignalR.Tests { client.SupportedFormats = TransferFormat.Text; - var connectionHandlerTask = await client.ConnectAsync(connectionHandler, - sendHandshakeRequestMessage: false, + var connectionHandlerTask = await client.ConnectAsync(connectionHandler, + sendHandshakeRequestMessage: false, expectedHandshakeResponseMessage: false); // Wait for the handshake response diff --git a/test/Microsoft.AspNetCore.SignalR.Tests/HubEndpointTestUtils/Utils.cs b/test/Microsoft.AspNetCore.SignalR.Tests/HubEndpointTestUtils/Utils.cs index 88c86a9bf9..d1ed071f74 100644 --- a/test/Microsoft.AspNetCore.SignalR.Tests/HubEndpointTestUtils/Utils.cs +++ b/test/Microsoft.AspNetCore.SignalR.Tests/HubEndpointTestUtils/Utils.cs @@ -3,7 +3,6 @@ using System; using Microsoft.AspNetCore.SignalR.Internal.Protocol; -using Microsoft.AspNetCore.Sockets; using Microsoft.Extensions.DependencyInjection; using Xunit; diff --git a/test/Microsoft.AspNetCore.SignalR.Tests/Microsoft.AspNetCore.SignalR.Tests.csproj b/test/Microsoft.AspNetCore.SignalR.Tests/Microsoft.AspNetCore.SignalR.Tests.csproj index c23bdb901f..0a852ed063 100644 --- a/test/Microsoft.AspNetCore.SignalR.Tests/Microsoft.AspNetCore.SignalR.Tests.csproj +++ b/test/Microsoft.AspNetCore.SignalR.Tests/Microsoft.AspNetCore.SignalR.Tests.csproj @@ -1,4 +1,4 @@ - + $(StandardTestTfms) diff --git a/test/Microsoft.AspNetCore.SignalR.Tests/WebSocketsTransportTests.cs b/test/Microsoft.AspNetCore.SignalR.Tests/WebSocketsTransportTests.cs index 8254ec2a6f..f384b3ad09 100644 --- a/test/Microsoft.AspNetCore.SignalR.Tests/WebSocketsTransportTests.cs +++ b/test/Microsoft.AspNetCore.SignalR.Tests/WebSocketsTransportTests.cs @@ -3,25 +3,19 @@ using System; using System.Buffers; -using System.Collections.Generic; using System.IO.Pipelines; -using System.Linq; using System.Net; -using System.Net.Http; using System.Net.WebSockets; using System.Reflection; using System.Security.Cryptography.X509Certificates; using System.Text; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Sockets; -using Microsoft.AspNetCore.Sockets.Client; -using Microsoft.AspNetCore.Sockets.Client.Http; -using Microsoft.AspNetCore.Sockets.Client.Internal; +using Microsoft.AspNetCore.Http.Connections.Client; +using Microsoft.AspNetCore.Http.Connections.Client.Internal; using Microsoft.AspNetCore.Testing.xunit; using Microsoft.Extensions.Logging.Testing; using Moq; -using Newtonsoft.Json.Linq; using Xunit; using Xunit.Abstractions; @@ -109,7 +103,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests .Assembly .GetCustomAttribute(); - Assert.Equal("Microsoft.AspNetCore.Sockets.Client.Http/" + assemblyVersion.InformationalVersion, userAgent); + Assert.Equal("Microsoft.AspNetCore.Http.Connections.Client/" + assemblyVersion.InformationalVersion, userAgent); } } diff --git a/test/Microsoft.AspNetCore.SignalR.Tests/WriteThenCloseConnectionHandler.cs b/test/Microsoft.AspNetCore.SignalR.Tests/WriteThenCloseConnectionHandler.cs index bf96db4266..f6c93452bb 100644 --- a/test/Microsoft.AspNetCore.SignalR.Tests/WriteThenCloseConnectionHandler.cs +++ b/test/Microsoft.AspNetCore.SignalR.Tests/WriteThenCloseConnectionHandler.cs @@ -2,10 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Buffers; -using System.IO.Pipelines; using System.Threading.Tasks; using Microsoft.AspNetCore.Connections; -using Microsoft.AspNetCore.Sockets; namespace Microsoft.AspNetCore.SignalR.Tests {