Do not explore unversioned endpoint more than one. Fixes #917

dotnet · Nov 21, 2022 · e731568 · e731568
1 parent e197e8c
commit e731568
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/AspNetCore/WebApi/src/Asp.Versioning.Mvc.ApiExplorer/VersionedApiDescriptionProvider.cs b/src/AspNetCore/WebApi/src/Asp.Versioning.Mvc.ApiExplorer/VersionedApiDescriptionProvider.cs
@@ -123,7 +123,7 @@ public virtual void OnProvidersExecuted( ApiDescriptionProviderContext context )
         }
 
         var groupResults = new List<ApiDescription>( capacity: results.Count );
-        var unversioned = default( List<ApiDescription> );
+        var unversioned = default( Dictionary<int, ApiDescription> );
         var formatGroupName = Options.FormatGroupName;
 
         foreach ( var version in FlattenApiVersions( results ) )
@@ -132,6 +132,11 @@ public virtual void OnProvidersExecuted( ApiDescriptionProviderContext context )
 
             for ( var i = 0; i < results.Count; i++ )
             {
+                if ( unversioned != null && unversioned.ContainsKey( i ) )
+                {
+                    continue;
+                }
+
                 var result = results[i];
                 var action = result.ActionDescriptor;
 
@@ -140,7 +145,7 @@ public virtual void OnProvidersExecuted( ApiDescriptionProviderContext context )
                     if ( IsUnversioned( action ) )
                     {
                         unversioned ??= new();
-                        unversioned.Add( result );
+                        unversioned.Add( i, result );
                     }
 
                     continue;
@@ -183,9 +188,9 @@ public virtual void OnProvidersExecuted( ApiDescriptionProviderContext context )
             return;
         }
 
-        for ( var i = 0; i < unversioned.Count; i++ )
+        foreach ( var result in unversioned.Values )
         {
-            results.Add( unversioned[i] );
+            results.Add( result );
         }
     }