diff --git a/samples/MvcSample.Web/Controllers/JsonPatchController.cs b/samples/MvcSample.Web/Controllers/JsonPatchController.cs index aba1583ec1..d52db85cdb 100644 --- a/samples/MvcSample.Web/Controllers/JsonPatchController.cs +++ b/samples/MvcSample.Web/Controllers/JsonPatchController.cs @@ -5,7 +5,6 @@ using System.Collections.Generic; using System.Linq; using Microsoft.AspNet.JsonPatch; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; namespace MvcSample.Web.Controllers { diff --git a/samples/MvcSample.Web/Filters/DelayAttribute.cs b/samples/MvcSample.Web/Filters/DelayAttribute.cs index a47f191204..bfbe954810 100644 --- a/samples/MvcSample.Web/Filters/DelayAttribute.cs +++ b/samples/MvcSample.Web/Filters/DelayAttribute.cs @@ -3,7 +3,7 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNet.Mvc.ActionResults; +using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Filters; namespace MvcSample.Web.Filters diff --git a/samples/MvcSample.Web/Filters/ErrorMessagesAttribute.cs b/samples/MvcSample.Web/Filters/ErrorMessagesAttribute.cs index 1f5f10f24e..24ea70b199 100644 --- a/samples/MvcSample.Web/Filters/ErrorMessagesAttribute.cs +++ b/samples/MvcSample.Web/Filters/ErrorMessagesAttribute.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.ActionResults; +using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Filters; using Microsoft.Net.Http.Headers; diff --git a/samples/MvcSample.Web/Filters/InspectResultPageAttribute.cs b/samples/MvcSample.Web/Filters/InspectResultPageAttribute.cs index 8e0c801cc4..82e6e8443e 100644 --- a/samples/MvcSample.Web/Filters/InspectResultPageAttribute.cs +++ b/samples/MvcSample.Web/Filters/InspectResultPageAttribute.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.ActionResults; +using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Filters; using MvcSample.Web.Models; diff --git a/samples/MvcSample.Web/FiltersController.cs b/samples/MvcSample.Web/FiltersController.cs index 98f6f1d4c1..dcb46b4131 100644 --- a/samples/MvcSample.Web/FiltersController.cs +++ b/samples/MvcSample.Web/FiltersController.cs @@ -3,7 +3,6 @@ using System; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Filters; using MvcSample.Web.Filters; using MvcSample.Web.Models; diff --git a/samples/MvcSample.Web/Home2Controller.cs b/samples/MvcSample.Web/Home2Controller.cs index c776041bc7..eb213a2b1f 100644 --- a/samples/MvcSample.Web/Home2Controller.cs +++ b/samples/MvcSample.Web/Home2Controller.cs @@ -4,8 +4,6 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; -using Microsoft.AspNet.Mvc.Actions; using MvcSample.Web.Models; namespace MvcSample.Web.RandomNameSpace diff --git a/samples/MvcSample.Web/HomeController.cs b/samples/MvcSample.Web/HomeController.cs index def7e46f31..09c3790ba0 100644 --- a/samples/MvcSample.Web/HomeController.cs +++ b/samples/MvcSample.Web/HomeController.cs @@ -8,7 +8,6 @@ using System.Threading.Tasks; using Microsoft.AspNet.Hosting; using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Rendering; using MvcSample.Web.Models; diff --git a/samples/MvcSample.Web/OverloadController.cs b/samples/MvcSample.Web/OverloadController.cs index 0793320998..d94dd891e2 100644 --- a/samples/MvcSample.Web/OverloadController.cs +++ b/samples/MvcSample.Web/OverloadController.cs @@ -4,7 +4,6 @@ using System; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.ActionConstraints; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.WebApiCompatShim; using MvcSample.Web.Models; diff --git a/samples/TagHelperSample.Web/Controllers/MoviesController.cs b/samples/TagHelperSample.Web/Controllers/MoviesController.cs index c960a02b34..736d9a35f3 100644 --- a/samples/TagHelperSample.Web/Controllers/MoviesController.cs +++ b/samples/TagHelperSample.Web/Controllers/MoviesController.cs @@ -2,7 +2,6 @@ // 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.ActionResults; using TagHelperSample.Web.Services; namespace TagHelperSample.Web.Controllers diff --git a/src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs index fdef13962d..08f77368a9 100644 --- a/src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs +++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs @@ -7,7 +7,6 @@ using System.Linq; using System.Reflection; using System.Threading.Tasks; using Microsoft.AspNet.Mvc.ActionConstraints; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Formatters; using Microsoft.AspNet.Mvc.ModelBinding; diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionInvoker.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionInvoker.cs index a612946f20..cc9c1d4f33 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionInvoker.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionInvoker.cs @@ -7,7 +7,6 @@ using System.Diagnostics; using System.Diagnostics.Tracing; using System.Reflection; using System.Threading.Tasks; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Core; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.Formatters; diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/FilterActionInvoker.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/FilterActionInvoker.cs index bfc7f2ca0d..1b00f6cd05 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/FilterActionInvoker.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Actions/FilterActionInvoker.cs @@ -8,7 +8,6 @@ using System.Diagnostics.Tracing; using System.Linq; using System.Runtime.ExceptionServices; using System.Threading.Tasks; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Core; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.Formatters; diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/BadRequestObjectResult.cs b/src/Microsoft.AspNet.Mvc.Core/BadRequestObjectResult.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/BadRequestObjectResult.cs rename to src/Microsoft.AspNet.Mvc.Core/BadRequestObjectResult.cs index 342548a0b5..4bc0e869dd 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/BadRequestObjectResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/BadRequestObjectResult.cs @@ -5,7 +5,7 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { /// /// An that when executed will produce a Bad Request (400) response. diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/BadRequestResult.cs b/src/Microsoft.AspNet.Mvc.Core/BadRequestResult.cs similarity index 93% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/BadRequestResult.cs rename to src/Microsoft.AspNet.Mvc.Core/BadRequestResult.cs index 6c5be81d5c..40ca333848 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/BadRequestResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/BadRequestResult.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Http; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { /// /// A that when diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/ChallengeResult.cs b/src/Microsoft.AspNet.Mvc.Core/ChallengeResult.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/ChallengeResult.cs rename to src/Microsoft.AspNet.Mvc.Core/ChallengeResult.cs index 6bbc7c16d7..fd1a81c179 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/ChallengeResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ChallengeResult.cs @@ -7,7 +7,7 @@ using Microsoft.AspNet.Http.Authentication; using Microsoft.AspNet.Mvc.Actions; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class ChallengeResult : ActionResult { diff --git a/src/Microsoft.AspNet.Mvc.Core/ConsumesAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/ConsumesAttribute.cs index 93899cd09c..b5ea84645a 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ConsumesAttribute.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ConsumesAttribute.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Linq; using Microsoft.AspNet.Mvc.ActionConstraints; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Core; using Microsoft.AspNet.Mvc.Filters; diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/ContentResult.cs b/src/Microsoft.AspNet.Mvc.Core/ContentResult.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/ContentResult.cs rename to src/Microsoft.AspNet.Mvc.Core/ContentResult.cs index 92f0ce461d..6beb8b68df 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/ContentResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ContentResult.cs @@ -9,7 +9,7 @@ using Microsoft.AspNet.Mvc.Internal; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class ContentResult : ActionResult { diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedAtActionResult.cs b/src/Microsoft.AspNet.Mvc.Core/CreatedAtActionResult.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedAtActionResult.cs rename to src/Microsoft.AspNet.Mvc.Core/CreatedAtActionResult.cs index b0e90b4e53..640e002a27 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedAtActionResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/CreatedAtActionResult.cs @@ -10,7 +10,7 @@ using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { /// /// An that returns a Created (201) response with a Location header. diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedAtRouteResult.cs b/src/Microsoft.AspNet.Mvc.Core/CreatedAtRouteResult.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedAtRouteResult.cs rename to src/Microsoft.AspNet.Mvc.Core/CreatedAtRouteResult.cs index 1755888d1e..ce06c3dba0 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedAtRouteResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/CreatedAtRouteResult.cs @@ -10,7 +10,7 @@ using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { /// /// An that returns a Created (201) response with a Location header. diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedResult.cs b/src/Microsoft.AspNet.Mvc.Core/CreatedResult.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedResult.cs rename to src/Microsoft.AspNet.Mvc.Core/CreatedResult.cs index 4f630f15af..02ac39c398 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/CreatedResult.cs @@ -7,7 +7,7 @@ using Microsoft.AspNet.Mvc.Actions; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { /// /// An that returns a Created (201) response with a Location header. diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/EmptyResult.cs b/src/Microsoft.AspNet.Mvc.Core/EmptyResult.cs similarity index 94% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/EmptyResult.cs rename to src/Microsoft.AspNet.Mvc.Core/EmptyResult.cs index fb178e3aa8..c815038a46 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/EmptyResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/EmptyResult.cs @@ -4,7 +4,7 @@ using Microsoft.AspNet.Mvc.Actions; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { /// /// Represents an that when executed will diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/FileContentResult.cs b/src/Microsoft.AspNet.Mvc.Core/FileContentResult.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/FileContentResult.cs rename to src/Microsoft.AspNet.Mvc.Core/FileContentResult.cs index c92c77911f..9a2befb433 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/FileContentResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/FileContentResult.cs @@ -9,7 +9,7 @@ using Microsoft.AspNet.Http.Features; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { /// /// Represents an that when executed will diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/FileResult.cs b/src/Microsoft.AspNet.Mvc.Core/FileResult.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/FileResult.cs rename to src/Microsoft.AspNet.Mvc.Core/FileResult.cs index 4e6be9a1d9..d002d75f60 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/FileResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/FileResult.cs @@ -8,7 +8,7 @@ using Microsoft.AspNet.Mvc.Actions; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { /// /// Represents an that when executed will diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/FileStreamResult.cs b/src/Microsoft.AspNet.Mvc.Core/FileStreamResult.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/FileStreamResult.cs rename to src/Microsoft.AspNet.Mvc.Core/FileStreamResult.cs index b093a90021..08bded14b8 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/FileStreamResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/FileStreamResult.cs @@ -10,7 +10,7 @@ using Microsoft.AspNet.Http.Features; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { /// /// Represents an that when executed will diff --git a/src/Microsoft.AspNet.Mvc.Core/Filters/AuthorizationFilterAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/AuthorizationFilterAttribute.cs index e07686500d..6d74c83ffa 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Filters/AuthorizationFilterAttribute.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Filters/AuthorizationFilterAttribute.cs @@ -4,7 +4,6 @@ using System; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Internal; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.Core/Filters/AuthorizeFilter.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/AuthorizeFilter.cs index 9426f3f9b6..cae4051ef4 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Filters/AuthorizeFilter.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Filters/AuthorizeFilter.cs @@ -5,7 +5,6 @@ using System.Linq; using System.Security.Claims; using System.Threading.Tasks; using Microsoft.AspNet.Authorization; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.Core/Formatters/FormatFilter.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/FormatFilter.cs index 7dc61222c3..4258910cb1 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Formatters/FormatFilter.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/FormatFilter.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ApiExplorer; using Microsoft.AspNet.Mvc.Filters; diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpNotFoundObjectResult.cs b/src/Microsoft.AspNet.Mvc.Core/HttpNotFoundObjectResult.cs similarity index 94% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpNotFoundObjectResult.cs rename to src/Microsoft.AspNet.Mvc.Core/HttpNotFoundObjectResult.cs index 161c5584ce..01eaa85c6f 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpNotFoundObjectResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/HttpNotFoundObjectResult.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Http; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { /// /// An that when executed will produce a Not Found (404) response. diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpNotFoundResult.cs b/src/Microsoft.AspNet.Mvc.Core/HttpNotFoundResult.cs similarity index 93% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpNotFoundResult.cs rename to src/Microsoft.AspNet.Mvc.Core/HttpNotFoundResult.cs index f267239245..5f6c002e4c 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpNotFoundResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/HttpNotFoundResult.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Http; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { /// /// Represents an that when diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpOkObjectResult.cs b/src/Microsoft.AspNet.Mvc.Core/HttpOkObjectResult.cs similarity index 95% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpOkObjectResult.cs rename to src/Microsoft.AspNet.Mvc.Core/HttpOkObjectResult.cs index f87d5ea3f8..5efefa2173 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpOkObjectResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/HttpOkObjectResult.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Http; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { /// /// An that when executed performs content negotiation, formats the entity body, and diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpOkResult.cs b/src/Microsoft.AspNet.Mvc.Core/HttpOkResult.cs similarity index 93% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpOkResult.cs rename to src/Microsoft.AspNet.Mvc.Core/HttpOkResult.cs index fcce07ba94..51482ca450 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpOkResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/HttpOkResult.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Http; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { /// /// An that when executed will produce an empty diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpStatusCodeResult.cs b/src/Microsoft.AspNet.Mvc.Core/HttpStatusCodeResult.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpStatusCodeResult.cs rename to src/Microsoft.AspNet.Mvc.Core/HttpStatusCodeResult.cs index d33a68c499..162f133031 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpStatusCodeResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/HttpStatusCodeResult.cs @@ -4,7 +4,7 @@ using Microsoft.AspNet.Mvc.Actions; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { /// /// Represents an that when executed will diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpUnauthorizedResult.cs b/src/Microsoft.AspNet.Mvc.Core/HttpUnauthorizedResult.cs similarity index 93% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpUnauthorizedResult.cs rename to src/Microsoft.AspNet.Mvc.Core/HttpUnauthorizedResult.cs index 8342860c06..7e2cce0568 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpUnauthorizedResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/HttpUnauthorizedResult.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Http; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { /// /// Represents an that when diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/IKeepTempDataResult.cs b/src/Microsoft.AspNet.Mvc.Core/IKeepTempDataResult.cs similarity index 89% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/IKeepTempDataResult.cs rename to src/Microsoft.AspNet.Mvc.Core/IKeepTempDataResult.cs index a18083a9eb..3b7f140e9f 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/IKeepTempDataResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/IKeepTempDataResult.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.ActionResults +namespace Microsoft.AspNet.Mvc { /// /// A marker interface for types which need to have temp data saved. diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/NoContentResult.cs b/src/Microsoft.AspNet.Mvc.Core/NoContentResult.cs similarity index 89% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/NoContentResult.cs rename to src/Microsoft.AspNet.Mvc.Core/NoContentResult.cs index 47586c3b31..2d80819441 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/NoContentResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/NoContentResult.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Http; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class NoContentResult : HttpStatusCodeResult { diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs b/src/Microsoft.AspNet.Mvc.Core/ObjectResult.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs rename to src/Microsoft.AspNet.Mvc.Core/ObjectResult.cs index 516c1ac329..a3b2415cbd 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ObjectResult.cs @@ -16,7 +16,7 @@ using Microsoft.Framework.Logging; using Microsoft.Framework.OptionsModel; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class ObjectResult : ActionResult { diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/PhysicalFileProviderResult.cs b/src/Microsoft.AspNet.Mvc.Core/PhysicalFileProviderResult.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/PhysicalFileProviderResult.cs rename to src/Microsoft.AspNet.Mvc.Core/PhysicalFileProviderResult.cs index d08f6f282e..0f739898e3 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/PhysicalFileProviderResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/PhysicalFileProviderResult.cs @@ -10,7 +10,7 @@ using Microsoft.AspNet.Mvc.Core; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { /// /// A on execution will write a file from disk to the response diff --git a/src/Microsoft.AspNet.Mvc.Core/ProducesAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/ProducesAttribute.cs index 970a08fbb9..846b1ab24d 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ProducesAttribute.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ProducesAttribute.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.ApiExplorer; using Microsoft.AspNet.Mvc.Core; using Microsoft.AspNet.Mvc.Filters; diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/RedirectResult.cs b/src/Microsoft.AspNet.Mvc.Core/RedirectResult.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/RedirectResult.cs rename to src/Microsoft.AspNet.Mvc.Core/RedirectResult.cs index 1dbc161726..53ece18a8b 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/RedirectResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/RedirectResult.cs @@ -2,12 +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.Actions; using Microsoft.AspNet.Mvc.Core; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class RedirectResult : ActionResult, IKeepTempDataResult { diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/RedirectToActionResult.cs b/src/Microsoft.AspNet.Mvc.Core/RedirectToActionResult.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/RedirectToActionResult.cs rename to src/Microsoft.AspNet.Mvc.Core/RedirectToActionResult.cs index 597beeabd1..98ddef1d76 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/RedirectToActionResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/RedirectToActionResult.cs @@ -8,7 +8,7 @@ using Microsoft.AspNet.Mvc.Core; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class RedirectToActionResult : ActionResult, IKeepTempDataResult { diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/RedirectToRouteResult.cs b/src/Microsoft.AspNet.Mvc.Core/RedirectToRouteResult.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/RedirectToRouteResult.cs rename to src/Microsoft.AspNet.Mvc.Core/RedirectToRouteResult.cs index 2e7031589d..d96e9a925a 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/RedirectToRouteResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/RedirectToRouteResult.cs @@ -8,7 +8,7 @@ using Microsoft.AspNet.Mvc.Core; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class RedirectToRouteResult : ActionResult, IKeepTempDataResult { diff --git a/src/Microsoft.AspNet.Mvc.Core/RequireHttpsAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/RequireHttpsAttribute.cs index f0195be961..307123f140 100644 --- a/src/Microsoft.AspNet.Mvc.Core/RequireHttpsAttribute.cs +++ b/src/Microsoft.AspNet.Mvc.Core/RequireHttpsAttribute.cs @@ -3,7 +3,6 @@ using System; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Filters; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/UnsupportedMediaTypeResult.cs b/src/Microsoft.AspNet.Mvc.Core/UnsupportedMediaTypeResult.cs similarity index 93% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/UnsupportedMediaTypeResult.cs rename to src/Microsoft.AspNet.Mvc.Core/UnsupportedMediaTypeResult.cs index 50a8b5931f..599ea1b432 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/UnsupportedMediaTypeResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/UnsupportedMediaTypeResult.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Http; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { /// /// A that when diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/VirtualFileProviderResult.cs b/src/Microsoft.AspNet.Mvc.Core/VirtualFileProviderResult.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Core/ActionResults/VirtualFileProviderResult.cs rename to src/Microsoft.AspNet.Mvc.Core/VirtualFileProviderResult.cs index be67a47a9d..ffe39b03aa 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/VirtualFileProviderResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/VirtualFileProviderResult.cs @@ -14,7 +14,7 @@ using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { /// /// A that on execution writes the file specified using a virtual path to the response diff --git a/src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilter.cs b/src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilter.cs index 4881856cc8..ce11a1b37e 100644 --- a/src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilter.cs +++ b/src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilter.cs @@ -5,10 +5,8 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNet.Authorization; using Microsoft.AspNet.Cors.Core; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Filters; using Microsoft.Framework.Internal; using Microsoft.Framework.Primitives; diff --git a/src/Microsoft.AspNet.Mvc.Cors/DisableCorsAuthorizationFilter.cs b/src/Microsoft.AspNet.Mvc.Cors/DisableCorsAuthorizationFilter.cs index 4c4d62d948..1158f771f0 100644 --- a/src/Microsoft.AspNet.Mvc.Cors/DisableCorsAuthorizationFilter.cs +++ b/src/Microsoft.AspNet.Mvc.Cors/DisableCorsAuthorizationFilter.cs @@ -5,7 +5,6 @@ using System; using System.Threading.Tasks; using Microsoft.AspNet.Cors.Core; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Filters; using Microsoft.Framework.Internal; using Microsoft.Framework.Primitives; diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Json/ActionResults/JsonResult.cs b/src/Microsoft.AspNet.Mvc.Formatters.Json/JsonResult.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Formatters.Json/ActionResults/JsonResult.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Json/JsonResult.cs index 3ceb648720..7548f56e9e 100644 --- a/src/Microsoft.AspNet.Mvc.Formatters.Json/ActionResults/JsonResult.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Json/JsonResult.cs @@ -10,7 +10,7 @@ using Microsoft.Framework.OptionsModel; using Microsoft.Net.Http.Headers; using Newtonsoft.Json; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { /// /// An action result which formats the given object as JSON. diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs index 3161fe2694..1f7abe1374 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.ActionResults; using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.ModelBinding; diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/PartialViewResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/PartialViewResult.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/PartialViewResult.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/PartialViewResult.cs index 363853e440..da6a82d5e1 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/PartialViewResult.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/PartialViewResult.cs @@ -11,7 +11,7 @@ using Microsoft.Net.Http.Headers; using Microsoft.Framework.OptionsModel; using Microsoft.AspNet.Mvc.Actions; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { /// /// Represents an that renders a partial view to the response. diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/SaveTempDataFilter.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/SaveTempDataFilter.cs index 8bce68b8f6..a90e0f8365 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/SaveTempDataFilter.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/SaveTempDataFilter.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.ActionResults; using Microsoft.AspNet.Mvc.Filters; namespace Microsoft.AspNet.Mvc diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/ViewComponentResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponentResult.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/ViewComponentResult.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponentResult.cs index c3e276bc45..63dc3b1911 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/ViewComponentResult.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponentResult.cs @@ -13,7 +13,7 @@ using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.OptionsModel; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { /// /// An which renders a view component to the response. diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/ViewResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewResult.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/ViewResult.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewResult.cs index 0bdbe4fedf..cd89976ad0 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/ViewResult.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewResult.cs @@ -11,7 +11,7 @@ using Microsoft.Net.Http.Headers; using Microsoft.Framework.OptionsModel; using System.Diagnostics.Tracing; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { /// /// Represents an that renders a view to the response. diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ApiController.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ApiController.cs index 98e81f5e3c..23dd358032 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.ActionResults; using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/BadRequestErrorMessageResult.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/BadRequestErrorMessageResult.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/BadRequestErrorMessageResult.cs rename to src/Microsoft.AspNet.Mvc.WebApiCompatShim/BadRequestErrorMessageResult.cs index 2b84c34e72..a11a7376a6 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/BadRequestErrorMessageResult.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/BadRequestErrorMessageResult.cs @@ -4,7 +4,6 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.Framework.Internal; namespace System.Web.Http diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ConflictResult.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ConflictResult.cs similarity index 93% rename from src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ConflictResult.cs rename to src/Microsoft.AspNet.Mvc.WebApiCompatShim/ConflictResult.cs index fc9bbdc67f..479eb93ef9 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ConflictResult.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ConflictResult.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.ActionResults; +using Microsoft.AspNet.Mvc; namespace System.Web.Http { diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ExceptionResult.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ExceptionResult.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ExceptionResult.cs rename to src/Microsoft.AspNet.Mvc.WebApiCompatShim/ExceptionResult.cs index 24f86b4788..5d12a4107f 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ExceptionResult.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ExceptionResult.cs @@ -4,7 +4,6 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; namespace System.Web.Http { diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpResponseExceptionActionFilter.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpResponseExceptionActionFilter.cs index a06741ebb1..414d47c10d 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpResponseExceptionActionFilter.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpResponseExceptionActionFilter.cs @@ -3,7 +3,6 @@ using System.Net.Http; using System.Web.Http; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Filters; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/InternalServerErrorResult.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/InternalServerErrorResult.cs similarity index 94% rename from src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/InternalServerErrorResult.cs rename to src/Microsoft.AspNet.Mvc.WebApiCompatShim/InternalServerErrorResult.cs index 6c34cafea3..e3dec407dc 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/InternalServerErrorResult.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/InternalServerErrorResult.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.ActionResults; +using Microsoft.AspNet.Mvc; namespace System.Web.Http { diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/InvalidModelStateResult.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/InvalidModelStateResult.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/InvalidModelStateResult.cs rename to src/Microsoft.AspNet.Mvc.WebApiCompatShim/InvalidModelStateResult.cs index a2dcc3cce2..d309f62893 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/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.ActionResults; using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/NegotiatedContentResult.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/NegotiatedContentResult.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/NegotiatedContentResult.cs rename to src/Microsoft.AspNet.Mvc.WebApiCompatShim/NegotiatedContentResult.cs index cf3a077cd3..d34097de37 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/NegotiatedContentResult.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/NegotiatedContentResult.cs @@ -4,7 +4,6 @@ using System.Net; using System.Threading.Tasks; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; namespace System.Web.Http { diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ResponseMessageResult.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ResponseMessageResult.cs similarity index 95% rename from src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ResponseMessageResult.cs rename to src/Microsoft.AspNet.Mvc.WebApiCompatShim/ResponseMessageResult.cs index 73173318fe..c75f54e621 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ActionResults/ResponseMessageResult.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ResponseMessageResult.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.Net.Http; -using Microsoft.AspNet.Mvc.ActionResults; +using Microsoft.AspNet.Mvc; using Microsoft.Framework.Internal; namespace System.Web.Http diff --git a/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs b/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs index 79b97cf14a..c8c1266ffa 100644 --- a/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs @@ -8,7 +8,6 @@ using System.Linq; using System.Reflection; using System.Threading.Tasks; using Microsoft.AspNet.Mvc.ActionConstraints; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ApiExplorer; using Microsoft.AspNet.Mvc.Filters; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionInvokerTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionInvokerTest.cs index dd846836a1..e131afa4cd 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionInvokerTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionInvokerTest.cs @@ -10,8 +10,6 @@ using System.Reflection; using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.ActionResults; -using Microsoft.AspNet.Mvc.Core; 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/DefaultApplicationModelProviderTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/DefaultApplicationModelProviderTest.cs index afadbe0b9b..b9372bb331 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/DefaultApplicationModelProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/DefaultApplicationModelProviderTest.cs @@ -6,8 +6,6 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Threading.Tasks; -using Microsoft.AspNet.Cors.Core; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.ModelBinding; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/BadRequestObjectResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/BadRequestObjectResultTests.cs similarity index 96% rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/BadRequestObjectResultTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/BadRequestObjectResultTests.cs index 6615a2b065..b6ebcc01ef 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/BadRequestObjectResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/BadRequestObjectResultTests.cs @@ -5,7 +5,7 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc.ModelBinding; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class BadRequestObjectResultTests { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/BadRequestResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/BadRequestResultTests.cs similarity index 92% rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/BadRequestResultTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/BadRequestResultTests.cs index 99a7574b55..2b2aafca23 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/BadRequestResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/BadRequestResultTests.cs @@ -4,7 +4,7 @@ using Microsoft.AspNet.Http; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class BadRequestResultTests { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ChallengeResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ChallengeResultTest.cs similarity index 97% rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ChallengeResultTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/ChallengeResultTest.cs index e3dfd2e9d2..bf06b2b5ef 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ChallengeResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ChallengeResultTest.cs @@ -9,7 +9,7 @@ using Microsoft.AspNet.Routing; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class ChallengeResultTest { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ConsumesAttributeTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ConsumesAttributeTests.cs index 55112872e0..2367e857bc 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ConsumesAttributeTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ConsumesAttributeTests.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using System.Linq; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc.ActionConstraints; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Routing; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ContentResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ContentResultTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ContentResultTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/ContentResultTest.cs index 39e0fa0522..734077a260 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ContentResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ContentResultTest.cs @@ -14,7 +14,7 @@ using Microsoft.Net.Http.Headers; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class ContentResultTest { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtActionResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtActionResultTests.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtActionResultTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtActionResultTests.cs index 1c5a6567e9..9afcf36e87 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtActionResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtActionResultTests.cs @@ -16,7 +16,7 @@ using Microsoft.Framework.OptionsModel; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class CreatedAtActionResultTests { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtRouteResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtRouteResultTests.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtRouteResultTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtRouteResultTests.cs index 0cdab1c7f5..2e916a9bc3 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtRouteResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtRouteResultTests.cs @@ -16,7 +16,7 @@ using Microsoft.Framework.OptionsModel; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class CreatedAtRouteResultTests { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/CreatedResultTests.cs similarity index 98% rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedResultTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/CreatedResultTests.cs index e419734f41..3bcdfce42f 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/CreatedResultTests.cs @@ -14,7 +14,7 @@ using Microsoft.Framework.OptionsModel; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class CreatedResultTests { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/EmptyResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/EmptyResultTests.cs similarity index 94% rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/EmptyResultTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/EmptyResultTests.cs index 8516a2972c..5dc0c29f5e 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/EmptyResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/EmptyResultTests.cs @@ -7,7 +7,7 @@ using Microsoft.AspNet.Routing; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class EmptyResultTests { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/FileContentResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/FileContentResultTest.cs similarity index 98% rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/FileContentResultTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/FileContentResultTest.cs index bab042a258..dc75179395 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/FileContentResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/FileContentResultTest.cs @@ -10,7 +10,7 @@ using Microsoft.AspNet.Routing; using Microsoft.Net.Http.Headers; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class FileContentResultTest { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/FileResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/FileResultTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/FileResultTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/FileResultTest.cs index dbbfdbb941..454cbb4bfa 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/FileResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/FileResultTest.cs @@ -13,7 +13,7 @@ using Microsoft.Net.Http.Headers; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class FileResultTest { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/FileStreamResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/FileStreamResultTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/FileStreamResultTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/FileStreamResultTest.cs index b9c6f007f0..51ea825a69 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/FileStreamResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/FileStreamResultTest.cs @@ -14,7 +14,7 @@ using Microsoft.Net.Http.Headers; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class FileStreamResultTest { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/AuthorizeFilterTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/AuthorizeFilterTest.cs index d13cb4e00c..4a9e70ec83 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/AuthorizeFilterTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/AuthorizeFilterTest.cs @@ -8,8 +8,6 @@ using System.Threading.Tasks; using Microsoft.AspNet.Authorization; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Authentication; -using Microsoft.AspNet.Mvc.ActionResults; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; using Moq; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/FormatFilterTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/FormatFilterTest.cs index 0728686675..3f19f69118 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/FormatFilterTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/FormatFilterTest.cs @@ -1,22 +1,18 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc; +using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Routing; -using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.OptionsModel; using Microsoft.Net.Http.Headers; -using Xunit; -using Microsoft.AspNet.Mvc.Filters; -using Microsoft.AspNet.Mvc.Actions; -using Microsoft.AspNet.Mvc.ActionResults; - #if DNX451 using Moq; -using System.Net; #endif +using Xunit; + + namespace Microsoft.AspNet.Mvc.Formatters { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/StreamOutputFormatterTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/StreamOutputFormatterTest.cs index 9be7cb276f..53aeb48d3b 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/StreamOutputFormatterTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/StreamOutputFormatterTest.cs @@ -7,7 +7,6 @@ using System.Text; using System.Threading.Tasks; using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.Net.Http.Headers; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpNotFoundObjectResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpNotFoundObjectResultTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs index 6995367c54..fb75ea6034 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpNotFoundObjectResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs @@ -16,7 +16,7 @@ using Microsoft.Framework.OptionsModel; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class HttpNotFoundObjectResultTest { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpNotFoundResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/HttpNotFoundResultTests.cs similarity index 92% rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpNotFoundResultTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/HttpNotFoundResultTests.cs index d1c09d5229..05b7ecfdc3 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpNotFoundResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/HttpNotFoundResultTests.cs @@ -4,7 +4,7 @@ using Microsoft.AspNet.Http; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class HttpNotFoundResultTests { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpOkObjectResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkObjectResultTest.cs similarity index 98% rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpOkObjectResultTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/HttpOkObjectResultTest.cs index b34db7e514..145bc8adc0 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpOkObjectResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkObjectResultTest.cs @@ -15,7 +15,7 @@ using Microsoft.Framework.Logging.Testing; using Microsoft.Framework.OptionsModel; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class HttpOkObjectResultTest { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpOkResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkResultTest.cs similarity index 96% rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpOkResultTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/HttpOkResultTest.cs index a7044adf40..328259010b 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpOkResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkResultTest.cs @@ -8,7 +8,7 @@ using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Routing; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class HttpOkResultTest { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpStatusCodeResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/HttpStatusCodeResultTests.cs similarity index 95% rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpStatusCodeResultTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/HttpStatusCodeResultTests.cs index 36fd475ba1..664c486df3 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpStatusCodeResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/HttpStatusCodeResultTests.cs @@ -7,7 +7,7 @@ using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Routing; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class HttpStatusCodeResultTests { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpUnauthorizedResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/HttpUnauthorizedResultTests.cs similarity index 92% rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpUnauthorizedResultTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/HttpUnauthorizedResultTests.cs index 53e45b5425..8a3ad20f44 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpUnauthorizedResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/HttpUnauthorizedResultTests.cs @@ -4,7 +4,7 @@ using Microsoft.AspNet.Http; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class HttpUnauthorizedResultTests { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ObjectResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ObjectResultTests.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ObjectResultTests.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/ObjectResultTests.cs index 33bb20bc8c..8dd291ac7b 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ObjectResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ObjectResultTests.cs @@ -22,7 +22,7 @@ using Microsoft.Net.Http.Headers; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class ObjectResultTests { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/PhysicalFileProviderResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/PhysicalFileProviderResultTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/PhysicalFileProviderResultTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/PhysicalFileProviderResultTest.cs index f200153c7d..8ce871fe7d 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/PhysicalFileProviderResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/PhysicalFileProviderResultTest.cs @@ -13,7 +13,7 @@ using Microsoft.Net.Http.Headers; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class PhysicalFileProviderResultTest { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ProducesAttributeTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ProducesAttributeTests.cs index 78d1d43885..2b019a51cd 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ProducesAttributeTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ProducesAttributeTests.cs @@ -5,7 +5,6 @@ using System; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.Formatters; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/RedirectResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectResultTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/RedirectResultTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/RedirectResultTest.cs index c9a977a867..59a990b296 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/RedirectResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectResultTest.cs @@ -9,7 +9,7 @@ using Microsoft.Framework.DependencyInjection; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class RedirectResultTest { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/RedirectToActionResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToActionResultTest.cs similarity index 98% rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/RedirectToActionResultTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/RedirectToActionResultTest.cs index 6f96dc37f5..2d28f5cccd 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/RedirectToActionResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToActionResultTest.cs @@ -9,7 +9,7 @@ using Microsoft.AspNet.Testing; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class RedirectToActionResultTest { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/RedirectToRouteResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToRouteResultTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/RedirectToRouteResultTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/RedirectToRouteResultTest.cs index 00b34db834..d8820dd1a2 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/RedirectToRouteResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToRouteResultTest.cs @@ -13,7 +13,7 @@ using Microsoft.Framework.Internal; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class RedirectToRouteResultTest { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/RequireHttpsAttributeTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/RequireHttpsAttributeTests.cs index 203f54fcff..9513b492b5 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/RequireHttpsAttributeTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/RequireHttpsAttributeTests.cs @@ -5,8 +5,6 @@ using System.Collections.Generic; using System.Linq; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.ActionResults; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Routing; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/VirtualFileProviderResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/VirtualFileProviderResultTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/VirtualFileProviderResultTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/VirtualFileProviderResultTest.cs index 927dc3104a..0aa150caf6 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/VirtualFileProviderResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/VirtualFileProviderResultTest.cs @@ -16,7 +16,7 @@ using Microsoft.Net.Http.Headers; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class VirtualFileProviderResultTest { diff --git a/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/ActionResults/JsonResultTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonResultTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Formatters.Json.Test/ActionResults/JsonResultTest.cs rename to test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonResultTest.cs index fa031c35d9..a1bae95a29 100644 --- a/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/ActionResults/JsonResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonResultTest.cs @@ -15,7 +15,7 @@ using Microsoft.Net.Http.Headers; using Newtonsoft.Json; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class JsonResultTest { diff --git a/test/Microsoft.AspNet.Mvc.TestCommon/CommonFilterTest.cs b/test/Microsoft.AspNet.Mvc.TestCommon/CommonFilterTest.cs index b698b632b9..c3224c84b4 100644 --- a/test/Microsoft.AspNet.Mvc.TestCommon/CommonFilterTest.cs +++ b/test/Microsoft.AspNet.Mvc.TestCommon/CommonFilterTest.cs @@ -5,7 +5,6 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Routing; using Moq; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerTest.cs index a304e33ab2..e5cd12414c 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerTest.cs @@ -11,7 +11,6 @@ using System.Threading.Tasks; using Microsoft.AspNet.Hosting; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.ModelBinding; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs index b371c69827..11326dd314 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs @@ -7,7 +7,6 @@ using System.IO; using System.Text; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Routing; using Moq; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/PartialViewResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/PartialViewResultTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/PartialViewResultTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/PartialViewResultTest.cs index abccec3b7f..3d58a69519 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/PartialViewResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/PartialViewResultTest.cs @@ -15,7 +15,7 @@ using Microsoft.Net.Http.Headers; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class PartialViewResultTest { diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/TempData/SaveTempDataFilterTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/TempData/SaveTempDataFilterTest.cs index 4ac1a8dbb9..5932d5c98b 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/TempData/SaveTempDataFilterTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/TempData/SaveTempDataFilterTest.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.ActionResults; using Microsoft.AspNet.Mvc.Filters; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/ViewComponentResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/ViewComponentResultTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs index 442e8a7146..5c0eb8677d 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/ViewComponentResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs @@ -19,7 +19,7 @@ using Microsoft.Net.Http.Headers; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class ViewComponentResultTest { diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/ViewResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewResultTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/ViewResultTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewResultTest.cs index 066b17af74..857fd84386 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/ViewResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewResultTest.cs @@ -17,7 +17,7 @@ using Microsoft.Net.Http.Headers; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.ActionResults +namespace Microsoft.AspNet.Mvc { public class ViewResultTest { diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerTest.cs index 01c6cc778a..c73e10bf68 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerTest.cs @@ -9,7 +9,6 @@ using System.Text; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Routing; diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/BadRequestErrorMessageResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/BadRequestErrorMessageResultTest.cs similarity index 98% rename from test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/BadRequestErrorMessageResultTest.cs rename to test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/BadRequestErrorMessageResultTest.cs index 0b384040b1..f2c886b006 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/BadRequestErrorMessageResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/BadRequestErrorMessageResultTest.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Formatters; using Microsoft.AspNet.Routing; diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ConflictResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ConflictResultTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ConflictResultTest.cs rename to test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ConflictResultTest.cs diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ExceptionResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ExceptionResultTest.cs similarity index 98% rename from test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ExceptionResultTest.cs rename to test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ExceptionResultTest.cs index 5dcd987839..1d09f32e9a 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ExceptionResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ExceptionResultTest.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Formatters; using Microsoft.AspNet.Routing; diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs index 44b7657c79..5ca3bcc484 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpResponseExceptionActionFilterTest.cs @@ -7,7 +7,6 @@ using System.Net; using System.Net.Http; using System.Web.Http; using Microsoft.AspNet.Http.Internal; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Routing; diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InternalServerErrorResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InternalServerErrorResultTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InternalServerErrorResultTest.cs rename to test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InternalServerErrorResultTest.cs diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InvalidModelStateResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InvalidModelStateResultTest.cs similarity index 98% rename from test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InvalidModelStateResultTest.cs rename to test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InvalidModelStateResultTest.cs index f617f6e378..1b948a972a 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InvalidModelStateResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InvalidModelStateResultTest.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Formatters; using Microsoft.AspNet.Mvc.ModelBinding; diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/NegotiatedContentResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/NegotiatedContentResultTest.cs similarity index 98% rename from test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/NegotiatedContentResultTest.cs rename to test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/NegotiatedContentResultTest.cs index 8eb4b13d36..4d9ad8bcac 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/NegotiatedContentResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/NegotiatedContentResultTest.cs @@ -7,7 +7,6 @@ using System.Net; using System.Threading.Tasks; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Formatters; using Microsoft.AspNet.Routing; diff --git a/test/WebSites/ActionConstraintsWebSite/Controllers/ConsumesAttribute_OveridesBaseController.cs b/test/WebSites/ActionConstraintsWebSite/Controllers/ConsumesAttribute_OveridesBaseController.cs index 76f0655bf3..ca5889925b 100644 --- a/test/WebSites/ActionConstraintsWebSite/Controllers/ConsumesAttribute_OveridesBaseController.cs +++ b/test/WebSites/ActionConstraintsWebSite/Controllers/ConsumesAttribute_OveridesBaseController.cs @@ -2,7 +2,6 @@ // 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.ActionResults; namespace ActionConstraintsWebSite { diff --git a/test/WebSites/ActionConstraintsWebSite/Controllers/ConsumesAttribute_OveridesController.cs b/test/WebSites/ActionConstraintsWebSite/Controllers/ConsumesAttribute_OveridesController.cs index db74802593..ca06eca38f 100644 --- a/test/WebSites/ActionConstraintsWebSite/Controllers/ConsumesAttribute_OveridesController.cs +++ b/test/WebSites/ActionConstraintsWebSite/Controllers/ConsumesAttribute_OveridesController.cs @@ -2,7 +2,6 @@ // 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.ActionResults; namespace ActionConstraintsWebSite { diff --git a/test/WebSites/ActionResultsWebSite/Controllers/ActionResultsVerificationController.cs b/test/WebSites/ActionResultsWebSite/Controllers/ActionResultsVerificationController.cs index 2e38dca60e..0fde891c37 100644 --- a/test/WebSites/ActionResultsWebSite/Controllers/ActionResultsVerificationController.cs +++ b/test/WebSites/ActionResultsWebSite/Controllers/ActionResultsVerificationController.cs @@ -5,7 +5,6 @@ using System; using System.Text; using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; namespace ActionResultsWebSite { diff --git a/test/WebSites/ActionResultsWebSite/Controllers/HomeController.cs b/test/WebSites/ActionResultsWebSite/Controllers/HomeController.cs index 7c987901bf..5f3dbe6065 100644 --- a/test/WebSites/ActionResultsWebSite/Controllers/HomeController.cs +++ b/test/WebSites/ActionResultsWebSite/Controllers/HomeController.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; namespace ActionResultsWebSite { diff --git a/test/WebSites/ActionResultsWebSite/Controllers/XmlSerializerController.cs b/test/WebSites/ActionResultsWebSite/Controllers/XmlSerializerController.cs index 0cf3832733..43ccd38c00 100644 --- a/test/WebSites/ActionResultsWebSite/Controllers/XmlSerializerController.cs +++ b/test/WebSites/ActionResultsWebSite/Controllers/XmlSerializerController.cs @@ -2,7 +2,6 @@ // 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.ActionResults; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.Formatters; diff --git a/test/WebSites/ActivatorWebSite/Controllers/CannotBeActivatedController.cs b/test/WebSites/ActivatorWebSite/Controllers/CannotBeActivatedController.cs index 653d8c880d..a8d2413597 100644 --- a/test/WebSites/ActivatorWebSite/Controllers/CannotBeActivatedController.cs +++ b/test/WebSites/ActivatorWebSite/Controllers/CannotBeActivatedController.cs @@ -2,7 +2,6 @@ // 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.ActionResults; namespace ActivatorWebSite { diff --git a/test/WebSites/ActivatorWebSite/Controllers/PlainController.cs b/test/WebSites/ActivatorWebSite/Controllers/PlainController.cs index d381d782e5..4e91d1afc3 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.ActionResults; using Microsoft.AspNet.Mvc.Actions; namespace ActivatorWebSite diff --git a/test/WebSites/ActivatorWebSite/Controllers/RegularController.cs b/test/WebSites/ActivatorWebSite/Controllers/RegularController.cs index b559df3adf..621c454bd6 100644 --- a/test/WebSites/ActivatorWebSite/Controllers/RegularController.cs +++ b/test/WebSites/ActivatorWebSite/Controllers/RegularController.cs @@ -4,7 +4,6 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; namespace ActivatorWebSite { diff --git a/test/WebSites/ApiExplorerWebSite/ApiExplorerDataFilter.cs b/test/WebSites/ApiExplorerWebSite/ApiExplorerDataFilter.cs index dda90db1d9..245a9b61a7 100644 --- a/test/WebSites/ApiExplorerWebSite/ApiExplorerDataFilter.cs +++ b/test/WebSites/ApiExplorerWebSite/ApiExplorerDataFilter.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Mvc.ActionResults; +using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.ApiExplorer; using Microsoft.AspNet.Mvc.Filters; diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithAttributeController.cs b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithAttributeController.cs index b5052ed7ad..941cc17d21 100644 --- a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithAttributeController.cs +++ b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithAttributeController.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; namespace ApiExplorerWebSite { diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithoutAttributeController.cs b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithoutAttributeController.cs index 172d0f9538..2d084b9933 100644 --- a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithoutAttributeController.cs +++ b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithoutAttributeController.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; namespace ApiExplorerWebSite { diff --git a/test/WebSites/BasicWebSite/Controllers/Appointments.cs b/test/WebSites/BasicWebSite/Controllers/Appointments.cs index 4a1154da9b..14832f6b5c 100644 --- a/test/WebSites/BasicWebSite/Controllers/Appointments.cs +++ b/test/WebSites/BasicWebSite/Controllers/Appointments.cs @@ -2,7 +2,6 @@ // 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.ActionResults; namespace BasicWebSite.Controllers { diff --git a/test/WebSites/BasicWebSite/Controllers/HomeController.cs b/test/WebSites/BasicWebSite/Controllers/HomeController.cs index a7e53f823b..8f416e8e8c 100644 --- a/test/WebSites/BasicWebSite/Controllers/HomeController.cs +++ b/test/WebSites/BasicWebSite/Controllers/HomeController.cs @@ -5,7 +5,6 @@ using System.Threading.Tasks; using BasicWebSite.Models; using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Actions; namespace BasicWebSite.Controllers diff --git a/test/WebSites/BasicWebSite/Controllers/JsonResultController.cs b/test/WebSites/BasicWebSite/Controllers/JsonResultController.cs index c3bbb097d5..24b341b12d 100644 --- a/test/WebSites/BasicWebSite/Controllers/JsonResultController.cs +++ b/test/WebSites/BasicWebSite/Controllers/JsonResultController.cs @@ -2,7 +2,6 @@ // 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.ActionResults; using Microsoft.Net.Http.Headers; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; diff --git a/test/WebSites/CompositeViewEngineWebSite/HomeController.cs b/test/WebSites/CompositeViewEngineWebSite/HomeController.cs index 90184174a0..afa70bd3c6 100644 --- a/test/WebSites/CompositeViewEngineWebSite/HomeController.cs +++ b/test/WebSites/CompositeViewEngineWebSite/HomeController.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.ActionResults; +using Microsoft.AspNet.Mvc; namespace CompositeViewEngineWebSite { diff --git a/test/WebSites/ContentNegotiationWebSite/Controllers/FallbackOnTypeBasedMatchController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/FallbackOnTypeBasedMatchController.cs index e5bdbb478c..81f748de86 100644 --- a/test/WebSites/ContentNegotiationWebSite/Controllers/FallbackOnTypeBasedMatchController.cs +++ b/test/WebSites/ContentNegotiationWebSite/Controllers/FallbackOnTypeBasedMatchController.cs @@ -2,7 +2,6 @@ // 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.ActionResults; using Microsoft.AspNet.Mvc.Formatters; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.OptionsModel; diff --git a/test/WebSites/ContentNegotiationWebSite/Controllers/FormatFilterController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/FormatFilterController.cs index 394c77f6b6..31feab230d 100644 --- a/test/WebSites/ContentNegotiationWebSite/Controllers/FormatFilterController.cs +++ b/test/WebSites/ContentNegotiationWebSite/Controllers/FormatFilterController.cs @@ -2,7 +2,6 @@ // 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.ActionResults; using Microsoft.AspNet.Mvc.Filters; namespace ContentNegotiationWebSite diff --git a/test/WebSites/ContentNegotiationWebSite/Controllers/HomeController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/HomeController.cs index 5255259669..86b48894d3 100644 --- a/test/WebSites/ContentNegotiationWebSite/Controllers/HomeController.cs +++ b/test/WebSites/ContentNegotiationWebSite/Controllers/HomeController.cs @@ -2,7 +2,6 @@ // 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.ActionResults; namespace ContentNegotiationWebSite { diff --git a/test/WebSites/ContentNegotiationWebSite/Controllers/JsonResultController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/JsonResultController.cs index 51b44f24df..b26eedfeda 100644 --- a/test/WebSites/ContentNegotiationWebSite/Controllers/JsonResultController.cs +++ b/test/WebSites/ContentNegotiationWebSite/Controllers/JsonResultController.cs @@ -2,7 +2,6 @@ // 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.ActionResults; namespace ContentNegotiationWebSite { diff --git a/test/WebSites/ContentNegotiationWebSite/Controllers/NoContentDoNotTreatNullValueAsNoContentController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/NoContentDoNotTreatNullValueAsNoContentController.cs index f548a30125..c89a9cd40c 100644 --- a/test/WebSites/ContentNegotiationWebSite/Controllers/NoContentDoNotTreatNullValueAsNoContentController.cs +++ b/test/WebSites/ContentNegotiationWebSite/Controllers/NoContentDoNotTreatNullValueAsNoContentController.cs @@ -3,7 +3,6 @@ using System.Threading.Tasks; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.Formatters; diff --git a/test/WebSites/ContentNegotiationWebSite/Controllers/NoProducesContentOnClassController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/NoProducesContentOnClassController.cs index 838fd75cdf..954fd59924 100644 --- a/test/WebSites/ContentNegotiationWebSite/Controllers/NoProducesContentOnClassController.cs +++ b/test/WebSites/ContentNegotiationWebSite/Controllers/NoProducesContentOnClassController.cs @@ -2,7 +2,6 @@ // 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.ActionResults; using Microsoft.AspNet.Mvc.Filters; namespace ContentNegotiationWebSite diff --git a/test/WebSites/ContentNegotiationWebSite/Controllers/NormalController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/NormalController.cs index 72970e5e28..d274cd5383 100644 --- a/test/WebSites/ContentNegotiationWebSite/Controllers/NormalController.cs +++ b/test/WebSites/ContentNegotiationWebSite/Controllers/NormalController.cs @@ -2,7 +2,6 @@ // 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.ActionResults; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.Formatters; using Newtonsoft.Json; diff --git a/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesContentBaseController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesContentBaseController.cs index 44cfc382cc..1c88f279ad 100644 --- a/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesContentBaseController.cs +++ b/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesContentBaseController.cs @@ -2,7 +2,6 @@ // 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.ActionResults; using Microsoft.AspNet.Mvc.Filters; namespace ContentNegotiationWebSite diff --git a/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesContentOnClassController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesContentOnClassController.cs index 6617f2eb05..b73b761dd6 100644 --- a/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesContentOnClassController.cs +++ b/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesContentOnClassController.cs @@ -2,7 +2,6 @@ // 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.ActionResults; using Microsoft.AspNet.Mvc.Filters; namespace ContentNegotiationWebSite diff --git a/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesWithMediaTypeParametersController.cs b/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesWithMediaTypeParametersController.cs index 0906e7a169..b55e68a1a7 100644 --- a/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesWithMediaTypeParametersController.cs +++ b/test/WebSites/ContentNegotiationWebSite/Controllers/ProducesWithMediaTypeParametersController.cs @@ -3,7 +3,6 @@ using ContentNegotiationWebSite.Models; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Filters; namespace ContentNegotiationWebSite diff --git a/test/WebSites/ControllersFromServicesClassLibrary/ControllerWithConstructorInjection.cs b/test/WebSites/ControllersFromServicesClassLibrary/ControllerWithConstructorInjection.cs index eebd5a5240..ef63bb4d0c 100644 --- a/test/WebSites/ControllersFromServicesClassLibrary/ControllerWithConstructorInjection.cs +++ b/test/WebSites/ControllersFromServicesClassLibrary/ControllerWithConstructorInjection.cs @@ -3,8 +3,6 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; -using Microsoft.AspNet.Mvc.Actions; namespace ControllersFromServicesClassLibrary { diff --git a/test/WebSites/ControllersFromServicesClassLibrary/GenericController.cs b/test/WebSites/ControllersFromServicesClassLibrary/GenericController.cs index e37da7f9e4..9a06c8a5a2 100644 --- a/test/WebSites/ControllersFromServicesClassLibrary/GenericController.cs +++ b/test/WebSites/ControllersFromServicesClassLibrary/GenericController.cs @@ -2,7 +2,6 @@ // 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.ActionResults; namespace ControllersFromServicesClassLibrary { diff --git a/test/WebSites/ControllersFromServicesClassLibrary/NestedControllerOwner.cs b/test/WebSites/ControllersFromServicesClassLibrary/NestedControllerOwner.cs index ab9fa522e7..6a4ccfcd85 100644 --- a/test/WebSites/ControllersFromServicesClassLibrary/NestedControllerOwner.cs +++ b/test/WebSites/ControllersFromServicesClassLibrary/NestedControllerOwner.cs @@ -2,7 +2,6 @@ // 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.ActionResults; namespace ControllersFromServicesClassLibrary { diff --git a/test/WebSites/ControllersFromServicesClassLibrary/TimeScheduleController.cs b/test/WebSites/ControllersFromServicesClassLibrary/TimeScheduleController.cs index a83a38cb61..1c6e83099a 100644 --- a/test/WebSites/ControllersFromServicesClassLibrary/TimeScheduleController.cs +++ b/test/WebSites/ControllersFromServicesClassLibrary/TimeScheduleController.cs @@ -2,7 +2,6 @@ // 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.ActionResults; namespace ControllersFromServicesClassLibrary { diff --git a/test/WebSites/FilesWebSite/Controllers/EmbeddedFilesController.cs b/test/WebSites/FilesWebSite/Controllers/EmbeddedFilesController.cs index f08f432a47..7d2cc5ac68 100644 --- a/test/WebSites/FilesWebSite/Controllers/EmbeddedFilesController.cs +++ b/test/WebSites/FilesWebSite/Controllers/EmbeddedFilesController.cs @@ -4,7 +4,6 @@ using System.Reflection; using Microsoft.AspNet.FileProviders; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; namespace FilesWebSite { diff --git a/test/WebSites/FiltersWebSite/Controllers/ActionFilterController.cs b/test/WebSites/FiltersWebSite/Controllers/ActionFilterController.cs index 2a38057492..cfe3a27d6b 100644 --- a/test/WebSites/FiltersWebSite/Controllers/ActionFilterController.cs +++ b/test/WebSites/FiltersWebSite/Controllers/ActionFilterController.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Filters; namespace FiltersWebSite diff --git a/test/WebSites/FiltersWebSite/Controllers/DummyClassController.cs b/test/WebSites/FiltersWebSite/Controllers/DummyClassController.cs index aac014e507..efa9276d7f 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.ActionResults; using Microsoft.AspNet.Mvc.Actions; namespace FiltersWebSite diff --git a/test/WebSites/FiltersWebSite/Controllers/HomeController.cs b/test/WebSites/FiltersWebSite/Controllers/HomeController.cs index 1199e89320..108cb062d4 100644 --- a/test/WebSites/FiltersWebSite/Controllers/HomeController.cs +++ b/test/WebSites/FiltersWebSite/Controllers/HomeController.cs @@ -3,7 +3,6 @@ using System; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; namespace FiltersWebSite.Controllers { diff --git a/test/WebSites/FiltersWebSite/Controllers/ResourceFilterController.cs b/test/WebSites/FiltersWebSite/Controllers/ResourceFilterController.cs index 16ee0cef6d..0ee2308cf9 100644 --- a/test/WebSites/FiltersWebSite/Controllers/ResourceFilterController.cs +++ b/test/WebSites/FiltersWebSite/Controllers/ResourceFilterController.cs @@ -3,7 +3,6 @@ using System; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.Formatters; diff --git a/test/WebSites/FiltersWebSite/Filters/ChangeContentActionFilter.cs b/test/WebSites/FiltersWebSite/Filters/ChangeContentActionFilter.cs index 17a9ccc9cf..31a885bd81 100644 --- a/test/WebSites/FiltersWebSite/Filters/ChangeContentActionFilter.cs +++ b/test/WebSites/FiltersWebSite/Filters/ChangeContentActionFilter.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.ActionResults; +using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Filters; namespace FiltersWebSite diff --git a/test/WebSites/FiltersWebSite/Filters/ControllerActionFilter.cs b/test/WebSites/FiltersWebSite/Filters/ControllerActionFilter.cs index fe518a983d..b5decc9b50 100644 --- a/test/WebSites/FiltersWebSite/Filters/ControllerActionFilter.cs +++ b/test/WebSites/FiltersWebSite/Filters/ControllerActionFilter.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.ActionResults; +using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Filters; namespace FiltersWebSite diff --git a/test/WebSites/FiltersWebSite/Filters/GlobalActionFilter.cs b/test/WebSites/FiltersWebSite/Filters/GlobalActionFilter.cs index a8be87b7c8..ed798b76f3 100644 --- a/test/WebSites/FiltersWebSite/Filters/GlobalActionFilter.cs +++ b/test/WebSites/FiltersWebSite/Filters/GlobalActionFilter.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.ActionResults; +using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Filters; namespace FiltersWebSite diff --git a/test/WebSites/FiltersWebSite/Filters/ModifyResultsFilterAttribute.cs b/test/WebSites/FiltersWebSite/Filters/ModifyResultsFilterAttribute.cs index 1ab247f133..78f82c0619 100644 --- a/test/WebSites/FiltersWebSite/Filters/ModifyResultsFilterAttribute.cs +++ b/test/WebSites/FiltersWebSite/Filters/ModifyResultsFilterAttribute.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.ActionResults; +using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.Formatters; diff --git a/test/WebSites/FiltersWebSite/Filters/RandomNumberFilter.cs b/test/WebSites/FiltersWebSite/Filters/RandomNumberFilter.cs index ddcbac33a8..4cd83cbfa7 100644 --- a/test/WebSites/FiltersWebSite/Filters/RandomNumberFilter.cs +++ b/test/WebSites/FiltersWebSite/Filters/RandomNumberFilter.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.ActionResults; +using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Filters; using Microsoft.Net.Http.Headers; diff --git a/test/WebSites/FiltersWebSite/Filters/SerializationActionFilterAttribute.cs b/test/WebSites/FiltersWebSite/Filters/SerializationActionFilterAttribute.cs index e3341eb603..0ee8f493aa 100644 --- a/test/WebSites/FiltersWebSite/Filters/SerializationActionFilterAttribute.cs +++ b/test/WebSites/FiltersWebSite/Filters/SerializationActionFilterAttribute.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.ActionResults; +using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.Formatters; diff --git a/test/WebSites/FiltersWebSite/Filters/ShortCircuitActionFilter.cs b/test/WebSites/FiltersWebSite/Filters/ShortCircuitActionFilter.cs index 73bda3f434..54a27638e8 100644 --- a/test/WebSites/FiltersWebSite/Filters/ShortCircuitActionFilter.cs +++ b/test/WebSites/FiltersWebSite/Filters/ShortCircuitActionFilter.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.ActionResults; +using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Filters; using Microsoft.Net.Http.Headers; diff --git a/test/WebSites/FiltersWebSite/Filters/ShortCircuitResultFilter.cs b/test/WebSites/FiltersWebSite/Filters/ShortCircuitResultFilter.cs index 5ab81fe92c..5c595a875e 100644 --- a/test/WebSites/FiltersWebSite/Filters/ShortCircuitResultFilter.cs +++ b/test/WebSites/FiltersWebSite/Filters/ShortCircuitResultFilter.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.ActionResults; +using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Filters; namespace FiltersWebSite diff --git a/test/WebSites/FiltersWebSite/Helper/Helpers.cs b/test/WebSites/FiltersWebSite/Helper/Helpers.cs index 0c01ae49d0..897d5088f2 100644 --- a/test/WebSites/FiltersWebSite/Helper/Helpers.cs +++ b/test/WebSites/FiltersWebSite/Helper/Helpers.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.ActionResults; +using Microsoft.AspNet.Mvc; using Microsoft.Net.Http.Headers; namespace FiltersWebSite diff --git a/test/WebSites/FormatterWebSite/Controllers/DataContractSerializerController.cs b/test/WebSites/FormatterWebSite/Controllers/DataContractSerializerController.cs index 0349c1a5ce..6ed5d92681 100644 --- a/test/WebSites/FormatterWebSite/Controllers/DataContractSerializerController.cs +++ b/test/WebSites/FormatterWebSite/Controllers/DataContractSerializerController.cs @@ -2,7 +2,6 @@ // 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.ActionResults; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.Formatters; diff --git a/test/WebSites/FormatterWebSite/Controllers/InputFormatterController.cs b/test/WebSites/FormatterWebSite/Controllers/InputFormatterController.cs index 627ea0e1c3..27a9369524 100644 --- a/test/WebSites/FormatterWebSite/Controllers/InputFormatterController.cs +++ b/test/WebSites/FormatterWebSite/Controllers/InputFormatterController.cs @@ -4,7 +4,6 @@ using System.Linq; using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; namespace FormatterWebSite.Controllers { diff --git a/test/WebSites/FormatterWebSite/Controllers/JsonFormatterController.cs b/test/WebSites/FormatterWebSite/Controllers/JsonFormatterController.cs index 320869ab1f..55bc222b8d 100644 --- a/test/WebSites/FormatterWebSite/Controllers/JsonFormatterController.cs +++ b/test/WebSites/FormatterWebSite/Controllers/JsonFormatterController.cs @@ -3,7 +3,6 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Formatters; using Newtonsoft.Json; diff --git a/test/WebSites/FormatterWebSite/Controllers/RespectBrowserAcceptHeaderController.cs b/test/WebSites/FormatterWebSite/Controllers/RespectBrowserAcceptHeaderController.cs index 74d8308441..9beaa16b66 100644 --- a/test/WebSites/FormatterWebSite/Controllers/RespectBrowserAcceptHeaderController.cs +++ b/test/WebSites/FormatterWebSite/Controllers/RespectBrowserAcceptHeaderController.cs @@ -2,7 +2,6 @@ // 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.ActionResults; namespace FormatterWebSite.Controllers { diff --git a/test/WebSites/FormatterWebSite/Controllers/XmlSerializerController.cs b/test/WebSites/FormatterWebSite/Controllers/XmlSerializerController.cs index 89017d2d54..fd3b7050fb 100644 --- a/test/WebSites/FormatterWebSite/Controllers/XmlSerializerController.cs +++ b/test/WebSites/FormatterWebSite/Controllers/XmlSerializerController.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.Formatters; diff --git a/test/WebSites/FormatterWebSite/Filters/ModelStateValidationFilterAttribute.cs b/test/WebSites/FormatterWebSite/Filters/ModelStateValidationFilterAttribute.cs index 9eaea25c3a..435ca2734e 100644 --- a/test/WebSites/FormatterWebSite/Filters/ModelStateValidationFilterAttribute.cs +++ b/test/WebSites/FormatterWebSite/Filters/ModelStateValidationFilterAttribute.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.ActionResults; +using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Filters; namespace FormatterWebSite diff --git a/test/WebSites/FormatterWebSite/ValidateBodyParameterAttribute.cs b/test/WebSites/FormatterWebSite/ValidateBodyParameterAttribute.cs index f1ff618571..30cca23b9e 100644 --- a/test/WebSites/FormatterWebSite/ValidateBodyParameterAttribute.cs +++ b/test/WebSites/FormatterWebSite/ValidateBodyParameterAttribute.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.Linq; -using Microsoft.AspNet.Mvc.ActionResults; +using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.ModelBinding; diff --git a/test/WebSites/JsonPatchWebSite/Controllers/JsonPatchController.cs b/test/WebSites/JsonPatchWebSite/Controllers/JsonPatchController.cs index f8b48ccb56..c2cc1dab94 100644 --- a/test/WebSites/JsonPatchWebSite/Controllers/JsonPatchController.cs +++ b/test/WebSites/JsonPatchWebSite/Controllers/JsonPatchController.cs @@ -5,7 +5,6 @@ using System.Collections.Generic; using JsonPatchWebSite.Models; using Microsoft.AspNet.JsonPatch; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; namespace JsonPatchWebSite.Controllers { diff --git a/test/WebSites/ModelBindingWebSite/Controllers/TryUpdateModelController.cs b/test/WebSites/ModelBindingWebSite/Controllers/TryUpdateModelController.cs index 57edb4fde4..65f9687f62 100644 --- a/test/WebSites/ModelBindingWebSite/Controllers/TryUpdateModelController.cs +++ b/test/WebSites/ModelBindingWebSite/Controllers/TryUpdateModelController.cs @@ -9,7 +9,6 @@ using System.Threading.Tasks; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.Framework.Primitives; using ModelBindingWebSite.Models; diff --git a/test/WebSites/RazorWebSite/NestedViewImportsController.cs b/test/WebSites/RazorWebSite/NestedViewImportsController.cs index 16a7e18a60..e97392b247 100644 --- a/test/WebSites/RazorWebSite/NestedViewImportsController.cs +++ b/test/WebSites/RazorWebSite/NestedViewImportsController.cs @@ -2,7 +2,6 @@ // 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.ActionResults; namespace RazorWebSite.Controllers { diff --git a/test/WebSites/RequestServicesWebSite/RequestScopedFilter.cs b/test/WebSites/RequestServicesWebSite/RequestScopedFilter.cs index 086d47d830..d2b5d90be9 100644 --- a/test/WebSites/RequestServicesWebSite/RequestScopedFilter.cs +++ b/test/WebSites/RequestServicesWebSite/RequestScopedFilter.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.ActionResults; +using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Filters; namespace RequestServicesWebSite diff --git a/test/WebSites/RoutingWebSite/TestResponseGenerator.cs b/test/WebSites/RoutingWebSite/TestResponseGenerator.cs index ab4b28b710..12b5e030c9 100644 --- a/test/WebSites/RoutingWebSite/TestResponseGenerator.cs +++ b/test/WebSites/RoutingWebSite/TestResponseGenerator.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Linq; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Actions; using Microsoft.Framework.DependencyInjection; diff --git a/test/WebSites/VersioningWebSite/TestResponseGenerator.cs b/test/WebSites/VersioningWebSite/TestResponseGenerator.cs index 9b9cf980c6..b9b6b77075 100644 --- a/test/WebSites/VersioningWebSite/TestResponseGenerator.cs +++ b/test/WebSites/VersioningWebSite/TestResponseGenerator.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Linq; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Actions; using Microsoft.Framework.DependencyInjection; diff --git a/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs b/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs index 86d4dc93f4..2b7f2fcea4 100644 --- a/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs +++ b/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.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.ActionResults; +using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Filters; using Newtonsoft.Json; diff --git a/test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs b/test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs index 3f65a5ef9d..fb0d78b791 100644 --- a/test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs +++ b/test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs @@ -8,7 +8,6 @@ using System.Threading.Tasks; using System.Web.Http; using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.WebApiCompatShim; using Microsoft.Framework.OptionsModel; diff --git a/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpRequestMessage/HttpRequestMessageController.cs b/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpRequestMessage/HttpRequestMessageController.cs index d4d048bcfd..69d45d3b56 100644 --- a/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpRequestMessage/HttpRequestMessageController.cs +++ b/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpRequestMessage/HttpRequestMessageController.cs @@ -12,7 +12,6 @@ using System.Threading.Tasks; using System.Web.Http; using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; namespace WebApiCompatShimWebSite { diff --git a/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpResponseExceptionController.cs b/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpResponseExceptionController.cs index 39c81c4aa7..bc6eef930f 100644 --- a/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpResponseExceptionController.cs +++ b/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpResponseExceptionController.cs @@ -5,7 +5,6 @@ using System.Net; using System.Net.Http; using System.Web.Http; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.Filters; namespace WebApiCompatShimWebSite diff --git a/test/WebSites/XmlFormattersWebSite/Controllers/HomeController.cs b/test/WebSites/XmlFormattersWebSite/Controllers/HomeController.cs index 46efd87572..ea8ba7115e 100644 --- a/test/WebSites/XmlFormattersWebSite/Controllers/HomeController.cs +++ b/test/WebSites/XmlFormattersWebSite/Controllers/HomeController.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.ModelBinding; namespace XmlFormattersWebSite diff --git a/test/WebSites/XmlFormattersWebSite/Controllers/SerializableErrorController.cs b/test/WebSites/XmlFormattersWebSite/Controllers/SerializableErrorController.cs index 4ac7183315..d569271517 100644 --- a/test/WebSites/XmlFormattersWebSite/Controllers/SerializableErrorController.cs +++ b/test/WebSites/XmlFormattersWebSite/Controllers/SerializableErrorController.cs @@ -3,7 +3,6 @@ using System; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; using XmlFormattersWebSite.Models; namespace XmlFormattersWebSite.Controllers diff --git a/test/WebSites/XmlFormattersWebSite/Controllers/ValidationController.cs b/test/WebSites/XmlFormattersWebSite/Controllers/ValidationController.cs index 39df58e14b..188946c3b3 100644 --- a/test/WebSites/XmlFormattersWebSite/Controllers/ValidationController.cs +++ b/test/WebSites/XmlFormattersWebSite/Controllers/ValidationController.cs @@ -3,7 +3,6 @@ using System.Collections.Generic; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.ActionResults; using Microsoft.AspNet.Mvc.ModelBinding; namespace XmlFormattersWebSite