diff --git a/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/BroadcastBenchmark.cs b/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/BroadcastBenchmark.cs index 5508022743..9b09dd8017 100644 --- a/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/BroadcastBenchmark.cs +++ b/benchmarks/Microsoft.AspNetCore.SignalR.Microbenchmarks/BroadcastBenchmark.cs @@ -7,6 +7,7 @@ using System.Threading; using System.Threading.Tasks; using BenchmarkDotNet.Attributes; using Microsoft.AspNetCore.Connections; +using Microsoft.AspNetCore.SignalR.Internal; using Microsoft.AspNetCore.SignalR.Protocol; using Microsoft.Extensions.Logging.Abstractions; diff --git a/build/dependencies.props b/build/dependencies.props index fd2d662693..35108cd17a 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -6,72 +6,71 @@ 0.10.13 3.1.0 2.1.0-preview3-17002 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 0.5.0-preview2-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 4.5.0-preview2-26403-05 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 - 2.1.0-preview3-32170 + 1.7.3.4 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 0.5.0-preview2-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 4.5.0-preview2-26406-04 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 + 2.1.0-preview3-32196 2.0.0 - 2.1.0-preview2-26403-06 + 2.1.0-preview2-26406-04 15.6.1 4.7.49 - 1.7.3.4 11.0.2 1.2.4 - 4.5.0-preview2-26403-05 - 4.5.0-preview2-26403-05 - 4.5.0-preview2-26403-05 - 4.5.0-preview2-26403-05 + 4.5.0-preview2-26406-04 + 4.5.0-preview2-26406-04 + 4.5.0-preview2-26406-04 + 4.5.0-preview2-26406-04 3.1.1 4.3.0 - 4.5.0-preview2-26403-05 - 4.5.0-preview2-26403-05 - 4.5.0-preview2-26403-05 + 4.5.0-preview2-26406-04 + 4.5.0-preview2-26406-04 + 4.5.0-preview2-26406-04 2.3.1 2.4.0-beta.1.build3945 diff --git a/samples/ChatSample/PresenceHubLifetimeManager.cs b/samples/ChatSample/PresenceHubLifetimeManager.cs index a318fee4a0..87d8bc3a27 100644 --- a/samples/ChatSample/PresenceHubLifetimeManager.cs +++ b/samples/ChatSample/PresenceHubLifetimeManager.cs @@ -6,9 +6,10 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.SignalR; +using Microsoft.AspNetCore.SignalR.Internal; +using Microsoft.AspNetCore.SignalR.Redis; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Microsoft.AspNetCore.SignalR.Redis; namespace ChatSample { diff --git a/src/Microsoft.AspNetCore.SignalR.Core/DynamicHubClients.cs b/src/Microsoft.AspNetCore.SignalR.Core/DynamicHubClients.cs index e18b01f531..47ffdeae00 100644 --- a/src/Microsoft.AspNetCore.SignalR.Core/DynamicHubClients.cs +++ b/src/Microsoft.AspNetCore.SignalR.Core/DynamicHubClients.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; +using Microsoft.AspNetCore.SignalR.Internal; namespace Microsoft.AspNetCore.SignalR { diff --git a/src/Microsoft.AspNetCore.SignalR.Core/DynamicClientProxy.cs b/src/Microsoft.AspNetCore.SignalR.Core/Internal/DynamicClientProxy.cs similarity index 85% rename from src/Microsoft.AspNetCore.SignalR.Core/DynamicClientProxy.cs rename to src/Microsoft.AspNetCore.SignalR.Core/Internal/DynamicClientProxy.cs index df3060f69a..16e0ddd21d 100644 --- a/src/Microsoft.AspNetCore.SignalR.Core/DynamicClientProxy.cs +++ b/src/Microsoft.AspNetCore.SignalR.Core/Internal/DynamicClientProxy.cs @@ -3,9 +3,9 @@ using System.Dynamic; -namespace Microsoft.AspNetCore.SignalR -{ - public class DynamicClientProxy : DynamicObject +namespace Microsoft.AspNetCore.SignalR.Internal +{ + internal class DynamicClientProxy : DynamicObject { private readonly IClientProxy _clientProxy; diff --git a/src/Microsoft.AspNetCore.SignalR.Core/HubCallerClients.cs b/src/Microsoft.AspNetCore.SignalR.Core/Internal/HubCallerClients.cs similarity index 97% rename from src/Microsoft.AspNetCore.SignalR.Core/HubCallerClients.cs rename to src/Microsoft.AspNetCore.SignalR.Core/Internal/HubCallerClients.cs index 42fa9f791c..b24d60af48 100644 --- a/src/Microsoft.AspNetCore.SignalR.Core/HubCallerClients.cs +++ b/src/Microsoft.AspNetCore.SignalR.Core/Internal/HubCallerClients.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.AspNetCore.SignalR +namespace Microsoft.AspNetCore.SignalR.Internal { public class HubCallerClients : IHubCallerClients { diff --git a/src/Microsoft.AspNetCore.SignalR.Core/HubClients.cs b/src/Microsoft.AspNetCore.SignalR.Core/Internal/HubClients.cs similarity index 92% rename from src/Microsoft.AspNetCore.SignalR.Core/HubClients.cs rename to src/Microsoft.AspNetCore.SignalR.Core/Internal/HubClients.cs index a97c543268..a5e9531983 100644 --- a/src/Microsoft.AspNetCore.SignalR.Core/HubClients.cs +++ b/src/Microsoft.AspNetCore.SignalR.Core/Internal/HubClients.cs @@ -2,11 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using Microsoft.AspNetCore.SignalR.Internal; -namespace Microsoft.AspNetCore.SignalR +namespace Microsoft.AspNetCore.SignalR.Internal { - public class HubClients : IHubClients where THub : Hub + internal class HubClients : IHubClients where THub : Hub { private readonly HubLifetimeManager _lifetimeManager; diff --git a/src/Microsoft.AspNetCore.SignalR.Core/HubClients`T.cs b/src/Microsoft.AspNetCore.SignalR.Core/Internal/HubClients`T.cs similarity index 92% rename from src/Microsoft.AspNetCore.SignalR.Core/HubClients`T.cs rename to src/Microsoft.AspNetCore.SignalR.Core/Internal/HubClients`T.cs index 0f9573470c..c232e15d32 100644 --- a/src/Microsoft.AspNetCore.SignalR.Core/HubClients`T.cs +++ b/src/Microsoft.AspNetCore.SignalR.Core/Internal/HubClients`T.cs @@ -2,11 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using Microsoft.AspNetCore.SignalR.Internal; -namespace Microsoft.AspNetCore.SignalR +namespace Microsoft.AspNetCore.SignalR.Internal { - public class HubClients : IHubClients where THub : Hub + internal class HubClients : IHubClients where THub : Hub { private readonly HubLifetimeManager _lifetimeManager; diff --git a/src/Microsoft.AspNetCore.SignalR.Core/HubContext.cs b/src/Microsoft.AspNetCore.SignalR.Core/Internal/HubContext.cs similarity index 80% rename from src/Microsoft.AspNetCore.SignalR.Core/HubContext.cs rename to src/Microsoft.AspNetCore.SignalR.Core/Internal/HubContext.cs index e9e2b79ac1..5bb92b418a 100644 --- a/src/Microsoft.AspNetCore.SignalR.Core/HubContext.cs +++ b/src/Microsoft.AspNetCore.SignalR.Core/Internal/HubContext.cs @@ -1,11 +1,9 @@ // 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.SignalR.Internal; - -namespace Microsoft.AspNetCore.SignalR +namespace Microsoft.AspNetCore.SignalR.Internal { - public class HubContext : IHubContext where THub : Hub + internal class HubContext : IHubContext where THub : Hub { private readonly HubLifetimeManager _lifetimeManager; private readonly IHubClients _clients; diff --git a/src/Microsoft.AspNetCore.SignalR.Core/HubContext`T.cs b/src/Microsoft.AspNetCore.SignalR.Core/Internal/HubContext`T.cs similarity index 83% rename from src/Microsoft.AspNetCore.SignalR.Core/HubContext`T.cs rename to src/Microsoft.AspNetCore.SignalR.Core/Internal/HubContext`T.cs index 23e95b4022..12fe03dace 100644 --- a/src/Microsoft.AspNetCore.SignalR.Core/HubContext`T.cs +++ b/src/Microsoft.AspNetCore.SignalR.Core/Internal/HubContext`T.cs @@ -1,11 +1,9 @@ // 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.SignalR.Internal; - -namespace Microsoft.AspNetCore.SignalR +namespace Microsoft.AspNetCore.SignalR.Internal { - public class HubContext : IHubContext + internal class HubContext : IHubContext where THub : Hub where T : class { diff --git a/src/Microsoft.AspNetCore.SignalR.Core/HubGroupList.cs b/src/Microsoft.AspNetCore.SignalR.Core/Internal/HubGroupList.cs similarity index 95% rename from src/Microsoft.AspNetCore.SignalR.Core/HubGroupList.cs rename to src/Microsoft.AspNetCore.SignalR.Core/Internal/HubGroupList.cs index 8142735005..af8dcf38fa 100644 --- a/src/Microsoft.AspNetCore.SignalR.Core/HubGroupList.cs +++ b/src/Microsoft.AspNetCore.SignalR.Core/Internal/HubGroupList.cs @@ -7,9 +7,9 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; -namespace Microsoft.AspNetCore.SignalR +namespace Microsoft.AspNetCore.SignalR.Internal { - public class HubGroupList : IReadOnlyCollection> + internal class HubGroupList : IReadOnlyCollection> { private readonly ConcurrentDictionary _groups = new ConcurrentDictionary(StringComparer.Ordinal); diff --git a/src/Microsoft.AspNetCore.SignalR.Core/HubOptionsSetup.cs b/src/Microsoft.AspNetCore.SignalR.Core/Internal/HubOptionsSetup.cs similarity index 97% rename from src/Microsoft.AspNetCore.SignalR.Core/HubOptionsSetup.cs rename to src/Microsoft.AspNetCore.SignalR.Core/Internal/HubOptionsSetup.cs index 576301d558..2aed136de9 100644 --- a/src/Microsoft.AspNetCore.SignalR.Core/HubOptionsSetup.cs +++ b/src/Microsoft.AspNetCore.SignalR.Core/Internal/HubOptionsSetup.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using Microsoft.AspNetCore.SignalR.Protocol; using Microsoft.Extensions.Options; -namespace Microsoft.AspNetCore.SignalR +namespace Microsoft.AspNetCore.SignalR.Internal { public class HubOptionsSetup : IConfigureOptions { diff --git a/src/Microsoft.AspNetCore.SignalR.Core/HubOptionsSetup`T.cs b/src/Microsoft.AspNetCore.SignalR.Core/Internal/HubOptionsSetup`T.cs similarity index 91% rename from src/Microsoft.AspNetCore.SignalR.Core/HubOptionsSetup`T.cs rename to src/Microsoft.AspNetCore.SignalR.Core/Internal/HubOptionsSetup`T.cs index df6bfc226d..8a82d6b48e 100644 --- a/src/Microsoft.AspNetCore.SignalR.Core/HubOptionsSetup`T.cs +++ b/src/Microsoft.AspNetCore.SignalR.Core/Internal/HubOptionsSetup`T.cs @@ -2,9 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.Extensions.Options; -using System.Collections.Generic; -namespace Microsoft.AspNetCore.SignalR +namespace Microsoft.AspNetCore.SignalR.Internal { public class HubOptionsSetup : IConfigureOptions> where THub : Hub { diff --git a/src/Microsoft.AspNetCore.SignalR.Core/SignalRBuilder.cs b/src/Microsoft.AspNetCore.SignalR.Core/Internal/SignalRBuilder.cs similarity index 67% rename from src/Microsoft.AspNetCore.SignalR.Core/SignalRBuilder.cs rename to src/Microsoft.AspNetCore.SignalR.Core/Internal/SignalRBuilder.cs index 51f0fb5502..f9e62b5c02 100644 --- a/src/Microsoft.AspNetCore.SignalR.Core/SignalRBuilder.cs +++ b/src/Microsoft.AspNetCore.SignalR.Core/Internal/SignalRBuilder.cs @@ -1,15 +1,11 @@ // 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.Linq; -using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; -namespace Microsoft.AspNetCore.SignalR +namespace Microsoft.AspNetCore.SignalR.Internal { - public class SignalRServerBuilder : ISignalRServerBuilder + internal class SignalRServerBuilder : ISignalRServerBuilder { public SignalRServerBuilder(IServiceCollection services) { diff --git a/src/Microsoft.AspNetCore.SignalR/SignalRDependencyInjectionExtensions.cs b/src/Microsoft.AspNetCore.SignalR/SignalRDependencyInjectionExtensions.cs index 8febc0ab09..9799583ec7 100644 --- a/src/Microsoft.AspNetCore.SignalR/SignalRDependencyInjectionExtensions.cs +++ b/src/Microsoft.AspNetCore.SignalR/SignalRDependencyInjectionExtensions.cs @@ -3,6 +3,7 @@ using System; using Microsoft.AspNetCore.SignalR; +using Microsoft.AspNetCore.SignalR.Internal; using Microsoft.Extensions.Options; namespace Microsoft.Extensions.DependencyInjection @@ -15,7 +16,7 @@ namespace Microsoft.Extensions.DependencyInjection signalrBuilder.Services.Configure(options); return signalrBuilder; } - + public static ISignalRServerBuilder AddSignalR(this IServiceCollection services) { services.AddConnections();