diff --git a/src/NLog.Extensions.Hosting/Extensions/ConfigureExtensions.cs b/src/NLog.Extensions.Hosting/Extensions/ConfigureExtensions.cs index 93d3727f..5ef01c6c 100644 --- a/src/NLog.Extensions.Hosting/Extensions/ConfigureExtensions.cs +++ b/src/NLog.Extensions.Hosting/Extensions/ConfigureExtensions.cs @@ -5,9 +5,6 @@ using Microsoft.Extensions.Hosting; using NLog.Config; using NLog.Extensions.Logging; -#if NETSTANDARD2_0 -using IHostEnvironment = Microsoft.Extensions.Hosting.IHostingEnvironment; -#endif namespace NLog.Extensions.Hosting { @@ -36,11 +33,7 @@ public static IHostBuilder UseNLog(this IHostBuilder builder) public static IHostBuilder UseNLog(this IHostBuilder builder, NLogProviderOptions? options) { Guard.ThrowIfNull(builder); -#if NETSTANDARD2_0 - builder.ConfigureServices((builderContext, services) => AddNLogLoggerProvider(services, builderContext.Configuration, null, options, CreateNLogLoggerProvider)); -#else builder.ConfigureServices((builderContext, services) => AddNLogLoggerProvider(services, builderContext.Configuration, builderContext.HostingEnvironment, options, CreateNLogLoggerProvider)); -#endif return builder; } @@ -54,11 +47,7 @@ public static IHostBuilder UseNLog(this IHostBuilder builder, NLogProviderOption public static IHostBuilder UseNLog(this IHostBuilder builder, NLogProviderOptions options, Func factoryBuilder) { Guard.ThrowIfNull(builder); -#if NETSTANDARD2_0 - builder.ConfigureServices((builderContext, services) => AddNLogLoggerProvider(services, builderContext.Configuration, null, options, (serviceProvider, config, hostEnv, opt) => -#else builder.ConfigureServices((builderContext, services) => AddNLogLoggerProvider(services, builderContext.Configuration, builderContext.HostingEnvironment, options, (serviceProvider, config, hostEnv, opt) => -#endif { RegisterHostNLogExtensions(LogManager.LogFactory, serviceProvider, hostEnv); config = serviceProvider.SetupNLogConfigSettings(config, LogManager.LogFactory); diff --git a/src/NLog.Extensions.Hosting/LayoutRenderers/HostAppNameLayoutRenderer.cs b/src/NLog.Extensions.Hosting/LayoutRenderers/HostAppNameLayoutRenderer.cs index f0402b55..5a517bc6 100644 --- a/src/NLog.Extensions.Hosting/LayoutRenderers/HostAppNameLayoutRenderer.cs +++ b/src/NLog.Extensions.Hosting/LayoutRenderers/HostAppNameLayoutRenderer.cs @@ -4,10 +4,6 @@ using NLog.Config; using NLog.LayoutRenderers; -#if NETSTANDARD2_0 -using IHostEnvironment = Microsoft.Extensions.Hosting.IHostingEnvironment; -#endif - namespace NLog.Extensions.Hosting { /// diff --git a/src/NLog.Extensions.Hosting/LayoutRenderers/HostEnvironmentLayoutRenderer.cs b/src/NLog.Extensions.Hosting/LayoutRenderers/HostEnvironmentLayoutRenderer.cs index e06a598c..0a6ccb8d 100644 --- a/src/NLog.Extensions.Hosting/LayoutRenderers/HostEnvironmentLayoutRenderer.cs +++ b/src/NLog.Extensions.Hosting/LayoutRenderers/HostEnvironmentLayoutRenderer.cs @@ -4,10 +4,6 @@ using NLog.Config; using NLog.LayoutRenderers; -#if NETSTANDARD2_0 -using IHostEnvironment = Microsoft.Extensions.Hosting.IHostingEnvironment; -#endif - namespace NLog.Extensions.Hosting { /// diff --git a/src/NLog.Extensions.Hosting/LayoutRenderers/HostRootDirLayoutRenderer.cs b/src/NLog.Extensions.Hosting/LayoutRenderers/HostRootDirLayoutRenderer.cs index d31ea247..74dea6cb 100644 --- a/src/NLog.Extensions.Hosting/LayoutRenderers/HostRootDirLayoutRenderer.cs +++ b/src/NLog.Extensions.Hosting/LayoutRenderers/HostRootDirLayoutRenderer.cs @@ -5,10 +5,6 @@ using NLog.Config; using NLog.LayoutRenderers; -#if NETSTANDARD2_0 -using IHostEnvironment = Microsoft.Extensions.Hosting.IHostingEnvironment; -#endif - namespace Microsoft.Extensions.Hosting { /// diff --git a/src/NLog.Extensions.Hosting/NLog.Extensions.Hosting.csproj b/src/NLog.Extensions.Hosting/NLog.Extensions.Hosting.csproj index e883ce1a..38830ba3 100644 --- a/src/NLog.Extensions.Hosting/NLog.Extensions.Hosting.csproj +++ b/src/NLog.Extensions.Hosting/NLog.Extensions.Hosting.csproj @@ -65,12 +65,10 @@ For ASP.NET Core, check: https://www.nuget.org/packages/NLog.Web.AspNetCore - - - + diff --git a/src/NLog.Extensions.Logging/NLog.Extensions.Logging.csproj b/src/NLog.Extensions.Logging/NLog.Extensions.Logging.csproj index 35f48898..daa23874 100644 --- a/src/NLog.Extensions.Logging/NLog.Extensions.Logging.csproj +++ b/src/NLog.Extensions.Logging/NLog.Extensions.Logging.csproj @@ -1,6 +1,6 @@  - net461;netstandard2.0;netstandard2.1;net6.0;net8.0 + net462;netstandard2.0;netstandard2.1;net6.0;net8.0 Full NLog.Extensions.Logging v$(ProductVersion) @@ -20,6 +20,7 @@ ChangeLog: - Updated to NLog v6.0-RC4 - Removed support for NetStandard 1.3 + 1.5 +- Replaced .NET Framework v4.6.1 with v4.6.2 and NET8-nuget-dependencies. - Enabled nullable references - Avoid boxing when extracting LogEvent properties from struct - Reduce allocation when creating LogEvent with properties by using ReadOnlySpan @@ -53,14 +54,14 @@ List of major changes in NLog 6.0: https://nlog-project.org/2025/04/29/nlog-6-0- true enable 9 - 12 + 12 true true true - - NLog.Extensions.Logging for .NET Framework 4.6.1 + + NLog.Extensions.Logging for .NET Framework 4.6.2 true @@ -83,14 +84,14 @@ List of major changes in NLog 6.0: https://nlog-project.org/2025/04/29/nlog-6-0- - - - + + + - - + +