If you scroll down a long way, you'll find more content. We add it asynchronously via streaming rendering.

diff --git a/src/Framework/AspNetCoreAnalyzers/src/Analyzers/Mvc/DetectAmbiguousActionRoutes.cs b/src/Framework/AspNetCoreAnalyzers/src/Analyzers/Mvc/DetectAmbiguousActionRoutes.cs index 3bb454473cce..a3c66da1e17e 100644 --- a/src/Framework/AspNetCoreAnalyzers/src/Analyzers/Mvc/DetectAmbiguousActionRoutes.cs +++ b/src/Framework/AspNetCoreAnalyzers/src/Analyzers/Mvc/DetectAmbiguousActionRoutes.cs @@ -20,7 +20,7 @@ public partial class MvcAnalyzer { private static void DetectAmbiguousActionRoutes(SymbolAnalysisContext context, WellKnownTypes wellKnownTypes, RoutePatternTree? controllerRoutePattern, List actionRoutes) { - var controllerHasActionReplacement = controllerRoutePattern != null ? HasActionReplacementToken(controllerRoutePattern) : false; + var controllerHasActionToken = controllerRoutePattern != null ? HasActionToken(controllerRoutePattern) : false; // Ambiguous action route detection is conservative in what it detects to avoid false positives. // @@ -33,7 +33,7 @@ private static void DetectAmbiguousActionRoutes(SymbolAnalysisContext context, W { // Group action routes together. When multiple match in a group, then report action routes to diagnostics. var groupedByParent = actionRoutes - .GroupBy(ar => new ActionRouteGroupKey(ar.ActionSymbol, ar.RouteUsageModel.RoutePattern, ar.HttpMethods, controllerHasActionReplacement, wellKnownTypes)); + .GroupBy(ar => new ActionRouteGroupKey(ar.ActionSymbol, ar.RouteUsageModel.RoutePattern, ar.HttpMethods, controllerHasActionToken, wellKnownTypes)); foreach (var ambiguousGroup in groupedByParent.Where(g => g.Count() >= 2)) { @@ -48,7 +48,12 @@ private static void DetectAmbiguousActionRoutes(SymbolAnalysisContext context, W } } - private static bool HasActionReplacementToken(RoutePatternTree routePattern) + ///

+ /// Search route pattern for: + /// 1. Action replacement tokens, [action] + /// 2. Action parameter tokens, {action} + ///

+ private static bool HasActionToken(RoutePatternTree routePattern) { for (var i = 0; i < routePattern.Root.Parts.Length; i++) { @@ -67,6 +72,23 @@ private static bool HasActionReplacementToken(RoutePatternTree routePattern) } } } + else if (segment.Children[j] is RoutePatternParameterNode parameterNode) + { + for (var k = 0; k < parameterNode.ParameterParts.Length; k++) + { + if (parameterNode.ParameterParts[k] is RoutePatternNameParameterPartNode namePartNode) + { + if (!namePartNode.ParameterNameToken.IsMissing) + { + var name = namePartNode.ParameterNameToken.Value!.ToString(); + if (string.Equals(name, "action", StringComparison.OrdinalIgnoreCase)) + { + return true; + } + } + } + } + } } } } @@ -80,10 +102,10 @@ private static bool HasActionReplacementToken(RoutePatternTree routePattern) public RoutePatternTree RoutePattern { get; } public ImmutableArray HttpMethods { get; } public string ActionName { get; } - public bool HasActionReplacement { get; } + public bool HasActionToken { get; } private readonly WellKnownTypes _wellKnownTypes; - public ActionRouteGroupKey(IMethodSymbol actionSymbol, RoutePatternTree routePattern, ImmutableArray httpMethods, bool controllerHasActionReplacement, WellKnownTypes wellKnownTypes) + public ActionRouteGroupKey(IMethodSymbol actionSymbol, RoutePatternTree routePattern, ImmutableArray httpMethods, bool controllerHasActionToken, WellKnownTypes wellKnownTypes) { Debug.Assert(!httpMethods.IsDefault); @@ -92,7 +114,7 @@ public ActionRouteGroupKey(IMethodSymbol actionSymbol, RoutePatternTree routePat HttpMethods = httpMethods; _wellKnownTypes = wellKnownTypes; ActionName = GetActionName(ActionSymbol, _wellKnownTypes); - HasActionReplacement = controllerHasActionReplacement || HasActionReplacementToken(RoutePattern); + HasActionToken = controllerHasActionToken || HasActionToken(RoutePattern); } private static string GetActionName(IMethodSymbol actionSymbol, WellKnownTypes wellKnownTypes) @@ -118,7 +140,7 @@ public bool Equals(ActionRouteGroupKey other) { return AmbiguousRoutePatternComparer.Instance.Equals(RoutePattern, other.RoutePattern) && - (!HasActionReplacement || string.Equals(ActionName, other.ActionName, StringComparison.OrdinalIgnoreCase)) && + (!HasActionToken || string.Equals(ActionName, other.ActionName, StringComparison.OrdinalIgnoreCase)) && HasMatchingHttpMethods(HttpMethods, other.HttpMethods) && CanMatchActions(_wellKnownTypes, ActionSymbol, other.ActionSymbol); } diff --git a/src/Framework/AspNetCoreAnalyzers/test/Mvc/DetectAmbiguousActionRoutesTest.cs b/src/Framework/AspNetCoreAnalyzers/test/Mvc/DetectAmbiguousActionRoutesTest.cs index 285ff95c36ee..d970d00188c1 100644 --- a/src/Framework/AspNetCoreAnalyzers/test/Mvc/DetectAmbiguousActionRoutesTest.cs +++ b/src/Framework/AspNetCoreAnalyzers/test/Mvc/DetectAmbiguousActionRoutesTest.cs @@ -318,6 +318,284 @@ static void Main(string[] args) await VerifyCS.VerifyAnalyzerAsync(source); } + [Fact] + public async Task ActionRouteToken_DifferentActionNames_NoDiagnostics() + { + // Arrange + var source = @" +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Mvc; +public class WeatherForecastController : ControllerBase +{ + [Route(""{action}"")] + public object Get() => new object(); + + [Route(""{action}"")] + public object Get1() => new object(); +} +internal class Program +{ + static void Main(string[] args) + { + } +} +"; + + // Act & Assert + await VerifyCS.VerifyAnalyzerAsync(source); + } + + [Fact] + public async Task ActionRouteToken_SameActionName_HasDiagnostics() + { + // Arrange + var source = @" +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Mvc; +public class WeatherForecastController : ControllerBase +{ + [Route({|#0:""{action}""|})] + public object Get() => new object(); + + [Route({|#1:""{action}""|})] + public object Get(int i) => new object(); +} +internal class Program +{ + static void Main(string[] args) + { + } +} +"; + + var expectedDiagnostics = new[] { + new DiagnosticResult(DiagnosticDescriptors.AmbiguousActionRoute).WithArguments("{action}").WithLocation(0), + new DiagnosticResult(DiagnosticDescriptors.AmbiguousActionRoute).WithArguments("{action}").WithLocation(1) + }; + + // Act & Assert + await VerifyCS.VerifyAnalyzerAsync(source, expectedDiagnostics); + } + + [Fact] + public async Task ActionRouteToken_ActionNameAttribute_HasDiagnostics() + { + // Arrange + var source = @" +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Mvc; +public class WeatherForecastController : ControllerBase +{ + [Route({|#0:""{action}""|})] + public object Get() => new object(); + + [Route({|#1:""{action}""|})] + [ActionName(""get"")] + public object Get1(int i) => new object(); +} +internal class Program +{ + static void Main(string[] args) + { + } +} +"; + + var expectedDiagnostics = new[] { + new DiagnosticResult(DiagnosticDescriptors.AmbiguousActionRoute).WithArguments("{action}").WithLocation(0), + new DiagnosticResult(DiagnosticDescriptors.AmbiguousActionRoute).WithArguments("{action}").WithLocation(1) + }; + + // Act & Assert + await VerifyCS.VerifyAnalyzerAsync(source, expectedDiagnostics); + } + + [Fact] + public async Task ActionRouteToken_ActionNameAttributeNullValue_NoDiagnostics() + { + // Arrange + var source = @" +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Mvc; +public class WeatherForecastController : ControllerBase +{ + [Route({|#0:""{action}""|})] + public object Get() => new object(); + + [Route({|#1:""{action}""|})] + [ActionName(null)] + public object Get1(int i) => new object(); +} +internal class Program +{ + static void Main(string[] args) + { + } +} +"; + + // Act & Assert + await VerifyCS.VerifyAnalyzerAsync(source); + } + + [Fact] + public async Task ActionRouteToken_OnController_NoDiagnostics() + { + // Arrange + var source = @" +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Mvc; +[Route(""{controller}/{action}"")] +public class WeatherForecastController : ControllerBase +{ + [Route(""{i}"")] + public object Get(int i) => new object(); + + [Route(""{i}"")] + public object Get1(int i) => new object(); +} +internal class Program +{ + static void Main(string[] args) + { + } +} +"; + + // Act & Assert + await VerifyCS.VerifyAnalyzerAsync(source); + } + + [Fact] + public async Task ActionRouteToken_OnBaseController_NoDiagnostics() + { + // Arrange + var source = @" +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Mvc; +[Route(""{controller}/{action}"")] +public class MyControllerBase : ControllerBase +{ +} +public class WeatherForecastController : MyControllerBase +{ + [Route(""{i}"")] + public object Get(int i) => new object(); + + [Route(""{i}"")] + public object Get1(int i) => new object(); +} +internal class Program +{ + static void Main(string[] args) + { + } +} +"; + + // Act & Assert + await VerifyCS.VerifyAnalyzerAsync(source); + } + + [Fact] + public async Task ActionRouteToken_OnBaseControllerButOverridden_HasDiagnostics() + { + // Arrange + var source = @" +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Mvc; +[Route(""{controller}/{action}"")] +public class MyControllerBase : ControllerBase +{ +} +[Route(""api"")] +public class WeatherForecastController : MyControllerBase +{ + [Route({|#0:""{i}""|})] + public object Get(int i) => new object(); + + [Route({|#1:""{i}""|})] + public object Get1(int i) => new object(); +} +internal class Program +{ + static void Main(string[] args) + { + } +} +"; + + var expectedDiagnostics = new[] { + new DiagnosticResult(DiagnosticDescriptors.AmbiguousActionRoute).WithArguments("{i}").WithLocation(0), + new DiagnosticResult(DiagnosticDescriptors.AmbiguousActionRoute).WithArguments("{i}").WithLocation(1) + }; + + // Act & Assert + await VerifyCS.VerifyAnalyzerAsync(source, expectedDiagnostics); + } + + [Fact] + public async Task ActionRouteToken_OnController_ActionName_NoDiagnostics() + { + // Arrange + var source = @" +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Mvc; +[Route(""{controller}/{action}"")] +public class WeatherForecastController : ControllerBase +{ + [Route(""{i}"")] + public object Get(int i) => new object(); + + [Route(""{s}"")] + [ActionName(name: ""getWithString"")] + public object Get(string s) => new object(); +} +internal class Program +{ + static void Main(string[] args) + { + } +} +"; + + // Act & Assert + await VerifyCS.VerifyAnalyzerAsync(source); + } + + [Fact] + public async Task ActionRouteToken_OnController_ActionNameOnBase_NoDiagnostics() + { + // Arrange + var source = @" +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Mvc; +public abstract class MyControllerBase : ControllerBase +{ + [ActionName(name: ""getWithString"")] + public abstract object Get(string s); +} +[Route(""{controller}/{action}"")] +public class WeatherForecastController : MyControllerBase +{ + [Route(""{i}"")] + public object Get(int i) => new object(); + + [Route(""{s}"")] + public override object Get(string s) => new object(); +} +internal class Program +{ + static void Main(string[] args) + { + } +} +"; + + // Act & Assert + await VerifyCS.VerifyAnalyzerAsync(source); + } + [Fact] public async Task MixedRoutes_DifferentAction_HasDiagnostics() { diff --git a/src/Http/Http.Abstractions/src/ProblemDetails/HttpValidationProblemDetails.cs b/src/Http/Http.Abstractions/src/ProblemDetails/HttpValidationProblemDetails.cs index af225a4b13fd..99d07781b92a 100644 --- a/src/Http/Http.Abstractions/src/ProblemDetails/HttpValidationProblemDetails.cs +++ b/src/Http/Http.Abstractions/src/ProblemDetails/HttpValidationProblemDetails.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Text.Json.Serialization; using Microsoft.AspNetCore.Mvc; namespace Microsoft.AspNetCore.Http; @@ -36,5 +37,6 @@ private HttpValidationProblemDetails(Dictionary errors) ///

/// Gets the validation errors associated with this instance of . ///

+ [JsonPropertyName("errors")] public IDictionary Errors { get; set; } = new Dictionary(StringComparer.Ordinal); } diff --git a/src/Http/Http.Abstractions/src/ProblemDetails/ProblemDetails.cs b/src/Http/Http.Abstractions/src/ProblemDetails/ProblemDetails.cs index 96c7db573ba0..02a002451c4f 100644 --- a/src/Http/Http.Abstractions/src/ProblemDetails/ProblemDetails.cs +++ b/src/Http/Http.Abstractions/src/ProblemDetails/ProblemDetails.cs @@ -18,6 +18,7 @@ public class ProblemDetails /// [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] [JsonPropertyOrder(-5)] + [JsonPropertyName("type")] public string? Type { get; set; } ///

@@ -27,6 +28,7 @@ public class ProblemDetails ///

[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] [JsonPropertyOrder(-4)] + [JsonPropertyName("title")] public string? Title { get; set; } ///

@@ -34,6 +36,7 @@ public class ProblemDetails ///

[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] [JsonPropertyOrder(-3)] + [JsonPropertyName("status")] public int? Status { get; set; } ///

@@ -41,6 +44,7 @@ public class ProblemDetails ///

[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] [JsonPropertyOrder(-2)] + [JsonPropertyName("detail")] public string? Detail { get; set; } ///

@@ -48,6 +52,7 @@ public class ProblemDetails ///

[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] [JsonPropertyOrder(-1)] + [JsonPropertyName("instance")] public string? Instance { get; set; } ///

diff --git a/src/Http/Http.Extensions/test/ProblemDetailsDefaultWriterTest.cs b/src/Http/Http.Extensions/test/ProblemDetailsDefaultWriterTest.cs index 5bd053f13f7d..8df91d099930 100644 --- a/src/Http/Http.Extensions/test/ProblemDetailsDefaultWriterTest.cs +++ b/src/Http/Http.Extensions/test/ProblemDetailsDefaultWriterTest.cs @@ -54,6 +54,68 @@ public async Task WriteAsync_Works() Assert.Equal(expectedProblem.Instance, problemDetails.Instance); } + [Fact] + public async Task WriteAsync_Works_ProperCasing() + { + // Arrange + var writer = GetWriter(); + var stream = new MemoryStream(); + var context = CreateContext(stream); + var expectedProblem = new ProblemDetails() + { + Detail = "Custom Bad Request", + Instance = "Custom Bad Request", + Status = StatusCodes.Status400BadRequest, + Type = "https://tools.ietf.org/html/rfc9110#section-15.5.1-custom", + Title = "Custom Bad Request", + Extensions = new Dictionary() { { "extensionKey", 1 } } + }; + var problemDetailsContext = new ProblemDetailsContext() + { + HttpContext = context, + ProblemDetails = expectedProblem + }; + + //Act + await writer.WriteAsync(problemDetailsContext); + + //Assert + stream.Position = 0; + var result = await JsonSerializer.DeserializeAsync>(stream, JsonSerializerOptions.Default); + Assert.Equal(result.Keys, new(new() { { "type", 0 }, { "title", 1 }, { "status", 2 }, { "detail", 3 }, { "instance", 4 }, { "extensionKey", 5 } })); + } + + [Fact] + public async Task WriteAsync_Works_ProperCasing_ValidationProblemDetails() + { + // Arrange + var writer = GetWriter(); + var stream = new MemoryStream(); + var context = CreateContext(stream); + var expectedProblem = new ValidationProblemDetails() + { + Detail = "Custom Bad Request", + Instance = "Custom Bad Request", + Status = StatusCodes.Status400BadRequest, + Type = "https://tools.ietf.org/html/rfc9110#section-15.5.1-custom", + Title = "Custom Bad Request", + Errors = new Dictionary() { { "name", ["Name is invalid."] } } + }; + var problemDetailsContext = new ProblemDetailsContext() + { + HttpContext = context, + ProblemDetails = expectedProblem + }; + + //Act + await writer.WriteAsync(problemDetailsContext); + + //Assert + stream.Position = 0; + var result = await JsonSerializer.DeserializeAsync>(stream, JsonSerializerOptions.Default); + Assert.Equal(result.Keys, new(new() { { "type", 0 }, { "title", 1 }, { "status", 2 }, { "detail", 3 }, { "instance", 4 }, { "errors", 5 } })); + } + [Fact] public async Task WriteAsync_Works_WhenReplacingProblemDetailsUsingSetter() { diff --git a/src/Identity/Core/src/Data/IdentityEndpointsJsonSerializerContext.cs b/src/Identity/Core/src/Data/IdentityEndpointsJsonSerializerContext.cs index 1c3f09fbd462..e459042e9ce4 100644 --- a/src/Identity/Core/src/Data/IdentityEndpointsJsonSerializerContext.cs +++ b/src/Identity/Core/src/Data/IdentityEndpointsJsonSerializerContext.cs @@ -9,6 +9,7 @@ namespace Microsoft.AspNetCore.Identity.Data; [JsonSerializable(typeof(LoginRequest))] [JsonSerializable(typeof(RefreshRequest))] [JsonSerializable(typeof(ResetPasswordRequest))] +[JsonSerializable(typeof(ForgotPasswordRequest))] [JsonSerializable(typeof(ResendConfirmationEmailRequest))] [JsonSerializable(typeof(InfoRequest))] [JsonSerializable(typeof(InfoResponse))] diff --git a/src/Mvc/Mvc.Core/src/ValidationProblemDetails.cs b/src/Mvc/Mvc.Core/src/ValidationProblemDetails.cs index 0701521ebb3e..d3ce4af1a8ce 100644 --- a/src/Mvc/Mvc.Core/src/ValidationProblemDetails.cs +++ b/src/Mvc/Mvc.Core/src/ValidationProblemDetails.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Text.Json.Serialization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Core; using Microsoft.AspNetCore.Mvc.ModelBinding; @@ -81,5 +82,6 @@ public ValidationProblemDetails(IDictionary errors) ///

/// Gets the validation errors associated with this instance of . ///

+ [JsonPropertyName("errors")] public new IDictionary Errors { get { return base.Errors; } set { base.Errors = value; } } } diff --git a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs index 7f97e1e29761..c47953e4eebb 100644 --- a/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs +++ b/src/SignalR/common/Http.Connections/src/Internal/HttpConnectionDispatcher.cs @@ -168,6 +168,14 @@ private async Task ExecuteAsync(HttpContext context, ConnectionDelegate connecti { transport = HttpTransportType.WebSockets; connection = await GetOrCreateConnectionAsync(context, options); + + if (connection is not null) + { + Log.EstablishedConnection(_logger); + + // Allow the reads to be canceled + connection.Cancellation ??= new CancellationTokenSource(); + } } else { diff --git a/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs b/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs index 20ba0fc3dc99..f55f5756ac45 100644 --- a/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs +++ b/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs @@ -2866,6 +2866,37 @@ public async Task WebSocketConnectionClosingTriggersConnectionClosedToken() } } + [Fact] + public async Task ServerClosingClosesWebSocketConnection() + { + using (StartVerifiableLog()) + { + var manager = CreateConnectionManager(LoggerFactory); + var connection = manager.CreateConnection(); + + var dispatcher = CreateDispatcher(manager, LoggerFactory); + var services = new ServiceCollection(); + services.AddSingleton(); + var context = MakeRequest("/foo", connection, services); + SetTransport(context, HttpTransportType.WebSockets); + + var builder = new ConnectionBuilder(services.BuildServiceProvider()); + builder.UseConnectionHandler(); + var app = builder.Build(); + var options = new HttpConnectionDispatcherOptions(); + options.WebSockets.CloseTimeout = TimeSpan.FromSeconds(1); + + var executeTask = dispatcher.ExecuteAsync(context, options, app); + + // "close" server, since we're not using a server in these tests we just simulate what would be called when the server closes + await connection.DisposeAsync().DefaultTimeout(); + + await connection.ConnectionClosed.WaitForCancellationAsync().DefaultTimeout(); + + await executeTask.DefaultTimeout(); + } + } + public class CustomHttpRequestLifetimeFeature : IHttpRequestLifetimeFeature { public CancellationToken RequestAborted { get; set; } diff --git a/src/SignalR/server/Core/src/DefaultHubLifetimeManager.cs b/src/SignalR/server/Core/src/DefaultHubLifetimeManager.cs index eec5f9ea2546..1eba4726f893 100644 --- a/src/SignalR/server/Core/src/DefaultHubLifetimeManager.cs +++ b/src/SignalR/server/Core/src/DefaultHubLifetimeManager.cs @@ -42,7 +42,18 @@ public override Task AddToGroupAsync(string connectionId, string groupName, Canc return Task.CompletedTask; } - _groups.Add(connection, groupName); + // Track groups in the connection object + lock (connection.GroupNames) + { + if (!connection.GroupNames.Add(groupName)) + { + // Connection already in group + return Task.CompletedTask; + } + + _groups.Add(connection, groupName); + } + // Connection disconnected while adding to group, remove it in case the Add was called after OnDisconnectedAsync removed items from the group if (connection.ConnectionAborted.IsCancellationRequested) { @@ -64,7 +75,17 @@ public override Task RemoveFromGroupAsync(string connectionId, string groupName, return Task.CompletedTask; } - _groups.Remove(connectionId, groupName); + // Remove from previously saved groups + lock (connection.GroupNames) + { + if (!connection.GroupNames.Remove(groupName)) + { + // Connection not in group + return Task.CompletedTask; + } + + _groups.Remove(connectionId, groupName); + } return Task.CompletedTask; } @@ -277,8 +298,16 @@ public override Task OnConnectedAsync(HubConnectionContext connection) /// public override Task OnDisconnectedAsync(HubConnectionContext connection) { + lock (connection.GroupNames) + { + // Remove from tracked groups one by one + foreach (var groupName in connection.GroupNames) + { + _groups.Remove(connection.ConnectionId, groupName); + } + } + _connections.Remove(connection); - _groups.RemoveDisconnectedConnection(connection.ConnectionId); return Task.CompletedTask; } diff --git a/src/SignalR/server/Core/src/HubConnectionContext.cs b/src/SignalR/server/Core/src/HubConnectionContext.cs index af9c68bbaa83..da0067064b97 100644 --- a/src/SignalR/server/Core/src/HubConnectionContext.cs +++ b/src/SignalR/server/Core/src/HubConnectionContext.cs @@ -56,6 +56,9 @@ public partial class HubConnectionContext [MemberNotNullWhen(true, nameof(_messageBuffer))] internal bool UsingStatefulReconnect() => _useStatefulReconnect; + // Tracks groups that the connection has been added to + internal HashSet GroupNames { get; } = new HashSet(); + ///

/// Initializes a new instance of the class. ///

diff --git a/src/SignalR/server/Core/src/Internal/HubGroupList.cs b/src/SignalR/server/Core/src/Internal/HubGroupList.cs index 138595d5be07..d87bb7f09e47 100644 --- a/src/SignalR/server/Core/src/Internal/HubGroupList.cs +++ b/src/SignalR/server/Core/src/Internal/HubGroupList.cs @@ -3,7 +3,6 @@ using System.Collections; using System.Collections.Concurrent; -using System.Linq; namespace Microsoft.AspNetCore.SignalR.Internal; @@ -43,15 +42,6 @@ public void Remove(string connectionId, string groupName) } } - public void RemoveDisconnectedConnection(string connectionId) - { - var groupNames = _groups.Where(x => x.Value.ContainsKey(connectionId)).Select(x => x.Key); - foreach (var groupName in groupNames) - { - Remove(connectionId, groupName); - } - } - public int Count => _groups.Count; public IEnumerator> GetEnumerator() diff --git a/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj b/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj index ca9fb454c381..91c5ec3c5fe4 100644 --- a/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj +++ b/src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj @@ -15,6 +15,7 @@ + diff --git a/src/submodules/googletest b/src/submodules/googletest index 7e33b6a1c497..48729681ad88 160000 --- a/src/submodules/googletest +++ b/src/submodules/googletest @@ -1 +1 @@ -Subproject commit 7e33b6a1c497ced1e98fc60175aeb4678419281c +Subproject commit 48729681ad88a89061344ee541b4548833077e00 pFad - Phonifier reborn

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.