Move less-commonly used types out of .Rendering

Author: rynowak

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

@@ -4,8 +4,8 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;

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

@@ -6,6 +6,7 @@
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 using Microsoft.Net.Http.Headers;

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

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

src/Microsoft.AspNet.Mvc.Core/MvcCoreMvcOptionsSetup.cs renamed to src/Microsoft.AspNet.Mvc.Core/Internal/MvcCoreMvcOptionsSetup.cs

@@ -9,7 +9,7 @@
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Microsoft.Framework.OptionsModel;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// Sets up default options for <see cref="MvcOptions"/>.

src/Microsoft.AspNet.Mvc.Core/MvcCoreRouteOptionsSetup.cs renamed to src/Microsoft.AspNet.Mvc.Core/Internal/MvcCoreRouteOptionsSetup.cs

@@ -5,7 +5,7 @@
 using Microsoft.AspNet.Routing;
 using Microsoft.Framework.OptionsModel;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Internal
 {
     /// <summary>
     /// Sets up MVC default options for <see cref="RouteOptions"/>.

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

@@ -3,6 +3,8 @@
 
 using System;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Routing;
+using Microsoft.AspNet.Mvc.ViewFeatures;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 

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

@@ -5,6 +5,8 @@
 using System.Collections.Generic;
 using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Routing;
+using Microsoft.AspNet.Mvc.ViewFeatures;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 

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

@@ -3,8 +3,9 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Core;
+using Microsoft.AspNet.Mvc.Routing;
+using Microsoft.AspNet.Mvc.ViewFeatures;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 

src/Microsoft.AspNet.Mvc.Core/UrlActionContext.cs renamed to src/Microsoft.AspNet.Mvc.Core/Routing/UrlActionContext.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
+namespace Microsoft.AspNet.Mvc.Routing
 {
     /// <summary>
     /// Context object to be used for the URLs that <see cref="IUrlHelper.Action(UrlActionContext)"/> generates.

src/Microsoft.AspNet.Mvc.Core/UrlHelper.cs renamed to src/Microsoft.AspNet.Mvc.Core/Routing/UrlHelper.cs

@@ -9,7 +9,7 @@
 using Microsoft.AspNet.Routing;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Routing
 {
     /// <summary>
     /// An implementation of <see cref="IUrlHelper"/> that contains methods to

src/Microsoft.AspNet.Mvc.Core/UrlRouteContext.cs renamed to src/Microsoft.AspNet.Mvc.Core/Routing/UrlRouteContext.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
+namespace Microsoft.AspNet.Mvc.Routing
 {
     /// <summary>
     /// Context object to be used for the URLs that <see cref="IUrlHelper.RouteUrl(UrlRouteContext)"/> generates.

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

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

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

src/Microsoft.AspNet.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcCoreBuilderExtensions.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.DataAnnotations.Internal;
 using Microsoft.Framework.DependencyInjection.Extensions;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.OptionsModel;

src/Microsoft.AspNet.Mvc.DataAnnotations/MvcDataAnnotationsMvcOptionsSetup.cs renamed to src/Microsoft.AspNet.Mvc.DataAnnotations/Internal/MvcDataAnnotationsMvcOptionsSetup.cs

@@ -5,7 +5,7 @@
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Microsoft.Framework.OptionsModel;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.DataAnnotations.Internal
 {
     /// <summary>
     /// Sets up default options for <see cref="MvcOptions"/>.

src/Microsoft.AspNet.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcCoreBuilderExtensions.cs

@@ -3,6 +3,7 @@
 
 using System;
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Formatters.Json.Internal;
 using Microsoft.Framework.DependencyInjection.Extensions;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.OptionsModel;

src/Microsoft.AspNet.Mvc.Formatters.Json/MvcJsonMvcOptionsSetup.cs renamed to src/Microsoft.AspNet.Mvc.Formatters.Json/Internal/MvcJsonMvcOptionsSetup.cs

@@ -1,13 +1,12 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.Framework.OptionsModel;
 using Microsoft.Net.Http.Headers;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters.Json.Internal
 {
     public class MvcJsonMvcOptionsSetup : ConfigureOptions<MvcOptions>
     {

src/Microsoft.AspNet.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcBuilderExtensions.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Formatters.Xml.Internal;
 using Microsoft.Framework.DependencyInjection.Extensions;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.OptionsModel;

src/Microsoft.AspNet.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcCoreBuilderExtensions.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Mvc;
+using Microsoft.AspNet.Mvc.Formatters.Xml.Internal;
 using Microsoft.Framework.DependencyInjection.Extensions;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.OptionsModel;

src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcXmlDataContractSerializerMvcOptionsSetup.cs renamed to src/Microsoft.AspNet.Mvc.Formatters.Xml/Internal/MvcXmlDataContractSerializerMvcOptionsSetup.cs

@@ -1,11 +1,10 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.AspNet.Mvc.ModelBinding.Metadata;
 using Microsoft.Framework.OptionsModel;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters.Xml.Internal
 {
     /// <summary>
     /// A <see cref="ConfigureOptions{TOptions}"/> implementation which will add the

src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcXmlSerializerMvcOptionsSetup.cs renamed to src/Microsoft.AspNet.Mvc.Formatters.Xml/Internal/MvcXmlSerializerMvcOptionsSetup.cs

@@ -1,10 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNet.Mvc.Formatters;
 using Microsoft.Framework.OptionsModel;
 
-namespace Microsoft.AspNet.Mvc
+namespace Microsoft.AspNet.Mvc.Formatters.Xml.Internal
 {
     /// <summary>
     /// A <see cref="ConfigureOptions{TOptions}"/> implementation which will add the

src/Microsoft.AspNet.Mvc.Localization/ViewLocalizer.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using Microsoft.AspNet.Mvc.Rendering;
+using Microsoft.AspNet.Mvc.ViewFeatures.Internal;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.Localization;
 using Microsoft.Dnx.Runtime;

src/Microsoft.AspNet.Mvc.Razor/DefaultTagHelperActivator.cs

@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Reflection;
 using Microsoft.AspNet.Mvc.Rendering;
+using Microsoft.AspNet.Mvc.ViewFeatures;
 using Microsoft.AspNet.Razor.Runtime.TagHelpers;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;

src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs

@@ -7,6 +7,7 @@
 using Microsoft.AspNet.Mvc;
 using Microsoft.AspNet.Mvc.Razor;
 using Microsoft.AspNet.Mvc.Razor.Compilation;
+using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Razor.Runtime.TagHelpers;
 using Microsoft.Framework.DependencyInjection.Extensions;
 using Microsoft.Framework.Internal;
@@ -55,17 +56,17 @@ public static IMvcBuilder InitializeTagHelper<TTagHelper>(
             return builder;
         }
 
-        public static IMvcBuilder AddPrecompiledRazorViews(		
-            [NotNull] this IMvcBuilder builder,		
-            [NotNull] params Assembly[] assemblies)		
-        {		
-            builder.Services.Replace(		
-                ServiceDescriptor.Singleton<ICompilerCacheProvider>(serviceProvider =>		
-                    ActivatorUtilities.CreateInstance<PrecompiledViewsCompilerCacheProvider>(		
-                        serviceProvider,		
-                        assemblies.AsEnumerable())));		
-		
-            return builder;		
-        }		
+        public static IMvcBuilder AddPrecompiledRazorViews(
+            [NotNull] this IMvcBuilder builder,
+            [NotNull] params Assembly[] assemblies)
+        {
+            builder.Services.Replace(
+                ServiceDescriptor.Singleton<ICompilerCacheProvider>(serviceProvider =>
+                    ActivatorUtilities.CreateInstance<PrecompiledViewsCompilerCacheProvider>(
+                        serviceProvider,
+                        assemblies.AsEnumerable())));
+
+            return builder;
+        }
     }
 }

src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs

@@ -8,6 +8,8 @@
 using Microsoft.AspNet.Mvc.Razor;
 using Microsoft.AspNet.Mvc.Razor.Compilation;
 using Microsoft.AspNet.Mvc.Razor.Directives;
+using Microsoft.AspNet.Mvc.Razor.Internal;
+using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Razor.Runtime.TagHelpers;
 using Microsoft.Framework.Caching.Memory;
 using Microsoft.Framework.DependencyInjection.Extensions;

src/Microsoft.AspNet.Mvc.Razor/IRazorPage.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.PageExecutionInstrumentation;
 
 namespace Microsoft.AspNet.Mvc.Razor

src/Microsoft.AspNet.Mvc.Razor/IRazorPageActivator.cs

@@ -1,6 +1,8 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Microsoft.AspNet.Mvc.Rendering;
+
 namespace Microsoft.AspNet.Mvc.Razor
 {
     /// <summary>

src/Microsoft.AspNet.Mvc.Razor/IRazorViewEngine.cs

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

src/Microsoft.AspNet.Mvc.Razor/IRazorViewFactory.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.Rendering;
+using Microsoft.AspNet.Mvc.ViewEngines;
 using Microsoft.Framework.Internal;
 
 namespace Microsoft.AspNet.Mvc.Razor

src/Microsoft.AspNet.Mvc.Razor/ITagHelperActivator.cs

@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using Microsoft.AspNet.Mvc.Rendering;
 using Microsoft.AspNet.Razor.Runtime.TagHelpers;
 
 namespace Microsoft.AspNet.Mvc.Razor

src/Microsoft.AspNet.Mvc.Razor/MvcRazorMvcViewOptionsSetup.cs renamed to src/Microsoft.AspNet.Mvc.Razor/Internal/MvcRazorMvcViewOptionsSetup.cs

@@ -6,7 +6,7 @@
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.OptionsModel;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Internal
 {
     /// <summary>
     /// Configures <see cref="MvcViewOptions"/> to use <see cref="RazorViewEngine"/>.

src/Microsoft.AspNet.Mvc.Razor/RazorPage.cs

@@ -14,6 +14,7 @@
 using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Razor.Internal;
 using Microsoft.AspNet.Mvc.Rendering;
+using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.AspNet.Mvc.ViewFeatures;
 using Microsoft.AspNet.PageExecutionInstrumentation;
 using Microsoft.AspNet.Razor.Runtime.TagHelpers;

src/Microsoft.AspNet.Mvc.Razor/RazorPageActivator.cs

@@ -7,6 +7,8 @@
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Razor.Internal;
 using Microsoft.AspNet.Mvc.Rendering;
+using Microsoft.AspNet.Mvc.ViewFeatures;
+using Microsoft.AspNet.Mvc.ViewFeatures.Internal;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 

src/Microsoft.AspNet.Mvc.Razor/RazorPageOfT.cs

@@ -6,7 +6,7 @@
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Mvc.Razor.Internal;
 using Microsoft.AspNet.Mvc.Rendering;
-using Microsoft.AspNet.Mvc.Rendering.Expressions;
+using Microsoft.AspNet.Mvc.ViewFeatures;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 

src/Microsoft.AspNet.Mvc.Razor/RazorView.cs

@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http.Features;
 using Microsoft.AspNet.Mvc.Rendering;
+using Microsoft.AspNet.Mvc.ViewEngines;
 using Microsoft.AspNet.PageExecutionInstrumentation;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.WebEncoders;

src/Microsoft.AspNet.Mvc.Razor/RazorViewEngine.cs

@@ -8,6 +8,7 @@
 using System.Linq;
 using Microsoft.AspNet.Mvc.Actions;
 using Microsoft.AspNet.Mvc.Rendering;
+using Microsoft.AspNet.Mvc.ViewEngines;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.OptionsModel;
 

src/Microsoft.AspNet.Mvc.Razor/RazorViewFactory.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.Rendering;
+using Microsoft.AspNet.Mvc.ViewEngines;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.WebEncoders;
 

src/Microsoft.AspNet.Mvc.Razor/TagHelperInitializerOfT.cs

@@ -2,6 +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.Rendering;
 using Microsoft.AspNet.Razor.Runtime.TagHelpers;
 using Microsoft.Framework.Internal;
 

src/Microsoft.AspNet.Mvc.Razor/TagHelpers/UrlResolutionTagHelper.cs

@@ -6,6 +6,7 @@
 using System.ComponentModel;
 using System.Reflection;
 using Microsoft.AspNet.Mvc.Rendering;
+using Microsoft.AspNet.Mvc.Routing;
 using Microsoft.AspNet.Razor.Runtime.TagHelpers;
 using Microsoft.Framework.WebEncoders;
 

src/Microsoft.AspNet.Mvc.TagHelpers/AnchorTagHelper.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNet.Mvc.Rendering;
+using Microsoft.AspNet.Mvc.ViewFeatures;
 using Microsoft.AspNet.Razor.Runtime.TagHelpers;
 
 namespace Microsoft.AspNet.Mvc.TagHelpers

src/Microsoft.AspNet.Mvc.TagHelpers/CacheTagHelper.cs

@@ -8,6 +8,8 @@
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Mvc.Rendering;
+using Microsoft.AspNet.Mvc.ViewFeatures;
 using Microsoft.AspNet.Razor.Runtime.TagHelpers;
 using Microsoft.Framework.Caching.Memory;