[release/6.0-rc2] Rename and consolidate "DelegateEndpoint" types #36578

halter73 · 2021-09-15T22:16:56Z

Description

Given that the options type related to the Map(string, Delegate)-style methods is named RouteHandlerOptions, this makes the following renames for consistency.

This changes DelegateEndpoint to RouteHandler and removes Convention in the class names.

DelegateEndpointConventionBuilder -> RouteHandlerBuilder
OpenApiDelegateEndpointConventionBuilderExtensions -> OpenApiRouteHandlerBuilderExtensions
DelegateEndpointRouteBuilderExtensions merges with the existing EndpointRouteBuilderExtensions which already contains the Map(string, RequestDelegate)-style methods.

Customer Impact

This creates more consistent naming between APIs dealing with minimal route handlers more clearly indicating the association between them.

Regression?

Yes
No

Risk

High
Medium
Low

These types are rarely written out in code so it shouldn't be source-breaking to most apps, but it is a binary break from earlier previews.

Verification

Manual (required)
Automated

Packaging changes reviewed?

Yes
No
N/A

Fixes #36553

src/Http/Routing/src/Builder/DelegateEndpointConventionBuilder.cs

halter73 · 2021-09-16T20:21:01Z

/backport to main

github-actions · 2021-09-16T20:21:13Z

Started backporting to main: https://github.com/dotnet/aspnetcore/actions/runs/1243073836

github-actions · 2021-09-16T20:21:44Z

@halter73 backporting to main failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: DelegateEndpointRouteBuilderExtensions -> EndpointRouteBuilderExtensions
Applying: DelegateEndpointConventionBuilder -> RouteHandlerConventionBuilder
Using index info to reconstruct a base tree...
M	src/Http/Routing/src/Builder/DelegateEndpointConventionBuilder.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Http/Routing/src/Builder/DelegateEndpointConventionBuilder.cs
CONFLICT (content): Merge conflict in src/Http/Routing/src/Builder/DelegateEndpointConventionBuilder.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 DelegateEndpointConventionBuilder -> RouteHandlerConventionBuilder
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

src/Http/Routing/src/Builder/EndpointRouteBuilderExtensions.cs

ghost · 2021-09-16T21:21:15Z

"Hi halter73. Please make sure you've updated the PR description to use the Shiproom Template. Also, make sure this PR is not marked as a draft and is ready-to-merge.

To learn more about how to prepare a servicing PR click here.

rafikiassumani-msft

lgtm

src/Http/Http.Extensions/test/RequestDelegateFactoryTests.cs.orig

halter73 · 2021-09-20T21:31:29Z

/backport to main

github-actions · 2021-09-20T21:31:42Z

Started backporting to main: https://github.com/dotnet/aspnetcore/actions/runs/1255257851

github-actions · 2021-09-20T21:32:12Z

@halter73 backporting to main failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: DelegateEndpointRouteBuilderExtensions -> EndpointRouteBuilderExtensions
Applying: DelegateEndpointConventionBuilder -> RouteHandlerConventionBuilder
Using index info to reconstruct a base tree...
M	src/Http/Routing/src/Builder/DelegateEndpointConventionBuilder.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Http/Routing/src/Builder/DelegateEndpointConventionBuilder.cs
CONFLICT (content): Merge conflict in src/Http/Routing/src/Builder/DelegateEndpointConventionBuilder.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 DelegateEndpointConventionBuilder -> RouteHandlerConventionBuilder
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

* [release/6.0-rc2] Update dependencies from dotnet/efcore (#36635) [release/6.0-rc2] Update dependencies from dotnet/efcore * [release/6.0-rc2] Handle JsonExceptions in RequestDelegateFactory (#36627) * Handle JsonExceptions like InvalidDataExceptions in RequestDelegateFactory * Don't catch InvalidDataExceptions when reading JSON * [release/6.0-rc2] Update dependencies from dotnet/runtime dotnet/efcore (#36651) [release/6.0-rc2] Update dependencies from dotnet/runtime dotnet/efcore * Avoid using invalid content type for ValidationProblemDetails (#36618) Co-authored-by: Safia Abdalla <[email protected]> * Update dependencies from https://github.com/dotnet/efcore build 20210917.6 (#36667) [release/6.0-rc2] Update dependencies from dotnet/efcore * Use a fake clock in the test (#36626) Co-authored-by: Chris R <[email protected]> * Update dependencies from https://github.com/dotnet/runtime build 20210917.8 (#36675) [release/6.0-rc2] Update dependencies from dotnet/runtime * [release/6.0-rc2] Throw for invalid TryParse and BindAsync (#36662) * Backport of #36628 to release/6.0-rc2 * Throw for invalid TryParse and BindAsync * nit * use TypeNameHelper * nit Co-authored-by: Brennan <[email protected]> * Update dependencies from https://github.com/dotnet/efcore build 20210917.8 (#36681) [release/6.0-rc2] Update dependencies from dotnet/efcore * Revert Enforce WebSockets Transport for Blazor (#36656) * Revert Enforce WebSockets Transport for Blazor (changes introduced in #34644) * Updated Release JS Files * [release/6.0-rc2] Update dependencies from dotnet/runtime dotnet/efcore (#36687) [release/6.0-rc2] Update dependencies from dotnet/runtime dotnet/efcore * Update dependencies from https://github.com/dotnet/runtime build 20210917.25 (#36699) [release/6.0-rc2] Update dependencies from dotnet/runtime * Update dependencies from https://github.com/dotnet/efcore build 20210917.18 (#36701) [release/6.0-rc2] Update dependencies from dotnet/efcore * [release/6.0-rc2] Update dependencies from dotnet/efcore dotnet/runtime (#36706) [release/6.0-rc2] Update dependencies from dotnet/efcore dotnet/runtime * [Release/6.0-rc2] Fix and test HttpSys delegation (#36698) * Out of proc delegation tests * Troubleshoot IsFeatureSupported * Fix test * Fix formatting * Seperate tests * Cleanup * Fix SLN * Update dependencies from https://github.com/dotnet/efcore build 20210918.7 (#36715) [release/6.0-rc2] Update dependencies from dotnet/efcore * Find inherited TryParse and BindAsync (#36694) Co-authored-by: Brennan <[email protected]> * [release/6.0-rc2] Use minimal APIs for F# project templates (#36660) * [release/6.0-rc2] Retarget DOTNETHOME when installing x64 on ARM64 (#36695) * Retarget DOTNETHOME when installing x64 on ARM64 * Make platform comparison case insenstive * Address feedback * Install x64 registry keys to different path on ARM64 machine Co-authored-by: Eric StJohn <[email protected]> * Pin analyzers that ship in the SDK (#36690) (#36754) * Pin analyzers that ship in the SDK (#36690) * Pin analyzers that ship in the SDK ASP.NET Core produces a few analyzer assemblies that are shipped as part of the .NET SDK. These analyzers are added to web projects targeting 3.1 and newer. In 6.0, we (unintentionally) bumped the version of Microsoft.CodeAnalysis that these projects referenced to a 4.0 version. This causes warnings when opening a 3.1 or 5.0 app in VS 2019 as it does not support these versions. Additionally update the version of Microsoft.CodeAnalysis.* packages used in tests, Razor, and framework analyzers that are only expected to run with VS 2020 to a more recent build. This is largely book-keeping, but allows us to write a test for file scoped namespaces. Fixes #36552 * Apply suggestions from code review * [release/6.0-rc2] Rename and consolidate "DelegateEndpoint" types (#36578) * Call AddEndpointsApiExplorer() in controllers Web API template (#36753) - backport of #36752 to release/6.0-rc2 Co-authored-by: DamianEdwards <[email protected]> * [release/6.0-rc2] Update dependencies from dotnet/efcore dotnet/runtime (#36769) [release/6.0-rc2] Update dependencies from dotnet/efcore dotnet/runtime * Update dependencies from https://github.com/dotnet/efcore build 20210920.20 (#36778) [release/6.0-rc2] Update dependencies from dotnet/efcore Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Stephen Halter <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Safia Abdalla <[email protected]> Co-authored-by: Chris R <[email protected]> Co-authored-by: Brennan <[email protected]> Co-authored-by: Tanay Parikh <[email protected]> Co-authored-by: Chris Ross <[email protected]> Co-authored-by: Eric StJohn <[email protected]> Co-authored-by: Pranav K <[email protected]> Co-authored-by: DamianEdwards <[email protected]>

halter73 requested review from davidfowl, captainsafia and BrennanConroy September 15, 2021 22:16

halter73 requested a review from javiercn as a code owner September 15, 2021 22:16

ghost added the area-runtime label Sep 15, 2021

halter73 changed the title ~~Rename and consolidate "DelegateEndpoint" types~~ [release/6.0] Rename and consolidate "DelegateEndpoint" types Sep 15, 2021

campersau reviewed Sep 16, 2021

View reviewed changes

src/Http/Routing/src/Builder/DelegateEndpointConventionBuilder.cs Outdated Show resolved Hide resolved

halter73 force-pushed the halter73/36553 branch from f0cbbcb to 686f343 Compare September 16, 2021 20:13

halter73 changed the base branch from release/6.0 to release/6.0-rc2 September 16, 2021 20:13

halter73 changed the title ~~[release/6.0] Rename and consolidate "DelegateEndpoint" types~~ [release/6.0-rc2] Rename and consolidate "DelegateEndpoint" types Sep 16, 2021

halter73 force-pushed the halter73/36553 branch from 686f343 to 48e1e34 Compare September 16, 2021 20:15

halter73 added this to the 6.0-rc2 milestone Sep 16, 2021

halter73 added old-area-web-frameworks-do-not-use *DEPRECATED* This label is deprecated in favor of the area-mvc and area-minimal labels Servicing-consider Shiproom approval is required for the issue and removed area-runtime labels Sep 16, 2021

rafikiassumani-msft reviewed Sep 16, 2021

View reviewed changes

src/Http/Routing/src/Builder/EndpointRouteBuilderExtensions.cs Outdated Show resolved Hide resolved

halter73 requested a review from Tratcher as a code owner September 16, 2021 21:24

rafikiassumani-msft approved these changes Sep 16, 2021

View reviewed changes

BrennanConroy reviewed Sep 16, 2021

View reviewed changes

src/Http/Http.Extensions/test/RequestDelegateFactoryTests.cs.orig Outdated Show resolved Hide resolved

halter73 force-pushed the halter73/36553 branch from 20017d1 to 7f38755 Compare September 16, 2021 22:05

BrennanConroy approved these changes Sep 16, 2021

View reviewed changes

halter73 added api-approved API was approved in API review, it can be implemented Servicing-approved Shiproom has approved the issue and removed Servicing-consider Shiproom approval is required for the issue labels Sep 16, 2021

halter73 added 2 commits September 20, 2021 11:25

DelegateEndpointRouteBuilderExtensions -> EndpointRouteBuilderExtensions

397134d

DelegateEndpointConventionBuilder -> RouteHandlerConventionBuilder

df43232

halter73 added 3 commits September 20, 2021 11:25

cref StatusCodes

57f8938

Remove "Convention" from new type names

e34852d

IEndpointConventionBuilder -> RouteHandlerBuilder in doc comments

36ac48d

halter73 force-pushed the halter73/36553 branch from 7f38755 to 60009c8 Compare September 20, 2021 19:29

halter73 requested a review from Pilchie as a code owner September 20, 2021 19:29

DelegateEndpointAnalyzer -> RouteHandlerAnalyzer

88e351b

halter73 force-pushed the halter73/36553 branch from 60009c8 to 88e351b Compare September 20, 2021 19:54

halter73 merged commit a1ed65a into release/6.0-rc2 Sep 20, 2021

halter73 deleted the halter73/36553 branch September 20, 2021 21:31

halter73 mentioned this pull request Sep 20, 2021

Rename and consolidate "DelegateEndpoint" types #36768

Merged

This was referenced Oct 19, 2021

[Breaking change]: Minimal API renames in RC2 aspnet/Announcements#475

Open

[Discussion] Announcement: Minimal API renames in RC1 and RC2 #37671

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[release/6.0-rc2] Rename and consolidate "DelegateEndpoint" types #36578

[release/6.0-rc2] Rename and consolidate "DelegateEndpoint" types #36578

Uh oh!

halter73 commented Sep 15, 2021 •

edited

Loading

Uh oh!

Uh oh!

halter73 commented Sep 16, 2021

Uh oh!

github-actions bot commented Sep 16, 2021

Uh oh!

github-actions bot commented Sep 16, 2021

Uh oh!

Uh oh!

ghost commented Sep 16, 2021

Uh oh!

rafikiassumani-msft left a comment

Uh oh!

Uh oh!

halter73 commented Sep 20, 2021

Uh oh!

github-actions bot commented Sep 20, 2021

Uh oh!

github-actions bot commented Sep 20, 2021

Uh oh!

Uh oh!

[release/6.0-rc2] Rename and consolidate "DelegateEndpoint" types #36578

[release/6.0-rc2] Rename and consolidate "DelegateEndpoint" types #36578

Uh oh!

Conversation

halter73 commented Sep 15, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Customer Impact

Regression?

Risk

Verification

Packaging changes reviewed?

Uh oh!

Uh oh!

halter73 commented Sep 16, 2021

Uh oh!

github-actions bot commented Sep 16, 2021

Uh oh!

github-actions bot commented Sep 16, 2021

Uh oh!

Uh oh!

ghost commented Sep 16, 2021

Uh oh!

rafikiassumani-msft left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

halter73 commented Sep 20, 2021

Uh oh!

github-actions bot commented Sep 20, 2021

Uh oh!

github-actions bot commented Sep 20, 2021

Uh oh!

Uh oh!

halter73 commented Sep 15, 2021 •

edited

Loading