Merge pull request #44034 from dotnet-maestro-bot/merge/release/7.0-rc2-to-release/7.0

[automated] Merge branch 'release/7.0-rc2' => 'release/7.0'

Author: Tratcher

src/Http/Routing/src/RouteEndpointDataSource.cs

@@ -168,9 +168,13 @@ private RouteEndpointBuilder CreateRouteEndpointBuilder(
         {
             DisplayName = displayName,
             ApplicationServices = _applicationServices,
-            Metadata = { handler.Method },
         };
 
+        if (isRouteHandler)
+        {
+            builder.Metadata.Add(handler.Method);
+        }
+
         if (entry.HttpMethods is not null)
         {
             builder.Metadata.Add(new HttpMethodMetadata(entry.HttpMethods));

src/Http/Routing/test/UnitTests/Builder/RequestDelegateEndpointRouteBuilderExtensionsTest.cs

@@ -190,10 +190,9 @@ public void MapEndpoint_AttributesCollectedAsMetadata()
         // Assert
         var endpointBuilder1 = GetRouteEndpointBuilder(builder);
         Assert.Equal("/", endpointBuilder1.RoutePattern.RawText);
-        Assert.Equal(3, endpointBuilder1.Metadata.Count);
-        Assert.Equal(((RequestDelegate)Handle).Method, endpointBuilder1.Metadata[0]);
-        Assert.IsType<Attribute1>(endpointBuilder1.Metadata[1]);
-        Assert.IsType<Attribute2>(endpointBuilder1.Metadata[2]);
+        Assert.Equal(2, endpointBuilder1.Metadata.Count);
+        Assert.IsType<Attribute1>(endpointBuilder1.Metadata[0]);
+        Assert.IsType<Attribute2>(endpointBuilder1.Metadata[1]);
     }
 
     [Fact]
@@ -228,11 +227,10 @@ public void MapEndpoint_PrecedenceOfMetadata_BuilderMetadataReturned()
 
         // As with the Delegate Map method overloads for route handlers, the attributes on the RequestDelegate
         // can override the HttpMethodMetadata. Extension methods could already do this.
-        Assert.Equal(4, endpoint.Metadata.Count);
-        Assert.Equal(((RequestDelegate)HandleHttpMetdata).Method, endpoint.Metadata[0]);
-        Assert.Equal("METHOD", GetMethod(endpoint.Metadata[1]));
-        Assert.Equal("ATTRIBUTE", GetMethod(endpoint.Metadata[2]));
-        Assert.Equal("BUILDER", GetMethod(endpoint.Metadata[3]));
+        Assert.Equal(3, endpoint.Metadata.Count);
+        Assert.Equal("METHOD", GetMethod(endpoint.Metadata[0]));
+        Assert.Equal("ATTRIBUTE", GetMethod(endpoint.Metadata[1]));
+        Assert.Equal("BUILDER", GetMethod(endpoint.Metadata[2]));
 
         Assert.Equal("BUILDER", endpoint.Metadata.GetMetadata<IHttpMethodMetadata>()?.HttpMethods.Single());