From 2c2873492fbf187fa98dea3c6bbefd4325dee2fb Mon Sep 17 00:00:00 2001 From: Stephan Date: Thu, 29 Nov 2018 12:48:13 +0100 Subject: [PATCH] Fix merge --- src/Umbraco.Core/Composing/TypeLoader.cs | 6 +++--- src/Umbraco.Web/Composing/Composers/ControllersComposer.cs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Core/Composing/TypeLoader.cs b/src/Umbraco.Core/Composing/TypeLoader.cs index 491ccb0c96..cba92ada64 100644 --- a/src/Umbraco.Core/Composing/TypeLoader.cs +++ b/src/Umbraco.Core/Composing/TypeLoader.cs @@ -530,7 +530,7 @@ namespace Umbraco.Core.Composing // if not caching, or not IDiscoverable, directly get types if (cache == false || typeof(IDiscoverable).IsAssignableFrom(typeof(T)) == false) { - _logger.Logger.Debug("Running a full, non-cached, scan for type {TypeName} (slow).", typeof(T).FullName); + _logger.Debug("Running a full, non-cached, scan for type {TypeName} (slow).", typeof(T).FullName); return GetTypesInternal( typeof (T), null, @@ -574,7 +574,7 @@ namespace Umbraco.Core.Composing // if not caching, or not IDiscoverable, directly get types if (cache == false || typeof(IDiscoverable).IsAssignableFrom(typeof(T)) == false) { - _logger.Logger.Debug("Running a full, non-cached, scan for type {TypeName} / attribute {AttributeName} (slow).", typeof(T).FullName, typeof(TAttribute).FullName); + _logger.Debug("Running a full, non-cached, scan for type {TypeName} / attribute {AttributeName} (slow).", typeof(T).FullName, typeof(TAttribute).FullName); return GetTypesInternal( typeof (T), typeof (TAttribute), @@ -617,7 +617,7 @@ namespace Umbraco.Core.Composing if (cache == false) { - _logger.Logger.Debug("Running a full, non-cached, scan for types / attribute {AttributeName} (slow).", typeof(TAttribute).FullName); + _logger.Debug("Running a full, non-cached, scan for types / attribute {AttributeName} (slow).", typeof(TAttribute).FullName); } return GetTypesInternal( diff --git a/src/Umbraco.Web/Composing/Composers/ControllersComposer.cs b/src/Umbraco.Web/Composing/Composers/ControllersComposer.cs index 0565e0d863..abc25dae49 100644 --- a/src/Umbraco.Web/Composing/Composers/ControllersComposer.cs +++ b/src/Umbraco.Web/Composing/Composers/ControllersComposer.cs @@ -71,11 +71,11 @@ namespace Umbraco.Web.Composing.Composers // scan and register every UmbracoApiController in everything (UmbracoApiController is IDiscoverable and IHttpController) var nonUmbracoWebApiControllers = composition.TypeLoader.GetTypes().Where(x => x.Assembly != umbracoWebAssembly); composition.RegisterControllers(nonUmbracoWebApiControllers); - + return composition; } - private static void RegisterControllers(this Composition composition, IEnumerable controllerTypes) + private static void RegisterControllers(this Composition composition, IEnumerable controllerTypes) { foreach (var controllerType in controllerTypes) composition.Register(controllerType, Lifetime.Request);