Move pubinternal types in Mvc.Razor and Mvc.RazorPages to internal

benchmarks/Microsoft.AspNetCore.Mvc.Performance/ActionSelectorBenchmark.cs

@@ -11,7 +11,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.ActionConstraints;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
-using Microsoft.AspNetCore.Mvc.Internal;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Logging.Abstractions;
 

benchmarks/Microsoft.AspNetCore.Mvc.Performance/MvcEndpointDatasourceBenchmark.cs

@@ -8,7 +8,6 @@ using BenchmarkDotNet.Attributes;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
-using Microsoft.AspNetCore.Mvc.Internal;
 using Microsoft.AspNetCore.Mvc.Routing;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.Routing.Patterns;

benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorBenchmarkBase.cs

@@ -6,7 +6,6 @@ using BenchmarkDotNet.Attributes;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.DataAnnotations;
-using Microsoft.AspNetCore.Mvc.Internal;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;

src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CSharpCompiler.cs

@@ -7,7 +7,6 @@ using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Emit;
@@ -15,9 +14,9 @@ using Microsoft.CodeAnalysis.Text;
 using Microsoft.Extensions.DependencyModel;
 using DependencyContextCompilationOptions = Microsoft.Extensions.DependencyModel.CompilationOptions;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
 {
-    public class CSharpCompiler
+    internal class CSharpCompiler
     {
 #pragma warning disable CS0618 // Type or member is obsolete
         private readonly RazorReferenceManager _referenceManager;

src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ChecksumValidator.cs

@@ -6,9 +6,9 @@ using System.Linq;
 using Microsoft.AspNetCore.Razor.Hosting;
 using Microsoft.AspNetCore.Razor.Language;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
 {
-    public static class ChecksumValidator
+    internal static class ChecksumValidator
     {
         public static bool IsRecompilationSupported(RazorCompiledItem item)
         {

src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompilationFailedExceptionFactory.cs

@@ -5,12 +5,11 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Diagnostics;
-using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
 {
     internal static class CompilationFailedExceptionFactory
     {

src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompiledViewDescriptor.cs

@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNetCore.Mvc.Razor.Internal;
 using Microsoft.AspNetCore.Razor.Hosting;
 using Microsoft.Extensions.Primitives;
 

src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultRazorPageFactoryProvider.cs

@@ -6,13 +6,13 @@ using System.Linq.Expressions;
 using System.Reflection;
 using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
 {
     /// <summary>
     /// Represents a <see cref="IRazorPageFactoryProvider"/> that creates <see cref="RazorPage"/> instances
     /// from razor files in the file system.
     /// </summary>
-    public class DefaultRazorPageFactoryProvider : IRazorPageFactoryProvider
+    internal class DefaultRazorPageFactoryProvider : IRazorPageFactoryProvider
     {
         private readonly IViewCompilerProvider _viewCompilerProvider;
 

src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultRazorReferenceManager.cs

@@ -5,14 +5,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
-using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 using Microsoft.CodeAnalysis;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
 {
 #pragma warning disable CS0618 // Type or member is obsolete
-    public class DefaultRazorReferenceManager : RazorReferenceManager
+    internal class DefaultRazorReferenceManager : RazorReferenceManager
 #pragma warning restore CS0618 // Type or member is obsolete
     {
         private readonly ApplicationPartManager _partManager;

src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ExpressionRewriter.cs

@@ -8,12 +8,12 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
 {
     /// <summary>
     /// An expression rewriter which can hoist a simple expression lambda into a private field.
     /// </summary>
-    public class ExpressionRewriter : CSharpSyntaxRewriter
+    internal class ExpressionRewriter : CSharpSyntaxRewriter
     {
         private static readonly string FieldNameTemplate = "__h{0}";
 

src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewCompiler.cs

@@ -10,7 +10,6 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 using Microsoft.AspNetCore.Razor.Hosting;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis.CSharp;
@@ -21,12 +20,12 @@ using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Primitives;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
 {
     /// <summary>
     /// Caches the result of runtime compilation of Razor files for the duration of the application lifetime.
     /// </summary>
-    public class RazorViewCompiler : IViewCompiler
+    internal class RazorViewCompiler : IViewCompiler
     {
         private readonly object _cacheLock = new object();
         private readonly Dictionary<string, CompiledViewDescriptor> _precompiledViews;

src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewCompilerProvider.cs

@@ -10,9 +10,9 @@ using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
 {
-    public class RazorViewCompilerProvider : IViewCompilerProvider
+    internal class RazorViewCompilerProvider : IViewCompilerProvider
     {
         private readonly RazorProjectEngine _razorProjectEngine;
         private readonly ApplicationPartManager _applicationPartManager;

src/Microsoft.AspNetCore.Mvc.Razor/Compilation/SymbolsUtility.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
 {
     /// <summary>
     /// Utility type for determining if a platform supports full pdb file generation.

src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ViewsFeatureProvider.cs

@@ -7,7 +7,6 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
-using Microsoft.AspNetCore.Mvc.Razor.Internal;
 using Microsoft.Extensions.Primitives;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Compilation

src/Microsoft.AspNetCore.Mvc.Razor/DefaultRazorViewEngineFileProviderAccessor.cs

@@ -4,12 +4,12 @@
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor
 {
     /// <summary>
     /// Default implementation of <see cref="IRazorViewEngineFileProviderAccessor"/>.
     /// </summary>
-    public class DefaultRazorViewEngineFileProviderAccessor : IRazorViewEngineFileProviderAccessor
+    internal class DefaultRazorViewEngineFileProviderAccessor : IRazorViewEngineFileProviderAccessor
     {
         /// <summary>
         /// Initializes a new instance of <see cref="DefaultRazorViewEngineFileProviderAccessor"/>.

src/Microsoft.AspNetCore.Mvc.Razor/DefaultTagHelperFactory.cs

@@ -11,12 +11,12 @@ using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor
 {
     /// <summary>
     /// Default implementation for <see cref="ITagHelperFactory"/>.
     /// </summary>
-    public class DefaultTagHelperFactory : ITagHelperFactory
+    internal class DefaultTagHelperFactory : ITagHelperFactory
     {
         private readonly ITagHelperActivator _activator;
         private readonly ConcurrentDictionary<Type, PropertyActivator<ViewContext>[]> _injectActions;

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

@@ -3,7 +3,6 @@
 
 using System;
 using Microsoft.AspNetCore.Mvc.Razor;
-using Microsoft.AspNetCore.Mvc.Razor.Internal;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 

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

@@ -11,7 +11,6 @@ using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 using Microsoft.AspNetCore.Mvc.Razor.Extensions;
 using Microsoft.AspNetCore.Mvc.Razor.Infrastructure;
-using Microsoft.AspNetCore.Mvc.Razor.Internal;
 using Microsoft.AspNetCore.Mvc.Razor.TagHelpers;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;

src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcViewOptionsSetup.cs

@@ -2,14 +2,16 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.Extensions.DependencyInjection
 {
     /// <summary>
     /// Configures <see cref="MvcViewOptions"/> to use <see cref="RazorViewEngine"/>.
     /// </summary>
-    public class MvcRazorMvcViewOptionsSetup : IConfigureOptions<MvcViewOptions>
+    internal class MvcRazorMvcViewOptionsSetup : IConfigureOptions<MvcViewOptions>
     {
         private readonly IRazorViewEngine _razorViewEngine;
 

src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/TagHelpersAsServices.cs

@@ -4,13 +4,13 @@
 using System;
 using System.Linq;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
+using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.AspNetCore.Mvc.Razor.TagHelpers;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.Extensions.DependencyInjection
 {
-    public static class TagHelpersAsServices
+    internal static class TagHelpersAsServices
     {
         public static void AddTagHelpersAsServices(ApplicationPartManager manager, IServiceCollection services)
         {

src/Microsoft.AspNetCore.Mvc.Razor/FileProviderRazorProject.cs

@@ -8,9 +8,9 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.Extensions.FileProviders;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor
 {
-    public class FileProviderRazorProjectFileSystem : RazorProjectFileSystem
+    internal class FileProviderRazorProjectFileSystem : RazorProjectFileSystem
     {
         private const string RazorFileExtension = ".cshtml";
         private readonly IFileProvider _provider;

src/Microsoft.AspNetCore.Mvc.Razor/FileProviderRazorProjectItem.cs

@@ -6,9 +6,9 @@ using System.IO;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.Extensions.FileProviders;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor
 {
-    public class FileProviderRazorProjectItem : RazorProjectItem
+    internal class FileProviderRazorProjectItem : RazorProjectItem
     {
         private string _root;
         private string _relativePhysicalPath;

src/Microsoft.AspNetCore.Mvc.Razor/IRazorViewEngineFileProviderAccessor.cs

@@ -3,12 +3,12 @@
 
 using Microsoft.Extensions.FileProviders;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor
 {
     /// <summary>
     /// Accessor to the <see cref="IFileProvider"/> used by <see cref="RazorViewEngine"/>.
     /// </summary>
-    public interface IRazorViewEngineFileProviderAccessor
+    internal interface IRazorViewEngineFileProviderAccessor
     {
         /// <summary>
         /// Gets the <see cref="IFileProvider"/> used to look up Razor files.

src/Microsoft.AspNetCore.Mvc.Razor/LazyMetadataReferenceFeature.cs

@@ -7,9 +7,9 @@ using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Razor;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor
 {
-    public class LazyMetadataReferenceFeature : IMetadataReferenceFeature
+    internal class LazyMetadataReferenceFeature : IMetadataReferenceFeature
     {
 #pragma warning disable CS0618 // Type or member is obsolete
         private readonly RazorReferenceManager _referenceManager;

src/Microsoft.AspNetCore.Mvc.Razor/MvcRazorDiagnosticSourceExtensions.cs

@@ -4,9 +4,9 @@
 using System.Diagnostics;
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor
 {
-    public static class MvcRazorDiagnosticSourceExtensions
+    internal static class MvcRazorDiagnosticSourceExtensions
     {
         public static void BeforeViewPage(
             this DiagnosticSource diagnosticSource,

src/Microsoft.AspNetCore.Mvc.Razor/MvcRazorLoggerExtensions.cs

@@ -2,14 +2,12 @@
 // 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 System.Diagnostics;
-using System.Linq;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor
 {
-    public static class MvcRazorLoggerExtensions
+    internal static class MvcRazorLoggerExtensions
     {
         private static readonly double TimestampToTicks = TimeSpan.TicksPerSecond / (double)Stopwatch.Frequency;
 

src/Microsoft.AspNetCore.Mvc.Razor/Properties/AssemblyInfo.cs

@@ -10,3 +10,5 @@ using System.Runtime.CompilerServices;
 [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("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]

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

@@ -7,7 +7,6 @@ using System.Diagnostics;
 using System.Reflection;
 using System.Text.Encodings.Web;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Microsoft.AspNetCore.Mvc.Razor.Internal;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.Routing;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;

src/Microsoft.AspNetCore.Mvc.Razor/RazorPagePropertyActivator.cs

@@ -6,14 +6,15 @@ using System.Diagnostics;
 using System.Reflection;
 using System.Text.Encodings.Web;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor
 {
-    public class RazorPagePropertyActivator
+    internal class RazorPagePropertyActivator
     {
         private readonly IModelMetadataProvider _metadataProvider;
         private readonly Func<IModelMetadataProvider, ModelStateDictionary, ViewDataDictionary> _rootFactory;

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

@@ -7,7 +7,6 @@ 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.Buffers;

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

@@ -7,7 +7,6 @@ using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
 using System.Text.Encodings.Web;
-using Microsoft.AspNetCore.Mvc.Razor.Internal;
 using Microsoft.AspNetCore.Mvc.Routing;
 using Microsoft.AspNetCore.Mvc.ViewEngines;
 using Microsoft.AspNetCore.Razor.Language;

src/Microsoft.AspNetCore.Mvc.Razor/ServiceBasedTagHelperActivator.cs

@@ -6,13 +6,13 @@ using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor
 {
     /// <summary>
     /// A <see cref="ITagHelperActivator"/> that retrieves tag helpers as services from the request's
     /// <see cref="IServiceProvider"/>.
     /// </summary>
-    public class ServiceBasedTagHelperActivator : ITagHelperActivator
+    internal class ServiceBasedTagHelperActivator : ITagHelperActivator
     {
         /// <inheritdoc />
         public TTagHelper Create<TTagHelper>(ViewContext context) where TTagHelper : ITagHelper

src/Microsoft.AspNetCore.Mvc.Razor/TagHelperComponentManager.cs

@@ -6,12 +6,12 @@ using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc.Razor.TagHelpers;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor
 {
     /// <summary>
     /// The default implementation of the <see cref="ITagHelperComponentManager"/>.
     /// </summary>
-    public class TagHelperComponentManager : ITagHelperComponentManager
+    internal class TagHelperComponentManager : ITagHelperComponentManager
     {
         /// <summary>
         /// Creates a new <see cref="TagHelperComponentManager"/>.

src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperComponentTagHelper.cs

@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc.Razor.Internal;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;

src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheItem.cs

@@ -3,12 +3,12 @@
 
 using System;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor
 {
     /// <summary>
     /// An item in <see cref="ViewLocationCacheResult"/>.
     /// </summary>
-    public readonly struct ViewLocationCacheItem
+    internal readonly struct ViewLocationCacheItem
     {
         /// <summary>
         /// Initializes a new instance of <see cref="ViewLocationCacheItem"/>.

src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheKey.cs

@@ -5,12 +5,12 @@ using System;
 using System.Collections.Generic;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor
 {
     /// <summary>
     /// Key for entries in <see cref="RazorViewEngine.ViewLookupCache"/>.
     /// </summary>
-    public readonly struct ViewLocationCacheKey : IEquatable<ViewLocationCacheKey>
+    internal readonly struct ViewLocationCacheKey : IEquatable<ViewLocationCacheKey>
     {
         /// <summary>
         /// Initializes a new instance of <see cref="ViewLocationCacheKey"/>.
@@ -111,8 +111,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 
             foreach (var item in ViewLocationExpanderValues)
             {
-                string yValue;
+                if (!y.ViewLocationExpanderValues.TryGetValue(item.Key, out var yValue) ||
-                if (!y.ViewLocationExpanderValues.TryGetValue(item.Key, out yValue) ||
                     !string.Equals(item.Value, yValue, StringComparison.Ordinal))
                 {
                     return false;

src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheResult.cs

@@ -4,12 +4,12 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor
 {
     /// <summary>
     /// Result of view location cache lookup.
     /// </summary>
-    public class ViewLocationCacheResult
+    internal class ViewLocationCacheResult
     {
         /// <summary>
         /// Initializes a new instance of <see cref="ViewLocationCacheResult"/>

src/Microsoft.AspNetCore.Mvc.Razor/ViewPath.cs

@@ -3,9 +3,9 @@
 
 using Microsoft.Extensions.Primitives;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor
 {
-    public static class ViewPath
+    internal static class ViewPath
     {
         public static string NormalizePath(string path)
         {

src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/AuthorizationPageApplicationModelProvider.cs

@@ -4,13 +4,11 @@
 using System;
 using System.Linq;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc.ApplicationModels;
 using Microsoft.AspNetCore.Mvc.Authorization;
-using Microsoft.AspNetCore.Mvc.Internal;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
 {
-    public class AuthorizationPageApplicationModelProvider : IPageApplicationModelProvider
+    internal class AuthorizationPageApplicationModelProvider : IPageApplicationModelProvider
     {
         private readonly IAuthorizationPolicyProvider _policyProvider;
 

src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/AutoValidateAntiforgeryPageApplicationModelProvider.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using Microsoft.AspNetCore.Mvc.ApplicationModels;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
 {
     internal class AutoValidateAntiforgeryPageApplicationModelProvider : IPageApplicationModelProvider
     {

src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/CompiledPageActionDescriptorBuilder.cs

@@ -4,16 +4,16 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNetCore.Mvc.ApplicationModels;
 using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
 {
     /// <summary>
     /// Constructs a <see cref="CompiledPageActionDescriptor"/> from an <see cref="PageApplicationModel"/>.
     /// </summary>
-    public static class CompiledPageActionDescriptorBuilder
+    internal static class CompiledPageActionDescriptorBuilder
     {
         /// <summary>
         /// Creates a <see cref="CompiledPageActionDescriptor"/> from the specified <paramref name="applicationModel"/>.

src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/CompiledPageRouteModelProvider.cs

@@ -4,20 +4,19 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNetCore.Mvc.ApplicationModels;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
 using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 using Microsoft.AspNetCore.Mvc.Razor.Extensions;
-using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
 using Microsoft.AspNetCore.Razor.Hosting;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
 {
-    public class CompiledPageRouteModelProvider : IPageRouteModelProvider
+    internal class CompiledPageRouteModelProvider : IPageRouteModelProvider
     {
         private readonly ApplicationPartManager _applicationManager;
         private readonly RazorPagesOptions _pagesOptions;

src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/DefaultPageApplicationModelProvider.cs

@@ -9,7 +9,6 @@ using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
-using Microsoft.AspNetCore.Mvc.RazorPages.Internal;
 using Microsoft.Extensions.Internal;
 using Microsoft.Extensions.Options;
 using Resources = Microsoft.AspNetCore.Mvc.RazorPages.Resources;

src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteMetadata.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
 {
     // This is used to store the uncombined parts of the final page route
     internal class PageRouteMetadata

src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelFactory.cs

@@ -4,12 +4,12 @@
 using System;
 using System.Diagnostics;
 using System.IO;
-using Microsoft.AspNetCore.Mvc.ApplicationModels;
 using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Primitives;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
 {
     internal class PageRouteModelFactory
     {

src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/RazorProjectPageRouteModelProvider.cs

@@ -3,15 +3,15 @@
 
 using System;
 using System.Linq;
-using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
 {
-    public class RazorProjectPageRouteModelProvider : IPageRouteModelProvider
+    internal class RazorProjectPageRouteModelProvider : IPageRouteModelProvider
     {
         private const string AreaRootDirectory = "/Areas";
         private readonly RazorProjectFileSystem _razorFileSystem;

src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/ResponseCacheFilterApplicationModelProvider.cs

@@ -3,13 +3,13 @@
 
 using System;
 using System.Linq;
-using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
 {
-    public class ResponseCacheFilterApplicationModelProvider : IPageApplicationModelProvider
+    internal class ResponseCacheFilterApplicationModelProvider : IPageApplicationModelProvider
     {
         private readonly MvcOptions _mvcOptions;
         private readonly ILoggerFactory _loggerFactory;
@@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
             foreach (var attribute in responseCacheAttributes)
             {
                 var cacheProfile = attribute.GetCacheProfile(_mvcOptions);
-                context.PageApplicationModel.Filters.Add(new ResponseCacheFilter(cacheProfile, _loggerFactory));
+                context.PageApplicationModel.Filters.Add(new PageResponseCacheFilter(cacheProfile, _loggerFactory));
             }
         }
 

src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/TempDataFilterPageApplicationModelProvider.cs

@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
 {
     internal class TempDataFilterPageApplicationModelProvider : IPageApplicationModelProvider
     {

src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/ViewDataAttributePageApplicationModelProvider.cs

@@ -2,10 +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.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
 {
     internal class ViewDataAttributePageApplicationModelProvider : IPageApplicationModelProvider
     {

src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/MvcRazorPagesMvcCoreBuilderExtensions.cs

@@ -4,11 +4,11 @@
 using System;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.ApplicationModels;
+using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
-using Microsoft.AspNetCore.Mvc.RazorPages.Internal;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
 using Resources = Microsoft.AspNetCore.Mvc.RazorPages.Resources;

src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/RazorPagesRazorViewEngineOptionsSetup.cs

@@ -4,12 +4,13 @@
 using System;
 using System.Diagnostics;
 using Microsoft.AspNetCore.Mvc.Razor;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.Extensions.DependencyInjection
 {
-    public class RazorPagesRazorViewEngineOptionsSetup : IConfigureOptions<RazorViewEngineOptions>
+    internal class RazorPagesRazorViewEngineOptionsSetup : IConfigureOptions<RazorViewEngineOptions>
     {
         private readonly RazorPagesOptions _pagesOptions;
 

src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerPageFilter.cs

@@ -3,11 +3,11 @@
 
 using System;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.Filters
 {
-    public class PageHandlerPageFilter : IAsyncPageFilter, IOrderedFilter
+    internal class PageHandlerPageFilter : IAsyncPageFilter, IOrderedFilter
     {
         /// <remarks>
         /// Filters on handlers run furthest from the action.

src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerResultFIlter.cs

@@ -3,11 +3,11 @@
 
 using System;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.Filters
 {
-    public class PageHandlerResultFilter : IAsyncResultFilter, IOrderedFilter
+    internal class PageHandlerResultFilter : IAsyncResultFilter, IOrderedFilter
     {
         /// <remarks>
         /// Filters on handlers run furthest from the action.

src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageResponseCacheFilter.cs

@@ -2,27 +2,26 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.AspNetCore.Mvc.Filters;
+using Microsoft.AspNetCore.Mvc.RazorPages;
-using Microsoft.AspNetCore.Mvc.Internal;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.Filters
 {
     /// <summary>
     /// A <see cref="IPageFilter"/> which sets the appropriate headers related to response caching.
     /// </summary>
-    public class ResponseCacheFilter : IPageFilter, IResponseCacheFilter
+    internal class PageResponseCacheFilter : IPageFilter, IResponseCacheFilter
     {
         private readonly ResponseCacheFilterExecutor _executor;
         private readonly ILogger _logger;
 
         /// <summary>
-        /// Creates a new instance of <see cref="ResponseCacheFilter"/>
+        /// Creates a new instance of <see cref="PageResponseCacheFilter"/>
         /// </summary>
         /// <param name="cacheProfile">The profile which contains the settings for
-        /// <see cref="ResponseCacheFilter"/>.</param>
+        /// <see cref="PageResponseCacheFilter"/>.</param>
         /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
-        public ResponseCacheFilter(CacheProfile cacheProfile, ILoggerFactory loggerFactory)
+        public PageResponseCacheFilter(CacheProfile cacheProfile, ILoggerFactory loggerFactory)
         {
             _executor = new ResponseCacheFilterExecutor(cacheProfile);
             _logger = loggerFactory.CreateLogger(GetType());

src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageSaveTempDataPropertyFilter.cs

@@ -1,11 +1,10 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages
+namespace Microsoft.AspNetCore.Mvc.Filters
 {
     internal class PageSaveTempDataPropertyFilter : SaveTempDataPropertyFilterBase, IPageFilter
     {

src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageSaveTempDataPropertyFilterFactory.cs

@@ -3,15 +3,13 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages
+namespace Microsoft.AspNetCore.Mvc.Filters
 {
     internal class PageSaveTempDataPropertyFilterFactory : IFilterFactory
     {
-
         public PageSaveTempDataPropertyFilterFactory(IReadOnlyList<LifecycleProperty> properties)
         {
             Properties = properties;

src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageViewDataAttributeFilter.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.Collections.Generic;
-using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages
+namespace Microsoft.AspNetCore.Mvc.Filters
 {
     internal class PageViewDataAttributeFilter : IPageFilter, IViewDataValuesProviderFeature
     {

src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageViewDataAttributeFilterFactory.cs

@@ -3,10 +3,9 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages
+namespace Microsoft.AspNetCore.Mvc.Filters
 {
     internal class PageViewDataAttributeFilterFactory : IFilterFactory
     {

src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageArgumentBinder.cs

@@ -5,12 +5,11 @@ using System;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
 {
 #pragma warning disable CS0618 // Type or member is obsolete
-    public class DefaultPageArgumentBinder : PageArgumentBinder
+    internal class DefaultPageArgumentBinder : PageArgumentBinder
 #pragma warning restore CS0618 // Type or member is obsolete
     {
         private readonly ParameterBinder _parameterBinder;

src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageFactoryProvider.cs

@@ -6,7 +6,7 @@ using System.Diagnostics;
 using System.Reflection;
 using System.Text.Encodings.Web;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.Routing;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;

src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageLoader.cs

@@ -11,9 +11,9 @@ using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
 {
-    public class DefaultPageLoader : IPageLoader
+    internal class DefaultPageLoader : IPageLoader
     {
         private readonly IPageApplicationModelProvider[] _applicationModelProviders;
         private readonly IViewCompilerProvider _viewCompilerProvider;

src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/ExecutorFactory.cs

@@ -6,12 +6,11 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
 {
-    public static class ExecutorFactory
+    internal static class ExecutorFactory
     {
         public static PageHandlerExecutorDelegate CreateExecutor(HandlerMethodDescriptor handlerDescriptor)
         {

src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionDescriptorChangeProvider.cs

@@ -6,15 +6,14 @@ using System.Diagnostics;
 using System.Linq;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.AspNetCore.Mvc.Razor;
-using Microsoft.AspNetCore.Mvc.Razor.Internal;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
 {
-    public class PageActionDescriptorChangeProvider : IActionDescriptorChangeProvider
+    internal class PageActionDescriptorChangeProvider : IActionDescriptorChangeProvider
     {
         private readonly IFileProvider _fileProvider;
         private readonly string[] _searchPatterns;

src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionDescriptorProvider.cs

@@ -4,15 +4,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.ApplicationModels;
 using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc.Internal;
-using Microsoft.AspNetCore.Mvc.RazorPages.Internal;
 using Microsoft.AspNetCore.Mvc.Routing;
 using Microsoft.AspNetCore.Routing;
-using Microsoft.AspNetCore.Routing.Patterns;
 using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure

src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvoker.cs

@@ -10,15 +10,13 @@ using System.Threading.Tasks;
 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.RazorPages.Infrastructure;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.Extensions.Internal;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
 {
     internal class PageActionInvoker : ResourceInvoker, IActionInvoker
     {

src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvokerCacheEntry.cs

@@ -10,9 +10,9 @@ using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
 {
-    public class PageActionInvokerCacheEntry
+    internal class PageActionInvokerCacheEntry
     {
         public PageActionInvokerCacheEntry(
             CompiledPageActionDescriptor actionDescriptor,

src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvokerProvider.cs

@@ -11,15 +11,14 @@ using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.Razor;
-using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
 {
-    public class PageActionInvokerProvider : IActionInvokerProvider
+    internal class PageActionInvokerProvider : IActionInvokerProvider
     {
         private const string ViewStartFileName = "_ViewStart.cshtml";
 

src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageBinderFactory.cs

@@ -4,11 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc.Internal;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
-using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
 {
     internal static class PageBinderFactory
     {

src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageDirectiveFeature.cs

@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Microsoft.AspNetCore.Mvc.Razor.Extensions;
-using Microsoft.AspNetCore.Mvc.RazorPages.Internal;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 using Microsoft.Extensions.Logging;

src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageHandlerBinderDelegate.cs

@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
 {
-    public delegate Task PageHandlerBinderDelegate(PageContext pageContext, IDictionary<string, object> arguments);
+    internal delegate Task PageHandlerBinderDelegate(PageContext pageContext, IDictionary<string, object> arguments);
 }

src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageHandlerExecutorDelegate.cs

@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
 {
-    public delegate Task<IActionResult> PageHandlerExecutorDelegate(object handler, object[] arguments);
+    internal delegate Task<IActionResult> PageHandlerExecutorDelegate(object handler, object[] arguments);
 }

src/Microsoft.AspNetCore.Mvc.RazorPages/MvcRazorPagesDiagnosticSourceExtensions.cs

@@ -6,9 +6,9 @@ using System.Diagnostics;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
 
-namespace Microsoft.AspNetCore.Mvc.Internal
+namespace Microsoft.AspNetCore.Mvc.RazorPages
 {
-    public static class MvcRazorPagesDiagnosticSourceExtensions
+    internal static class MvcRazorPagesDiagnosticSourceExtensions
     {
         public static void BeforeHandlerMethod(
             this DiagnosticSource diagnosticSource,

src/Microsoft.AspNetCore.Mvc.RazorPages/PageLoggerExtensions.cs

@@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.RazorPages
 {
     internal static class PageLoggerExtensions
     {

src/Microsoft.AspNetCore.Mvc/MvcServiceCollectionExtensions.cs

@@ -8,7 +8,6 @@ using System.Linq;
 using System.Reflection;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
-using Microsoft.AspNetCore.Mvc.Internal;
 using Microsoft.AspNetCore.Mvc.Razor.TagHelpers;
 using Microsoft.AspNetCore.Mvc.TagHelpers;
 

test/Microsoft.AspNetCore.Mvc.IntegrationTests/AuthorizeFilterIntegrationTest.cs

@@ -12,7 +12,6 @@ using Microsoft.AspNetCore.Mvc.ApplicationModels;
 using Microsoft.AspNetCore.Mvc.Authorization;
 using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.AspNetCore.Mvc.Internal;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;

test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindPropertyIntegrationTest.cs

@@ -11,7 +11,6 @@ using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
-using Microsoft.AspNetCore.Mvc.RazorPages.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Mvc.IntegrationTests

test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindingSourceMetadataProviderIntegrationTest.cs

@@ -9,7 +9,6 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Internal;
 using Microsoft.AspNetCore.Mvc.Abstractions;
-using Microsoft.AspNetCore.Mvc.Internal;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Binders;
 using Microsoft.Extensions.Primitives;

test/Microsoft.AspNetCore.Mvc.IntegrationTests/ExcludeBindingMetadataProviderIntegrationTest.cs

@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Abstractions;
-using Microsoft.AspNetCore.Mvc.Internal;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
 using Microsoft.Extensions.Primitives;

test/Microsoft.AspNetCore.Mvc.IntegrationTests/TestMvcOptions.cs

@@ -6,7 +6,6 @@ using System.Buffers;
 using Microsoft.AspNetCore.Mvc.DataAnnotations;
 using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal;
 using Microsoft.AspNetCore.Mvc.Formatters.Json.Internal;
-using Microsoft.AspNetCore.Mvc.Internal;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.ObjectPool;

test/Microsoft.AspNetCore.Mvc.IntegrationTests/TryValidateModelIntegrationTest.cs

@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
-using Microsoft.AspNetCore.Mvc.Internal;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
 using Microsoft.AspNetCore.Testing;

test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/CSharpCompilerTest.cs

@@ -4,7 +4,6 @@
 using System.Linq;
 using System.Reflection;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Emit;
@@ -13,7 +12,7 @@ using Moq;
 using Xunit;
 using DependencyContextCompilationOptions = Microsoft.Extensions.DependencyModel.CompilationOptions;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
 {
     public class CSharpCompilerTest
     {

test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/ChecksumValidatorTest.cs

@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Razor.Language;
 using Xunit;
 using static Microsoft.AspNetCore.Razor.Hosting.TestRazorCompiledItem;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
 {
     public class ChecksumValidatorTest
     {

test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/CompilerFailedExceptionFactoryTest.cs

@@ -11,7 +11,7 @@ using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Text;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
 {
     public class CompilerFailedExceptionFactoryTest
     {

test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/DefaultRazorPageFactoryProviderTest.cs

@@ -3,12 +3,11 @@
 
 using System;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 using Microsoft.Extensions.Primitives;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
 {
     public class DefaultRazorPageFactoryProviderTest
     {

test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/DefaultRazorReferenceManagerTest.cs

@@ -4,13 +4,11 @@
 using System.Linq;
 using System.Reflection;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
-using Microsoft.AspNetCore.Mvc.Razor.Compilation;
-using Microsoft.AspNetCore.Mvc.Razor.Internal;
 using Microsoft.CodeAnalysis;
 using Microsoft.Extensions.Options;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Test.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
 {
 #pragma warning disable CS0618 // Type or member is obsolete
     public class DefaultRazorReferenceManagerTest

test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/ExpressionRewriterTest.cs

@@ -10,7 +10,7 @@ using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
 {
     public class ExpressionRewriterTest
     {

test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorPagePropertyActivatorTest.cs

@@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor
 {
     public class RazorPagePropertyActivatorTest
     {

test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorViewCompilerProviderTest.cs

@@ -4,7 +4,6 @@
 using System;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
-using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Logging.Abstractions;
@@ -12,7 +11,7 @@ using Microsoft.Extensions.Options;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
 {
     public class RazorViewCompilerProviderTest
     {

test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorViewCompilerTest.cs

@@ -7,7 +7,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
-using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 using Microsoft.AspNetCore.Mvc.Razor.Extensions;
 using Microsoft.AspNetCore.Razor.Hosting;
 using Microsoft.AspNetCore.Razor.Language;
@@ -21,7 +20,7 @@ using Moq;
 using Xunit;
 using static Microsoft.AspNetCore.Razor.Hosting.TestRazorCompiledItem;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
 {
     public class RazorViewCompilerTest
     {

test/Microsoft.AspNetCore.Mvc.Razor.Test/DefaultRazorViewEngineFileProviderAccessorTest.cs

@@ -6,7 +6,7 @@ using Microsoft.Extensions.Options;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor
 {
     public class DefaultRazorViewEngineFileProviderAccessorTest
     {

test/Microsoft.AspNetCore.Mvc.Razor.Test/DefaultTagHelperFactoryTest.cs

@@ -16,7 +16,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor
 {
     public class DefaultTagHelperFactoryTest
     {

test/Microsoft.AspNetCore.Mvc.Razor.Test/DependencyInjection/RazorViewEngineOptionsSetupTest.cs

@@ -2,15 +2,16 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.Extensions.DependencyInjection
 {
     public class RazorViewEngineOptionsSetupTest
     {
@@ -153,7 +154,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal
             return new RazorViewEngineOptionsSetup(
                 hostingEnvironment,
                 NullLoggerFactory.Instance,
-                Options.Create(compatibilityOptions));
+                Options.Options.Create(compatibilityOptions));
         }
 
     }

test/Microsoft.AspNetCore.Mvc.Razor.Test/FileProviderRazorProjectFileSystemTest.cs

@@ -8,7 +8,7 @@ using Microsoft.Extensions.FileProviders;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor
 {
     public class FileProviderRazorProjectFileSystemTest
     {

test/Microsoft.AspNetCore.Mvc.Razor.Test/ViewPathTest.cs

@@ -3,7 +3,7 @@
 
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Internal
+namespace Microsoft.AspNetCore.Mvc.Razor
 {
     public class ViewPathTest
     {

test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/AuthorizationPageApplicationModelProviderTest.cs

@@ -5,14 +5,15 @@ using System;
 using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc.ApplicationModels;
 using Microsoft.AspNetCore.Mvc.Authorization;
+using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
 using Microsoft.Extensions.Options;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
 {
     public class AuthorizationPageApplicationModelProviderTest
     {

test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/CompiledPageActionDescriptorBuilderTest.cs

@@ -6,14 +6,14 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using Microsoft.AspNetCore.Mvc.ActionConstraints;
-using Microsoft.AspNetCore.Mvc.ApplicationModels;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.AspNetCore.Mvc.Routing;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
 {
     public class CompiledPageActionDescriptorBuilderTest
     {

test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/CompiledPageRouteModelProviderTest.cs

@@ -4,9 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNetCore.Mvc.ApplicationModels;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
 using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
 using Microsoft.AspNetCore.Razor.Hosting;
 using Microsoft.AspNetCore.Razor.Language;
@@ -16,7 +16,7 @@ using Microsoft.Extensions.Options;
 using Xunit;
 using static Microsoft.AspNetCore.Razor.Hosting.TestRazorCompiledItem;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
 {
     public class CompiledPageRouteModelProviderTest
     {
@@ -712,7 +712,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
             };
         }
 
-        public class TestCompiledPageRouteModelProvider : CompiledPageRouteModelProvider
+        private class TestCompiledPageRouteModelProvider : CompiledPageRouteModelProvider
         {
             public TestCompiledPageRouteModelProvider(
                 ApplicationPartManager partManager,

test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/DefaultPageApplicationModelProviderTest.cs

@@ -11,7 +11,6 @@ using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
-using Microsoft.AspNetCore.Mvc.RazorPages.Internal;
 using Microsoft.Extensions.Options;
 using Xunit;
 

test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/PageRouteModelFactoryTest.cs

@@ -2,11 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Linq;
-using Microsoft.AspNetCore.Testing.xunit;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging.Abstractions;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal
+namespace Microsoft.AspNetCore.Mvc.ApplicationModels
 {
     public class PageRouteModelFactoryTest
     {