From b18526cdc8d8c868e8d7f9c6c8484064215e1002 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 8 Nov 2018 11:32:40 -0800 Subject: [PATCH] Make types in Microsoft.AspNetCore.Mvc.ViewFeatures internal --- .../Internal/RazorPagePropertyActivator.cs | 1 - .../RazorPageBase.cs | 2 +- .../RazorView.cs | 4 +-- .../Infrastructure/PageResultExecutor.cs | 2 +- .../Internal/PageActionInvoker.cs | 1 - .../Internal/PageActionInvokerProvider.cs | 2 -- .../PageSaveTempDataPropertyFilter.cs | 2 +- .../PageSaveTempDataPropertyFilterFactory.cs | 2 +- .../Internal/PageViewDataAttributeFilter.cs | 2 +- .../PageViewDataAttributeFilterFactory.cs | 2 +- ...pDataFilterPageApplicationModelProvider.cs | 2 +- ...taAttributePageApplicationModelProvider.cs | 3 +- .../CacheTagHelper.cs | 2 +- .../InputTagHelper.cs | 1 - .../PartialTagHelper.cs | 7 ++--- .../breakingchanges.netcore.json | 7 +++++ .../AntiforgeryExtensions.cs | 0 .../{ViewFeatures => }/AttributeDictionary.cs | 0 .../AutoValidateAntiforgeryTokenAttribute.cs | 2 +- .../ArrayPoolBufferSource.cs | 4 +-- .../CharArrayBufferSource.cs | 4 +-- .../ICharBufferSource.cs | 4 +-- .../{Internal => Buffers}/IViewBufferScope.cs | 2 +- .../MemoryPoolViewBufferScope.cs | 4 +-- .../PagedBufferedTextWriter.cs | 2 +- .../{Internal => Buffers}/PagedCharBuffer.cs | 4 +-- .../{Internal => Buffers}/ViewBuffer.cs | 4 +-- .../{Internal => Buffers}/ViewBufferPage.cs | 4 +-- .../ViewBufferTextWriter.cs | 20 +++++-------- .../{Internal => Buffers}/ViewBufferValue.cs | 2 +- .../CachedExpressionCompiler.cs | 0 .../Controller.cs | 1 - .../CookieTempDataProvider.cs | 6 ++-- .../{Internal => }/DefaultDisplayTemplates.cs | 5 ++-- .../{Internal => }/DefaultEditorTemplates.cs | 5 ++-- .../DefaultHtmlGenerator.cs | 1 - .../DefaultHtmlGeneratorExtensions.cs | 0 .../DefaultValidationHtmlAttributeProvider.cs | 3 +- ...MvcViewFeaturesMvcCoreBuilderExtensions.cs | 3 +- .../MvcViewOptionsSetup.cs | 5 ++-- .../TempDataMvcOptionsSetup.cs | 6 ++-- .../{Internal => }/DynamicViewData.cs | 4 +-- .../{Internal => }/ExpressionHelper.cs | 4 +-- .../ExpressionMetadataProvider.cs | 4 +-- .../{Internal => }/ExpressionTextCache.cs | 2 +- ...dateAntiforgeryTokenAuthorizationFilter.cs | 4 +-- .../ControllerSaveTempDataPropertyFilter.cs | 3 +- ...rollerSaveTempDataPropertyFilterFactory.cs | 3 +- .../ControllerViewDataAttributeFilter.cs | 3 +- ...ontrollerViewDataAttributeFilterFactory.cs | 3 +- .../ISaveTempDataCallback.cs | 4 +-- .../IViewDataValuesProviderFeature.cs | 4 +-- .../LifecycleProperty.cs | 4 +-- .../SaveTempDataFilter.cs | 4 +-- .../SaveTempDataPropertyFilterBase.cs | 4 +-- .../TempDataApplicationModelProvider.cs | 3 +- .../TempDataSerializer.cs | 10 +++---- ...dateAntiforgeryTokenAuthorizationFilter.cs | 4 +-- ...ewDataAttributeApplicationModelProvider.cs | 3 +- .../ViewDataAttributePropertyProvider.cs | 4 +-- .../{ViewFeatures => }/FormContext.cs | 0 .../{Internal => }/FormatWeekHelper.cs | 4 +-- .../HtmlAttributePropertyHelper.cs | 2 +- .../{ViewFeatures => }/HtmlHelper.cs | 4 +-- .../{ViewFeatures => }/HtmlHelperOfT.cs | 9 ++---- .../{ViewFeatures => }/HtmlHelperOptions.cs | 0 .../{ViewFeatures => }/IAntiforgeryPolicy.cs | 0 .../IFileVersionProvider.cs | 0 .../{ViewFeatures => }/IHtmlGenerator.cs | 0 .../IModelExpressionProvider.cs | 0 .../{ViewFeatures => }/ITempDataDictionary.cs | 0 .../ITempDataDictionaryFactory.cs | 0 .../{ViewFeatures => }/ITempDataProvider.cs | 0 .../{ViewFeatures => }/InputType.cs | 0 .../{ViewFeatures => }/JsonHelper.cs | 0 .../MemberExpressionCacheKey.cs | 0 .../MemberExpressionCacheKeyComparer.cs | 0 .../{ViewFeatures => }/ModelExplorer.cs | 0 .../ModelExplorerExtensions.cs | 0 .../{ViewFeatures => }/ModelExpression.cs | 0 .../ModelExpressionProvider.cs | 1 - .../ModelMetadataProviderExtensions.cs | 0 .../ModelStateDictionaryExtensions.cs | 2 +- ...cViewFeaturesDiagnosticSourceExtensions.cs | 2 +- .../MvcViewFeaturesLoggerExtensions.cs | 2 +- ...iewOptionsConfigureCompatibilityOptions.cs | 0 .../{Internal => }/NameAndIdProvider.cs | 4 +-- .../{Internal => }/NullView.cs | 4 +-- .../PartialViewResultExecutor.cs | 1 - .../Properties/AssemblyInfo.cs | 6 ++++ .../Rendering/MvcForm.cs | 19 ++++++------ .../Rendering/ViewContext.cs | 1 - .../SaveTempDataAttribute.cs | 2 +- .../SessionStateTempDataProvider.cs | 5 ++-- .../{ViewFeatures => }/StringHtmlContent.cs | 0 .../{ViewFeatures => }/TempDataDictionary.cs | 0 .../TempDataDictionaryFactory.cs | 0 .../{ViewFeatures => }/TemplateBuilder.cs | 5 ++-- .../{ViewFeatures => }/TemplateInfo.cs | 0 .../{ViewFeatures => }/TemplateRenderer.cs | 5 ++-- .../{ViewFeatures => }/TryGetValueDelegate.cs | 0 .../{ViewFeatures => }/TryGetValueProvider.cs | 0 .../ValidateAntiForgeryTokenAttribute.cs | 2 +- .../{Internal => }/ValidationHelpers.cs | 4 +-- .../ValidationHtmlAttributeProvider.cs | 0 .../ViewComponent.cs | 1 - .../ViewComponentResult.cs | 1 - .../ViewComponentResultExecutor.cs | 2 +- .../DefaultViewComponentHelper.cs | 4 +-- .../DefaultViewComponentInvoker.cs | 12 ++------ .../DefaultViewComponentInvokerFactory.cs | 3 -- .../ViewComponentInvokerCache.cs | 4 +-- .../ViewComponents/ViewViewComponentResult.cs | 1 - .../ViewContextAttribute.cs | 0 .../ViewDataAttribute.cs | 2 -- .../{ViewFeatures => }/ViewDataDictionary.cs | 0 .../ViewDataDictionaryAttribute.cs | 0 ...taDictionaryControllerPropertyActivator.cs | 0 .../ViewDataDictionaryFactory.cs | 4 +-- .../ViewDataDictionaryOfT.cs | 0 .../{ViewFeatures => }/ViewDataEvaluator.cs | 0 .../{ViewFeatures => }/ViewDataInfo.cs | 0 .../{ViewFeatures => }/ViewExecutor.cs | 2 +- .../{ViewFeatures => }/ViewResultExecutor.cs | 1 - .../breakingchanges.netcore.json | 30 +++++++++++++++++++ .../RazorPageActivatorTest.cs | 1 - .../RazorPageCreateModelExpressionTest.cs | 1 - .../RazorPageCreateTagHelperTest.cs | 1 - .../RazorPageTest.cs | 2 +- .../RazorViewTest.cs | 3 +- .../Internal/PageActionInvokerTest.cs | 2 -- ...geSaveTempDataPropertyFilterFactoryTest.cs | 2 +- .../PageSaveTempDataPropertyFilterTest.cs | 2 +- .../PageViewDataAttributeFilterFactoryTest.cs | 2 +- .../PageViewDataAttributeFilterTest.cs | 2 +- .../PageTest.cs | 1 - .../InputTagHelperTest.cs | 1 - .../PartialTagHelperTest.cs | 2 +- .../MvcServiceCollectionExtensionsTest.cs | 2 +- .../AntiforgeryExtensionsTest.cs | 0 .../AttributeDictionaryTest.cs | 0 .../PagedBufferedTextWriterTest.cs | 2 +- .../PagedCharBufferTest.cs | 2 +- .../{Internal => Buffers}/ViewBufferTest.cs | 2 +- .../ViewBufferTextWriterTest.cs | 2 +- .../CachedExpressionCompilerTest.cs | 0 .../CookieTempDataProviderTest.cs | 10 ++----- .../DefaultDisplayTemplatesTest.cs | 2 +- .../DefaultEditorTemplatesTest.cs | 2 +- .../DefaultHtmlGeneratorTest.cs | 0 ...aultValidationHtmlAttributeProviderTest.cs | 0 .../{Internal => }/ExpressionHelperTest.cs | 2 +- .../ExpressionMetadataProviderTest.cs | 2 +- ...AntiforgeryTokenAuthorizationFilterTest.cs | 2 +- ...erSaveTempDataPropertyFilterFactoryTest.cs | 2 +- ...ontrollerSaveTempDataPropertyFilterTest.cs | 2 +- ...ollerViewDataAttributeFilterFactoryTest.cs | 3 +- .../ControllerViewDataAttributeFilterTest.cs | 3 +- .../LifecyclePropertyTest.cs | 2 +- .../SaveTempDataFilterTest.cs | 2 +- .../TempDataApplicationModelProviderTest.cs | 2 +- .../TempDataSerializerTest.cs | 2 +- ...AntiforgeryTokenAuthorizationFilterTest.cs | 2 +- ...taAttributeApplicationModelProviderTest.cs | 2 +- .../ViewDataAttributePropertyProviderTest.cs | 2 +- .../{Internal => }/FormatWeekHelperTest.cs | 2 +- .../HtmlAttributePropertyHelperTest.cs | 2 +- .../{ViewFeatures => }/JsonHelperTest.cs | 0 .../MemberExpressionCacheKeyComparerTest.cs | 0 .../MemberExpressionCacheKeyTest.cs | 0 .../ModelExplorerExtensionsTest.cs | 0 .../{ViewFeatures => }/ModelExplorerTest.cs | 0 .../PartialViewResultExecutorTest.cs | 0 .../Rendering/DefaultTemplatesUtilities.cs | 2 +- .../Rendering/HtmlHelperSelectTest.cs | 2 +- .../SessionStateTempDataProviderTest.cs | 1 - .../StringHtmlContentTest.cs | 0 .../TempDataDictionaryFactoryTest.cs | 0 .../TempDataDictionaryTest.cs | 0 .../{Internal => }/TemplateRendererTest.cs | 2 +- .../ViewComponentResultTest.cs | 2 +- .../DefaultViewComponentHelperTest.cs | 2 +- .../ViewComponentContextTest.cs | 1 - .../ViewDataDictionaryOfTModelTest.cs | 0 .../ViewDataDictionaryTest.cs | 0 .../{ViewFeatures => }/ViewDataOfTTest.cs | 0 .../{ViewFeatures => }/ViewExecutorTest.cs | 0 .../ViewResultExecutorTest.cs | 0 .../ViewResultTest.cs | 1 - .../TestViewBufferScope.cs | 2 +- 190 files changed, 216 insertions(+), 237 deletions(-) create mode 100644 src/Microsoft.AspNetCore.Mvc.TagHelpers/breakingchanges.netcore.json rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/AntiforgeryExtensions.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/AttributeDictionary.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Buffers}/ArrayPoolBufferSource.cs (81%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Buffers}/CharArrayBufferSource.cs (78%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Buffers}/ICharBufferSource.cs (72%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Buffers}/IViewBufferScope.cs (95%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Buffers}/MemoryPoolViewBufferScope.cs (96%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Buffers}/PagedBufferedTextWriter.cs (98%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Buffers}/PagedCharBuffer.cs (97%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Buffers}/ViewBuffer.cs (99%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Buffers}/ViewBufferPage.cs (89%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Buffers}/ViewBufferTextWriter.cs (95%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Buffers}/ViewBufferValue.cs (96%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/CachedExpressionCompiler.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/CookieTempDataProvider.cs (99%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => }/DefaultDisplayTemplates.cs (98%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => }/DefaultEditorTemplates.cs (99%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/DefaultHtmlGenerator.cs (99%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/DefaultHtmlGeneratorExtensions.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/DefaultValidationHtmlAttributeProvider.cs (98%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => DependencyInjection}/MvcViewOptionsSetup.cs (94%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => DependencyInjection}/TempDataMvcOptionsSetup.cs (69%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => }/DynamicViewData.cs (95%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => }/ExpressionHelper.cs (99%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => }/ExpressionMetadataProvider.cs (98%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => }/ExpressionTextCache.cs (98%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Filters}/AutoValidateAntiforgeryTokenAuthorizationFilter.cs (88%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Filters}/ControllerSaveTempDataPropertyFilter.cs (89%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Filters}/ControllerSaveTempDataPropertyFilterFactory.cs (91%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Filters}/ControllerViewDataAttributeFilter.cs (92%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Filters}/ControllerViewDataAttributeFilterFactory.cs (89%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Filters}/ISaveTempDataCallback.cs (70%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Filters}/IViewDataValuesProviderFeature.cs (69%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Filters}/LifecycleProperty.cs (92%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Filters}/SaveTempDataFilter.cs (97%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Filters}/SaveTempDataPropertyFilterBase.cs (97%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Filters}/TempDataApplicationModelProvider.cs (94%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Filters}/TempDataSerializer.cs (96%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Filters}/ValidateAntiforgeryTokenAuthorizationFilter.cs (92%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Filters}/ViewDataAttributeApplicationModelProvider.cs (93%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => Filters}/ViewDataAttributePropertyProvider.cs (92%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/FormContext.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => }/FormatWeekHelper.cs (95%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => }/HtmlAttributePropertyHelper.cs (95%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/HtmlHelper.cs (99%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/HtmlHelperOfT.cs (97%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/HtmlHelperOptions.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/IAntiforgeryPolicy.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/IFileVersionProvider.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/IHtmlGenerator.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/IModelExpressionProvider.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/ITempDataDictionary.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/ITempDataDictionaryFactory.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/ITempDataProvider.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/InputType.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/JsonHelper.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/MemberExpressionCacheKey.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/MemberExpressionCacheKeyComparer.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/ModelExplorer.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/ModelExplorerExtensions.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/ModelExpression.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/ModelExpressionProvider.cs (98%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/ModelMetadataProviderExtensions.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => }/MvcViewFeaturesDiagnosticSourceExtensions.cs (99%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => }/MvcViewFeaturesLoggerExtensions.cs (99%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/MvcViewOptionsConfigureCompatibilityOptions.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => }/NameAndIdProvider.cs (98%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => }/NullView.cs (88%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/PartialViewResultExecutor.cs (99%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/SaveTempDataAttribute.cs (96%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/SessionStateTempDataProvider.cs (96%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/StringHtmlContent.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/TempDataDictionary.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/TempDataDictionaryFactory.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/TemplateBuilder.cs (97%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/TemplateInfo.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/TemplateRenderer.cs (98%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/TryGetValueDelegate.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/TryGetValueProvider.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => }/ValidationHelpers.cs (97%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/ValidationHtmlAttributeProvider.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/ViewComponentResultExecutor.cs (99%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/ViewContextAttribute.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/ViewDataDictionary.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/ViewDataDictionaryAttribute.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/ViewDataDictionaryControllerPropertyActivator.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{Internal => }/ViewDataDictionaryFactory.cs (95%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/ViewDataDictionaryOfT.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/ViewDataEvaluator.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/ViewDataInfo.cs (100%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/ViewExecutor.cs (99%) rename src/Microsoft.AspNetCore.Mvc.ViewFeatures/{ViewFeatures => }/ViewResultExecutor.cs (99%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{ViewFeatures => }/AntiforgeryExtensionsTest.cs (100%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{ViewFeatures => }/AttributeDictionaryTest.cs (100%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => Buffers}/PagedBufferedTextWriterTest.cs (99%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => Buffers}/PagedCharBufferTest.cs (99%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => Buffers}/ViewBufferTest.cs (99%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => Buffers}/ViewBufferTextWriterTest.cs (99%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{ViewFeatures => }/CachedExpressionCompilerTest.cs (100%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{ViewFeatures => }/CookieTempDataProviderTest.cs (99%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => }/DefaultDisplayTemplatesTest.cs (99%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => }/DefaultEditorTemplatesTest.cs (99%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{ViewFeatures => }/DefaultHtmlGeneratorTest.cs (100%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{ViewFeatures => }/DefaultValidationHtmlAttributeProviderTest.cs (100%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => }/ExpressionHelperTest.cs (99%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => }/ExpressionMetadataProviderTest.cs (99%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => Filters}/AutoValidateAntiforgeryTokenAuthorizationFilterTest.cs (98%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => Filters}/ControllerSaveTempDataPropertyFilterFactoryTest.cs (96%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => Filters}/ControllerSaveTempDataPropertyFilterTest.cs (99%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => Filters}/ControllerViewDataAttributeFilterFactoryTest.cs (89%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => Filters}/ControllerViewDataAttributeFilterTest.cs (97%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => Filters}/LifecyclePropertyTest.cs (98%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => Filters}/SaveTempDataFilterTest.cs (99%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => Filters}/TempDataApplicationModelProviderTest.cs (99%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => Filters}/TempDataSerializerTest.cs (98%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => Filters}/ValidateAntiforgeryTokenAuthorizationFilterTest.cs (98%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => Filters}/ViewDataAttributeApplicationModelProviderTest.cs (98%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => Filters}/ViewDataAttributePropertyProviderTest.cs (98%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => }/FormatWeekHelperTest.cs (97%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => }/HtmlAttributePropertyHelperTest.cs (98%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{ViewFeatures => }/JsonHelperTest.cs (100%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => }/MemberExpressionCacheKeyComparerTest.cs (100%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => }/MemberExpressionCacheKeyTest.cs (100%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{ViewFeatures => }/ModelExplorerExtensionsTest.cs (100%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{ViewFeatures => }/ModelExplorerTest.cs (100%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{ViewFeatures => }/PartialViewResultExecutorTest.cs (100%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{ViewFeatures => }/SessionStateTempDataProviderTest.cs (99%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{ViewFeatures => }/StringHtmlContentTest.cs (100%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{ViewFeatures => }/TempDataDictionaryFactoryTest.cs (100%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{ViewFeatures => }/TempDataDictionaryTest.cs (100%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{Internal => }/TemplateRendererTest.cs (98%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{ViewFeatures => }/ViewDataDictionaryOfTModelTest.cs (100%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{ViewFeatures => }/ViewDataDictionaryTest.cs (100%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{ViewFeatures => }/ViewDataOfTTest.cs (100%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{ViewFeatures => }/ViewExecutorTest.cs (100%) rename test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/{ViewFeatures => }/ViewResultExecutorTest.cs (100%) diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorPagePropertyActivator.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorPagePropertyActivator.cs index b163088361..7ce90adf82 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorPagePropertyActivator.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorPagePropertyActivator.cs @@ -8,7 +8,6 @@ using System.Text.Encodings.Web; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Internal; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs b/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs index 016076520f..8f2a98defa 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs @@ -16,7 +16,7 @@ using Microsoft.AspNetCore.Mvc.Razor.Internal; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.Routing; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers; using Microsoft.AspNetCore.Razor.Runtime.TagHelpers; using Microsoft.AspNetCore.Razor.TagHelpers; using Microsoft.Extensions.DependencyInjection; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/RazorView.cs b/src/Microsoft.AspNetCore.Mvc.Razor/RazorView.cs index 10ef8139da..c50a574711 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/RazorView.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor/RazorView.cs @@ -7,10 +7,10 @@ using System.Diagnostics; using System.Linq; using System.Text.Encodings.Web; using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc.Razor.Internal; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewEngines; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; -using Microsoft.AspNetCore.Mvc.Razor.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers; using Microsoft.Extensions.DependencyInjection; namespace Microsoft.AspNetCore.Mvc.Razor diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageResultExecutor.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageResultExecutor.cs index 967c6fa07d..17a5c8e68b 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageResultExecutor.cs +++ b/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageResultExecutor.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Mvc.Razor; using Microsoft.AspNetCore.Mvc.ViewEngines; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure { diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvoker.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvoker.cs index d616d223e0..bae7346e04 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvoker.cs +++ b/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvoker.cs @@ -15,7 +15,6 @@ using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvokerProvider.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvokerProvider.cs index 007a2f9b14..31904ed3db 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvokerProvider.cs +++ b/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvokerProvider.cs @@ -9,12 +9,10 @@ using System.Linq; using Microsoft.AspNetCore.Mvc.Abstractions; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.Infrastructure; -using Microsoft.AspNetCore.Mvc.Internal; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.Razor; using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.AspNetCore.Razor.Language; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageSaveTempDataPropertyFilter.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageSaveTempDataPropertyFilter.cs index e3f3355fde..2fedf3b2a3 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageSaveTempDataPropertyFilter.cs +++ b/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageSaveTempDataPropertyFilter.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; namespace Microsoft.AspNetCore.Mvc.RazorPages { diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageSaveTempDataPropertyFilterFactory.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageSaveTempDataPropertyFilterFactory.cs index b50ce6b2a9..d65056c9a8 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageSaveTempDataPropertyFilterFactory.cs +++ b/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageSaveTempDataPropertyFilterFactory.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using Microsoft.AspNetCore.Mvc.Filters; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; using Microsoft.Extensions.DependencyInjection; namespace Microsoft.AspNetCore.Mvc.RazorPages diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageViewDataAttributeFilter.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageViewDataAttributeFilter.cs index 1199f1a91e..28d7e1e4e5 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageViewDataAttributeFilter.cs +++ b/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageViewDataAttributeFilter.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; namespace Microsoft.AspNetCore.Mvc.RazorPages { diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageViewDataAttributeFilterFactory.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageViewDataAttributeFilterFactory.cs index e75f518aec..45398e9327 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageViewDataAttributeFilterFactory.cs +++ b/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageViewDataAttributeFilterFactory.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using Microsoft.AspNetCore.Mvc.Filters; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; namespace Microsoft.AspNetCore.Mvc.RazorPages { diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/TempDataFilterPageApplicationModelProvider.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/TempDataFilterPageApplicationModelProvider.cs index 411c13c608..4104c4af1f 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/TempDataFilterPageApplicationModelProvider.cs +++ b/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/TempDataFilterPageApplicationModelProvider.cs @@ -3,7 +3,7 @@ using System; using Microsoft.AspNetCore.Mvc.ApplicationModels; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; using Microsoft.Extensions.Options; namespace Microsoft.AspNetCore.Mvc.RazorPages diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ViewDataAttributePageApplicationModelProvider.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ViewDataAttributePageApplicationModelProvider.cs index cdfbe11f0c..65f81dd58d 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ViewDataAttributePageApplicationModelProvider.cs +++ b/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ViewDataAttributePageApplicationModelProvider.cs @@ -3,8 +3,7 @@ using System; using Microsoft.AspNetCore.Mvc.ApplicationModels; -using Microsoft.AspNetCore.Mvc.RazorPages.Internal; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; namespace Microsoft.AspNetCore.Mvc.RazorPages { diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelper.cs b/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelper.cs index de3fc45194..72d106ce91 100644 --- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelper.cs +++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelper.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Html; using Microsoft.AspNetCore.Mvc.TagHelpers.Cache; using Microsoft.AspNetCore.Mvc.TagHelpers.Internal; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers; using Microsoft.AspNetCore.Razor.TagHelpers; using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Primitives; diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/InputTagHelper.cs b/src/Microsoft.AspNetCore.Mvc.TagHelpers/InputTagHelper.cs index 8ea3effdd4..16e7950dba 100644 --- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/InputTagHelper.cs +++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/InputTagHelper.cs @@ -7,7 +7,6 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.AspNetCore.Razor.TagHelpers; namespace Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/PartialTagHelper.cs b/src/Microsoft.AspNetCore.Mvc.TagHelpers/PartialTagHelper.cs index 617fa5d3a2..3797ea5ff1 100644 --- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/PartialTagHelper.cs +++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/PartialTagHelper.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewEngines; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers; using Microsoft.AspNetCore.Razor.TagHelpers; namespace Microsoft.AspNetCore.Mvc.TagHelpers @@ -34,10 +34,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers public PartialTagHelper( ICompositeViewEngine viewEngine, -#pragma warning disable PUB0001 // Pubternal type in public API - IViewBufferScope viewBufferScope -#pragma warning restore PUB0001 - ) + IViewBufferScope viewBufferScope) { _viewEngine = viewEngine ?? throw new ArgumentNullException(nameof(viewEngine)); _viewBufferScope = viewBufferScope ?? throw new ArgumentNullException(nameof(viewBufferScope)); diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/breakingchanges.netcore.json b/src/Microsoft.AspNetCore.Mvc.TagHelpers/breakingchanges.netcore.json new file mode 100644 index 0000000000..2f91e8be92 --- /dev/null +++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/breakingchanges.netcore.json @@ -0,0 +1,7 @@ +[ + { + "TypeId": "public class Microsoft.AspNetCore.Mvc.TagHelpers.PartialTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper", + "MemberId": "public .ctor(Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine viewEngine, Microsoft.AspNetCore.Mvc.ViewFeatures.Internal.IViewBufferScope viewBufferScope)", + "Kind": "Removal" + } +] \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/AntiforgeryExtensions.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AntiforgeryExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/AntiforgeryExtensions.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/AntiforgeryExtensions.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/AttributeDictionary.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AttributeDictionary.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/AttributeDictionary.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/AttributeDictionary.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AutoValidateAntiforgeryTokenAttribute.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AutoValidateAntiforgeryTokenAttribute.cs index 673e52c261..8fc6724074 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AutoValidateAntiforgeryTokenAttribute.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AutoValidateAntiforgeryTokenAttribute.cs @@ -3,7 +3,7 @@ using System; using Microsoft.AspNetCore.Mvc.Filters; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; using Microsoft.Extensions.DependencyInjection; namespace Microsoft.AspNetCore.Mvc diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ArrayPoolBufferSource.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ArrayPoolBufferSource.cs similarity index 81% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ArrayPoolBufferSource.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ArrayPoolBufferSource.cs index b21e645cbc..bbfbf72440 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ArrayPoolBufferSource.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ArrayPoolBufferSource.cs @@ -3,9 +3,9 @@ using System.Buffers; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers { - public class ArrayPoolBufferSource : ICharBufferSource + internal class ArrayPoolBufferSource : ICharBufferSource { private readonly ArrayPool _pool; diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/CharArrayBufferSource.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/CharArrayBufferSource.cs similarity index 78% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/CharArrayBufferSource.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/CharArrayBufferSource.cs index 50d526172d..fa6ae6cbe9 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/CharArrayBufferSource.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/CharArrayBufferSource.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. -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers { - public class CharArrayBufferSource : ICharBufferSource + internal class CharArrayBufferSource : ICharBufferSource { public static readonly CharArrayBufferSource Instance = new CharArrayBufferSource(); diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ICharBufferSource.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ICharBufferSource.cs similarity index 72% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ICharBufferSource.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ICharBufferSource.cs index 99e23c1997..439aa46973 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ICharBufferSource.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ICharBufferSource.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. -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers { - public interface ICharBufferSource + internal interface ICharBufferSource { char[] Rent(int bufferSize); diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/IViewBufferScope.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/IViewBufferScope.cs similarity index 95% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/IViewBufferScope.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/IViewBufferScope.cs index 2b6f7ee37d..376d002ccd 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/IViewBufferScope.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/IViewBufferScope.cs @@ -3,7 +3,7 @@ using System.IO; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers { /// /// Creates and manages the lifetime of instances. diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MemoryPoolViewBufferScope.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/MemoryPoolViewBufferScope.cs similarity index 96% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MemoryPoolViewBufferScope.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/MemoryPoolViewBufferScope.cs index 9b72316f02..ca0f27e41b 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MemoryPoolViewBufferScope.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/MemoryPoolViewBufferScope.cs @@ -6,12 +6,12 @@ using System.Buffers; using System.Collections.Generic; using System.IO; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers { /// /// A that uses pooled memory. /// - public class MemoryPoolViewBufferScope : IViewBufferScope, IDisposable + internal class MemoryPoolViewBufferScope : IViewBufferScope, IDisposable { public static readonly int MinimumSize = 16; private readonly ArrayPool _viewBufferPool; diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/PagedBufferedTextWriter.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/PagedBufferedTextWriter.cs similarity index 98% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/PagedBufferedTextWriter.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/PagedBufferedTextWriter.cs index 4c8b1937c9..a6b9de4d17 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/PagedBufferedTextWriter.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/PagedBufferedTextWriter.cs @@ -9,7 +9,7 @@ using System.Runtime.CompilerServices; using System.Text; using System.Threading.Tasks; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers { public class PagedBufferedTextWriter : TextWriter { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/PagedCharBuffer.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/PagedCharBuffer.cs similarity index 97% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/PagedCharBuffer.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/PagedCharBuffer.cs index 0c4931c7b9..877a81910c 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/PagedCharBuffer.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/PagedCharBuffer.cs @@ -5,9 +5,9 @@ using System; using System.Collections.Generic; using System.Diagnostics; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers { - public class PagedCharBuffer : IDisposable + internal class PagedCharBuffer : IDisposable { public const int PageSize = 1024; private int _charIndex; diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBuffer.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBuffer.cs similarity index 99% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBuffer.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBuffer.cs index dfe23dce7c..de5964e46b 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBuffer.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBuffer.cs @@ -10,13 +10,13 @@ using System.Text.Encodings.Web; using System.Threading.Tasks; using Microsoft.AspNetCore.Html; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers { /// /// An that is backed by a buffer provided by . /// [DebuggerDisplay("{DebuggerToString()}")] - public class ViewBuffer : IHtmlContentBuilder + internal class ViewBuffer : IHtmlContentBuilder { public static readonly int PartialViewPageSize = 32; public static readonly int TagHelperPageSize = 32; diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBufferPage.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferPage.cs similarity index 89% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBufferPage.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferPage.cs index dfc47673ec..af360d9fcd 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBufferPage.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferPage.cs @@ -3,9 +3,9 @@ using System.Runtime.CompilerServices; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers { - public class ViewBufferPage + internal class ViewBufferPage { public ViewBufferPage(ViewBufferValue[] buffer) { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBufferTextWriter.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferTextWriter.cs similarity index 95% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBufferTextWriter.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferTextWriter.cs index e7d3761677..84f3a993a2 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBufferTextWriter.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferTextWriter.cs @@ -8,7 +8,7 @@ using System.Text.Encodings.Web; using System.Threading.Tasks; using Microsoft.AspNetCore.Html; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers { /// /// @@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal /// the writer and switches to writing to the unbuffered writer for all further write operations. /// /// - public class ViewBufferTextWriter : TextWriter + internal class ViewBufferTextWriter : TextWriter { private readonly TextWriter _inner; private readonly HtmlEncoder _htmlEncoder; @@ -161,15 +161,13 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal return; } - IHtmlContentContainer container; - IHtmlContent content; - if ((container = value as IHtmlContentContainer) != null) + if (value is IHtmlContentContainer container) { Write(container); } - else if ((content = value as IHtmlContent) != null) + else if (value is IHtmlContent htmlContent) { - Write(content); + Write(htmlContent); } else { @@ -227,16 +225,14 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal return; } - IHtmlContentContainer container; - IHtmlContent content; - if ((container = value as IHtmlContentContainer) != null) + if (value is IHtmlContentContainer container) { Write(container); Write(NewLine); } - else if ((content = value as IHtmlContent) != null) + else if (value is IHtmlContent htmlContent) { - Write(content); + Write(htmlContent); Write(NewLine); } else diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBufferValue.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferValue.cs similarity index 96% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBufferValue.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferValue.cs index 68691a9868..4f2bd4bf82 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewBufferValue.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferValue.cs @@ -6,7 +6,7 @@ using System.IO; using System.Text.Encodings.Web; using Microsoft.AspNetCore.Html; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers { /// /// Encapsulates a string or value. diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/CachedExpressionCompiler.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/CachedExpressionCompiler.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/CachedExpressionCompiler.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/CachedExpressionCompiler.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Controller.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Controller.cs index c0aaa0e3b3..7af52c185a 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Controller.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Controller.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.Extensions.DependencyInjection; using Newtonsoft.Json; diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/CookieTempDataProvider.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/CookieTempDataProvider.cs similarity index 99% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/CookieTempDataProvider.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/CookieTempDataProvider.cs index 073c400f78..6a52e7b636 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/CookieTempDataProvider.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/CookieTempDataProvider.cs @@ -5,11 +5,11 @@ using System; using System.Collections.Generic; using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.WebUtilities; using Microsoft.AspNetCore.Internal; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; -using Microsoft.Extensions.Options; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; +using Microsoft.AspNetCore.WebUtilities; using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Options; namespace Microsoft.AspNetCore.Mvc.ViewFeatures { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DefaultDisplayTemplates.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultDisplayTemplates.cs similarity index 98% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DefaultDisplayTemplates.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultDisplayTemplates.cs index eb071f5807..d1671a248e 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DefaultDisplayTemplates.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultDisplayTemplates.cs @@ -10,11 +10,12 @@ using Microsoft.AspNetCore.Html; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewEngines; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers; using Microsoft.Extensions.DependencyInjection; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures { - public static class DefaultDisplayTemplates + internal static class DefaultDisplayTemplates { public static IHtmlContent BooleanTemplate(IHtmlHelper htmlHelper) { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DefaultEditorTemplates.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultEditorTemplates.cs similarity index 99% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DefaultEditorTemplates.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultEditorTemplates.cs index 408448c651..847bd5d34e 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DefaultEditorTemplates.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultEditorTemplates.cs @@ -13,11 +13,12 @@ using Microsoft.AspNetCore.Html; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewEngines; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers; using Microsoft.Extensions.DependencyInjection; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures { - public static class DefaultEditorTemplates + internal static class DefaultEditorTemplates { private const string HtmlAttributeKey = "htmlAttributes"; private const string UsePasswordValue = "Switch.Microsoft.AspNetCore.Mvc.UsePasswordValue"; diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultHtmlGenerator.cs similarity index 99% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultHtmlGenerator.cs index 7504156c68..ec79c64859 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultHtmlGenerator.cs @@ -15,7 +15,6 @@ using Microsoft.AspNetCore.Html; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.Routing; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.Extensions.Options; namespace Microsoft.AspNetCore.Mvc.ViewFeatures diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGeneratorExtensions.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultHtmlGeneratorExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGeneratorExtensions.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultHtmlGeneratorExtensions.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultValidationHtmlAttributeProvider.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultValidationHtmlAttributeProvider.cs similarity index 98% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultValidationHtmlAttributeProvider.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultValidationHtmlAttributeProvider.cs index b141321bfb..1b2d5d1b7a 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/DefaultValidationHtmlAttributeProvider.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultValidationHtmlAttributeProvider.cs @@ -29,8 +29,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures public DefaultValidationHtmlAttributeProvider( IOptions optionsAccessor, IModelMetadataProvider metadataProvider, - ClientValidatorCache clientValidatorCache - ) + ClientValidatorCache clientValidatorCache) { if (optionsAccessor == null) { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs index 3db9a88249..01457ce718 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs @@ -14,7 +14,8 @@ using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewComponents; using Microsoft.AspNetCore.Mvc.ViewEngines; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Options; diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MvcViewOptionsSetup.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewOptionsSetup.cs similarity index 94% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MvcViewOptionsSetup.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewOptionsSetup.cs index 5e59f56345..9b454f2c86 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MvcViewOptionsSetup.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewOptionsSetup.cs @@ -2,17 +2,18 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; +using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.DataAnnotations; using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal; using Microsoft.Extensions.Localization; using Microsoft.Extensions.Options; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.Extensions.DependencyInjection { /// /// Sets up default options for . /// - public class MvcViewOptionsSetup : IConfigureOptions + internal class MvcViewOptionsSetup : IConfigureOptions { private readonly IOptions _dataAnnotationsLocalizationOptions; private readonly IValidationAttributeAdapterProvider _validationAttributeAdapterProvider; diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataMvcOptionsSetup.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/TempDataMvcOptionsSetup.cs similarity index 69% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataMvcOptionsSetup.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/TempDataMvcOptionsSetup.cs index 9d471020b3..4f6d7360e1 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataMvcOptionsSetup.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/TempDataMvcOptionsSetup.cs @@ -1,14 +1,16 @@ // 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.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.ViewFeatures; using Microsoft.Extensions.Options; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.Extensions.DependencyInjection { /// /// Sets up default options for . /// - public class TempDataMvcOptionsSetup : IConfigureOptions + internal class TempDataMvcOptionsSetup : IConfigureOptions { public void Configure(MvcOptions options) { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DynamicViewData.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DynamicViewData.cs similarity index 95% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DynamicViewData.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/DynamicViewData.cs index 8f17e95800..9068baec2e 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/DynamicViewData.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DynamicViewData.cs @@ -5,9 +5,9 @@ using System; using System.Collections.Generic; using System.Dynamic; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures { - public class DynamicViewData : DynamicObject + internal class DynamicViewData : DynamicObject { private readonly Func _viewDataFunc; diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ExpressionHelper.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionHelper.cs similarity index 99% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ExpressionHelper.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionHelper.cs index 4de9146bb2..aa2bd0df4e 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ExpressionHelper.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionHelper.cs @@ -9,9 +9,9 @@ using System.Linq.Expressions; using System.Reflection; using System.Text; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures { - public static class ExpressionHelper + internal static class ExpressionHelper { public static string GetExpressionText(string expression) { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ExpressionMetadataProvider.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionMetadataProvider.cs similarity index 98% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ExpressionMetadataProvider.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionMetadataProvider.cs index 0f8b11eacb..ae5aeba14b 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ExpressionMetadataProvider.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionMetadataProvider.cs @@ -8,9 +8,9 @@ using System.Linq.Expressions; using System.Reflection; using Microsoft.AspNetCore.Mvc.ModelBinding; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures { - public static class ExpressionMetadataProvider + internal static class ExpressionMetadataProvider { public static ModelExplorer FromLambdaExpression( Expression> expression, diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ExpressionTextCache.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionTextCache.cs similarity index 98% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ExpressionTextCache.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionTextCache.cs index cc774bebfc..6468769363 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ExpressionTextCache.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionTextCache.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Linq.Expressions; using Microsoft.Extensions.Internal; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures { /// /// This class holds the cache for the expression text that is computed by ExpressionHelper. diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/AutoValidateAntiforgeryTokenAuthorizationFilter.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/AutoValidateAntiforgeryTokenAuthorizationFilter.cs similarity index 88% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/AutoValidateAntiforgeryTokenAuthorizationFilter.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/AutoValidateAntiforgeryTokenAuthorizationFilter.cs index f159ed2da3..032fa98ec6 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/AutoValidateAntiforgeryTokenAuthorizationFilter.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/AutoValidateAntiforgeryTokenAuthorizationFilter.cs @@ -6,9 +6,9 @@ using Microsoft.AspNetCore.Antiforgery; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { - public class AutoValidateAntiforgeryTokenAuthorizationFilter : ValidateAntiforgeryTokenAuthorizationFilter + internal class AutoValidateAntiforgeryTokenAuthorizationFilter : ValidateAntiforgeryTokenAuthorizationFilter { public AutoValidateAntiforgeryTokenAuthorizationFilter(IAntiforgery antiforgery, ILoggerFactory loggerFactory) : base(antiforgery, loggerFactory) diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerSaveTempDataPropertyFilter.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerSaveTempDataPropertyFilter.cs similarity index 89% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerSaveTempDataPropertyFilter.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerSaveTempDataPropertyFilter.cs index e375ae94bc..bd83709054 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerSaveTempDataPropertyFilter.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerSaveTempDataPropertyFilter.cs @@ -2,9 +2,8 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNetCore.Mvc.Filters; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { internal class ControllerSaveTempDataPropertyFilter : SaveTempDataPropertyFilterBase, IActionFilter { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerSaveTempDataPropertyFilterFactory.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerSaveTempDataPropertyFilterFactory.cs similarity index 91% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerSaveTempDataPropertyFilterFactory.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerSaveTempDataPropertyFilterFactory.cs index 22b7754f72..3ee6b4b718 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerSaveTempDataPropertyFilterFactory.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerSaveTempDataPropertyFilterFactory.cs @@ -4,10 +4,9 @@ using System; using System.Collections.Generic; using Microsoft.AspNetCore.Mvc.Filters; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.Extensions.DependencyInjection; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { internal class ControllerSaveTempDataPropertyFilterFactory : IFilterFactory { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerViewDataAttributeFilter.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerViewDataAttributeFilter.cs similarity index 92% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerViewDataAttributeFilter.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerViewDataAttributeFilter.cs index f08508736d..7a37a43663 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerViewDataAttributeFilter.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerViewDataAttributeFilter.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using Microsoft.AspNetCore.Mvc.Filters; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { internal class ControllerViewDataAttributeFilter : IActionFilter, IViewDataValuesProviderFeature { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerViewDataAttributeFilterFactory.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerViewDataAttributeFilterFactory.cs similarity index 89% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerViewDataAttributeFilterFactory.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerViewDataAttributeFilterFactory.cs index 61e9e172df..9293aca872 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ControllerViewDataAttributeFilterFactory.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerViewDataAttributeFilterFactory.cs @@ -4,9 +4,8 @@ using System; using System.Collections.Generic; using Microsoft.AspNetCore.Mvc.Filters; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { internal class ControllerViewDataAttributeFilterFactory : IFilterFactory { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ISaveTempDataCallback.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ISaveTempDataCallback.cs similarity index 70% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ISaveTempDataCallback.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ISaveTempDataCallback.cs index 6f3aa16493..c331e6064b 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ISaveTempDataCallback.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ISaveTempDataCallback.cs @@ -3,9 +3,9 @@ using Microsoft.AspNetCore.Mvc.Filters; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { - public interface ISaveTempDataCallback : IFilterMetadata + internal interface ISaveTempDataCallback : IFilterMetadata { void OnTempDataSaving(ITempDataDictionary tempData); } diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/IViewDataValuesProviderFeature.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/IViewDataValuesProviderFeature.cs similarity index 69% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/IViewDataValuesProviderFeature.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/IViewDataValuesProviderFeature.cs index 50648d6ecf..1908b0cfef 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/IViewDataValuesProviderFeature.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/IViewDataValuesProviderFeature.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. -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { - public interface IViewDataValuesProviderFeature + internal interface IViewDataValuesProviderFeature { void ProvideViewDataValues(ViewDataDictionary viewData); } diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/LifecycleProperty.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/LifecycleProperty.cs similarity index 92% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/LifecycleProperty.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/LifecycleProperty.cs index 5eaf6e1491..f6cfd08eaa 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/LifecycleProperty.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/LifecycleProperty.cs @@ -6,10 +6,10 @@ using System.Diagnostics; using System.Reflection; using Microsoft.Extensions.Internal; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { [DebuggerDisplay("{PropertyInfo, nq}")] - public readonly struct LifecycleProperty + internal readonly struct LifecycleProperty { private readonly PropertyHelper _propertyHelper; private readonly bool _isReferenceTypeOrNullable; diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/SaveTempDataFilter.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/SaveTempDataFilter.cs similarity index 97% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/SaveTempDataFilter.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/SaveTempDataFilter.cs index 52e98e0677..0ab2ec33a1 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/SaveTempDataFilter.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/SaveTempDataFilter.cs @@ -7,12 +7,12 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Filters; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { /// /// A filter that saves temp data. /// - public class SaveTempDataFilter : IResourceFilter, IResultFilter + internal class SaveTempDataFilter : IResourceFilter, IResultFilter { // Internal for unit testing internal static readonly object SaveTempDataFilterContextKey = new object(); diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/SaveTempDataPropertyFilterBase.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/SaveTempDataPropertyFilterBase.cs similarity index 97% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/SaveTempDataPropertyFilterBase.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/SaveTempDataPropertyFilterBase.cs index ab4c79dff8..360aedfdbb 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/SaveTempDataPropertyFilterBase.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/SaveTempDataPropertyFilterBase.cs @@ -7,9 +7,9 @@ using System.Diagnostics; using System.Reflection; using Microsoft.Extensions.Internal; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { - public abstract class SaveTempDataPropertyFilterBase : ISaveTempDataCallback + internal abstract class SaveTempDataPropertyFilterBase : ISaveTempDataCallback { protected readonly ITempDataDictionaryFactory _tempDataFactory; diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataApplicationModelProvider.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/TempDataApplicationModelProvider.cs similarity index 94% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataApplicationModelProvider.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/TempDataApplicationModelProvider.cs index 47e30591e3..dce36d87da 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataApplicationModelProvider.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/TempDataApplicationModelProvider.cs @@ -3,10 +3,9 @@ using System; using Microsoft.AspNetCore.Mvc.ApplicationModels; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.Extensions.Options; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { internal class TempDataApplicationModelProvider : IApplicationModelProvider { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataSerializer.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/TempDataSerializer.cs similarity index 96% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataSerializer.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/TempDataSerializer.cs index fd92d4d8ca..244ea1f94e 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataSerializer.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/TempDataSerializer.cs @@ -14,9 +14,9 @@ using Newtonsoft.Json; using Newtonsoft.Json.Bson; using Newtonsoft.Json.Linq; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { - public class TempDataSerializer + internal class TempDataSerializer { private readonly JsonSerializer _jsonSerializer = JsonSerializer.Create(JsonSerializerSettingsProvider.CreateSerializerSettings()); @@ -62,9 +62,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal StringComparer.OrdinalIgnoreCase); foreach (var item in tempDataDictionary) { - var jArrayValue = item.Value as JArray; - var jObjectValue = item.Value as JObject; - if (jArrayValue != null && jArrayValue.Count > 0) + if (item.Value is JArray jArrayValue && jArrayValue.Count > 0) { var arrayType = jArrayValue[0].Type; if (_tokenTypeLookup.TryGetValue(arrayType, out var returnType)) @@ -85,7 +83,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal throw new InvalidOperationException(message); } } - else if (jObjectValue != null) + else if (item.Value is JObject jObjectValue) { if (!jObjectValue.HasValues) { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ValidateAntiforgeryTokenAuthorizationFilter.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ValidateAntiforgeryTokenAuthorizationFilter.cs similarity index 92% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ValidateAntiforgeryTokenAuthorizationFilter.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ValidateAntiforgeryTokenAuthorizationFilter.cs index 901ea36cf8..bad3aabeed 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ValidateAntiforgeryTokenAuthorizationFilter.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ValidateAntiforgeryTokenAuthorizationFilter.cs @@ -7,9 +7,9 @@ using Microsoft.AspNetCore.Antiforgery; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { - public class ValidateAntiforgeryTokenAuthorizationFilter : IAsyncAuthorizationFilter, IAntiforgeryPolicy + internal class ValidateAntiforgeryTokenAuthorizationFilter : IAsyncAuthorizationFilter, IAntiforgeryPolicy { private readonly IAntiforgery _antiforgery; private readonly ILogger _logger; diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewDataAttributeApplicationModelProvider.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ViewDataAttributeApplicationModelProvider.cs similarity index 93% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewDataAttributeApplicationModelProvider.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ViewDataAttributeApplicationModelProvider.cs index fa2f8eb052..7995e5d345 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewDataAttributeApplicationModelProvider.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ViewDataAttributeApplicationModelProvider.cs @@ -3,9 +3,8 @@ using System; using Microsoft.AspNetCore.Mvc.ApplicationModels; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { internal class ViewDataAttributeApplicationModelProvider : IApplicationModelProvider { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewDataAttributePropertyProvider.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ViewDataAttributePropertyProvider.cs similarity index 92% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewDataAttributePropertyProvider.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ViewDataAttributePropertyProvider.cs index 494a4b6c2d..102033ca9c 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewDataAttributePropertyProvider.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ViewDataAttributePropertyProvider.cs @@ -6,9 +6,9 @@ using System.Collections.Generic; using System.Reflection; using Microsoft.Extensions.Internal; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { - public static class ViewDataAttributePropertyProvider + internal static class ViewDataAttributePropertyProvider { public static IReadOnlyList GetViewDataProperties(Type type) { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/FormContext.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/FormContext.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/FormContext.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/FormContext.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/FormatWeekHelper.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/FormatWeekHelper.cs similarity index 95% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/FormatWeekHelper.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/FormatWeekHelper.cs index 56e8329a69..5ed508cd7d 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/FormatWeekHelper.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/FormatWeekHelper.cs @@ -5,9 +5,9 @@ using System; using System.Globalization; using System.Threading; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures { - public class FormatWeekHelper + internal static class FormatWeekHelper { public static string GetFormattedWeek(ModelExplorer modelExplorer) { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/HtmlAttributePropertyHelper.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlAttributePropertyHelper.cs similarity index 95% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/HtmlAttributePropertyHelper.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlAttributePropertyHelper.cs index 3b0db8ee6e..9f9161293d 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/HtmlAttributePropertyHelper.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlAttributePropertyHelper.cs @@ -6,7 +6,7 @@ using System.Collections.Concurrent; using System.Reflection; using Microsoft.Extensions.Internal; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures { internal class HtmlAttributePropertyHelper : PropertyHelper { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelper.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelper.cs similarity index 99% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelper.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelper.cs index 108ac5d7bf..8d5c7554ed 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelper.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelper.cs @@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Html; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewEngines; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers; using Microsoft.Extensions.Internal; namespace Microsoft.AspNetCore.Mvc.ViewFeatures @@ -43,9 +43,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures IHtmlGenerator htmlGenerator, ICompositeViewEngine viewEngine, IModelMetadataProvider metadataProvider, -#pragma warning disable PUB0001 // Pubternal type in public API IViewBufferScope bufferScope, -#pragma warning restore PUB0001 HtmlEncoder htmlEncoder, UrlEncoder urlEncoder) { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOfT.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperOfT.cs similarity index 97% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOfT.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperOfT.cs index f4bb418c20..34df7e0068 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOfT.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperOfT.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Html; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewEngines; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers; namespace Microsoft.AspNetCore.Mvc.ViewFeatures { @@ -24,15 +24,10 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures IHtmlGenerator htmlGenerator, ICompositeViewEngine viewEngine, IModelMetadataProvider metadataProvider, -#pragma warning disable PUB0001 // Pubternal type in public API IViewBufferScope bufferScope, -#pragma warning restore PUB0001 HtmlEncoder htmlEncoder, UrlEncoder urlEncoder, -#pragma warning disable PUB0001 // Pubternal type in public API - ExpressionTextCache expressionTextCache -#pragma warning restore PUB0001 - ) + ExpressionTextCache expressionTextCache) : base( htmlGenerator, viewEngine, diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOptions.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/HtmlHelperOptions.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperOptions.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/IAntiforgeryPolicy.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IAntiforgeryPolicy.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/IAntiforgeryPolicy.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/IAntiforgeryPolicy.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/IFileVersionProvider.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IFileVersionProvider.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/IFileVersionProvider.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/IFileVersionProvider.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/IHtmlGenerator.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IHtmlGenerator.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/IHtmlGenerator.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/IHtmlGenerator.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/IModelExpressionProvider.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/IModelExpressionProvider.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ITempDataDictionary.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ITempDataDictionary.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ITempDataDictionaryFactory.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionaryFactory.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ITempDataDictionaryFactory.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionaryFactory.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ITempDataProvider.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataProvider.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ITempDataProvider.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataProvider.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/InputType.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/InputType.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/InputType.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/InputType.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/JsonHelper.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/JsonHelper.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/JsonHelper.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/JsonHelper.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/MemberExpressionCacheKey.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MemberExpressionCacheKey.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/MemberExpressionCacheKey.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/MemberExpressionCacheKey.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/MemberExpressionCacheKeyComparer.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MemberExpressionCacheKeyComparer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/MemberExpressionCacheKeyComparer.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/MemberExpressionCacheKeyComparer.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExplorer.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExplorer.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExplorer.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExplorer.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExplorerExtensions.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExplorerExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExplorerExtensions.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExplorerExtensions.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExpression.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExpression.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExpressionProvider.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpressionProvider.cs similarity index 98% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExpressionProvider.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpressionProvider.cs index f6880a66f7..3a9d98eca6 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelExpressionProvider.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpressionProvider.cs @@ -4,7 +4,6 @@ using System; using System.Linq.Expressions; using Microsoft.AspNetCore.Mvc.ModelBinding; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; namespace Microsoft.AspNetCore.Mvc.ViewFeatures { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelMetadataProviderExtensions.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelMetadataProviderExtensions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ModelMetadataProviderExtensions.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelMetadataProviderExtensions.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelStateDictionaryExtensions.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelStateDictionaryExtensions.cs index 7e023c4b7f..a80479e75d 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelStateDictionaryExtensions.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelStateDictionaryExtensions.cs @@ -4,7 +4,7 @@ using System; using System.Linq; using System.Linq.Expressions; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures; namespace Microsoft.AspNetCore.Mvc.ModelBinding { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MvcViewFeaturesDiagnosticSourceExtensions.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewFeaturesDiagnosticSourceExtensions.cs similarity index 99% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MvcViewFeaturesDiagnosticSourceExtensions.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewFeaturesDiagnosticSourceExtensions.cs index 305b16a87d..d62d6d4028 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MvcViewFeaturesDiagnosticSourceExtensions.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewFeaturesDiagnosticSourceExtensions.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewComponents; using Microsoft.AspNetCore.Mvc.ViewEngines; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures { internal static class MvcViewFeaturesDiagnosticSourceExtensions { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MvcViewFeaturesLoggerExtensions.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewFeaturesLoggerExtensions.cs similarity index 99% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MvcViewFeaturesLoggerExtensions.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewFeaturesLoggerExtensions.cs index 7f77416b12..070d4ec775 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/MvcViewFeaturesLoggerExtensions.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewFeaturesLoggerExtensions.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Mvc.ViewComponents; using Microsoft.AspNetCore.Mvc.ViewEngines; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures { internal static class MvcViewFeaturesLoggerExtensions { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/MvcViewOptionsConfigureCompatibilityOptions.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewOptionsConfigureCompatibilityOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/MvcViewOptionsConfigureCompatibilityOptions.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewOptionsConfigureCompatibilityOptions.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/NameAndIdProvider.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/NameAndIdProvider.cs similarity index 98% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/NameAndIdProvider.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/NameAndIdProvider.cs index 83f9e518e9..c13e46cf23 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/NameAndIdProvider.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/NameAndIdProvider.cs @@ -4,12 +4,12 @@ using System; using Microsoft.AspNetCore.Mvc.Rendering; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures { /// /// Provides cached values for "name" and "id" HTML attributes. /// - public static class NameAndIdProvider + internal static class NameAndIdProvider { private static readonly object PreviousNameAndIdKey = typeof(PreviousNameAndId); diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/NullView.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/NullView.cs similarity index 88% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/NullView.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/NullView.cs index 6ce44ca33c..77d595e522 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/NullView.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/NullView.cs @@ -6,9 +6,9 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewEngines; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures { - public class NullView : IView + internal class NullView : IView { public static readonly NullView Instance = new NullView(); diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/PartialViewResultExecutor.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/PartialViewResultExecutor.cs similarity index 99% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/PartialViewResultExecutor.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/PartialViewResultExecutor.cs index 2644558bc6..39bcf58369 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/PartialViewResultExecutor.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/PartialViewResultExecutor.cs @@ -10,7 +10,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ViewEngines; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/AssemblyInfo.cs index c0dae432e0..581085ab42 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/AssemblyInfo.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/AssemblyInfo.cs @@ -3,7 +3,13 @@ using System.Runtime.CompilerServices; +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.RazorPages, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.TagHelpers, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] + [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Razor.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.RazorPages.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.TagHelpers.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Views.TestCommon, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.ViewFeatures.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/MvcForm.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/MvcForm.cs index 78837e1b23..32d90b2356 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/MvcForm.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/MvcForm.cs @@ -4,7 +4,7 @@ using System; using System.Text.Encodings.Web; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers; namespace Microsoft.AspNetCore.Mvc.Rendering { @@ -76,21 +76,20 @@ namespace Microsoft.AspNetCore.Mvc.Rendering return; } - var viewBufferWriter = _viewContext.Writer as ViewBufferTextWriter; - if (viewBufferWriter == null) - { - foreach (var content in formContext.EndOfFormContent) - { - content.WriteTo(_viewContext.Writer, _htmlEncoder); - } - } - else + if (_viewContext.Writer is ViewBufferTextWriter viewBufferWriter) { foreach (var content in formContext.EndOfFormContent) { viewBufferWriter.Write(content); } } + else + { + foreach (var content in formContext.EndOfFormContent) + { + content.WriteTo(_viewContext.Writer, _htmlEncoder); + } + } } } } diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/ViewContext.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/ViewContext.cs index 88b8b0d74d..f80bf61758 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/ViewContext.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/ViewContext.cs @@ -6,7 +6,6 @@ using System.IO; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ViewEngines; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; namespace Microsoft.AspNetCore.Mvc.Rendering { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/SaveTempDataAttribute.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/SaveTempDataAttribute.cs similarity index 96% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/SaveTempDataAttribute.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/SaveTempDataAttribute.cs index 1c9af6ca28..a42be35202 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/SaveTempDataAttribute.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/SaveTempDataAttribute.cs @@ -3,7 +3,7 @@ using System; using Microsoft.AspNetCore.Mvc.Filters; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; using Microsoft.Extensions.DependencyInjection; namespace Microsoft.AspNetCore.Mvc.ViewFeatures diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/SessionStateTempDataProvider.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/SessionStateTempDataProvider.cs similarity index 96% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/SessionStateTempDataProvider.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/SessionStateTempDataProvider.cs index f933e1163f..50fd26799c 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/SessionStateTempDataProvider.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/SessionStateTempDataProvider.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; namespace Microsoft.AspNetCore.Mvc.ViewFeatures { @@ -33,8 +33,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures // Accessing Session property will throw if the session middleware is not enabled. var session = context.Session; - byte[] value; - if (session.TryGetValue(TempDataSessionStateKey, out value)) + if (session.TryGetValue(TempDataSessionStateKey, out var value)) { // If we got it from Session, remove it so that no other request gets it session.Remove(TempDataSessionStateKey); diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/StringHtmlContent.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/StringHtmlContent.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/StringHtmlContent.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/StringHtmlContent.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TempDataDictionary.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataDictionary.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TempDataDictionary.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataDictionary.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TempDataDictionaryFactory.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataDictionaryFactory.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TempDataDictionaryFactory.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataDictionaryFactory.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TemplateBuilder.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateBuilder.cs similarity index 97% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TemplateBuilder.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateBuilder.cs index 62d4b3ea86..405f224878 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TemplateBuilder.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateBuilder.cs @@ -8,10 +8,11 @@ using Microsoft.AspNetCore.Html; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewEngines; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures { - public class TemplateBuilder + internal class TemplateBuilder { private readonly IViewEngine _viewEngine; private readonly IViewBufferScope _bufferScope; diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TemplateInfo.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateInfo.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TemplateInfo.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateInfo.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TemplateRenderer.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateRenderer.cs similarity index 98% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TemplateRenderer.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateRenderer.cs index f90a3441ed..7b90535cdf 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TemplateRenderer.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateRenderer.cs @@ -11,11 +11,12 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewEngines; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers; using Microsoft.Extensions.DependencyInjection; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures { - public class TemplateRenderer + internal class TemplateRenderer { private const string DisplayTemplateViewPath = "DisplayTemplates"; private const string EditorTemplateViewPath = "EditorTemplates"; diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TryGetValueDelegate.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TryGetValueDelegate.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TryGetValueDelegate.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/TryGetValueDelegate.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TryGetValueProvider.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TryGetValueProvider.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/TryGetValueProvider.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/TryGetValueProvider.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs index fcf1bd3f8f..cfdc6e14c8 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs @@ -3,7 +3,7 @@ using System; using Microsoft.AspNetCore.Mvc.Filters; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; using Microsoft.Extensions.DependencyInjection; namespace Microsoft.AspNetCore.Mvc diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ValidationHelpers.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidationHelpers.cs similarity index 97% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ValidationHelpers.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidationHelpers.cs index 54c40227dd..fec4837dde 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ValidationHelpers.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidationHelpers.cs @@ -6,9 +6,9 @@ using System.Collections.Generic; using System.Diagnostics; using Microsoft.AspNetCore.Mvc.ModelBinding; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures { - public static class ValidationHelpers + internal static class ValidationHelpers { public static string GetModelErrorMessageOrDefault(ModelError modelError) { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ValidationHtmlAttributeProvider.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidationHtmlAttributeProvider.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ValidationHtmlAttributeProvider.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidationHtmlAttributeProvider.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponent.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponent.cs index f0ae37312b..125fdc86ac 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponent.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponent.cs @@ -11,7 +11,6 @@ using Microsoft.AspNetCore.Mvc.Routing; using Microsoft.AspNetCore.Mvc.ViewComponents; using Microsoft.AspNetCore.Mvc.ViewEngines; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentResult.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentResult.cs index cbdb85574c..433f44eff4 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentResult.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentResult.cs @@ -5,7 +5,6 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.Extensions.DependencyInjection; namespace Microsoft.AspNetCore.Mvc diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewComponentResultExecutor.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentResultExecutor.cs similarity index 99% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewComponentResultExecutor.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentResultExecutor.cs index 69c8ffaff7..6a4fd56ba4 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewComponentResultExecutor.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentResultExecutor.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Mvc.Formatters; using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.Rendering; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; using Microsoft.AspNetCore.WebUtilities; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentHelper.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentHelper.cs index ad979c9ae0..d446a6c172 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentHelper.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentHelper.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Html; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers; using Microsoft.Extensions.Internal; namespace Microsoft.AspNetCore.Mvc.ViewComponents @@ -41,9 +41,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewComponents HtmlEncoder htmlEncoder, IViewComponentSelector selector, IViewComponentInvokerFactory invokerFactory, -#pragma warning disable PUB0001 // Pubternal type in public API IViewBufferScope viewBufferScope -#pragma warning restore PUB0001 ) { if (descriptorProvider == null) diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvoker.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvoker.cs index 9111ccef3b..5fdb90b505 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvoker.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvoker.cs @@ -7,7 +7,6 @@ using System.Diagnostics; using System.Threading.Tasks; using Microsoft.AspNetCore.Html; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; @@ -32,9 +31,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewComponents /// The . public DefaultViewComponentInvoker( IViewComponentFactory viewComponentFactory, -#pragma warning disable PUB0001 // Pubternal type in public API ViewComponentInvokerCache viewComponentInvokerCache, -#pragma warning restore PUB0001 DiagnosticSource diagnosticSource, ILogger logger) { @@ -179,20 +176,17 @@ namespace Microsoft.AspNetCore.Mvc.ViewComponents throw new InvalidOperationException(Resources.ViewComponent_MustReturnValue); } - var componentResult = value as IViewComponentResult; - if (componentResult != null) + if (value is IViewComponentResult componentResult) { return componentResult; } - var stringResult = value as string; - if (stringResult != null) + if (value is string stringResult) { return new ContentViewComponentResult(stringResult); } - var htmlContent = value as IHtmlContent; - if (htmlContent != null) + if (value is IHtmlContent htmlContent) { return new HtmlContentViewComponentResult(htmlContent); } diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvokerFactory.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvokerFactory.cs index 3d67017743..de1740f21c 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvokerFactory.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvokerFactory.cs @@ -3,7 +3,6 @@ using System; using System.Diagnostics; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.Extensions.Logging; namespace Microsoft.AspNetCore.Mvc.ViewComponents @@ -17,9 +16,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewComponents public DefaultViewComponentInvokerFactory( IViewComponentFactory viewComponentFactory, -#pragma warning disable PUB0001 // Pubternal type in public API ViewComponentInvokerCache viewComponentInvokerCache, -#pragma warning restore PUB0001 DiagnosticSource diagnosticSource, ILoggerFactory loggerFactory) { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentInvokerCache.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentInvokerCache.cs index 96316b3903..c1d5585944 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentInvokerCache.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentInvokerCache.cs @@ -4,10 +4,10 @@ using System; using System.Collections.Concurrent; using Microsoft.AspNetCore.Mvc.Infrastructure; -using Microsoft.AspNetCore.Mvc.ViewComponents; +using Microsoft.AspNetCore.Mvc.ViewFeatures; using Microsoft.Extensions.Internal; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewComponents { public class ViewComponentInvokerCache { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewViewComponentResult.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewViewComponentResult.cs index 7ccf1df877..bf7ff1f7f3 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewViewComponentResult.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewViewComponentResult.cs @@ -9,7 +9,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewEngines; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.Extensions.DependencyInjection; namespace Microsoft.AspNetCore.Mvc.ViewComponents diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewContextAttribute.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewContextAttribute.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataAttribute.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataAttribute.cs index ca0cee6ea0..e9b4c84aa2 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataAttribute.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataAttribute.cs @@ -2,9 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using System.Collections.Generic; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; namespace Microsoft.AspNetCore.Mvc { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionary.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryAttribute.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryAttribute.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryAttribute.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryAttribute.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewDataDictionaryFactory.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryFactory.cs similarity index 95% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewDataDictionaryFactory.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryFactory.cs index 86bd602f6c..76fa685923 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/ViewDataDictionaryFactory.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryFactory.cs @@ -7,9 +7,9 @@ using System.Linq.Expressions; using System.Reflection; using Microsoft.AspNetCore.Mvc.ModelBinding; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures { - public static class ViewDataDictionaryFactory + internal static class ViewDataDictionaryFactory { public static Func CreateFactory(TypeInfo modelType) { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryOfT.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataDictionaryOfT.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataEvaluator.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataEvaluator.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataEvaluator.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataEvaluator.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataInfo.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataInfo.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewDataInfo.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataInfo.cs diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewExecutor.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewExecutor.cs similarity index 99% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewExecutor.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewExecutor.cs index 054b67d4d6..e815f386d8 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewExecutor.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewExecutor.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewEngines; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; using Microsoft.Extensions.Options; namespace Microsoft.AspNetCore.Mvc.ViewFeatures diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewResultExecutor.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewResultExecutor.cs similarity index 99% rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewResultExecutor.cs rename to src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewResultExecutor.cs index 4a2ca98b6d..f23451992b 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewFeatures/ViewResultExecutor.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewResultExecutor.cs @@ -10,7 +10,6 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ViewEngines; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.Extensions.Internal; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/breakingchanges.netcore.json b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/breakingchanges.netcore.json index 4b0e23da35..2535632381 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/breakingchanges.netcore.json +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/breakingchanges.netcore.json @@ -12,5 +12,35 @@ "TypeId": "public class Microsoft.AspNetCore.Mvc.ViewFeatures.DefaultValidationHtmlAttributeProvider : Microsoft.AspNetCore.Mvc.ViewFeatures.ValidationHtmlAttributeProvider", "MemberId": "public .ctor(Microsoft.Extensions.Options.IOptions optionsAccessor, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.Internal.ClientValidatorCache clientValidatorCache)", "Kind": "Removal" + }, + { + "TypeId": "public class Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpressionProvider : Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider", + "MemberId": "public .ctor(Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, Microsoft.AspNetCore.Mvc.ViewFeatures.Internal.ExpressionTextCache expressionTextCache)", + "Kind": "Removal" + }, + { + "TypeId": "public class Microsoft.AspNetCore.Mvc.ViewComponents.DefaultViewComponentHelper : Microsoft.AspNetCore.Mvc.IViewComponentHelper, Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware", + "MemberId": "public .ctor(Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentDescriptorCollectionProvider descriptorProvider, System.Text.Encodings.Web.HtmlEncoder htmlEncoder, Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentSelector selector, Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentInvokerFactory invokerFactory, Microsoft.AspNetCore.Mvc.ViewFeatures.Internal.IViewBufferScope viewBufferScope)", + "Kind": "Removal" + }, + { + "TypeId": "public class Microsoft.AspNetCore.Mvc.ViewComponents.DefaultViewComponentInvoker : Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentInvoker", + "MemberId": "public .ctor(Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentFactory viewComponentFactory, Microsoft.AspNetCore.Mvc.ViewFeatures.Internal.ViewComponentInvokerCache viewComponentInvokerCache, System.Diagnostics.DiagnosticSource diagnosticSource, Microsoft.Extensions.Logging.ILogger logger)", + "Kind": "Removal" + }, + { + "TypeId": "public class Microsoft.AspNetCore.Mvc.ViewComponents.DefaultViewComponentInvokerFactory : Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentInvokerFactory", + "MemberId": "public .ctor(Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentFactory viewComponentFactory, Microsoft.AspNetCore.Mvc.ViewFeatures.Internal.ViewComponentInvokerCache viewComponentInvokerCache, System.Diagnostics.DiagnosticSource diagnosticSource, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory)", + "Kind": "Removal" + }, + { + "TypeId": "public class Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelper : Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper, Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware", + "MemberId": "public .ctor(Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator htmlGenerator, Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine viewEngine, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.ViewFeatures.Internal.IViewBufferScope bufferScope, System.Text.Encodings.Web.HtmlEncoder htmlEncoder, System.Text.Encodings.Web.UrlEncoder urlEncoder)", + "Kind": "Removal" + }, + { + "TypeId": "public class Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelper : Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelper, Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper", + "MemberId": "public .ctor(Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator htmlGenerator, Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine viewEngine, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.ViewFeatures.Internal.IViewBufferScope bufferScope, System.Text.Encodings.Web.HtmlEncoder htmlEncoder, System.Text.Encodings.Web.UrlEncoder urlEncoder, Microsoft.AspNetCore.Mvc.ViewFeatures.Internal.ExpressionTextCache expressionTextCache)", + "Kind": "Removal" } ] \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageActivatorTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageActivatorTest.cs index f96d2ba439..25f6072395 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageActivatorTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageActivatorTest.cs @@ -14,7 +14,6 @@ using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.Routing; using Microsoft.AspNetCore.Mvc.ViewEngines; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.WebEncoders.Testing; diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs index 015742b0c3..861944f0bb 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs @@ -11,7 +11,6 @@ using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using Moq; diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs index ed0bc63ca6..cc8ea7833e 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs @@ -20,7 +20,6 @@ using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.Routing; using Microsoft.AspNetCore.Mvc.ViewEngines; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.AspNetCore.Razor.TagHelpers; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.WebEncoders.Testing; diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageTest.cs index 73a92e8232..c94f921f3a 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageTest.cs @@ -16,7 +16,7 @@ using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.Routing; using Microsoft.AspNetCore.Mvc.ViewEngines; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers; using Microsoft.AspNetCore.Razor.Runtime.TagHelpers; using Microsoft.AspNetCore.Razor.TagHelpers; using Microsoft.AspNetCore.Routing; diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewTest.cs index 71fa07b67e..991b1de1b7 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewTest.cs @@ -13,10 +13,9 @@ using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.Razor.Compilation; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Primitives; using Microsoft.Extensions.WebEncoders.Testing; using Moq; using Xunit; diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionInvokerTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionInvokerTest.cs index f20ebc5d57..f6aff12602 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionInvokerTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionInvokerTest.cs @@ -12,7 +12,6 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Abstractions; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.Infrastructure; -using Microsoft.AspNetCore.Mvc.Internal; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; using Microsoft.AspNetCore.Mvc.Razor; @@ -20,7 +19,6 @@ using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewEngines; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.DependencyInjection; diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageSaveTempDataPropertyFilterFactoryTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageSaveTempDataPropertyFilterFactoryTest.cs index 92b7455009..7dfc55af46 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageSaveTempDataPropertyFilterFactoryTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageSaveTempDataPropertyFilterFactoryTest.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; using Microsoft.Extensions.DependencyInjection; using Moq; using Xunit; diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageSaveTempDataPropertyFilterTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageSaveTempDataPropertyFilterTest.cs index c6a1c27f2e..524cd24b9c 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageSaveTempDataPropertyFilterTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageSaveTempDataPropertyFilterTest.cs @@ -7,7 +7,7 @@ using System.Linq; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; using Microsoft.AspNetCore.Routing; using Moq; using Xunit; diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageViewDataAttributeFilterFactoryTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageViewDataAttributeFilterFactoryTest.cs index 8b032e59f9..9c66bbda13 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageViewDataAttributeFilterFactoryTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageViewDataAttributeFilterFactoryTest.cs @@ -2,7 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; using Moq; using Xunit; diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageViewDataAttributeFilterTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageViewDataAttributeFilterTest.cs index 1978424d5a..dd10aa73f9 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageViewDataAttributeFilterTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageViewDataAttributeFilterTest.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; using Microsoft.AspNetCore.Routing; using Xunit; diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/PageTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/PageTest.cs index 3a0e7ad2b1..f92db3a934 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/PageTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/PageTest.cs @@ -11,7 +11,6 @@ using Microsoft.AspNetCore.Mvc.Formatters; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Testing; using Moq; diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/InputTagHelperTest.cs b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/InputTagHelperTest.cs index ce787ccf14..265ecde1f0 100644 --- a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/InputTagHelperTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/InputTagHelperTest.cs @@ -10,7 +10,6 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.AspNetCore.Razor.TagHelpers; using Microsoft.AspNetCore.Razor.TagHelpers.Testing; using Microsoft.AspNetCore.Testing; diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/PartialTagHelperTest.cs b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/PartialTagHelperTest.cs index d6789c5376..5ac74627c4 100644 --- a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/PartialTagHelperTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/PartialTagHelperTest.cs @@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewEngines; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers; using Microsoft.AspNetCore.Razor.TagHelpers; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.WebEncoders.Testing; diff --git a/test/Microsoft.AspNetCore.Mvc.Test/MvcServiceCollectionExtensionsTest.cs b/test/Microsoft.AspNetCore.Mvc.Test/MvcServiceCollectionExtensionsTest.cs index f88c8dcb3b..56e278e42a 100644 --- a/test/Microsoft.AspNetCore.Mvc.Test/MvcServiceCollectionExtensionsTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Test/MvcServiceCollectionExtensionsTest.cs @@ -29,7 +29,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages.Internal; using Microsoft.AspNetCore.Mvc.TagHelpers; using Microsoft.AspNetCore.Mvc.ViewComponents; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/AntiforgeryExtensionsTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/AntiforgeryExtensionsTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/AntiforgeryExtensionsTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/AntiforgeryExtensionsTest.cs diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/AttributeDictionaryTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/AttributeDictionaryTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/AttributeDictionaryTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/AttributeDictionaryTest.cs diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/PagedBufferedTextWriterTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/PagedBufferedTextWriterTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/PagedBufferedTextWriterTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/PagedBufferedTextWriterTest.cs index 42bc170a5d..cd96649e92 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/PagedBufferedTextWriterTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/PagedBufferedTextWriterTest.cs @@ -8,7 +8,7 @@ using System.IO; using System.Threading.Tasks; using Xunit; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers { public class PagedBufferedTextWriterTest { diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/PagedCharBufferTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/PagedCharBufferTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/PagedCharBufferTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/PagedCharBufferTest.cs index 8c05f896f4..8a10564537 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/PagedCharBufferTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/PagedCharBufferTest.cs @@ -5,7 +5,7 @@ using System.Linq; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers { public class PagedCharBufferTest { diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewBufferTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/ViewBufferTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewBufferTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/ViewBufferTest.cs index eeb189dafc..baee0d7003 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewBufferTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/ViewBufferTest.cs @@ -11,7 +11,7 @@ using Microsoft.Extensions.WebEncoders.Testing; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers { public class ViewBufferTest { diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewBufferTextWriterTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/ViewBufferTextWriterTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewBufferTextWriterTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/ViewBufferTextWriterTest.cs index d5951053af..8b0619ad77 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewBufferTextWriterTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/ViewBufferTextWriterTest.cs @@ -13,7 +13,7 @@ using Microsoft.Extensions.WebEncoders.Testing; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers { public class ViewBufferTextWriterTest { diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/CachedExpressionCompilerTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/CachedExpressionCompilerTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/CachedExpressionCompilerTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/CachedExpressionCompilerTest.cs diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/CookieTempDataProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/CookieTempDataProviderTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/CookieTempDataProviderTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/CookieTempDataProviderTest.cs index 1fe6b0920b..b42ad325db 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/CookieTempDataProviderTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/CookieTempDataProviderTest.cs @@ -7,7 +7,7 @@ using System.Collections.Generic; using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Internal; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; using Microsoft.AspNetCore.WebUtilities; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Options; @@ -628,13 +628,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures } } - public CookieInfo this[string key] - { - get - { - return _cookies[key]; - } - } + public CookieInfo this[string key] => _cookies[key]; public void Append(string key, string value, CookieOptions options) { diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/DefaultDisplayTemplatesTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultDisplayTemplatesTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/DefaultDisplayTemplatesTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultDisplayTemplatesTest.cs index e9526d1d62..4a180a3836 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/DefaultDisplayTemplatesTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultDisplayTemplatesTest.cs @@ -14,7 +14,7 @@ using Microsoft.AspNetCore.Mvc.ViewEngines; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures { public class DefaultDisplayTemplatesTest { diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/DefaultEditorTemplatesTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultEditorTemplatesTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/DefaultEditorTemplatesTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultEditorTemplatesTest.cs index ad94d3bf9e..911d3c538b 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/DefaultEditorTemplatesTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultEditorTemplatesTest.cs @@ -19,7 +19,7 @@ using Microsoft.AspNetCore.Testing; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures { public class DefaultEditorTemplatesTest { diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/DefaultHtmlGeneratorTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultHtmlGeneratorTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/DefaultHtmlGeneratorTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultHtmlGeneratorTest.cs diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/DefaultValidationHtmlAttributeProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultValidationHtmlAttributeProviderTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/DefaultValidationHtmlAttributeProviderTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultValidationHtmlAttributeProviderTest.cs diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ExpressionHelperTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ExpressionHelperTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ExpressionHelperTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ExpressionHelperTest.cs index f316eea6be..4ad1ebdfe5 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ExpressionHelperTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ExpressionHelperTest.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Linq.Expressions; using Xunit; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures { public class ExpressionHelperTest { diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ExpressionMetadataProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ExpressionMetadataProviderTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ExpressionMetadataProviderTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ExpressionMetadataProviderTest.cs index c47802cfd0..3dfb94a3b8 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ExpressionMetadataProviderTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ExpressionMetadataProviderTest.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata; using Xunit; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures { public class ExpressionMetadataProviderTest { diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/AutoValidateAntiforgeryTokenAuthorizationFilterTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/AutoValidateAntiforgeryTokenAuthorizationFilterTest.cs similarity index 98% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/AutoValidateAntiforgeryTokenAuthorizationFilterTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/AutoValidateAntiforgeryTokenAuthorizationFilterTest.cs index 88129eeb7d..b788e7cc06 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/AutoValidateAntiforgeryTokenAuthorizationFilterTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/AutoValidateAntiforgeryTokenAuthorizationFilterTest.cs @@ -11,7 +11,7 @@ using Microsoft.Extensions.Logging.Abstractions; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { public class AutoValidateAntiforgeryTokenAuthorizationFilterTest { diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerSaveTempDataPropertyFilterFactoryTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerSaveTempDataPropertyFilterFactoryTest.cs similarity index 96% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerSaveTempDataPropertyFilterFactoryTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerSaveTempDataPropertyFilterFactoryTest.cs index 5383d49d1c..cdb4e3cf2b 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerSaveTempDataPropertyFilterFactoryTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerSaveTempDataPropertyFilterFactoryTest.cs @@ -5,7 +5,7 @@ using Microsoft.Extensions.DependencyInjection; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { public class ControllerSaveTempDataPropertyFilterFactoryTest { diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerSaveTempDataPropertyFilterTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerSaveTempDataPropertyFilterTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerSaveTempDataPropertyFilterTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerSaveTempDataPropertyFilterTest.cs index 7826bbb2e3..b11269a831 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerSaveTempDataPropertyFilterTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerSaveTempDataPropertyFilterTest.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Routing; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { public class ControllerSaveTempDataPropertyFilterTest { diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerViewDataAttributeFilterFactoryTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerViewDataAttributeFilterFactoryTest.cs similarity index 89% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerViewDataAttributeFilterFactoryTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerViewDataAttributeFilterFactoryTest.cs index 75638684ee..949d337a7e 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerViewDataAttributeFilterFactoryTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerViewDataAttributeFilterFactoryTest.cs @@ -2,11 +2,10 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { public class ControllerViewDataAttributeFilterFactoryTest { diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerViewDataAttributeFilterTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerViewDataAttributeFilterTest.cs similarity index 97% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerViewDataAttributeFilterTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerViewDataAttributeFilterTest.cs index c90f220557..0d9d893705 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ControllerViewDataAttributeFilterTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerViewDataAttributeFilterTest.cs @@ -8,11 +8,10 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Abstractions; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.ModelBinding; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.AspNetCore.Routing; using Xunit; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { public class ControllerViewDataAttributeFilterTest { diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/LifecyclePropertyTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/LifecyclePropertyTest.cs similarity index 98% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/LifecyclePropertyTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/LifecyclePropertyTest.cs index 87aa7dd5e7..bb9dad1a04 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/LifecyclePropertyTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/LifecyclePropertyTest.cs @@ -3,7 +3,7 @@ using Xunit; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { public class LifecyclePropertyTest { diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/SaveTempDataFilterTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/SaveTempDataFilterTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/SaveTempDataFilterTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/SaveTempDataFilterTest.cs index 9ccf374554..130849e8f1 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/SaveTempDataFilterTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/SaveTempDataFilterTest.cs @@ -12,7 +12,7 @@ using Microsoft.AspNetCore.Routing; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { public class SaveTempDataFilterTest { diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TempDataApplicationModelProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/TempDataApplicationModelProviderTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TempDataApplicationModelProviderTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/TempDataApplicationModelProviderTest.cs index e63c92aac3..35e744b6b1 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TempDataApplicationModelProviderTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/TempDataApplicationModelProviderTest.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.Extensions.Options; using Xunit; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { public class TempDataApplicationModelProviderTest { diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TempDataSerializerTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/TempDataSerializerTest.cs similarity index 98% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TempDataSerializerTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/TempDataSerializerTest.cs index 2cc577b21d..1e7320ef28 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TempDataSerializerTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/TempDataSerializerTest.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using Xunit; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { public class TempDataSerializerTest { diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ValidateAntiforgeryTokenAuthorizationFilterTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ValidateAntiforgeryTokenAuthorizationFilterTest.cs similarity index 98% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ValidateAntiforgeryTokenAuthorizationFilterTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ValidateAntiforgeryTokenAuthorizationFilterTest.cs index d8e62d278e..a19e9b7d4a 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ValidateAntiforgeryTokenAuthorizationFilterTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ValidateAntiforgeryTokenAuthorizationFilterTest.cs @@ -11,7 +11,7 @@ using Microsoft.Extensions.Logging.Abstractions; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { public class ValidateAntiforgeryTokenAuthorizationFilterTest { diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewDataAttributeApplicationModelProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ViewDataAttributeApplicationModelProviderTest.cs similarity index 98% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewDataAttributeApplicationModelProviderTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ViewDataAttributeApplicationModelProviderTest.cs index 048266c2f1..b76494b5df 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewDataAttributeApplicationModelProviderTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ViewDataAttributeApplicationModelProviderTest.cs @@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.Extensions.Options; using Xunit; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { public class ViewDataAttributeApplicationModelProviderTest { diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewDataAttributePropertyProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ViewDataAttributePropertyProviderTest.cs similarity index 98% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewDataAttributePropertyProviderTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ViewDataAttributePropertyProviderTest.cs index 1ab02127a9..536ad329d1 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/ViewDataAttributePropertyProviderTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ViewDataAttributePropertyProviderTest.cs @@ -5,7 +5,7 @@ using System; using System.Linq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Filters { public class ViewDataAttributePropertyProviderTest { diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/FormatWeekHelperTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/FormatWeekHelperTest.cs similarity index 97% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/FormatWeekHelperTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/FormatWeekHelperTest.cs index 9e0428743d..a2bc939c84 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/FormatWeekHelperTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/FormatWeekHelperTest.cs @@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata; using Xunit; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures { public class FormatWeekHelperTest { diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/HtmlAttributePropertyHelperTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/HtmlAttributePropertyHelperTest.cs similarity index 98% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/HtmlAttributePropertyHelperTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/HtmlAttributePropertyHelperTest.cs index 00c7672240..8d82c60905 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/HtmlAttributePropertyHelperTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/HtmlAttributePropertyHelperTest.cs @@ -6,7 +6,7 @@ using System.Reflection; using Microsoft.Extensions.Internal; using Xunit; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures { public class HtmlAttributePropertyHelperTest { diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/JsonHelperTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/JsonHelperTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/JsonHelperTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/JsonHelperTest.cs diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/MemberExpressionCacheKeyComparerTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/MemberExpressionCacheKeyComparerTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/MemberExpressionCacheKeyComparerTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/MemberExpressionCacheKeyComparerTest.cs diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/MemberExpressionCacheKeyTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/MemberExpressionCacheKeyTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/MemberExpressionCacheKeyTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/MemberExpressionCacheKeyTest.cs diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ModelExplorerExtensionsTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelExplorerExtensionsTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ModelExplorerExtensionsTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelExplorerExtensionsTest.cs diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ModelExplorerTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelExplorerTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ModelExplorerTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelExplorerTest.cs diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/PartialViewResultExecutorTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/PartialViewResultExecutorTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/PartialViewResultExecutorTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/PartialViewResultExecutorTest.cs diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs index 24377c95eb..79ed10e0b4 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs @@ -17,7 +17,7 @@ using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.Routing; using Microsoft.AspNetCore.Mvc.ViewEngines; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Localization; diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperSelectTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperSelectTest.cs index 41050775f2..60ec798ada 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperSelectTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperSelectTest.cs @@ -10,7 +10,7 @@ using System.Text.Encodings.Web; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ViewEngines; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.Localization; using Moq; diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/SessionStateTempDataProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/SessionStateTempDataProviderTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/SessionStateTempDataProviderTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/SessionStateTempDataProviderTest.cs index 3df754fa95..2086bbccc1 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/SessionStateTempDataProviderTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/SessionStateTempDataProviderTest.cs @@ -8,7 +8,6 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Xunit; namespace Microsoft.AspNetCore.Mvc.ViewFeatures diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/StringHtmlContentTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/StringHtmlContentTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/StringHtmlContentTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/StringHtmlContentTest.cs diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/TempDataDictionaryFactoryTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TempDataDictionaryFactoryTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/TempDataDictionaryFactoryTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TempDataDictionaryFactoryTest.cs diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/TempDataDictionaryTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TempDataDictionaryTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/TempDataDictionaryTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TempDataDictionaryTest.cs diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TemplateRendererTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TemplateRendererTest.cs similarity index 98% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TemplateRendererTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TemplateRendererTest.cs index 31345d4205..b6468f36db 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TemplateRendererTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TemplateRendererTest.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Http.Internal; using Microsoft.AspNetCore.Mvc.ModelBinding; using Xunit; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures { public class TemplateRendererTest { diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs index e2e633846a..5a94dc6546 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs @@ -16,7 +16,7 @@ using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ViewComponents; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentHelperTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentHelperTest.cs index 1bebf6ebac..a4334152f5 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentHelperTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentHelperTest.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; using Microsoft.AspNetCore.Mvc.ApplicationParts; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; +using Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers; using Microsoft.Extensions.WebEncoders.Testing; using Moq; using Xunit; diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentContextTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentContextTest.cs index 9d0709e0ce..8afdb8dc14 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentContextTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentContextTest.cs @@ -9,7 +9,6 @@ using Microsoft.AspNetCore.Mvc.Abstractions; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.WebEncoders.Testing; using Xunit; diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataDictionaryOfTModelTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewDataDictionaryOfTModelTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataDictionaryOfTModelTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewDataDictionaryOfTModelTest.cs diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataDictionaryTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewDataDictionaryTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataDictionaryTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewDataDictionaryTest.cs diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataOfTTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewDataOfTTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewDataOfTTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewDataOfTTest.cs diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewExecutorTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewExecutorTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewExecutorTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewExecutorTest.cs diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewResultExecutorTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewResultExecutorTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewFeatures/ViewResultExecutorTest.cs rename to test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewResultExecutorTest.cs diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewResultTest.cs b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewResultTest.cs index d31be86a02..5275edc841 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewResultTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewResultTest.cs @@ -12,7 +12,6 @@ using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewEngines; using Microsoft.AspNetCore.Mvc.ViewFeatures; -using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging.Abstractions; diff --git a/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestViewBufferScope.cs b/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestViewBufferScope.cs index 4497a592d4..0ef6e922f4 100644 --- a/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestViewBufferScope.cs +++ b/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestViewBufferScope.cs @@ -5,7 +5,7 @@ using System.Buffers; using System.Collections.Generic; using System.IO; -namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal +namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers { public class TestViewBufferScope : IViewBufferScope {