From b07972308ea4a22dd970b98319309abf54636993 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Mon, 7 Feb 2022 12:06:23 -0800 Subject: [PATCH] Renaming DisableImplicitFromServiceParameters to DisableImplicitFromServicesParameters --- src/SignalR/server/Core/src/HubConnectionHandler.cs | 4 ++-- src/SignalR/server/Core/src/HubOptions.cs | 2 +- src/SignalR/server/Core/src/HubOptionsSetup`T.cs | 2 +- src/SignalR/server/Core/src/PublicAPI.Unshipped.txt | 4 ++-- src/SignalR/server/SignalR/test/AddSignalRTests.cs | 6 +++--- .../server/SignalR/test/HubConnectionHandlerTests.cs | 8 ++++---- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/SignalR/server/Core/src/HubConnectionHandler.cs b/src/SignalR/server/Core/src/HubConnectionHandler.cs index f3e7343c0c3a..dfdcbe3ce822 100644 --- a/src/SignalR/server/Core/src/HubConnectionHandler.cs +++ b/src/SignalR/server/Core/src/HubConnectionHandler.cs @@ -70,7 +70,7 @@ IServiceScopeFactory serviceScopeFactory _maximumMessageSize = _hubOptions.MaximumReceiveMessageSize; _enableDetailedErrors = _hubOptions.EnableDetailedErrors ?? _enableDetailedErrors; _maxParallelInvokes = _hubOptions.MaximumParallelInvocationsPerClient; - disableImplicitFromServiceParameters = _hubOptions.DisableImplicitFromServiceParameters; + disableImplicitFromServiceParameters = _hubOptions.DisableImplicitFromServicesParameters; if (_hubOptions.HubFilters != null) { @@ -82,7 +82,7 @@ IServiceScopeFactory serviceScopeFactory _maximumMessageSize = _globalHubOptions.MaximumReceiveMessageSize; _enableDetailedErrors = _globalHubOptions.EnableDetailedErrors ?? _enableDetailedErrors; _maxParallelInvokes = _globalHubOptions.MaximumParallelInvocationsPerClient; - disableImplicitFromServiceParameters = _globalHubOptions.DisableImplicitFromServiceParameters; + disableImplicitFromServiceParameters = _globalHubOptions.DisableImplicitFromServicesParameters; if (_globalHubOptions.HubFilters != null) { diff --git a/src/SignalR/server/Core/src/HubOptions.cs b/src/SignalR/server/Core/src/HubOptions.cs index 0f183658336f..7fd11b0cfcb1 100644 --- a/src/SignalR/server/Core/src/HubOptions.cs +++ b/src/SignalR/server/Core/src/HubOptions.cs @@ -81,5 +81,5 @@ public int MaximumParallelInvocationsPerClient /// /// False by default. Hub method arguments will be resolved from a DI container if possible. /// - public bool DisableImplicitFromServiceParameters { get; set; } + public bool DisableImplicitFromServicesParameters { get; set; } } diff --git a/src/SignalR/server/Core/src/HubOptionsSetup`T.cs b/src/SignalR/server/Core/src/HubOptionsSetup`T.cs index 7c2fb0ca621f..b1f12805538d 100644 --- a/src/SignalR/server/Core/src/HubOptionsSetup`T.cs +++ b/src/SignalR/server/Core/src/HubOptionsSetup`T.cs @@ -37,7 +37,7 @@ public void Configure(HubOptions options) options.MaximumReceiveMessageSize = _hubOptions.MaximumReceiveMessageSize; options.StreamBufferCapacity = _hubOptions.StreamBufferCapacity; options.MaximumParallelInvocationsPerClient = _hubOptions.MaximumParallelInvocationsPerClient; - options.DisableImplicitFromServiceParameters = _hubOptions.DisableImplicitFromServiceParameters; + options.DisableImplicitFromServicesParameters = _hubOptions.DisableImplicitFromServicesParameters; options.UserHasSetValues = true; diff --git a/src/SignalR/server/Core/src/PublicAPI.Unshipped.txt b/src/SignalR/server/Core/src/PublicAPI.Unshipped.txt index 0454de320f7f..ffabdf464f3e 100644 --- a/src/SignalR/server/Core/src/PublicAPI.Unshipped.txt +++ b/src/SignalR/server/Core/src/PublicAPI.Unshipped.txt @@ -1,3 +1,3 @@ #nullable enable -Microsoft.AspNetCore.SignalR.HubOptions.DisableImplicitFromServiceParameters.get -> bool -Microsoft.AspNetCore.SignalR.HubOptions.DisableImplicitFromServiceParameters.set -> void +Microsoft.AspNetCore.SignalR.HubOptions.DisableImplicitFromServicesParameters.get -> bool +Microsoft.AspNetCore.SignalR.HubOptions.DisableImplicitFromServicesParameters.set -> void diff --git a/src/SignalR/server/SignalR/test/AddSignalRTests.cs b/src/SignalR/server/SignalR/test/AddSignalRTests.cs index 80ef3e2b6c85..0c29129220d1 100644 --- a/src/SignalR/server/SignalR/test/AddSignalRTests.cs +++ b/src/SignalR/server/SignalR/test/AddSignalRTests.cs @@ -111,7 +111,7 @@ public void HubSpecificOptionsHaveSameValuesAsGlobalHubOptions() Assert.Equal(globalHubOptions.SupportedProtocols, hubOptions.SupportedProtocols); Assert.Equal(globalHubOptions.ClientTimeoutInterval, hubOptions.ClientTimeoutInterval); Assert.Equal(globalHubOptions.MaximumParallelInvocationsPerClient, hubOptions.MaximumParallelInvocationsPerClient); - Assert.Equal(globalHubOptions.DisableImplicitFromServiceParameters, hubOptions.DisableImplicitFromServiceParameters); + Assert.Equal(globalHubOptions.DisableImplicitFromServicesParameters, hubOptions.DisableImplicitFromServicesParameters); Assert.True(hubOptions.UserHasSetValues); } @@ -146,7 +146,7 @@ public void UserSpecifiedOptionsRunAfterDefaultOptions() options.SupportedProtocols = null; options.ClientTimeoutInterval = TimeSpan.FromSeconds(1); options.MaximumParallelInvocationsPerClient = 3; - options.DisableImplicitFromServiceParameters = true; + options.DisableImplicitFromServicesParameters = true; }); var serviceProvider = serviceCollection.BuildServiceProvider(); @@ -160,7 +160,7 @@ public void UserSpecifiedOptionsRunAfterDefaultOptions() Assert.Null(globalOptions.SupportedProtocols); Assert.Equal(3, globalOptions.MaximumParallelInvocationsPerClient); Assert.Equal(TimeSpan.FromSeconds(1), globalOptions.ClientTimeoutInterval); - Assert.True(globalOptions.DisableImplicitFromServiceParameters); + Assert.True(globalOptions.DisableImplicitFromServicesParameters); } [Fact] diff --git a/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs b/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs index 5ba25ff7bfab..a8b675bdb3dc 100644 --- a/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs +++ b/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs @@ -4695,7 +4695,7 @@ public async Task ServiceNotResolvedWithoutAttribute_WithSettingDisabledGlobally provider.AddSignalR(options => { options.EnableDetailedErrors = true; - options.DisableImplicitFromServiceParameters = true; + options.DisableImplicitFromServicesParameters = true; }); provider.AddSingleton(); }); @@ -4738,10 +4738,10 @@ public async Task ServiceResolvedWithoutAttribute_WithHubSpecificSettingEnabled( provider.AddSignalR(options => { options.EnableDetailedErrors = true; - options.DisableImplicitFromServiceParameters = true; + options.DisableImplicitFromServicesParameters = true; }).AddHubOptions(options => { - options.DisableImplicitFromServiceParameters = false; + options.DisableImplicitFromServicesParameters = false; }); provider.AddSingleton(); }); @@ -4763,7 +4763,7 @@ public async Task ServiceNotResolvedWithAndWithoutAttribute_WithOptionDisabled() provider.AddSignalR(options => { options.EnableDetailedErrors = true; - options.DisableImplicitFromServiceParameters = true; + options.DisableImplicitFromServicesParameters = true; }); provider.AddSingleton(); provider.AddSingleton();