Merge branch 'release/2.1' into dev

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}

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

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;
 

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;

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;
         }
     }
-}
+}

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);
         }
     }
-}
+}

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();
     }
-}
+}

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

benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/MessageParserBenchmark.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Buffers;
 using System.IO;
 using BenchmarkDotNet.Attributes;

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();
     }
-}
+}

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
 {

clients/ts/FunctionalTests/FunctionalTests.csproj

@@ -12,6 +12,7 @@
     <None Remove="ts\ConnectionTests.ts" />
     <None Remove="ts\HubConnectionTests.ts" />
     <None Remove="ts\index.ts" />
+    <None Remove="ts\TestLogger.ts" />
     <None Remove="ts\Utils.ts" />
     <None Remove="ts\WebDriverReporter.ts" />
     <None Remove="ts\WebSocketTests.ts" />
@@ -44,6 +45,7 @@
     <TypeScriptCompile Include="ts\ConnectionTests.ts" />
     <TypeScriptCompile Include="ts\HubConnectionTests.ts" />
     <TypeScriptCompile Include="ts\index.ts" />
+    <TypeScriptCompile Include="ts\TestLogger.ts" />
     <TypeScriptCompile Include="ts\Utils.ts" />
     <TypeScriptCompile Include="ts\WebDriverReporter.ts" />
     <TypeScriptCompile Include="ts\WebSocketTests.ts" />

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;

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
 {

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;

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;
 

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
 {

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
     {

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<ConnectionContext>
     {

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
     {

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
     {

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<IChatClient>
     {

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
     {

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
     {

samples/SignalRSamples/SignalRSamples.csproj

@@ -9,7 +9,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.SignalR.MsgPack\Microsoft.AspNetCore.SignalR.MsgPack.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.SignalR\Microsoft.AspNetCore.SignalR.csproj" />
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Sockets.Http\Microsoft.AspNetCore.Sockets.Http.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Http.Connections\Microsoft.AspNetCore.Http.Connections.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.SignalR.Redis\Microsoft.AspNetCore.SignalR.Redis.csproj" />
 
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />

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
     {

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<ConnectionContext>
     {

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
 {

samples/SocialWeather/SocialWeather.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Sockets.Http\Microsoft.AspNetCore.Sockets.Http.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Http.Connections\Microsoft.AspNetCore.Http.Connections.csproj" />
   </ItemGroup>
 
   <ItemGroup>

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

samples/SocketsSample/Properties/launchSettings.json

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

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);
         }
     }
-}
+}

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
             }
         }
     }
-}
+}

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

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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<KeyValuePair<string, object>>
     {

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
     {

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
     {

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
     {

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';

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
     {

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
     {

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);
     }
-}
+}

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
     {

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
     {

src/Microsoft.AspNetCore.Http.Connections.Client/Microsoft.AspNetCore.Http.Connections.Client.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>Client for ASP.NET Core SignalR</Description>
+    <Description>Client for ASP.NET Core Connection Handlers</Description>
     <TargetFrameworks>netstandard2.0;netcoreapp2.1</TargetFrameworks>
   </PropertyGroup>
 
@@ -14,8 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Sockets.Abstractions\Microsoft.AspNetCore.Sockets.Abstractions.csproj" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Sockets.Common.Http\Microsoft.AspNetCore.Sockets.Common.Http.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Http.Connections.Common\Microsoft.AspNetCore.Http.Connections.Common.csproj" />
   </ItemGroup>
 
   <ItemGroup>

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")]

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
     {

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
     {

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
     {

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<string> TransferFormats { get; set; }
     }
-}
+}

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

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
     {

src/Microsoft.AspNetCore.Http.Connections.Common/Microsoft.AspNetCore.Http.Connections.Common.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Description>Common primitives for Sockets clients and servers</Description>
+    <Description>Common primitives for ASP.NET Connection Handlers and clients</Description>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>Microsoft.AspNetCore.Sockets</RootNamespace>
+    <RootNamespace>Microsoft.AspNetCore.Http.Connections</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

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

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
     {

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

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

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
     {

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
     {

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,

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
     {

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<ILogger, string, Exception> _connectionDisposed =
-                LoggerMessage.Define<string>(LogLevel.Debug, new EventId(1, "ConnectionDisposed"), "Connection Id {SocketsConnectionId} was disposed.");
+                LoggerMessage.Define<string>(LogLevel.Debug, new EventId(1, "ConnectionDisposed"), "Connection Id {TransportConnectionId} was disposed.");
 
             private static readonly Action<ILogger, string, string, Exception> _connectionAlreadyActive =
-                LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(2, "ConnectionAlreadyActive"), "Connection Id {SocketsConnectionId} is already active via {RequestId}.");
+                LoggerMessage.Define<string, string>(LogLevel.Debug, new EventId(2, "ConnectionAlreadyActive"), "Connection Id {TransportConnectionId} is already active via {RequestId}.");
 
             private static readonly Action<ILogger, string, string, Exception> _pollCanceled =
-                LoggerMessage.Define<string, string>(LogLevel.Trace, new EventId(3, "PollCanceled"), "Previous poll canceled for {SocketsConnectionId} on {RequestId}.");
+                LoggerMessage.Define<string, string>(LogLevel.Trace, new EventId(3, "PollCanceled"), "Previous poll canceled for {TransportConnectionId} on {RequestId}.");
 
             private static readonly Action<ILogger, Exception> _establishedConnection =
                 LoggerMessage.Define(LogLevel.Debug, new EventId(4, "EstablishedConnection"), "Establishing new connection.");

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
     {

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

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
     {

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
     {

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
     {

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<KeyValuePair<string, object>>
     {
@@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Sockets.Internal
             {
                 if (Count == 1 && index == 0)
                 {
-                    return new KeyValuePair<string, object>("SocketsConnectionId", ConnectionId);
+                    return new KeyValuePair<string, object>("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);
                 }
             }

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);

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<ILogger, string, Exception> _createdNewConnection =
-            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(1, nameof(CreatedNewConnection)), "New connection {SocketsConnectionId} created.");
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(1, nameof(CreatedNewConnection)), "New connection {TransportConnectionId} created.");
 
         private static readonly Action<ILogger, string, Exception> _removedConnection =
-            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(2, nameof(RemovedConnection)), "Removing connection {SocketsConnectionId} from the list of connections.");
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(2, nameof(RemovedConnection)), "Removing connection {TransportConnectionId} from the list of connections.");
 
         private static readonly Action<ILogger, string, Exception> _failedDispose =
-            LoggerMessage.Define<string>(LogLevel.Error, new EventId(3, nameof(FailedDispose)), "Failed disposing connection {SocketsConnectionId}.");
+            LoggerMessage.Define<string>(LogLevel.Error, new EventId(3, nameof(FailedDispose)), "Failed disposing connection {TransportConnectionId}.");
 
         private static readonly Action<ILogger, string, Exception> _connectionReset =
-            LoggerMessage.Define<string>(LogLevel.Trace, new EventId(4, nameof(ConnectionReset)), "Connection {SocketsConnectionId} was reset.");
+            LoggerMessage.Define<string>(LogLevel.Trace, new EventId(4, nameof(ConnectionReset)), "Connection {TransportConnectionId} was reset.");
 
         private static readonly Action<ILogger, string, Exception> _connectionTimedOut =
-            LoggerMessage.Define<string>(LogLevel.Trace, new EventId(5, nameof(ConnectionTimedOut)), "Connection {SocketsConnectionId} timed out.");
+            LoggerMessage.Define<string>(LogLevel.Trace, new EventId(5, nameof(ConnectionTimedOut)), "Connection {TransportConnectionId} timed out.");
 
         private static readonly Action<ILogger, Exception> _scanningConnections =
             LoggerMessage.Define(LogLevel.Trace, new EventId(6, nameof(ScanningConnections)), "Scanning connections.");

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

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
     {

src/Microsoft.AspNetCore.Http.Connections/Microsoft.AspNetCore.Http.Connections.csproj

@@ -13,8 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AspNetCore.Sockets.Common.Http\Microsoft.AspNetCore.Sockets.Common.Http.csproj" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Sockets.Abstractions\Microsoft.AspNetCore.Sockets.Abstractions.csproj" />
+    <ProjectReference Include="..\Microsoft.AspNetCore.Http.Connections.Common\Microsoft.AspNetCore.Http.Connections.Common.csproj" />
   </ItemGroup>
 
   <ItemGroup>

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
     {

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;
 

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

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
 {

src/Microsoft.AspNetCore.SignalR.Client.Core/Microsoft.AspNetCore.SignalR.Client.Core.csproj

@@ -13,7 +13,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.AspNetCore.SignalR.Common\Microsoft.AspNetCore.SignalR.Common.csproj" />
-    <ProjectReference Include="..\Microsoft.AspNetCore.Sockets.Abstractions\Microsoft.AspNetCore.Sockets.Abstractions.csproj" />
   </ItemGroup>
 
   <ItemGroup>

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
 {