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

Reacting to NullLoggerFactory removal

This commit is contained in:
Pranav K 2015-02-26 17:30:37 -08:00
parent 73f44889f2
commit ed3f5118e3
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Microsoft.AspNet.Mvc/MvcServiceCollectionExtensions.cs
View File

@ -118,7 +118,8 @@ namespace Microsoft.Framework.DependencyInjection
{ {
assemblyProvider.CandidateAssemblies.Add(assembly); assemblyProvider.CandidateAssemblies.Add(assembly);
} }
var loggerFactory = NullLoggerFactory.Instance;
var loggerFactory = new LoggerFactory();
var controllerTypeProvider = new DefaultControllerTypeProvider(assemblyProvider, loggerFactory); var controllerTypeProvider = new DefaultControllerTypeProvider(assemblyProvider, loggerFactory);
var controllerTypes = controllerTypeProvider.ControllerTypes; var controllerTypes = controllerTypeProvider.ControllerTypes;

6
test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs
View File

@ -371,7 +371,7 @@ namespace System.Web.Http
assemblyProvider.CandidateAssemblies.Add(GetType().GetTypeInfo().Assembly); assemblyProvider.CandidateAssemblies.Add(GetType().GetTypeInfo().Assembly);
var controllerTypeProvider = new NamespaceFilteredControllerTypeProvider(assemblyProvider); var controllerTypeProvider = new NamespaceFilteredControllerTypeProvider(assemblyProvider);
var modelBuilder = new DefaultControllerModelBuilder(new DefaultActionModelBuilder(null), var modelBuilder = new DefaultControllerModelBuilder(new DefaultActionModelBuilder(null),
NullLoggerFactory.Instance, new LoggerFactory(),
null); null);
var filterProvider = new Mock<IGlobalFilterProvider>(); var filterProvider = new Mock<IGlobalFilterProvider>();
@ -394,7 +394,7 @@ namespace System.Web.Http
modelBuilder, modelBuilder,
filterProvider.Object, filterProvider.Object,
optionsAccessor.Object, optionsAccessor.Object,
new NullLoggerFactory()); new LoggerFactory());
return provider; return provider;
} }
@ -408,7 +408,7 @@ namespace System.Web.Http
private class NamespaceFilteredControllerTypeProvider : DefaultControllerTypeProvider private class NamespaceFilteredControllerTypeProvider : DefaultControllerTypeProvider
{ {
public NamespaceFilteredControllerTypeProvider(IAssemblyProvider provider) public NamespaceFilteredControllerTypeProvider(IAssemblyProvider provider)
: base(provider, NullLoggerFactory.Instance) : base(provider, new LoggerFactory())
{ {
} }