From 99aa696e5eb0a3d5cd81f2f90b4389c995bd3194 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Tue, 14 Sep 2021 03:10:31 +0000 Subject: [PATCH 1/3] Make DelegateEndpointConventionBuilder constructors public --- .../Builder/DelegateEndpointConventionBuilder.cs | 14 ++++++++++++-- src/Http/Routing/src/PublicAPI.Unshipped.txt | 2 ++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/Http/Routing/src/Builder/DelegateEndpointConventionBuilder.cs b/src/Http/Routing/src/Builder/DelegateEndpointConventionBuilder.cs index d5884ad8d915..ec379b207571 100644 --- a/src/Http/Routing/src/Builder/DelegateEndpointConventionBuilder.cs +++ b/src/Http/Routing/src/Builder/DelegateEndpointConventionBuilder.cs @@ -13,12 +13,22 @@ public sealed class DelegateEndpointConventionBuilder : IEndpointConventionBuild { private readonly List _endpointConventionBuilders; - internal DelegateEndpointConventionBuilder(IEndpointConventionBuilder endpointConventionBuilder) + /// + /// Instantiates a new given a single + /// . + /// + /// The to instantiate with. + public DelegateEndpointConventionBuilder(IEndpointConventionBuilder endpointConventionBuilder) { _endpointConventionBuilders = new List() { endpointConventionBuilder }; } - internal DelegateEndpointConventionBuilder(List endpointConventionBuilders) + /// + /// Instantiates a new given multiple + /// instances. + /// + /// A list of instances. + public DelegateEndpointConventionBuilder(List endpointConventionBuilders) { _endpointConventionBuilders = endpointConventionBuilders; } diff --git a/src/Http/Routing/src/PublicAPI.Unshipped.txt b/src/Http/Routing/src/PublicAPI.Unshipped.txt index 636eacda9f7b..a42274fb6c23 100644 --- a/src/Http/Routing/src/PublicAPI.Unshipped.txt +++ b/src/Http/Routing/src/PublicAPI.Unshipped.txt @@ -6,6 +6,8 @@ *REMOVED*Microsoft.AspNetCore.Routing.RouteNameMetadata.RouteName.get -> string! *REMOVED*Microsoft.AspNetCore.Routing.RouteNameMetadata.RouteNameMetadata(string! routeName) -> void Microsoft.AspNetCore.Builder.DelegateEndpointConventionBuilder +Microsoft.AspNetCore.Builder.DelegateEndpointConventionBuilder.DelegateEndpointConventionBuilder(Microsoft.AspNetCore.Builder.IEndpointConventionBuilder! endpointConventionBuilder) -> void +Microsoft.AspNetCore.Builder.DelegateEndpointConventionBuilder.DelegateEndpointConventionBuilder(System.Collections.Generic.List! endpointConventionBuilders) -> void Microsoft.AspNetCore.Builder.DelegateEndpointConventionBuilder.Add(System.Action! convention) -> void Microsoft.AspNetCore.Builder.DelegateEndpointRouteBuilderExtensions Microsoft.AspNetCore.Routing.DataTokensMetadata.DataTokens.get -> System.Collections.Generic.IReadOnlyDictionary! From 64656e3371e1a65f8e8e9232505a433d8a4f6d4d Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Tue, 14 Sep 2021 17:24:12 +0000 Subject: [PATCH 2/3] Address API review feedback --- .../Routing/src/Builder/DelegateEndpointConventionBuilder.cs | 4 ++-- src/Http/Routing/src/PublicAPI.Unshipped.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Http/Routing/src/Builder/DelegateEndpointConventionBuilder.cs b/src/Http/Routing/src/Builder/DelegateEndpointConventionBuilder.cs index ec379b207571..754b4c017bc6 100644 --- a/src/Http/Routing/src/Builder/DelegateEndpointConventionBuilder.cs +++ b/src/Http/Routing/src/Builder/DelegateEndpointConventionBuilder.cs @@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Builder /// public sealed class DelegateEndpointConventionBuilder : IEndpointConventionBuilder { - private readonly List _endpointConventionBuilders; + private readonly IEnumerable _endpointConventionBuilders; /// /// Instantiates a new given a single @@ -28,7 +28,7 @@ public DelegateEndpointConventionBuilder(IEndpointConventionBuilder endpointConv /// instances. /// /// A list of instances. - public DelegateEndpointConventionBuilder(List endpointConventionBuilders) + public DelegateEndpointConventionBuilder(IEnumerable endpointConventionBuilders) { _endpointConventionBuilders = endpointConventionBuilders; } diff --git a/src/Http/Routing/src/PublicAPI.Unshipped.txt b/src/Http/Routing/src/PublicAPI.Unshipped.txt index a42274fb6c23..9127a6656158 100644 --- a/src/Http/Routing/src/PublicAPI.Unshipped.txt +++ b/src/Http/Routing/src/PublicAPI.Unshipped.txt @@ -7,7 +7,7 @@ *REMOVED*Microsoft.AspNetCore.Routing.RouteNameMetadata.RouteNameMetadata(string! routeName) -> void Microsoft.AspNetCore.Builder.DelegateEndpointConventionBuilder Microsoft.AspNetCore.Builder.DelegateEndpointConventionBuilder.DelegateEndpointConventionBuilder(Microsoft.AspNetCore.Builder.IEndpointConventionBuilder! endpointConventionBuilder) -> void -Microsoft.AspNetCore.Builder.DelegateEndpointConventionBuilder.DelegateEndpointConventionBuilder(System.Collections.Generic.List! endpointConventionBuilders) -> void +Microsoft.AspNetCore.Builder.DelegateEndpointConventionBuilder.DelegateEndpointConventionBuilder(System.Collections.Generic.IEnumerable! endpointConventionBuilders) -> void Microsoft.AspNetCore.Builder.DelegateEndpointConventionBuilder.Add(System.Action! convention) -> void Microsoft.AspNetCore.Builder.DelegateEndpointRouteBuilderExtensions Microsoft.AspNetCore.Routing.DataTokensMetadata.DataTokens.get -> System.Collections.Generic.IReadOnlyDictionary! From 0673a429128c1b32a5f125e0f184c8e85bab22b1 Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Tue, 14 Sep 2021 20:09:29 +0000 Subject: [PATCH 3/3] Only expose a single constructor --- .../Routing/src/Builder/DelegateEndpointConventionBuilder.cs | 2 +- src/Http/Routing/src/PublicAPI.Unshipped.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Http/Routing/src/Builder/DelegateEndpointConventionBuilder.cs b/src/Http/Routing/src/Builder/DelegateEndpointConventionBuilder.cs index 754b4c017bc6..d9a41767182f 100644 --- a/src/Http/Routing/src/Builder/DelegateEndpointConventionBuilder.cs +++ b/src/Http/Routing/src/Builder/DelegateEndpointConventionBuilder.cs @@ -18,7 +18,7 @@ public sealed class DelegateEndpointConventionBuilder : IEndpointConventionBuild /// . /// /// The to instantiate with. - public DelegateEndpointConventionBuilder(IEndpointConventionBuilder endpointConventionBuilder) + internal DelegateEndpointConventionBuilder(IEndpointConventionBuilder endpointConventionBuilder) { _endpointConventionBuilders = new List() { endpointConventionBuilder }; } diff --git a/src/Http/Routing/src/PublicAPI.Unshipped.txt b/src/Http/Routing/src/PublicAPI.Unshipped.txt index 9127a6656158..03affad7bff7 100644 --- a/src/Http/Routing/src/PublicAPI.Unshipped.txt +++ b/src/Http/Routing/src/PublicAPI.Unshipped.txt @@ -6,7 +6,6 @@ *REMOVED*Microsoft.AspNetCore.Routing.RouteNameMetadata.RouteName.get -> string! *REMOVED*Microsoft.AspNetCore.Routing.RouteNameMetadata.RouteNameMetadata(string! routeName) -> void Microsoft.AspNetCore.Builder.DelegateEndpointConventionBuilder -Microsoft.AspNetCore.Builder.DelegateEndpointConventionBuilder.DelegateEndpointConventionBuilder(Microsoft.AspNetCore.Builder.IEndpointConventionBuilder! endpointConventionBuilder) -> void Microsoft.AspNetCore.Builder.DelegateEndpointConventionBuilder.DelegateEndpointConventionBuilder(System.Collections.Generic.IEnumerable! endpointConventionBuilders) -> void Microsoft.AspNetCore.Builder.DelegateEndpointConventionBuilder.Add(System.Action! convention) -> void Microsoft.AspNetCore.Builder.DelegateEndpointRouteBuilderExtensions