dotnet
diff --git a/‎src/AspNetCore/WebApi/src/Asp.Versioning.Mvc.ApiExplorer/VersionedApiDescriptionProvider.cs
Copy file name to clipboardExpand all lines: src/AspNetCore/WebApi/src/Asp.Versioning.Mvc.ApiExplorer/VersionedApiDescriptionProvider.cs
+5-3Lines changed: 5 additions & 3 deletions b/‎src/AspNetCore/WebApi/src/Asp.Versioning.Mvc.ApiExplorer/VersionedApiDescriptionProvider.cs
Copy file name to clipboardExpand all lines: src/AspNetCore/WebApi/src/Asp.Versioning.Mvc.ApiExplorer/VersionedApiDescriptionProvider.cs
+5-3Lines changed: 5 additions & 3 deletions
diff --git a/‎src/AspNetCore/WebApi/src/Asp.Versioning.Mvc/ApplicationModels/ModelExtensions.cs
Copy file name to clipboardExpand all lines: src/AspNetCore/WebApi/src/Asp.Versioning.Mvc/ApplicationModels/ModelExtensions.cs
+6-7Lines changed: 6 additions & 7 deletions b/‎src/AspNetCore/WebApi/src/Asp.Versioning.Mvc/ApplicationModels/ModelExtensions.cs
Copy file name to clipboardExpand all lines: src/AspNetCore/WebApi/src/Asp.Versioning.Mvc/ApplicationModels/ModelExtensions.cs
+6-7Lines changed: 6 additions & 7 deletions
@@ -94,10 +94,13 @@ protected virtual bool ShouldExploreAction( ActionDescriptor actionDescriptor, A
     protected virtual void PopulateApiVersionParameters( ApiDescription apiDescription, ApiVersion apiVersion )
     {
         var parameterSource = Options.ApiVersionParameterSource;
-        var context = new ApiVersionParameterDescriptionContext( apiDescription, apiVersion, ModelMetadata, Options );
+        var context = new ApiVersionParameterDescriptionContext( apiDescription, apiVersion, ModelMetadata, Options )
+        {
+            ConstraintResolver = constraintResolver,
+        };
 
-        context.ConstraintResolver = constraintResolver;
         parameterSource.AddParameters( context );
+        apiDescription.TryUpdateRelativePathAndRemoveApiVersionParameter( Options );
     }
 
     /// <summary>
@@ -159,7 +162,6 @@ public virtual void OnProvidersExecuted( ApiDescriptionProviderContext context )
 
                 groupResult.SetApiVersion( version );
                 PopulateApiVersionParameters( groupResult, version );
-                groupResult.TryUpdateRelativePathAndRemoveApiVersionParameter( Options );
                 groupResults.Add( groupResult );
             }
         }
 
@@ -37,17 +37,16 @@ public static ApiVersionModel GetApiVersionModel( this ControllerModel controlle
 
     internal static void AddEndpointMetadata( this ActionModel action, object metadata )
     {
-        SelectorModel selector;
+        var selectors = action.Selectors;
 
-        if ( action.Selectors.Count == 0 )
+        if ( selectors.Count == 0 )
         {
-            action.Selectors.Add( selector = new() );
+            selectors.Add( new() );
         }
-        else
+
+        for ( var i = 0; i < selectors.Count; i++ )
         {
-            selector = action.Selectors[0];
+            selectors[i].EndpointMetadata.Add( metadata );
         }
-
-        selector.EndpointMetadata.Add( metadata );
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -94,10 +94,13 @@ protected virtual bool ShouldExploreAction( ActionDescriptor actionDescriptor, A`
`94`	`94`	`protected virtual void PopulateApiVersionParameters( ApiDescription apiDescription, ApiVersion apiVersion )`
`95`	`95`	`{`
`96`	`96`	`var parameterSource = Options.ApiVersionParameterSource;`
`97`		`- var context = new ApiVersionParameterDescriptionContext( apiDescription, apiVersion, ModelMetadata, Options );`
	`97`	`+ var context = new ApiVersionParameterDescriptionContext( apiDescription, apiVersion, ModelMetadata, Options )`
	`98`	`+ {`
	`99`	`+ ConstraintResolver = constraintResolver,`
	`100`	`+ };`
`98`	`101`
`99`		`- context.ConstraintResolver = constraintResolver;`
`100`	`102`	`parameterSource.AddParameters( context );`
	`103`	`+ apiDescription.TryUpdateRelativePathAndRemoveApiVersionParameter( Options );`
`101`	`104`	`}`
`102`	`105`
`103`	`106`	`/// <summary>`
`@@ -159,7 +162,6 @@ public virtual void OnProvidersExecuted( ApiDescriptionProviderContext context )`
`159`	`162`
`160`	`163`	`groupResult.SetApiVersion( version );`
`161`	`164`	`PopulateApiVersionParameters( groupResult, version );`
`162`		`- groupResult.TryUpdateRelativePathAndRemoveApiVersionParameter( Options );`
`163`	`165`	`groupResults.Add( groupResult );`
`164`	`166`	`}`
`165`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,17 +37,16 @@ public static ApiVersionModel GetApiVersionModel( this ControllerModel controlle`
`37`	`37`
`38`	`38`	`internal static void AddEndpointMetadata( this ActionModel action, object metadata )`
`39`	`39`	`{`
`40`		`- SelectorModel selector;`
	`40`	`+ var selectors = action.Selectors;`
`41`	`41`
`42`		`- if ( action.Selectors.Count == 0 )`
	`42`	`+ if ( selectors.Count == 0 )`
`43`	`43`	`{`
`44`		`- action.Selectors.Add( selector = new() );`
	`44`	`+ selectors.Add( new() );`
`45`	`45`	`}`
`46`		`- else`
	`46`	`+`
	`47`	`+ for ( var i = 0; i < selectors.Count; i++ )`
`47`	`48`	`{`
`48`		`- selector = action.Selectors[0];`
	`49`	`+ selectors[i].EndpointMetadata.Add( metadata );`
`49`	`50`	`}`
`50`		`-`
`51`		`- selector.EndpointMetadata.Add( metadata );`
`52`	`51`	`}`
`53`	`52`	`}`