Move ActionResult classes back to main namespace

samples/MvcSample.Web/Controllers/JsonPatchController.cs

@@ -5,7 +5,6 @@
 using System.Linq;
 using Microsoft.AspNet.JsonPatch;
 using Microsoft.AspNet.Mvc;
-using Microsoft.AspNet.Mvc.ActionResults;
 
 namespace MvcSample.Web.Controllers
 {

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

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;
 

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;
 

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;

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

samples/MvcSample.Web/HomeController.cs

@@ -8,7 +8,6 @@
 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;
 

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;
 

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

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

@@ -7,7 +7,6 @@
 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;

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

@@ -7,7 +7,6 @@
 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;

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

@@ -8,7 +8,6 @@
 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;

src/Microsoft.AspNet.Mvc.Core/ActionResults/BadRequestObjectResult.cs → src/Microsoft.AspNet.Mvc.Core/BadRequestObjectResult.cs

@@ -5,7 +5,7 @@
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc.ActionResults
+namespace Microsoft.AspNet.Mvc
 {
     /// <summary>
     /// An <see cref="ObjectResult"/> that when executed will produce a Bad Request (400) response.

src/Microsoft.AspNet.Mvc.Core/ActionResults/BadRequestResult.cs → src/Microsoft.AspNet.Mvc.Core/BadRequestResult.cs

@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Mvc.ActionResults
+namespace Microsoft.AspNet.Mvc
 {
     /// <summary>
     /// A <see cref="HttpStatusCodeResult"/> that when

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

@@ -7,7 +7,7 @@
 using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc.ActionResults
+namespace Microsoft.AspNet.Mvc
 {
     public class ChallengeResult : ActionResult
     {

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

@@ -5,7 +5,6 @@
 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;

src/Microsoft.AspNet.Mvc.Core/ActionResults/ContentResult.cs → src/Microsoft.AspNet.Mvc.Core/ContentResult.cs

@@ -9,7 +9,7 @@
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc.ActionResults
+namespace Microsoft.AspNet.Mvc
 {
     public class ContentResult : ActionResult
     {

src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedAtActionResult.cs → src/Microsoft.AspNet.Mvc.Core/CreatedAtActionResult.cs

@@ -10,7 +10,7 @@
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc.ActionResults
+namespace Microsoft.AspNet.Mvc
 {
     /// <summary>
     /// An <see cref="ActionResult"/> that returns a Created (201) response with a Location header.

src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedAtRouteResult.cs → src/Microsoft.AspNet.Mvc.Core/CreatedAtRouteResult.cs

@@ -10,7 +10,7 @@
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc.ActionResults
+namespace Microsoft.AspNet.Mvc
 {
     /// <summary>
     /// An <see cref="ActionResult"/> that returns a Created (201) response with a Location header.

src/Microsoft.AspNet.Mvc.Core/ActionResults/CreatedResult.cs → src/Microsoft.AspNet.Mvc.Core/CreatedResult.cs

@@ -7,7 +7,7 @@
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc.ActionResults
+namespace Microsoft.AspNet.Mvc
 {
     /// <summary>
     /// An <see cref="ActionResult"/> that returns a Created (201) response with a Location header.

src/Microsoft.AspNet.Mvc.Core/ActionResults/EmptyResult.cs → 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
 {
     /// <summary>
     /// Represents an <see cref="ActionResult"/> that when executed will

src/Microsoft.AspNet.Mvc.Core/ActionResults/FileContentResult.cs → src/Microsoft.AspNet.Mvc.Core/FileContentResult.cs

@@ -9,7 +9,7 @@
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc.ActionResults
+namespace Microsoft.AspNet.Mvc
 {
     /// <summary>
     /// Represents an <see cref="ActionResult"/> that when executed will

src/Microsoft.AspNet.Mvc.Core/ActionResults/FileResult.cs → src/Microsoft.AspNet.Mvc.Core/FileResult.cs

@@ -8,7 +8,7 @@
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc.ActionResults
+namespace Microsoft.AspNet.Mvc
 {
     /// <summary>
     /// Represents an <see cref="ActionResult"/> that when executed will

src/Microsoft.AspNet.Mvc.Core/ActionResults/FileStreamResult.cs → src/Microsoft.AspNet.Mvc.Core/FileStreamResult.cs

@@ -10,7 +10,7 @@
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc.ActionResults
+namespace Microsoft.AspNet.Mvc
 {
     /// <summary>
     /// Represents an <see cref="ActionResult"/> that when executed will

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;
 

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

@@ -5,7 +5,6 @@
 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;
 

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;

src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpNotFoundObjectResult.cs → src/Microsoft.AspNet.Mvc.Core/HttpNotFoundObjectResult.cs

@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Mvc.ActionResults
+namespace Microsoft.AspNet.Mvc
 {
     /// <summary>
     /// An <see cref="ObjectResult"/> that when executed will produce a Not Found (404) response.

src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpNotFoundResult.cs → src/Microsoft.AspNet.Mvc.Core/HttpNotFoundResult.cs

@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Mvc.ActionResults
+namespace Microsoft.AspNet.Mvc
 {
     /// <summary>
     /// Represents an <see cref="HttpStatusCodeResult"/> that when

src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpOkObjectResult.cs → src/Microsoft.AspNet.Mvc.Core/HttpOkObjectResult.cs

@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Mvc.ActionResults
+namespace Microsoft.AspNet.Mvc
 {
     /// <summary>
     /// An <see cref="ObjectResult"/> that when executed performs content negotiation, formats the entity body, and

src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpOkResult.cs → src/Microsoft.AspNet.Mvc.Core/HttpOkResult.cs

@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Mvc.ActionResults
+namespace Microsoft.AspNet.Mvc
 {
     /// <summary>
     /// An <see cref="HttpStatusCodeResult"/> that when executed will produce an empty

src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpStatusCodeResult.cs → 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
 {
     /// <summary>
     /// Represents an <see cref="ActionResult"/> that when executed will

src/Microsoft.AspNet.Mvc.Core/ActionResults/HttpUnauthorizedResult.cs → src/Microsoft.AspNet.Mvc.Core/HttpUnauthorizedResult.cs

@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Mvc.ActionResults
+namespace Microsoft.AspNet.Mvc
 {
     /// <summary>
     /// Represents an <see cref="HttpUnauthorizedResult"/> that when

src/Microsoft.AspNet.Mvc.Core/ActionResults/IKeepTempDataResult.cs → 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
 {
     /// <summary>
     /// A marker interface for <see cref="IActionResult"/> types which need to have temp data saved.

src/Microsoft.AspNet.Mvc.Core/ActionResults/NoContentResult.cs → 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
     {

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

@@ -16,7 +16,7 @@
 using Microsoft.Framework.OptionsModel;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc.ActionResults
+namespace Microsoft.AspNet.Mvc
 {
     public class ObjectResult : ActionResult
     {

src/Microsoft.AspNet.Mvc.Core/ActionResults/PhysicalFileProviderResult.cs → src/Microsoft.AspNet.Mvc.Core/PhysicalFileProviderResult.cs

@@ -10,7 +10,7 @@
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc.ActionResults
+namespace Microsoft.AspNet.Mvc
 {
     /// <summary>
     /// A <see cref="FileResult"/> on execution will write a file from disk to the response

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;

src/Microsoft.AspNet.Mvc.Core/ActionResults/RedirectResult.cs → 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
     {

src/Microsoft.AspNet.Mvc.Core/ActionResults/RedirectToActionResult.cs → src/Microsoft.AspNet.Mvc.Core/RedirectToActionResult.cs

@@ -8,7 +8,7 @@
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc.ActionResults
+namespace Microsoft.AspNet.Mvc
 {
     public class RedirectToActionResult : ActionResult, IKeepTempDataResult
     {

src/Microsoft.AspNet.Mvc.Core/ActionResults/RedirectToRouteResult.cs → src/Microsoft.AspNet.Mvc.Core/RedirectToRouteResult.cs

@@ -8,7 +8,7 @@
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc.ActionResults
+namespace Microsoft.AspNet.Mvc
 {
     public class RedirectToRouteResult : ActionResult, IKeepTempDataResult
     {

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;
 

src/Microsoft.AspNet.Mvc.Core/ActionResults/UnsupportedMediaTypeResult.cs → src/Microsoft.AspNet.Mvc.Core/UnsupportedMediaTypeResult.cs

@@ -3,7 +3,7 @@
 
 using Microsoft.AspNet.Http;
 
-namespace Microsoft.AspNet.Mvc.ActionResults
+namespace Microsoft.AspNet.Mvc
 {
     /// <summary>
     /// A <see cref="HttpStatusCodeResult"/> that when

src/Microsoft.AspNet.Mvc.Core/ActionResults/VirtualFileProviderResult.cs → src/Microsoft.AspNet.Mvc.Core/VirtualFileProviderResult.cs

@@ -14,7 +14,7 @@
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;
 
-namespace Microsoft.AspNet.Mvc.ActionResults
+namespace Microsoft.AspNet.Mvc
 {
     /// <summary>
     /// A <see cref="FileResult" /> that on execution writes the file specified using a virtual path to the response

src/Microsoft.AspNet.Mvc.Cors/CorsAuthorizationFilter.cs

@@ -5,10 +5,8 @@
 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;