From 3be396f38442e385e0ae0afdf481cc42d090a367 Mon Sep 17 00:00:00 2001
From: Mole <nikolajlauridsen@protonmail.ch>
Date: Mon, 21 Sep 2020 15:12:14 +0200
Subject: [PATCH] Use Factory.GetInstance in Current

---
 src/Umbraco.Core/Composing/Current.cs | 6 +++---
 src/Umbraco.Web/Composing/Current.cs  | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Core/Composing/Current.cs b/src/Umbraco.Core/Composing/Current.cs
index 2a4559c652..40fc979590 100644
--- a/src/Umbraco.Core/Composing/Current.cs
+++ b/src/Umbraco.Core/Composing/Current.cs
@@ -14,7 +14,7 @@ namespace Umbraco.Composing
 {
     public static class Current
     {
-        private static Microsoft.Extensions.Logging.ILogger<object> _logger = new NullLogger<object>();
+        private static ILogger<object> _logger = new NullLogger<object>();
         private static ILoggerFactory _loggerFactory;
         private static IIOHelper _ioHelper;
         private static IHostingEnvironment _hostingEnvironment;
@@ -23,7 +23,7 @@ namespace Umbraco.Composing
         private static SecuritySettings _securitySettings;
         private static GlobalSettings _globalSettings;
 
-        public static Microsoft.Extensions.Logging.ILogger<object> Logger => EnsureInitialized(_logger);
+        public static ILogger<object> Logger => EnsureInitialized(_logger);
         public static IIOHelper IOHelper => EnsureInitialized(_ioHelper);
         public static IHostingEnvironment HostingEnvironment => EnsureInitialized(_hostingEnvironment);
         public static IBackOfficeInfo BackOfficeInfo => EnsureInitialized(_backOfficeInfo);
@@ -44,7 +44,7 @@ namespace Umbraco.Composing
         }
 
         public static void Initialize(
-            Microsoft.Extensions.Logging.ILogger<object> logger,
+            ILogger<object> logger,
             SecuritySettings securitySettings,
             GlobalSettings globalSettings,
             IIOHelper ioHelper,
diff --git a/src/Umbraco.Web/Composing/Current.cs b/src/Umbraco.Web/Composing/Current.cs
index 0a7170063e..a940cd3657 100644
--- a/src/Umbraco.Web/Composing/Current.cs
+++ b/src/Umbraco.Web/Composing/Current.cs
@@ -244,9 +244,10 @@ namespace Umbraco.Web.Composing
 
         public static IShortStringHelper ShortStringHelper => Factory.GetInstance<IShortStringHelper>();
 
-        public static Microsoft.Extensions.Logging.ILogger<object> Logger => Umbraco.Composing.Current.Logger;
+        // TODO: Use LoggerFactory instead of shared Logger
+        public static ILogger<object> Logger => Factory.GetInstance<ILogger<object>>();
 
-        public static ILoggerFactory LoggerFactory => Umbraco.Composing.Current.LoggerFactory;
+        public static ILoggerFactory LoggerFactory => Factory.GetInstance<ILoggerFactory>();
 
         public static IProfiler Profiler => Factory.GetInstance<IProfiler>();