From ed3f5118e318f90267210cf5b3682835ed390b10 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 26 Feb 2015 17:30:37 -0800 Subject: [PATCH] Reacting to NullLoggerFactory removal --- src/Microsoft.AspNet.Mvc/MvcServiceCollectionExtensions.cs | 3 ++- .../ApiControllerActionDiscoveryTest.cs | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.AspNet.Mvc/MvcServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Mvc/MvcServiceCollectionExtensions.cs index 4e792ef221..7b466c715c 100644 --- a/src/Microsoft.AspNet.Mvc/MvcServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Mvc/MvcServiceCollectionExtensions.cs @@ -118,7 +118,8 @@ namespace Microsoft.Framework.DependencyInjection { assemblyProvider.CandidateAssemblies.Add(assembly); } - var loggerFactory = NullLoggerFactory.Instance; + + var loggerFactory = new LoggerFactory(); var controllerTypeProvider = new DefaultControllerTypeProvider(assemblyProvider, loggerFactory); var controllerTypes = controllerTypeProvider.ControllerTypes; diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs index 2059bbeae7..0d8e6369f1 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs @@ -371,7 +371,7 @@ namespace System.Web.Http assemblyProvider.CandidateAssemblies.Add(GetType().GetTypeInfo().Assembly); var controllerTypeProvider = new NamespaceFilteredControllerTypeProvider(assemblyProvider); var modelBuilder = new DefaultControllerModelBuilder(new DefaultActionModelBuilder(null), - NullLoggerFactory.Instance, + new LoggerFactory(), null); var filterProvider = new Mock(); @@ -394,7 +394,7 @@ namespace System.Web.Http modelBuilder, filterProvider.Object, optionsAccessor.Object, - new NullLoggerFactory()); + new LoggerFactory()); return provider; } @@ -408,7 +408,7 @@ namespace System.Web.Http private class NamespaceFilteredControllerTypeProvider : DefaultControllerTypeProvider { public NamespaceFilteredControllerTypeProvider(IAssemblyProvider provider) - : base(provider, NullLoggerFactory.Instance) + : base(provider, new LoggerFactory()) { }