diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperTypeResolver.cs b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperTypeResolver.cs index a88752ea37..60a399140e 100644 --- a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperTypeResolver.cs +++ b/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperTypeResolver.cs @@ -53,7 +53,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers IEnumerable libraryTypes; try { - libraryTypes = GetLibraryDefinedTypes(assemblyName); + libraryTypes = GetExportedTypes(assemblyName); } catch (Exception ex) { @@ -72,8 +72,14 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers return validTagHelpers.Select(type => type.AsType()); } - // Internal for testing, don't want to be loading assemblies during a test. - internal virtual IEnumerable GetLibraryDefinedTypes(AssemblyName assemblyName) + /// + /// Returns all exported types from the given + /// + /// The to get s from. + /// + /// An of types exported from the given . + /// + protected virtual IEnumerable GetExportedTypes(AssemblyName assemblyName) { var assembly = Assembly.Load(assemblyName); diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperDescriptorResolverTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperDescriptorResolverTest.cs index c2eba5d79d..d240daf0ad 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperDescriptorResolverTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperDescriptorResolverTest.cs @@ -358,7 +358,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers // Arrange var tagHelperTypeResolver = new TestTagHelperTypeResolver(TestableTagHelpers) { - OnGetLibraryDefinedTypes = (assemblyName) => + OnGetExportedTypes = (assemblyName) => { Assert.Equal("MyAssembly", assemblyName.Name); } @@ -523,7 +523,7 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers _lookupValues = lookupValues; } - internal override IEnumerable GetLibraryDefinedTypes(AssemblyName assemblyName) + protected override IEnumerable GetExportedTypes(AssemblyName assemblyName) { IEnumerable types; diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperTypeResolverTest.cs b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperTypeResolverTest.cs index a48c06e8b5..185406936d 100644 --- a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperTypeResolverTest.cs +++ b/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperTypeResolverTest.cs @@ -114,14 +114,14 @@ namespace Microsoft.AspNet.Razor.Runtime.TagHelpers public TestTagHelperTypeResolver(IEnumerable assemblyTypes) { _assemblyTypeInfos = assemblyTypes.Select(type => type.GetTypeInfo()); - OnGetLibraryDefinedTypes = (_) => { }; + OnGetExportedTypes = (_) => { }; } - public Action OnGetLibraryDefinedTypes { get; set; } + public Action OnGetExportedTypes { get; set; } - internal override IEnumerable GetLibraryDefinedTypes(AssemblyName assemblyName) + protected override IEnumerable GetExportedTypes(AssemblyName assemblyName) { - OnGetLibraryDefinedTypes(assemblyName); + OnGetExportedTypes(assemblyName); return _assemblyTypeInfos; }