huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Addressed feedback

This commit is contained in:
Ajay Bhargav Baaskaran 2016-09-16 11:01:51 -07:00
parent 0cfd5363f8
commit 5ad5f7a3f9
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Mvc.Razor.Host/Internal/GeneratedViewComponentTagHelperContext.cs
View File

@ -47,7 +47,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Host.Internal
public string ViewContextTypeName { get; set; }
/// <summary>
/// Name of the ViewContextAttribute type for view execution.
/// Name of the ViewContextAttribute type.
/// </summary>
public string ViewContextAttributeTypeName { get; set; }
}

6
src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs
View File

@ -165,10 +165,8 @@ namespace Microsoft.Extensions.DependencyInjection
services.TryAddSingleton<ITagHelperTypeResolver, TagHelperTypeResolver>();
services.TryAddSingleton<ITagHelperDescriptorFactory>(s => new TagHelperDescriptorFactory(designTime: false));
services.TryAddSingleton<TagHelperDescriptorResolver, TagHelperDescriptorResolver>();
// And ViewComponentTagHelper resolver.
services.TryAddSingleton<ViewComponentTagHelperDescriptorResolver, ViewComponentTagHelperDescriptorResolver>();
services.TryAddSingleton<TagHelperDescriptorResolver>();
services.TryAddSingleton<ViewComponentTagHelperDescriptorResolver>();
services.TryAddSingleton<ITagHelperDescriptorResolver, CompositeTagHelperDescriptorResolver>();
// Caches compilation artifacts across the lifetime of the application.

15
src/Microsoft.AspNetCore.Mvc.Razor/Internal/CompositeTagHelperDescriptorResolver.cs
View File

@ -9,26 +9,23 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal
{
public class CompositeTagHelperDescriptorResolver : ITagHelperDescriptorResolver
{
public IList<TagHelperDescriptorResolver> _resolvers;
private readonly TagHelperDescriptorResolver _tagHelperDescriptorResolver;
private readonly ViewComponentTagHelperDescriptorResolver _viewComponentTagHelperDescriptorResolver;
public CompositeTagHelperDescriptorResolver(
TagHelperDescriptorResolver tagHelperDescriptorResolver,
ViewComponentTagHelperDescriptorResolver viewComponentTagHelperDescriptorResolver)
{
_resolvers = new List<TagHelperDescriptorResolver>();
_resolvers.Add(tagHelperDescriptorResolver);
_resolvers.Add(viewComponentTagHelperDescriptorResolver);
_tagHelperDescriptorResolver = tagHelperDescriptorResolver;
_viewComponentTagHelperDescriptorResolver = viewComponentTagHelperDescriptorResolver;
}
public IEnumerable<TagHelperDescriptor> Resolve(TagHelperDescriptorResolutionContext resolutionContext)
{
var descriptors = new List<TagHelperDescriptor>();
foreach (var resolver in _resolvers)
{
var currentDescriptors = resolver.Resolve(resolutionContext);
descriptors.AddRange(currentDescriptors);
}
descriptors.AddRange(_tagHelperDescriptorResolver.Resolve(resolutionContext));
descriptors.AddRange(_viewComponentTagHelperDescriptorResolver.Resolve(resolutionContext));
return descriptors;
}

2
src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewComponentTagHelperDescriptorResolver.cs
View File

@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal
{
public class ViewComponentTagHelperDescriptorResolver : TagHelperDescriptorResolver
{
ViewComponentTagHelperDescriptorFactory _descriptorFactory;
private readonly ViewComponentTagHelperDescriptorFactory _descriptorFactory;
public ViewComponentTagHelperDescriptorResolver(
IViewComponentDescriptorProvider viewComponentDescriptorProvider)