Make types in Microsoft.AspNetCore.Mvc.ViewFeatures internal

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;
 

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;

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.ViewFeatures.Buffers;
-using Microsoft.AspNetCore.Mvc.Razor.Internal;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.AspNetCore.Mvc.Razor

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
 {

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;
 

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;

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
 {

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

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
 {

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
 {

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

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.Filters;
-using Microsoft.AspNetCore.Mvc.ViewFeatures.Internal;
 
 namespace Microsoft.AspNetCore.Mvc.RazorPages
 {

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;

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

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)
-            IViewBufferScope viewBufferScope
-#pragma warning restore PUB0001
-            )
         {
             _viewEngine = viewEngine ?? throw new ArgumentNullException(nameof(viewEngine));
             _viewBufferScope = viewBufferScope ?? throw new ArgumentNullException(nameof(viewBufferScope));

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"
+  }
+]

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

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<char> _pool;
 

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();
 

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);
 

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
 {
     /// <summary>
     /// Creates and manages the lifetime of <see cref="T:ViewBufferValue[]"/> instances.

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
 {
     /// <summary>
     /// A <see cref="IViewBufferScope"/> that uses pooled memory.
     /// </summary>
-    public class MemoryPoolViewBufferScope : IViewBufferScope, IDisposable
+    internal class MemoryPoolViewBufferScope : IViewBufferScope, IDisposable
     {
         public static readonly int MinimumSize = 16;
         private readonly ArrayPool<ViewBufferValue> _viewBufferPool;

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
     {

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;

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
 {
     /// <summary>
     /// An <see cref="IHtmlContentBuilder"/> that is backed by a buffer provided by <see cref="IViewBufferScope"/>.
     /// </summary>
     [DebuggerDisplay("{DebuggerToString()}")]
-    public class ViewBuffer : IHtmlContentBuilder
+    internal class ViewBuffer : IHtmlContentBuilder
     {
         public static readonly int PartialViewPageSize = 32;
         public static readonly int TagHelperPageSize = 32;

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)
         {

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
 {
     /// <summary>
     /// <para>
@@ -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.
     /// </para>
     /// </summary>
-    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;
+            if (value is IHtmlContentContainer container)
-            IHtmlContent content;
-            if ((container = value as IHtmlContentContainer) != null)
             {
                 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;
+            if (value is IHtmlContentContainer container)
-            IHtmlContent content;
-            if ((container = value as IHtmlContentContainer) != null)
             {
                 Write(container);
                 Write(NewLine);
             }
-            else if ((content = value as IHtmlContent) != null)
+            else if (value is IHtmlContent htmlContent)
             {
-                Write(content);
+                Write(htmlContent);
                 Write(NewLine);
             }
             else

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
 {
     /// <summary>
     /// Encapsulates a string or <see cref="IHtmlContent"/> value.

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;
 

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.AspNetCore.Mvc.ViewFeatures.Filters;
-using Microsoft.Extensions.Options;
+using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNetCore.Mvc.ViewFeatures
 {

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)
         {

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";

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

src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultValidationHtmlAttributeProvider.cs

@@ -29,8 +29,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures
         public DefaultValidationHtmlAttributeProvider(
             IOptions<MvcViewOptions> optionsAccessor,
             IModelMetadataProvider metadataProvider,
-            ClientValidatorCache clientValidatorCache
+            ClientValidatorCache clientValidatorCache)
-            )
         {
             if (optionsAccessor == null)
             {

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;
 

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
 {
     /// <summary>
     /// Sets up default options for <see cref="MvcViewOptions"/>.
     /// </summary>
-    public class MvcViewOptionsSetup : IConfigureOptions<MvcViewOptions>
+    internal class MvcViewOptionsSetup : IConfigureOptions<MvcViewOptions>
     {
         private readonly IOptions<MvcDataAnnotationsLocalizationOptions> _dataAnnotationsLocalizationOptions;
         private readonly IValidationAttributeAdapterProvider _validationAttributeAdapterProvider;

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
 {
     /// <summary>
     /// Sets up default options for <see cref="MvcOptions"/>.
     /// </summary>
-    public class TempDataMvcOptionsSetup : IConfigureOptions<MvcOptions>
+    internal class TempDataMvcOptionsSetup : IConfigureOptions<MvcOptions>
     {
         public void Configure(MvcOptions options)
         {

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<ViewDataDictionary> _viewDataFunc;
 

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)
         {

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<TModel, TResult>(
             Expression<Func<TModel, TResult>> expression,

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
 {
     /// <summary>
     /// This class holds the cache for the expression text that is computed by ExpressionHelper.

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)

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
     {

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
     {

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
     {

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
     {

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);
     }

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);
     }

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;

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
 {
     /// <summary>
     /// A filter that saves temp data.
     /// </summary>
-    public class SaveTempDataFilter : IResourceFilter, IResultFilter
+    internal class SaveTempDataFilter : IResourceFilter, IResultFilter
     {
         // Internal for unit testing
         internal static readonly object SaveTempDataFilterContextKey = new object();

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;
 

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
     {

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;
+                if (item.Value is JArray jArrayValue && jArrayValue.Count > 0)
-                var jObjectValue = item.Value as JObject;
-                if (jArrayValue != null && 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)
                     {

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;

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
     {

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<LifecycleProperty> GetViewDataProperties(Type type)
         {

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)
         {

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
     {

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)
         {

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)
-            ExpressionTextCache expressionTextCache
-#pragma warning restore PUB0001
-            )
             : base(
                   htmlGenerator,
                   viewEngine,

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
 {

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
 {

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
     {

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
     {

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
 {
     /// <summary>
     /// Provides cached values for "name" and "id" HTML attributes.
     /// </summary>
-    public static class NameAndIdProvider
+    internal static class NameAndIdProvider
     {
         private static readonly object PreviousNameAndIdKey = typeof(PreviousNameAndId);
 

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();
 

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;

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")]

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 (_viewContext.Writer is ViewBufferTextWriter viewBufferWriter)
-            if (viewBufferWriter == null)
-            {
-                foreach (var content in formContext.EndOfFormContent)
-                {
-                    content.WriteTo(_viewContext.Writer, _htmlEncoder);
-                }
-            }
-            else
             {
                 foreach (var content in formContext.EndOfFormContent)
                 {
                     viewBufferWriter.Write(content);
                 }
             }
+            else
+            {
+                foreach (var content in formContext.EndOfFormContent)
+                {
+                    content.WriteTo(_viewContext.Writer, _htmlEncoder);
+                }
+            }
         }
     }
 }

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
 {

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

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 var value))
-            if (session.TryGetValue(TempDataSessionStateKey, out value))
             {
                 // If we got it from Session, remove it so that no other request gets it
                 session.Remove(TempDataSessionStateKey);

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;

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";