IApiVersionNeutral should be inherited from attributes

Author: Chris Martinez

src/Microsoft.AspNet.WebApi.Versioning/Versioning/Conventions/ActionApiVersionConventionBuilderBase.cs

@@ -1,6 +1,7 @@
 namespace Microsoft.Web.Http.Versioning.Conventions
 {
     using System;
+    using System.Collections.Generic;
     using System.Linq;
     using System.Web.Http;
     using System.Web.Http.Controllers;
@@ -20,7 +21,11 @@ public virtual void ApplyTo( HttpActionDescriptor actionDescriptor )
         {
             Arg.NotNull( actionDescriptor, nameof( actionDescriptor ) );
 
-            MergeAttributesWithConventions( actionDescriptor.GetCustomAttributes<Attribute>() );
+            var attributes = new List<object>();
+
+            attributes.AddRange( actionDescriptor.GetCustomAttributes<IApiVersionNeutral>( inherit: true ) );
+            attributes.AddRange( actionDescriptor.GetCustomAttributes<IApiVersionProvider>( inherit: false ) );
+            MergeAttributesWithConventions( attributes );
 
             if ( VersionNeutral )
             {

src/Microsoft.AspNet.WebApi.Versioning/Versioning/Conventions/ControllerApiVersionConventionBuilderBase.cs

@@ -28,7 +28,11 @@ public virtual void ApplyTo( HttpControllerDescriptor controllerDescriptor )
         {
             Arg.NotNull( controllerDescriptor, nameof( controllerDescriptor ) );
 
-            MergeAttributesWithConventions( controllerDescriptor.GetCustomAttributes<Attribute>() );
+            var attributes = new List<object>();
+
+            attributes.AddRange( controllerDescriptor.GetCustomAttributes<IApiVersionNeutral>( inherit: true ) );
+            attributes.AddRange( controllerDescriptor.GetCustomAttributes<IApiVersionProvider>( inherit: false ) );
+            MergeAttributesWithConventions( attributes );
             ApplyActionConventions( controllerDescriptor );
         }