API review feedback for pubinternal type changes
This commit is contained in:
parent
3fe61d6601
commit
5a6d438f7b
|
|
@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Mvc.Core;
|
|||
|
||||
namespace Microsoft.AspNetCore.Mvc.Controllers
|
||||
{
|
||||
public class ControllerFactoryProvider : IControllerFactoryProvider
|
||||
internal class ControllerFactoryProvider : IControllerFactoryProvider
|
||||
{
|
||||
private readonly IControllerActivatorProvider _activatorProvider;
|
||||
private readonly Func<ControllerContext, object> _factoryCreateController;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Mvc.Controllers
|
|||
/// <summary>
|
||||
/// <see cref="IControllerActivator"/> that uses type activation to create controllers.
|
||||
/// </summary>
|
||||
public class DefaultControllerActivator : IControllerActivator
|
||||
internal class DefaultControllerActivator : IControllerActivator
|
||||
{
|
||||
private readonly ITypeActivatorCache _typeActivatorCache;
|
||||
|
||||
|
|
@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Mvc.Controllers
|
|||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public virtual object Create(ControllerContext controllerContext)
|
||||
public object Create(ControllerContext controllerContext)
|
||||
{
|
||||
if (controllerContext == null)
|
||||
{
|
||||
|
|
@ -57,7 +57,7 @@ namespace Microsoft.AspNetCore.Mvc.Controllers
|
|||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public virtual void Release(ControllerContext context, object controller)
|
||||
public void Release(ControllerContext context, object controller)
|
||||
{
|
||||
if (context == null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Mvc.Controllers
|
|||
/// <summary>
|
||||
/// Default implementation for <see cref="IControllerFactory"/>.
|
||||
/// </summary>
|
||||
public class DefaultControllerFactory : IControllerFactory
|
||||
internal class DefaultControllerFactory : IControllerFactory
|
||||
{
|
||||
private readonly IControllerActivator _controllerActivator;
|
||||
private readonly IControllerPropertyActivator[] _propertyActivators;
|
||||
|
|
@ -44,13 +44,8 @@ namespace Microsoft.AspNetCore.Mvc.Controllers
|
|||
_propertyActivators = propertyActivators.ToArray();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The <see cref="IControllerActivator"/> used to create a controller.
|
||||
/// </summary>
|
||||
protected IControllerActivator ControllerActivator => _controllerActivator;
|
||||
|
||||
/// <inheritdoc />
|
||||
public virtual object CreateController(ControllerContext context)
|
||||
public object CreateController(ControllerContext context)
|
||||
{
|
||||
if (context == null)
|
||||
{
|
||||
|
|
@ -74,7 +69,7 @@ namespace Microsoft.AspNetCore.Mvc.Controllers
|
|||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public virtual void ReleaseController(ControllerContext context, object controller)
|
||||
public void ReleaseController(ControllerContext context, object controller)
|
||||
{
|
||||
if (context == null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ using System;
|
|||
|
||||
namespace Microsoft.AspNetCore.Mvc.Controllers
|
||||
{
|
||||
public interface IControllerPropertyActivator
|
||||
internal interface IControllerPropertyActivator
|
||||
{
|
||||
void Activate(ControllerContext context, object controller);
|
||||
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@ using System;
|
|||
namespace Microsoft.AspNetCore.Mvc.Infrastructure
|
||||
{
|
||||
/// <summary>
|
||||
/// Caches <see cref="Microsoft.Extensions.DependencyInjection.ObjectFactory"/> instances produced by
|
||||
/// <see cref="Microsoft.Extensions.DependencyInjection.ActivatorUtilities.CreateFactory(Type, Type[])"/>.
|
||||
/// Caches <see cref="Extensions.DependencyInjection.ObjectFactory"/> instances produced by
|
||||
/// <see cref="Extensions.DependencyInjection.ActivatorUtilities.CreateFactory(Type, Type[])"/>.
|
||||
/// </summary>
|
||||
public interface ITypeActivatorCache
|
||||
internal interface ITypeActivatorCache
|
||||
{
|
||||
/// <summary>
|
||||
/// Creates an instance of <typeparamref name="TInstance"/>.
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure
|
|||
{
|
||||
/// <summary>
|
||||
/// Caches <see cref="ObjectFactory"/> instances produced by
|
||||
/// <see cref="Microsoft.Extensions.DependencyInjection.ActivatorUtilities.CreateFactory(Type, Type[])"/>.
|
||||
/// <see cref="ActivatorUtilities.CreateFactory(Type, Type[])"/>.
|
||||
/// </summary>
|
||||
internal class TypeActivatorCache : ITypeActivatorCache
|
||||
{
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ using System.Diagnostics;
|
|||
|
||||
namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
|
||||
{
|
||||
public class ValidationStack
|
||||
internal class ValidationStack
|
||||
{
|
||||
public int Count => HashSet?.Count ?? List.Count;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
|
|||
/// </summary>
|
||||
public class ValidationVisitor
|
||||
{
|
||||
private readonly ValidationStack _currentPath;
|
||||
private int? _maxValidationDepth;
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -55,7 +56,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
|
|||
ValidationState = validationState;
|
||||
|
||||
ModelState = actionContext.ModelState;
|
||||
CurrentPath = new ValidationStack();
|
||||
_currentPath = new ValidationStack();
|
||||
}
|
||||
|
||||
protected IModelValidatorProvider ValidatorProvider { get; }
|
||||
|
|
@ -65,7 +66,6 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
|
|||
protected ActionContext Context { get; }
|
||||
protected ModelStateDictionary ModelState { get; }
|
||||
protected ValidationStateDictionary ValidationState { get; }
|
||||
protected ValidationStack CurrentPath { get; }
|
||||
|
||||
protected object Container { get; set; }
|
||||
protected string Key { get; set; }
|
||||
|
|
@ -214,18 +214,18 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
|
|||
{
|
||||
RuntimeHelpers.EnsureSufficientExecutionStack();
|
||||
|
||||
if (model != null && !CurrentPath.Push(model))
|
||||
if (model != null && !_currentPath.Push(model))
|
||||
{
|
||||
// This is a cycle, bail.
|
||||
return true;
|
||||
}
|
||||
|
||||
if (MaxValidationDepth != null && CurrentPath.Count > MaxValidationDepth)
|
||||
if (MaxValidationDepth != null && _currentPath.Count > MaxValidationDepth)
|
||||
{
|
||||
// Non cyclic but too deep an object graph.
|
||||
|
||||
// Pop the current model to make ValidationStack.Dispose happy
|
||||
CurrentPath.Pop(model);
|
||||
_currentPath.Pop(model);
|
||||
|
||||
string message;
|
||||
switch (metadata.MetadataKind)
|
||||
|
|
@ -261,7 +261,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
|
|||
{
|
||||
// Use the key on the entry, because we might not have entries in model state.
|
||||
SuppressValidation(entry.Key);
|
||||
CurrentPath.Pop(model);
|
||||
_currentPath.Pop(model);
|
||||
return true;
|
||||
}
|
||||
// If the metadata indicates that no validators exist AND the aggregate state for the key says that the model graph
|
||||
|
|
@ -281,7 +281,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
|
|||
}
|
||||
}
|
||||
|
||||
CurrentPath.Pop(model);
|
||||
_currentPath.Pop(model);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -441,7 +441,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
|
|||
_visitor.Model = _model;
|
||||
_visitor.Strategy = _strategy;
|
||||
|
||||
_visitor.CurrentPath.Pop(_newModel);
|
||||
_visitor._currentPath.Pop(_newModel);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,18 @@
|
|||
"TypeId": "public class Microsoft.AspNetCore.Mvc.ConsumesAttribute : System.Attribute, Microsoft.AspNetCore.Mvc.Filters.IResourceFilter, Microsoft.AspNetCore.Mvc.Internal.IConsumesActionConstraint, Microsoft.AspNetCore.Mvc.ApiExplorer.IApiRequestMetadataProvider",
|
||||
"Kind": "Removal"
|
||||
},
|
||||
{
|
||||
"TypeId": "public class Microsoft.AspNetCore.Mvc.Controllers.ControllerFactoryProvider : Microsoft.AspNetCore.Mvc.Controllers.IControllerFactoryProvider",
|
||||
"Kind": "Removal"
|
||||
},
|
||||
{
|
||||
"TypeId": "public class Microsoft.AspNetCore.Mvc.Controllers.DefaultControllerActivator : Microsoft.AspNetCore.Mvc.Controllers.IControllerActivator",
|
||||
"Kind": "Removal"
|
||||
},
|
||||
{
|
||||
"TypeId": "public class Microsoft.AspNetCore.Mvc.Controllers.DefaultControllerFactory : Microsoft.AspNetCore.Mvc.Controllers.IControllerFactory",
|
||||
"Kind": "Removal"
|
||||
},
|
||||
{
|
||||
"TypeId": "public class Microsoft.AspNetCore.Mvc.Formatters.FormatFilter : Microsoft.AspNetCore.Mvc.Formatters.Internal.IFormatFilter, Microsoft.AspNetCore.Mvc.Filters.IResourceFilter, Microsoft.AspNetCore.Mvc.Filters.IResultFilter",
|
||||
"Kind": "Removal"
|
||||
|
|
@ -46,21 +58,6 @@
|
|||
"MemberId": "public .ctor(Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidatorProvider validatorProvider, Microsoft.AspNetCore.Mvc.Internal.ValidatorCache validatorCache, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateDictionary validationState)",
|
||||
"Kind": "Removal"
|
||||
},
|
||||
{
|
||||
"TypeId": "public class Microsoft.AspNetCore.Mvc.Controllers.DefaultControllerFactory : Microsoft.AspNetCore.Mvc.Controllers.IControllerFactory",
|
||||
"MemberId": "public .ctor(Microsoft.AspNetCore.Mvc.Controllers.IControllerActivator controllerActivator, System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Internal.IControllerPropertyActivator> propertyActivators)",
|
||||
"Kind": "Removal"
|
||||
},
|
||||
{
|
||||
"TypeId": "public class Microsoft.AspNetCore.Mvc.Controllers.ControllerFactoryProvider : Microsoft.AspNetCore.Mvc.Controllers.IControllerFactoryProvider",
|
||||
"MemberId": "public .ctor(Microsoft.AspNetCore.Mvc.Controllers.IControllerActivatorProvider activatorProvider, Microsoft.AspNetCore.Mvc.Controllers.IControllerFactory controllerFactory, System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.Internal.IControllerPropertyActivator> propertyActivators)",
|
||||
"Kind": "Removal"
|
||||
},
|
||||
{
|
||||
"TypeId": "public class Microsoft.AspNetCore.Mvc.Controllers.DefaultControllerActivator : Microsoft.AspNetCore.Mvc.Controllers.IControllerActivator",
|
||||
"MemberId": "public .ctor(Microsoft.AspNetCore.Mvc.Internal.ITypeActivatorCache typeActivatorCache)",
|
||||
"Kind": "Removal"
|
||||
},
|
||||
{
|
||||
"TypeId": "public abstract class Microsoft.AspNetCore.Mvc.ModelBinding.ObjectModelValidator : Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IObjectModelValidator",
|
||||
"MemberId": "public abstract Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationVisitor GetValidationVisitor(Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidatorProvider validatorProvider, Microsoft.AspNetCore.Mvc.Internal.ValidatorCache validatorCache, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateDictionary validationState)",
|
||||
|
|
@ -76,4 +73,4 @@
|
|||
"MemberId": "public abstract Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationVisitor GetValidationVisitor(Microsoft.AspNetCore.Mvc.ActionContext actionContext, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IModelValidatorProvider validatorProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidatorCache validatorCache, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateDictionary validationState)",
|
||||
"Kind": "Addition"
|
||||
}
|
||||
]
|
||||
]
|
||||
|
|
@ -11,12 +11,12 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
|
|||
/// <summary>
|
||||
/// <see cref="IPageActivatorProvider"/> that uses type activation to create Pages.
|
||||
/// </summary>
|
||||
public class DefaultPageActivatorProvider : IPageActivatorProvider
|
||||
internal class DefaultPageActivatorProvider : IPageActivatorProvider
|
||||
{
|
||||
private readonly Action<PageContext, ViewContext, object> _disposer = Dispose;
|
||||
|
||||
/// <inheritdoc />
|
||||
public virtual Func<PageContext, ViewContext, object> CreateActivator(CompiledPageActionDescriptor actionDescriptor)
|
||||
public Func<PageContext, ViewContext, object> CreateActivator(CompiledPageActionDescriptor actionDescriptor)
|
||||
{
|
||||
if (actionDescriptor == null)
|
||||
{
|
||||
|
|
@ -35,7 +35,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
|
|||
return CreatePageFactory(pageTypeInfo);
|
||||
}
|
||||
|
||||
public virtual Action<PageContext, ViewContext, object> CreateReleaser(CompiledPageActionDescriptor actionDescriptor)
|
||||
public Action<PageContext, ViewContext, object> CreateReleaser(CompiledPageActionDescriptor actionDescriptor)
|
||||
{
|
||||
if (actionDescriptor == null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Mvc.ViewFeatures;
|
|||
|
||||
namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
|
||||
{
|
||||
public class DefaultPageFactoryProvider : IPageFactoryProvider
|
||||
internal class DefaultPageFactoryProvider : IPageFactoryProvider
|
||||
{
|
||||
private readonly IPageActivatorProvider _pageActivator;
|
||||
private readonly IModelMetadataProvider _modelMetadataProvider;
|
||||
|
|
@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
|
|||
};
|
||||
}
|
||||
|
||||
public virtual Func<PageContext, ViewContext, object> CreatePageFactory(CompiledPageActionDescriptor actionDescriptor)
|
||||
public Func<PageContext, ViewContext, object> CreatePageFactory(CompiledPageActionDescriptor actionDescriptor)
|
||||
{
|
||||
if (!typeof(PageBase).GetTypeInfo().IsAssignableFrom(actionDescriptor.PageTypeInfo))
|
||||
{
|
||||
|
|
@ -68,7 +68,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
|
|||
};
|
||||
}
|
||||
|
||||
public virtual Action<PageContext, ViewContext, object> CreatePageDisposer(CompiledPageActionDescriptor descriptor)
|
||||
public Action<PageContext, ViewContext, object> CreatePageDisposer(CompiledPageActionDescriptor descriptor)
|
||||
{
|
||||
if (descriptor == null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -9,17 +9,12 @@ using Microsoft.Extensions.Options;
|
|||
|
||||
namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
|
||||
{
|
||||
public class DefaultPageHandlerMethodSelector : IPageHandlerMethodSelector
|
||||
internal class DefaultPageHandlerMethodSelector : IPageHandlerMethodSelector
|
||||
{
|
||||
private const string Handler = "handler";
|
||||
|
||||
private readonly IOptions<RazorPagesOptions> _options;
|
||||
|
||||
[Obsolete("This constructor will be removed in a future release. Use the other constructor.")]
|
||||
public DefaultPageHandlerMethodSelector()
|
||||
{
|
||||
}
|
||||
|
||||
public DefaultPageHandlerMethodSelector(IOptions<RazorPagesOptions> options)
|
||||
{
|
||||
if (options == null)
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
|
|||
/// <summary>
|
||||
/// <see cref="IPageActivatorProvider"/> that uses type activation to create Razor Page instances.
|
||||
/// </summary>
|
||||
public class DefaultPageModelActivatorProvider : IPageModelActivatorProvider
|
||||
internal class DefaultPageModelActivatorProvider : IPageModelActivatorProvider
|
||||
{
|
||||
private readonly Action<PageContext, object> _disposer = Dispose;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ using Microsoft.Extensions.Internal;
|
|||
|
||||
namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
|
||||
{
|
||||
public class DefaultPageModelFactoryProvider : IPageModelFactoryProvider
|
||||
internal class DefaultPageModelFactoryProvider : IPageModelFactoryProvider
|
||||
{
|
||||
private static readonly Func<PropertyInfo, PropertyActivator<PageContext>> _createActivateInfo =
|
||||
CreateActivateInfo;
|
||||
|
|
@ -18,7 +18,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
|
|||
_modelActivator = modelActivator;
|
||||
}
|
||||
|
||||
public virtual Func<PageContext, object> CreateModelFactory(CompiledPageActionDescriptor descriptor)
|
||||
public Func<PageContext, object> CreateModelFactory(CompiledPageActionDescriptor descriptor)
|
||||
{
|
||||
if (descriptor == null)
|
||||
{
|
||||
|
|
@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure
|
|||
};
|
||||
}
|
||||
|
||||
public virtual Action<PageContext, object> CreateModelDisposer(CompiledPageActionDescriptor descriptor)
|
||||
public Action<PageContext, object> CreateModelDisposer(CompiledPageActionDescriptor descriptor)
|
||||
{
|
||||
if (descriptor == null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,12 +1,27 @@
|
|||
[
|
||||
{
|
||||
"TypeId": "public class Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageResultExecutor : Microsoft.AspNetCore.Mvc.ViewFeatures.ViewExecutor",
|
||||
"MemberId": "public .ctor(Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory writerFactory, Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine compositeViewEngine, Microsoft.AspNetCore.Mvc.Razor.IRazorViewEngine razorViewEngine, Microsoft.AspNetCore.Mvc.Razor.IRazorPageActivator razorPageActivator, System.Diagnostics.DiagnosticSource diagnosticSource, System.Text.Encodings.Web.HtmlEncoder htmlEncoder)",
|
||||
"TypeId": "public class Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.DefaultPageActivatorProvider : Microsoft.AspNetCore.Mvc.RazorPages.IPageActivatorProvider",
|
||||
"Kind": "Removal"
|
||||
},
|
||||
{
|
||||
"TypeId": "public class Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.DefaultPageFactoryProvider : Microsoft.AspNetCore.Mvc.RazorPages.IPageFactoryProvider",
|
||||
"MemberId": "public .ctor(Microsoft.AspNetCore.Mvc.RazorPages.IPageActivatorProvider pageActivator, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.Routing.IUrlHelperFactory urlHelperFactory, Microsoft.AspNetCore.Mvc.Rendering.IJsonHelper jsonHelper, System.Diagnostics.DiagnosticSource diagnosticSource, System.Text.Encodings.Web.HtmlEncoder htmlEncoder, Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider modelExpressionProvider)",
|
||||
"Kind": "Removal"
|
||||
},
|
||||
{
|
||||
"TypeId": "public class Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.DefaultPageHandlerMethodSelector : Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.IPageHandlerMethodSelector",
|
||||
"Kind": "Removal"
|
||||
},
|
||||
{
|
||||
"TypeId": "public class Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.DefaultPageModelActivatorProvider : Microsoft.AspNetCore.Mvc.RazorPages.IPageModelActivatorProvider",
|
||||
"Kind": "Removal"
|
||||
},
|
||||
{
|
||||
"TypeId": "public class Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.DefaultPageModelFactoryProvider : Microsoft.AspNetCore.Mvc.RazorPages.IPageModelFactoryProvider",
|
||||
"Kind": "Removal"
|
||||
},
|
||||
{
|
||||
"TypeId": "public class Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure.PageResultExecutor : Microsoft.AspNetCore.Mvc.ViewFeatures.ViewExecutor",
|
||||
"MemberId": "public .ctor(Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory writerFactory, Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine compositeViewEngine, Microsoft.AspNetCore.Mvc.Razor.IRazorViewEngine razorViewEngine, Microsoft.AspNetCore.Mvc.Razor.IRazorPageActivator razorPageActivator, System.Diagnostics.DiagnosticSource diagnosticSource, System.Text.Encodings.Web.HtmlEncoder htmlEncoder)",
|
||||
"Kind": "Removal"
|
||||
}
|
||||
]
|
||||
]
|
||||
|
|
@ -29,6 +29,6 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers
|
|||
/// </summary>
|
||||
/// <param name="writer">The <see cref="TextWriter"/>.</param>
|
||||
/// <returns>A <see cref="PagedBufferedTextWriter"/>.</returns>
|
||||
PagedBufferedTextWriter CreateWriter(TextWriter writer);
|
||||
TextWriter CreateWriter(TextWriter writer);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers
|
|||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public PagedBufferedTextWriter CreateWriter(TextWriter writer)
|
||||
public TextWriter CreateWriter(TextWriter writer)
|
||||
{
|
||||
if (writer == null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ using System.Threading.Tasks;
|
|||
|
||||
namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers
|
||||
{
|
||||
public class PagedBufferedTextWriter : TextWriter
|
||||
internal class PagedBufferedTextWriter : TextWriter
|
||||
{
|
||||
private readonly TextWriter _inner;
|
||||
private readonly PagedCharBuffer _charBuffer;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewComponents
|
|||
/// <see cref="ViewComponentContext"/> to a public property of a view component marked
|
||||
/// with <see cref="ViewComponentContextAttribute"/>.
|
||||
/// </remarks>
|
||||
public class DefaultViewComponentActivator : IViewComponentActivator
|
||||
internal class DefaultViewComponentActivator : IViewComponentActivator
|
||||
{
|
||||
private readonly ITypeActivatorCache _typeActivatorCache;
|
||||
|
||||
|
|
@ -36,7 +36,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewComponents
|
|||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public virtual object Create(ViewComponentContext context)
|
||||
public object Create(ViewComponentContext context)
|
||||
{
|
||||
if (context == null)
|
||||
{
|
||||
|
|
@ -60,7 +60,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewComponents
|
|||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
public virtual void Release(ViewComponentContext context, object viewComponent)
|
||||
public void Release(ViewComponentContext context, object viewComponent)
|
||||
{
|
||||
if (context == null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewComponents
|
|||
/// <summary>
|
||||
/// Default implementation for <see cref="IViewComponentInvoker"/>.
|
||||
/// </summary>
|
||||
public class DefaultViewComponentInvoker : IViewComponentInvoker
|
||||
internal class DefaultViewComponentInvoker : IViewComponentInvoker
|
||||
{
|
||||
private readonly IViewComponentFactory _viewComponentFactory;
|
||||
private readonly ViewComponentInvokerCache _viewComponentInvokerCache;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ using Microsoft.Extensions.Logging;
|
|||
|
||||
namespace Microsoft.AspNetCore.Mvc.ViewComponents
|
||||
{
|
||||
public class DefaultViewComponentInvokerFactory : IViewComponentInvokerFactory
|
||||
internal class DefaultViewComponentInvokerFactory : IViewComponentInvokerFactory
|
||||
{
|
||||
private readonly IViewComponentFactory _viewComponentFactory;
|
||||
private readonly ViewComponentInvokerCache _viewComponentInvokerCache;
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ using Microsoft.Extensions.Internal;
|
|||
|
||||
namespace Microsoft.AspNetCore.Mvc.ViewComponents
|
||||
{
|
||||
public class ViewComponentInvokerCache
|
||||
internal class ViewComponentInvokerCache
|
||||
{
|
||||
private readonly IViewComponentDescriptorCollectionProvider _collectionProvider;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,18 @@
|
|||
"TypeId": "public class Microsoft.AspNetCore.Mvc.RemoteAttribute : System.ComponentModel.DataAnnotations.ValidationAttribute, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IClientModelValidator",
|
||||
"Kind": "Removal"
|
||||
},
|
||||
{
|
||||
"TypeId": "public class Microsoft.AspNetCore.Mvc.ViewComponents.DefaultViewComponentActivator : Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentActivator",
|
||||
"Kind": "Removal"
|
||||
},
|
||||
{
|
||||
"TypeId": "public class Microsoft.AspNetCore.Mvc.ViewComponents.DefaultViewComponentInvoker : Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentInvoker",
|
||||
"Kind": "Removal"
|
||||
},
|
||||
{
|
||||
"TypeId": "public class Microsoft.AspNetCore.Mvc.ViewComponents.DefaultViewComponentInvokerFactory : Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentInvokerFactory",
|
||||
"Kind": "Removal"
|
||||
},
|
||||
{
|
||||
"TypeId": "public class Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionaryControllerPropertyActivator : Microsoft.AspNetCore.Mvc.Internal.IControllerPropertyActivator",
|
||||
"Kind": "Removal"
|
||||
|
|
@ -22,11 +34,6 @@
|
|||
"MemberId": "public .ctor(Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.MvcViewOptions> viewOptions, Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory writerFactory, Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine viewEngine, Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory tempDataFactory, System.Diagnostics.DiagnosticSource diagnosticSource, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider)",
|
||||
"Kind": "Removal"
|
||||
},
|
||||
{
|
||||
"TypeId": "public class Microsoft.AspNetCore.Mvc.ViewComponents.DefaultViewComponentActivator : Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentActivator",
|
||||
"MemberId": "public .ctor(Microsoft.AspNetCore.Mvc.Internal.ITypeActivatorCache typeActivatorCache)",
|
||||
"Kind": "Removal"
|
||||
},
|
||||
{
|
||||
"TypeId": "public class Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpressionProvider : Microsoft.AspNetCore.Mvc.ViewFeatures.IModelExpressionProvider",
|
||||
"MemberId": "public .ctor(Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider, Microsoft.AspNetCore.Mvc.ViewFeatures.Internal.ExpressionTextCache expressionTextCache)",
|
||||
|
|
@ -37,16 +44,6 @@
|
|||
"MemberId": "public .ctor(Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentDescriptorCollectionProvider descriptorProvider, System.Text.Encodings.Web.HtmlEncoder htmlEncoder, Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentSelector selector, Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentInvokerFactory invokerFactory, Microsoft.AspNetCore.Mvc.ViewFeatures.Internal.IViewBufferScope viewBufferScope)",
|
||||
"Kind": "Removal"
|
||||
},
|
||||
{
|
||||
"TypeId": "public class Microsoft.AspNetCore.Mvc.ViewComponents.DefaultViewComponentInvoker : Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentInvoker",
|
||||
"MemberId": "public .ctor(Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentFactory viewComponentFactory, Microsoft.AspNetCore.Mvc.ViewFeatures.Internal.ViewComponentInvokerCache viewComponentInvokerCache, System.Diagnostics.DiagnosticSource diagnosticSource, Microsoft.Extensions.Logging.ILogger logger)",
|
||||
"Kind": "Removal"
|
||||
},
|
||||
{
|
||||
"TypeId": "public class Microsoft.AspNetCore.Mvc.ViewComponents.DefaultViewComponentInvokerFactory : Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentInvokerFactory",
|
||||
"MemberId": "public .ctor(Microsoft.AspNetCore.Mvc.ViewComponents.IViewComponentFactory viewComponentFactory, Microsoft.AspNetCore.Mvc.ViewFeatures.Internal.ViewComponentInvokerCache viewComponentInvokerCache, System.Diagnostics.DiagnosticSource diagnosticSource, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory)",
|
||||
"Kind": "Removal"
|
||||
},
|
||||
{
|
||||
"TypeId": "public class Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelper : Microsoft.AspNetCore.Mvc.Rendering.IHtmlHelper, Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware",
|
||||
"MemberId": "public .ctor(Microsoft.AspNetCore.Mvc.ViewFeatures.IHtmlGenerator htmlGenerator, Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine viewEngine, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider metadataProvider, Microsoft.AspNetCore.Mvc.ViewFeatures.Internal.IViewBufferScope bufferScope, System.Text.Encodings.Web.HtmlEncoder htmlEncoder, System.Text.Encodings.Web.UrlEncoder urlEncoder)",
|
||||
|
|
@ -72,4 +69,4 @@
|
|||
"MemberId": "public .ctor(Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Mvc.MvcViewOptions> viewOptions, Microsoft.AspNetCore.Mvc.Infrastructure.IHttpResponseStreamWriterFactory writerFactory, Microsoft.AspNetCore.Mvc.ViewEngines.ICompositeViewEngine viewEngine, Microsoft.AspNetCore.Mvc.ViewFeatures.ITempDataDictionaryFactory tempDataFactory, System.Diagnostics.DiagnosticSource diagnosticSource, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory, Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider modelMetadataProvider)",
|
||||
"Kind": "Removal"
|
||||
}
|
||||
]
|
||||
]
|
||||
|
|
@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Buffers
|
|||
ReturnedBuffers.Add(segment);
|
||||
}
|
||||
|
||||
public PagedBufferedTextWriter CreateWriter(TextWriter writer)
|
||||
public TextWriter CreateWriter(TextWriter writer)
|
||||
{
|
||||
return new PagedBufferedTextWriter(ArrayPool<char>.Shared, writer);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue