Handle multiple selector models. Fixes #896

Author: commonsensesoftware

src/AspNetCore/WebApi/src/Asp.Versioning.Mvc.ApiExplorer/VersionedApiDescriptionProvider.cs

@@ -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 );
             }
         }

src/AspNetCore/WebApi/src/Asp.Versioning.Mvc/ApplicationModels/ModelExtensions.cs

@@ -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 );
     }
 }