Merge branch 'dev/chrimart/refactor-conventions-api' into release/4.0

Author: Chris Martinez

src/Common/Common.projitems

@@ -36,19 +36,23 @@
     <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\ActionApiVersionConventionBuilderCollection{T}.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\ActionApiVersionConventionBuilder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\ActionApiVersionConventionBuilder{T}.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\ActionApiVersionConventionBuilderExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\ActionApiVersionConventionBuilderTExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\ActionConventionBuilderExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\ActionMethodResolver.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\ApiVersionConventionBuilder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\ApiVersionConventionBuilderBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\ControllerApiVersionConventionBuilder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\ControllerApiVersionConventionBuilder{T}.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\ControllerConventionBuilderExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\ExpressionExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\IActionConventionBuilder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\IActionConventionBuilder{T}.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\IApiVersionConventionBuilderExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\IApiVersionConvention{T}.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\ApiVersionConventionBuilderExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\IApiVersionConventionBuilder.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\IApiVersionConvention{T}.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\IDeclareApiVersionConventionBuilder.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\IControllerConventionBuilder.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\IControllerConventionBuilder{T}.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\IMapToApiVersionConventionBuilder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Versioning\Conventions\VersionByNamespaceConvention.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Versioning\CurrentImplementationApiVersionSelector.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Versioning\DefaultApiVersionReporter.cs" />

src/Common/Versioning/ApiVersioningOptions.cs

@@ -29,7 +29,7 @@ public partial class ApiVersioningOptions
         IApiVersionReader apiVersionReader = Combine( new QueryStringApiVersionReader(), new UrlSegmentApiVersionReader() );
         IApiVersionSelector apiVersionSelector;
         IErrorResponseProvider errorResponseProvider = new DefaultErrorResponseProvider();
-        ApiVersionConventionBuilder conventions = new ApiVersionConventionBuilder();
+        IApiVersionConventionBuilder conventions = new ApiVersionConventionBuilder();
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ApiVersioningOptions"/> class.
@@ -152,11 +152,11 @@ public IApiVersionSelector ApiVersionSelector
         /// <summary>
         /// Gets or sets the builder used to define API version conventions.
         /// </summary>
-        /// <value>An <see cref="ApiVersionConventionBuilder">API version convention builder</see>.</value>
+        /// <value>An <see cref="IApiVersionConventionBuilder">API version convention builder</see>.</value>
 #if !WEBAPI
         [CLSCompliant( false )]
 #endif
-        public ApiVersionConventionBuilder Conventions
+        public IApiVersionConventionBuilder Conventions
         {
             get
             {

src/Common/Versioning/Conventions/ActionApiVersionConventionBuilder.cs

@@ -11,7 +11,10 @@ namespace Microsoft.AspNetCore.Mvc.Versioning.Conventions
     /// <summary>
     /// Represents a builder for API versions applied to a controller action.
     /// </summary>
-    public partial class ActionApiVersionConventionBuilder : ActionApiVersionConventionBuilderBase, IApiVersionConventionBuilder
+#if !WEBAPI
+    [CLSCompliant( false )]
+#endif
+    public class ActionApiVersionConventionBuilder : ActionApiVersionConventionBuilderBase, IActionConventionBuilder
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ActionApiVersionConventionBuilder"/> class.
@@ -125,14 +128,18 @@ public virtual ActionApiVersionConventionBuilder AdvertisesDeprecatedApiVersion(
             return this;
         }
 
-        void IApiVersionConventionBuilder.IsApiVersionNeutral() => IsApiVersionNeutral();
+        void IDeclareApiVersionConventionBuilder.IsApiVersionNeutral() => IsApiVersionNeutral();
+
+        void IDeclareApiVersionConventionBuilder.HasApiVersion( ApiVersion apiVersion ) => HasApiVersion( apiVersion );
+
+        void IDeclareApiVersionConventionBuilder.HasDeprecatedApiVersion( ApiVersion apiVersion ) => HasDeprecatedApiVersion( apiVersion );
 
-        void IApiVersionConventionBuilder.HasApiVersion( ApiVersion apiVersion ) => HasApiVersion( apiVersion );
+        void IDeclareApiVersionConventionBuilder.AdvertisesApiVersion( ApiVersion apiVersion ) => AdvertisesApiVersion( apiVersion );
 
-        void IApiVersionConventionBuilder.HasDeprecatedApiVersion( ApiVersion apiVersion ) => HasDeprecatedApiVersion( apiVersion );
+        void IDeclareApiVersionConventionBuilder.AdvertisesDeprecatedApiVersion( ApiVersion apiVersion ) => AdvertisesDeprecatedApiVersion( apiVersion );
 
-        void IApiVersionConventionBuilder.AdvertisesApiVersion( ApiVersion apiVersion ) => AdvertisesApiVersion( apiVersion );
+        void IMapToApiVersionConventionBuilder.MapToApiVersion( ApiVersion apiVersion ) => MapToApiVersion( apiVersion );
 
-        void IApiVersionConventionBuilder.AdvertisesDeprecatedApiVersion( ApiVersion apiVersion ) => AdvertisesDeprecatedApiVersion( apiVersion );
+        IActionConventionBuilder IActionConventionBuilder.Action( MethodInfo actionMethod ) => Action( actionMethod );
     }
 }