diff --git a/SignalR.sln b/SignalR.sln
index 2633db8191..8a663cb7e9 100644
--- a/SignalR.sln
+++ b/SignalR.sln
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
-VisualStudioVersion = 15.0.26730.10
+VisualStudioVersion = 15.0.26823.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DA69F624-5398-4884-87E4-B816698CDE65}"
ProjectSection(SolutionItems) = preProject
@@ -31,7 +31,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6A35B453-5
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}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR", "src\Microsoft.AspNetCore.SignalR\Microsoft.AspNetCore.SignalR.csproj", "{42E76F87-92B6-45AB-BF07-6B811C0F2CAC}"
+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
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.SignalR.Redis", "src\Microsoft.AspNetCore.SignalR.Redis\Microsoft.AspNetCore.SignalR.Redis.csproj", "{59319B72-38BE-4041-8E5C-FF6938874CE8}"
EndProject
diff --git a/src/Microsoft.AspNetCore.SignalR/DefaultHubActivator.cs b/src/Microsoft.AspNetCore.SignalR.Core/DefaultHubActivator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/DefaultHubActivator.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/DefaultHubActivator.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/DefaultHubLifetimeManager.cs b/src/Microsoft.AspNetCore.SignalR.Core/DefaultHubLifetimeManager.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/DefaultHubLifetimeManager.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/DefaultHubLifetimeManager.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/DynamicClientProxy.cs b/src/Microsoft.AspNetCore.SignalR.Core/DynamicClientProxy.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/DynamicClientProxy.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/DynamicClientProxy.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/DynamicHub.cs b/src/Microsoft.AspNetCore.SignalR.Core/DynamicHub.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/DynamicHub.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/DynamicHub.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/DynamicHubClients.cs b/src/Microsoft.AspNetCore.SignalR.Core/DynamicHubClients.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/DynamicHubClients.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/DynamicHubClients.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/Features/IHubFeature.cs b/src/Microsoft.AspNetCore.SignalR.Core/Features/IHubFeature.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/Features/IHubFeature.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/Features/IHubFeature.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/Hub.cs b/src/Microsoft.AspNetCore.SignalR.Core/Hub.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/Hub.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/Hub.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/HubCallerContext.cs b/src/Microsoft.AspNetCore.SignalR.Core/HubCallerContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/HubCallerContext.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/HubCallerContext.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/HubConnectionContext.cs b/src/Microsoft.AspNetCore.SignalR.Core/HubConnectionContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/HubConnectionContext.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/HubConnectionContext.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/HubConnectionList.cs b/src/Microsoft.AspNetCore.SignalR.Core/HubConnectionList.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/HubConnectionList.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/HubConnectionList.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/HubContext.cs b/src/Microsoft.AspNetCore.SignalR.Core/HubContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/HubContext.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/HubContext.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/HubEndPoint.cs b/src/Microsoft.AspNetCore.SignalR.Core/HubEndPoint.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/HubEndPoint.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/HubEndPoint.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/HubLifetimeManager.cs b/src/Microsoft.AspNetCore.SignalR.Core/HubLifetimeManager.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/HubLifetimeManager.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/HubLifetimeManager.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/HubOptions.cs b/src/Microsoft.AspNetCore.SignalR.Core/HubOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/HubOptions.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/HubOptions.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/Hub`T.cs b/src/Microsoft.AspNetCore.SignalR.Core/Hub`T.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/Hub`T.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/Hub`T.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/IClientProxy.cs b/src/Microsoft.AspNetCore.SignalR.Core/IClientProxy.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/IClientProxy.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/IClientProxy.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/IGroupManager.cs b/src/Microsoft.AspNetCore.SignalR.Core/IGroupManager.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/IGroupManager.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/IGroupManager.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/IHubActivator.cs b/src/Microsoft.AspNetCore.SignalR.Core/IHubActivator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/IHubActivator.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/IHubActivator.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/IHubClients.cs b/src/Microsoft.AspNetCore.SignalR.Core/IHubClients.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/IHubClients.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/IHubClients.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/IHubClients`T.cs b/src/Microsoft.AspNetCore.SignalR.Core/IHubClients`T.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/IHubClients`T.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/IHubClients`T.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/IHubContext.cs b/src/Microsoft.AspNetCore.SignalR.Core/IHubContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/IHubContext.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/IHubContext.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/ISignalRBuilder.cs b/src/Microsoft.AspNetCore.SignalR.Core/ISignalRBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/ISignalRBuilder.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/ISignalRBuilder.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/Internal/AsyncEnumeratorAdapters.cs b/src/Microsoft.AspNetCore.SignalR.Core/Internal/AsyncEnumeratorAdapters.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/Internal/AsyncEnumeratorAdapters.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/Internal/AsyncEnumeratorAdapters.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/Internal/DefaultHubProtocolResolver.cs b/src/Microsoft.AspNetCore.SignalR.Core/Internal/DefaultHubProtocolResolver.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/Internal/DefaultHubProtocolResolver.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/Internal/DefaultHubProtocolResolver.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/Internal/HubReflectionHelper.cs b/src/Microsoft.AspNetCore.SignalR.Core/Internal/HubReflectionHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/Internal/HubReflectionHelper.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/Internal/HubReflectionHelper.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/Internal/IHubProtocolResolver.cs b/src/Microsoft.AspNetCore.SignalR.Core/Internal/IHubProtocolResolver.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/Internal/IHubProtocolResolver.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/Internal/IHubProtocolResolver.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/Internal/TypeBaseEnumerationExtensions.cs b/src/Microsoft.AspNetCore.SignalR.Core/Internal/TypeBaseEnumerationExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/Internal/TypeBaseEnumerationExtensions.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/Internal/TypeBaseEnumerationExtensions.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/Microsoft.AspNetCore.SignalR.csproj b/src/Microsoft.AspNetCore.SignalR.Core/Microsoft.AspNetCore.SignalR.Core.csproj
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/Microsoft.AspNetCore.SignalR.csproj
rename to src/Microsoft.AspNetCore.SignalR.Core/Microsoft.AspNetCore.SignalR.Core.csproj
diff --git a/src/Microsoft.AspNetCore.SignalR/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.SignalR.Core/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/Proxies.cs b/src/Microsoft.AspNetCore.SignalR.Core/Proxies.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/Proxies.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/Proxies.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/SignalRBuilder.cs b/src/Microsoft.AspNetCore.SignalR.Core/SignalRBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/SignalRBuilder.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/SignalRBuilder.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/SignalRDependencyInjectionExtensions.cs b/src/Microsoft.AspNetCore.SignalR.Core/SignalRDependencyInjectionExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/SignalRDependencyInjectionExtensions.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/SignalRDependencyInjectionExtensions.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/SignalRSocketBuilderExtensions.cs b/src/Microsoft.AspNetCore.SignalR.Core/SignalRSocketBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/SignalRSocketBuilderExtensions.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/SignalRSocketBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/TypedClientBuilder.cs b/src/Microsoft.AspNetCore.SignalR.Core/TypedClientBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/TypedClientBuilder.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/TypedClientBuilder.cs
diff --git a/src/Microsoft.AspNetCore.SignalR/TypedHubClients.cs b/src/Microsoft.AspNetCore.SignalR.Core/TypedHubClients.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.SignalR/TypedHubClients.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/TypedHubClients.cs
diff --git a/src/Microsoft.AspNetCore.SignalR.Http/Microsoft.AspNetCore.SignalR.Http.csproj b/src/Microsoft.AspNetCore.SignalR.Http/Microsoft.AspNetCore.SignalR.Http.csproj
index 89774847e1..d588565bb8 100644
--- a/src/Microsoft.AspNetCore.SignalR.Http/Microsoft.AspNetCore.SignalR.Http.csproj
+++ b/src/Microsoft.AspNetCore.SignalR.Http/Microsoft.AspNetCore.SignalR.Http.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/src/Microsoft.AspNetCore.SignalR.Redis/Microsoft.AspNetCore.SignalR.Redis.csproj b/src/Microsoft.AspNetCore.SignalR.Redis/Microsoft.AspNetCore.SignalR.Redis.csproj
index 2eb64c0ec3..93abfeda35 100644
--- a/src/Microsoft.AspNetCore.SignalR.Redis/Microsoft.AspNetCore.SignalR.Redis.csproj
+++ b/src/Microsoft.AspNetCore.SignalR.Redis/Microsoft.AspNetCore.SignalR.Redis.csproj
@@ -5,13 +5,13 @@
netstandard2.0
-
-
-
-
+
+
+
+