Fix API version route constraint

Author: Chris Martinez

src/Microsoft.AspNet.WebApi.Versioning/Dispatcher/HttpResponseExceptionFactory.cs

@@ -1,5 +1,6 @@
 namespace Microsoft.Web.Http.Dispatcher
 {
+    using Microsoft.Web.Http.Versioning;
     using System;
     using System.Collections.Generic;
     using System.Diagnostics.CodeAnalysis;
@@ -9,7 +10,6 @@
     using System.Web.Http;
     using System.Web.Http.Dispatcher;
     using System.Web.Http.Tracing;
-    using Microsoft.Web.Http.Versioning;
     using static ApiVersion;
     using static System.Net.HttpStatusCode;
     using static System.String;

src/Microsoft.AspNet.WebApi.Versioning/Routing/ApiVersionRouteConstraint.cs

@@ -29,13 +29,7 @@ public bool Match( HttpRequestMessage request, IHttpRoute route, string paramete
                 return false;
             }
 
-            var properties = request.ApiVersionProperties();
-
-            if ( values.TryGetValue( parameterName, out string value ) )
-            {
-                properties.RawRequestedApiVersion = value;
-            }
-            else
+            if ( !values.TryGetValue( parameterName, out string value ) )
             {
                 return false;
             }
@@ -45,6 +39,10 @@ public bool Match( HttpRequestMessage request, IHttpRoute route, string paramete
                 return !IsNullOrEmpty( value );
             }
 
+            var properties = request.ApiVersionProperties();
+
+            properties.RawRequestedApiVersion = value;
+
             if ( TryParse( value, out var requestedVersion ) )
             {
                 properties.RequestedApiVersion = requestedVersion;

src/Microsoft.AspNetCore.Mvc.Versioning/Routing/ApiVersionRouteConstraint.cs

@@ -30,13 +30,7 @@ public bool Match( HttpContext httpContext, IRouter route, string routeKey, Rout
                 return false;
             }
 
-            var feature = httpContext.Features.Get<IApiVersioningFeature>();
-
-            if ( values.TryGetValue( routeKey, out string value ) )
-            {
-                feature.RawRequestedApiVersion = value;
-            }
-            else
+            if ( !values.TryGetValue( routeKey, out string value ) )
             {
                 return false;
             }
@@ -46,6 +40,10 @@ public bool Match( HttpContext httpContext, IRouter route, string routeKey, Rout
                 return !IsNullOrEmpty( value );
             }
 
+            var feature = httpContext.Features.Get<IApiVersioningFeature>();
+
+            feature.RawRequestedApiVersion = value;
+
             if ( TryParse( value, out var requestedVersion ) )
             {
                 feature.RequestedApiVersion = requestedVersion;