From 084c7f80e56e62e5aea2ff4edc558a1f3ee35c66 Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Mon, 7 Apr 2014 18:28:08 -0700 Subject: [PATCH] Further rearranging IView/IViewEngine/ViewContext et al --- .../{Rendering/View => }/FormContext.cs | 0 .../{Rendering/View => }/ICanHasViewContext.cs | 0 src/Microsoft.AspNet.Mvc.Core/{Rendering/View => }/IView.cs | 2 +- .../{Rendering/View => }/IViewEngine.cs | 2 +- .../Rendering/{View => }/DynamicViewData.cs | 0 .../{Rendering/View => }/TemplateInfo.cs | 0 src/Microsoft.AspNet.Mvc.Core/UrlHelper.cs | 1 - .../{Rendering/View => }/ViewContext.cs | 3 ++- .../{Rendering/View => }/ViewDataDictionary.cs | 3 ++- .../{Rendering/View => }/ViewDataDictionaryOfT.cs | 2 +- .../{Rendering/View => }/ViewEngineResult.cs | 2 +- 11 files changed, 8 insertions(+), 7 deletions(-) rename src/Microsoft.AspNet.Mvc.Core/{Rendering/View => }/FormContext.cs (100%) rename src/Microsoft.AspNet.Mvc.Core/{Rendering/View => }/ICanHasViewContext.cs (100%) rename src/Microsoft.AspNet.Mvc.Core/{Rendering/View => }/IView.cs (76%) rename src/Microsoft.AspNet.Mvc.Core/{Rendering/View => }/IViewEngine.cs (88%) rename src/Microsoft.AspNet.Mvc.Core/Rendering/{View => }/DynamicViewData.cs (100%) rename src/Microsoft.AspNet.Mvc.Core/{Rendering/View => }/TemplateInfo.cs (100%) rename src/Microsoft.AspNet.Mvc.Core/{Rendering/View => }/ViewContext.cs (97%) rename src/Microsoft.AspNet.Mvc.Core/{Rendering/View => }/ViewDataDictionary.cs (99%) rename src/Microsoft.AspNet.Mvc.Core/{Rendering/View => }/ViewDataDictionaryOfT.cs (98%) rename src/Microsoft.AspNet.Mvc.Core/{Rendering/View => }/ViewEngineResult.cs (96%) diff --git a/src/Microsoft.AspNet.Mvc.Core/Rendering/View/FormContext.cs b/src/Microsoft.AspNet.Mvc.Core/FormContext.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Core/Rendering/View/FormContext.cs rename to src/Microsoft.AspNet.Mvc.Core/FormContext.cs diff --git a/src/Microsoft.AspNet.Mvc.Core/Rendering/View/ICanHasViewContext.cs b/src/Microsoft.AspNet.Mvc.Core/ICanHasViewContext.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Core/Rendering/View/ICanHasViewContext.cs rename to src/Microsoft.AspNet.Mvc.Core/ICanHasViewContext.cs diff --git a/src/Microsoft.AspNet.Mvc.Core/Rendering/View/IView.cs b/src/Microsoft.AspNet.Mvc.Core/IView.cs similarity index 76% rename from src/Microsoft.AspNet.Mvc.Core/Rendering/View/IView.cs rename to src/Microsoft.AspNet.Mvc.Core/IView.cs index 7c45b8a3b4..3eda732779 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Rendering/View/IView.cs +++ b/src/Microsoft.AspNet.Mvc.Core/IView.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc { public interface IView { diff --git a/src/Microsoft.AspNet.Mvc.Core/Rendering/View/IViewEngine.cs b/src/Microsoft.AspNet.Mvc.Core/IViewEngine.cs similarity index 88% rename from src/Microsoft.AspNet.Mvc.Core/Rendering/View/IViewEngine.cs rename to src/Microsoft.AspNet.Mvc.Core/IViewEngine.cs index 80c757ef7a..af39663b8a 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Rendering/View/IViewEngine.cs +++ b/src/Microsoft.AspNet.Mvc.Core/IViewEngine.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc { public interface IViewEngine { diff --git a/src/Microsoft.AspNet.Mvc.Core/Rendering/View/DynamicViewData.cs b/src/Microsoft.AspNet.Mvc.Core/Rendering/DynamicViewData.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Core/Rendering/View/DynamicViewData.cs rename to src/Microsoft.AspNet.Mvc.Core/Rendering/DynamicViewData.cs diff --git a/src/Microsoft.AspNet.Mvc.Core/Rendering/View/TemplateInfo.cs b/src/Microsoft.AspNet.Mvc.Core/TemplateInfo.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Core/Rendering/View/TemplateInfo.cs rename to src/Microsoft.AspNet.Mvc.Core/TemplateInfo.cs diff --git a/src/Microsoft.AspNet.Mvc.Core/UrlHelper.cs b/src/Microsoft.AspNet.Mvc.Core/UrlHelper.cs index 6d22a1ed32..6f1acf7469 100644 --- a/src/Microsoft.AspNet.Mvc.Core/UrlHelper.cs +++ b/src/Microsoft.AspNet.Mvc.Core/UrlHelper.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Diagnostics.Contracts; using System.Globalization; -using System.Globalization; using System.Linq; using Microsoft.AspNet.Abstractions; using Microsoft.AspNet.DependencyInjection; diff --git a/src/Microsoft.AspNet.Mvc.Core/Rendering/View/ViewContext.cs b/src/Microsoft.AspNet.Mvc.Core/ViewContext.cs similarity index 97% rename from src/Microsoft.AspNet.Mvc.Core/Rendering/View/ViewContext.cs rename to src/Microsoft.AspNet.Mvc.Core/ViewContext.cs index 6b24a67a04..c7d11be7c6 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Rendering/View/ViewContext.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ViewContext.cs @@ -2,8 +2,9 @@ using System; using System.Collections.Generic; using System.IO; using Microsoft.AspNet.Abstractions; +using Microsoft.AspNet.Mvc.Rendering; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc { public class ViewContext { diff --git a/src/Microsoft.AspNet.Mvc.Core/Rendering/View/ViewDataDictionary.cs b/src/Microsoft.AspNet.Mvc.Core/ViewDataDictionary.cs similarity index 99% rename from src/Microsoft.AspNet.Mvc.Core/Rendering/View/ViewDataDictionary.cs rename to src/Microsoft.AspNet.Mvc.Core/ViewDataDictionary.cs index 3284a7d307..08abee7971 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Rendering/View/ViewDataDictionary.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ViewDataDictionary.cs @@ -4,9 +4,10 @@ using System.Collections.Generic; using System.Globalization; using Microsoft.AspNet.Mvc.Core; using Microsoft.AspNet.Mvc.ModelBinding; +using Microsoft.AspNet.Mvc.Rendering; using Microsoft.AspNet.Mvc.Rendering.Expressions; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc { public class ViewDataDictionary : IDictionary { diff --git a/src/Microsoft.AspNet.Mvc.Core/Rendering/View/ViewDataDictionaryOfT.cs b/src/Microsoft.AspNet.Mvc.Core/ViewDataDictionaryOfT.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Core/Rendering/View/ViewDataDictionaryOfT.cs rename to src/Microsoft.AspNet.Mvc.Core/ViewDataDictionaryOfT.cs index 8639772257..a47dac2425 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Rendering/View/ViewDataDictionaryOfT.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ViewDataDictionaryOfT.cs @@ -2,7 +2,7 @@ using System; using Microsoft.AspNet.Mvc.Core; using Microsoft.AspNet.Mvc.ModelBinding; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc { public class ViewDataDictionary : ViewDataDictionary { diff --git a/src/Microsoft.AspNet.Mvc.Core/Rendering/View/ViewEngineResult.cs b/src/Microsoft.AspNet.Mvc.Core/ViewEngineResult.cs similarity index 96% rename from src/Microsoft.AspNet.Mvc.Core/Rendering/View/ViewEngineResult.cs rename to src/Microsoft.AspNet.Mvc.Core/ViewEngineResult.cs index 434e2721d2..7b6bbad76c 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Rendering/View/ViewEngineResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ViewEngineResult.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Microsoft.AspNet.Mvc.Rendering +namespace Microsoft.AspNet.Mvc { public class ViewEngineResult {