-
Notifications
You must be signed in to change notification settings - Fork 10.3k
[release/6.0-rc2] Rename and consolidate "DelegateEndpoint" types #36578
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
src/Http/Routing/src/Builder/DelegateEndpointConventionBuilder.cs
Outdated
Show resolved
Hide resolved
f0cbbcb
to
686f343
Compare
686f343
to
48e1e34
Compare
/backport to main |
Started backporting to main: https://github.com/dotnet/aspnetcore/actions/runs/1243073836 |
@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! |
"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. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
src/Http/Http.Extensions/test/RequestDelegateFactoryTests.cs.orig
Outdated
Show resolved
Hide resolved
20017d1
to
7f38755
Compare
7f38755
to
60009c8
Compare
60009c8
to
88e351b
Compare
/backport to main |
Started backporting to main: https://github.com/dotnet/aspnetcore/actions/runs/1255257851 |
@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]>
Description
Given that the options type related to the
Map(string, Delegate)
-style methods is namedRouteHandlerOptions
, this makes the following renames for consistency.This changes
DelegateEndpoint
toRouteHandler
and removesConvention
in the class names.DelegateEndpointConventionBuilder
->RouteHandlerBuilder
OpenApiDelegateEndpointConventionBuilderExtensions
->OpenApiRouteHandlerBuilderExtensions
DelegateEndpointRouteBuilderExtensions
merges with the existingEndpointRouteBuilderExtensions
which already contains theMap(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?
Risk
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
Packaging changes reviewed?
Fixes #36553