Move some types to .Internal namespace

samples/ActionConstraintSample.Web/CountrySpecificAttribute.cs

@@ -3,7 +3,7 @@
 
 using System;
 using Microsoft.AspNet.Mvc.ActionConstraints;
-using Microsoft.AspNet.Mvc.Infrastructure;
+using Microsoft.AspNet.Mvc.Routing;
 
 namespace ActionConstraintSample.Web
 {

samples/CustomRouteSample.Web/LocaleAttribute.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc.Infrastructure;
+using Microsoft.AspNet.Mvc.Routing;
 
 namespace CustomRouteSample.Web
 {

samples/MvcSubAreaSample.Web/SubAreaAttribute.cs

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Mvc.Infrastructure;
+using Microsoft.AspNet.Mvc.Routing;
 
 namespace MvcSubAreaSample.Web
 {

src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs

@@ -10,6 +10,7 @@ using Microsoft.AspNet.Mvc.Abstractions;
 using Microsoft.AspNet.Mvc.ActionConstraints;
 using Microsoft.AspNet.Mvc.Controllers;
 using Microsoft.AspNet.Mvc.Formatters;
+using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Routing;
 using Microsoft.AspNet.Routing.Template;
@@ -263,7 +264,7 @@ namespace Microsoft.AspNet.Mvc.ApiExplorer
         {
             if (action.ActionConstraints != null && action.ActionConstraints.Count > 0)
             {
-                return action.ActionConstraints.OfType<HttpMethodConstraint>().SelectMany(c => c.HttpMethods);
+                return action.ActionConstraints.OfType<HttpMethodActionConstraint>().SelectMany(c => c.HttpMethods);
             }
             else
             {

src/Microsoft.AspNet.Mvc.Core/AcceptVerbsAttribute.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.Mvc.Infrastructure;
+using Microsoft.AspNet.Mvc.Routing;
 
 namespace Microsoft.AspNet.Mvc
 {

src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ActionModel.cs

@@ -9,6 +9,7 @@ using System.Reflection;
 using Microsoft.AspNet.Mvc.ActionConstraints;
 using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Mvc.Infrastructure;
+using Microsoft.AspNet.Mvc.Routing;
 
 namespace Microsoft.AspNet.Mvc.ApplicationModels
 {

src/Microsoft.AspNet.Mvc.Core/ApplicationModels/AttributeRouteModel.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Microsoft.AspNet.Mvc.Core;
-using Microsoft.AspNet.Mvc.Infrastructure;
+using Microsoft.AspNet.Mvc.Routing;
 
 namespace Microsoft.AspNet.Mvc.ApplicationModels
 {

src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ControllerModel.cs

@@ -8,7 +8,7 @@ using System.Linq;
 using System.Reflection;
 using Microsoft.AspNet.Mvc.ActionConstraints;
 using Microsoft.AspNet.Mvc.Filters;
-using Microsoft.AspNet.Mvc.Infrastructure;
+using Microsoft.AspNet.Mvc.Routing;
 
 namespace Microsoft.AspNet.Mvc.ApplicationModels
 {

src/Microsoft.AspNet.Mvc.Core/AreaAttribute.cs

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Mvc.Infrastructure;
+using Microsoft.AspNet.Mvc.Routing;
 
 namespace Microsoft.AspNet.Mvc
 {

src/Microsoft.AspNet.Mvc.Core/ChallengeResult.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Authentication;
-using Microsoft.AspNet.Mvc.Logging;
+using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 

src/Microsoft.AspNet.Mvc.Core/ConsumesAttribute.cs

@@ -10,6 +10,7 @@ using Microsoft.AspNet.Mvc.ApiExplorer;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Mvc.Formatters;
+using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNet.Mvc

src/Microsoft.AspNet.Mvc.Core/Controllers/DefaultControllerActivator.cs

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Mvc.Infrastructure;
+using Microsoft.AspNet.Mvc.Internal;
 
 namespace Microsoft.AspNet.Mvc.Controllers
 {

src/Microsoft.AspNet.Mvc.Core/DependencyInjection/MvcCoreServiceCollectionExtensions.cs

@@ -92,12 +92,12 @@ namespace Microsoft.Extensions.DependencyInjection
                 ServiceDescriptor.Transient<IApplicationModelProvider, DefaultApplicationModelProvider>());
             services.TryAddEnumerable(
                 ServiceDescriptor.Transient<IActionDescriptorProvider, ControllerActionDescriptorProvider>());
-            services.TryAddSingleton<IActionDescriptorCollectionProvider, DefaultActionDescriptorCollectionProvider>();
+            services.TryAddSingleton<IActionDescriptorCollectionProvider, ActionDescriptorCollectionProvider>();
 
             //
             // Action Selection
             //
-            services.TryAddSingleton<IActionSelector, DefaultActionSelector>();
+            services.TryAddSingleton<IActionSelector, ActionSelector>();
 
             // Performs caching
             services.TryAddSingleton<IActionSelectorDecisionTreeProvider, ActionSelectorDecisionTreeProvider>();
@@ -126,7 +126,7 @@ namespace Microsoft.Extensions.DependencyInjection
                 ServiceDescriptor.Transient<IActionInvokerProvider, ControllerActionInvokerProvider>());
 
             // These are stateless
-            services.TryAddSingleton<IControllerActionArgumentBinder, DefaultControllerActionArgumentBinder>();
+            services.TryAddSingleton<IControllerActionArgumentBinder, ControllerArgumentBinder>();
             services.TryAddSingleton<FilterCache>();
             services.TryAddEnumerable(
                 ServiceDescriptor.Singleton<IFilterProvider, DefaultFilterProvider>());
@@ -147,7 +147,7 @@ namespace Microsoft.Extensions.DependencyInjection
             // Random Infrastructure
             //
             services.TryAddSingleton<MvcMarkerService, MvcMarkerService>();
-            services.TryAddSingleton<ITypeActivatorCache, DefaultTypeActivatorCache>();
+            services.TryAddSingleton<ITypeActivatorCache, TypeActivatorCache>();
             services.TryAddSingleton<IUrlHelperFactory, UrlHelperFactory>();
             services.TryAddSingleton<IHttpRequestStreamReaderFactory, MemoryPoolHttpRequestStreamReaderFactory>();
             services.TryAddSingleton<IHttpResponseStreamWriterFactory, MemoryPoolHttpResponseStreamWriterFactory>();

src/Microsoft.AspNet.Mvc.Core/DiagnosticSource/MvcRouteHandlerDiagnosticSourceExtensions.cs

@@ -1,41 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.Diagnostics;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc.Abstractions;
-using Microsoft.AspNet.Routing;
-
-namespace Microsoft.AspNet.Mvc.Diagnostics
-{
-    public static class MvcRouteHandlerDiagnosticSourceExtensions
-    {
-        public static void BeforeAction(
-            this DiagnosticSource diagnosticSource,
-            ActionDescriptor actionDescriptor,
-            HttpContext httpContext,
-            RouteData routeData)
-        {
-            if (diagnosticSource.IsEnabled("Microsoft.AspNet.Mvc.BeforeAction"))
-            {
-                diagnosticSource.Write(
-                    "Microsoft.AspNet.Mvc.BeforeAction",
-                    new { actionDescriptor, httpContext = httpContext, routeData = routeData });
-            }
-        }
-
-        public static void AfterAction(
-            this DiagnosticSource diagnosticSource,
-            ActionDescriptor actionDescriptor,
-            HttpContext httpContext,
-            RouteData routeData)
-        {
-            if (diagnosticSource.IsEnabled("Microsoft.AspNet.Mvc.AfterAction"))
-            {
-                diagnosticSource.Write(
-                    "Microsoft.AspNet.Mvc.AfterAction",
-                    new { actionDescriptor, httpContext = httpContext, routeData = routeData });
-            }
-        }
-    }
-}

src/Microsoft.AspNet.Mvc.Core/Formatters/FormatFilter.cs

@@ -5,6 +5,7 @@ using System;
 using System.Linq;
 using Microsoft.AspNet.Mvc.ApiExplorer;
 using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNet.Mvc.Formatters.Internal;
 using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNet.Mvc.Formatters

src/Microsoft.AspNet.Mvc.Core/Formatters/MediaType.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Globalization;
 using System.Text;
+using Microsoft.AspNet.Mvc.Formatters.Internal;
 using Microsoft.Extensions.Internal;
 using Microsoft.Extensions.Primitives;
 

src/Microsoft.AspNet.Mvc.Core/Infrastructure/IActionSelector.cs

@@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Mvc.Infrastructure
         /// </summary>
         /// <param name="context">The <see cref="RouteContext"/> for the current request.</param>
         /// <returns>An <see cref="ActionDescriptor"/> or <c>null</c> if no action can be selected.</returns>
-        /// <exception cref="AmbiguousActionException">
+        /// <exception cref="Internal.AmbiguousActionException">
         /// Thrown when action selection results in an ambiguity.
         /// </exception>
         ActionDescriptor Select(RouteContext context);

src/Microsoft.AspNet.Mvc.Core/Internal/AcceptHeaderParser.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using Microsoft.AspNet.Mvc.Core;
 
-namespace Microsoft.AspNet.Mvc.Formatters
+namespace Microsoft.AspNet.Mvc.Formatters.Internal
 {
     public static class AcceptHeaderParser
     {

src/Microsoft.AspNet.Mvc.Core/Internal/ActionDescriptorCollectionProvider.cs

@@ -5,24 +5,25 @@ using System;
 using System.Collections.ObjectModel;
 using System.Linq;
 using Microsoft.AspNet.Mvc.Abstractions;
+using Microsoft.AspNet.Mvc.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.AspNet.Mvc.Infrastructure
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// Default implementation of <see cref="IActionDescriptorCollectionProvider"/>.
     /// This implementation caches the results at first call, and is not responsible for updates.
     /// </summary>
-    public class DefaultActionDescriptorCollectionProvider : IActionDescriptorCollectionProvider
+    public class ActionDescriptorCollectionProvider : IActionDescriptorCollectionProvider
     {
         private readonly IServiceProvider _serviceProvider;
         private ActionDescriptorCollection _collection;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="DefaultActionDescriptorCollectionProvider" /> class.
+        /// Initializes a new instance of the <see cref="ActionDescriptorCollectionProvider" /> class.
         /// </summary>
         /// <param name="serviceProvider">The application IServiceProvider.</param>
-        public DefaultActionDescriptorCollectionProvider(IServiceProvider serviceProvider)
+        public ActionDescriptorCollectionProvider(IServiceProvider serviceProvider)
         {
             _serviceProvider = serviceProvider;
         }

src/Microsoft.AspNet.Mvc.Core/Internal/ActionInvokerFactory.cs

@@ -4,8 +4,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNet.Mvc.Abstractions;
+using Microsoft.AspNet.Mvc.Infrastructure;
 
-namespace Microsoft.AspNet.Mvc.Infrastructure
+namespace Microsoft.AspNet.Mvc.Internal
 {
     public class ActionInvokerFactory : IActionInvokerFactory
     {

src/Microsoft.AspNet.Mvc.Core/Internal/ActionSelectionDecisionTree.cs

@@ -8,10 +8,11 @@ using System.ComponentModel;
 #endif
 using Microsoft.AspNet.Mvc.Abstractions;
 using Microsoft.AspNet.Mvc.Infrastructure;
+using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.AspNet.Routing;
 using Microsoft.AspNet.Routing.DecisionTree;
 
-namespace Microsoft.AspNet.Mvc.Routing
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <inheritdoc />
     public class ActionSelectionDecisionTree : IActionSelectionDecisionTree

src/Microsoft.AspNet.Mvc.Core/Internal/ActionSelector.cs

@@ -8,36 +8,37 @@ using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc.Abstractions;
 using Microsoft.AspNet.Mvc.ActionConstraints;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Infrastructure;
 using Microsoft.AspNet.Mvc.Logging;
 using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.AspNet.Routing;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNet.Mvc.Infrastructure
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// A default <see cref="IActionSelector"/> implementation.
     /// </summary>
-    public class DefaultActionSelector : IActionSelector
+    public class ActionSelector : IActionSelector
     {
         private readonly IActionSelectorDecisionTreeProvider _decisionTreeProvider;
         private readonly IActionConstraintProvider[] _actionConstraintProviders;
         private ILogger _logger;
 
         /// <summary>
-        /// Creates a new <see cref="DefaultActionSelector"/>.
+        /// Creates a new <see cref="ActionSelector"/>.
         /// </summary>
         /// <param name="decisionTreeProvider">The <see cref="IActionSelectorDecisionTreeProvider"/>.</param>
         /// <param name="actionConstraintProviders">The set of <see cref="IActionInvokerProvider"/> instances.</param>
         /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
-        public DefaultActionSelector(
+        public ActionSelector(
             IActionSelectorDecisionTreeProvider decisionTreeProvider,
             IEnumerable<IActionConstraintProvider> actionConstraintProviders,
             ILoggerFactory loggerFactory)
         {
             _decisionTreeProvider = decisionTreeProvider;
             _actionConstraintProviders = actionConstraintProviders.OrderBy(item => item.Order).ToArray();
-            _logger = loggerFactory.CreateLogger<DefaultActionSelector>();
+            _logger = loggerFactory.CreateLogger<ActionSelector>();
         }
 
         /// <inheritdoc />

src/Microsoft.AspNet.Mvc.Core/Internal/ActionSelectorDecisionTreeProvider.cs

@@ -5,7 +5,7 @@ using System;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Mvc.Infrastructure;
 
-namespace Microsoft.AspNet.Mvc.Routing
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <inheritdoc />
     public class ActionSelectorDecisionTreeProvider : IActionSelectorDecisionTreeProvider

src/Microsoft.AspNet.Mvc.Core/Internal/AllowAnonymousFilter.cs

@@ -1,13 +1,14 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc.Filters
+using Microsoft.AspNet.Mvc.Filters;
+
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// An implementation of <see cref="IAllowAnonymousFilter"/>
     /// </summary>
     public class AllowAnonymousFilter : IAllowAnonymousFilter
     {
-
     }
 }

src/Microsoft.AspNet.Mvc.Core/Internal/AmbiguousActionException.cs

@@ -6,7 +6,7 @@ using System;
 using System.Runtime.Serialization;
 #endif
 
-namespace Microsoft.AspNet.Mvc.Infrastructure
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// An exception which indicates multiple matches in action selection.

src/Microsoft.AspNet.Mvc.Core/Internal/ApiDescriptionActionData.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc.ApiExplorer
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// Represents data used to build an <c>ApiDescription</c>, stored as part of the

src/Microsoft.AspNet.Mvc.Core/Internal/ApplicationModelConventions.cs

@@ -4,8 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNet.Mvc.ApplicationModels;
 
-namespace Microsoft.AspNet.Mvc.ApplicationModels
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// Applies conventions to a <see cref="ApplicationModel"/>.

src/Microsoft.AspNet.Mvc.Core/Internal/AttributeRoute.cs

@@ -9,6 +9,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc.Abstractions;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Mvc.Infrastructure;
+using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.AspNet.Routing;
 using Microsoft.AspNet.Routing.Internal;
 using Microsoft.AspNet.Routing.Template;
@@ -16,7 +17,7 @@ using Microsoft.AspNet.Routing.Tree;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.ObjectPool;
 
-namespace Microsoft.AspNet.Mvc.Routing
+namespace Microsoft.AspNet.Mvc.Internal
 {
     public class AttributeRoute : IRouter
     {

src/Microsoft.AspNet.Mvc.Core/Internal/AttributeRouting.cs

@@ -4,13 +4,14 @@
 using System;
 using System.Text.Encodings.Web;
 using Microsoft.AspNet.Mvc.Infrastructure;
+using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.AspNet.Routing;
 using Microsoft.AspNet.Routing.Internal;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.ObjectPool;
 
-namespace Microsoft.AspNet.Mvc.Routing
+namespace Microsoft.AspNet.Mvc.Internal
 {
     public static class AttributeRouting
     {

src/Microsoft.AspNet.Mvc.Core/Internal/AuthorizationApplicationModelProvider.cs

@@ -4,10 +4,11 @@
 using System;
 using System.Linq;
 using Microsoft.AspNet.Authorization;
+using Microsoft.AspNet.Mvc.ApplicationModels;
 using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNet.Mvc.ApplicationModels
+namespace Microsoft.AspNet.Mvc.Internal
 {
     public class AuthorizationApplicationModelProvider : IApplicationModelProvider
     {

src/Microsoft.AspNet.Mvc.Core/Internal/AuthorizeFilter.cs

@@ -6,10 +6,11 @@ using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Authorization;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNet.Mvc.Filters
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// An implementation of <see cref="IAsyncAuthorizationFilter"/>

src/Microsoft.AspNet.Mvc.Core/Internal/ControllerActionDescriptorBuilder.cs

@@ -9,15 +9,15 @@ using System.Linq;
 using System.Reflection;
 using Microsoft.AspNet.Mvc.Abstractions;
 using Microsoft.AspNet.Mvc.ActionConstraints;
-using Microsoft.AspNet.Mvc.ApiExplorer;
 using Microsoft.AspNet.Mvc.ApplicationModels;
+using Microsoft.AspNet.Mvc.Controllers;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Mvc.Infrastructure;
 using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.AspNet.Routing.Tree;
 
-namespace Microsoft.AspNet.Mvc.Controllers
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// Creates instances of <see cref="ControllerActionDescriptor"/> from <see cref="ApplicationModel"/>.
@@ -424,7 +424,7 @@ namespace Microsoft.AspNet.Mvc.Controllers
             var httpMethods = action.HttpMethods;
             if (httpMethods != null && httpMethods.Count > 0)
             {
-                constraints.Add(new HttpMethodConstraint(httpMethods));
+                constraints.Add(new HttpMethodActionConstraint(httpMethods));
             }
 
             if (action.ActionConstraints != null)
@@ -716,7 +716,7 @@ namespace Microsoft.AspNet.Mvc.Controllers
             {
                 var routeTemplate = action.AttributeRouteInfo?.Template ?? nullTemplate;
 
-                var verbs = action.ActionConstraints.OfType<HttpMethodConstraint>().FirstOrDefault()?.HttpMethods;
+                var verbs = action.ActionConstraints.OfType<HttpMethodActionConstraint>().FirstOrDefault()?.HttpMethods;
                 var formattedVerbs = string.Join(", ", verbs.OrderBy(v => v, StringComparer.Ordinal));
 
                 var description =

src/Microsoft.AspNet.Mvc.Core/Internal/ControllerActionDescriptorProvider.cs

@@ -6,9 +6,10 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNet.Mvc.Abstractions;
 using Microsoft.AspNet.Mvc.ApplicationModels;
+using Microsoft.AspNet.Mvc.Controllers;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNet.Mvc.Controllers
+namespace Microsoft.AspNet.Mvc.Internal
 {
     public class ControllerActionDescriptorProvider : IActionDescriptorProvider
     {

src/Microsoft.AspNet.Mvc.Core/Internal/ControllerActionExecutor.cs

@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNet.Mvc.Controllers
+namespace Microsoft.AspNet.Mvc.Internal
 {
     public static class ControllerActionExecutor
     {

src/Microsoft.AspNet.Mvc.Core/Internal/ControllerActionFilter.cs

@@ -4,8 +4,9 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Filters;
 
-namespace Microsoft.AspNet.Mvc.Filters
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// A filter implementation which delegates to the controller for action filter interfaces.

src/Microsoft.AspNet.Mvc.Core/Internal/ControllerActionInvoker.cs

@@ -6,17 +6,17 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Reflection;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc.Controllers;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Mvc.Formatters;
-using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.AspNet.Mvc.Logging;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Microsoft.Extensions.Internal;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNet.Mvc.Controllers
+namespace Microsoft.AspNet.Mvc.Internal
 {
     public class ControllerActionInvoker : FilterActionInvoker
     {

src/Microsoft.AspNet.Mvc.Core/Internal/ControllerActionInvokerProvider.cs

@@ -6,14 +6,14 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using Microsoft.AspNet.Mvc.Abstractions;
+using Microsoft.AspNet.Mvc.Controllers;
 using Microsoft.AspNet.Mvc.Formatters;
-using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNet.Mvc.Controllers
+namespace Microsoft.AspNet.Mvc.Internal
 {
     public class ControllerActionInvokerProvider : IActionInvokerProvider
     {

src/Microsoft.AspNet.Mvc.Core/Internal/ControllerArgumentBinder.cs

@@ -3,31 +3,31 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc.Abstractions;
+using Microsoft.AspNet.Mvc.Controllers;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNet.Mvc.Controllers
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// Provides a default implementation of <see cref="IControllerActionArgumentBinder"/>.
     /// Uses ModelBinding to populate action parameters.
     /// </summary>
-    public class DefaultControllerActionArgumentBinder : IControllerActionArgumentBinder
+    public class ControllerArgumentBinder : IControllerActionArgumentBinder
     {
         private static readonly MethodInfo CallPropertyAddRangeOpenGenericMethod =
-            typeof(DefaultControllerActionArgumentBinder).GetTypeInfo().GetDeclaredMethod(
+            typeof(ControllerArgumentBinder).GetTypeInfo().GetDeclaredMethod(
                 nameof(CallPropertyAddRange));
 
         private readonly IModelMetadataProvider _modelMetadataProvider;
         private readonly IObjectModelValidator _validator;
 
-        public DefaultControllerActionArgumentBinder(
+        public ControllerArgumentBinder(
             IModelMetadataProvider modelMetadataProvider,
             IObjectModelValidator validator)
         {

src/Microsoft.AspNet.Mvc.Core/Internal/ControllerResultFilter.cs

@@ -4,8 +4,9 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Filters;
 
-namespace Microsoft.AspNet.Mvc.Filters
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// A filter implementation which delegates to the controller for result filter interfaces.

src/Microsoft.AspNet.Mvc.Core/Internal/DefaultActionConstraintProvider.cs

@@ -2,8 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNet.Mvc.ActionConstraints;
 
-namespace Microsoft.AspNet.Mvc.ActionConstraints
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// A default implementation of <see cref="IActionConstraintProvider"/>.

src/Microsoft.AspNet.Mvc.Core/Internal/DefaultApplicationModelProvider.cs

@@ -7,13 +7,15 @@ using System.Linq;
 using System.Reflection;
 using Microsoft.AspNet.Mvc.ActionConstraints;
 using Microsoft.AspNet.Mvc.ApiExplorer;
+using Microsoft.AspNet.Mvc.ApplicationModels;
 using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Mvc.Infrastructure;
 using Microsoft.AspNet.Mvc.ModelBinding;
+using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.Extensions.Internal;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNet.Mvc.ApplicationModels
+namespace Microsoft.AspNet.Mvc.Internal
 {
     public class DefaultApplicationModelProvider : IApplicationModelProvider
     {

src/Microsoft.AspNet.Mvc.Core/Internal/DefaultBindingMetadataProvider.cs

@@ -5,8 +5,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using Microsoft.AspNet.Mvc.ModelBinding;
+using Microsoft.AspNet.Mvc.ModelBinding.Metadata;
 
-namespace Microsoft.AspNet.Mvc.ModelBinding.Metadata
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// A default implementation of <see cref="IBindingMetadataProvider"/>.

src/Microsoft.AspNet.Mvc.Core/Internal/DefaultCollectionValidationStrategy.cs

@@ -1,12 +1,13 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
+using Microsoft.AspNet.Mvc.ModelBinding;
+using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 
-namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// The default implementation of <see cref="IValidationStrategy"/> for a collection.

src/Microsoft.AspNet.Mvc.Core/Internal/DefaultComplexObjectValidationStrategy.cs

@@ -5,8 +5,10 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
+using Microsoft.AspNet.Mvc.ModelBinding;
+using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 
-namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// The default implementation of <see cref="IValidationStrategy"/> for a complex object.

src/Microsoft.AspNet.Mvc.Core/Internal/DefaultCompositeMetadataDetailsProvider.cs

@@ -4,8 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNet.Mvc.ModelBinding.Metadata;
 
-namespace Microsoft.AspNet.Mvc.ModelBinding.Metadata
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// A default implementation of <see cref="ICompositeMetadataDetailsProvider"/>.

src/Microsoft.AspNet.Mvc.Core/Internal/DefaultControllerPropertyActivator.cs

@@ -5,10 +5,10 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNet.Mvc.Infrastructure;
+using Microsoft.AspNet.Mvc.Controllers;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNet.Mvc.Controllers
+namespace Microsoft.AspNet.Mvc.Internal
 {
     public class DefaultControllerPropertyActivator : IControllerPropertyActivator
     {

src/Microsoft.AspNet.Mvc.Core/Internal/DefaultFilterProvider.cs

@@ -4,8 +4,9 @@
 using System;
 using System.Diagnostics;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Filters;
 
-namespace Microsoft.AspNet.Mvc.Filters
+namespace Microsoft.AspNet.Mvc.Internal
 {
     public class DefaultFilterProvider : IFilterProvider
     {

src/Microsoft.AspNet.Mvc.Core/Internal/DefaultModelValidatorProvider.cs

@@ -1,14 +1,16 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
+using Microsoft.AspNet.Mvc.ModelBinding.Validation;
+
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// A default <see cref="IModelValidatorProvider"/>.
     /// </summary>
     /// <remarks>
     /// The <see cref="DefaultModelValidatorProvider"/> provides validators from <see cref="IModelValidator"/>
-    /// instances in <see cref="ModelMetadata.ValidatorMetadata"/>.
+    /// instances in <see cref="ModelBinding.ModelMetadata.ValidatorMetadata"/>.
     /// </remarks>
     public class DefaultModelValidatorProvider : IModelValidatorProvider
     {

src/Microsoft.AspNet.Mvc.Core/Internal/DefaultObjectValidator.cs

@@ -2,8 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNet.Mvc.ModelBinding;
+using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 
-namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// The default implementation of <see cref="IObjectModelValidator"/>.

src/Microsoft.AspNet.Mvc.Core/Internal/DefaultValidationMetadataProvider.cs

@@ -2,9 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNet.Mvc.ModelBinding.Metadata;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 
-namespace Microsoft.AspNet.Mvc.ModelBinding.Metadata
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// A default implementation of <see cref="IValidationMetadataProvider"/>.

src/Microsoft.AspNet.Mvc.Core/Internal/ElementalValueProvider.cs

@@ -3,8 +3,9 @@
 
 using System;
 using System.Globalization;
+using Microsoft.AspNet.Mvc.ModelBinding;
 
-namespace Microsoft.AspNet.Mvc.ModelBinding
+namespace Microsoft.AspNet.Mvc.Internal
 {
     public class ElementalValueProvider : IValueProvider
     {

src/Microsoft.AspNet.Mvc.Core/Internal/ExplicitIndexCollectionValidationStrategy.cs

@@ -4,8 +4,10 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.ModelBinding;
+using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 
-namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// An implementation of <see cref="IValidationStrategy"/> for a collection bound using 'explict indexing'

src/Microsoft.AspNet.Mvc.Core/Internal/FilterActionInvoker.cs

@@ -8,16 +8,14 @@ using System.Runtime.ExceptionServices;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc.Abstractions;
 using Microsoft.AspNet.Mvc.Core;
-using Microsoft.AspNet.Mvc.Diagnostics;
 using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Mvc.Formatters;
-using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.AspNet.Mvc.Logging;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNet.Mvc.Controllers
+namespace Microsoft.AspNet.Mvc.Internal
 {
     public abstract class FilterActionInvoker : IActionInvoker
     {

src/Microsoft.AspNet.Mvc.Core/Internal/FilterDescriptorOrderComparer.cs

@@ -3,8 +3,9 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.Filters;
 
-namespace Microsoft.AspNet.Mvc.Filters
+namespace Microsoft.AspNet.Mvc.Internal
 {
     public class FilterDescriptorOrderComparer : IComparer<FilterDescriptor>
     {

src/Microsoft.AspNet.Mvc.Core/Internal/FilterItemOrderComparer.cs

@@ -3,8 +3,9 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.Filters;
 
-namespace Microsoft.AspNet.Mvc.Filters
+namespace Microsoft.AspNet.Mvc.Internal
 {
     public class FilterItemOrderComparer : IComparer<FilterItem>
     {

src/Microsoft.AspNet.Mvc.Core/Internal/HttpMethodActionConstraint.cs

@@ -4,12 +4,12 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
+using Microsoft.AspNet.Mvc.ActionConstraints;
 using Microsoft.Extensions.Primitives;
 
-namespace Microsoft.AspNet.Mvc.ActionConstraints
+namespace Microsoft.AspNet.Mvc.Internal
 {
-    public class HttpMethodConstraint : IActionConstraint
+    public class HttpMethodActionConstraint : IActionConstraint
     {
         public static readonly int HttpMethodConstraintOrder = 100;
 
@@ -20,7 +20,7 @@ namespace Microsoft.AspNet.Mvc.ActionConstraints
         private readonly string PreflightHttpMethod = "OPTIONS";
 
         // Empty collection means any method will be accepted.
-        public HttpMethodConstraint(IEnumerable<string> httpMethods)
+        public HttpMethodActionConstraint(IEnumerable<string> httpMethods)
         {
             if (httpMethods == null)
             {

src/Microsoft.AspNet.Mvc.Core/Internal/HttpParseResult.cs

@@ -1,9 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc.Formatters
+namespace Microsoft.AspNet.Mvc.Formatters.Internal
 {
-    internal enum HttpParseResult
+    public enum HttpParseResult
     {
         Parsed,
         NotParsed,

src/Microsoft.AspNet.Mvc.Core/Internal/HttpTokenParsingRules.cs

@@ -1,14 +1,12 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Diagnostics.Contracts;
-using System.Globalization;
 using System.Text;
 
-namespace Microsoft.AspNet.Mvc.Formatters
+namespace Microsoft.AspNet.Mvc.Formatters.Internal
 {
-    internal static class HttpTokenParsingRules
+    public static class HttpTokenParsingRules
     {
         private static readonly bool[] TokenChars;
         private const int MaxNestedCount = 5;

src/Microsoft.AspNet.Mvc.Core/Internal/IActionInvokerFactory.cs

@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Mvc.Abstractions;
 
-namespace Microsoft.AspNet.Mvc.Infrastructure
+namespace Microsoft.AspNet.Mvc.Internal
 {
     public interface IActionInvokerFactory
     {

src/Microsoft.AspNet.Mvc.Core/Internal/IActionSelectorDecisionTreeProvider.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc.Routing
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// Stores an <see cref="ActionSelectionDecisionTree"/> for the current value of

src/Microsoft.AspNet.Mvc.Core/Internal/IConsumesActionConstraint.cs

@@ -1,7 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc.ActionConstraints
+using Microsoft.AspNet.Mvc.ActionConstraints;
+
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// An <see cref="IActionConstraint"/> constraint that identifies a type which can be used to select an action

src/Microsoft.AspNet.Mvc.Core/Internal/IFormatFilter.cs

@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Mvc.Filters;
 
-namespace Microsoft.AspNet.Mvc.Formatters
+namespace Microsoft.AspNet.Mvc.Formatters.Internal
 {
     /// <summary>
     ///  A filter which produces a desired content type for the current request. 

src/Microsoft.AspNet.Mvc.Core/Internal/IHttpRequestStreamReaderFactory.cs

@@ -4,7 +4,7 @@
 using System.IO;
 using System.Text;
 
-namespace Microsoft.AspNet.Mvc.Infrastructure
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// Creates <see cref="TextReader"/> instances for reading from <see cref="Http.HttpRequest.Body"/>.

src/Microsoft.AspNet.Mvc.Core/Internal/IHttpResponseStreamWriterFactory.cs

@@ -4,7 +4,7 @@
 using System.IO;
 using System.Text;
 
-namespace Microsoft.AspNet.Mvc.Infrastructure
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// Creates <see cref="TextWriter"/> instances for writing to <see cref="Http.HttpResponse.Body"/>.

src/Microsoft.AspNet.Mvc.Core/Internal/IResponseCacheFilter.cs

@@ -1,7 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc.Filters
+using Microsoft.AspNet.Mvc.Filters;
+
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// An <see cref="IActionFilter"/> which sets the appropriate headers related to Response caching.

src/Microsoft.AspNet.Mvc.Core/Internal/ITypeActivatorCache.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Mvc.Infrastructure
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// Caches <see cref="Microsoft.Extensions.DependencyInjection.ObjectFactory"/> instances produced by 

src/Microsoft.AspNet.Mvc.Core/Internal/MediaTypeSegmentWithQuality.cs

@@ -3,7 +3,7 @@
 
 using Microsoft.Extensions.Primitives;
 
-namespace Microsoft.AspNet.Mvc.Formatters
+namespace Microsoft.AspNet.Mvc.Formatters.Internal
 {
     /// <summary>
     /// A media type with its associated quality.

src/Microsoft.AspNet.Mvc.Core/Internal/MemoryPoolHttpRequestStreamReaderFactory.cs

@@ -5,8 +5,9 @@ using System;
 using System.Buffers;
 using System.IO;
 using System.Text;
+using Microsoft.AspNet.Mvc.Infrastructure;
 
-namespace Microsoft.AspNet.Mvc.Infrastructure
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// An <see cref="IHttpRequestStreamReaderFactory"/> that uses pooled buffers.

src/Microsoft.AspNet.Mvc.Core/Internal/MemoryPoolHttpResponseStreamWriterFactory.cs

@@ -6,7 +6,7 @@ using System.Buffers;
 using System.IO;
 using System.Text;
 
-namespace Microsoft.AspNet.Mvc.Infrastructure
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// An <see cref="IHttpResponseStreamWriterFactory"/> that uses pooled buffers.

src/Microsoft.AspNet.Mvc.Core/Internal/MvcCoreDiagnosticSourceExtensions.cs

@@ -3,13 +3,43 @@
 
 using System.Collections.Generic;
 using System.Diagnostics;
+using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc.Abstractions;
 using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNet.Routing;
 
-namespace Microsoft.AspNet.Mvc.Diagnostics
+namespace Microsoft.AspNet.Mvc.Internal
 {
-    public static class FilterActionInvokerDiagnosticSourceExtensions
+    public static class MvcCoreDiagnosticSourceExtensions
     {
+        public static void BeforeAction(
+            this DiagnosticSource diagnosticSource,
+            ActionDescriptor actionDescriptor,
+            HttpContext httpContext,
+            RouteData routeData)
+        {
+            if (diagnosticSource.IsEnabled("Microsoft.AspNet.Mvc.BeforeAction"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNet.Mvc.BeforeAction",
+                    new { actionDescriptor, httpContext = httpContext, routeData = routeData });
+            }
+        }
+
+        public static void AfterAction(
+            this DiagnosticSource diagnosticSource,
+            ActionDescriptor actionDescriptor,
+            HttpContext httpContext,
+            RouteData routeData)
+        {
+            if (diagnosticSource.IsEnabled("Microsoft.AspNet.Mvc.AfterAction"))
+            {
+                diagnosticSource.Write(
+                    "Microsoft.AspNet.Mvc.AfterAction",
+                    new { actionDescriptor, httpContext = httpContext, routeData = routeData });
+            }
+        }
+
         public static void BeforeOnAuthorizationAsync(
             this DiagnosticSource diagnosticSource,
             AuthorizationContext authorizationContext,

src/Microsoft.AspNet.Mvc.Core/Internal/MvcCoreLoggerExtensions.cs

@@ -4,19 +4,24 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using Microsoft.AspNet.Mvc.Abstractions;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNet.Mvc.Logging
+namespace Microsoft.AspNet.Mvc.Internal
 {
-    internal static class MvcRouteHandlerLoggerExtensions
+    internal static class MvcCoreLoggerExtensions
     {
         private static readonly double TimestampToTicks = TimeSpan.TicksPerSecond / (double)Stopwatch.Frequency;
 
         private static readonly Action<ILogger, string, Exception> _actionExecuting;
         private static readonly Action<ILogger, string, double, Exception> _actionExecuted;
 
-        static MvcRouteHandlerLoggerExtensions()
+        private static readonly Action<ILogger, string[], Exception> _challengeResultExecuting;
+
+        private static readonly Action<ILogger, string, Exception> _contentResultExecuting;
+
+        static MvcCoreLoggerExtensions()
         {
             _actionExecuting = LoggerMessage.Define<string>(
                 LogLevel.Debug,
@@ -27,6 +32,16 @@ namespace Microsoft.AspNet.Mvc.Logging
                 LogLevel.Information,
                 2,
                 "Executed action {ActionName} in {ElapsedMilliseconds}ms");
+
+            _challengeResultExecuting = LoggerMessage.Define<string[]>(
+                LogLevel.Information,
+                1,
+                "Executing ChallengeResult with authentication schemes ({Schemes}).");
+
+            _contentResultExecuting = LoggerMessage.Define<string>(
+                LogLevel.Information,
+                1,
+                "Executing ContentResult with HTTP Response ContentType of {ContentType}");
         }
 
         public static IDisposable ActionScope(this ILogger logger, ActionDescriptor action)
@@ -56,6 +71,16 @@ namespace Microsoft.AspNet.Mvc.Logging
             logger.LogDebug(3, "No actions matched the current request");
         }
 
+        public static void ChallengeResultExecuting(this ILogger logger, IList<string> schemes)
+        {
+            _challengeResultExecuting(logger, schemes.ToArray(), null);
+        }
+
+        public static void ContentResultExecuting(this ILogger logger, string contentType)
+        {
+            _contentResultExecuting(logger, contentType, null);
+        }
+
         private class ActionLogScope : ILogValues
         {
             private readonly ActionDescriptor _action;

src/Microsoft.AspNet.Mvc.Core/Internal/MvcRouteHandler.cs

@@ -7,15 +7,14 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc.Abstractions;
 using Microsoft.AspNet.Mvc.Core;
-using Microsoft.AspNet.Mvc.Diagnostics;
+using Microsoft.AspNet.Mvc.Infrastructure;
-using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.AspNet.Mvc.Logging;
 using Microsoft.AspNet.Routing;
 using Microsoft.AspNet.Routing.Tree;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNet.Mvc.Infrastructure
+namespace Microsoft.AspNet.Mvc.Internal
 {
     public class MvcRouteHandler : IRouter
     {

src/Microsoft.AspNet.Mvc.Core/Internal/ObjectResultExecutor.cs

@@ -9,14 +9,14 @@ using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Mvc.Formatters;
-using Microsoft.AspNet.Mvc.Internal;
+using Microsoft.AspNet.Mvc.Formatters.Internal;
 using Microsoft.AspNet.Mvc.Logging;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc.Infrastructure
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// Executes an <see cref="ObjectResult"/> to write to the response.

src/Microsoft.AspNet.Mvc.Core/Internal/PrefixContainer.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 
-namespace Microsoft.AspNet.Mvc.ModelBinding
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// This is a container for prefix values. It normalizes all the values into dotted-form and then stores

src/Microsoft.AspNet.Mvc.Core/Internal/ReferenceEqualityComparer.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 
-namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
+namespace Microsoft.AspNet.Mvc.Internal
 {
     internal class ReferenceEqualityComparer : IEqualityComparer<object>
     {

src/Microsoft.AspNet.Mvc.Core/Internal/ResponseCacheFilter.cs

@@ -6,12 +6,13 @@ using System.Globalization;
 using System.Linq;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc.Filters
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
-    /// An <see cref="ActionFilterAttribute"/> which sets the appropriate headers related to response caching.
+    /// An <see cref="IActionFilter"/> which sets the appropriate headers related to response caching.
     /// </summary>
     public class ResponseCacheFilter : IActionFilter, IResponseCacheFilter
     {

src/Microsoft.AspNet.Mvc.Core/Internal/RouteConstraintAttribute.cs

@@ -2,10 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Mvc.Core;
-using Microsoft.AspNet.Mvc.Routing;
 
-namespace Microsoft.AspNet.Mvc.Infrastructure
+namespace Microsoft.AspNet.Mvc.Routing
 {
     /// <summary>
     /// An attribute which specifies a required route value for an action or controller.

src/Microsoft.AspNet.Mvc.Core/Internal/ShortFormDictionaryValidationStrategy.cs

@@ -4,8 +4,10 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using Microsoft.AspNet.Mvc.ModelBinding;
+using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 
-namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// An implementation of <see cref="IValidationStrategy"/> for a dictionary bound with 'short form' style keys.

src/Microsoft.AspNet.Mvc.Core/Internal/TypeActivatorCache.cs

@@ -5,13 +5,13 @@ using System;
 using System.Collections.Concurrent;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.AspNet.Mvc.Infrastructure
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// Caches <see cref="ObjectFactory"/> instances produced by 
     /// <see cref="Microsoft.Extensions.DependencyInjection.ActivatorUtilities.CreateFactory(Type, Type[])"/>.
     /// </summary>
-    public class DefaultTypeActivatorCache : ITypeActivatorCache
+    public class TypeActivatorCache : ITypeActivatorCache
     {
         private readonly Func<Type, ObjectFactory> _createFactory =
             (type) => ActivatorUtilities.CreateFactory(type, Type.EmptyTypes);

src/Microsoft.AspNet.Mvc.Core/Logging/ChallengeResultLoggerExtensions.cs

@@ -1,28 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Microsoft.Extensions.Logging;
-
-namespace Microsoft.AspNet.Mvc.Logging
-{
-    internal static class ChallengeResultLoggerExtenstions
-    {
-        private static readonly Action<ILogger, string[], Exception> _challengeResultExecuting;
-
-        static ChallengeResultLoggerExtenstions()
-        {
-            _challengeResultExecuting = LoggerMessage.Define<string[]>(
-                LogLevel.Information,
-                1,
-                "Executing ChallengeResult with authentication schemes ({Schemes}).");
-        }
-
-        public static void ChallengeResultExecuting(this ILogger logger, IList<string> schemes)
-        {
-            _challengeResultExecuting(logger, schemes.ToArray(), null);
-        }
-    }
-}

src/Microsoft.AspNet.Mvc.Core/Logging/ContentResultLoggerExtensions.cs

@@ -1,27 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Microsoft.Extensions.Logging;
-using Microsoft.Net.Http.Headers;
-
-namespace Microsoft.AspNet.Mvc.Logging
-{
-    internal static class ContentResultLoggerExtensions
-    {
-        private static readonly Action<ILogger, string, Exception> _contentResultExecuting;
-
-        static ContentResultLoggerExtensions()
-        {
-            _contentResultExecuting = LoggerMessage.Define<string>(
-                LogLevel.Information,
-                1,
-                "Executing ContentResult with HTTP Response ContentType of {ContentType}");
-        }
-
-        public static void ContentResultExecuting(this ILogger logger, string contentType)
-        {
-            _contentResultExecuting(logger, contentType, null);
-        }
-    }
-}

src/Microsoft.AspNet.Mvc.Core/Logging/ObjectResultExecutorLoggerExtensions.cs

@@ -4,9 +4,8 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNet.Mvc.Formatters;
+using Microsoft.AspNet.Mvc.Formatters.Internal;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Primitives;
-using Microsoft.Net.Http.Headers;
 
 namespace Microsoft.AspNet.Mvc.Logging
 {

src/Microsoft.AspNet.Mvc.Core/ModelBinding/BodyModelBinder.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Mvc.Formatters;
-using Microsoft.AspNet.Mvc.Infrastructure;
+using Microsoft.AspNet.Mvc.Internal;
 
 namespace Microsoft.AspNet.Mvc.ModelBinding
 {

src/Microsoft.AspNet.Mvc.Core/ModelBinding/CollectionModelBinder.cs

@@ -11,6 +11,7 @@ using System.Linq;
 using System.Reflection;
 #endif
 using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 
 namespace Microsoft.AspNet.Mvc.ModelBinding

src/Microsoft.AspNet.Mvc.Core/ModelBinding/DictionaryModelBinder.cs

@@ -9,6 +9,7 @@ using System.Linq;
 using System.Reflection;
 #endif
 using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 
 namespace Microsoft.AspNet.Mvc.ModelBinding

src/Microsoft.AspNet.Mvc.Core/ModelBinding/EmptyModelMetadataProvider.cs

@@ -3,6 +3,7 @@
 
 using System;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.AspNet.Mvc.ModelBinding.Metadata;
 
 namespace Microsoft.AspNet.Mvc.ModelBinding

src/Microsoft.AspNet.Mvc.Core/ModelBinding/FormValueProvider.cs

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Internal;
 
 namespace Microsoft.AspNet.Mvc.ModelBinding
 {

src/Microsoft.AspNet.Mvc.Core/ModelBinding/JQueryFormValueProvider.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNet.Mvc.ModelBinding

src/Microsoft.AspNet.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadata.cs

@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Linq;
+using Microsoft.AspNet.Mvc.Internal;
 #if DOTNET5_4
 using System.Reflection;
 #endif

src/Microsoft.AspNet.Mvc.Core/ModelBinding/ModelBindingHelper.cs

@@ -13,6 +13,7 @@ using System.Runtime.ExceptionServices;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Mvc.Formatters;
+using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 
 namespace Microsoft.AspNet.Mvc.ModelBinding

src/Microsoft.AspNet.Mvc.Core/ModelBinding/QueryStringValueProvider.cs

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Internal;
 
 namespace Microsoft.AspNet.Mvc.ModelBinding
 {

src/Microsoft.AspNet.Mvc.Core/ModelBinding/RouteValueProvider.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Globalization;
+using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.AspNet.Routing;
 
 namespace Microsoft.AspNet.Mvc.ModelBinding

src/Microsoft.AspNet.Mvc.Core/ModelBinding/Validation/ValidationVisitor.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
+using Microsoft.AspNet.Mvc.Internal;
 
 namespace Microsoft.AspNet.Mvc.ModelBinding.Validation
 {

src/Microsoft.AspNet.Mvc.Core/MvcOptions.cs

@@ -36,7 +36,7 @@ namespace Microsoft.AspNet.Mvc
 
         /// <summary>
         /// Gets a Dictionary of CacheProfile Names, <see cref="CacheProfile"/> which are pre-defined settings for
-        /// <see cref="ResponseCacheFilter"/>.
+        /// response caching.
         /// </summary>
         public IDictionary<string, CacheProfile> CacheProfiles { get; }
 

src/Microsoft.AspNet.Mvc.Core/ObjectResult.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Mvc.Formatters;
-using Microsoft.AspNet.Mvc.Infrastructure;
+using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNet.Mvc

src/Microsoft.AspNet.Mvc.Core/ProducesAttribute.cs

@@ -8,6 +8,7 @@ using Microsoft.AspNet.Mvc.ApiExplorer;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Mvc.Filters;
 using Microsoft.AspNet.Mvc.Formatters;
+using Microsoft.AspNet.Mvc.Formatters.Internal;
 using Microsoft.Extensions.Primitives;
 using Microsoft.Net.Http.Headers;
 

src/Microsoft.AspNet.Mvc.Core/ResponseCacheAttribute.cs

@@ -4,6 +4,7 @@
 using System;
 using Microsoft.AspNet.Mvc.Core;
 using Microsoft.AspNet.Mvc.Filters;
+using Microsoft.AspNet.Mvc.Internal;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
@@ -118,14 +119,13 @@ namespace Microsoft.AspNet.Mvc
 
             // ResponseCacheFilter cannot take any null values. Hence, if there are any null values,
             // the properties convert them to their defaults and are passed on.
-            return new ResponseCacheFilter(
+            return new ResponseCacheFilter(new CacheProfile
-                new CacheProfile
+            {
-                {
+                Duration = _duration,
-                    Duration = _duration,
+                Location = _location,
-                    Location = _location,
+                NoStore = _noStore,
-                    NoStore = _noStore,
+                VaryByHeader = VaryByHeader
-                    VaryByHeader = VaryByHeader
+            });
-                });
         }
     }
 }

src/Microsoft.AspNet.Mvc.Core/RouteAttribute.cs

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNet.Mvc.Infrastructure;
+using Microsoft.AspNet.Mvc.Routing;
 
 namespace Microsoft.AspNet.Mvc
 {

src/Microsoft.AspNet.Mvc.Core/Routing/HttpMethodAttribute.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.Mvc.Infrastructure;
 
 namespace Microsoft.AspNet.Mvc.Routing
 {