diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/Actions/ActionDescriptor.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Abstractions/ActionDescriptor.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.Abstractions/Actions/ActionDescriptor.cs rename to src/Microsoft.AspNet.Mvc.Abstractions/Abstractions/ActionDescriptor.cs index ab8c38906f..8f048c022a 100644 --- a/src/Microsoft.AspNet.Mvc.Abstractions/Actions/ActionDescriptor.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/Abstractions/ActionDescriptor.cs @@ -7,7 +7,7 @@ using Microsoft.AspNet.Mvc.ActionConstraints; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.Routing; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Abstractions { public class ActionDescriptor { diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/ActionDescriptorExtensions.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Abstractions/ActionDescriptorExtensions.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.Core/Actions/ActionDescriptorExtensions.cs rename to src/Microsoft.AspNet.Mvc.Abstractions/Abstractions/ActionDescriptorExtensions.cs index 5e30655d61..9b263d8e8e 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/ActionDescriptorExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/Abstractions/ActionDescriptorExtensions.cs @@ -3,7 +3,7 @@ using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Abstractions { /// /// Extension methods for . diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/ActionDescriptorProviderContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Abstractions/ActionDescriptorProviderContext.cs similarity index 89% rename from src/Microsoft.AspNet.Mvc.Core/Actions/ActionDescriptorProviderContext.cs rename to src/Microsoft.AspNet.Mvc.Abstractions/Abstractions/ActionDescriptorProviderContext.cs index d3c7d849c5..b3933976da 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/ActionDescriptorProviderContext.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/Abstractions/ActionDescriptorProviderContext.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Abstractions { public class ActionDescriptorProviderContext { diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/ActionInvokerProviderContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Abstractions/ActionInvokerProviderContext.cs similarity index 92% rename from src/Microsoft.AspNet.Mvc.Core/Actions/ActionInvokerProviderContext.cs rename to src/Microsoft.AspNet.Mvc.Abstractions/Abstractions/ActionInvokerProviderContext.cs index 0627476223..1eaffe904b 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/ActionInvokerProviderContext.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/Abstractions/ActionInvokerProviderContext.cs @@ -3,7 +3,7 @@ using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Abstractions { public class ActionInvokerProviderContext { diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/IActionDescriptorProvider.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Abstractions/IActionDescriptorProvider.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.Core/Actions/IActionDescriptorProvider.cs rename to src/Microsoft.AspNet.Mvc.Abstractions/Abstractions/IActionDescriptorProvider.cs index d32a71f114..7b581a2607 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/IActionDescriptorProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/Abstractions/IActionDescriptorProvider.cs @@ -3,7 +3,7 @@ using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Abstractions { public interface IActionDescriptorProvider { diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/IActionInvoker.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Abstractions/IActionInvoker.cs similarity index 86% rename from src/Microsoft.AspNet.Mvc.Core/Actions/IActionInvoker.cs rename to src/Microsoft.AspNet.Mvc.Abstractions/Abstractions/IActionInvoker.cs index ef8bf148c5..440c5e423e 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/IActionInvoker.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/Abstractions/IActionInvoker.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Abstractions { public interface IActionInvoker { diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/IActionInvokerProvider.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Abstractions/IActionInvokerProvider.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.Core/Actions/IActionInvokerProvider.cs rename to src/Microsoft.AspNet.Mvc.Abstractions/Abstractions/IActionInvokerProvider.cs index e97bf65508..9b350c3c49 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/IActionInvokerProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/Abstractions/IActionInvokerProvider.cs @@ -3,7 +3,7 @@ using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Abstractions { public interface IActionInvokerProvider { diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/Actions/ParameterDescriptor.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Abstractions/ParameterDescriptor.cs similarity index 90% rename from src/Microsoft.AspNet.Mvc.Abstractions/Actions/ParameterDescriptor.cs rename to src/Microsoft.AspNet.Mvc.Abstractions/Abstractions/ParameterDescriptor.cs index 48cc6dfd3a..a6a67ee431 100644 --- a/src/Microsoft.AspNet.Mvc.Abstractions/Actions/ParameterDescriptor.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/Abstractions/ParameterDescriptor.cs @@ -4,7 +4,7 @@ using System; using Microsoft.AspNet.Mvc.ModelBinding; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Abstractions { public class ParameterDescriptor { diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/ActionConstraintProviderContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/ActionConstraintProviderContext.cs index 4e78170c49..72a1cd55e2 100644 --- a/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/ActionConstraintProviderContext.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/ActionConstraintProviderContext.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.ActionConstraints diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/ActionSelectorCandidate.cs b/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/ActionSelectorCandidate.cs index b1ed6b92c0..ca5ef9a840 100644 --- a/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/ActionSelectorCandidate.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/ActionConstraints/ActionSelectorCandidate.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.Collections.Generic; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.ActionConstraints diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/ActionContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/ActionContext.cs index 27b8120958..e13592f05a 100644 --- a/src/Microsoft.AspNet.Mvc.Abstractions/ActionContext.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/ActionContext.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Routing; using Microsoft.Framework.Internal; @@ -43,7 +43,7 @@ namespace Microsoft.AspNet.Mvc /// /// The for the current request. /// The for the current request. - /// The for the selected action. + /// The for the selected action. public ActionContext( [NotNull] HttpContext httpContext, [NotNull] RouteData routeData, @@ -57,7 +57,7 @@ namespace Microsoft.AspNet.Mvc /// /// The for the current request. /// The for the current request. - /// The for the selected action. + /// The for the selected action. /// The . public ActionContext( [NotNull] HttpContext httpContext, @@ -72,7 +72,7 @@ namespace Microsoft.AspNet.Mvc } /// - /// Gets or sets the for the selected action. + /// Gets or sets the for the selected action. /// /// /// The property setter is provided for unit test purposes only. diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ActionExecutedContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ActionExecutedContext.cs index 000e3e61ea..199fb6a9e0 100644 --- a/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ActionExecutedContext.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ActionExecutedContext.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; using System.Runtime.ExceptionServices; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Filters diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ActionExecutingContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ActionExecutingContext.cs index 2445f979b7..12d374769b 100644 --- a/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ActionExecutingContext.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ActionExecutingContext.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Filters diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/Filters/AuthorizationContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/AuthorizationContext.cs index 11a6bb7cde..64f58d2f74 100644 --- a/src/Microsoft.AspNet.Mvc.Abstractions/Filters/AuthorizationContext.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/AuthorizationContext.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Filters diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ExceptionContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ExceptionContext.cs index 4d8ca31506..381bcd3c8f 100644 --- a/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ExceptionContext.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ExceptionContext.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; using System.Runtime.ExceptionServices; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Filters diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/Filters/FilterContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/FilterContext.cs index e0cfbe77c6..a37a55c5e7 100644 --- a/src/Microsoft.AspNet.Mvc.Abstractions/Filters/FilterContext.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/FilterContext.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Filters diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/Filters/FilterProviderContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/FilterProviderContext.cs index d9c64394a4..c3b77f6edd 100644 --- a/src/Microsoft.AspNet.Mvc.Abstractions/Filters/FilterProviderContext.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/FilterProviderContext.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Filters diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResourceExecutedContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResourceExecutedContext.cs index b82f114ba9..53e8956458 100644 --- a/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResourceExecutedContext.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResourceExecutedContext.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; using System.Runtime.ExceptionServices; -using Microsoft.AspNet.Mvc.Actions; namespace Microsoft.AspNet.Mvc.Filters { diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResourceExecutingContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResourceExecutingContext.cs index 2fc9015924..30281025da 100644 --- a/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResourceExecutingContext.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResourceExecutingContext.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Formatters; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResultExecutedContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResultExecutedContext.cs index c94197ac77..87fe7522dd 100644 --- a/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResultExecutedContext.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResultExecutedContext.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; using System.Runtime.ExceptionServices; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Filters diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResultExecutingContext.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResultExecutingContext.cs index 6b7d7b01ea..88cb7ba4e1 100644 --- a/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResultExecutingContext.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/Filters/ResultExecutingContext.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Collections.Generic; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Filters diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/IActionResult.cs b/src/Microsoft.AspNet.Mvc.Abstractions/IActionResult.cs index 25e27a2f4f..e2fc5dfc27 100644 --- a/src/Microsoft.AspNet.Mvc.Abstractions/IActionResult.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/IActionResult.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; -using Microsoft.AspNet.Mvc.Actions; namespace Microsoft.AspNet.Mvc { diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/Actions/RouteDataActionConstraint.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Routing/RouteDataActionConstraint.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Abstractions/Actions/RouteDataActionConstraint.cs rename to src/Microsoft.AspNet.Mvc.Abstractions/Routing/RouteDataActionConstraint.cs index 5e3e905aba..1244ab42c4 100644 --- a/src/Microsoft.AspNet.Mvc.Abstractions/Actions/RouteDataActionConstraint.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/Routing/RouteDataActionConstraint.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Routing { /// /// Constraints an action to a route key and value. diff --git a/src/Microsoft.AspNet.Mvc.Abstractions/Actions/RouteKeyHandling.cs b/src/Microsoft.AspNet.Mvc.Abstractions/Routing/RouteKeyHandling.cs similarity index 95% rename from src/Microsoft.AspNet.Mvc.Abstractions/Actions/RouteKeyHandling.cs rename to src/Microsoft.AspNet.Mvc.Abstractions/Routing/RouteKeyHandling.cs index 487a2a5283..aee03ff0e4 100644 --- a/src/Microsoft.AspNet.Mvc.Abstractions/Actions/RouteKeyHandling.cs +++ b/src/Microsoft.AspNet.Mvc.Abstractions/Routing/RouteKeyHandling.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.Actions +namespace Microsoft.AspNet.Mvc.Routing { public enum RouteKeyHandling { diff --git a/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescription.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescription.cs index bb17c41e12..f2b1a2ff60 100644 --- a/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescription.cs +++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescription.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; namespace Microsoft.AspNet.Mvc.ApiExplorer diff --git a/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionGroupCollectionProvider.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionGroupCollectionProvider.cs index b067eb60be..df756f1390 100644 --- a/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionGroupCollectionProvider.cs +++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionGroupCollectionProvider.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Infrastructure; namespace Microsoft.AspNet.Mvc.ApiExplorer { diff --git a/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionProviderContext.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionProviderContext.cs index 8ca05885b1..0fe65eab7d 100644 --- a/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionProviderContext.cs +++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/ApiDescriptionProviderContext.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.Collections.Generic; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.ApiExplorer diff --git a/src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs index f49e7c8805..45395cc25c 100644 --- a/src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs +++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs @@ -6,8 +6,9 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Threading.Tasks; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ActionConstraints; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Controllers; using Microsoft.AspNet.Mvc.Formatters; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Routing; diff --git a/src/Microsoft.AspNet.Mvc.Core/AcceptVerbsAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/AcceptVerbsAttribute.cs index dc484e9af6..1c06a4d426 100644 --- a/src/Microsoft.AspNet.Mvc.Core/AcceptVerbsAttribute.cs +++ b/src/Microsoft.AspNet.Mvc.Core/AcceptVerbsAttribute.cs @@ -4,8 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Mvc.Actions; -using Microsoft.AspNet.Mvc.Routing; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/ActionBindingContext.cs b/src/Microsoft.AspNet.Mvc.Core/ActionBindingContext.cs similarity index 94% rename from src/Microsoft.AspNet.Mvc.Core/Actions/ActionBindingContext.cs rename to src/Microsoft.AspNet.Mvc.Core/ActionBindingContext.cs index ab61022005..122236af8d 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/ActionBindingContext.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ActionBindingContext.cs @@ -6,7 +6,7 @@ using Microsoft.AspNet.Mvc.Formatters; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc { public class ActionBindingContext { diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionBindingContextAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/ActionBindingContextAttribute.cs index cee05eebd1..72bf1dd423 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionBindingContextAttribute.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ActionBindingContextAttribute.cs @@ -7,7 +7,7 @@ namespace Microsoft.AspNet.Mvc { /// /// Specifies that a controller property should be set with the current - /// when creating the controller. The property must have a public + /// when creating the controller. The property must have a public /// set method. /// [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)] diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionConstraints/ActionMethodSelectorAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/ActionConstraints/ActionMethodSelectorAttribute.cs index 5cea3aaa35..331d1e69ec 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionConstraints/ActionMethodSelectorAttribute.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ActionConstraints/ActionMethodSelectorAttribute.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.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Routing; namespace Microsoft.AspNet.Mvc.ActionConstraints diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResult.cs index 93408325f4..b135421a79 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ActionResult.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; -using Microsoft.AspNet.Mvc.Actions; namespace Microsoft.AspNet.Mvc { diff --git a/src/Microsoft.AspNet.Mvc.Core/ApiExplorer/ApiDescriptionActionData.cs b/src/Microsoft.AspNet.Mvc.Core/ApiExplorer/ApiDescriptionActionData.cs index aa97916807..7faeb0ec01 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ApiExplorer/ApiDescriptionActionData.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ApiExplorer/ApiDescriptionActionData.cs @@ -5,7 +5,7 @@ namespace Microsoft.AspNet.Mvc.ApiExplorer { /// /// Represents data used to build an ApiDescription, stored as part of the - /// . + /// . /// public class ApiDescriptionActionData { diff --git a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ActionModel.cs b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ActionModel.cs index 5e069aa34b..43f4de045e 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ActionModel.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ActionModel.cs @@ -6,8 +6,8 @@ using System.Diagnostics; using System.Linq; using System.Reflection; using Microsoft.AspNet.Mvc.ActionConstraints; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Filters; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.ApplicationModels @@ -92,7 +92,7 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels /// /// Gets a set of properties associated with the action. - /// These properties will be copied to . + /// These properties will be copied to . /// /// /// Entries will take precedence over entries with the same key in diff --git a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ApplicationModel.cs b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ApplicationModel.cs index bd0deb6fe2..70e97e6015 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ApplicationModel.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ApplicationModel.cs @@ -37,7 +37,7 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels /// /// Gets a set of properties associated with all actions. - /// These properties will be copied to . + /// These properties will be copied to . /// public IDictionary Properties { get; } } diff --git a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/AttributeRouteModel.cs b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/AttributeRouteModel.cs index 811499ad51..96fa3bdc11 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/AttributeRouteModel.cs +++ b/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.Routing; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.ApplicationModels diff --git a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ControllerModel.cs b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ControllerModel.cs index 9b1cf90455..c3ab3486ab 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ControllerModel.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/ControllerModel.cs @@ -6,8 +6,8 @@ using System.Diagnostics; using System.Linq; using System.Reflection; using Microsoft.AspNet.Mvc.ActionConstraints; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Filters; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.ApplicationModels @@ -91,7 +91,7 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels /// /// Gets a set of properties associated with the controller. - /// These properties will be copied to . + /// These properties will be copied to . /// /// /// Entries will take precedence over entries with the same key diff --git a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultApplicationModelProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultApplicationModelProvider.cs index f799bd02c2..7782f13bbd 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultApplicationModelProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultApplicationModelProvider.cs @@ -5,10 +5,11 @@ using System; using System.Collections.Generic; using System.Linq; using System.Reflection; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ActionConstraints; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ApiExplorer; using Microsoft.AspNet.Mvc.Filters; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Routing; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.Core/AreaAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/AreaAttribute.cs index 2c26ea9cce..3482a89424 100644 --- a/src/Microsoft.AspNet.Mvc.Core/AreaAttribute.cs +++ b/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.Actions; +using Microsoft.AspNet.Mvc.Infrastructure; namespace Microsoft.AspNet.Mvc { diff --git a/src/Microsoft.AspNet.Mvc.Core/Builder/MvcApplicationBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/Builder/MvcApplicationBuilderExtensions.cs index 6618ae2546..59cd1c552e 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Builder/MvcApplicationBuilderExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Builder/MvcApplicationBuilderExtensions.cs @@ -2,8 +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; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.Internal; using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Routing; diff --git a/src/Microsoft.AspNet.Mvc.Core/ChallengeResult.cs b/src/Microsoft.AspNet.Mvc.Core/ChallengeResult.cs index fd1a81c179..8f1fa10735 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ChallengeResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ChallengeResult.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNet.Http.Authentication; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc diff --git a/src/Microsoft.AspNet.Mvc.Core/ConsumesAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/ConsumesAttribute.cs index b5ea84645a..3763d6162f 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ConsumesAttribute.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ConsumesAttribute.cs @@ -4,8 +4,8 @@ using System; using System.Collections.Generic; using System.Linq; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ActionConstraints; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Core; using Microsoft.AspNet.Mvc.Filters; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptor.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionDescriptor.cs similarity index 93% rename from src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptor.cs rename to src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionDescriptor.cs index 93d48b1dc1..8348b7374a 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptor.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionDescriptor.cs @@ -4,8 +4,9 @@ using System; using System.Diagnostics; using System.Reflection; +using Microsoft.AspNet.Mvc.Abstractions; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { [DebuggerDisplay("CA {DisplayName}(RC-{RouteConstraints.Count})")] public class ControllerActionDescriptor : ActionDescriptor diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptorBuilder.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionDescriptorBuilder.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptorBuilder.cs rename to src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionDescriptorBuilder.cs index 87226da833..958b9173c9 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptorBuilder.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionDescriptorBuilder.cs @@ -7,14 +7,16 @@ using System.Diagnostics; using System.Globalization; 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.Core; using Microsoft.AspNet.Mvc.Filters; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.Routing; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { /// /// Creates instances of from . diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptorProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionDescriptorProvider.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptorProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionDescriptorProvider.cs index f18b93c784..44bab034b3 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptorProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionDescriptorProvider.cs @@ -3,11 +3,12 @@ using System.Collections.Generic; using System.Linq; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ApplicationModels; using Microsoft.Framework.Internal; using Microsoft.Framework.OptionsModel; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { public class ControllerActionDescriptorProvider : IActionDescriptorProvider { diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionExecutor.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionExecutor.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionExecutor.cs rename to src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionExecutor.cs index 3dedcab26f..022a80c359 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionExecutor.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionExecutor.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Mvc.Core; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { public static class ControllerActionExecutor { diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionInvoker.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionInvoker.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionInvoker.cs rename to src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionInvoker.cs index cc9c1d4f33..a7d96f1e73 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionInvoker.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionInvoker.cs @@ -10,12 +10,13 @@ using System.Threading.Tasks; using Microsoft.AspNet.Mvc.Core; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.Formatters; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; using Microsoft.Framework.Internal; using Microsoft.Framework.Logging; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { public class ControllerActionInvoker : FilterActionInvoker { diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionInvokerProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionInvokerProvider.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionInvokerProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionInvokerProvider.cs index 74288e63f3..27f54455f3 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionInvokerProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerActionInvokerProvider.cs @@ -4,15 +4,17 @@ using System.Collections.Generic; using System.Diagnostics.Tracing; using System.Linq; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.Formatters; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; using Microsoft.Framework.Internal; using Microsoft.Framework.Logging; using Microsoft.Framework.OptionsModel; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { public class ControllerActionInvokerProvider : IActionInvokerProvider { diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerBoundPropertyDescriptor.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerBoundPropertyDescriptor.cs similarity index 87% rename from src/Microsoft.AspNet.Mvc.Core/Actions/ControllerBoundPropertyDescriptor.cs rename to src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerBoundPropertyDescriptor.cs index 5bf7cd59db..e0fc19ddc8 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerBoundPropertyDescriptor.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerBoundPropertyDescriptor.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.Reflection; +using Microsoft.AspNet.Mvc.Abstractions; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { /// /// A descriptor for model bound properties of a controller. diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerParameterDescriptor.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerParameterDescriptor.cs similarity index 86% rename from src/Microsoft.AspNet.Mvc.Core/Actions/ControllerParameterDescriptor.cs rename to src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerParameterDescriptor.cs index 1950c4537d..3744cfb86c 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerParameterDescriptor.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Controllers/ControllerParameterDescriptor.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.Reflection; +using Microsoft.AspNet.Mvc.Abstractions; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { /// /// A descriptor for method parameters of an action method. diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerActionArgumentBinder.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/DefaultControllerActionArgumentBinder.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerActionArgumentBinder.cs rename to src/Microsoft.AspNet.Mvc.Core/Controllers/DefaultControllerActionArgumentBinder.cs index f2650cc20f..4449f19901 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerActionArgumentBinder.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Controllers/DefaultControllerActionArgumentBinder.cs @@ -6,12 +6,13 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Threading.Tasks; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Core; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { /// /// Provides a default implementation of . diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerActivator.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/DefaultControllerActivator.cs similarity index 93% rename from src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerActivator.cs rename to src/Microsoft.AspNet.Mvc.Core/Controllers/DefaultControllerActivator.cs index ead1e3d13a..972b615286 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerActivator.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Controllers/DefaultControllerActivator.cs @@ -2,10 +2,11 @@ // 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.Framework.DependencyInjection; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { /// /// that uses type activation to create controllers. diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerFactory.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/DefaultControllerFactory.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerFactory.cs rename to src/Microsoft.AspNet.Mvc.Core/Controllers/DefaultControllerFactory.cs index 8d93e95d9d..63b431bc3c 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerFactory.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Controllers/DefaultControllerFactory.cs @@ -8,7 +8,7 @@ using System.Reflection; using Microsoft.AspNet.Mvc.Core; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { /// /// Default implementation for . diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerPropertyActivator.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/DefaultControllerPropertyActivator.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerPropertyActivator.cs rename to src/Microsoft.AspNet.Mvc.Core/Controllers/DefaultControllerPropertyActivator.cs index 2338da2c34..c1bffa9a49 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerPropertyActivator.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Controllers/DefaultControllerPropertyActivator.cs @@ -5,10 +5,10 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; -using Microsoft.Framework.DependencyInjection; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { public class DefaultControllerPropertyActivator : IControllerPropertyActivator { diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerTypeProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/DefaultControllerTypeProvider.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerTypeProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/Controllers/DefaultControllerTypeProvider.cs index 2173725ea5..d67b2e0168 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultControllerTypeProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Controllers/DefaultControllerTypeProvider.cs @@ -5,9 +5,10 @@ using System; using System.Collections.Generic; using System.Linq; using System.Reflection; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { /// /// A that identifies controller types from assemblies diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/FilterActionInvoker.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/FilterActionInvoker.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Core/Actions/FilterActionInvoker.cs rename to src/Microsoft.AspNet.Mvc.Core/Controllers/FilterActionInvoker.cs index 1b00f6cd05..9263427cb8 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/FilterActionInvoker.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Controllers/FilterActionInvoker.cs @@ -8,16 +8,18 @@ using System.Diagnostics.Tracing; using System.Linq; using System.Runtime.ExceptionServices; using System.Threading.Tasks; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Core; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.Formatters; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.Internal; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; using Microsoft.Framework.Internal; using Microsoft.Framework.Logging; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { public abstract class FilterActionInvoker : IActionInvoker { diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/IControllerActionArgumentBinder.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/IControllerActionArgumentBinder.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.Core/Actions/IControllerActionArgumentBinder.cs rename to src/Microsoft.AspNet.Mvc.Core/Controllers/IControllerActionArgumentBinder.cs index 5e6d980b6b..bbc3b63ef2 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/IControllerActionArgumentBinder.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Controllers/IControllerActionArgumentBinder.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { /// /// Provides a dictionary of action arguments. diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/IControllerActivator.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/IControllerActivator.cs similarity index 92% rename from src/Microsoft.AspNet.Mvc.Core/Actions/IControllerActivator.cs rename to src/Microsoft.AspNet.Mvc.Core/Controllers/IControllerActivator.cs index 73c70dcd19..4a5cab48bb 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/IControllerActivator.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Controllers/IControllerActivator.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { /// /// Provides methods to create a controller. diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/IControllerFactory.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/IControllerFactory.cs similarity index 95% rename from src/Microsoft.AspNet.Mvc.Core/Actions/IControllerFactory.cs rename to src/Microsoft.AspNet.Mvc.Core/Controllers/IControllerFactory.cs index 52de6ed529..89ad66a14d 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/IControllerFactory.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Controllers/IControllerFactory.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.Actions +namespace Microsoft.AspNet.Mvc.Controllers { /// /// Provides methods for creation and disposal of controllers. diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/IControllerPropertyActivator.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/IControllerPropertyActivator.cs similarity index 87% rename from src/Microsoft.AspNet.Mvc.Core/Actions/IControllerPropertyActivator.cs rename to src/Microsoft.AspNet.Mvc.Core/Controllers/IControllerPropertyActivator.cs index 2677b5476c..ab9a1a4446 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/IControllerPropertyActivator.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Controllers/IControllerPropertyActivator.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.Actions +namespace Microsoft.AspNet.Mvc.Controllers { public interface IControllerPropertyActivator { diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/IControllerTypeProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/IControllerTypeProvider.cs similarity index 92% rename from src/Microsoft.AspNet.Mvc.Core/Actions/IControllerTypeProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/Controllers/IControllerTypeProvider.cs index 04e6c85e1b..9fe4e3b268 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/IControllerTypeProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Controllers/IControllerTypeProvider.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Reflection; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { /// /// Provides methods for discovery of controller types. diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/ServiceBasedControllerActivator.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/ServiceBasedControllerActivator.cs similarity index 94% rename from src/Microsoft.AspNet.Mvc.Core/Actions/ServiceBasedControllerActivator.cs rename to src/Microsoft.AspNet.Mvc.Core/Controllers/ServiceBasedControllerActivator.cs index ccd5beeaf3..6a6bf1262f 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/ServiceBasedControllerActivator.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Controllers/ServiceBasedControllerActivator.cs @@ -5,7 +5,7 @@ using System; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { /// /// A that retrieves controllers as services from the request's diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/StaticControllerTypeProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Controllers/StaticControllerTypeProvider.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.Core/Actions/StaticControllerTypeProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/Controllers/StaticControllerTypeProvider.cs index 7a89b9a826..d221df7d41 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/StaticControllerTypeProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Controllers/StaticControllerTypeProvider.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Reflection; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { /// /// A with a fixed set of types that are used as controllers. diff --git a/src/Microsoft.AspNet.Mvc.Core/CreatedAtRouteResult.cs b/src/Microsoft.AspNet.Mvc.Core/CreatedAtRouteResult.cs index adb60fd56c..0c6b052340 100644 --- a/src/Microsoft.AspNet.Mvc.Core/CreatedAtRouteResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/CreatedAtRouteResult.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Core; using Microsoft.AspNet.Mvc.Routing; using Microsoft.Framework.DependencyInjection; diff --git a/src/Microsoft.AspNet.Mvc.Core/CreatedResult.cs b/src/Microsoft.AspNet.Mvc.Core/CreatedResult.cs index dc08ad9b2a..68c1476504 100644 --- a/src/Microsoft.AspNet.Mvc.Core/CreatedResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/CreatedResult.cs @@ -3,7 +3,6 @@ using System; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; diff --git a/src/Microsoft.AspNet.Mvc.Core/DependencyInjection/MvcCoreServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/DependencyInjection/MvcCoreServiceCollectionExtensions.cs index 319df3759d..a296bf438f 100644 --- a/src/Microsoft.AspNet.Mvc.Core/DependencyInjection/MvcCoreServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Core/DependencyInjection/MvcCoreServiceCollectionExtensions.cs @@ -2,13 +2,13 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Diagnostics.Tracing; -using System.Linq; using Microsoft.AspNet.Mvc; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ActionConstraints; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ApplicationModels; +using Microsoft.AspNet.Mvc.Controllers; using Microsoft.AspNet.Mvc.Filters; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.Internal; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Metadata; diff --git a/src/Microsoft.AspNet.Mvc.Core/EmptyResult.cs b/src/Microsoft.AspNet.Mvc.Core/EmptyResult.cs index c815038a46..26166d2d19 100644 --- a/src/Microsoft.AspNet.Mvc.Core/EmptyResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/EmptyResult.cs @@ -1,7 +1,6 @@ // 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.Actions; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc diff --git a/src/Microsoft.AspNet.Mvc.Core/FileResult.cs b/src/Microsoft.AspNet.Mvc.Core/FileResult.cs index d002d75f60..6e7925d74f 100644 --- a/src/Microsoft.AspNet.Mvc.Core/FileResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/FileResult.cs @@ -4,7 +4,6 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; diff --git a/src/Microsoft.AspNet.Mvc.Core/Formatters/FormatFilter.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/FormatFilter.cs index 4258910cb1..a885ed2232 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Formatters/FormatFilter.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/FormatFilter.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ApiExplorer; using Microsoft.AspNet.Mvc.Filters; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.Framework.Internal; using Microsoft.Framework.OptionsModel; using Microsoft.Net.Http.Headers; diff --git a/src/Microsoft.AspNet.Mvc.Core/HttpStatusCodeResult.cs b/src/Microsoft.AspNet.Mvc.Core/HttpStatusCodeResult.cs index 162f133031..5aedaa4035 100644 --- a/src/Microsoft.AspNet.Mvc.Core/HttpStatusCodeResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/HttpStatusCodeResult.cs @@ -1,7 +1,6 @@ // 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.Actions; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/ActionBindingContextAccessor.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/ActionBindingContextAccessor.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.Core/Actions/ActionBindingContextAccessor.cs rename to src/Microsoft.AspNet.Mvc.Core/Infrastructure/ActionBindingContextAccessor.cs index df335e8106..179c40b68b 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/ActionBindingContextAccessor.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/ActionBindingContextAccessor.cs @@ -8,7 +8,7 @@ using System.Runtime.Remoting.Messaging; using System.Threading; #endif -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Infrastructure { public class ActionBindingContextAccessor : IActionBindingContextAccessor { diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/ActionContextAccessor.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/ActionContextAccessor.cs similarity index 93% rename from src/Microsoft.AspNet.Mvc.Core/Actions/ActionContextAccessor.cs rename to src/Microsoft.AspNet.Mvc.Core/Infrastructure/ActionContextAccessor.cs index bb17b7fad2..4a06103e0a 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/ActionContextAccessor.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/ActionContextAccessor.cs @@ -4,12 +4,11 @@ #if DNX451 using System.Runtime.Remoting; using System.Runtime.Remoting.Messaging; -using Microsoft.AspNet.Mvc.Actions; #else using System.Threading; #endif -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Infrastructure { public class ActionContextAccessor : IActionContextAccessor { diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/ActionDescriptorsCollection.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/ActionDescriptorsCollection.cs similarity index 93% rename from src/Microsoft.AspNet.Mvc.Core/Actions/ActionDescriptorsCollection.cs rename to src/Microsoft.AspNet.Mvc.Core/Infrastructure/ActionDescriptorsCollection.cs index 0a79da8a36..63082125f6 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/ActionDescriptorsCollection.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/ActionDescriptorsCollection.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.Collections.Generic; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Infrastructure { /// /// A cached collection of . diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/ActionInvokerFactory.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/ActionInvokerFactory.cs similarity index 92% rename from src/Microsoft.AspNet.Mvc.Core/Actions/ActionInvokerFactory.cs rename to src/Microsoft.AspNet.Mvc.Core/Infrastructure/ActionInvokerFactory.cs index 60ec191345..0ee207d550 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/ActionInvokerFactory.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/ActionInvokerFactory.cs @@ -3,8 +3,9 @@ using System.Collections.Generic; using System.Linq; +using Microsoft.AspNet.Mvc.Abstractions; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Infrastructure { public class ActionInvokerFactory : IActionInvokerFactory { diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/AmbiguousActionException.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/AmbiguousActionException.cs similarity index 94% rename from src/Microsoft.AspNet.Mvc.Core/Actions/AmbiguousActionException.cs rename to src/Microsoft.AspNet.Mvc.Core/Infrastructure/AmbiguousActionException.cs index 3a2adb250d..04f06c65b6 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/AmbiguousActionException.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/AmbiguousActionException.cs @@ -6,7 +6,7 @@ using System; using System.Runtime.Serialization; #endif -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Infrastructure { /// /// An exception which indicates multiple matches in action selection. diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultActionDescriptorsCollectionProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/DefaultActionDescriptorsCollectionProvider.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.Core/Actions/DefaultActionDescriptorsCollectionProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/Infrastructure/DefaultActionDescriptorsCollectionProvider.cs index d14d214012..0c369c5301 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultActionDescriptorsCollectionProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/DefaultActionDescriptorsCollectionProvider.cs @@ -4,9 +4,10 @@ using System; using System.Collections.ObjectModel; using System.Linq; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.Framework.DependencyInjection; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Infrastructure { /// /// Default implementation for ActionDescriptors. diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultActionSelector.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/DefaultActionSelector.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Core/Actions/DefaultActionSelector.cs rename to src/Microsoft.AspNet.Mvc.Core/Infrastructure/DefaultActionSelector.cs index 55873a1600..61dbf6cac4 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultActionSelector.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/DefaultActionSelector.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Http; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ActionConstraints; using Microsoft.AspNet.Mvc.Core; using Microsoft.AspNet.Mvc.Routing; @@ -13,7 +14,7 @@ using Microsoft.AspNet.Routing; using Microsoft.Framework.Internal; using Microsoft.Framework.Logging; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Infrastructure { public class DefaultActionSelector : IActionSelector { diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultAssemblyProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/DefaultAssemblyProvider.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Core/Actions/DefaultAssemblyProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/Infrastructure/DefaultAssemblyProvider.cs index 50fa221c6a..36b37ea5a6 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultAssemblyProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/DefaultAssemblyProvider.cs @@ -8,7 +8,7 @@ using System.Linq; using System.Reflection; using Microsoft.Dnx.Runtime; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Infrastructure { public class DefaultAssemblyProvider : IAssemblyProvider { diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultTypeActivatorCache.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/DefaultTypeActivatorCache.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.Core/Actions/DefaultTypeActivatorCache.cs rename to src/Microsoft.AspNet.Mvc.Core/Infrastructure/DefaultTypeActivatorCache.cs index dc7dde7896..32c98af73d 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/DefaultTypeActivatorCache.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/DefaultTypeActivatorCache.cs @@ -6,7 +6,7 @@ using System.Collections.Concurrent; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Infrastructure { /// /// Caches instances produced by diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/IActionBindingContextAccessor.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/IActionBindingContextAccessor.cs similarity index 86% rename from src/Microsoft.AspNet.Mvc.Core/Actions/IActionBindingContextAccessor.cs rename to src/Microsoft.AspNet.Mvc.Core/Infrastructure/IActionBindingContextAccessor.cs index b37dfe3dd6..e2e9d44041 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/IActionBindingContextAccessor.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/IActionBindingContextAccessor.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.Actions +namespace Microsoft.AspNet.Mvc.Infrastructure { public interface IActionBindingContextAccessor { diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/IActionContextAccessor.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/IActionContextAccessor.cs similarity index 85% rename from src/Microsoft.AspNet.Mvc.Core/Actions/IActionContextAccessor.cs rename to src/Microsoft.AspNet.Mvc.Core/Infrastructure/IActionContextAccessor.cs index 658f3dca2a..bd405e08c3 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/IActionContextAccessor.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/IActionContextAccessor.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.Actions +namespace Microsoft.AspNet.Mvc.Infrastructure { public interface IActionContextAccessor { diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/IActionDescriptorsCollectionProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/IActionDescriptorsCollectionProvider.cs similarity index 92% rename from src/Microsoft.AspNet.Mvc.Core/Actions/IActionDescriptorsCollectionProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/Infrastructure/IActionDescriptorsCollectionProvider.cs index 8d04769270..8e31c09251 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/IActionDescriptorsCollectionProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/IActionDescriptorsCollectionProvider.cs @@ -1,10 +1,10 @@ // 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.Actions +namespace Microsoft.AspNet.Mvc.Infrastructure { /// - /// Provides the currently cached collection of . + /// Provides the currently cached collection of . /// /// /// The default implementation, does not update the cache, it is up to the user diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/IActionHttpMethodProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/IActionHttpMethodProvider.cs similarity index 86% rename from src/Microsoft.AspNet.Mvc.Core/Actions/IActionHttpMethodProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/Infrastructure/IActionHttpMethodProvider.cs index 99d3117d21..5d48eca8a0 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/IActionHttpMethodProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/IActionHttpMethodProvider.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Infrastructure { public interface IActionHttpMethodProvider { diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/IActionInvokerFactory.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/IActionInvokerFactory.cs similarity index 76% rename from src/Microsoft.AspNet.Mvc.Core/Actions/IActionInvokerFactory.cs rename to src/Microsoft.AspNet.Mvc.Core/Infrastructure/IActionInvokerFactory.cs index 048f8e2f77..2549fda72c 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/IActionInvokerFactory.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/IActionInvokerFactory.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.Actions +using Microsoft.AspNet.Mvc.Abstractions; + +namespace Microsoft.AspNet.Mvc.Infrastructure { public interface IActionInvokerFactory { diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/IActionSelector.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/IActionSelector.cs similarity index 82% rename from src/Microsoft.AspNet.Mvc.Core/Actions/IActionSelector.cs rename to src/Microsoft.AspNet.Mvc.Core/Infrastructure/IActionSelector.cs index c1103bb87f..03cb9688f2 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/IActionSelector.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/IActionSelector.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.Threading.Tasks; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Routing; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Infrastructure { public interface IActionSelector { diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/IAssemblyProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/IAssemblyProvider.cs similarity index 94% rename from src/Microsoft.AspNet.Mvc.Core/Actions/IAssemblyProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/Infrastructure/IAssemblyProvider.cs index e128b79846..186635a267 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/IAssemblyProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/IAssemblyProvider.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Reflection; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Infrastructure { /// /// Specifies the contract for discovering assemblies that may contain Mvc specific types such as controllers, diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/IRouteConstraintProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/IRouteConstraintProvider.cs similarity index 92% rename from src/Microsoft.AspNet.Mvc.Core/Actions/IRouteConstraintProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/Infrastructure/IRouteConstraintProvider.cs index 854772d60b..776e0ca353 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/IRouteConstraintProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/IRouteConstraintProvider.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.Actions +using Microsoft.AspNet.Mvc.Routing; + +namespace Microsoft.AspNet.Mvc.Infrastructure { /// /// An interface for metadata which provides values diff --git a/src/Microsoft.AspNet.Mvc.Core/Routing/IRouteTemplateProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/IRouteTemplateProvider.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.Core/Routing/IRouteTemplateProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/Infrastructure/IRouteTemplateProvider.cs index 6df1cfcdfa..26207ffb8b 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Routing/IRouteTemplateProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/IRouteTemplateProvider.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.Infrastructure { /// /// Interface for attributes which can supply a route template for attribute routing. diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/ITypeActivatorCache.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/ITypeActivatorCache.cs similarity index 95% rename from src/Microsoft.AspNet.Mvc.Core/Actions/ITypeActivatorCache.cs rename to src/Microsoft.AspNet.Mvc.Core/Infrastructure/ITypeActivatorCache.cs index 13963f142b..f72617a834 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/ITypeActivatorCache.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/ITypeActivatorCache.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Infrastructure { /// /// Caches instances produced by diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/MvcRouteHandler.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/MvcRouteHandler.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Core/Actions/MvcRouteHandler.cs rename to src/Microsoft.AspNet.Mvc.Core/Infrastructure/MvcRouteHandler.cs index 971ff42d67..f809a0084d 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/MvcRouteHandler.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/MvcRouteHandler.cs @@ -5,6 +5,7 @@ using System; using System.Diagnostics.Tracing; using System.Threading.Tasks; using Microsoft.AspNet.Http; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Core; using Microsoft.AspNet.Mvc.Internal; using Microsoft.AspNet.Routing; @@ -12,7 +13,7 @@ using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; using Microsoft.Framework.Logging; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Infrastructure { public class MvcRouteHandler : IRouter { diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/RouteConstraintAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/RouteConstraintAttribute.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.Core/Actions/RouteConstraintAttribute.cs rename to src/Microsoft.AspNet.Mvc.Core/Infrastructure/RouteConstraintAttribute.cs index d67a010890..0484438ad6 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/RouteConstraintAttribute.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/RouteConstraintAttribute.cs @@ -3,9 +3,10 @@ using System; using Microsoft.AspNet.Mvc.Core; +using Microsoft.AspNet.Mvc.Routing; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Infrastructure { /// /// An attribute which specifies a required route value for an action or controller. diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/StaticAssemblyProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/StaticAssemblyProvider.cs similarity index 93% rename from src/Microsoft.AspNet.Mvc.Core/Actions/StaticAssemblyProvider.cs rename to src/Microsoft.AspNet.Mvc.Core/Infrastructure/StaticAssemblyProvider.cs index ca4078a726..2fda130dfc 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/StaticAssemblyProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Infrastructure/StaticAssemblyProvider.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Reflection; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Infrastructure { /// /// A with a fixed set of candidate assemblies. diff --git a/src/Microsoft.AspNet.Mvc.Core/Internal/ControllersAsServices.cs b/src/Microsoft.AspNet.Mvc.Core/Internal/ControllersAsServices.cs index c1dee32923..21c1953d39 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Internal/ControllersAsServices.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Internal/ControllersAsServices.cs @@ -5,7 +5,8 @@ using System; using System.Collections.Generic; using System.Linq; using System.Reflection; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Controllers; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.DependencyInjection.Extensions; diff --git a/src/Microsoft.AspNet.Mvc.Core/ObjectResult.cs b/src/Microsoft.AspNet.Mvc.Core/ObjectResult.cs index a3b2415cbd..154e99e8b4 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ObjectResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ObjectResult.cs @@ -6,9 +6,9 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Core; using Microsoft.AspNet.Mvc.Formatters; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.Internal; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.Core/RedirectToActionResult.cs b/src/Microsoft.AspNet.Mvc.Core/RedirectToActionResult.cs index 85a7e07d17..3a2d5fbcec 100644 --- a/src/Microsoft.AspNet.Mvc.Core/RedirectToActionResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/RedirectToActionResult.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Core; using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Mvc.ViewFeatures; diff --git a/src/Microsoft.AspNet.Mvc.Core/RouteAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/RouteAttribute.cs index b82dd8533c..02005a40c2 100644 --- a/src/Microsoft.AspNet.Mvc.Core/RouteAttribute.cs +++ b/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.Routing; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc diff --git a/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectionDecisionTree.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectionDecisionTree.cs index d57a7b57ca..ce9272da30 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectionDecisionTree.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectionDecisionTree.cs @@ -7,7 +7,8 @@ using System.Collections.Generic; using System.ComponentModel; #endif using System.Diagnostics; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.Internal.DecisionTree; namespace Microsoft.AspNet.Mvc.Routing diff --git a/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectorDecisionTreeProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectorDecisionTreeProvider.cs index 4d1b9633de..e1cb10ec1b 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectorDecisionTreeProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Routing/ActionSelectorDecisionTreeProvider.cs @@ -2,8 +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.Actions; using Microsoft.AspNet.Mvc.Core; +using Microsoft.AspNet.Mvc.Infrastructure; namespace Microsoft.AspNet.Mvc.Routing { diff --git a/src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRoute.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRoute.cs index ab8002992e..06117f4368 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRoute.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRoute.cs @@ -5,8 +5,9 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Core; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Routing; using Microsoft.AspNet.Routing.Template; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRouting.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRouting.cs index 41a14d4ab9..ac69431722 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRouting.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Routing/AttributeRouting.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.Actions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.Core/Routing/HttpMethodAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/HttpMethodAttribute.cs index 6ce0c55a13..5113239e92 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Routing/HttpMethodAttribute.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Routing/HttpMethodAttribute.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Routing diff --git a/src/Microsoft.AspNet.Mvc.Core/Routing/IActionSelectionDecisionTree.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/IActionSelectionDecisionTree.cs index 348e3986cd..4236a09850 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Routing/IActionSelectionDecisionTree.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Routing/IActionSelectionDecisionTree.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.Collections.Generic; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; namespace Microsoft.AspNet.Mvc.Routing { @@ -13,7 +13,8 @@ namespace Microsoft.AspNet.Mvc.Routing public interface IActionSelectionDecisionTree { /// - /// Gets the version. The same as the value of . + /// Gets the version. The same as the value of + /// . /// int Version { get; } diff --git a/src/Microsoft.AspNet.Mvc.Core/Routing/IActionSelectorDecisionTreeProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/IActionSelectorDecisionTreeProvider.cs index c0adf6544e..07110c28b3 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Routing/IActionSelectorDecisionTreeProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Routing/IActionSelectorDecisionTreeProvider.cs @@ -5,12 +5,12 @@ namespace Microsoft.AspNet.Mvc.Routing { /// /// Stores an for the current value of - /// . + /// . /// public interface IActionSelectorDecisionTreeProvider { /// - /// Gets the . + /// Gets the . /// IActionSelectionDecisionTree DecisionTree { diff --git a/src/Microsoft.AspNet.Mvc.Core/Routing/InnerAttributeRoute.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/InnerAttributeRoute.cs index 69ce478dd5..b431a7912a 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Routing/InnerAttributeRoute.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Routing/InnerAttributeRoute.cs @@ -93,7 +93,7 @@ namespace Microsoft.AspNet.Mvc.Routing /// /// Gets the version of this route. This corresponds to the value of - /// when this route was created. + /// when this route was created. /// public int Version { get; } diff --git a/src/Microsoft.AspNet.Mvc.Core/Routing/KnownRouteValueConstraint.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/KnownRouteValueConstraint.cs index d48a1f2817..58a914704f 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Routing/KnownRouteValueConstraint.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Routing/KnownRouteValueConstraint.cs @@ -5,8 +5,9 @@ using System; using System.Collections.Generic; using System.Linq; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Core; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.Core/Routing/UrlHelper.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/UrlHelper.cs index a4e40175f8..4dca31b5c5 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Routing/UrlHelper.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Routing/UrlHelper.cs @@ -5,7 +5,8 @@ using System; using System.Collections.Generic; using System.Diagnostics; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Routing; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.Razor/RazorPage.cs b/src/Microsoft.AspNet.Mvc.Razor/RazorPage.cs index 0502789a59..9a6fed11b0 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/RazorPage.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/RazorPage.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Antiforgery; using Microsoft.AspNet.Html.Abstractions; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.Razor.Internal; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewFeatures; diff --git a/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngine.cs b/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngine.cs index e0cd76aa44..3eab873e1b 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngine.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngine.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Globalization; using System.Linq; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Mvc.ViewEngines; using Microsoft.Framework.OptionsModel; @@ -162,9 +162,9 @@ namespace Microsoft.AspNet.Mvc.Razor /// /// The casing of a route value in is determined by the client. /// This making constructing paths for view locations in a case sensitive file system unreliable. Using the - /// for attribute routes and - /// for traditional routes to get route values produces - /// consistently cased results. + /// for attribute routes and + /// for traditional routes to get route values + /// produces consistently cased results. /// public static string GetNormalizedRouteValue( ActionContext context, diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs index acca803108..8bf76d9649 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs @@ -8,7 +8,6 @@ using System.Security.Claims; using System.Text; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; @@ -104,8 +103,9 @@ namespace Microsoft.AspNet.Mvc /// Gets or sets the object. /// /// - /// activates this property while activating controllers. If user codes - /// directly instantiate controllers, the getter returns an empty . + /// activates this property while activating controllers. + /// If user code directly instantiates a controller, the getter returns an empty + /// . /// [ActionContext] public ActionContext ActionContext @@ -214,9 +214,9 @@ namespace Microsoft.AspNet.Mvc /// Gets or sets used by and . /// /// - /// By default, this property is activated when activates controllers. - /// However, when controllers are directly instantiated in user codes, this property is initialized with - /// . + /// By default, this property is activated when activates + /// controllers. However, when controllers are directly instantiated in user code, this property is + /// initialized with . /// [ViewDataDictionary] public ViewDataDictionary ViewData diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs index d22d8696b5..11296ad8b1 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs @@ -3,7 +3,7 @@ using System; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Controllers; using Microsoft.AspNet.Mvc.Formatters; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewComponents; diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/PartialViewResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/PartialViewResult.cs index 372e6398b8..fe69b0070b 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/PartialViewResult.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/PartialViewResult.cs @@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Mvc /// Gets or sets the name of the partial view to render. /// /// - /// When null, defaults to . + /// When null, defaults to . /// public string ViewName { get; set; } diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponentResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponentResult.cs index c31f9e89bb..a9014a5bc2 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponentResult.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponentResult.cs @@ -4,7 +4,6 @@ using System; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewComponents; diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorProvider.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorProvider.cs index ee1a7bcbea..4dd0dfd62d 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorProvider.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorProvider.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.ViewComponents diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvoker.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvoker.cs index c8e759d463..4159667630 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvoker.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvoker.cs @@ -5,7 +5,8 @@ using System; using System.Reflection; using System.Runtime.ExceptionServices; using System.Threading.Tasks; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Controllers; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvokerFactory.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvokerFactory.cs index 6ff695a274..58c1faeb91 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvokerFactory.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvokerFactory.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.Actions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.ViewComponents diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewEngines/IViewEngine.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewEngines/IViewEngine.cs index c8c76c6586..a12719e993 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewEngines/IViewEngine.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewEngines/IViewEngine.cs @@ -1,7 +1,6 @@ // 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.Actions; namespace Microsoft.AspNet.Mvc.ViewEngines { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs index 140a52ab86..a3f723541f 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Concurrent; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Controllers; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewResult.cs index 656e08963a..e8cc8945f7 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewResult.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewResult.cs @@ -29,7 +29,7 @@ namespace Microsoft.AspNet.Mvc /// Gets or sets the name of the view to render. /// /// - /// When null, defaults to . + /// When null, defaults to . /// public string ViewName { get; set; } diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ApiController.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ApiController.cs index 25da37e9a6..892203129e 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ApiController.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ApiController.cs @@ -7,7 +7,6 @@ using System.Security.Principal; using System.Text; using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; using Microsoft.AspNet.Mvc.Routing; diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/Conventions/WebApiActionConventionsApplicationModelConvention.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/Conventions/WebApiActionConventionsApplicationModelConvention.cs index 4e04954685..1a6bd6a4a3 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/Conventions/WebApiActionConventionsApplicationModelConvention.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/Conventions/WebApiActionConventionsApplicationModelConvention.cs @@ -4,8 +4,9 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ApplicationModels; +using Microsoft.AspNet.Mvc.Infrastructure; +using Microsoft.AspNet.Mvc.Routing; namespace Microsoft.AspNet.Mvc.WebApiCompatShim { diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/InvalidModelStateResult.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/InvalidModelStateResult.cs index d309f62893..eb8cde4e86 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/InvalidModelStateResult.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/InvalidModelStateResult.cs @@ -4,7 +4,6 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/OverloadActionConstraint.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/OverloadActionConstraint.cs index f1c386895d..21f75e4c65 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/OverloadActionConstraint.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/OverloadActionConstraint.cs @@ -7,8 +7,8 @@ using System.ComponentModel; using System.Linq; using System.Net.Http.Formatting; using System.Reflection; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ActionConstraints; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Routing; diff --git a/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs b/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs index c8c1266ffa..105bd1606d 100644 --- a/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs @@ -7,9 +7,10 @@ using System.Collections.ObjectModel; using System.Linq; using System.Reflection; using System.Threading.Tasks; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ActionConstraints; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ApiExplorer; +using Microsoft.AspNet.Mvc.Controllers; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.Formatters; using Microsoft.AspNet.Mvc.ModelBinding; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/ActionModelTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/ActionModelTest.cs index 3139d1245e..d115e507f9 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/ActionModelTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/ActionModelTest.cs @@ -4,9 +4,11 @@ using System; using System.Collections.Generic; using System.Reflection; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ActionConstraints; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Filters; +using Microsoft.AspNet.Mvc.Infrastructure; +using Microsoft.AspNet.Mvc.Routing; using Xunit; namespace Microsoft.AspNet.Mvc.ApplicationModels diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/ControllerModelTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/ControllerModelTest.cs index 0f2ee4180b..c9ba0ccb19 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/ControllerModelTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/ControllerModelTest.cs @@ -5,8 +5,9 @@ using System; using System.Collections.Generic; using System.Reflection; using Microsoft.AspNet.Mvc.ActionConstraints; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Filters; +using Microsoft.AspNet.Mvc.Infrastructure; +using Microsoft.AspNet.Mvc.Routing; using Xunit; namespace Microsoft.AspNet.Mvc.ApplicationModels diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/DefaultApplicationModelProviderTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/DefaultApplicationModelProviderTest.cs index b9372bb331..22f733b913 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/DefaultApplicationModelProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/DefaultApplicationModelProviderTest.cs @@ -6,8 +6,8 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Threading.Tasks; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Filters; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.Framework.Internal; using Microsoft.Framework.OptionsModel; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ChallengeResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ChallengeResultTest.cs index bf06b2b5ef..d24a5910d8 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ChallengeResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ChallengeResultTest.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Authentication; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Routing; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ConsumesAttributeTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ConsumesAttributeTests.cs index 2367e857bc..65fd81d4aa 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ConsumesAttributeTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ConsumesAttributeTests.cs @@ -5,8 +5,8 @@ using System; using System.Collections.Generic; using System.Linq; using Microsoft.AspNet.Http.Internal; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ActionConstraints; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Routing; using Moq; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ContentResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ContentResultTest.cs index 734077a260..6d9addecfd 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ContentResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ContentResultTest.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Routing; using Microsoft.Net.Http.Headers; using Moq; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ActionExecutorTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ActionExecutorTests.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Core.Test/Actions/ActionExecutorTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ActionExecutorTests.cs index 89f25ef9e8..91098f7e6f 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ActionExecutorTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ActionExecutorTests.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Testing; using Xunit; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { public class ActionExecutorTests { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionArgumentBinderTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ControllerActionArgumentBinderTests.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionArgumentBinderTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ControllerActionArgumentBinderTests.cs index 15a09c1a24..23cd52db65 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionArgumentBinderTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ControllerActionArgumentBinderTests.cs @@ -6,14 +6,15 @@ using System.Collections.Generic; using System.Reflection; using System.Threading.Tasks; using Microsoft.AspNet.Http.Internal; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; using Microsoft.AspNet.Routing; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.Actions -{ +namespace Microsoft.AspNet.Mvc.Controllers +{ public class ControllerActionArgumentBinderTests { [Fact] diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionDescriptorBuilderTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ControllerActionDescriptorBuilderTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionDescriptorBuilderTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ControllerActionDescriptorBuilderTest.cs index 4679814377..19723c22e5 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionDescriptorBuilderTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ControllerActionDescriptorBuilderTest.cs @@ -8,7 +8,7 @@ using Microsoft.AspNet.Mvc.ApplicationModels; using Microsoft.AspNet.Mvc.ModelBinding; using Xunit; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { public class ControllerActionDescriptorBuilderTest { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionDescriptorProviderTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ControllerActionDescriptorProviderTests.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionDescriptorProviderTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ControllerActionDescriptorProviderTests.cs index f1e882d9de..e245b8dc04 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionDescriptorProviderTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ControllerActionDescriptorProviderTests.cs @@ -5,17 +5,19 @@ using System; using System.Collections.Generic; 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.Filters; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Routing; using Microsoft.Framework.Internal; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { public class ControllerActionDescriptorProviderTests { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionInvokerTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ControllerActionInvokerTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionInvokerTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ControllerActionInvokerTest.cs index 7e2d723f03..fc7009bff6 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionInvokerTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ControllerActionInvokerTest.cs @@ -10,8 +10,10 @@ using System.Reflection; using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.Formatters; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; using Microsoft.AspNet.Routing; @@ -24,7 +26,7 @@ using Microsoft.Net.Http.Headers; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { public class ControllerActionInvokerTest { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultControllerActivatorTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/DefaultControllerActivatorTest.cs similarity index 95% rename from test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultControllerActivatorTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/Controllers/DefaultControllerActivatorTest.cs index 363c478145..66d64a8142 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultControllerActivatorTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/DefaultControllerActivatorTest.cs @@ -3,11 +3,13 @@ using System; using Microsoft.AspNet.Http.Internal; +using Microsoft.AspNet.Mvc.Abstractions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Routing; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { public class DefaultControllerActivatorTest { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultControllerFactoryTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/DefaultControllerFactoryTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultControllerFactoryTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/Controllers/DefaultControllerFactoryTest.cs index a20fb07a51..147c540e24 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultControllerFactoryTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/DefaultControllerFactoryTest.cs @@ -3,8 +3,9 @@ using System; using System.Reflection; -using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; +using Microsoft.AspNet.Mvc.Abstractions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; using Microsoft.AspNet.Routing; @@ -12,7 +13,7 @@ using Microsoft.Framework.DependencyInjection; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { public class DefaultControllerFactoryTest { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultControllerTypeProviderTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/DefaultControllerTypeProviderTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultControllerTypeProviderTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/Controllers/DefaultControllerTypeProviderTest.cs index d4fd2037c7..86a63648b9 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultControllerTypeProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/DefaultControllerTypeProviderTest.cs @@ -5,9 +5,10 @@ using System; using System.Collections.Generic; using System.Reflection; using Microsoft.AspNet.Mvc.DefaultControllerTypeProviderControllers; +using Microsoft.AspNet.Mvc.Infrastructure; using Xunit; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { public class DefaultControllerTypeProviderTest { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ServiceBasedControllerActivatorTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ServiceBasedControllerActivatorTest.cs similarity index 96% rename from test/Microsoft.AspNet.Mvc.Core.Test/Actions/ServiceBasedControllerActivatorTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ServiceBasedControllerActivatorTest.cs index cbc051d8c4..8dd5af3831 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ServiceBasedControllerActivatorTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ServiceBasedControllerActivatorTest.cs @@ -3,11 +3,12 @@ using System; using Microsoft.AspNet.Http.Internal; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Routing; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { public class ServiceBasedControllerActivatorTest { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/TestController.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/TestController.cs similarity index 98% rename from test/Microsoft.AspNet.Mvc.Core.Test/Actions/TestController.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/Controllers/TestController.cs index 3497f9cae5..073fe810fe 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/TestController.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/TestController.cs @@ -5,7 +5,7 @@ using System; using System.ComponentModel; using System.Threading.Tasks; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Controllers { public class TestController { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtActionResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtActionResultTests.cs index 1d55fbed49..21caef7f5e 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtActionResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtActionResultTests.cs @@ -7,8 +7,9 @@ using System.IO; using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Formatters; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Routing; using Microsoft.AspNet.Testing; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtRouteResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtRouteResultTests.cs index 2e916a9bc3..3e7e6d238d 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtRouteResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtRouteResultTests.cs @@ -7,8 +7,9 @@ using System.IO; using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Formatters; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Routing; using Microsoft.AspNet.Testing; using Microsoft.Framework.Logging; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/CreatedResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/CreatedResultTests.cs index 3bcdfce42f..ad5b705daf 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/CreatedResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/CreatedResultTests.cs @@ -5,8 +5,9 @@ using System.IO; using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Formatters; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Routing; using Microsoft.AspNet.WebUtilities; using Microsoft.Framework.Logging; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DependencyInjection/MvcBuilderExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/DependencyInjection/MvcBuilderExtensionsTest.cs index ef948cbf07..8a148f4c1f 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/DependencyInjection/MvcBuilderExtensionsTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/DependencyInjection/MvcBuilderExtensionsTest.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Reflection; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Controllers; using Microsoft.AspNet.Mvc.MvcServiceCollectionExtensionsTestControllers; using Microsoft.Framework.DependencyInjection; using Moq; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DependencyInjection/MvcCoreServiceCollectionExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/DependencyInjection/MvcCoreServiceCollectionExtensionsTest.cs index 845be10eed..feff3cb94d 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/DependencyInjection/MvcCoreServiceCollectionExtensionsTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/DependencyInjection/MvcCoreServiceCollectionExtensionsTest.cs @@ -4,9 +4,10 @@ using System; using System.Collections.Generic; using System.Linq; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ActionConstraints; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ApplicationModels; +using Microsoft.AspNet.Mvc.Controllers; using Microsoft.AspNet.Mvc.Core; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.Internal; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/EmptyResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/EmptyResultTests.cs index 5dc0c29f5e..517b9f2db2 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/EmptyResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/EmptyResultTests.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Routing; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/FileContentResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/FileContentResultTest.cs index dc75179395..17adde2290 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/FileContentResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/FileContentResultTest.cs @@ -5,7 +5,7 @@ using System.IO; using System.Threading.Tasks; using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Routing; using Microsoft.Net.Http.Headers; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/FileResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/FileResultTest.cs index 454cbb4bfa..c479c53b24 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/FileResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/FileResultTest.cs @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Routing; using Microsoft.Net.Http.Headers; using Moq; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/FileStreamResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/FileStreamResultTest.cs index 51ea825a69..0470b7692f 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/FileStreamResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/FileStreamResultTest.cs @@ -8,7 +8,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Routing; using Microsoft.Net.Http.Headers; using Moq; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/DefaultFilterProviderTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/DefaultFilterProviderTest.cs index 436871a5f6..a87f5997d5 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/DefaultFilterProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/DefaultFilterProviderTest.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Routing; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ResponseCacheFilterTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ResponseCacheFilterTest.cs index b869fe3a7c..1942ec4257 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ResponseCacheFilterTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/ResponseCacheFilterTest.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Routing; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/FormatFilterTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/FormatFilterTest.cs index 3f19f69118..0b72bfd14c 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/FormatFilterTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/FormatFilterTest.cs @@ -2,8 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Filters; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Routing; using Microsoft.Framework.OptionsModel; using Microsoft.Net.Http.Headers; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs index fb75ea6034..277fb867be 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs @@ -7,8 +7,9 @@ using System.Text; using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Formatters; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Logging; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkObjectResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkObjectResultTest.cs index 145bc8adc0..3d961578af 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkObjectResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkObjectResultTest.cs @@ -5,8 +5,9 @@ using System; using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Formatters; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.DependencyInjection.Extensions; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkResultTest.cs index 328259010b..a0fb90f234 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkResultTest.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Routing; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/HttpStatusCodeResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/HttpStatusCodeResultTests.cs index 664c486df3..bed9dce54c 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/HttpStatusCodeResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/HttpStatusCodeResultTests.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Routing; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultActionSelectorTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/DefaultActionSelectorTests.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultActionSelectorTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/DefaultActionSelectorTests.cs index 8621c5eca7..ffc3451764 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultActionSelectorTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/DefaultActionSelectorTests.cs @@ -9,9 +9,10 @@ using System.Reflection; using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ActionConstraints; using Microsoft.AspNet.Mvc.ApplicationModels; -using Microsoft.AspNet.Mvc.Core; +using Microsoft.AspNet.Mvc.Controllers; using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Routing; using Microsoft.Framework.Internal; @@ -20,7 +21,7 @@ using Microsoft.Framework.Logging.Testing; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Infrastructure { public class DefaultActionSelectorTests { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultAssemblyProviderTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/DefaultAssemblyProviderTests.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultAssemblyProviderTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/DefaultAssemblyProviderTests.cs index da2fbf02d0..3fbe0ad4b4 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/DefaultAssemblyProviderTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/DefaultAssemblyProviderTests.cs @@ -10,7 +10,7 @@ using Microsoft.Framework.DependencyInjection; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Infrastructure { public class DefaultAssemblyProviderTests { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/MvcRouteHandlerTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/MvcRouteHandlerTests.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Core.Test/Actions/MvcRouteHandlerTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/MvcRouteHandlerTests.cs index 5524c82667..47813bb2b6 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/MvcRouteHandlerTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/MvcRouteHandlerTests.cs @@ -5,6 +5,7 @@ using System; using System.Diagnostics.Tracing; using System.Threading.Tasks; using Microsoft.AspNet.Http; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Internal; using Microsoft.AspNet.Routing; using Microsoft.Framework.Logging; @@ -13,7 +14,7 @@ using Microsoft.Framework.OptionsModel; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Infrastructure { public class MvcRouteHandlerTests { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/RouteDataActionConstraintTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/RouteDataActionConstraintTest.cs similarity index 95% rename from test/Microsoft.AspNet.Mvc.Core.Test/Actions/RouteDataActionConstraintTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/RouteDataActionConstraintTest.cs index 766c068b6b..818c841c5b 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/RouteDataActionConstraintTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/RouteDataActionConstraintTest.cs @@ -1,9 +1,10 @@ // 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.Routing; using Xunit; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Infrastructure { public class RouteDataActionConstraintTest { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ObjectResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ObjectResultTests.cs index 8dd291ac7b..ff46937c67 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ObjectResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ObjectResultTests.cs @@ -10,9 +10,10 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Formatters; using Microsoft.AspNet.Mvc.Formatters.Xml; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Routing; using Microsoft.AspNet.Testing.xunit; using Microsoft.Framework.DependencyInjection; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/PhysicalFileProviderResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/PhysicalFileProviderResultTest.cs index 8ce871fe7d..9a26501a3a 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/PhysicalFileProviderResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/PhysicalFileProviderResultTest.cs @@ -7,7 +7,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Routing; using Microsoft.Net.Http.Headers; using Moq; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ProducesAttributeTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ProducesAttributeTests.cs index 2b019a51cd..7d27a6ac7c 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ProducesAttributeTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ProducesAttributeTests.cs @@ -5,7 +5,7 @@ using System; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.Formatters; using Microsoft.AspNet.Routing; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/RedirectResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectResultTest.cs index 9f0c3f11d7..be2548f126 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/RedirectResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectResultTest.cs @@ -3,7 +3,8 @@ using System; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToActionResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToActionResultTest.cs index 38b6d13f82..62092c8a73 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToActionResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToActionResultTest.cs @@ -4,7 +4,7 @@ using System; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Routing; using Microsoft.AspNet.Testing; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToRouteResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToRouteResultTest.cs index 8e08e15d08..bcd1e832ed 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToRouteResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToRouteResultTest.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Routing; using Microsoft.AspNet.Testing; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRouteTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRouteTest.cs index 80684ca447..7a77b342f1 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRouteTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRouteTest.cs @@ -7,7 +7,8 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Routing; using Microsoft.Framework.Logging; using Microsoft.Framework.Logging.Testing; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutingTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutingTest.cs index e53f9873d2..f26ab4ed83 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutingTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutingTest.cs @@ -6,7 +6,9 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; +using Microsoft.AspNet.Mvc.Controllers; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Routing; using Microsoft.Framework.Logging; using Microsoft.Framework.Logging.Testing; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/HttpMethodProviderAttributesTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/HttpMethodProviderAttributesTests.cs similarity index 94% rename from test/Microsoft.AspNet.Mvc.Core.Test/Actions/HttpMethodProviderAttributesTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/Routing/HttpMethodProviderAttributesTests.cs index ccb1e2a37d..77823ce220 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/HttpMethodProviderAttributesTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/HttpMethodProviderAttributesTests.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.Collections.Generic; +using Microsoft.AspNet.Mvc.Infrastructure; using Xunit; -namespace Microsoft.AspNet.Mvc.Actions +namespace Microsoft.AspNet.Mvc.Routing { public class HttpMethodProviderAttributesTests { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/KnownRouteValueConstraintTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/KnownRouteValueConstraintTests.cs index ce481972a4..e0173d4b26 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/KnownRouteValueConstraintTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/KnownRouteValueConstraintTests.cs @@ -6,7 +6,8 @@ using System; using System.Collections.Generic; using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Routing; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/RouteTemplateProviderAttributesTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/RouteTemplateProviderAttributesTest.cs index c11949ffed..e4ad00d8f0 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/RouteTemplateProviderAttributesTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/RouteTemplateProviderAttributesTest.cs @@ -1,6 +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 Xunit; namespace Microsoft.AspNet.Mvc.Routing diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/UrlHelperTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/UrlHelperTest.cs index 5f5097e9ba..684084849c 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/UrlHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/UrlHelperTest.cs @@ -7,7 +7,8 @@ using System.Threading.Tasks; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Logging; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/VirtualFileProviderResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/VirtualFileProviderResultTest.cs index 0aa150caf6..0ee17513d2 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/VirtualFileProviderResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/VirtualFileProviderResultTest.cs @@ -9,7 +9,7 @@ using Microsoft.AspNet.FileProviders; using Microsoft.AspNet.Hosting; using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; using Microsoft.Net.Http.Headers; diff --git a/test/Microsoft.AspNet.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs b/test/Microsoft.AspNet.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs index a842461c53..fa066a3595 100644 --- a/test/Microsoft.AspNet.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs +++ b/test/Microsoft.AspNet.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Cors.Core; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Routing; using Moq; diff --git a/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs index 0b1414f399..97a93e3a0e 100644 --- a/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs +++ b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs @@ -8,7 +8,6 @@ using System.Text; using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Testing; using Microsoft.Net.Http.Headers; using Moq; diff --git a/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonResultTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonResultTest.cs index a1bae95a29..d016b73885 100644 --- a/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonResultTest.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; using Microsoft.Net.Http.Headers; diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/ConsumesAttributeTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/ConsumesAttributeTests.cs index 45548ef84c..c1647499b2 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/ConsumesAttributeTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/ConsumesAttributeTests.cs @@ -6,7 +6,7 @@ using System.Net.Http; using System.Text; using System.Threading.Tasks; using ActionConstraintsWebSite; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Testing.xunit; using Newtonsoft.Json; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/DefaultOrderTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/DefaultOrderTest.cs index f14203c94f..42824e5ea2 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/DefaultOrderTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/DefaultOrderTest.cs @@ -5,9 +5,10 @@ using System; using System.Net; using System.Net.Http; using System.Threading.Tasks; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ActionConstraints; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ApiExplorer; +using Microsoft.AspNet.Mvc.Controllers; using Microsoft.AspNet.Mvc.Filters; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/FilteredDefaultAssemblyProviderFixtureOfT.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/FilteredDefaultAssemblyProviderFixtureOfT.cs index ad4ce9415f..52b4bfc7a7 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/FilteredDefaultAssemblyProviderFixtureOfT.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/FilteredDefaultAssemblyProviderFixtureOfT.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.Dnx.Runtime; using Microsoft.Framework.DependencyInjection; diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTestFixture.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTestFixture.cs index dd15f73fc1..24136acb63 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTestFixture.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTestFixture.cs @@ -9,7 +9,7 @@ using System.Net.Http; using System.Reflection; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.TestHost; using Microsoft.AspNet.Testing; using Microsoft.Dnx.Runtime; diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/RouteDataTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/RouteDataTest.cs index b216f36412..aeda74cdf2 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/RouteDataTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/RouteDataTest.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Net; using System.Net.Http; using System.Threading.Tasks; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Routing; using Microsoft.AspNet.Routing.Template; diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs index 2d3a8c69e3..94dfed7d1e 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/TestHelper.cs @@ -6,7 +6,7 @@ using System.IO; using System.Reflection; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Hosting; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.TestHost; using Microsoft.Dnx.Runtime; using Microsoft.Framework.DependencyInjection; diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/WebApiCompatShimActionSelectionTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/WebApiCompatShimActionSelectionTest.cs index 8d73f8ecef..a12c9bb282 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/WebApiCompatShimActionSelectionTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/WebApiCompatShimActionSelectionTest.cs @@ -4,7 +4,7 @@ using System.Net; using System.Net.Http; using System.Threading.Tasks; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Infrastructure; using Newtonsoft.Json; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/ActionParametersIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/ActionParametersIntegrationTest.cs index e8a3ea3375..cd11d2844a 100644 --- a/test/Microsoft.AspNet.Mvc.IntegrationTests/ActionParametersIntegrationTest.cs +++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/ActionParametersIntegrationTest.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/ArrayModelBinderIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/ArrayModelBinderIntegrationTest.cs index 8a0806508f..2e70102134 100644 --- a/test/Microsoft.AspNet.Mvc.IntegrationTests/ArrayModelBinderIntegrationTest.cs +++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/ArrayModelBinderIntegrationTest.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/BinderTypeBasedModelBinderIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/BinderTypeBasedModelBinderIntegrationTest.cs index cfee10ddd2..67397c7dd2 100644 --- a/test/Microsoft.AspNet.Mvc.IntegrationTests/BinderTypeBasedModelBinderIntegrationTest.cs +++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/BinderTypeBasedModelBinderIntegrationTest.cs @@ -3,7 +3,7 @@ using System.Globalization; using System.Threading.Tasks; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Testing; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/BodyValidationIntegrationTests.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/BodyValidationIntegrationTests.cs index 25d7003540..e434e9fe66 100644 --- a/test/Microsoft.AspNet.Mvc.IntegrationTests/BodyValidationIntegrationTests.cs +++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/BodyValidationIntegrationTests.cs @@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations; using System.IO; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/ByteArrayModelBinderIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/ByteArrayModelBinderIntegrationTest.cs index b2e42d08d8..f2c0b231af 100644 --- a/test/Microsoft.AspNet.Mvc.IntegrationTests/ByteArrayModelBinderIntegrationTest.cs +++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/ByteArrayModelBinderIntegrationTest.cs @@ -4,7 +4,7 @@ using System; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/CancellationTokenModelBinderIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/CancellationTokenModelBinderIntegrationTest.cs index f6e1345004..daead4ad7a 100644 --- a/test/Microsoft.AspNet.Mvc.IntegrationTests/CancellationTokenModelBinderIntegrationTest.cs +++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/CancellationTokenModelBinderIntegrationTest.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs index 49778d775c..72ae66ce2b 100644 --- a/test/Microsoft.AspNet.Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs +++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs @@ -9,7 +9,7 @@ using System.ComponentModel.DataAnnotations; using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.Framework.Primitives; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/DictionaryModelBinderIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/DictionaryModelBinderIntegrationTest.cs index 69669ee95f..e592e584ee 100644 --- a/test/Microsoft.AspNet.Mvc.IntegrationTests/DictionaryModelBinderIntegrationTest.cs +++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/DictionaryModelBinderIntegrationTest.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/FormCollectionModelBindingIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/FormCollectionModelBindingIntegrationTest.cs index 29e3b4e689..4463a4de55 100644 --- a/test/Microsoft.AspNet.Mvc.IntegrationTests/FormCollectionModelBindingIntegrationTest.cs +++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/FormCollectionModelBindingIntegrationTest.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Features.Internal; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.Framework.Primitives; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/FormFileModelBindingIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/FormFileModelBindingIntegrationTest.cs index 147493fac0..0981cbd43d 100644 --- a/test/Microsoft.AspNet.Mvc.IntegrationTests/FormFileModelBindingIntegrationTest.cs +++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/FormFileModelBindingIntegrationTest.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Features.Internal; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.Framework.Primitives; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/GenericModelBinderIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/GenericModelBinderIntegrationTest.cs index fd0b570525..9233dba834 100644 --- a/test/Microsoft.AspNet.Mvc.IntegrationTests/GenericModelBinderIntegrationTest.cs +++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/GenericModelBinderIntegrationTest.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/HeaderModelBinderIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/HeaderModelBinderIntegrationTest.cs index 072184ac4c..ba70da0401 100644 --- a/test/Microsoft.AspNet.Mvc.IntegrationTests/HeaderModelBinderIntegrationTest.cs +++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/HeaderModelBinderIntegrationTest.cs @@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs index 1cde6af8d4..39c0f46713 100644 --- a/test/Microsoft.AspNet.Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs +++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/ModelBindingTestHelper.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/ModelBindingTestHelper.cs index 2298560f39..b0b3feb00f 100644 --- a/test/Microsoft.AspNet.Mvc.IntegrationTests/ModelBindingTestHelper.cs +++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/ModelBindingTestHelper.cs @@ -4,7 +4,8 @@ using System; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Controllers; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; using Microsoft.AspNet.Routing; diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/ModelPrefixSelectionIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/ModelPrefixSelectionIntegrationTest.cs index 94b099c8ca..b5f13b129a 100644 --- a/test/Microsoft.AspNet.Mvc.IntegrationTests/ModelPrefixSelectionIntegrationTest.cs +++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/ModelPrefixSelectionIntegrationTest.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.Framework.Primitives; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/MutableObjectModelBinderIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/MutableObjectModelBinderIntegrationTest.cs index 00bbff2660..08d10d2686 100644 --- a/test/Microsoft.AspNet.Mvc.IntegrationTests/MutableObjectModelBinderIntegrationTest.cs +++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/MutableObjectModelBinderIntegrationTest.cs @@ -9,7 +9,8 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Features.Internal; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.Framework.Primitives; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/ServicesModelBinderIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/ServicesModelBinderIntegrationTest.cs index 5cf06b3d6d..3aa5b02c2f 100644 --- a/test/Microsoft.AspNet.Mvc.IntegrationTests/ServicesModelBinderIntegrationTest.cs +++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/ServicesModelBinderIntegrationTest.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.Threading.Tasks; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Formatters; using Microsoft.AspNet.Mvc.ModelBinding; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/SimpleTypeModelBinderIntegrationTest.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/SimpleTypeModelBinderIntegrationTest.cs index f37020be15..ba2f524781 100644 --- a/test/Microsoft.AspNet.Mvc.IntegrationTests/SimpleTypeModelBinderIntegrationTest.cs +++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/SimpleTypeModelBinderIntegrationTest.cs @@ -8,7 +8,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.Framework.Primitives; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/ValidationIntegrationTests.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/ValidationIntegrationTests.cs index a40d512057..c503eb33e5 100644 --- a/test/Microsoft.AspNet.Mvc.IntegrationTests/ValidationIntegrationTests.cs +++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/ValidationIntegrationTests.cs @@ -7,7 +7,7 @@ using System.IO; using System.Text; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/DefaultTagHelperActivatorTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/DefaultTagHelperActivatorTest.cs index 20a80576dc..2089fe1e62 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/DefaultTagHelperActivatorTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/DefaultTagHelperActivatorTest.cs @@ -5,7 +5,7 @@ using System; using System.IO; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Internal; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/DefaultViewLocationCacheTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/DefaultViewLocationCacheTest.cs index 83e2416a66..1561f262bc 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/DefaultViewLocationCacheTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/DefaultViewLocationCacheTest.cs @@ -4,7 +4,8 @@ using System; using System.Collections.Generic; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; +using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Routing; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageActivatorTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageActivatorTest.cs index de6f340550..14780db86f 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageActivatorTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageActivatorTest.cs @@ -6,7 +6,7 @@ using System.Globalization; using System.IO; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Razor.Internal; using Microsoft.AspNet.Mvc.Rendering; diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs index 951bef36ee..3be87732d7 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs @@ -6,7 +6,7 @@ using System.IO; using System.Linq.Expressions; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewEngines; diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs index c855dbc441..180663033a 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs @@ -7,7 +7,8 @@ using System.IO; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewEngines; diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs index d0cfc7ef61..c091c54b76 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Mvc.ViewEngines; diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/CacheTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/CacheTagHelperTest.cs index 365b02eb90..2af71d44a6 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/CacheTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/CacheTagHelperTest.cs @@ -11,7 +11,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewEngines; diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/FormTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/FormTagHelperTest.cs index 8299ba691c..0b07ac6163 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/FormTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/FormTagHelperTest.cs @@ -7,7 +7,7 @@ using System.IO; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.Routing; diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ImageTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ImageTagHelperTest.cs index 442ee75e1b..802c91e6bc 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ImageTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ImageTagHelperTest.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.FileProviders; using Microsoft.AspNet.Hosting; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewEngines; diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LinkTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LinkTagHelperTest.cs index e296c45d55..23d5273c57 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LinkTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LinkTagHelperTest.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.FileProviders; using Microsoft.AspNet.Hosting; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.TagHelpers.Internal; diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs index 4ffc37d4e7..e8c4ad8e60 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.FileProviders; using Microsoft.AspNet.Hosting; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.TagHelpers.Internal; diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs index 979370815a..191cc4a25e 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs @@ -7,7 +7,7 @@ using System.IO; using Microsoft.AspNet.Antiforgery; using Microsoft.AspNet.Html.Abstractions; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.Routing; diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs index 9e12e40ef8..ca2aec784d 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Html.Abstractions; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewEngines; diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs index 79ae30e414..e618b2c91f 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs @@ -8,7 +8,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Html.Abstractions; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewEngines; diff --git a/test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs index 38454b7b40..ed3c7ab1b9 100644 --- a/test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs +++ b/test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs @@ -5,10 +5,11 @@ using System; using System.Collections.Generic; using System.Linq; using System.Reflection; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ActionConstraints; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ApiExplorer; using Microsoft.AspNet.Mvc.ApplicationModels; +using Microsoft.AspNet.Mvc.Controllers; using Microsoft.AspNet.Mvc.Core; using Microsoft.AspNet.Mvc.Cors; using Microsoft.AspNet.Mvc.DataAnnotations.Internal; diff --git a/test/Microsoft.AspNet.Mvc.TestCommon/CommonFilterTest.cs b/test/Microsoft.AspNet.Mvc.TestCommon/CommonFilterTest.cs index c3224c84b4..914735368e 100644 --- a/test/Microsoft.AspNet.Mvc.TestCommon/CommonFilterTest.cs +++ b/test/Microsoft.AspNet.Mvc.TestCommon/CommonFilterTest.cs @@ -5,8 +5,8 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Routing; +using Microsoft.AspNet.Mvc.Abstractions; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerTest.cs index 630bd512b5..1fbde6b0f0 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerTest.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Hosting; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs index 11326dd314..17711c465a 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs @@ -7,7 +7,7 @@ using System.IO; using System.Text; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Routing; using Moq; using Newtonsoft.Json; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/PartialViewResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/PartialViewResultTest.cs index 31d3b5b3ba..c841dc43f9 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/PartialViewResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/PartialViewResultTest.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ViewEngines; using Microsoft.AspNet.Routing; using Microsoft.Framework.Logging; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs index 1cb83ef3de..8a71779884 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs @@ -4,7 +4,8 @@ using System; using Microsoft.AspNet.Builder; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; using Microsoft.AspNet.Mvc.Routing; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs index 86812f7b9f..781267d4c9 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs @@ -9,7 +9,7 @@ using System.IO; using System.Threading.Tasks; using Microsoft.AspNet.Antiforgery; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; using Microsoft.AspNet.Mvc.ViewEngines; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/SkipStatusCodePagesAttributeTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/SkipStatusCodePagesAttributeTest.cs index d3c7a217cb..5db66d30df 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/SkipStatusCodePagesAttributeTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/SkipStatusCodePagesAttributeTest.cs @@ -4,7 +4,7 @@ using Microsoft.AspNet.Diagnostics; using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Routing; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs index 5c0eb8677d..eb04ee9c16 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs @@ -8,7 +8,8 @@ using System.Text; using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewComponents; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ContentViewComponentResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ContentViewComponentResultTest.cs index 0c8db6f42b..c3b0e74d99 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ContentViewComponentResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ContentViewComponentResultTest.cs @@ -3,7 +3,7 @@ using System.IO; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewComponents; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentDescriptorProviderTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentDescriptorProviderTest.cs index 6c357696b4..48893c7049 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentDescriptorProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentDescriptorProviderTest.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Reflection; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Infrastructure; using Xunit; namespace Microsoft.AspNet.Mvc.ViewComponents diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs index fa3a11a5e7..d1fb0273e2 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Reflection; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.Framework.Internal; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/JsonViewComponentResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/JsonViewComponentResultTest.cs index 2a8d528815..de6df00118 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/JsonViewComponentResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/JsonViewComponentResultTest.cs @@ -6,7 +6,7 @@ using System.IO; using System.Text; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewComponents; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ViewViewComponentResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ViewViewComponentResultTest.cs index d27065bfc4..8077c01493 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ViewViewComponentResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ViewViewComponentResultTest.cs @@ -5,7 +5,7 @@ using System; using System.IO; using System.Threading.Tasks; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewComponents; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewEngines/CompositeViewEngineTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewEngines/CompositeViewEngineTest.cs index f078b9b837..1350542e16 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewEngines/CompositeViewEngineTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewEngines/CompositeViewEngineTest.cs @@ -4,7 +4,7 @@ using System; using System.Linq; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Routing; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/DefaultDisplayTemplatesTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/DefaultDisplayTemplatesTest.cs index 275f4cf729..58fe3177d1 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/DefaultDisplayTemplatesTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/DefaultDisplayTemplatesTest.cs @@ -8,7 +8,6 @@ using System.Globalization; using System.Linq; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.TestCommon; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ViewExecutorTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ViewExecutorTest.cs index 5fc0ee19ff..5fec6b2aa0 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ViewExecutorTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ViewExecutorTest.cs @@ -5,7 +5,7 @@ using System; using System.IO; using System.Threading.Tasks; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewEngines; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewResultTest.cs index 77b431d3c9..a84eb6ef37 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewResultTest.cs @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ViewEngines; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs index 974229060f..c992e8d27e 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs @@ -8,11 +8,11 @@ using System.Linq; using System.Reflection; using Microsoft.AspNet.Authorization; using Microsoft.AspNet.Mvc; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ActionConstraints; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ApplicationModels; -using Microsoft.AspNet.Mvc.Core; -using Microsoft.AspNet.Mvc.Filters; +using Microsoft.AspNet.Mvc.Controllers; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.WebApiCompatShim; using Microsoft.Framework.OptionsModel; diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerTest.cs index c73e10bf68..483e434b62 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerTest.cs @@ -9,7 +9,7 @@ using System.Text; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Routing; using Newtonsoft.Json; diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/BadRequestErrorMessageResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/BadRequestErrorMessageResultTest.cs index f2c886b006..87a3c259fa 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/BadRequestErrorMessageResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/BadRequestErrorMessageResultTest.cs @@ -7,8 +7,9 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Formatters; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Routing; using Microsoft.Framework.Logging; using Microsoft.Framework.OptionsModel; diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ConflictResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ConflictResultTest.cs index 84a22c06de..6aa308a360 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ConflictResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ConflictResultTest.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Routing; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ExceptionResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ExceptionResultTest.cs index 1d09f32e9a..35aaac57bf 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ExceptionResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ExceptionResultTest.cs @@ -7,8 +7,9 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Formatters; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Routing; using Microsoft.Framework.Logging; using Microsoft.Framework.OptionsModel; diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs index 5ca3bcc484..26e357ea4f 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs @@ -7,7 +7,7 @@ using System.Net; using System.Net.Http; using System.Web.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Routing; using Moq; diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InternalServerErrorResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InternalServerErrorResultTest.cs index 5a83c53dde..5d0e0b0d17 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InternalServerErrorResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InternalServerErrorResultTest.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Routing; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InvalidModelStateResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InvalidModelStateResultTest.cs index 1b948a972a..326fc2acf2 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InvalidModelStateResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InvalidModelStateResultTest.cs @@ -7,8 +7,9 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Formatters; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Routing; using Microsoft.Framework.Logging; diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/NegotiatedContentResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/NegotiatedContentResultTest.cs index 4d9ad8bcac..163e8ef31f 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/NegotiatedContentResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/NegotiatedContentResultTest.cs @@ -7,8 +7,9 @@ using System.Net; using System.Threading.Tasks; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.Formatters; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Routing; using Microsoft.Framework.Logging; using Microsoft.Framework.OptionsModel; diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/OverloadActionConstraintTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/OverloadActionConstraintTest.cs index 2559d82ad0..5257dd743a 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/OverloadActionConstraintTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/OverloadActionConstraintTest.cs @@ -5,8 +5,8 @@ using System.Collections.Generic; using System.Web.Http; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.AspNet.Mvc.ActionConstraints; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Routing; using Xunit; diff --git a/test/WebSites/ActivatorWebSite/Controllers/PlainController.cs b/test/WebSites/ActivatorWebSite/Controllers/PlainController.cs index 4e91d1afc3..2cdbf4ce80 100644 --- a/test/WebSites/ActivatorWebSite/Controllers/PlainController.cs +++ b/test/WebSites/ActivatorWebSite/Controllers/PlainController.cs @@ -3,7 +3,6 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Actions; namespace ActivatorWebSite { diff --git a/test/WebSites/ApplicationModelWebSite/Controllers/ActionModelController.cs b/test/WebSites/ApplicationModelWebSite/Controllers/ActionModelController.cs index 5bd46b0bbd..fd545b6d4c 100644 --- a/test/WebSites/ApplicationModelWebSite/Controllers/ActionModelController.cs +++ b/test/WebSites/ApplicationModelWebSite/Controllers/ActionModelController.cs @@ -3,8 +3,8 @@ using System; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ApplicationModels; +using Microsoft.AspNet.Mvc.Controllers; namespace ApplicationModelWebSite { diff --git a/test/WebSites/ApplicationModelWebSite/Controllers/ApplicationModelController.cs b/test/WebSites/ApplicationModelWebSite/Controllers/ApplicationModelController.cs index cd66df0272..47905046b9 100644 --- a/test/WebSites/ApplicationModelWebSite/Controllers/ApplicationModelController.cs +++ b/test/WebSites/ApplicationModelWebSite/Controllers/ApplicationModelController.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Controllers; namespace ApplicationModelWebSite { diff --git a/test/WebSites/ApplicationModelWebSite/Controllers/ControllerModelController.cs b/test/WebSites/ApplicationModelWebSite/Controllers/ControllerModelController.cs index 54c130447b..89f575e58f 100644 --- a/test/WebSites/ApplicationModelWebSite/Controllers/ControllerModelController.cs +++ b/test/WebSites/ApplicationModelWebSite/Controllers/ControllerModelController.cs @@ -3,8 +3,8 @@ using System; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ApplicationModels; +using Microsoft.AspNet.Mvc.Controllers; namespace ApplicationModelWebSite { diff --git a/test/WebSites/ApplicationModelWebSite/Controllers/HomeController.cs b/test/WebSites/ApplicationModelWebSite/Controllers/HomeController.cs index bdbc3446cf..96bd88b791 100644 --- a/test/WebSites/ApplicationModelWebSite/Controllers/HomeController.cs +++ b/test/WebSites/ApplicationModelWebSite/Controllers/HomeController.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Controllers; namespace ApplicationModelWebSite { diff --git a/test/WebSites/ApplicationModelWebSite/Controllers/LisenceController.cs b/test/WebSites/ApplicationModelWebSite/Controllers/LisenceController.cs index fcd957aa66..5828eb6572 100644 --- a/test/WebSites/ApplicationModelWebSite/Controllers/LisenceController.cs +++ b/test/WebSites/ApplicationModelWebSite/Controllers/LisenceController.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Controllers; namespace ApplicationModelWebSite.Controllers { diff --git a/test/WebSites/BasicWebSite/ActionDescriptorCreationCounter.cs b/test/WebSites/BasicWebSite/ActionDescriptorCreationCounter.cs index 35808f7630..322c522627 100644 --- a/test/WebSites/BasicWebSite/ActionDescriptorCreationCounter.cs +++ b/test/WebSites/BasicWebSite/ActionDescriptorCreationCounter.cs @@ -3,8 +3,7 @@ using System; using System.Threading; -using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; namespace BasicWebSite { diff --git a/test/WebSites/BasicWebSite/Controllers/HomeController.cs b/test/WebSites/BasicWebSite/Controllers/HomeController.cs index 8f416e8e8c..86d1c1a39a 100644 --- a/test/WebSites/BasicWebSite/Controllers/HomeController.cs +++ b/test/WebSites/BasicWebSite/Controllers/HomeController.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using BasicWebSite.Models; using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Controllers; namespace BasicWebSite.Controllers { diff --git a/test/WebSites/BasicWebSite/Controllers/MonitorController.cs b/test/WebSites/BasicWebSite/Controllers/MonitorController.cs index 9f615519e4..5342043014 100644 --- a/test/WebSites/BasicWebSite/Controllers/MonitorController.cs +++ b/test/WebSites/BasicWebSite/Controllers/MonitorController.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; namespace BasicWebSite { diff --git a/test/WebSites/BasicWebSite/Startup.cs b/test/WebSites/BasicWebSite/Startup.cs index 67574725ad..7cc6368c68 100644 --- a/test/WebSites/BasicWebSite/Startup.cs +++ b/test/WebSites/BasicWebSite/Startup.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Builder; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Abstractions; using Microsoft.Framework.DependencyInjection; namespace BasicWebSite diff --git a/test/WebSites/CustomRouteWebSite/LocaleAttribute.cs b/test/WebSites/CustomRouteWebSite/LocaleAttribute.cs index 75e247873a..cca23fcc60 100644 --- a/test/WebSites/CustomRouteWebSite/LocaleAttribute.cs +++ b/test/WebSites/CustomRouteWebSite/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.Actions; +using Microsoft.AspNet.Mvc.Infrastructure; namespace CustomRouteWebSite { diff --git a/test/WebSites/FiltersWebSite/Controllers/DummyClassController.cs b/test/WebSites/FiltersWebSite/Controllers/DummyClassController.cs index efa9276d7f..87abf0b963 100644 --- a/test/WebSites/FiltersWebSite/Controllers/DummyClassController.cs +++ b/test/WebSites/FiltersWebSite/Controllers/DummyClassController.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Actions; namespace FiltersWebSite { diff --git a/test/WebSites/RoutingWebSite/CountryNeutralAttribute.cs b/test/WebSites/RoutingWebSite/CountryNeutralAttribute.cs index b2360887ad..7622948673 100644 --- a/test/WebSites/RoutingWebSite/CountryNeutralAttribute.cs +++ b/test/WebSites/RoutingWebSite/CountryNeutralAttribute.cs @@ -1,7 +1,8 @@ // 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.Actions; +using Microsoft.AspNet.Mvc.Infrastructure; +using Microsoft.AspNet.Mvc.Routing; namespace RoutingWebSite { diff --git a/test/WebSites/RoutingWebSite/CountrySpecificAttribute.cs b/test/WebSites/RoutingWebSite/CountrySpecificAttribute.cs index 4fbb9ed21e..c544abf4b7 100644 --- a/test/WebSites/RoutingWebSite/CountrySpecificAttribute.cs +++ b/test/WebSites/RoutingWebSite/CountrySpecificAttribute.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.Actions; +using Microsoft.AspNet.Mvc.Infrastructure; namespace RoutingWebSite { diff --git a/test/WebSites/RoutingWebSite/HttpMergeAttribute.cs b/test/WebSites/RoutingWebSite/HttpMergeAttribute.cs index 43cf0f2a92..bd342ffe92 100644 --- a/test/WebSites/RoutingWebSite/HttpMergeAttribute.cs +++ b/test/WebSites/RoutingWebSite/HttpMergeAttribute.cs @@ -3,8 +3,7 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Mvc.Actions; -using Microsoft.AspNet.Mvc.Routing; +using Microsoft.AspNet.Mvc.Infrastructure; namespace RoutingWebSite { diff --git a/test/WebSites/RoutingWebSite/TestResponseGenerator.cs b/test/WebSites/RoutingWebSite/TestResponseGenerator.cs index 034be23e4c..f1f7fefb96 100644 --- a/test/WebSites/RoutingWebSite/TestResponseGenerator.cs +++ b/test/WebSites/RoutingWebSite/TestResponseGenerator.cs @@ -5,8 +5,8 @@ using System; using System.Collections.Generic; using System.Linq; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Actions; -using Microsoft.AspNet.Mvc.Routing; +using Microsoft.AspNet.Mvc.Controllers; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.Framework.DependencyInjection; namespace RoutingWebSite diff --git a/test/WebSites/UrlHelperWebSite/CustomUrlHelper.cs b/test/WebSites/UrlHelperWebSite/CustomUrlHelper.cs index 9061ab34bc..688eb24cd3 100644 --- a/test/WebSites/UrlHelperWebSite/CustomUrlHelper.cs +++ b/test/WebSites/UrlHelperWebSite/CustomUrlHelper.cs @@ -3,7 +3,7 @@ using System; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.AspNet.Mvc.Routing; using Microsoft.Framework.OptionsModel; diff --git a/test/WebSites/VersioningWebSite/TestResponseGenerator.cs b/test/WebSites/VersioningWebSite/TestResponseGenerator.cs index 0bd63e62f3..81bef35bf2 100644 --- a/test/WebSites/VersioningWebSite/TestResponseGenerator.cs +++ b/test/WebSites/VersioningWebSite/TestResponseGenerator.cs @@ -5,8 +5,8 @@ using System; using System.Collections.Generic; using System.Linq; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Actions; -using Microsoft.AspNet.Mvc.Routing; +using Microsoft.AspNet.Mvc.Controllers; +using Microsoft.AspNet.Mvc.Infrastructure; using Microsoft.Framework.DependencyInjection; namespace VersioningWebSite diff --git a/test/WebSites/VersioningWebSite/VersionDeleteAttribute.cs b/test/WebSites/VersioningWebSite/VersionDeleteAttribute.cs index 8b9e861484..420f91091b 100644 --- a/test/WebSites/VersioningWebSite/VersionDeleteAttribute.cs +++ b/test/WebSites/VersioningWebSite/VersionDeleteAttribute.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.Collections.Generic; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Infrastructure; namespace VersioningWebSite { diff --git a/test/WebSites/VersioningWebSite/VersionGetAttribute.cs b/test/WebSites/VersioningWebSite/VersionGetAttribute.cs index 3882be02d5..26f577c75e 100644 --- a/test/WebSites/VersioningWebSite/VersionGetAttribute.cs +++ b/test/WebSites/VersioningWebSite/VersionGetAttribute.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.Collections.Generic; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Infrastructure; namespace VersioningWebSite { diff --git a/test/WebSites/VersioningWebSite/VersionPostAttribute.cs b/test/WebSites/VersioningWebSite/VersionPostAttribute.cs index dd93d6141d..6a29ba9863 100644 --- a/test/WebSites/VersioningWebSite/VersionPostAttribute.cs +++ b/test/WebSites/VersioningWebSite/VersionPostAttribute.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.Collections.Generic; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Infrastructure; namespace VersioningWebSite { diff --git a/test/WebSites/VersioningWebSite/VersionPutAttribute.cs b/test/WebSites/VersioningWebSite/VersionPutAttribute.cs index 6911dc19b7..071fe9fb67 100644 --- a/test/WebSites/VersioningWebSite/VersionPutAttribute.cs +++ b/test/WebSites/VersioningWebSite/VersionPutAttribute.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.Collections.Generic; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Infrastructure; namespace VersioningWebSite { diff --git a/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs b/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs index 2b7f2fcea4..1df0ea414f 100644 --- a/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs +++ b/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Controllers; using Microsoft.AspNet.Mvc.Filters; using Newtonsoft.Json;