Skip to content

Commit 59e4d97

Browse files
authored
NET Framework v4.6.2 with NET8 nuget-dependencies (#797)
1 parent d82ab00 commit 59e4d97

File tree

6 files changed

+11
-35
lines changed

6 files changed

+11
-35
lines changed

src/NLog.Extensions.Hosting/Extensions/ConfigureExtensions.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
using Microsoft.Extensions.Hosting;
66
using NLog.Config;
77
using NLog.Extensions.Logging;
8-
#if NETSTANDARD2_0
9-
using IHostEnvironment = Microsoft.Extensions.Hosting.IHostingEnvironment;
10-
#endif
118

129
namespace NLog.Extensions.Hosting
1310
{
@@ -36,11 +33,7 @@ public static IHostBuilder UseNLog(this IHostBuilder builder)
3633
public static IHostBuilder UseNLog(this IHostBuilder builder, NLogProviderOptions? options)
3734
{
3835
Guard.ThrowIfNull(builder);
39-
#if NETSTANDARD2_0
40-
builder.ConfigureServices((builderContext, services) => AddNLogLoggerProvider(services, builderContext.Configuration, null, options, CreateNLogLoggerProvider));
41-
#else
4236
builder.ConfigureServices((builderContext, services) => AddNLogLoggerProvider(services, builderContext.Configuration, builderContext.HostingEnvironment, options, CreateNLogLoggerProvider));
43-
#endif
4437
return builder;
4538
}
4639

@@ -54,11 +47,7 @@ public static IHostBuilder UseNLog(this IHostBuilder builder, NLogProviderOption
5447
public static IHostBuilder UseNLog(this IHostBuilder builder, NLogProviderOptions options, Func<IServiceProvider, LogFactory> factoryBuilder)
5548
{
5649
Guard.ThrowIfNull(builder);
57-
#if NETSTANDARD2_0
58-
builder.ConfigureServices((builderContext, services) => AddNLogLoggerProvider(services, builderContext.Configuration, null, options, (serviceProvider, config, hostEnv, opt) =>
59-
#else
6050
builder.ConfigureServices((builderContext, services) => AddNLogLoggerProvider(services, builderContext.Configuration, builderContext.HostingEnvironment, options, (serviceProvider, config, hostEnv, opt) =>
61-
#endif
6251
{
6352
RegisterHostNLogExtensions(LogManager.LogFactory, serviceProvider, hostEnv);
6453
config = serviceProvider.SetupNLogConfigSettings(config, LogManager.LogFactory);

src/NLog.Extensions.Hosting/LayoutRenderers/HostAppNameLayoutRenderer.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
using NLog.Config;
55
using NLog.LayoutRenderers;
66

7-
#if NETSTANDARD2_0
8-
using IHostEnvironment = Microsoft.Extensions.Hosting.IHostingEnvironment;
9-
#endif
10-
117
namespace NLog.Extensions.Hosting
128
{
139
/// <summary>

src/NLog.Extensions.Hosting/LayoutRenderers/HostEnvironmentLayoutRenderer.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
using NLog.Config;
55
using NLog.LayoutRenderers;
66

7-
#if NETSTANDARD2_0
8-
using IHostEnvironment = Microsoft.Extensions.Hosting.IHostingEnvironment;
9-
#endif
10-
117
namespace NLog.Extensions.Hosting
128
{
139
/// <summary>

src/NLog.Extensions.Hosting/LayoutRenderers/HostRootDirLayoutRenderer.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
using NLog.Config;
66
using NLog.LayoutRenderers;
77

8-
#if NETSTANDARD2_0
9-
using IHostEnvironment = Microsoft.Extensions.Hosting.IHostingEnvironment;
10-
#endif
11-
128
namespace Microsoft.Extensions.Hosting
139
{
1410
/// <summary>

src/NLog.Extensions.Hosting/NLog.Extensions.Hosting.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,10 @@ For ASP.NET Core, check: https://www.nuget.org/packages/NLog.Web.AspNetCore
6565

6666
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
6767
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
68-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
69-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
7068
</ItemGroup>
7169

7270
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
73-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.0" />
71+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
7472
</ItemGroup>
7573

7674
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">

src/NLog.Extensions.Logging/NLog.Extensions.Logging.csproj

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net461;netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net462;netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
44
<DebugType Condition=" '$(Configuration)' == 'Debug' ">Full</DebugType>
55

66
<Product>NLog.Extensions.Logging v$(ProductVersion)</Product>
@@ -20,6 +20,7 @@ ChangeLog:
2020

2121
- Updated to NLog v6.0-RC4
2222
- Removed support for NetStandard 1.3 + 1.5
23+
- Replaced .NET Framework v4.6.1 with v4.6.2 and NET8-nuget-dependencies.
2324
- Enabled nullable references
2425
- Avoid boxing when extracting LogEvent properties from struct
2526
- 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-
5354
<GenerateDocumentationFile>true</GenerateDocumentationFile>
5455
<Nullable>enable</Nullable>
5556
<LangVersion>9</LangVersion>
56-
<LangVersion Condition=" '$(TargetFramework)' != 'net461' AND '$(TargetFramework)' != 'netstandard2.0' ">12</LangVersion>
57+
<LangVersion Condition=" '$(TargetFramework)' != 'net462' AND '$(TargetFramework)' != 'netstandard2.0' ">12</LangVersion>
5758
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
5859
<IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsTrimmable>
5960
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
6061
</PropertyGroup>
6162

62-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
63-
<Title>NLog.Extensions.Logging for .NET Framework 4.6.1</Title>
63+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' ">
64+
<Title>NLog.Extensions.Logging for .NET Framework 4.6.2</Title>
6465
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
6566
</PropertyGroup>
6667
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
@@ -83,14 +84,14 @@ List of major changes in NLog 6.0: https://nlog-project.org/2025/04/29/nlog-6-0-
8384
<PackageReference Include="NLog" Version="6.0.0-rc4" />
8485
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
8586
</ItemGroup>
86-
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
87-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.0" />
88-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.0" />
87+
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
88+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
89+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
8990
<Reference Include="System" />
9091
</ItemGroup>
9192
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
92-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.0" />
93-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.0" />
93+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
94+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
9495
</ItemGroup>
9596
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
9697
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />

0 commit comments

Comments
 (0)