From 538cd9c19121f8d3171cbfddd5d842cbb756df3e Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Wed, 16 Sep 2015 23:52:29 -0700 Subject: [PATCH] Move less-commonly used types out of .Rendering --- .../CreatedAtActionResult.cs | 2 +- .../CreatedAtRouteResult.cs | 1 + src/Microsoft.AspNet.Mvc.Core/IUrlHelper.cs | 1 + .../{ => Internal}/MvcCoreMvcOptionsSetup.cs | 2 +- .../MvcCoreRouteOptionsSetup.cs | 2 +- .../RedirectResult.cs | 2 ++ .../RedirectToActionResult.cs | 2 ++ .../RedirectToRouteResult.cs | 3 ++- .../{ => Routing}/UrlActionContext.cs | 2 +- .../{ => Routing}/UrlHelper.cs | 2 +- .../{ => Routing}/UrlRouteContext.cs | 2 +- .../UrlHelperExtensions.cs | 1 + .../{ => ViewFeatures}/IKeepTempDataResult.cs | 2 +- ...DataAnnotationsMvcCoreBuilderExtensions.cs | 1 + .../MvcDataAnnotationsMvcOptionsSetup.cs | 2 +- .../MvcJsonMvcCoreBuilderExtensions.cs | 1 + .../{ => Internal}/MvcJsonMvcOptionsSetup.cs | 3 +-- .../MvcXmlMvcBuilderExtensions.cs | 1 + .../MvcXmlMvcCoreBuilderExtensions.cs | 1 + ...mlDataContractSerializerMvcOptionsSetup.cs | 3 +-- .../MvcXmlSerializerMvcOptionsSetup.cs | 3 +-- .../ViewLocalizer.cs | 1 + .../DefaultTagHelperActivator.cs | 1 + .../MvcRazorMvcBuilderExtensions.cs | 25 ++++++++++--------- .../MvcRazorMvcCoreBuilderExtensions.cs | 2 ++ src/Microsoft.AspNet.Mvc.Razor/IRazorPage.cs | 1 + .../IRazorPageActivator.cs | 2 ++ .../IRazorViewEngine.cs | 3 +-- .../IRazorViewFactory.cs | 2 +- .../ITagHelperActivator.cs | 1 + .../MvcRazorMvcViewOptionsSetup.cs | 2 +- src/Microsoft.AspNet.Mvc.Razor/RazorPage.cs | 1 + .../RazorPageActivator.cs | 2 ++ .../RazorPageOfT.cs | 2 +- src/Microsoft.AspNet.Mvc.Razor/RazorView.cs | 1 + .../RazorViewEngine.cs | 1 + .../RazorViewFactory.cs | 2 +- .../TagHelperInitializerOfT.cs | 1 + .../TagHelpers/UrlResolutionTagHelper.cs | 1 + .../AnchorTagHelper.cs | 1 + .../CacheTagHelper.cs | 2 ++ .../FormTagHelper.cs | 1 + .../ImageTagHelper.cs | 3 +++ .../InputTagHelper.cs | 3 ++- .../LabelTagHelper.cs | 1 + .../LinkTagHelper.cs | 2 ++ .../OptionTagHelper.cs | 1 + .../{ => Rendering}/ValidationSummary.cs | 2 +- .../ScriptTagHelper.cs | 3 +++ .../SelectTagHelper.cs | 1 + .../TextAreaTagHelper.cs | 1 + .../ValidationMessageTagHelper.cs | 1 + .../ValidationSummaryTagHelper.cs | 1 + .../Controller.cs | 1 - ...MvcViewFeaturesMvcCoreBuilderExtensions.cs | 3 +++ .../HtmlAttributePropertyHelper.cs | 2 +- .../ICanHasViewContext.cs | 3 ++- .../{ => Internal}/MvcViewOptionsSetup.cs | 2 +- .../Internal/NullView.cs | 1 + .../TempDataMvcOptionsSetup.cs | 2 +- .../Html => Internal}/ValidationHelpers.cs | 2 +- .../MvcViewOptions.cs | 2 ++ .../PartialViewResult.cs | 4 +-- .../RemoteAttribute.cs | 1 + .../HtmlHelperDisplayNameExtensions.cs | 1 + .../Rendering/HtmlHelperEditorExtensions.cs | 1 + .../Rendering/HtmlHelperFormExtensions.cs | 1 + .../Rendering/HtmlHelperInputExtensions.cs | 1 + .../Rendering/HtmlHelperLabelExtensions.cs | 1 + .../Rendering/HtmlHelperLinkExtensions.cs | 1 + .../Rendering/HtmlHelperNameExtensions.cs | 1 + .../Rendering/HtmlHelperPartialExtensions.cs | 1 + .../Rendering/HtmlHelperSelectExtensions.cs | 1 + .../HtmlHelperValidationExtensions.cs | 1 + .../Rendering/HtmlHelperValueExtensions.cs | 1 + .../Rendering/IHtmlHelper.cs | 1 + .../Rendering/IHtmlHelperOfT.cs | 1 + .../Rendering/MultiSelectList.cs | 2 +- .../Rendering/MvcForm.cs | 1 + .../Rendering/{Html => }/TagBuilder.cs | 0 .../Rendering/{Html => }/TagRenderMode.cs | 0 .../ViewComponentHelperExtensions.cs | 3 ++- .../{ => Rendering}/ViewContext.cs | 6 ++--- .../ValidateAntiForgeryTokenAttribute.cs | 1 + .../ViewComponent.cs | 3 +++ .../ViewComponentResult.cs | 2 ++ .../DefaultViewComponentHelper.cs | 1 + .../ViewComponents/ViewComponentContext.cs | 2 ++ .../ViewComponents/ViewViewComponentResult.cs | 3 ++- .../CompositeViewEngine.cs | 3 +-- .../ICompositeViewEngine.cs | 2 +- .../ViewEngine => ViewEngines}/IView.cs | 3 ++- .../ViewEngine => ViewEngines}/IViewEngine.cs | 2 +- .../ViewEngineResult.cs | 2 +- .../CachedExpressionCompiler.cs | 2 +- .../DefaultDisplayTemplates.cs | 7 +++--- .../DefaultEditorTemplates.cs | 8 +++--- .../DefaultHtmlGenerator.cs | 7 +++--- .../DynamicViewData.cs | 2 +- .../ExpressionHelper.cs | 3 +-- .../ExpressionMetadataProvider.cs | 2 +- .../FormContext.cs | 2 +- .../Html => ViewFeatures}/HtmlHelper.cs | 8 +++--- .../Html => ViewFeatures}/HtmlHelperOfT.cs | 6 ++--- .../HtmlHelperOptions.cs | 4 ++- .../Html => ViewFeatures}/IHtmlGenerator.cs | 3 ++- .../ITempDataDictionary.cs | 2 +- .../ITempDataProvider.cs | 2 +- .../Html => ViewFeatures}/InputType.cs | 2 +- .../{Rendering => ViewFeatures}/JsonHelper.cs | 3 ++- .../ModelExpression.cs | 0 .../SaveTempDataAttribute.cs | 2 +- .../SaveTempDataFilter.cs | 2 +- .../SessionStateTempDataProvider.cs | 3 +-- .../StringCollectionTextWriter.cs | 3 +-- .../StringHtmlContent.cs | 2 +- .../TempDataDictionary.cs | 2 +- .../TemplateBuilder.cs | 4 ++- .../{ => ViewFeatures}/TemplateInfo.cs | 2 +- .../TemplateRenderer.cs | 5 ++-- .../TryGetValueDelegate.cs | 2 +- .../TryGetValueProvider.cs | 2 +- ...nobtrusiveValidationAttributesGenerator.cs | 2 +- ...dateAntiforgeryTokenAuthorizationFilter.cs | 2 +- .../ViewContextAttribute.cs | 2 +- .../{ => ViewFeatures}/ViewDataDictionary.cs | 4 +-- .../ViewDataDictionaryAttribute.cs | 2 +- ...taDictionaryControllerPropertyActivator.cs | 2 +- .../ViewDataDictionaryOfT.cs | 2 +- .../ViewDataEvaluator.cs | 2 +- .../ViewDataInfo.cs | 2 +- .../{ => ViewFeatures}/ViewExecutor.cs | 4 +-- .../ViewResult.cs | 6 +++-- .../ApiController.cs | 1 + .../CreatedAtActionResultTests.cs | 1 + ...pplicationModelConventionExtensionsTest.cs | 0 .../MvcBuilderExtensionsTest.cs | 0 .../MvcCoreServiceCollectionExtensionsTest.cs | 1 + .../RedirectResultTest.cs | 1 + .../RedirectToActionResultTest.cs | 1 + .../RedirectToRouteResultTest.cs | 1 + .../{ => Routing}/UrlHelperTest.cs | 2 +- .../TempDataTest.cs | 1 + .../TestMvcOptions.cs | 2 ++ .../ViewLocalizerTest.cs | 1 + .../InputTestTagHelper.cs | 2 +- .../MvcRazorParserTest.cs | 1 + .../DefaultTagHelperActivatorTest.cs | 2 ++ .../RazorPageActivatorTest.cs | 3 +++ .../RazorPageCreateModelExpressionTest.cs | 2 ++ .../RazorPageCreateTagHelperTest.cs | 2 ++ .../RazorPageTest.cs | 2 ++ .../RazorViewEngineTest.cs | 1 + .../RazorViewTest.cs | 4 ++- .../TagHelpers/UrlResolutionTagHelperTest.cs | 1 + .../AnchorTagHelperTest.cs | 2 ++ .../CacheTagHelperTest.cs | 2 ++ .../FormTagHelperTest.cs | 3 +++ .../ImageTagHelperTest.cs | 2 ++ .../InputTagHelperTest.cs | 3 ++- .../LabelTagHelperTest.cs | 2 +- .../LinkTagHelperTest.cs | 2 ++ .../ScriptTagHelperTest.cs | 2 ++ .../SelectTagHelperTest.cs | 1 + .../TestableHtmlGenerator.cs | 4 ++- .../TextAreaTagHelperTest.cs | 1 + .../ValidationMessageTagHelperTest.cs | 2 ++ .../ValidationSummaryTagHelperTest.cs | 2 ++ .../MvcServiceCollectionExtensionsTest.cs | 6 +++++ .../ControllerTest.cs | 1 + .../HtmlAttributePropertyHelperTest.cs | 2 +- .../TemplateRendererTest.cs | 2 +- .../MockMvcViewOptionsAccessor.cs | 17 ------------- .../PartialViewResultTest.cs | 2 +- .../RemoteAttributeTest.cs | 1 + .../Rendering/DefaultTemplatesUtilities.cs | 3 ++- .../Rendering/HtmlHelperCheckboxTest.cs | 1 + .../HtmlHelperDisplayNameExtensionsTest.cs | 3 +-- .../Rendering/HtmlHelperFormExtensionsTest.cs | 2 +- .../Rendering/HtmlHelperFormTest.cs | 2 ++ .../Rendering/HtmlHelperHiddenTest.cs | 1 + .../Rendering/HtmlHelperLinkGenerationTest.cs | 1 + .../HtmlHelperPartialExtensionsTest.cs | 1 + .../Rendering/HtmlHelperPasswordTest.cs | 1 + .../Rendering/HtmlHelperSelectTest.cs | 2 ++ .../Rendering/HtmlHelperTest.cs | 1 + .../Rendering/HtmlHelperValueTest.cs | 3 +-- .../Rendering/ViewContextTests.cs | 1 + .../ViewComponentTests.cs | 1 + .../ContentViewComponentResultTest.cs | 2 ++ .../JsonViewComponentResultTest.cs | 2 ++ .../ViewViewComponentResultTest.cs | 2 ++ .../CompositeViewEngineTest.cs | 24 +++++++++--------- .../DefaultDisplayTemplatesTest.cs | 3 ++- .../DefaultEditorTemplatesTest.cs | 6 ++--- .../DefaultHtmlGeneratorTest.cs | 7 +++--- .../ExpressionMetadataProviderTest.cs | 2 +- .../SaveTempDataFilterTest.cs | 2 +- .../SessionStateTempDataProviderTest.cs | 2 +- .../StringCollectionTextWriterTest.cs | 3 ++- .../StringHtmlContentTest.cs | 2 +- .../TempDataDictionaryTest.cs | 3 +-- .../ViewDataDictionaryOfTModelTest.cs | 2 +- .../ViewDataDictionaryTest.cs | 2 +- .../ViewDataOfTTest.cs | 2 +- .../{ => ViewFeatures}/ViewExecutorTest.cs | 3 ++- .../ViewResultTest.cs | 2 +- .../ActivatorWebSite/Services/ViewService.cs | 2 +- .../TagHelpers/FooterTagHelper.cs | 4 +-- .../TagHelpers/HiddenTagHelper.cs | 2 ++ .../TagHelpers/RepeatContentTagHelper.cs | 3 ++- .../TagHelpers/TitleTagHelper.cs | 3 ++- .../TestPartialView.cs | 2 +- .../CompositeViewEngineWebSite/TestView.cs | 2 +- .../TestViewEngine.cs | 2 +- .../ControllerWithConstructorInjection.cs | 1 + .../Controllers/RoundtripController.cs | 3 +++ .../RoutingWebSite/TestResponseGenerator.cs | 1 + .../TagHelpers/ATagHelper.cs | 1 + .../TagHelpers/PrettyTagHelper.cs | 3 ++- .../TagCloudViewComponentTagHelper.cs | 2 ++ .../Controllers/SimplePocoController.cs | 1 + .../UrlHelperWebSite/CustomUrlHelper.cs | 2 +- .../TestResponseGenerator.cs | 1 + 224 files changed, 341 insertions(+), 186 deletions(-) rename src/Microsoft.AspNet.Mvc.Core/{ => Internal}/MvcCoreMvcOptionsSetup.cs (98%) rename src/Microsoft.AspNet.Mvc.Core/{ => Internal}/MvcCoreRouteOptionsSetup.cs (95%) rename src/Microsoft.AspNet.Mvc.Core/{ => Routing}/UrlActionContext.cs (97%) rename src/Microsoft.AspNet.Mvc.Core/{ => Routing}/UrlHelper.cs (99%) rename src/Microsoft.AspNet.Mvc.Core/{ => Routing}/UrlRouteContext.cs (97%) rename src/Microsoft.AspNet.Mvc.Core/{ => ViewFeatures}/IKeepTempDataResult.cs (89%) rename src/Microsoft.AspNet.Mvc.DataAnnotations/{ => Internal}/MvcDataAnnotationsMvcOptionsSetup.cs (93%) rename src/Microsoft.AspNet.Mvc.Formatters.Json/{ => Internal}/MvcJsonMvcOptionsSetup.cs (94%) rename src/Microsoft.AspNet.Mvc.Formatters.Xml/{ => Internal}/MvcXmlDataContractSerializerMvcOptionsSetup.cs (95%) rename src/Microsoft.AspNet.Mvc.Formatters.Xml/{ => Internal}/MvcXmlSerializerMvcOptionsSetup.cs (94%) rename src/Microsoft.AspNet.Mvc.Razor/{ => Internal}/MvcRazorMvcViewOptionsSetup.cs (97%) rename src/Microsoft.AspNet.Mvc.TagHelpers/{ => Rendering}/ValidationSummary.cs (94%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering => Internal}/HtmlAttributePropertyHelper.cs (95%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering => Internal}/ICanHasViewContext.cs (78%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{ => Internal}/MvcViewOptionsSetup.cs (95%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{TempData => Internal}/TempDataMvcOptionsSetup.cs (92%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering/Html => Internal}/ValidationHelpers.cs (98%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/{Html => }/TagBuilder.cs (100%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/{Html => }/TagRenderMode.cs (100%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{ => Rendering}/ViewComponentHelperExtensions.cs (93%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{ => Rendering}/ViewContext.cs (98%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering/ViewEngine => ViewEngines}/CompositeViewEngine.cs (96%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering/ViewEngine => ViewEngines}/ICompositeViewEngine.cs (93%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering/ViewEngine => ViewEngines}/IView.cs (91%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering/ViewEngine => ViewEngines}/IViewEngine.cs (96%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering/ViewEngine => ViewEngines}/ViewEngineResult.cs (97%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering/Expressions => ViewFeatures}/CachedExpressionCompiler.cs (99%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering/Html => ViewFeatures}/DefaultDisplayTemplates.cs (98%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering/Html => ViewFeatures}/DefaultEditorTemplates.cs (98%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering/Html => ViewFeatures}/DefaultHtmlGenerator.cs (99%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering => ViewFeatures}/DynamicViewData.cs (97%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering/Expressions => ViewFeatures}/ExpressionHelper.cs (98%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering/Expressions => ViewFeatures}/ExpressionMetadataProvider.cs (99%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering => ViewFeatures}/FormContext.cs (96%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering/Html => ViewFeatures}/HtmlHelper.cs (99%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering/Html => ViewFeatures}/HtmlHelperOfT.cs (98%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering => ViewFeatures}/HtmlHelperOptions.cs (95%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering/Html => ViewFeatures}/IHtmlGenerator.cs (99%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{TempData => ViewFeatures}/ITempDataDictionary.cs (97%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{TempData => ViewFeatures}/ITempDataProvider.cs (95%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering/Html => ViewFeatures}/InputType.cs (86%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering => ViewFeatures}/JsonHelper.cs (95%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering => ViewFeatures}/ModelExpression.cs (100%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{TempData => ViewFeatures}/SaveTempDataAttribute.cs (94%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{TempData => ViewFeatures}/SaveTempDataFilter.cs (96%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{TempData => ViewFeatures}/SessionStateTempDataProvider.cs (99%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering => ViewFeatures}/StringCollectionTextWriter.cs (98%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering => ViewFeatures}/StringHtmlContent.cs (96%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{TempData => ViewFeatures}/TempDataDictionary.cs (99%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering/Internal => ViewFeatures}/TemplateBuilder.cs (96%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{ => ViewFeatures}/TemplateInfo.cs (98%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering/Internal => ViewFeatures}/TemplateRenderer.cs (98%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering/Expressions => ViewFeatures}/TryGetValueDelegate.cs (83%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering/Expressions => ViewFeatures}/TryGetValueProvider.cs (98%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering => ViewFeatures}/UnobtrusiveValidationAttributesGenerator.cs (98%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{ => ViewFeatures}/ValidateAntiforgeryTokenAuthorizationFilter.cs (94%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{ => ViewFeatures}/ViewContextAttribute.cs (92%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{ => ViewFeatures}/ViewDataDictionary.cs (99%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{ => ViewFeatures}/ViewDataDictionaryAttribute.cs (92%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{ => ViewFeatures}/ViewDataDictionaryControllerPropertyActivator.cs (98%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{ => ViewFeatures}/ViewDataDictionaryOfT.cs (98%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering/Expressions => ViewFeatures}/ViewDataEvaluator.cs (99%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{Rendering/Expressions => ViewFeatures}/ViewDataInfo.cs (97%) rename src/Microsoft.AspNet.Mvc.ViewFeatures/{ => ViewFeatures}/ViewExecutor.cs (97%) rename test/Microsoft.AspNet.Mvc.Core.Test/{DepenencyInjection => DependencyInjection}/ApplicationModelConventionExtensionsTest.cs (100%) rename test/Microsoft.AspNet.Mvc.Core.Test/{DepenencyInjection => DependencyInjection}/MvcBuilderExtensionsTest.cs (100%) rename test/Microsoft.AspNet.Mvc.Core.Test/{ => DependencyInjection}/MvcCoreServiceCollectionExtensionsTest.cs (99%) rename test/Microsoft.AspNet.Mvc.Core.Test/{ => Routing}/UrlHelperTest.cs (99%) rename test/Microsoft.AspNet.Mvc.ViewFeatures.Test/{Rendering => Internal}/HtmlAttributePropertyHelperTest.cs (98%) rename test/Microsoft.AspNet.Mvc.ViewFeatures.Test/{Rendering => Internal}/TemplateRendererTest.cs (98%) delete mode 100644 test/Microsoft.AspNet.Mvc.ViewFeatures.Test/MockMvcViewOptionsAccessor.cs rename test/Microsoft.AspNet.Mvc.ViewFeatures.Test/{Rendering/ViewEngine => ViewEngines}/CompositeViewEngineTest.cs (93%) rename test/Microsoft.AspNet.Mvc.ViewFeatures.Test/{Rendering => ViewFeatures}/DefaultDisplayTemplatesTest.cs (99%) rename test/Microsoft.AspNet.Mvc.ViewFeatures.Test/{Rendering => ViewFeatures}/DefaultEditorTemplatesTest.cs (99%) rename test/Microsoft.AspNet.Mvc.ViewFeatures.Test/{Rendering => ViewFeatures}/DefaultHtmlGeneratorTest.cs (99%) rename test/Microsoft.AspNet.Mvc.ViewFeatures.Test/{Rendering/Expression => ViewFeatures}/ExpressionMetadataProviderTest.cs (97%) rename test/Microsoft.AspNet.Mvc.ViewFeatures.Test/{TempData => ViewFeatures}/SaveTempDataFilterTest.cs (98%) rename test/Microsoft.AspNet.Mvc.ViewFeatures.Test/{TempData => ViewFeatures}/SessionStateTempDataProviderTest.cs (99%) rename test/Microsoft.AspNet.Mvc.ViewFeatures.Test/{Rendering => ViewFeatures}/StringCollectionTextWriterTest.cs (98%) rename test/Microsoft.AspNet.Mvc.ViewFeatures.Test/{Rendering => ViewFeatures}/StringHtmlContentTest.cs (94%) rename test/Microsoft.AspNet.Mvc.ViewFeatures.Test/{TempData => ViewFeatures}/TempDataDictionaryTest.cs (99%) rename test/Microsoft.AspNet.Mvc.ViewFeatures.Test/{ => ViewFeatures}/ViewDataDictionaryOfTModelTest.cs (99%) rename test/Microsoft.AspNet.Mvc.ViewFeatures.Test/{ => ViewFeatures}/ViewDataDictionaryTest.cs (99%) rename test/Microsoft.AspNet.Mvc.ViewFeatures.Test/{Rendering => ViewFeatures}/ViewDataOfTTest.cs (98%) rename test/Microsoft.AspNet.Mvc.ViewFeatures.Test/{ => ViewFeatures}/ViewExecutorTest.cs (98%) diff --git a/src/Microsoft.AspNet.Mvc.Core/CreatedAtActionResult.cs b/src/Microsoft.AspNet.Mvc.Core/CreatedAtActionResult.cs index 640e002a27..4ebf8d69e3 100644 --- a/src/Microsoft.AspNet.Mvc.Core/CreatedAtActionResult.cs +++ b/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; diff --git a/src/Microsoft.AspNet.Mvc.Core/CreatedAtRouteResult.cs b/src/Microsoft.AspNet.Mvc.Core/CreatedAtRouteResult.cs index ce06c3dba0..5a8c422c18 100644 --- a/src/Microsoft.AspNet.Mvc.Core/CreatedAtRouteResult.cs +++ b/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; diff --git a/src/Microsoft.AspNet.Mvc.Core/IUrlHelper.cs b/src/Microsoft.AspNet.Mvc.Core/IUrlHelper.cs index 6b85af47e3..3b79fca0f0 100644 --- a/src/Microsoft.AspNet.Mvc.Core/IUrlHelper.cs +++ b/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 diff --git a/src/Microsoft.AspNet.Mvc.Core/MvcCoreMvcOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.Core/Internal/MvcCoreMvcOptionsSetup.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Core/MvcCoreMvcOptionsSetup.cs rename to src/Microsoft.AspNet.Mvc.Core/Internal/MvcCoreMvcOptionsSetup.cs index 5d53d0358a..2a461e74c8 100644 --- a/src/Microsoft.AspNet.Mvc.Core/MvcCoreMvcOptionsSetup.cs +++ b/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 { /// /// Sets up default options for . diff --git a/src/Microsoft.AspNet.Mvc.Core/MvcCoreRouteOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.Core/Internal/MvcCoreRouteOptionsSetup.cs similarity index 95% rename from src/Microsoft.AspNet.Mvc.Core/MvcCoreRouteOptionsSetup.cs rename to src/Microsoft.AspNet.Mvc.Core/Internal/MvcCoreRouteOptionsSetup.cs index f2c5682920..c682280b95 100644 --- a/src/Microsoft.AspNet.Mvc.Core/MvcCoreRouteOptionsSetup.cs +++ b/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 { /// /// Sets up MVC default options for . diff --git a/src/Microsoft.AspNet.Mvc.Core/RedirectResult.cs b/src/Microsoft.AspNet.Mvc.Core/RedirectResult.cs index 53ece18a8b..9a15223ab5 100644 --- a/src/Microsoft.AspNet.Mvc.Core/RedirectResult.cs +++ b/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; diff --git a/src/Microsoft.AspNet.Mvc.Core/RedirectToActionResult.cs b/src/Microsoft.AspNet.Mvc.Core/RedirectToActionResult.cs index 98ddef1d76..85a7e07d17 100644 --- a/src/Microsoft.AspNet.Mvc.Core/RedirectToActionResult.cs +++ b/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; diff --git a/src/Microsoft.AspNet.Mvc.Core/RedirectToRouteResult.cs b/src/Microsoft.AspNet.Mvc.Core/RedirectToRouteResult.cs index d96e9a925a..4c4ebb3ea1 100644 --- a/src/Microsoft.AspNet.Mvc.Core/RedirectToRouteResult.cs +++ b/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; diff --git a/src/Microsoft.AspNet.Mvc.Core/UrlActionContext.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/UrlActionContext.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.Core/UrlActionContext.cs rename to src/Microsoft.AspNet.Mvc.Core/Routing/UrlActionContext.cs index e411147735..238205ef40 100644 --- a/src/Microsoft.AspNet.Mvc.Core/UrlActionContext.cs +++ b/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 { /// /// Context object to be used for the URLs that generates. diff --git a/src/Microsoft.AspNet.Mvc.Core/UrlHelper.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/UrlHelper.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Core/UrlHelper.cs rename to src/Microsoft.AspNet.Mvc.Core/Routing/UrlHelper.cs index cf6d23868e..a4e40175f8 100644 --- a/src/Microsoft.AspNet.Mvc.Core/UrlHelper.cs +++ b/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 { /// /// An implementation of that contains methods to diff --git a/src/Microsoft.AspNet.Mvc.Core/UrlRouteContext.cs b/src/Microsoft.AspNet.Mvc.Core/Routing/UrlRouteContext.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.Core/UrlRouteContext.cs rename to src/Microsoft.AspNet.Mvc.Core/Routing/UrlRouteContext.cs index e105662e63..8695aa93e2 100644 --- a/src/Microsoft.AspNet.Mvc.Core/UrlRouteContext.cs +++ b/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 { /// /// Context object to be used for the URLs that generates. diff --git a/src/Microsoft.AspNet.Mvc.Core/UrlHelperExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/UrlHelperExtensions.cs index f5e274f3bb..7507cc6307 100644 --- a/src/Microsoft.AspNet.Mvc.Core/UrlHelperExtensions.cs +++ b/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 diff --git a/src/Microsoft.AspNet.Mvc.Core/IKeepTempDataResult.cs b/src/Microsoft.AspNet.Mvc.Core/ViewFeatures/IKeepTempDataResult.cs similarity index 89% rename from src/Microsoft.AspNet.Mvc.Core/IKeepTempDataResult.cs rename to src/Microsoft.AspNet.Mvc.Core/ViewFeatures/IKeepTempDataResult.cs index 3b7f140e9f..99616ef3ed 100644 --- a/src/Microsoft.AspNet.Mvc.Core/IKeepTempDataResult.cs +++ b/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 { /// /// A marker interface for types which need to have temp data saved. diff --git a/src/Microsoft.AspNet.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcCoreBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcCoreBuilderExtensions.cs index 2268266648..74ee9708b8 100644 --- a/src/Microsoft.AspNet.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcCoreBuilderExtensions.cs +++ b/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; diff --git a/src/Microsoft.AspNet.Mvc.DataAnnotations/MvcDataAnnotationsMvcOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/Internal/MvcDataAnnotationsMvcOptionsSetup.cs similarity index 93% rename from src/Microsoft.AspNet.Mvc.DataAnnotations/MvcDataAnnotationsMvcOptionsSetup.cs rename to src/Microsoft.AspNet.Mvc.DataAnnotations/Internal/MvcDataAnnotationsMvcOptionsSetup.cs index ccbe7fdbca..473cba0b7b 100644 --- a/src/Microsoft.AspNet.Mvc.DataAnnotations/MvcDataAnnotationsMvcOptionsSetup.cs +++ b/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 { /// /// Sets up default options for . diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcCoreBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcCoreBuilderExtensions.cs index 20559ee388..418c165d0f 100644 --- a/src/Microsoft.AspNet.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcCoreBuilderExtensions.cs +++ b/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; diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Json/MvcJsonMvcOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.Formatters.Json/Internal/MvcJsonMvcOptionsSetup.cs similarity index 94% rename from src/Microsoft.AspNet.Mvc.Formatters.Json/MvcJsonMvcOptionsSetup.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Json/Internal/MvcJsonMvcOptionsSetup.cs index 8ea4b63c71..1a9202a0e8 100644 --- a/src/Microsoft.AspNet.Mvc.Formatters.Json/MvcJsonMvcOptionsSetup.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcBuilderExtensions.cs index ca90a97b7b..3bc260e7b4 100644 --- a/src/Microsoft.AspNet.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcBuilderExtensions.cs +++ b/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; diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcCoreBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcCoreBuilderExtensions.cs index d0670295aa..f022e52fb9 100644 --- a/src/Microsoft.AspNet.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcCoreBuilderExtensions.cs +++ b/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; diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcXmlDataContractSerializerMvcOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/Internal/MvcXmlDataContractSerializerMvcOptionsSetup.cs similarity index 95% rename from src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcXmlDataContractSerializerMvcOptionsSetup.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/Internal/MvcXmlDataContractSerializerMvcOptionsSetup.cs index 196348516d..3dd12d40dd 100644 --- a/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcXmlDataContractSerializerMvcOptionsSetup.cs +++ b/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 { /// /// A implementation which will add the diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcXmlSerializerMvcOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/Internal/MvcXmlSerializerMvcOptionsSetup.cs similarity index 94% rename from src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcXmlSerializerMvcOptionsSetup.cs rename to src/Microsoft.AspNet.Mvc.Formatters.Xml/Internal/MvcXmlSerializerMvcOptionsSetup.cs index 43b4861163..41f4f7e9e1 100644 --- a/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcXmlSerializerMvcOptionsSetup.cs +++ b/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 { /// /// A implementation which will add the diff --git a/src/Microsoft.AspNet.Mvc.Localization/ViewLocalizer.cs b/src/Microsoft.AspNet.Mvc.Localization/ViewLocalizer.cs index 9a5b47cd20..0b4447b73b 100644 --- a/src/Microsoft.AspNet.Mvc.Localization/ViewLocalizer.cs +++ b/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; diff --git a/src/Microsoft.AspNet.Mvc.Razor/DefaultTagHelperActivator.cs b/src/Microsoft.AspNet.Mvc.Razor/DefaultTagHelperActivator.cs index 4a41085893..0438c85126 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/DefaultTagHelperActivator.cs +++ b/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; diff --git a/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs index 30d524b255..07b56d8ffd 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs +++ b/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 class MvcRazorMvcBuilderExtensions return builder; } - public static IMvcBuilder AddPrecompiledRazorViews( - [NotNull] this IMvcBuilder builder, - [NotNull] params Assembly[] assemblies) - { - builder.Services.Replace( - ServiceDescriptor.Singleton(serviceProvider => - ActivatorUtilities.CreateInstance( - serviceProvider, - assemblies.AsEnumerable()))); - - return builder; - } + public static IMvcBuilder AddPrecompiledRazorViews( + [NotNull] this IMvcBuilder builder, + [NotNull] params Assembly[] assemblies) + { + builder.Services.Replace( + ServiceDescriptor.Singleton(serviceProvider => + ActivatorUtilities.CreateInstance( + serviceProvider, + assemblies.AsEnumerable()))); + + return builder; + } } } diff --git a/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs index 9f9a8ee036..409eeb293d 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs +++ b/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; diff --git a/src/Microsoft.AspNet.Mvc.Razor/IRazorPage.cs b/src/Microsoft.AspNet.Mvc.Razor/IRazorPage.cs index 7dfc42c1ff..5530185be3 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/IRazorPage.cs +++ b/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 diff --git a/src/Microsoft.AspNet.Mvc.Razor/IRazorPageActivator.cs b/src/Microsoft.AspNet.Mvc.Razor/IRazorPageActivator.cs index 457320e01b..11c30bfbf3 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/IRazorPageActivator.cs +++ b/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 { /// diff --git a/src/Microsoft.AspNet.Mvc.Razor/IRazorViewEngine.cs b/src/Microsoft.AspNet.Mvc.Razor/IRazorViewEngine.cs index dfa783eaf4..6a61b1844e 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/IRazorViewEngine.cs +++ b/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 { diff --git a/src/Microsoft.AspNet.Mvc.Razor/IRazorViewFactory.cs b/src/Microsoft.AspNet.Mvc.Razor/IRazorViewFactory.cs index ad01845920..8860b278bf 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/IRazorViewFactory.cs +++ b/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 diff --git a/src/Microsoft.AspNet.Mvc.Razor/ITagHelperActivator.cs b/src/Microsoft.AspNet.Mvc.Razor/ITagHelperActivator.cs index e007860330..d178038a93 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/ITagHelperActivator.cs +++ b/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 diff --git a/src/Microsoft.AspNet.Mvc.Razor/MvcRazorMvcViewOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.Razor/Internal/MvcRazorMvcViewOptionsSetup.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.Razor/MvcRazorMvcViewOptionsSetup.cs rename to src/Microsoft.AspNet.Mvc.Razor/Internal/MvcRazorMvcViewOptionsSetup.cs index f2b34755f2..ea32167cd4 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/MvcRazorMvcViewOptionsSetup.cs +++ b/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 { /// /// Configures to use . diff --git a/src/Microsoft.AspNet.Mvc.Razor/RazorPage.cs b/src/Microsoft.AspNet.Mvc.Razor/RazorPage.cs index 274a63bd0f..d5507a3ce4 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/RazorPage.cs +++ b/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; diff --git a/src/Microsoft.AspNet.Mvc.Razor/RazorPageActivator.cs b/src/Microsoft.AspNet.Mvc.Razor/RazorPageActivator.cs index 910662ca7c..d01b782fae 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/RazorPageActivator.cs +++ b/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; diff --git a/src/Microsoft.AspNet.Mvc.Razor/RazorPageOfT.cs b/src/Microsoft.AspNet.Mvc.Razor/RazorPageOfT.cs index 57b486cbd2..a313a65030 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/RazorPageOfT.cs +++ b/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; diff --git a/src/Microsoft.AspNet.Mvc.Razor/RazorView.cs b/src/Microsoft.AspNet.Mvc.Razor/RazorView.cs index c2a758371b..86bb79369d 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/RazorView.cs +++ b/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; diff --git a/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngine.cs b/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngine.cs index 0e9666e868..b07789c852 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngine.cs +++ b/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; diff --git a/src/Microsoft.AspNet.Mvc.Razor/RazorViewFactory.cs b/src/Microsoft.AspNet.Mvc.Razor/RazorViewFactory.cs index 6ac913d358..85b3acf259 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/RazorViewFactory.cs +++ b/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; diff --git a/src/Microsoft.AspNet.Mvc.Razor/TagHelperInitializerOfT.cs b/src/Microsoft.AspNet.Mvc.Razor/TagHelperInitializerOfT.cs index fdd8be24e8..b4f9c976ec 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/TagHelperInitializerOfT.cs +++ b/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; diff --git a/src/Microsoft.AspNet.Mvc.Razor/TagHelpers/UrlResolutionTagHelper.cs b/src/Microsoft.AspNet.Mvc.Razor/TagHelpers/UrlResolutionTagHelper.cs index 7f889026e9..9edbbdd850 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/TagHelpers/UrlResolutionTagHelper.cs +++ b/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; diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/AnchorTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/AnchorTagHelper.cs index ba9b30871c..5faecb31e6 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/AnchorTagHelper.cs +++ b/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 diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/CacheTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/CacheTagHelper.cs index 6b1d0b3879..b19cef1d13 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/CacheTagHelper.cs +++ b/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; diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/FormTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/FormTagHelper.cs index 5e97c78c8e..c69179368e 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/FormTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/FormTagHelper.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 diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/ImageTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/ImageTagHelper.cs index 3ddd0caa6a..8aaa959264 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/ImageTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/ImageTagHelper.cs @@ -3,7 +3,10 @@ using Microsoft.AspNet.Hosting; using Microsoft.AspNet.Mvc.Razor.TagHelpers; +using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Mvc.TagHelpers.Internal; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.Framework.Caching.Memory; using Microsoft.Framework.WebEncoders; diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs index d0f481304b..8e2068223e 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs @@ -7,7 +7,8 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; -using Microsoft.AspNet.Mvc.Rendering.Internal; +using Microsoft.AspNet.Mvc.ViewFeatures; +using Microsoft.AspNet.Mvc.ViewFeatures.Internal; using Microsoft.AspNet.Razor.Runtime.TagHelpers; namespace Microsoft.AspNet.Mvc.TagHelpers diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/LabelTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/LabelTagHelper.cs index a62e1ee5ee..9065ee97b6 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/LabelTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/LabelTagHelper.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; namespace Microsoft.AspNet.Mvc.TagHelpers diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs index a7350828b4..90ec5c70ae 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs @@ -8,7 +8,9 @@ using Microsoft.AspNet.Hosting; using Microsoft.AspNet.Mvc.Razor.TagHelpers; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Mvc.TagHelpers.Internal; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.Framework.Caching.Memory; using Microsoft.Framework.Logging; diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/OptionTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/OptionTagHelper.cs index 1578ac9583..fe94d8b7fb 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/OptionTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/OptionTagHelper.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; namespace Microsoft.AspNet.Mvc.TagHelpers diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationSummary.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/Rendering/ValidationSummary.cs similarity index 94% rename from src/Microsoft.AspNet.Mvc.TagHelpers/ValidationSummary.cs rename to src/Microsoft.AspNet.Mvc.TagHelpers/Rendering/ValidationSummary.cs index cac697c045..69470bdd3b 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationSummary.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/Rendering/ValidationSummary.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.Rendering { /// /// Acceptable validation summary rendering modes. diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/ScriptTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/ScriptTagHelper.cs index dc9a59d3c4..c6a5998a11 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/ScriptTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/ScriptTagHelper.cs @@ -6,7 +6,10 @@ using System.Linq; using Microsoft.AspNet.Hosting; using Microsoft.AspNet.Mvc.Razor.TagHelpers; +using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Mvc.TagHelpers.Internal; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.Framework.Caching.Memory; using Microsoft.Framework.Logging; diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/SelectTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/SelectTagHelper.cs index 8869242216..455002fb99 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/SelectTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/SelectTagHelper.cs @@ -8,6 +8,7 @@ using System.Reflection; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; namespace Microsoft.AspNet.Mvc.TagHelpers diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs index b9ac974d6d..cbafd721b3 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/TextAreaTagHelper.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.Rendering; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; namespace Microsoft.AspNet.Mvc.TagHelpers diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationMessageTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationMessageTagHelper.cs index 8875127b23..4d5b5ae0b6 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationMessageTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationMessageTagHelper.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; namespace Microsoft.AspNet.Mvc.TagHelpers diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationSummaryTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationSummaryTagHelper.cs index 40b7d0c055..f8f89fa642 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationSummaryTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/ValidationSummaryTagHelper.cs @@ -3,6 +3,7 @@ using System; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; namespace Microsoft.AspNet.Mvc.TagHelpers diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs index 1f7abe1374..3fce0d0ecc 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Controller.cs @@ -12,7 +12,6 @@ using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; -using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Routing; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs index b6981a4b6c..d22d8696b5 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs @@ -7,6 +7,9 @@ using Microsoft.AspNet.Mvc.Formatters; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewComponents; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; +using Microsoft.AspNet.Mvc.ViewFeatures.Internal; using Microsoft.Framework.DependencyInjection.Extensions; using Microsoft.Framework.Internal; using Microsoft.Framework.OptionsModel; diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlAttributePropertyHelper.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Internal/HtmlAttributePropertyHelper.cs similarity index 95% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlAttributePropertyHelper.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Internal/HtmlAttributePropertyHelper.cs index b208df50e1..acab018470 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlAttributePropertyHelper.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Internal/HtmlAttributePropertyHelper.cs @@ -6,7 +6,7 @@ using System.Reflection; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewFeatures.Internal { internal class HtmlAttributePropertyHelper : PropertyHelper { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ICanHasViewContext.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Internal/ICanHasViewContext.cs similarity index 78% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ICanHasViewContext.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Internal/ICanHasViewContext.cs index f1fd33625d..1194f77248 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ICanHasViewContext.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Internal/ICanHasViewContext.cs @@ -1,9 +1,10 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using Microsoft.AspNet.Mvc.Rendering; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewFeatures.Internal { public interface ICanHasViewContext { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/MvcViewOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Internal/MvcViewOptionsSetup.cs similarity index 95% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/MvcViewOptionsSetup.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Internal/MvcViewOptionsSetup.cs index b7b73d4bdd..559017105d 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/MvcViewOptionsSetup.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Internal/MvcViewOptionsSetup.cs @@ -4,7 +4,7 @@ using Microsoft.AspNet.Mvc.ModelBinding.Validation; using Microsoft.Framework.OptionsModel; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.ViewFeatures.Internal { /// /// Sets up default options for . diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Internal/NullView.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Internal/NullView.cs index 96fffa7b32..c1e17dffd4 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Internal/NullView.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Internal/NullView.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.ViewFeatures.Internal diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/TempDataMvcOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Internal/TempDataMvcOptionsSetup.cs similarity index 92% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/TempDataMvcOptionsSetup.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Internal/TempDataMvcOptionsSetup.cs index c5dd06394f..6c5422aff4 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/TempDataMvcOptionsSetup.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Internal/TempDataMvcOptionsSetup.cs @@ -3,7 +3,7 @@ using Microsoft.Framework.OptionsModel; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.ViewFeatures.Internal { /// /// Sets up default options for . diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/ValidationHelpers.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Internal/ValidationHelpers.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/ValidationHelpers.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Internal/ValidationHelpers.cs index ae76aef9b5..56dcfd4f37 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/ValidationHelpers.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Internal/ValidationHelpers.cs @@ -8,7 +8,7 @@ using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewFeatures.Internal { internal static class ValidationHelpers { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/MvcViewOptions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/MvcViewOptions.cs index e6e596d559..46aad3d935 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/MvcViewOptions.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/MvcViewOptions.cs @@ -4,6 +4,8 @@ using System.Collections.Generic; using Microsoft.AspNet.Mvc.ModelBinding.Validation; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/PartialViewResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/PartialViewResult.cs index da6a82d5e1..ac2db4ba75 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/PartialViewResult.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/PartialViewResult.cs @@ -3,13 +3,13 @@ using System; using System.Threading.Tasks; -using Microsoft.AspNet.Mvc.Rendering; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; using Microsoft.Framework.Logging; using Microsoft.Net.Http.Headers; using Microsoft.Framework.OptionsModel; -using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; namespace Microsoft.AspNet.Mvc { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/RemoteAttribute.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/RemoteAttribute.cs index 0121205903..c60045d121 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/RemoteAttribute.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/RemoteAttribute.cs @@ -12,6 +12,7 @@ using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; +using Microsoft.AspNet.Mvc.Routing; namespace Microsoft.AspNet.Mvc { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayNameExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayNameExtensions.cs index 10ec01b583..ae3d46cf19 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayNameExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayNameExtensions.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Linq.Expressions; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Rendering diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperEditorExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperEditorExtensions.cs index 75450fde83..c07c5d182e 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperEditorExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperEditorExtensions.cs @@ -4,6 +4,7 @@ using System; using System.Linq.Expressions; using Microsoft.AspNet.Html.Abstractions; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Rendering diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperFormExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperFormExtensions.cs index e5d4af6ea7..67e63d3823 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperFormExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperFormExtensions.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.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Rendering diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperInputExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperInputExtensions.cs index 4455fd8ddb..003461e40f 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperInputExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperInputExtensions.cs @@ -4,6 +4,7 @@ using System; using System.Linq.Expressions; using Microsoft.AspNet.Html.Abstractions; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Rendering diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperLabelExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperLabelExtensions.cs index 85baaa33d1..73ea26d187 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperLabelExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperLabelExtensions.cs @@ -4,6 +4,7 @@ using System; using System.Linq.Expressions; using Microsoft.AspNet.Html.Abstractions; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Rendering diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperLinkExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperLinkExtensions.cs index 1314c870e9..7e4187a407 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperLinkExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperLinkExtensions.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.Html.Abstractions; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Rendering diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperNameExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperNameExtensions.cs index 4acd2bccc3..072f41ad41 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperNameExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperNameExtensions.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.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Rendering diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperPartialExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperPartialExtensions.cs index 8161fc17e1..bf0dd3ada9 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperPartialExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperPartialExtensions.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Html.Abstractions; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Rendering diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperSelectExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperSelectExtensions.cs index 3a8fe1f79a..45603e6479 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperSelectExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperSelectExtensions.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Linq.Expressions; using Microsoft.AspNet.Html.Abstractions; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Rendering diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperValidationExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperValidationExtensions.cs index c68b3a0f7c..ac87d1237a 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperValidationExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperValidationExtensions.cs @@ -4,6 +4,7 @@ using System; using System.Linq.Expressions; using Microsoft.AspNet.Html.Abstractions; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Rendering diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperValueExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperValueExtensions.cs index 92f4e0e9cf..78446a32a5 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperValueExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperValueExtensions.cs @@ -3,6 +3,7 @@ using System; using System.Linq.Expressions; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Rendering diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/IHtmlHelper.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/IHtmlHelper.cs index 2f277efe89..603606f806 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/IHtmlHelper.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/IHtmlHelper.cs @@ -7,6 +7,7 @@ using Microsoft.AspNet.Html.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; using Microsoft.Framework.WebEncoders; diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/IHtmlHelperOfT.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/IHtmlHelperOfT.cs index fcea74ea8b..6ced83b465 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/IHtmlHelperOfT.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/IHtmlHelperOfT.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Linq.Expressions; using Microsoft.AspNet.Html.Abstractions; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Rendering diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/MultiSelectList.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/MultiSelectList.cs index 0064f5415d..d64e0bab7c 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/MultiSelectList.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/MultiSelectList.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; -using Microsoft.AspNet.Mvc.Rendering.Expressions; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Rendering diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/MvcForm.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/MvcForm.cs index 009962fadd..46b76893a9 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/MvcForm.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/MvcForm.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.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.Rendering diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/TagBuilder.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/TagBuilder.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/TagBuilder.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/TagBuilder.cs diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/TagRenderMode.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/TagRenderMode.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/TagRenderMode.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/TagRenderMode.cs diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponentHelperExtensions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewComponentHelperExtensions.cs similarity index 93% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponentHelperExtensions.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewComponentHelperExtensions.cs index 304ba52171..396cbc20e8 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponentHelperExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewComponentHelperExtensions.cs @@ -3,9 +3,10 @@ using System.Threading.Tasks; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewComponents; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.Rendering { public static class ViewComponentHelperExtensions { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewContext.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewContext.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/ViewContext.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewContext.cs index 251e161be8..a019774542 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewContext.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewContext.cs @@ -2,12 +2,12 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.IO; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; -using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.Rendering { /// /// Context for view execution. diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs index f531f70ef2..23cf475c17 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs @@ -4,6 +4,7 @@ using System; using Microsoft.AspNet.Antiforgery; using Microsoft.AspNet.Mvc.Filters; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.DependencyInjection; namespace Microsoft.AspNet.Mvc diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponent.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponent.cs index b7266e18ee..a6e2f918d5 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponent.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponent.cs @@ -5,7 +5,10 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Mvc.ViewComponents; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponentResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponentResult.cs index 63dc3b1911..c31f9e89bb 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponentResult.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponentResult.cs @@ -7,6 +7,8 @@ using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewComponents; +using Microsoft.AspNet.Mvc.ViewEngines; using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Mvc.ViewFeatures.Internal; using Microsoft.Framework.DependencyInjection; diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentHelper.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentHelper.cs index 334b8f9996..b67f77d312 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentHelper.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentHelper.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewFeatures; +using Microsoft.AspNet.Mvc.ViewFeatures.Internal; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.ViewComponents diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentContext.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentContext.cs index 664a47e7d7..9f780f58c2 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentContext.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewComponentContext.cs @@ -2,6 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.IO; +using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; namespace Microsoft.AspNet.Mvc.ViewComponents diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewViewComponentResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewViewComponentResult.cs index da3ff4aab4..b2d561826d 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewViewComponentResult.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/ViewViewComponentResult.cs @@ -4,8 +4,9 @@ using System; using System.Globalization; using System.Threading.Tasks; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/CompositeViewEngine.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewEngines/CompositeViewEngine.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/CompositeViewEngine.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewEngines/CompositeViewEngine.cs index 1467a38c67..0b97ba801c 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/CompositeViewEngine.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewEngines/CompositeViewEngine.cs @@ -3,11 +3,10 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.Framework.Internal; using Microsoft.Framework.OptionsModel; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewEngines { /// public class CompositeViewEngine : ICompositeViewEngine diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/ICompositeViewEngine.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewEngines/ICompositeViewEngine.cs similarity index 93% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/ICompositeViewEngine.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewEngines/ICompositeViewEngine.cs index ad8fddcc73..a5eceaed8c 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/ICompositeViewEngine.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewEngines/ICompositeViewEngine.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewEngines { /// /// Represents an that delegates to one of a collection of view engines. diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/IView.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewEngines/IView.cs similarity index 91% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/IView.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewEngines/IView.cs index 86cacef5db..f4acc9cab0 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/IView.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewEngines/IView.cs @@ -2,9 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; +using Microsoft.AspNet.Mvc.Rendering; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewEngines { /// /// Specifies the contract for a view. diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/IViewEngine.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewEngines/IViewEngine.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/IViewEngine.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewEngines/IViewEngine.cs index 8385e586e4..c8c76c6586 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/IViewEngine.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewEngines/IViewEngine.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Mvc.Actions; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewEngines { /// /// Defines the contract for a view engine. diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/ViewEngineResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewEngines/ViewEngineResult.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/ViewEngineResult.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewEngines/ViewEngineResult.cs index 796a8d314e..14d11ead56 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/ViewEngineResult.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewEngines/ViewEngineResult.cs @@ -6,7 +6,7 @@ using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewEngines { public class ViewEngineResult { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/CachedExpressionCompiler.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/CachedExpressionCompiler.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/CachedExpressionCompiler.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/CachedExpressionCompiler.cs index 31a6b9af6c..7604fc8e73 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/CachedExpressionCompiler.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/CachedExpressionCompiler.cs @@ -7,7 +7,7 @@ using System.Reflection; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Rendering.Expressions +namespace Microsoft.AspNet.Mvc.ViewFeatures { public static class CachedExpressionCompiler { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/DefaultDisplayTemplates.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultDisplayTemplates.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/DefaultDisplayTemplates.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultDisplayTemplates.cs index 942b14400c..ee655b1cd6 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/DefaultDisplayTemplates.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultDisplayTemplates.cs @@ -8,12 +8,13 @@ using System.Globalization; using Microsoft.AspNet.Html.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; -using Microsoft.AspNet.Mvc.Rendering.Internal; -using Microsoft.AspNet.Mvc.ViewFeatures; +using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures.Internal; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewFeatures { public static class DefaultDisplayTemplates { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/DefaultEditorTemplates.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultEditorTemplates.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/DefaultEditorTemplates.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultEditorTemplates.cs index 23533a0b81..cf64f34ddc 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/DefaultEditorTemplates.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultEditorTemplates.cs @@ -6,15 +6,15 @@ using System.Collections.Generic; using System.Diagnostics; using System.Globalization; -using System.Text; using Microsoft.AspNet.Html.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; -using Microsoft.AspNet.Mvc.Rendering.Internal; -using Microsoft.AspNet.Mvc.ViewFeatures; +using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures.Internal; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewFeatures { public static class DefaultEditorTemplates { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/DefaultHtmlGenerator.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/DefaultHtmlGenerator.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs index 27efd0fbc4..85c385d7a4 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/DefaultHtmlGenerator.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs @@ -12,13 +12,14 @@ using Microsoft.AspNet.Html.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; -using Microsoft.AspNet.Mvc.Rendering.Expressions; -using Microsoft.AspNet.Mvc.ViewFeatures; +using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.Routing; +using Microsoft.AspNet.Mvc.ViewFeatures.Internal; using Microsoft.Framework.Internal; using Microsoft.Framework.OptionsModel; using Microsoft.Framework.WebEncoders; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewFeatures { public class DefaultHtmlGenerator : IHtmlGenerator { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/DynamicViewData.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DynamicViewData.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/DynamicViewData.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DynamicViewData.cs index 69a2114e37..829efc17e3 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/DynamicViewData.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DynamicViewData.cs @@ -7,7 +7,7 @@ using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewFeatures { public class DynamicViewData : DynamicObject { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/ExpressionHelper.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ExpressionHelper.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/ExpressionHelper.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ExpressionHelper.cs index b27caa123b..8f027840a5 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/ExpressionHelper.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ExpressionHelper.cs @@ -7,10 +7,9 @@ using System.Linq; using System.Linq.Expressions; using System.Reflection; -using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Rendering.Expressions +namespace Microsoft.AspNet.Mvc.ViewFeatures { public static class ExpressionHelper { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/ExpressionMetadataProvider.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ExpressionMetadataProvider.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/ExpressionMetadataProvider.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ExpressionMetadataProvider.cs index 7fb31d3e58..0d0ed68a28 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/ExpressionMetadataProvider.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ExpressionMetadataProvider.cs @@ -9,7 +9,7 @@ using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Rendering.Expressions +namespace Microsoft.AspNet.Mvc.ViewFeatures { public static class ExpressionMetadataProvider { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/FormContext.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/FormContext.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/FormContext.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/FormContext.cs index 1e2b6fb678..eadaa6b80c 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/FormContext.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/FormContext.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewFeatures { public class FormContext { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/HtmlHelper.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/HtmlHelper.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/HtmlHelper.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/HtmlHelper.cs index f789f92332..619fc5b5d7 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/HtmlHelper.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/HtmlHelper.cs @@ -10,13 +10,13 @@ using Microsoft.AspNet.Html.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; -using Microsoft.AspNet.Mvc.Rendering.Expressions; -using Microsoft.AspNet.Mvc.Rendering.Internal; -using Microsoft.AspNet.Mvc.ViewFeatures; +using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures.Internal; using Microsoft.Framework.Internal; using Microsoft.Framework.WebEncoders; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewFeatures { /// /// Default implementation of . diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/HtmlHelperOfT.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOfT.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/HtmlHelperOfT.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOfT.cs index bec37c5cdd..87e112ce8a 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/HtmlHelperOfT.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOfT.cs @@ -6,12 +6,12 @@ using System.Linq.Expressions; using Microsoft.AspNet.Html.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; -using Microsoft.AspNet.Mvc.Rendering.Expressions; -using Microsoft.AspNet.Mvc.ViewFeatures; +using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; using Microsoft.Framework.Internal; using Microsoft.Framework.WebEncoders; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewFeatures { public class HtmlHelper : HtmlHelper, IHtmlHelper { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperOptions.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOptions.cs similarity index 95% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperOptions.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOptions.cs index 626e919107..fd393cd27b 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/HtmlHelperOptions.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOptions.cs @@ -1,7 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace Microsoft.AspNet.Mvc.Rendering +using Microsoft.AspNet.Mvc.Rendering; + +namespace Microsoft.AspNet.Mvc.ViewFeatures { /// /// Provides programmatic configuration for the HTML helpers and . diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/IHtmlGenerator.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/IHtmlGenerator.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/IHtmlGenerator.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/IHtmlGenerator.cs index 0209f893e3..c208feaba7 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/IHtmlGenerator.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/IHtmlGenerator.cs @@ -5,9 +5,10 @@ using Microsoft.AspNet.Html.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; +using Microsoft.AspNet.Mvc.Rendering; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewFeatures { /// /// Contract for a service supporting and ITagHelper implementations. diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/ITempDataDictionary.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ITempDataDictionary.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/ITempDataDictionary.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ITempDataDictionary.cs index 2513efa99b..bcc39d6133 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/ITempDataDictionary.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ITempDataDictionary.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.ViewFeatures { /// /// Represents a set of data that persists only from one request to the next. diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/ITempDataProvider.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ITempDataProvider.cs similarity index 95% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/ITempDataProvider.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ITempDataProvider.cs index 6df09719f4..c59ec18ae7 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/ITempDataProvider.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ITempDataProvider.cs @@ -5,7 +5,7 @@ using Microsoft.AspNet.Http; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.ViewFeatures { /// /// Defines the contract for temporary-data providers that store data that is viewed on the next request. diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/InputType.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/InputType.cs similarity index 86% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/InputType.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/InputType.cs index 932f2ee8e9..894a39d1de 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/InputType.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/InputType.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.Rendering +namespace Microsoft.AspNet.Mvc.ViewFeatures { public enum InputType { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/JsonHelper.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/JsonHelper.cs similarity index 95% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/JsonHelper.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/JsonHelper.cs index 7418f4e25d..8b7c21f15d 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/JsonHelper.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/JsonHelper.cs @@ -6,8 +6,9 @@ using Newtonsoft.Json; using Microsoft.Framework.Internal; using Microsoft.AspNet.Mvc.Formatters; +using Microsoft.AspNet.Mvc.Rendering; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewFeatures { /// /// Default implementation of . diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ModelExpression.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ModelExpression.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ModelExpression.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ModelExpression.cs diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/SaveTempDataAttribute.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/SaveTempDataAttribute.cs similarity index 94% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/SaveTempDataAttribute.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/SaveTempDataAttribute.cs index 35e0b02973..a8804dde59 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/SaveTempDataAttribute.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/SaveTempDataAttribute.cs @@ -5,7 +5,7 @@ using Microsoft.AspNet.Mvc.Filters; using Microsoft.Framework.DependencyInjection; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.ViewFeatures { /// /// Adds a filter which will save the for a request. diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/SaveTempDataFilter.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/SaveTempDataFilter.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/SaveTempDataFilter.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/SaveTempDataFilter.cs index a90e0f8365..c0fcf8f32e 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/SaveTempDataFilter.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/SaveTempDataFilter.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Mvc.Filters; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.ViewFeatures { /// /// A filter which saves temp data. diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/SessionStateTempDataProvider.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/SessionStateTempDataProvider.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/SessionStateTempDataProvider.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/SessionStateTempDataProvider.cs index 7eabbe2c8d..84cb891693 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/SessionStateTempDataProvider.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/SessionStateTempDataProvider.cs @@ -10,13 +10,12 @@ using System.Reflection; using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Features; -using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; using Newtonsoft.Json; using Newtonsoft.Json.Bson; using Newtonsoft.Json.Linq; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.ViewFeatures { /// /// Provides session-state data to the current object. diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/StringCollectionTextWriter.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/StringCollectionTextWriter.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/StringCollectionTextWriter.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/StringCollectionTextWriter.cs index 30eb6d26e0..9b5da8a748 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/StringCollectionTextWriter.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/StringCollectionTextWriter.cs @@ -10,9 +10,8 @@ using Microsoft.AspNet.Html.Abstractions; using Microsoft.Framework.Internal; using Microsoft.Framework.WebEncoders; -using Microsoft.AspNet.Mvc.ViewFeatures; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewFeatures { /// /// A that stores individual write operations as a sequence of diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/StringHtmlContent.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/StringHtmlContent.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/StringHtmlContent.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/StringHtmlContent.cs index 6b78985053..79743e8a6c 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/StringHtmlContent.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/StringHtmlContent.cs @@ -7,7 +7,7 @@ using Microsoft.Framework.Internal; using Microsoft.Framework.WebEncoders; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewFeatures { /// /// String content which gets encoded when written. diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/TempDataDictionary.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/TempDataDictionary.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/TempDataDictionary.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/TempDataDictionary.cs index 65364354be..81eac57f0a 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/TempData/TempDataDictionary.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/TempDataDictionary.cs @@ -7,7 +7,7 @@ using Microsoft.AspNet.Http; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.ViewFeatures { /// public class TempDataDictionary : ITempDataDictionary diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Internal/TemplateBuilder.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/TemplateBuilder.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Internal/TemplateBuilder.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/TemplateBuilder.cs index 44b00c1a4e..c6ff559009 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Internal/TemplateBuilder.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/TemplateBuilder.cs @@ -4,9 +4,11 @@ using System.Globalization; using Microsoft.AspNet.Html.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; +using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Rendering.Internal +namespace Microsoft.AspNet.Mvc.ViewFeatures.Internal { public class TemplateBuilder { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/TemplateInfo.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/TemplateInfo.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/TemplateInfo.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/TemplateInfo.cs index 5ca35ac09c..b2da019d53 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/TemplateInfo.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/TemplateInfo.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using Microsoft.AspNet.Mvc.ModelBinding; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.ViewFeatures { public class TemplateInfo { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Internal/TemplateRenderer.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/TemplateRenderer.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Internal/TemplateRenderer.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/TemplateRenderer.cs index 428a820e5f..d395dbb6ef 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Internal/TemplateRenderer.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/TemplateRenderer.cs @@ -9,11 +9,12 @@ using Microsoft.AspNet.Html.Abstractions; using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc.ModelBinding; -using Microsoft.AspNet.Mvc.ViewFeatures; +using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Rendering.Internal +namespace Microsoft.AspNet.Mvc.ViewFeatures.Internal { public class TemplateRenderer { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/TryGetValueDelegate.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/TryGetValueDelegate.cs similarity index 83% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/TryGetValueDelegate.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/TryGetValueDelegate.cs index 39bb808453..9d04b15988 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/TryGetValueDelegate.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/TryGetValueDelegate.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.Rendering.Expressions +namespace Microsoft.AspNet.Mvc.ViewFeatures { public delegate bool TryGetValueDelegate(object dictionary, string key, out object value); } diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/TryGetValueProvider.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/TryGetValueProvider.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/TryGetValueProvider.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/TryGetValueProvider.cs index c3ff41c503..3da731e25a 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/TryGetValueProvider.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/TryGetValueProvider.cs @@ -8,7 +8,7 @@ using System.Threading; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Rendering.Expressions +namespace Microsoft.AspNet.Mvc.ViewFeatures { public static class TryGetValueProvider { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/UnobtrusiveValidationAttributesGenerator.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/UnobtrusiveValidationAttributesGenerator.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/UnobtrusiveValidationAttributesGenerator.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/UnobtrusiveValidationAttributesGenerator.cs index 7580021fa2..304ba5fcdc 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/UnobtrusiveValidationAttributesGenerator.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/UnobtrusiveValidationAttributesGenerator.cs @@ -8,7 +8,7 @@ using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewFeatures { public static class UnobtrusiveValidationAttributesGenerator { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ValidateAntiforgeryTokenAuthorizationFilter.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ValidateAntiforgeryTokenAuthorizationFilter.cs similarity index 94% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/ValidateAntiforgeryTokenAuthorizationFilter.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ValidateAntiforgeryTokenAuthorizationFilter.cs index 8b81f0cf1a..07b7a98047 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ValidateAntiforgeryTokenAuthorizationFilter.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ValidateAntiforgeryTokenAuthorizationFilter.cs @@ -6,7 +6,7 @@ using Microsoft.AspNet.Mvc.Filters; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.ViewFeatures { public class ValidateAntiforgeryTokenAuthorizationFilter : IAsyncAuthorizationFilter { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewContextAttribute.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewContextAttribute.cs similarity index 92% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/ViewContextAttribute.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewContextAttribute.cs index 5685dd2e39..6e7fdf8e25 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewContextAttribute.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewContextAttribute.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.ViewFeatures { /// /// Specifies that a tag helper property should be set with the current diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionary.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionary.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs index 1a90f6701a..d21d3d486a 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionary.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs @@ -9,11 +9,9 @@ using System.Reflection; #endif using Microsoft.AspNet.Mvc.ModelBinding; -using Microsoft.AspNet.Mvc.Rendering.Expressions; -using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.ViewFeatures { public class ViewDataDictionary : IDictionary { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionaryAttribute.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryAttribute.cs similarity index 92% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionaryAttribute.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryAttribute.cs index bf0d6d2ce8..ba23382c12 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionaryAttribute.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryAttribute.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.ViewFeatures { /// /// Specifies that a controller property should be set with the current diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs index f6f08c3183..140a52ab86 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs @@ -7,7 +7,7 @@ using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.ViewFeatures { public class ViewDataDictionaryControllerPropertyActivator : IControllerPropertyActivator { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryOfT.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryOfT.cs index 51208d6c7b..2c60faacfb 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryOfT.cs @@ -4,7 +4,7 @@ using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.ViewFeatures { public class ViewDataDictionary : ViewDataDictionary { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/ViewDataEvaluator.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataEvaluator.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/ViewDataEvaluator.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataEvaluator.cs index 4f123cc7bf..696be3f1d5 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/ViewDataEvaluator.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataEvaluator.cs @@ -5,7 +5,7 @@ using System.Reflection; using Microsoft.Framework.Internal; -namespace Microsoft.AspNet.Mvc.Rendering.Expressions +namespace Microsoft.AspNet.Mvc.ViewFeatures { public static class ViewDataEvaluator { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/ViewDataInfo.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataInfo.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/ViewDataInfo.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataInfo.cs index b3a766efbb..7923046968 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Expressions/ViewDataInfo.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewDataInfo.cs @@ -4,7 +4,7 @@ using System; using System.Reflection; -namespace Microsoft.AspNet.Mvc.Rendering.Expressions +namespace Microsoft.AspNet.Mvc.ViewFeatures { public class ViewDataInfo { diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewExecutor.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewExecutor.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.ViewFeatures/ViewExecutor.cs rename to src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewExecutor.cs index affde70761..329df9f9b0 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewExecutor.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/ViewExecutor.cs @@ -3,12 +3,12 @@ using System.Text; using System.Threading.Tasks; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.ViewFeatures { /// /// Utility type for rendering a to the response. diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewResult.cs index cd89976ad0..656e08963a 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewResult.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewResult.cs @@ -2,14 +2,16 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using System.Diagnostics.Tracing; using System.Threading.Tasks; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Internal; using Microsoft.Framework.Logging; -using Microsoft.Net.Http.Headers; using Microsoft.Framework.OptionsModel; -using System.Diagnostics.Tracing; +using Microsoft.Net.Http.Headers; namespace Microsoft.AspNet.Mvc { diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ApiController.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ApiController.cs index 23dd358032..25da37e9a6 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ApiController.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/ApiController.cs @@ -10,6 +10,7 @@ using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; +using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Mvc.WebApiCompatShim; using Microsoft.Framework.Internal; using Microsoft.Net.Http.Headers; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtActionResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtActionResultTests.cs index 9afcf36e87..1d55fbed49 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtActionResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtActionResultTests.cs @@ -9,6 +9,7 @@ using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Formatters; +using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Routing; using Microsoft.AspNet.Testing; using Microsoft.Framework.Logging; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DepenencyInjection/ApplicationModelConventionExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/DependencyInjection/ApplicationModelConventionExtensionsTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Core.Test/DepenencyInjection/ApplicationModelConventionExtensionsTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/DependencyInjection/ApplicationModelConventionExtensionsTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DepenencyInjection/MvcBuilderExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/DependencyInjection/MvcBuilderExtensionsTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Core.Test/DepenencyInjection/MvcBuilderExtensionsTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/DependencyInjection/MvcBuilderExtensionsTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/MvcCoreServiceCollectionExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/DependencyInjection/MvcCoreServiceCollectionExtensionsTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Core.Test/MvcCoreServiceCollectionExtensionsTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/DependencyInjection/MvcCoreServiceCollectionExtensionsTest.cs index a8da9c5d65..845be10eed 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/MvcCoreServiceCollectionExtensionsTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/DependencyInjection/MvcCoreServiceCollectionExtensionsTest.cs @@ -9,6 +9,7 @@ using Microsoft.AspNet.Mvc.ApplicationModels; using Microsoft.AspNet.Mvc.Core; using Microsoft.AspNet.Mvc.Filters; +using Microsoft.AspNet.Mvc.Internal; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.DependencyInjection.Extensions; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/RedirectResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectResultTest.cs index 59a990b296..47615477d5 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/RedirectResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectResultTest.cs @@ -4,6 +4,7 @@ using System; using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; using Moq; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToActionResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToActionResultTest.cs index 2d28f5cccd..8e72180c45 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToActionResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToActionResultTest.cs @@ -4,6 +4,7 @@ using System; using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Routing; using Microsoft.AspNet.Testing; using Moq; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToRouteResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToRouteResultTest.cs index d8820dd1a2..9547885e83 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToRouteResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToRouteResultTest.cs @@ -7,6 +7,7 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Routing; using Microsoft.AspNet.Testing; using Microsoft.Framework.Internal; diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/UrlHelperTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs rename to test/Microsoft.AspNet.Mvc.Core.Test/Routing/UrlHelperTest.cs index 66b48a4d7d..3a38faae30 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/UrlHelperTest.cs @@ -16,7 +16,7 @@ using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.Routing { public class UrlHelperTest { diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/TempDataTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/TempDataTest.cs index 09f2cdc237..64ec8b1b83 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/TempDataTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/TempDataTest.cs @@ -7,6 +7,7 @@ using System.Net; using System.Net.Http; using System.Threading.Tasks; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Testing.xunit; using Microsoft.Net.Http.Headers; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/TestMvcOptions.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/TestMvcOptions.cs index 1d0ebf4d22..ffef0a475b 100644 --- a/test/Microsoft.AspNet.Mvc.IntegrationTests/TestMvcOptions.cs +++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/TestMvcOptions.cs @@ -2,6 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using Microsoft.AspNet.Mvc.DataAnnotations.Internal; +using Microsoft.AspNet.Mvc.Formatters.Json.Internal; using Microsoft.AspNet.Mvc.Internal; using Microsoft.Framework.OptionsModel; diff --git a/test/Microsoft.AspNet.Mvc.Localization.Test/ViewLocalizerTest.cs b/test/Microsoft.AspNet.Mvc.Localization.Test/ViewLocalizerTest.cs index ef6d4b0f5a..d7f2e5f3ea 100644 --- a/test/Microsoft.AspNet.Mvc.Localization.Test/ViewLocalizerTest.cs +++ b/test/Microsoft.AspNet.Mvc.Localization.Test/ViewLocalizerTest.cs @@ -8,6 +8,7 @@ using Microsoft.Framework.WebEncoders.Testing; using Moq; using Xunit; +using Microsoft.AspNet.Mvc.ViewEngines; namespace Microsoft.AspNet.Mvc.Localization.Test { diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/InputTestTagHelper.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/InputTestTagHelper.cs index 7b41ed88ad..ff6bf8986b 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/InputTestTagHelper.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/InputTestTagHelper.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.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; namespace Microsoft.AspNet.Mvc.Razor diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorParserTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorParserTest.cs index 19b6e3bdf6..6780aad5bd 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorParserTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorParserTest.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; using Microsoft.AspNet.Razor.Chunks; using Microsoft.AspNet.Razor.Parser; diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/DefaultTagHelperActivatorTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/DefaultTagHelperActivatorTest.cs index a1cfeb7add..20a80576dc 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/DefaultTagHelperActivatorTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/DefaultTagHelperActivatorTest.cs @@ -9,6 +9,8 @@ using Microsoft.AspNet.Mvc.Internal; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageActivatorTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageActivatorTest.cs index 38b29b0c28..de6f340550 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageActivatorTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageActivatorTest.cs @@ -10,6 +10,9 @@ using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Razor.Internal; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; +using Microsoft.AspNet.Mvc.ViewFeatures.Internal; using Microsoft.AspNet.Routing; using Microsoft.Framework.WebEncoders; using Microsoft.Framework.WebEncoders.Testing; diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs index 0e94bc4649..951bef36ee 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs @@ -9,6 +9,8 @@ using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Routing; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs index a52aa4fd90..c855dbc441 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs @@ -10,6 +10,8 @@ using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.AspNet.Routing; using Moq; diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageTest.cs index 1ff23da79f..c2bc586d16 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageTest.cs @@ -10,6 +10,8 @@ using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.TestCommon; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.PageExecutionInstrumentation; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.AspNet.Testing; diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs index b06d1104ea..0c1cdee844 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs @@ -7,6 +7,7 @@ using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.Routing; +using Microsoft.AspNet.Mvc.ViewEngines; using Microsoft.AspNet.Routing; using Microsoft.AspNet.Testing; using Microsoft.Framework.OptionsModel; diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewTest.cs index 3606c509bb..ba6a39ca9a 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewTest.cs @@ -9,6 +9,8 @@ using Microsoft.AspNet.Http.Features; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc.ModelBinding; +using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.PageExecutionInstrumentation; using Microsoft.Framework.WebEncoders.Testing; using Moq; @@ -1462,7 +1464,7 @@ private static ViewContext CreateViewContext(RazorView view) new ViewDataDictionary(new EmptyModelMetadataProvider()), Mock.Of(), new StringWriter(), - new Rendering.HtmlHelperOptions()); + new HtmlHelperOptions()); } private static IViewStartProvider CreateViewStartProvider(params IRazorPage[] viewStartPages) diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/TagHelpers/UrlResolutionTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/TagHelpers/UrlResolutionTagHelperTest.cs index 346db8856e..023347e9db 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/TagHelpers/UrlResolutionTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/TagHelpers/UrlResolutionTagHelperTest.cs @@ -4,6 +4,7 @@ using System; using System.Reflection; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.Framework.WebEncoders; using Moq; diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/AnchorTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/AnchorTagHelperTest.cs index d518a7962a..641793759d 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/AnchorTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/AnchorTagHelperTest.cs @@ -7,6 +7,8 @@ using System.Threading.Tasks; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.Routing; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.Framework.WebEncoders.Testing; using Moq; diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/CacheTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/CacheTagHelperTest.cs index 62943f4d7d..ab6b1a15fe 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/CacheTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/CacheTagHelperTest.cs @@ -14,6 +14,8 @@ using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.AspNet.Routing; using Microsoft.Framework.Caching; diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/FormTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/FormTagHelperTest.cs index 2c03948c3d..8299ba691c 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/FormTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/FormTagHelperTest.cs @@ -10,7 +10,10 @@ using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Mvc.TestCommon; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.AspNet.Routing; using Microsoft.Framework.WebEncoders.Testing; diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ImageTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ImageTagHelperTest.cs index c7716056dd..df6aba60f0 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ImageTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ImageTagHelperTest.cs @@ -13,6 +13,8 @@ using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.AspNet.Routing; using Microsoft.AspNet.Testing.xunit; diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/InputTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/InputTagHelperTest.cs index f8825653e6..afa33dcfe8 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/InputTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/InputTagHelperTest.cs @@ -9,8 +9,9 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; -using Microsoft.AspNet.Mvc.Rendering.Internal; using Microsoft.AspNet.Mvc.TestCommon; +using Microsoft.AspNet.Mvc.ViewFeatures; +using Microsoft.AspNet.Mvc.ViewFeatures.Internal; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LabelTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LabelTagHelperTest.cs index 974e15b5b9..ed19fbdc34 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LabelTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LabelTagHelperTest.cs @@ -6,8 +6,8 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Mvc.ModelBinding; -using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.TestCommon; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LinkTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LinkTagHelperTest.cs index 29c914aa22..4e0f261f8d 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LinkTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LinkTagHelperTest.cs @@ -14,6 +14,8 @@ using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.TagHelpers.Internal; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.AspNet.Routing; using Microsoft.AspNet.Testing.xunit; diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs index cf82fc5fb6..06ec01ebd1 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs @@ -14,6 +14,8 @@ using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.TagHelpers.Internal; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.AspNet.Routing; using Microsoft.AspNet.Testing.xunit; diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/SelectTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/SelectTagHelperTest.cs index d3ce775e5a..432b640d1f 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/SelectTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/SelectTagHelperTest.cs @@ -9,6 +9,7 @@ using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.TestCommon; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs index d9e549987e..979370815a 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs @@ -5,12 +5,14 @@ using System.Collections.Generic; using System.IO; using Microsoft.AspNet.Antiforgery; -using Microsoft.AspNet.DataProtection; using Microsoft.AspNet.Html.Abstractions; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.Routing; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Routing; using Microsoft.Framework.OptionsModel; using Microsoft.Framework.WebEncoders.Testing; diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TextAreaTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TextAreaTagHelperTest.cs index 853fa27105..de3a58082b 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TextAreaTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TextAreaTagHelperTest.cs @@ -8,6 +8,7 @@ using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.TestCommon; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs index 7b1e3626a6..9e12e40ef8 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs @@ -10,6 +10,8 @@ using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.AspNet.Routing; using Moq; diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs index ddd8478568..e5488b18a7 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs @@ -11,6 +11,8 @@ using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; using Microsoft.AspNet.Routing; using Microsoft.AspNet.Testing; diff --git a/test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs index 59e69a469f..38454b7b40 100644 --- a/test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs +++ b/test/Microsoft.AspNet.Mvc.Test/MvcServiceCollectionExtensionsTest.cs @@ -11,8 +11,14 @@ using Microsoft.AspNet.Mvc.ApplicationModels; using Microsoft.AspNet.Mvc.Core; using Microsoft.AspNet.Mvc.Cors; +using Microsoft.AspNet.Mvc.DataAnnotations.Internal; using Microsoft.AspNet.Mvc.Filters; +using Microsoft.AspNet.Mvc.Formatters.Json.Internal; +using Microsoft.AspNet.Mvc.Internal; using Microsoft.AspNet.Mvc.Razor; +using Microsoft.AspNet.Mvc.Razor.Internal; +using Microsoft.AspNet.Mvc.ViewFeatures; +using Microsoft.AspNet.Mvc.ViewFeatures.Internal; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.DependencyInjection.Extensions; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerTest.cs index e5cd12414c..630bd512b5 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ControllerTest.cs @@ -15,6 +15,7 @@ using Microsoft.AspNet.Mvc.Filters; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Routing; using Microsoft.AspNet.Testing; #if DNX451 diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlAttributePropertyHelperTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Internal/HtmlAttributePropertyHelperTest.cs similarity index 98% rename from test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlAttributePropertyHelperTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Internal/HtmlAttributePropertyHelperTest.cs index 89221eff6f..8150d483c9 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlAttributePropertyHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Internal/HtmlAttributePropertyHelperTest.cs @@ -5,7 +5,7 @@ using Microsoft.Framework.Internal; using Xunit; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewFeatures.Internal { public class HtmlAttributePropertyHelperTest { diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/TemplateRendererTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Internal/TemplateRendererTest.cs similarity index 98% rename from test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/TemplateRendererTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Internal/TemplateRendererTest.cs index 652ce32f55..f21174f055 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/TemplateRendererTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Internal/TemplateRendererTest.cs @@ -11,7 +11,7 @@ using Microsoft.AspNet.Mvc.ModelBinding; using Xunit; -namespace Microsoft.AspNet.Mvc.Rendering.Internal +namespace Microsoft.AspNet.Mvc.ViewFeatures.Internal { public class TemplateRendererTest { diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/MockMvcViewOptionsAccessor.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/MockMvcViewOptionsAccessor.cs deleted file mode 100644 index 98e78ec5e8..0000000000 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/MockMvcViewOptionsAccessor.cs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using Microsoft.Framework.OptionsModel; - -namespace Microsoft.AspNet.Mvc -{ - public class MockMvcViewOptionsAccessor : IOptions - { - public MockMvcViewOptionsAccessor() - { - Value = new MvcViewOptions(); - } - - public MvcViewOptions Value { get; private set; } - } -} \ No newline at end of file diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/PartialViewResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/PartialViewResultTest.cs index 3d58a69519..31d3b5b3ba 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/PartialViewResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/PartialViewResultTest.cs @@ -7,7 +7,7 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc.Actions; -using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; using Microsoft.AspNet.Routing; using Microsoft.Framework.Logging; using Microsoft.Framework.OptionsModel; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs index e4e741fb26..1cb83ef3de 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs @@ -7,6 +7,7 @@ using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; +using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Logging; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs index f125db9566..86812f7b9f 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs @@ -8,11 +8,12 @@ using System.IO; using System.Threading.Tasks; using Microsoft.AspNet.Antiforgery; -using Microsoft.AspNet.DataProtection; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Routing; using Microsoft.Framework.OptionsModel; using Microsoft.Framework.WebEncoders; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperCheckboxTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperCheckboxTest.cs index 74e7ffe227..a72a0b8f63 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperCheckboxTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperCheckboxTest.cs @@ -7,6 +7,7 @@ using System.Globalization; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.TestCommon; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Routing; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayNameExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayNameExtensionsTest.cs index b0b1c99b2a..1f233581bb 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayNameExtensionsTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayNameExtensionsTest.cs @@ -4,10 +4,9 @@ using System; using System.Collections.Generic; using Microsoft.AspNet.Mvc.ModelBinding; -using Microsoft.AspNet.Mvc.Rendering; using Xunit; -namespace Microsoft.AspNet.Mvc.Core +namespace Microsoft.AspNet.Mvc.Rendering { /// /// Test the class. diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormExtensionsTest.cs index 923688aad4..38ddf818df 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormExtensionsTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormExtensionsTest.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; -using Microsoft.Framework.WebEncoders.Testing; +using Microsoft.AspNet.Mvc.ViewFeatures; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormTest.cs index 8101b71743..4950a2879e 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormTest.cs @@ -5,6 +5,8 @@ using System.IO; using System.Linq; using Microsoft.AspNet.Http; +using Microsoft.AspNet.Mvc.Routing; +using Microsoft.AspNet.Mvc.ViewFeatures; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperHiddenTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperHiddenTest.cs index 7e18011e5b..ed16cdf1ec 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperHiddenTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperHiddenTest.cs @@ -8,6 +8,7 @@ using System.Linq.Expressions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.TestCommon; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Testing; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLinkGenerationTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLinkGenerationTest.cs index 61f77a75d9..b41184191a 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLinkGenerationTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLinkGenerationTest.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; +using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Mvc.TestCommon; using Microsoft.Framework.Internal; using Moq; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPartialExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPartialExtensionsTest.cs index 7d48b5d3af..2c83eea6c3 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPartialExtensionsTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPartialExtensionsTest.cs @@ -6,6 +6,7 @@ using Microsoft.AspNet.Html.Abstractions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.TestCommon; +using Microsoft.AspNet.Mvc.ViewFeatures; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPasswordTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPasswordTest.cs index 5492cded5b..c88893f2d3 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPasswordTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPasswordTest.cs @@ -8,6 +8,7 @@ using System.Linq.Expressions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.TestCommon; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Testing; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperSelectTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperSelectTest.cs index ecd0dbea25..c643670b2d 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperSelectTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperSelectTest.cs @@ -7,6 +7,8 @@ using System.Linq; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.TestCommon; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Testing; using Microsoft.Framework.Internal; using Microsoft.Framework.WebEncoders; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTest.cs index f86e5ed154..e7b7ce55c0 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTest.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.Collections.Generic; +using Microsoft.AspNet.Mvc.ViewFeatures; using Xunit; namespace Microsoft.AspNet.Mvc.Rendering diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValueTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValueTest.cs index 7dc8b88c76..3cc3b3273f 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValueTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValueTest.cs @@ -2,13 +2,12 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Globalization; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Testing; using Xunit; -namespace Microsoft.AspNet.Mvc.Core +namespace Microsoft.AspNet.Mvc.ViewFeatures { /// /// Test the and methods. diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/ViewContextTests.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/ViewContextTests.cs index 8a4b516d8a..95d18e5d3f 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/ViewContextTests.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/ViewContextTests.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.ModelBinding; +using Microsoft.AspNet.Mvc.ViewFeatures; using Xunit; namespace Microsoft.AspNet.Mvc.Rendering diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponentTests.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponentTests.cs index 6849e2f6c2..4319eb77a8 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponentTests.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponentTests.cs @@ -3,6 +3,7 @@ using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewComponents; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.Framework.WebEncoders; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ContentViewComponentResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ContentViewComponentResultTest.cs index 465ef38e7f..0c8db6f42b 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ContentViewComponentResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ContentViewComponentResultTest.cs @@ -7,6 +7,8 @@ using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewComponents; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Routing; using Moq; using Xunit; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/JsonViewComponentResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/JsonViewComponentResultTest.cs index fd4737480e..2a8d528815 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/JsonViewComponentResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/JsonViewComponentResultTest.cs @@ -10,6 +10,8 @@ using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewComponents; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; using Moq; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ViewViewComponentResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ViewViewComponentResultTest.cs index 409090d2d4..e10c7eebd6 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ViewViewComponentResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponents/ViewViewComponentResultTest.cs @@ -9,6 +9,8 @@ using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewComponents; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; using Moq; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/ViewEngine/CompositeViewEngineTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewEngines/CompositeViewEngineTest.cs similarity index 93% rename from test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/ViewEngine/CompositeViewEngineTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewEngines/CompositeViewEngineTest.cs index 23c3394390..f078b9b837 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/ViewEngine/CompositeViewEngineTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewEngines/CompositeViewEngineTest.cs @@ -9,7 +9,7 @@ using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewEngines { public class CompositeViewEngineTest { @@ -19,7 +19,7 @@ public void ViewEngines_UsesListOfViewEnginesFromOptions() // Arrange var viewEngine1 = Mock.Of(); var viewEngine2 = Mock.Of(); - var optionsAccessor = new MockMvcViewOptionsAccessor(); + var optionsAccessor = new TestOptionsManager(); optionsAccessor.Value.ViewEngines.Add(viewEngine1); optionsAccessor.Value.ViewEngines.Add(viewEngine2); var compositeViewEngine = new CompositeViewEngine(optionsAccessor); @@ -37,7 +37,7 @@ public void FindView_ReturnsNotFoundResult_WhenNoViewEnginesAreRegistered() // Arrange var viewName = "test-view"; var actionContext = GetActionContext(); - var optionsAccessor = new MockMvcViewOptionsAccessor(); + var optionsAccessor = new TestOptionsManager(); var compositeViewEngine = new CompositeViewEngine(optionsAccessor); // Act @@ -57,7 +57,7 @@ public void FindView_ReturnsNotFoundResult_WhenExactlyOneViewEngineIsRegisteredW var engine = new Mock(); engine.Setup(e => e.FindView(It.IsAny(), It.IsAny())) .Returns(ViewEngineResult.NotFound(viewName, new[] { "controller/test-view" })); - var optionsAccessor = new MockMvcViewOptionsAccessor(); + var optionsAccessor = new TestOptionsManager(); optionsAccessor.Value.ViewEngines.Add(engine.Object); var compositeViewEngine = new CompositeViewEngine(optionsAccessor); @@ -78,7 +78,7 @@ public void FindView_ReturnsView_WhenExactlyOneViewEngineIsRegisteredWhichReturn var view = Mock.Of(); engine.Setup(e => e.FindView(It.IsAny(), It.IsAny())) .Returns(ViewEngineResult.Found(viewName, view)); - var optionsAccessor = new MockMvcViewOptionsAccessor(); + var optionsAccessor = new TestOptionsManager(); optionsAccessor.Value.ViewEngines.Add(engine.Object); var compositeViewEngine = new CompositeViewEngine(optionsAccessor); @@ -107,7 +107,7 @@ public void FindView_ReturnsViewFromFirstViewEngineWithFoundResult() engine3.Setup(e => e.FindView(It.IsAny(), It.IsAny())) .Returns(ViewEngineResult.Found(viewName, view3)); - var optionsAccessor = new MockMvcViewOptionsAccessor(); + var optionsAccessor = new TestOptionsManager(); optionsAccessor.Value.ViewEngines.Add(engine1.Object); optionsAccessor.Value.ViewEngines.Add(engine2.Object); optionsAccessor.Value.ViewEngines.Add(engine3.Object); @@ -137,7 +137,7 @@ public void FindView_ReturnsNotFound_IfAllViewEnginesReturnNotFound() engine3.Setup(e => e.FindView(It.IsAny(), It.IsAny())) .Returns(ViewEngineResult.NotFound(viewName, new[] { "4", "5" })); - var optionsAccessor = new MockMvcViewOptionsAccessor(); + var optionsAccessor = new TestOptionsManager(); optionsAccessor.Value.ViewEngines.Add(engine1.Object); optionsAccessor.Value.ViewEngines.Add(engine2.Object); optionsAccessor.Value.ViewEngines.Add(engine3.Object); @@ -156,7 +156,7 @@ public void FindPartialView_ReturnsNotFoundResult_WhenNoViewEnginesAreRegistered { // Arrange var viewName = "my-partial-view"; - var optionsAccessor = new MockMvcViewOptionsAccessor(); + var optionsAccessor = new TestOptionsManager(); var compositeViewEngine = new CompositeViewEngine(optionsAccessor); // Act @@ -175,7 +175,7 @@ public void FindPartialView_ReturnsNotFoundResult_WhenExactlyOneViewEngineIsRegi var engine = new Mock(); engine.Setup(e => e.FindPartialView(It.IsAny(), It.IsAny())) .Returns(ViewEngineResult.NotFound(viewName, new[] { "Shared/partial-view" })); - var optionsAccessor = new MockMvcViewOptionsAccessor(); + var optionsAccessor = new TestOptionsManager(); optionsAccessor.Value.ViewEngines.Add(engine.Object); var compositeViewEngine = new CompositeViewEngine(optionsAccessor); @@ -196,7 +196,7 @@ public void FindPartialView_ReturnsView_WhenExactlyOneViewEngineIsRegisteredWhic var view = Mock.Of(); engine.Setup(e => e.FindPartialView(It.IsAny(), It.IsAny())) .Returns(ViewEngineResult.Found(viewName, view)); - var optionsAccessor = new MockMvcViewOptionsAccessor(); + var optionsAccessor = new TestOptionsManager(); optionsAccessor.Value.ViewEngines.Add(engine.Object); var compositeViewEngine = new CompositeViewEngine(optionsAccessor); @@ -225,7 +225,7 @@ public void FindPartialView_ReturnsViewFromFirstViewEngineWithFoundResult() engine3.Setup(e => e.FindPartialView(It.IsAny(), It.IsAny())) .Returns(ViewEngineResult.Found(viewName, view3)); - var optionsAccessor = new MockMvcViewOptionsAccessor(); + var optionsAccessor = new TestOptionsManager(); optionsAccessor.Value.ViewEngines.Add(engine1.Object); optionsAccessor.Value.ViewEngines.Add(engine2.Object); optionsAccessor.Value.ViewEngines.Add(engine3.Object); @@ -255,7 +255,7 @@ public void FindPartialView_ReturnsNotFound_IfAllViewEnginesReturnNotFound() engine3.Setup(e => e.FindPartialView(It.IsAny(), It.IsAny())) .Returns(ViewEngineResult.NotFound(viewName, new[] { "4", "5" })); - var optionsAccessor = new MockMvcViewOptionsAccessor(); + var optionsAccessor = new TestOptionsManager(); optionsAccessor.Value.ViewEngines.Add(engine1.Object); optionsAccessor.Value.ViewEngines.Add(engine2.Object); optionsAccessor.Value.ViewEngines.Add(engine3.Object); diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultDisplayTemplatesTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/DefaultDisplayTemplatesTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultDisplayTemplatesTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/DefaultDisplayTemplatesTest.cs index 9f01e7d36b..275f4cf729 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultDisplayTemplatesTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/DefaultDisplayTemplatesTest.cs @@ -12,10 +12,11 @@ using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.TestCommon; +using Microsoft.AspNet.Mvc.ViewEngines; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.Core +namespace Microsoft.AspNet.Mvc.ViewFeatures { public class DefaultDisplayTemplatesTest { diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultEditorTemplatesTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/DefaultEditorTemplatesTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultEditorTemplatesTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/DefaultEditorTemplatesTest.cs index 51f7301e96..f815e0ecdf 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultEditorTemplatesTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/DefaultEditorTemplatesTest.cs @@ -10,19 +10,19 @@ using System.Threading.Tasks; using Microsoft.AspNet.Html.Abstractions; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.ModelBinding.Validation; using Microsoft.AspNet.Mvc.Rendering; -using Microsoft.AspNet.Mvc.Rendering.Internal; using Microsoft.AspNet.Mvc.TestCommon; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures.Internal; using Microsoft.AspNet.Testing; using Microsoft.Framework.Internal; using Microsoft.Framework.WebEncoders; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.Core +namespace Microsoft.AspNet.Mvc.ViewFeatures { public class DefaultEditorTemplatesTest { diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultHtmlGeneratorTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/DefaultHtmlGeneratorTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultHtmlGeneratorTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/DefaultHtmlGeneratorTest.cs index ed101c6682..c31efec170 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultHtmlGeneratorTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/DefaultHtmlGeneratorTest.cs @@ -6,15 +6,16 @@ using System.IO; using System.Linq; using Microsoft.AspNet.Antiforgery; -using Microsoft.AspNet.DataProtection; -using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; +using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.Routing; +using Microsoft.AspNet.Mvc.ViewEngines; using Microsoft.Framework.OptionsModel; using Microsoft.Framework.WebEncoders; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewFeatures { public class DefaultHtmlGeneratorTest { diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/Expression/ExpressionMetadataProviderTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ExpressionMetadataProviderTest.cs similarity index 97% rename from test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/Expression/ExpressionMetadataProviderTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ExpressionMetadataProviderTest.cs index e8d2117c9c..1b5a2fd428 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/Expression/ExpressionMetadataProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ExpressionMetadataProviderTest.cs @@ -4,7 +4,7 @@ using Microsoft.AspNet.Mvc.ModelBinding; using Xunit; -namespace Microsoft.AspNet.Mvc.Rendering.Expressions +namespace Microsoft.AspNet.Mvc.ViewFeatures { public class ExpressionMetadataProviderTest { diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/TempData/SaveTempDataFilterTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/SaveTempDataFilterTest.cs similarity index 98% rename from test/Microsoft.AspNet.Mvc.ViewFeatures.Test/TempData/SaveTempDataFilterTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/SaveTempDataFilterTest.cs index 5932d5c98b..11fe833eef 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/TempData/SaveTempDataFilterTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/SaveTempDataFilterTest.cs @@ -5,7 +5,7 @@ using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.ViewFeatures { public class SaveTempDataFilterTest { diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/TempData/SessionStateTempDataProviderTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/SessionStateTempDataProviderTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.ViewFeatures.Test/TempData/SessionStateTempDataProviderTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/SessionStateTempDataProviderTest.cs index 2a498f1e73..7cae2e63f4 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/TempData/SessionStateTempDataProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/SessionStateTempDataProviderTest.cs @@ -11,7 +11,7 @@ using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.ViewFeatures { public class SessionStateTempDataProviderTest { diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/StringCollectionTextWriterTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/StringCollectionTextWriterTest.cs similarity index 98% rename from test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/StringCollectionTextWriterTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/StringCollectionTextWriterTest.cs index 317e980cca..9299e73660 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/StringCollectionTextWriterTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/StringCollectionTextWriterTest.cs @@ -6,12 +6,13 @@ using System.IO; using System.Text; using System.Threading.Tasks; +using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Testing; using Microsoft.Framework.Internal; using Microsoft.Framework.WebEncoders.Testing; using Xunit; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewFeatures { public class StringCollectionTextWriterTest { diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/StringHtmlContentTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/StringHtmlContentTest.cs similarity index 94% rename from test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/StringHtmlContentTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/StringHtmlContentTest.cs index 885e69f6fc..044a66219a 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/StringHtmlContentTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/StringHtmlContentTest.cs @@ -5,7 +5,7 @@ using Microsoft.Framework.WebEncoders.Testing; using Xunit; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc.ViewFeatures { public class StringHtmlContentTest { diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/TempData/TempDataDictionaryTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/TempDataDictionaryTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.ViewFeatures.Test/TempData/TempDataDictionaryTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/TempDataDictionaryTest.cs index ab7a133262..1ff4038354 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/TempData/TempDataDictionaryTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/TempDataDictionaryTest.cs @@ -2,13 +2,12 @@ // 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.Hosting; using Microsoft.AspNet.Http; using Microsoft.Framework.Internal; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.ViewFeatures { public class TempDataDictionaryTest { diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewDataDictionaryOfTModelTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataDictionaryOfTModelTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewDataDictionaryOfTModelTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataDictionaryOfTModelTest.cs index d3f2e7d4fd..4f006fb3dd 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewDataDictionaryOfTModelTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataDictionaryOfTModelTest.cs @@ -6,7 +6,7 @@ using Microsoft.Framework.Internal; using Xunit; -namespace Microsoft.AspNet.Mvc.Core +namespace Microsoft.AspNet.Mvc.ViewFeatures { public class ViewDataDictionaryOfTModelTest { diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewDataDictionaryTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataDictionaryTest.cs similarity index 99% rename from test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewDataDictionaryTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataDictionaryTest.cs index 2fb84fd981..286d080f9c 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewDataDictionaryTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataDictionaryTest.cs @@ -10,7 +10,7 @@ using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc.Core +namespace Microsoft.AspNet.Mvc.ViewFeatures { public class ViewDataDictionaryTest { diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/ViewDataOfTTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataOfTTest.cs similarity index 98% rename from test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/ViewDataOfTTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataOfTTest.cs index d76967bd6b..839e908c3a 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/ViewDataOfTTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataOfTTest.cs @@ -5,7 +5,7 @@ using Microsoft.AspNet.Mvc.ModelBinding; using Xunit; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.ViewFeatures { public class ViewDataOfTTest { diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewExecutorTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ViewExecutorTest.cs similarity index 98% rename from test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewExecutorTest.cs rename to test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ViewExecutorTest.cs index f426226366..5fc0ee19ff 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewExecutorTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ViewExecutorTest.cs @@ -8,12 +8,13 @@ using Microsoft.AspNet.Mvc.Actions; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; using Microsoft.AspNet.Routing; using Microsoft.Net.Http.Headers; using Moq; using Xunit; -namespace Microsoft.AspNet.Mvc +namespace Microsoft.AspNet.Mvc.ViewFeatures { public class ViewExecutorTest { diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewResultTest.cs index 857fd84386..77b431d3c9 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewResultTest.cs @@ -8,7 +8,7 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Http.Internal; using Microsoft.AspNet.Mvc.Actions; -using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; using Microsoft.Framework.Logging; diff --git a/test/WebSites/ActivatorWebSite/Services/ViewService.cs b/test/WebSites/ActivatorWebSite/Services/ViewService.cs index f7b16161c9..11c42c87c2 100644 --- a/test/WebSites/ActivatorWebSite/Services/ViewService.cs +++ b/test/WebSites/ActivatorWebSite/Services/ViewService.cs @@ -1,8 +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; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewFeatures.Internal; namespace ActivatorWebSite { diff --git a/test/WebSites/ActivatorWebSite/TagHelpers/FooterTagHelper.cs b/test/WebSites/ActivatorWebSite/TagHelpers/FooterTagHelper.cs index 2c99445959..e1a98d88fc 100644 --- a/test/WebSites/ActivatorWebSite/TagHelpers/FooterTagHelper.cs +++ b/test/WebSites/ActivatorWebSite/TagHelpers/FooterTagHelper.cs @@ -1,9 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using Microsoft.AspNet.Mvc; +using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; -using Microsoft.Framework.WebEncoders; namespace ActivatorWebSite.TagHelpers { diff --git a/test/WebSites/ActivatorWebSite/TagHelpers/HiddenTagHelper.cs b/test/WebSites/ActivatorWebSite/TagHelpers/HiddenTagHelper.cs index 55d6f253c9..22f12a9d49 100644 --- a/test/WebSites/ActivatorWebSite/TagHelpers/HiddenTagHelper.cs +++ b/test/WebSites/ActivatorWebSite/TagHelpers/HiddenTagHelper.cs @@ -4,6 +4,8 @@ using System.Threading.Tasks; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewFeatures; +using Microsoft.AspNet.Mvc.ViewFeatures.Internal; using Microsoft.AspNet.Razor.Runtime.TagHelpers; namespace ActivatorWebSite.TagHelpers diff --git a/test/WebSites/ActivatorWebSite/TagHelpers/RepeatContentTagHelper.cs b/test/WebSites/ActivatorWebSite/TagHelpers/RepeatContentTagHelper.cs index 1de777d108..32e36909d4 100644 --- a/test/WebSites/ActivatorWebSite/TagHelpers/RepeatContentTagHelper.cs +++ b/test/WebSites/ActivatorWebSite/TagHelpers/RepeatContentTagHelper.cs @@ -2,8 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; -using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewFeatures; +using Microsoft.AspNet.Mvc.ViewFeatures.Internal; using Microsoft.AspNet.Razor.Runtime.TagHelpers; namespace ActivatorWebSite.TagHelpers diff --git a/test/WebSites/ActivatorWebSite/TagHelpers/TitleTagHelper.cs b/test/WebSites/ActivatorWebSite/TagHelpers/TitleTagHelper.cs index 4ba4c8fdf5..972bd41c84 100644 --- a/test/WebSites/ActivatorWebSite/TagHelpers/TitleTagHelper.cs +++ b/test/WebSites/ActivatorWebSite/TagHelpers/TitleTagHelper.cs @@ -2,8 +2,9 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNet.Html.Abstractions; -using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewFeatures; +using Microsoft.AspNet.Mvc.ViewFeatures.Internal; using Microsoft.AspNet.Razor.Runtime.TagHelpers; namespace ActivatorWebSite.TagHelpers diff --git a/test/WebSites/CompositeViewEngineWebSite/TestPartialView.cs b/test/WebSites/CompositeViewEngineWebSite/TestPartialView.cs index 8e21d6f2a2..42f221ac96 100644 --- a/test/WebSites/CompositeViewEngineWebSite/TestPartialView.cs +++ b/test/WebSites/CompositeViewEngineWebSite/TestPartialView.cs @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; -using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; namespace CompositeViewEngineWebSite { diff --git a/test/WebSites/CompositeViewEngineWebSite/TestView.cs b/test/WebSites/CompositeViewEngineWebSite/TestView.cs index fd683fbded..ef6fc50bc6 100644 --- a/test/WebSites/CompositeViewEngineWebSite/TestView.cs +++ b/test/WebSites/CompositeViewEngineWebSite/TestView.cs @@ -2,8 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Threading.Tasks; -using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; namespace CompositeViewEngineWebSite { diff --git a/test/WebSites/CompositeViewEngineWebSite/TestViewEngine.cs b/test/WebSites/CompositeViewEngineWebSite/TestViewEngine.cs index 92821ba0fe..62673f2cf5 100644 --- a/test/WebSites/CompositeViewEngineWebSite/TestViewEngine.cs +++ b/test/WebSites/CompositeViewEngineWebSite/TestViewEngine.cs @@ -3,7 +3,7 @@ using System; using Microsoft.AspNet.Mvc; -using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; namespace CompositeViewEngineWebSite { diff --git a/test/WebSites/ControllersFromServicesClassLibrary/ControllerWithConstructorInjection.cs b/test/WebSites/ControllersFromServicesClassLibrary/ControllerWithConstructorInjection.cs index ef63bb4d0c..080a3aa1c7 100644 --- a/test/WebSites/ControllersFromServicesClassLibrary/ControllerWithConstructorInjection.cs +++ b/test/WebSites/ControllersFromServicesClassLibrary/ControllerWithConstructorInjection.cs @@ -3,6 +3,7 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc; +using Microsoft.AspNet.Mvc.Routing; namespace ControllersFromServicesClassLibrary { diff --git a/test/WebSites/ModelBindingWebSite/Controllers/RoundtripController.cs b/test/WebSites/ModelBindingWebSite/Controllers/RoundtripController.cs index 71d988e7ed..eb059899fc 100644 --- a/test/WebSites/ModelBindingWebSite/Controllers/RoundtripController.cs +++ b/test/WebSites/ModelBindingWebSite/Controllers/RoundtripController.cs @@ -6,6 +6,9 @@ using System.Threading.Tasks; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewEngines; +using Microsoft.AspNet.Mvc.ViewFeatures; +using Microsoft.AspNet.Mvc.ViewFeatures.Internal; using ModelBindingWebSite.Models; namespace ModelBindingWebSite.Controllers diff --git a/test/WebSites/RoutingWebSite/TestResponseGenerator.cs b/test/WebSites/RoutingWebSite/TestResponseGenerator.cs index 12b5e030c9..034be23e4c 100644 --- a/test/WebSites/RoutingWebSite/TestResponseGenerator.cs +++ b/test/WebSites/RoutingWebSite/TestResponseGenerator.cs @@ -6,6 +6,7 @@ using System.Linq; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Routing; using Microsoft.Framework.DependencyInjection; namespace RoutingWebSite diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/ATagHelper.cs b/test/WebSites/TagHelpersWebSite/TagHelpers/ATagHelper.cs index a9d2d4f586..364aa034c1 100644 --- a/test/WebSites/TagHelpersWebSite/TagHelpers/ATagHelper.cs +++ b/test/WebSites/TagHelpersWebSite/TagHelpers/ATagHelper.cs @@ -3,6 +3,7 @@ using System.Linq; using Microsoft.AspNet.Mvc; +using Microsoft.AspNet.Mvc.Routing; using Microsoft.AspNet.Razor.Runtime.TagHelpers; namespace TagHelpersWebSite.TagHelpers diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/PrettyTagHelper.cs b/test/WebSites/TagHelpersWebSite/TagHelpers/PrettyTagHelper.cs index 5136b05acc..85b698c678 100644 --- a/test/WebSites/TagHelpersWebSite/TagHelpers/PrettyTagHelper.cs +++ b/test/WebSites/TagHelpersWebSite/TagHelpers/PrettyTagHelper.cs @@ -3,7 +3,8 @@ using System; using System.Collections.Generic; -using Microsoft.AspNet.Mvc; +using Microsoft.AspNet.Mvc.Rendering; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; namespace TagHelpersWebSite.TagHelpers diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/TagCloudViewComponentTagHelper.cs b/test/WebSites/TagHelpersWebSite/TagHelpers/TagCloudViewComponentTagHelper.cs index d035ab89ac..0505322bae 100644 --- a/test/WebSites/TagHelpersWebSite/TagHelpers/TagCloudViewComponentTagHelper.cs +++ b/test/WebSites/TagHelpersWebSite/TagHelpers/TagCloudViewComponentTagHelper.cs @@ -6,7 +6,9 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.AspNet.Mvc; +using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.ViewComponents; +using Microsoft.AspNet.Mvc.ViewFeatures; using Microsoft.AspNet.Razor.Runtime.TagHelpers; namespace MvcSample.Web.Components diff --git a/test/WebSites/UrlHelperWebSite/Controllers/SimplePocoController.cs b/test/WebSites/UrlHelperWebSite/Controllers/SimplePocoController.cs index 6a9965ceba..0ca7fbe5ae 100644 --- a/test/WebSites/UrlHelperWebSite/Controllers/SimplePocoController.cs +++ b/test/WebSites/UrlHelperWebSite/Controllers/SimplePocoController.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.Routing; namespace UrlHelperWebSite.Controllers { diff --git a/test/WebSites/UrlHelperWebSite/CustomUrlHelper.cs b/test/WebSites/UrlHelperWebSite/CustomUrlHelper.cs index 8572b7a115..9061ab34bc 100644 --- a/test/WebSites/UrlHelperWebSite/CustomUrlHelper.cs +++ b/test/WebSites/UrlHelperWebSite/CustomUrlHelper.cs @@ -3,8 +3,8 @@ using System; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Routing; using Microsoft.Framework.OptionsModel; namespace UrlHelperWebSite diff --git a/test/WebSites/VersioningWebSite/TestResponseGenerator.cs b/test/WebSites/VersioningWebSite/TestResponseGenerator.cs index b9b6b77075..0bd63e62f3 100644 --- a/test/WebSites/VersioningWebSite/TestResponseGenerator.cs +++ b/test/WebSites/VersioningWebSite/TestResponseGenerator.cs @@ -6,6 +6,7 @@ using System.Linq; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Actions; +using Microsoft.AspNet.Mvc.Routing; using Microsoft.Framework.DependencyInjection; namespace VersioningWebSite