diff --git a/NLog.Web.AspNetCore/AspNetExtensions.cs b/NLog.Web.AspNetCore/AspNetExtensions.cs index 18e4e1180..bca54155c 100644 --- a/NLog.Web.AspNetCore/AspNetExtensions.cs +++ b/NLog.Web.AspNetCore/AspNetExtensions.cs @@ -10,6 +10,8 @@ using NLog.Web.Internal; using NLog.Extensions.Logging; using NLog.Web.AspNetCore; +using NLog.Web.DependencyInjection; + #if ASP_NET_CORE2 using Microsoft.Extensions.DependencyInjection; #endif diff --git a/NLog.Web.AspNetCore/Internal/ServiceLocator.cs b/NLog.Web.AspNetCore/DependencyInjection/ServiceLocator.cs similarity index 76% rename from NLog.Web.AspNetCore/Internal/ServiceLocator.cs rename to NLog.Web.AspNetCore/DependencyInjection/ServiceLocator.cs index c4e1b8653..a834485f8 100644 --- a/NLog.Web.AspNetCore/Internal/ServiceLocator.cs +++ b/NLog.Web.AspNetCore/DependencyInjection/ServiceLocator.cs @@ -1,15 +1,14 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.Extensions.DependencyInjection; -namespace NLog.Web.Internal +namespace NLog.Web.DependencyInjection { /// <summary> /// Service provider /// </summary> /// <remarks> - /// This is a anti-pattern, but it works well with NLog + /// This is a anti-pattern, but it works well with NLog, and NLog should also support non-DI /// </remarks> internal static class ServiceLocator { diff --git a/NLog.Web.AspNetCore/LayoutRenderers/AspNetEnvironmentLayoutRenderer.cs b/NLog.Web.AspNetCore/LayoutRenderers/AspNetEnvironmentLayoutRenderer.cs index 36e2a5ff9..20a05bbf0 100644 --- a/NLog.Web.AspNetCore/LayoutRenderers/AspNetEnvironmentLayoutRenderer.cs +++ b/NLog.Web.AspNetCore/LayoutRenderers/AspNetEnvironmentLayoutRenderer.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using NLog.LayoutRenderers; +using NLog.Web.DependencyInjection; using NLog.Web.Internal; namespace NLog.Web.LayoutRenderers diff --git a/NLog.Web.AspNetCore/LayoutRenderers/AspNetLayoutRendererBase.cs b/NLog.Web.AspNetCore/LayoutRenderers/AspNetLayoutRendererBase.cs index adfc58410..261f2010e 100644 --- a/NLog.Web.AspNetCore/LayoutRenderers/AspNetLayoutRendererBase.cs +++ b/NLog.Web.AspNetCore/LayoutRenderers/AspNetLayoutRendererBase.cs @@ -4,6 +4,7 @@ using System.Text; using NLog.LayoutRenderers; +using NLog.Web.DependencyInjection; #if ASP_NET_CORE using NLog.Web.Internal; using Microsoft.AspNetCore.Http; diff --git a/NLog.Web.AspNetCore/LayoutRenderers/IISInstanceNameLayoutRenderer.cs b/NLog.Web.AspNetCore/LayoutRenderers/IISInstanceNameLayoutRenderer.cs index 14b364316..d03974d11 100644 --- a/NLog.Web.AspNetCore/LayoutRenderers/IISInstanceNameLayoutRenderer.cs +++ b/NLog.Web.AspNetCore/LayoutRenderers/IISInstanceNameLayoutRenderer.cs @@ -7,6 +7,7 @@ using Microsoft.Extensions.DependencyInjection; #endif using NLog.LayoutRenderers; +using NLog.Web.DependencyInjection; using NLog.Web.Internal; namespace NLog.Web.LayoutRenderers