Fix MediaTypeApiVersionReaderBuilder.AddParameters

src/AspNet/OData/src/Asp.Versioning.WebApi.OData.ApiExplorer/Asp.Versioning.WebApi.OData.ApiExplorer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <VersionPrefix>6.2.0</VersionPrefix>
+  <VersionPrefix>6.2.1</VersionPrefix>
   <AssemblyVersion>6.2.0.0</AssemblyVersion>
   <TargetFrameworks>net45;net472</TargetFrameworks>
   <RootNamespace>Asp.Versioning</RootNamespace>

src/AspNet/OData/src/Asp.Versioning.WebApi.OData.ApiExplorer/ReleaseNotes.txt

@@ -1 +1 @@
-
+Fix MediaTypeApiVersionReaderBuilder.AddParameters (#904)

src/AspNet/OData/src/Asp.Versioning.WebApi.OData/Asp.Versioning.WebApi.OData.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <VersionPrefix>6.2.0</VersionPrefix>
+  <VersionPrefix>6.2.1</VersionPrefix>
   <AssemblyVersion>6.2.0.0</AssemblyVersion>
   <TargetFrameworks>net45;net472</TargetFrameworks>
   <RootNamespace>Asp.Versioning</RootNamespace>

src/AspNet/OData/src/Asp.Versioning.WebApi.OData/ReleaseNotes.txt

@@ -1 +1 @@
-
+Fix MediaTypeApiVersionReaderBuilder.AddParameters (#904)

src/AspNet/WebApi/src/Asp.Versioning.WebApi.ApiExplorer/Asp.Versioning.WebApi.ApiExplorer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <VersionPrefix>6.2.0</VersionPrefix>
+  <VersionPrefix>6.2.1</VersionPrefix>
   <AssemblyVersion>6.2.0.0</AssemblyVersion>
   <TargetFrameworks>net45;net472</TargetFrameworks>
   <AssemblyTitle>ASP.NET Web API Versioning API Explorer</AssemblyTitle>

src/AspNet/WebApi/src/Asp.Versioning.WebApi.ApiExplorer/Description/ApiVersionParameterDescriptionContext.cs

@@ -157,6 +157,11 @@ protected virtual void UpdateUrlSegment()
     /// <param name="name">The name of the media type parameter.</param>
     protected virtual void AddMediaTypeParameter( string name )
     {
+        if ( string.IsNullOrEmpty( name ) )
+        {
+            return;
+        }
+
         var parameter = new NameValueHeaderValue( name, ApiVersion.ToString() );
 
         CloneFormattersAndAddMediaTypeParameter( parameter, ApiDescription.SupportedRequestBodyFormatters );

src/AspNet/WebApi/src/Asp.Versioning.WebApi.ApiExplorer/ReleaseNotes.txt

@@ -1 +1 @@
-
+Fix MediaTypeApiVersionReaderBuilder.AddParameters (#904)

src/AspNet/WebApi/src/Asp.Versioning.WebApi/ApplyContentTypeVersionActionFilter.cs

@@ -3,7 +3,6 @@
 namespace Asp.Versioning;
 
 using System.Net.Http.Headers;
-using System.Web.Http;
 using System.Web.Http.Filters;
 using static Asp.Versioning.ApiVersionParameterLocation;
 

src/AspNet/WebApi/src/Asp.Versioning.WebApi/Asp.Versioning.WebApi.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <VersionPrefix>6.2.0</VersionPrefix>
+  <VersionPrefix>6.2.1</VersionPrefix>
   <AssemblyVersion>6.2.0.0</AssemblyVersion>
   <TargetFrameworks>net45;net472</TargetFrameworks>
   <AssemblyTitle>ASP.NET Web API Versioning</AssemblyTitle>

src/AspNet/WebApi/src/Asp.Versioning.WebApi/ReleaseNotes.txt

@@ -1 +1 @@
-
+Fix MediaTypeApiVersionReaderBuilder.AddParameters (#904)

src/AspNet/WebApi/src/Asp.Versioning.WebApi/System.Web.Http/HttpConfigurationExtensions.cs

@@ -7,6 +7,7 @@ namespace System.Web.Http;
 using Asp.Versioning.Dispatcher;
 using System.Web.Http.Controllers;
 using System.Web.Http.Dispatcher;
+using static Asp.Versioning.ApiVersionParameterLocation;
 
 /// <summary>
 /// Provides extension methods for the <see cref="HttpConfiguration"/> class.
@@ -79,9 +80,16 @@ private static void AddApiVersioning( this HttpConfiguration configuration, ApiV
             configuration.Filters.Add( new ReportApiVersionsAttribute() );
         }
 
-        if ( options.ApiVersionReader.VersionsByMediaType() )
+        var reader = options.ApiVersionReader;
+
+        if ( reader.VersionsByMediaType() )
         {
-            configuration.Filters.Add( new ApplyContentTypeVersionActionFilter( options.ApiVersionReader ) );
+            var parameterName = reader.GetParameterName( MediaTypeParameter );
+
+            if ( !string.IsNullOrEmpty( parameterName ) )
+            {
+                configuration.Filters.Add( new ApplyContentTypeVersionActionFilter( reader ) );
+            }
         }
 
         configuration.Properties.AddOrUpdate( ApiVersioningOptionsKey, options, ( key, oldValue ) => options );

src/AspNetCore/OData/src/Asp.Versioning.OData.ApiExplorer/Asp.Versioning.OData.ApiExplorer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <VersionPrefix>6.2.0</VersionPrefix>
+  <VersionPrefix>6.2.1</VersionPrefix>
   <AssemblyVersion>6.2.0.0</AssemblyVersion>
   <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
   <RootNamespace>Asp.Versioning</RootNamespace>

src/AspNetCore/OData/src/Asp.Versioning.OData.ApiExplorer/ReleaseNotes.txt

@@ -1 +1 @@
-
+Fix MediaTypeApiVersionReaderBuilder.AddParameters (#904)

src/AspNetCore/OData/src/Asp.Versioning.OData/Asp.Versioning.OData.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <VersionPrefix>6.2.0</VersionPrefix>
+  <VersionPrefix>6.2.1</VersionPrefix>
   <AssemblyVersion>6.2.0.0</AssemblyVersion>
   <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
   <RootNamespace>Asp.Versioning</RootNamespace>

src/AspNetCore/OData/src/Asp.Versioning.OData/ReleaseNotes.txt

@@ -1 +1 @@
-
+Fix MediaTypeApiVersionReaderBuilder.AddParameters (#904)

src/AspNetCore/WebApi/src/Asp.Versioning.Http/Asp.Versioning.Http.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <VersionPrefix>6.2.0</VersionPrefix>
+  <VersionPrefix>6.2.1</VersionPrefix>
   <AssemblyVersion>6.2.0.0</AssemblyVersion>
   <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
   <RootNamespace>Asp.Versioning</RootNamespace>

src/AspNetCore/WebApi/src/Asp.Versioning.Http/ReleaseNotes.txt

@@ -1 +1 @@
-
+Fix MediaTypeApiVersionReaderBuilder.AddParameters (#904)

src/AspNetCore/WebApi/src/Asp.Versioning.Http/net6.0/Builder/IEndpointConventionBuilderExtensions.cs

@@ -10,6 +10,7 @@ namespace Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using System.Globalization;
+using System.Runtime.CompilerServices;
 using static Asp.Versioning.ApiVersionParameterLocation;
 
 /// <summary>
@@ -100,12 +101,17 @@ private static void Apply(
         if ( parameterSource.VersionsByMediaType() )
         {
             var parameterName = parameterSource.GetParameterName( MediaTypeParameter );
-            requestDelegate = EnsureRequestDelegate( requestDelegate, endpointBuilder.RequestDelegate );
-            requestDelegate = new ContentTypeApiVersionDecorator( requestDelegate, parameterName );
-            endpointBuilder.RequestDelegate = requestDelegate;
+
+            if ( !string.IsNullOrEmpty( parameterName ) )
+            {
+                requestDelegate = EnsureRequestDelegate( requestDelegate, endpointBuilder.RequestDelegate );
+                requestDelegate = new ContentTypeApiVersionDecorator( requestDelegate, parameterName );
+                endpointBuilder.RequestDelegate = requestDelegate;
+            }
         }
     }
 
+    [MethodImpl( MethodImplOptions.AggressiveInlining )]
     private static RequestDelegate EnsureRequestDelegate( RequestDelegate? current, RequestDelegate? original ) =>
         ( current ?? original ) ??
         throw new InvalidOperationException(

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

@@ -200,6 +200,11 @@ protected virtual void UpdateUrlSegment()
     /// <param name="name">The name of the media type parameter.</param>
     protected virtual void AddMediaTypeParameter( string name )
     {
+        if ( string.IsNullOrEmpty( name ) )
+        {
+            return;
+        }
+
         var requestFormats = ApiDescription.SupportedRequestFormats.ToArray();
         var responseTypes = ApiDescription.SupportedResponseTypes.ToArray();
         var parameter = $"{name}={ApiVersion}";

src/AspNetCore/WebApi/src/Asp.Versioning.Mvc.ApiExplorer/Asp.Versioning.Mvc.ApiExplorer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <VersionPrefix>6.2.0</VersionPrefix>
+  <VersionPrefix>6.2.1</VersionPrefix>
   <AssemblyVersion>6.2.0.0</AssemblyVersion>
   <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
   <RootNamespace>Asp.Versioning.ApiExplorer</RootNamespace>

src/AspNetCore/WebApi/src/Asp.Versioning.Mvc.ApiExplorer/ReleaseNotes.txt

@@ -1 +1 @@
-
+Fix MediaTypeApiVersionReaderBuilder.AddParameters (#904)

src/AspNetCore/WebApi/src/Asp.Versioning.Mvc/ApiVersioningMvcOptionsSetup.cs

@@ -6,6 +6,7 @@ namespace Asp.Versioning;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
 using Microsoft.Extensions.Options;
+using static Asp.Versioning.ApiVersionParameterLocation;
 
 /// <summary>
 /// Represents the API versioning configuration for ASP.NET Core <see cref="MvcOptions">MVC options</see>.
@@ -36,9 +37,16 @@ public virtual void PostConfigure( string name, MvcOptions options )
             options.Filters.AddService<ReportApiVersionsAttribute>();
         }
 
-        if ( value.ApiVersionReader.VersionsByMediaType() )
+        var reader = value.ApiVersionReader;
+
+        if ( reader.VersionsByMediaType() )
         {
-            options.Filters.AddService<ApplyContentTypeVersionActionFilter>();
+            var parameterName = reader.GetParameterName( MediaTypeParameter );
+
+            if ( !string.IsNullOrEmpty( parameterName ) )
+            {
+                options.Filters.AddService<ApplyContentTypeVersionActionFilter>();
+            }
         }
 
         var modelMetadataDetailsProviders = options.ModelMetadataDetailsProviders;

src/AspNetCore/WebApi/src/Asp.Versioning.Mvc/Asp.Versioning.Mvc.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <VersionPrefix>6.2.0</VersionPrefix>
+  <VersionPrefix>6.2.1</VersionPrefix>
   <AssemblyVersion>6.2.0.0</AssemblyVersion>
   <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
   <RootNamespace>Asp.Versioning</RootNamespace>

src/AspNetCore/WebApi/src/Asp.Versioning.Mvc/ReleaseNotes.txt

@@ -1 +1 @@
-
+Fix MediaTypeApiVersionReaderBuilder.AddParameters (#904)

src/Client/test/Asp.Versioning.Http.Client.Tests/TestServer.cs

@@ -7,11 +7,28 @@ namespace Asp.Versioning.Http;
 internal sealed class TestServer : HttpMessageHandler
 {
     private readonly HttpResponseMessage response;
+    private bool disposed;
 
     public TestServer() => response = new( HttpStatusCode.OK );
 
     public TestServer( HttpResponseMessage response ) => this.response = response;
 
     protected override Task<HttpResponseMessage> SendAsync( HttpRequestMessage request, CancellationToken cancellationToken ) =>
         Task.FromResult( response );
+
+    protected override void Dispose( bool disposing )
+    {
+        if ( disposed )
+        {
+            return;
+        }
+
+        base.Dispose( disposing );
+        disposed = true;
+
+        if ( disposing )
+        {
+            response.Dispose();
+        }
+    }
 }

src/Common/src/Common/MediaTypeApiVersionReaderBuilder.cs

@@ -301,9 +301,16 @@ public void AddParameters( IApiVersionParameterDescriptionContext context )
                 throw new ArgumentNullException( nameof( context ) );
             }
 
-            for ( var i = 0; i < parameters.Count; i++ )
+            if ( parameters.Count == 0 )
             {
-                context.AddParameter( parameters[i], MediaTypeParameter );
+                context.AddParameter( name: string.Empty, MediaTypeParameter );
+            }
+            else
+            {
+                for ( var i = 0; i < parameters.Count; i++ )
+                {
+                    context.AddParameter( parameters[i], MediaTypeParameter );
+                }
             }
         }
 
@@ -427,7 +434,7 @@ private void Read(
                         versions.Add( result[j] );
                     }
                 }
+            }
         }
     }
-    }
 }