diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ActionSelectorBenchmark.cs b/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ActionSelectorBenchmark.cs index d207316ddc..38d363e9c0 100644 --- a/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ActionSelectorBenchmark.cs +++ b/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; diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance/MvcEndpointDatasourceBenchmark.cs b/benchmarks/Microsoft.AspNetCore.Mvc.Performance/MvcEndpointDatasourceBenchmark.cs index 028293dd28..efdb91d2f6 100644 --- a/benchmarks/Microsoft.AspNetCore.Mvc.Performance/MvcEndpointDatasourceBenchmark.cs +++ b/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; diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorBenchmarkBase.cs b/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorBenchmarkBase.cs index cfa12d5f1b..8d66120fd2 100644 --- a/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorBenchmarkBase.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/CSharpCompiler.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CSharpCompiler.cs similarity index 98% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/CSharpCompiler.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CSharpCompiler.cs index 496d2f9ee7..c4f58943fa 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/CSharpCompiler.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ChecksumValidator.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ChecksumValidator.cs similarity index 97% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/ChecksumValidator.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ChecksumValidator.cs index fea6a7ba2d..2e5df4a3a8 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ChecksumValidator.cs +++ b/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) { diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/CompilationFailedExceptionFactory.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompilationFailedExceptionFactory.cs similarity index 98% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/CompilationFailedExceptionFactory.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompilationFailedExceptionFactory.cs index 02b096ec75..324b835728 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/CompilationFailedExceptionFactory.cs +++ b/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 { diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompiledViewDescriptor.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompiledViewDescriptor.cs index 4b4c1ec3e8..1e5bbb0c40 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompiledViewDescriptor.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorPageFactoryProvider.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultRazorPageFactoryProvider.cs similarity index 95% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorPageFactoryProvider.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultRazorPageFactoryProvider.cs index b5c7341830..a968749884 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorPageFactoryProvider.cs +++ b/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 { /// /// Represents a that creates instances /// from razor files in the file system. /// - public class DefaultRazorPageFactoryProvider : IRazorPageFactoryProvider + internal class DefaultRazorPageFactoryProvider : IRazorPageFactoryProvider { private readonly IViewCompilerProvider _viewCompilerProvider; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorReferenceManager.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultRazorReferenceManager.cs similarity index 93% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorReferenceManager.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultRazorReferenceManager.cs index 04965e52a4..b2a8e80127 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorReferenceManager.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ExpressionRewriter.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ExpressionRewriter.cs similarity index 98% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/ExpressionRewriter.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ExpressionRewriter.cs index 6d3d9cc757..d76b635d3e 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ExpressionRewriter.cs +++ b/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 { /// /// An expression rewriter which can hoist a simple expression lambda into a private field. /// - public class ExpressionRewriter : CSharpSyntaxRewriter + internal class ExpressionRewriter : CSharpSyntaxRewriter { private static readonly string FieldNameTemplate = "__h{0}"; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorViewCompiler.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewCompiler.cs similarity index 99% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorViewCompiler.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewCompiler.cs index 0f43c19f44..8dbc2012f1 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorViewCompiler.cs +++ b/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 { /// /// Caches the result of runtime compilation of Razor files for the duration of the application lifetime. /// - public class RazorViewCompiler : IViewCompiler + internal class RazorViewCompiler : IViewCompiler { private readonly object _cacheLock = new object(); private readonly Dictionary _precompiledViews; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorViewCompilerProvider.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewCompilerProvider.cs similarity index 96% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorViewCompilerProvider.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewCompilerProvider.cs index 3776bc845f..44fb8a0ef3 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorViewCompilerProvider.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/SymbolsUtility.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/SymbolsUtility.cs similarity index 96% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/SymbolsUtility.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/Compilation/SymbolsUtility.cs index 280fe8c84a..bfe2b88414 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/SymbolsUtility.cs +++ b/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 { /// /// Utility type for determining if a platform supports full pdb file generation. diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ViewsFeatureProvider.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ViewsFeatureProvider.cs index e7e7143fbb..aebfe00085 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ViewsFeatureProvider.cs +++ b/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 diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorViewEngineFileProviderAccessor.cs b/src/Microsoft.AspNetCore.Mvc.Razor/DefaultRazorViewEngineFileProviderAccessor.cs similarity index 90% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorViewEngineFileProviderAccessor.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/DefaultRazorViewEngineFileProviderAccessor.cs index 5823a4b39c..4495273762 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorViewEngineFileProviderAccessor.cs +++ b/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 { /// /// Default implementation of . /// - public class DefaultRazorViewEngineFileProviderAccessor : IRazorViewEngineFileProviderAccessor + internal class DefaultRazorViewEngineFileProviderAccessor : IRazorViewEngineFileProviderAccessor { /// /// Initializes a new instance of . diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultTagHelperFactory.cs b/src/Microsoft.AspNetCore.Mvc.Razor/DefaultTagHelperFactory.cs similarity index 96% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultTagHelperFactory.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/DefaultTagHelperFactory.cs index 6dd51965c3..f394d34581 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultTagHelperFactory.cs +++ b/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 { /// /// Default implementation for . /// - public class DefaultTagHelperFactory : ITagHelperFactory + internal class DefaultTagHelperFactory : ITagHelperFactory { private readonly ITagHelperActivator _activator; private readonly ConcurrentDictionary[]> _injectActions; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs b/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs index 8b47c02345..7fa8e4b3ae 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs b/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs index 131bc13391..64c4b4d3a9 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/MvcRazorMvcViewOptionsSetup.cs b/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcViewOptionsSetup.cs similarity index 87% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/MvcRazorMvcViewOptionsSetup.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcViewOptionsSetup.cs index 8b35da8ddf..f932560411 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/MvcRazorMvcViewOptionsSetup.cs +++ b/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 { /// /// Configures to use . /// - public class MvcRazorMvcViewOptionsSetup : IConfigureOptions + internal class MvcRazorMvcViewOptionsSetup : IConfigureOptions { private readonly IRazorViewEngine _razorViewEngine; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/TagHelpersAsServices.cs b/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/TagHelpersAsServices.cs similarity index 88% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/TagHelpersAsServices.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/TagHelpersAsServices.cs index a441c75de1..7ef080696b 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/TagHelpersAsServices.cs +++ b/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) { diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/FileProviderRazorProject.cs b/src/Microsoft.AspNetCore.Mvc.Razor/FileProviderRazorProject.cs similarity index 96% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/FileProviderRazorProject.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/FileProviderRazorProject.cs index 9e5718fa2f..cde9cf1da2 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/FileProviderRazorProject.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/FileProviderRazorProjectItem.cs b/src/Microsoft.AspNetCore.Mvc.Razor/FileProviderRazorProjectItem.cs similarity index 94% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/FileProviderRazorProjectItem.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/FileProviderRazorProjectItem.cs index 6108d6875b..5eb9f24b3e 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/FileProviderRazorProjectItem.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/IRazorViewEngineFileProviderAccessor.cs b/src/Microsoft.AspNetCore.Mvc.Razor/IRazorViewEngineFileProviderAccessor.cs similarity index 82% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/IRazorViewEngineFileProviderAccessor.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/IRazorViewEngineFileProviderAccessor.cs index 670b7c3db3..19c5fde0cb 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/IRazorViewEngineFileProviderAccessor.cs +++ b/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 { /// /// Accessor to the used by . /// - public interface IRazorViewEngineFileProviderAccessor + internal interface IRazorViewEngineFileProviderAccessor { /// /// Gets the used to look up Razor files. diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/LazyMetadataReferenceFeature.cs b/src/Microsoft.AspNetCore.Mvc.Razor/LazyMetadataReferenceFeature.cs similarity index 90% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/LazyMetadataReferenceFeature.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/LazyMetadataReferenceFeature.cs index 5479991463..a7b86b00fd 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/LazyMetadataReferenceFeature.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/MvcRazorDiagnosticSourceExtensions.cs b/src/Microsoft.AspNetCore.Mvc.Razor/MvcRazorDiagnosticSourceExtensions.cs similarity index 93% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/MvcRazorDiagnosticSourceExtensions.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/MvcRazorDiagnosticSourceExtensions.cs index a60f5fb587..d6706ed56d 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/MvcRazorDiagnosticSourceExtensions.cs +++ b/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, diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/MvcRazorLoggerExtensions.cs b/src/Microsoft.AspNetCore.Mvc.Razor/MvcRazorLoggerExtensions.cs similarity index 98% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/MvcRazorLoggerExtensions.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/MvcRazorLoggerExtensions.cs index 21d7496abd..58a1123cc7 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/MvcRazorLoggerExtensions.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Properties/AssemblyInfo.cs index 0e1a8e8695..5bd88d4693 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Properties/AssemblyInfo.cs +++ b/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")] diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageActivator.cs b/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageActivator.cs index cc9a20c8cb..9acc858e5a 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageActivator.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorPagePropertyActivator.cs b/src/Microsoft.AspNetCore.Mvc.Razor/RazorPagePropertyActivator.cs similarity index 97% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorPagePropertyActivator.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/RazorPagePropertyActivator.cs index 7ce90adf82..5bcba01b62 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorPagePropertyActivator.cs +++ b/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 _rootFactory; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/RazorView.cs b/src/Microsoft.AspNetCore.Mvc.Razor/RazorView.cs index c50a574711..e6e75ce12d 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/RazorView.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngine.cs b/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngine.cs index 145f2fc6b2..9bbe9cfb13 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngine.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ServiceBasedTagHelperActivator.cs b/src/Microsoft.AspNetCore.Mvc.Razor/ServiceBasedTagHelperActivator.cs similarity index 87% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/ServiceBasedTagHelperActivator.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/ServiceBasedTagHelperActivator.cs index d5ba1e6409..142efbe256 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ServiceBasedTagHelperActivator.cs +++ b/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 { /// /// A that retrieves tag helpers as services from the request's /// . /// - public class ServiceBasedTagHelperActivator : ITagHelperActivator + internal class ServiceBasedTagHelperActivator : ITagHelperActivator { /// public TTagHelper Create(ViewContext context) where TTagHelper : ITagHelper diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/TagHelperComponentManager.cs b/src/Microsoft.AspNetCore.Mvc.Razor/TagHelperComponentManager.cs similarity index 90% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/TagHelperComponentManager.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/TagHelperComponentManager.cs index 38dde4f941..bdbaba846d 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/TagHelperComponentManager.cs +++ b/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 { /// /// The default implementation of the . /// - public class TagHelperComponentManager : ITagHelperComponentManager + internal class TagHelperComponentManager : ITagHelperComponentManager { /// /// Creates a new . diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperComponentTagHelper.cs b/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperComponentTagHelper.cs index ddf68268bd..14f11998c9 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperComponentTagHelper.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheItem.cs b/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheItem.cs similarity index 91% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheItem.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheItem.cs index 64333eb02f..7ba1140bc8 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheItem.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheItem.cs @@ -3,12 +3,12 @@ using System; -namespace Microsoft.AspNetCore.Mvc.Razor.Internal +namespace Microsoft.AspNetCore.Mvc.Razor { /// /// An item in . /// - public readonly struct ViewLocationCacheItem + internal readonly struct ViewLocationCacheItem { /// /// Initializes a new instance of . diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheKey.cs b/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheKey.cs similarity index 96% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheKey.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheKey.cs index 00f3d3c8ec..2640110dd5 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheKey.cs +++ b/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 { /// /// Key for entries in . /// - public readonly struct ViewLocationCacheKey : IEquatable + internal readonly struct ViewLocationCacheKey : IEquatable { /// /// Initializes a new instance of . @@ -111,8 +111,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal foreach (var item in ViewLocationExpanderValues) { - string yValue; - if (!y.ViewLocationExpanderValues.TryGetValue(item.Key, out yValue) || + if (!y.ViewLocationExpanderValues.TryGetValue(item.Key, out var yValue) || !string.Equals(item.Value, yValue, StringComparison.Ordinal)) { return false; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheResult.cs b/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheResult.cs similarity index 96% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheResult.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheResult.cs index c703bcaf19..2b72934aa3 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheResult.cs +++ b/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 { /// /// Result of view location cache lookup. /// - public class ViewLocationCacheResult + internal class ViewLocationCacheResult { /// /// Initializes a new instance of diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewPath.cs b/src/Microsoft.AspNetCore.Mvc.Razor/ViewPath.cs similarity index 93% rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewPath.cs rename to src/Microsoft.AspNetCore.Mvc.Razor/ViewPath.cs index 813493ee76..640dc69432 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewPath.cs +++ b/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) { diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/AuthorizationPageApplicationModelProvider.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/AuthorizationPageApplicationModelProvider.cs similarity index 86% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/AuthorizationPageApplicationModelProvider.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/AuthorizationPageApplicationModelProvider.cs index ad047c1ede..78fc43500e 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/AuthorizationPageApplicationModelProvider.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/AutoValidateAntiforgeryPageApplicationModelProvider.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/AutoValidateAntiforgeryPageApplicationModelProvider.cs similarity index 97% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/AutoValidateAntiforgeryPageApplicationModelProvider.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/AutoValidateAntiforgeryPageApplicationModelProvider.cs index 5503ba5d03..b4fca876d8 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/AutoValidateAntiforgeryPageApplicationModelProvider.cs +++ b/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 { diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/CompiledPageActionDescriptorBuilder.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/CompiledPageActionDescriptorBuilder.cs similarity index 97% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/CompiledPageActionDescriptorBuilder.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/CompiledPageActionDescriptorBuilder.cs index 41055bf878..96f7b895af 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/CompiledPageActionDescriptorBuilder.cs +++ b/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 { /// /// Constructs a from an . /// - public static class CompiledPageActionDescriptorBuilder + internal static class CompiledPageActionDescriptorBuilder { /// /// Creates a from the specified . diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/CompiledPageRouteModelProvider.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/CompiledPageRouteModelProvider.cs similarity index 96% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/CompiledPageRouteModelProvider.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/CompiledPageRouteModelProvider.cs index 544521e5a7..9660bffa2c 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/CompiledPageRouteModelProvider.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/DefaultPageApplicationModelProvider.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/DefaultPageApplicationModelProvider.cs index b486d40e8c..8e6322984b 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/DefaultPageApplicationModelProvider.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageRouteMetadata.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteMetadata.cs similarity index 90% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageRouteMetadata.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteMetadata.cs index ec5390ea98..0ababdcddc 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageRouteMetadata.cs +++ b/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 diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageRouteModelFactory.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelFactory.cs similarity index 98% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageRouteModelFactory.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelFactory.cs index d6699015be..603a0225dc 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageRouteModelFactory.cs +++ b/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 { diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/RazorProjectPageRouteModelProvider.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/RazorProjectPageRouteModelProvider.cs similarity index 96% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/RazorProjectPageRouteModelProvider.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/RazorProjectPageRouteModelProvider.cs index 23384fa9f7..4f2dcc65c8 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/RazorProjectPageRouteModelProvider.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ResponseCacheFilterApplicationModelProvider.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/ResponseCacheFilterApplicationModelProvider.cs similarity index 84% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ResponseCacheFilterApplicationModelProvider.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/ResponseCacheFilterApplicationModelProvider.cs index 27a8a7cb9b..09122c103a 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ResponseCacheFilterApplicationModelProvider.cs +++ b/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)); } } diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/TempDataFilterPageApplicationModelProvider.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/TempDataFilterPageApplicationModelProvider.cs similarity index 94% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/TempDataFilterPageApplicationModelProvider.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/TempDataFilterPageApplicationModelProvider.cs index 4104c4af1f..62f0878a21 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/TempDataFilterPageApplicationModelProvider.cs +++ b/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 { diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ViewDataAttributePageApplicationModelProvider.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/ViewDataAttributePageApplicationModelProvider.cs similarity index 93% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ViewDataAttributePageApplicationModelProvider.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/ViewDataAttributePageApplicationModelProvider.cs index 65f81dd58d..c0e12870b7 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ViewDataAttributePageApplicationModelProvider.cs +++ b/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 { diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/MvcRazorPagesMvcCoreBuilderExtensions.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/MvcRazorPagesMvcCoreBuilderExtensions.cs index 2f17cfbbca..18a88f803f 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/MvcRazorPagesMvcCoreBuilderExtensions.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/RazorPagesRazorViewEngineOptionsSetup.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/RazorPagesRazorViewEngineOptionsSetup.cs similarity index 94% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/RazorPagesRazorViewEngineOptionsSetup.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/RazorPagesRazorViewEngineOptionsSetup.cs index a0d19edf2f..a39591397e 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/RazorPagesRazorViewEngineOptionsSetup.cs +++ b/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 + internal class RazorPagesRazorViewEngineOptionsSetup : IConfigureOptions { private readonly RazorPagesOptions _pagesOptions; diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerPageFilter.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerPageFilter.cs similarity index 93% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerPageFilter.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerPageFilter.cs index 662fa6113a..4e491eef04 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerPageFilter.cs +++ b/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 { /// /// Filters on handlers run furthest from the action. diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerResultFIlter.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerResultFIlter.cs similarity index 91% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerResultFIlter.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerResultFIlter.cs index 9d0b3dcd09..c804aeb2d3 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerResultFIlter.cs +++ b/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 { /// /// Filters on handlers run furthest from the action. diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ResponseCacheFilter.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageResponseCacheFilter.cs similarity index 88% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ResponseCacheFilter.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageResponseCacheFilter.cs index 6fde160028..989183e491 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ResponseCacheFilter.cs +++ b/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.Internal; +using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Logging; -namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal +namespace Microsoft.AspNetCore.Mvc.Filters { /// /// A which sets the appropriate headers related to response caching. /// - public class ResponseCacheFilter : IPageFilter, IResponseCacheFilter + internal class PageResponseCacheFilter : IPageFilter, IResponseCacheFilter { private readonly ResponseCacheFilterExecutor _executor; private readonly ILogger _logger; /// - /// Creates a new instance of + /// Creates a new instance of /// /// The profile which contains the settings for - /// . + /// . /// The . - public ResponseCacheFilter(CacheProfile cacheProfile, ILoggerFactory loggerFactory) + public PageResponseCacheFilter(CacheProfile cacheProfile, ILoggerFactory loggerFactory) { _executor = new ResponseCacheFilterExecutor(cacheProfile); _logger = loggerFactory.CreateLogger(GetType()); diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageSaveTempDataPropertyFilter.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageSaveTempDataPropertyFilter.cs similarity index 91% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageSaveTempDataPropertyFilter.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageSaveTempDataPropertyFilter.cs index 2fedf3b2a3..3fc0b2b761 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageSaveTempDataPropertyFilter.cs +++ b/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 { diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageSaveTempDataPropertyFilterFactory.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageSaveTempDataPropertyFilterFactory.cs similarity index 92% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageSaveTempDataPropertyFilterFactory.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageSaveTempDataPropertyFilterFactory.cs index d65056c9a8..0bbc255240 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageSaveTempDataPropertyFilterFactory.cs +++ b/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 properties) { Properties = properties; diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageViewDataAttributeFilter.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageViewDataAttributeFilter.cs similarity index 94% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageViewDataAttributeFilter.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageViewDataAttributeFilter.cs index 28d7e1e4e5..98b353b237 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageViewDataAttributeFilter.cs +++ b/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 { diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageViewDataAttributeFilterFactory.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageViewDataAttributeFilterFactory.cs similarity index 90% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageViewDataAttributeFilterFactory.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageViewDataAttributeFilterFactory.cs index 45398e9327..42cdda0f04 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageViewDataAttributeFilterFactory.cs +++ b/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 { diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageArgumentBinder.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageArgumentBinder.cs similarity index 91% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageArgumentBinder.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageArgumentBinder.cs index 9fd638c10c..acc6b2f001 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageArgumentBinder.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageFactoryProvider.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageFactoryProvider.cs index 709921ab28..899175d215 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageFactoryProvider.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageHandlerMethodSelector.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageHandlerMethodSelector.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageHandlerMethodSelector.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageHandlerMethodSelector.cs diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageLoader.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageLoader.cs similarity index 97% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageLoader.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageLoader.cs index 9bb9390bcc..0534d276ba 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/DefaultPageLoader.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ExecutorFactory.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/ExecutorFactory.cs similarity index 98% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ExecutorFactory.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/ExecutorFactory.cs index 6bea1e9605..99571e68e3 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/ExecutorFactory.cs +++ b/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) { diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionDescriptorChangeProvider.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionDescriptorChangeProvider.cs similarity index 96% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionDescriptorChangeProvider.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionDescriptorChangeProvider.cs index fadb391b90..8ede4ccf18 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionDescriptorChangeProvider.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionDescriptorProvider.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionDescriptorProvider.cs index 806a032c35..3e47042bdc 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionDescriptorProvider.cs +++ b/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 diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvoker.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvoker.cs similarity index 99% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvoker.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvoker.cs index bae7346e04..1fa0739e1b 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvoker.cs +++ b/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 { diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvokerCacheEntry.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvokerCacheEntry.cs similarity index 96% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvokerCacheEntry.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvokerCacheEntry.cs index f2844d2023..9b964ff661 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvokerCacheEntry.cs +++ b/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, diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvokerProvider.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvokerProvider.cs similarity index 98% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvokerProvider.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvokerProvider.cs index 31904ed3db..f1a54850d3 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageActionInvokerProvider.cs +++ b/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"; diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageBinderFactory.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageBinderFactory.cs similarity index 97% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageBinderFactory.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageBinderFactory.cs index 72fd33d754..c29faad2dd 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageBinderFactory.cs +++ b/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 { diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageDirectiveFeature.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageDirectiveFeature.cs index ff09f6abbf..db310a80a4 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageDirectiveFeature.cs +++ b/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; diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerBinderDelegate.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageHandlerBinderDelegate.cs similarity index 57% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerBinderDelegate.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageHandlerBinderDelegate.cs index 7bea47fc51..433f3ccfd8 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerBinderDelegate.cs +++ b/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 arguments); + internal delegate Task PageHandlerBinderDelegate(PageContext pageContext, IDictionary arguments); } diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerExecutorDelegate.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageHandlerExecutorDelegate.cs similarity index 55% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerExecutorDelegate.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageHandlerExecutorDelegate.cs index e90c24dc75..6c992ad84d 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageHandlerExecutorDelegate.cs +++ b/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 PageHandlerExecutorDelegate(object handler, object[] arguments); + internal delegate Task PageHandlerExecutorDelegate(object handler, object[] arguments); } diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/MvcRazorPagesDiagnosticSourceExtensions.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/MvcRazorPagesDiagnosticSourceExtensions.cs similarity index 99% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/MvcRazorPagesDiagnosticSourceExtensions.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/MvcRazorPagesDiagnosticSourceExtensions.cs index fd7ca7f0bc..54dd75df95 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/MvcRazorPagesDiagnosticSourceExtensions.cs +++ b/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, diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageLoggerExtensions.cs b/src/Microsoft.AspNetCore.Mvc.RazorPages/PageLoggerExtensions.cs similarity index 99% rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageLoggerExtensions.cs rename to src/Microsoft.AspNetCore.Mvc.RazorPages/PageLoggerExtensions.cs index 1ff89f5512..7d14642639 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Internal/PageLoggerExtensions.cs +++ b/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 { diff --git a/src/Microsoft.AspNetCore.Mvc/MvcServiceCollectionExtensions.cs b/src/Microsoft.AspNetCore.Mvc/MvcServiceCollectionExtensions.cs index 037bcdd2d3..03a73516d2 100644 --- a/src/Microsoft.AspNetCore.Mvc/MvcServiceCollectionExtensions.cs +++ b/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; diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/AuthorizeFilterIntegrationTest.cs b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/AuthorizeFilterIntegrationTest.cs index e7cf604430..07520c63c3 100644 --- a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/AuthorizeFilterIntegrationTest.cs +++ b/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; diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindPropertyIntegrationTest.cs b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindPropertyIntegrationTest.cs index d054633f72..392aebe33a 100644 --- a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindPropertyIntegrationTest.cs +++ b/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 diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindingSourceMetadataProviderIntegrationTest.cs b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindingSourceMetadataProviderIntegrationTest.cs index 0eaffb7f3d..e41452e0bb 100644 --- a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindingSourceMetadataProviderIntegrationTest.cs +++ b/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; diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ExcludeBindingMetadataProviderIntegrationTest.cs b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ExcludeBindingMetadataProviderIntegrationTest.cs index 185f828a86..b3b31bc9fd 100644 --- a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ExcludeBindingMetadataProviderIntegrationTest.cs +++ b/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; diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TestMvcOptions.cs b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TestMvcOptions.cs index 615e8685cb..cb7d13c97d 100644 --- a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TestMvcOptions.cs +++ b/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; diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TryValidateModelIntegrationTest.cs b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TryValidateModelIntegrationTest.cs index cae150842f..26584b2cde 100644 --- a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TryValidateModelIntegrationTest.cs +++ b/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; diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/CSharpCompilerTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/CSharpCompilerTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/CSharpCompilerTest.cs rename to test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/CSharpCompilerTest.cs index 8c3440db2a..f25d1fc028 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/CSharpCompilerTest.cs +++ b/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 { diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ChecksumValidatorTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/ChecksumValidatorTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ChecksumValidatorTest.cs rename to test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/ChecksumValidatorTest.cs index b1e72b56c9..cfbf962d25 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ChecksumValidatorTest.cs +++ b/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 { diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/CompilerFailedExceptionFactoryTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/CompilerFailedExceptionFactoryTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/CompilerFailedExceptionFactoryTest.cs rename to test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/CompilerFailedExceptionFactoryTest.cs index 394bc2ae7d..5cfca9ca37 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/CompilerFailedExceptionFactoryTest.cs +++ b/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 { diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorPageFactoryProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/DefaultRazorPageFactoryProviderTest.cs similarity index 97% rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorPageFactoryProviderTest.cs rename to test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/DefaultRazorPageFactoryProviderTest.cs index c216e4993a..4e35a4f838 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorPageFactoryProviderTest.cs +++ b/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 { diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorReferenceManagerTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/DefaultRazorReferenceManagerTest.cs similarity index 93% rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorReferenceManagerTest.cs rename to test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/DefaultRazorReferenceManagerTest.cs index c6435cd36e..6e634fd96f 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorReferenceManagerTest.cs +++ b/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 diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ExpressionRewriterTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/ExpressionRewriterTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ExpressionRewriterTest.cs rename to test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/ExpressionRewriterTest.cs index 9e55373f62..7dd6bc25dc 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ExpressionRewriterTest.cs +++ b/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 { diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorPagePropertyActivatorTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorPagePropertyActivatorTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorPagePropertyActivatorTest.cs rename to test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorPagePropertyActivatorTest.cs index c1c68a7d8d..a62ddba0ca 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorPagePropertyActivatorTest.cs +++ b/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 { diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewCompilerProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorViewCompilerProviderTest.cs similarity index 95% rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewCompilerProviderTest.cs rename to test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorViewCompilerProviderTest.cs index 9b3656aaee..e6e23255bb 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewCompilerProviderTest.cs +++ b/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 { diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewCompilerTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorViewCompilerTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewCompilerTest.cs rename to test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorViewCompilerTest.cs index ce99154a00..2fb6d3d40c 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewCompilerTest.cs +++ b/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 { diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorViewEngineFileProviderAccessorTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/DefaultRazorViewEngineFileProviderAccessorTest.cs similarity index 97% rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorViewEngineFileProviderAccessorTest.cs rename to test/Microsoft.AspNetCore.Mvc.Razor.Test/DefaultRazorViewEngineFileProviderAccessorTest.cs index 7f64ceb9f8..d69853f2b8 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorViewEngineFileProviderAccessorTest.cs +++ b/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 { diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultTagHelperFactoryTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/DefaultTagHelperFactoryTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultTagHelperFactoryTest.cs rename to test/Microsoft.AspNetCore.Mvc.Razor.Test/DefaultTagHelperFactoryTest.cs index b09d936d01..9444298493 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultTagHelperFactoryTest.cs +++ b/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 { diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewEngineOptionsSetupTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/DependencyInjection/RazorViewEngineOptionsSetupTest.cs similarity index 97% rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewEngineOptionsSetupTest.cs rename to test/Microsoft.AspNetCore.Mvc.Razor.Test/DependencyInjection/RazorViewEngineOptionsSetupTest.cs index fc28afe325..79d9b334d6 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorViewEngineOptionsSetupTest.cs +++ b/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)); } } diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/FileProviderRazorProjectFileSystemTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/FileProviderRazorProjectFileSystemTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/FileProviderRazorProjectFileSystemTest.cs rename to test/Microsoft.AspNetCore.Mvc.Razor.Test/FileProviderRazorProjectFileSystemTest.cs index e2f8846111..4aa75decdd 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/FileProviderRazorProjectFileSystemTest.cs +++ b/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 { diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ViewPathTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/ViewPathTest.cs similarity index 95% rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ViewPathTest.cs rename to test/Microsoft.AspNetCore.Mvc.Razor.Test/ViewPathTest.cs index e7055650e2..6f69e12a85 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ViewPathTest.cs +++ b/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 { diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/AuthorizationPageApplicationModelProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/AuthorizationPageApplicationModelProviderTest.cs similarity index 97% rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/AuthorizationPageApplicationModelProviderTest.cs rename to test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/AuthorizationPageApplicationModelProviderTest.cs index 559a653985..b820add41e 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/AuthorizationPageApplicationModelProviderTest.cs +++ b/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 { diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/CompiledPageActionDescriptorBuilderTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/CompiledPageActionDescriptorBuilderTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/CompiledPageActionDescriptorBuilderTest.cs rename to test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/CompiledPageActionDescriptorBuilderTest.cs index 4627d28c89..a67ea21a9b 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/CompiledPageActionDescriptorBuilderTest.cs +++ b/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 { diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/CompiledPageRouteModelProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/CompiledPageRouteModelProviderTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/CompiledPageRouteModelProviderTest.cs rename to test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/CompiledPageRouteModelProviderTest.cs index 0ddf9f3af4..a12c877f5e 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/CompiledPageRouteModelProviderTest.cs +++ b/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, diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/DefaultPageApplicationModelProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/DefaultPageApplicationModelProviderTest.cs index 7661f32707..b9b0cd9548 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/DefaultPageApplicationModelProviderTest.cs +++ b/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; diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageRouteModelFactoryTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/PageRouteModelFactoryTest.cs similarity index 98% rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageRouteModelFactoryTest.cs rename to test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/PageRouteModelFactoryTest.cs index 7269743cc8..7e5347d280 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageRouteModelFactoryTest.cs +++ b/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 { diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/RazorProjectPageRouteModelProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/RazorProjectPageRouteModelProviderTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/RazorProjectPageRouteModelProviderTest.cs rename to test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/RazorProjectPageRouteModelProviderTest.cs index 4b8aa8e581..70b80a5c64 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/RazorProjectPageRouteModelProviderTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/RazorProjectPageRouteModelProviderTest.cs @@ -2,13 +2,13 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Linq; -using Microsoft.AspNetCore.Mvc.ApplicationModels; +using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Razor.Language; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Options; using Xunit; -namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal +namespace Microsoft.AspNetCore.Mvc.ApplicationModels { public class RazorProjectPageRouteModelProviderTest { diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/ResponseCacheFilterApplicationModelProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/ResponseCacheFilterApplicationModelProviderTest.cs similarity index 95% rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/ResponseCacheFilterApplicationModelProviderTest.cs rename to test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/ResponseCacheFilterApplicationModelProviderTest.cs index 6b08977e2d..622049a8c5 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/ResponseCacheFilterApplicationModelProviderTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/ResponseCacheFilterApplicationModelProviderTest.cs @@ -6,14 +6,16 @@ using System.Reflection; using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc.ApplicationModels; +using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.ModelBinding; +using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal +namespace Microsoft.AspNetCore.Mvc.Filters { public class ResponseCacheFilterApplicationModelProviderTest { @@ -71,7 +73,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal f => Assert.IsType(f), f => { - var filter = Assert.IsType(f); + var filter = Assert.IsType(f); Assert.Equal("Abc", filter.VaryByHeader); Assert.Equal(12, filter.Duration); Assert.True(filter.NoStore); @@ -118,7 +120,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal f => Assert.IsType(f), f => { - var filter = Assert.IsType(f); + var filter = Assert.IsType(f); Assert.Equal(new[] { "A" }, filter.VaryByQueryKeys); Assert.Equal(14, filter.Duration); }); diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/TempDataFilterPageApplicationModelProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/TempDataFilterPageApplicationModelProviderTest.cs similarity index 97% rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/TempDataFilterPageApplicationModelProviderTest.cs rename to test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/TempDataFilterPageApplicationModelProviderTest.cs index cc2429ca16..5db6365cf1 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/TempDataFilterPageApplicationModelProviderTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/TempDataFilterPageApplicationModelProviderTest.cs @@ -4,11 +4,12 @@ using System; using System.Reflection; using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc.ApplicationModels; +using Microsoft.AspNetCore.Mvc.Filters; +using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Options; using Xunit; -namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal +namespace Microsoft.AspNetCore.Mvc.ApplicationModels { public class TempDataFilterPageApplicationModelProviderTest { diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/ViewDataAttributePageApplicationModelProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/ViewDataAttributePageApplicationModelProviderTest.cs similarity index 94% rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/ViewDataAttributePageApplicationModelProviderTest.cs rename to test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/ViewDataAttributePageApplicationModelProviderTest.cs index 7caf17e358..2407264496 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/ViewDataAttributePageApplicationModelProviderTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/ViewDataAttributePageApplicationModelProviderTest.cs @@ -4,10 +4,11 @@ using System; using System.Reflection; using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc.ApplicationModels; +using Microsoft.AspNetCore.Mvc.Filters; +using Microsoft.AspNetCore.Mvc.RazorPages; using Xunit; -namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal +namespace Microsoft.AspNetCore.Mvc.ApplicationModels { public class ViewDataAttributePageApplicationModelProviderTest { diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/MvcRazorPagesMvcBuilderExtensionsTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/MvcRazorPagesMvcBuilderExtensionsTest.cs index 4b209a45fd..2979301efe 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/MvcRazorPagesMvcBuilderExtensionsTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/MvcRazorPagesMvcBuilderExtensionsTest.cs @@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Mvc.ApplicationModels; using Microsoft.AspNetCore.Mvc.ApplicationParts; -using Microsoft.AspNetCore.Mvc.Internal; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.Extensions.Options; using Moq; diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/RazorPagesRazorViewEngineOptionsSetupTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/RazorPagesRazorViewEngineOptionsSetupTest.cs similarity index 91% rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/RazorPagesRazorViewEngineOptionsSetupTest.cs rename to test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/RazorPagesRazorViewEngineOptionsSetupTest.cs index b0690ea559..f23c913288 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/RazorPagesRazorViewEngineOptionsSetupTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/RazorPagesRazorViewEngineOptionsSetupTest.cs @@ -4,13 +4,13 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Mvc.Razor; +using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure; using Microsoft.Extensions.Logging.Abstractions; -using Microsoft.Extensions.Options; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal +namespace Microsoft.Extensions.DependencyInjection { public class RazorPagesRazorViewEngineOptionsSetupTest { @@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal }; var viewEngineOptions = GetViewEngineOptions(); var setup = new RazorPagesRazorViewEngineOptionsSetup( - Options.Create(razorPagesOptions)); + Options.Options.Create(razorPagesOptions)); // Act setup.Configure(viewEngineOptions); @@ -54,7 +54,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal var razorPagesOptions = new RazorPagesOptions(); var viewEngineOptions = GetViewEngineOptions(); var setup = new RazorPagesRazorViewEngineOptionsSetup( - Options.Create(razorPagesOptions)); + Options.Options.Create(razorPagesOptions)); // Act setup.Configure(viewEngineOptions); @@ -79,7 +79,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal var razorPagesOptions = new RazorPagesOptions(); var viewEngineOptions = GetViewEngineOptions(); var setup = new RazorPagesRazorViewEngineOptionsSetup( - Options.Create(razorPagesOptions)); + Options.Options.Create(razorPagesOptions)); // Act setup.Configure(viewEngineOptions); @@ -107,7 +107,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal }; var viewEngineOptions = GetViewEngineOptions(); var setup = new RazorPagesRazorViewEngineOptionsSetup( - Options.Create(razorPagesOptions)); + Options.Options.Create(razorPagesOptions)); // Act setup.Configure(viewEngineOptions); @@ -133,7 +133,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal }; var viewEngineOptions = GetViewEngineOptions(); var setup = new RazorPagesRazorViewEngineOptionsSetup( - Options.Create(razorPagesOptions)); + Options.Options.Create(razorPagesOptions)); // Act setup.Configure(viewEngineOptions); @@ -160,7 +160,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal }; var viewEngineOptions = GetViewEngineOptions(); var setup = new RazorPagesRazorViewEngineOptionsSetup( - Options.Create(razorPagesOptions)); + Options.Options.Create(razorPagesOptions)); // Act setup.Configure(viewEngineOptions); @@ -174,7 +174,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal { // Arrange var viewEngineOptions = GetViewEngineOptions(); - var setup = new RazorPagesRazorViewEngineOptionsSetup(Options.Create(new RazorPagesOptions())); + var setup = new RazorPagesRazorViewEngineOptionsSetup(Options.Options.Create(new RazorPagesOptions())); // Act setup.Configure(viewEngineOptions); @@ -190,7 +190,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal var defaultSetup = new RazorViewEngineOptionsSetup( Mock.Of(), NullLoggerFactory.Instance, - Options.Create(new MvcCompatibilityOptions())); + Options.Options.Create(new MvcCompatibilityOptions())); var options = new RazorViewEngineOptions(); defaultSetup.Configure(options); diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/AutoValidateAntiforgeryPageApplicationModelProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/AutoValidateAntiforgeryPageApplicationModelProviderTest.cs similarity index 97% rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/AutoValidateAntiforgeryPageApplicationModelProviderTest.cs rename to test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/AutoValidateAntiforgeryPageApplicationModelProviderTest.cs index f3222ce36c..cbfc1125c4 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/AutoValidateAntiforgeryPageApplicationModelProviderTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/AutoValidateAntiforgeryPageApplicationModelProviderTest.cs @@ -4,11 +4,12 @@ using System; using System.Reflection; using Microsoft.AspNetCore.Mvc.ApplicationModels; +using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.ViewFeatures; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.RazorPages +namespace Microsoft.AspNetCore.Mvc.Filters { public class AutoValidateAntiforgeryPageApplicationModelProviderTest { diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageHandlerResultFilterTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageHandlerResultFilterTest.cs similarity index 98% rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageHandlerResultFilterTest.cs rename to test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageHandlerResultFilterTest.cs index bbe92dd6da..66bdda64e5 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageHandlerResultFilterTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageHandlerResultFilterTest.cs @@ -4,13 +4,13 @@ using System; using System.Threading.Tasks; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.ModelBinding; +using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Routing; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal +namespace Microsoft.AspNetCore.Mvc.Filters { public class PageHandlerResultFilterTest { diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageSaveTempDataPropertyFilterFactoryTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageSaveTempDataPropertyFilterFactoryTest.cs similarity index 95% rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageSaveTempDataPropertyFilterFactoryTest.cs rename to test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageSaveTempDataPropertyFilterFactoryTest.cs index 7dfc55af46..31d78c9075 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageSaveTempDataPropertyFilterFactoryTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageSaveTempDataPropertyFilterFactoryTest.cs @@ -1,13 +1,14 @@ // 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.RazorPages; using Microsoft.AspNetCore.Mvc.ViewFeatures; using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; using Microsoft.Extensions.DependencyInjection; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.RazorPages +namespace Microsoft.AspNetCore.Mvc.Filters { public class PageSaveTempDataPropertyFilterFactoryTest { diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageSaveTempDataPropertyFilterTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageSaveTempDataPropertyFilterTest.cs similarity index 98% rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageSaveTempDataPropertyFilterTest.cs rename to test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageSaveTempDataPropertyFilterTest.cs index 524cd24b9c..be14b1a341 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageSaveTempDataPropertyFilterTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageSaveTempDataPropertyFilterTest.cs @@ -5,14 +5,14 @@ using System; using System.Collections.Generic; using System.Linq; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc.Filters; +using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.ViewFeatures; using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; using Microsoft.AspNetCore.Routing; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal +namespace Microsoft.AspNetCore.Mvc.Filters { public class PageSaveTempDataPropertyFilterTest { diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageViewDataAttributeFilterFactoryTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageViewDataAttributeFilterFactoryTest.cs similarity index 95% rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageViewDataAttributeFilterFactoryTest.cs rename to test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageViewDataAttributeFilterFactoryTest.cs index 9c66bbda13..73ca582905 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageViewDataAttributeFilterFactoryTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageViewDataAttributeFilterFactoryTest.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.RazorPages +namespace Microsoft.AspNetCore.Mvc.Filters { public class PageViewDataAttributeFilterFactoryTest { diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageViewDataAttributeFilterTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageViewDataAttributeFilterTest.cs similarity index 97% rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageViewDataAttributeFilterTest.cs rename to test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageViewDataAttributeFilterTest.cs index dd10aa73f9..5198f9d558 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageViewDataAttributeFilterTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageViewDataAttributeFilterTest.cs @@ -6,15 +6,15 @@ using System.Collections.Generic; using System.Linq; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Abstractions; -using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.ModelBinding; +using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure; using Microsoft.AspNetCore.Mvc.ViewFeatures; using Microsoft.AspNetCore.Mvc.ViewFeatures.Filters; using Microsoft.AspNetCore.Routing; using Xunit; -namespace Microsoft.AspNetCore.Mvc.RazorPages +namespace Microsoft.AspNetCore.Mvc.Filters { public class PageViewDataAttributeFilterTest { diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/DefaultPageHandlerMethodSelectorTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageHandlerMethodSelectorTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/DefaultPageHandlerMethodSelectorTest.cs rename to test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageHandlerMethodSelectorTest.cs index 34b081d84d..c44fc72a69 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/DefaultPageHandlerMethodSelectorTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageHandlerMethodSelectorTest.cs @@ -4,13 +4,12 @@ using System; using System.Collections.Generic; using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.Options; using Xunit; -namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal +namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure { public class DefaultPageHandlerMethodSelectorTest { diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/DefaultPageLoaderTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageLoaderTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/DefaultPageLoaderTest.cs rename to test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageLoaderTest.cs index d31359df2f..0000ce40b1 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/DefaultPageLoaderTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageLoaderTest.cs @@ -5,13 +5,12 @@ using System; using System.Reflection; using Microsoft.AspNetCore.Mvc.ApplicationModels; using Microsoft.AspNetCore.Mvc.Razor.Compilation; -using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure; -using Microsoft.Extensions.Options; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Options; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal +namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure { public class DefaultPageLoaderTest { diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/ExecutorFactoryTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/ExecutorFactoryTest.cs similarity index 98% rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/ExecutorFactoryTest.cs rename to test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/ExecutorFactoryTest.cs index a5a58227e0..f7d48b9b2a 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/ExecutorFactoryTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/ExecutorFactoryTest.cs @@ -6,12 +6,10 @@ using System.Linq; using System.Reflection; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc.ModelBinding; -using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure; -using Microsoft.AspNetCore.Mvc.RazorPages.Internal; using Microsoft.AspNetCore.Mvc.ViewComponents; using Xunit; -namespace Microsoft.AspNetCore.Mvc.RazorPages.Test.Internal +namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure { public class ExecutorFactoryTest { diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionDescriptorChangeProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionDescriptorChangeProviderTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionDescriptorChangeProviderTest.cs rename to test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionDescriptorChangeProviderTest.cs index 48c7cb3454..a7973b2770 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionDescriptorChangeProviderTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionDescriptorChangeProviderTest.cs @@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Mvc.Razor; -using Microsoft.AspNetCore.Mvc.Razor.Internal; using Microsoft.AspNetCore.Razor.Language; using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.Options; @@ -11,7 +10,7 @@ using Microsoft.Extensions.Primitives; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal +namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure { public class PageActionDescriptorChangeProviderTest { diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionInvokerProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionInvokerProviderTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionInvokerProviderTest.cs rename to test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionInvokerProviderTest.cs index 955149bf03..9bd81c1b00 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionInvokerProviderTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionInvokerProviderTest.cs @@ -10,12 +10,10 @@ using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Abstractions; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.Infrastructure; -using Microsoft.AspNetCore.Mvc.Internal; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; using Microsoft.AspNetCore.Mvc.Razor; using Microsoft.AspNetCore.Mvc.Razor.Compilation; -using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewFeatures; using Microsoft.AspNetCore.Razor.Language; @@ -26,7 +24,7 @@ using Microsoft.Extensions.Options; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal +namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure { public class PageInvokerProviderTest { diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionInvokerTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionInvokerTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionInvokerTest.cs rename to test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionInvokerTest.cs index f6aff12602..e2930aec35 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageActionInvokerTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionInvokerTest.cs @@ -15,7 +15,6 @@ using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; using Microsoft.AspNetCore.Mvc.Razor; -using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure; using Microsoft.AspNetCore.Mvc.Rendering; using Microsoft.AspNetCore.Mvc.ViewEngines; using Microsoft.AspNetCore.Mvc.ViewFeatures; @@ -28,7 +27,7 @@ using Microsoft.Extensions.Options; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal +namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure { public class PageActionInvokerTest : CommonResourceInvokerTest { diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageBinderFactoryTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageBinderFactoryTest.cs similarity index 99% rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageBinderFactoryTest.cs rename to test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageBinderFactoryTest.cs index 6c983e1138..040f5763be 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageBinderFactoryTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageBinderFactoryTest.cs @@ -8,10 +8,8 @@ using System.Reflection; 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.Validation; -using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; @@ -19,7 +17,7 @@ using Microsoft.Extensions.Options; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal +namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure { public class PageBinderFactoryTest { diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageHandlerPageFilterTest.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageHandlerPageFilterTest.cs similarity index 98% rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageHandlerPageFilterTest.cs rename to test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageHandlerPageFilterTest.cs index 6b8e1e5d17..7e89443558 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Internal/PageHandlerPageFilterTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageHandlerPageFilterTest.cs @@ -7,12 +7,11 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.AspNetCore.Mvc.ModelBinding; -using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure; using Microsoft.AspNetCore.Routing; using Moq; using Xunit; -namespace Microsoft.AspNetCore.Mvc.RazorPages.Internal +namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure { public class PageHandlerPageFilterTest { diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/TestRazorProjectFileSystem.cs b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/TestRazorProjectFileSystem.cs index 49244b8980..c24d0bd834 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/TestRazorProjectFileSystem.cs +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/TestRazorProjectFileSystem.cs @@ -2,13 +2,13 @@ // 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.Razor.Internal; +using Microsoft.AspNetCore.Mvc.Razor; using Microsoft.Extensions.FileProviders; using Moq; namespace Microsoft.AspNetCore.Mvc.RazorPages { - public class TestRazorProjectFileSystem : FileProviderRazorProjectFileSystem + internal class TestRazorProjectFileSystem : FileProviderRazorProjectFileSystem { public TestRazorProjectFileSystem(IFileProvider fileProvider, IHostingEnvironment hostingEnvironment) :base(GetAccessor(fileProvider), hostingEnvironment) diff --git a/test/Microsoft.AspNetCore.Mvc.Test/MvcOptionsSetupTest.cs b/test/Microsoft.AspNetCore.Mvc.Test/MvcOptionsSetupTest.cs index 53ba4f52fb..f80437c550 100644 --- a/test/Microsoft.AspNetCore.Mvc.Test/MvcOptionsSetupTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Test/MvcOptionsSetupTest.cs @@ -5,7 +5,6 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; -using System.Linq; using System.Reflection; using System.Threading; using System.Xml; @@ -17,7 +16,6 @@ using Microsoft.AspNetCore.Mvc.ApplicationParts; using Microsoft.AspNetCore.Mvc.DataAnnotations; using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal; using Microsoft.AspNetCore.Mvc.Formatters; -using Microsoft.AspNetCore.Mvc.Internal; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ModelBinding.Binders; using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata; diff --git a/test/Microsoft.AspNetCore.Mvc.Test/MvcServiceCollectionExtensionsTest.cs b/test/Microsoft.AspNetCore.Mvc.Test/MvcServiceCollectionExtensionsTest.cs index 56e278e42a..697e78ddf1 100644 --- a/test/Microsoft.AspNetCore.Mvc.Test/MvcServiceCollectionExtensionsTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Test/MvcServiceCollectionExtensionsTest.cs @@ -21,11 +21,9 @@ using Microsoft.AspNetCore.Mvc.Formatters.Json.Internal; using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Mvc.Razor; using Microsoft.AspNetCore.Mvc.Razor.Compilation; -using Microsoft.AspNetCore.Mvc.Razor.Internal; using Microsoft.AspNetCore.Mvc.Razor.TagHelpers; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure; -using Microsoft.AspNetCore.Mvc.RazorPages.Internal; using Microsoft.AspNetCore.Mvc.TagHelpers; using Microsoft.AspNetCore.Mvc.ViewComponents; using Microsoft.AspNetCore.Mvc.ViewFeatures;