From a0193e2f06dd39ba9eb8609fbae57965c90ef6a6 Mon Sep 17 00:00:00 2001
From: Safia Abdalla <safia@microsoft.com>
Date: Mon, 16 Aug 2021 15:42:01 -0700
Subject: [PATCH] Set route name metadata in WithName (#35388)

---
 .../Builder/RoutingEndpointConventionBuilderExtensions.cs | 2 +-
 .../RoutingEndpointConventionBuilderExtensionsTest.cs     | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Http/Routing/src/Builder/RoutingEndpointConventionBuilderExtensions.cs b/src/Http/Routing/src/Builder/RoutingEndpointConventionBuilderExtensions.cs
index fe674265788..24b9b3df6c8 100644
--- a/src/Http/Routing/src/Builder/RoutingEndpointConventionBuilderExtensions.cs
+++ b/src/Http/Routing/src/Builder/RoutingEndpointConventionBuilderExtensions.cs
@@ -130,7 +130,7 @@ namespace Microsoft.AspNetCore.Builder
         /// <returns>The <see cref="IEndpointConventionBuilder"/>.</returns>
         public static TBuilder WithName<TBuilder>(this TBuilder builder, string endpointName) where TBuilder : IEndpointConventionBuilder
         {
-            builder.WithMetadata(new EndpointNameAttribute(endpointName));
+            builder.WithMetadata(new EndpointNameAttribute(endpointName), new RouteNameMetadata(endpointName));
             return builder;
         }
 
diff --git a/src/Http/Routing/test/UnitTests/Builder/RoutingEndpointConventionBuilderExtensionsTest.cs b/src/Http/Routing/test/UnitTests/Builder/RoutingEndpointConventionBuilderExtensionsTest.cs
index 9141829aeae..013e2a55adb 100644
--- a/src/Http/Routing/test/UnitTests/Builder/RoutingEndpointConventionBuilderExtensionsTest.cs
+++ b/src/Http/Routing/test/UnitTests/Builder/RoutingEndpointConventionBuilderExtensionsTest.cs
@@ -119,16 +119,20 @@ namespace Microsoft.AspNetCore.Builder
         public void WithName_SetsEndpointName()
         {
             // Arrange
+            var name = "SomeEndpointName";
             var builder = CreateBuilder();
 
             // Act
-            builder.WithName("SomeEndpointName");
+            builder.WithName(name);
 
             // Assert
             var endpoint = builder.Build();
 
             var endpointName = endpoint.Metadata.GetMetadata<IEndpointNameMetadata>();
-            Assert.Equal("SomeEndpointName", endpointName.EndpointName);
+            Assert.Equal(name, endpointName.EndpointName);
+
+            var routeName = endpoint.Metadata.GetMetadata<IRouteNameMetadata>();
+            Assert.Equal(name, routeName.RouteName);
         }
 
         [Fact]
-- 
GitLab