Skip to content

Commit 681024c

Browse files
committed
Fixed an issue with nlog on .net 4.0
@ejsmith NLog.Fluent.Log is not supported on .NET 4.0. I implemented what it was doing https://github.com/NLog/NLog/blob/master/src/NLog/Fluent/Log.cs
1 parent 75683c8 commit 681024c

File tree

4 files changed

+10
-18
lines changed

4 files changed

+10
-18
lines changed

Libraries/Build.ps1

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@ ForEach ($p in $client_projects) {
1313
Continue;
1414
}
1515

16-
# Temporary fix for nlog until https://github.com/NLog/NLog/issues/729 is fixed.
17-
$isNLog = ($($p.Name) -eq "Exceptionless.NLog") -or ($($p.Name) -eq "Exceptionless.NLog.Signed")
18-
If ($isNLog -and ($($b.TargetFrameworkVersionProperty) -ne "NET45")) {
19-
Continue;
20-
}
21-
2216
$targetPortable = 'false';
2317
If ($isPclClient -and ($($b.NuGetDir) -eq "portable-net40+sl50+win+wpa81+wp80")) {
2418
$targetPortable = 'true';

Libraries/Package.ps1

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@ ForEach ($p in $client_projects) {
2929
Continue;
3030
}
3131

32-
# Temporary fix for nlog until https://github.com/NLog/NLog/issues/729 is fixed.
33-
$isNLog = ($($p.Name) -eq "Exceptionless.NLog") -or ($($p.Name) -eq "Exceptionless.NLog.Signed")
34-
If ($isNLog -and ($($b.TargetFrameworkVersionProperty) -ne "NET45")) {
35-
Continue;
36-
}
37-
3832
$buildDirectory = "$build_dir\$configuration\$($p.Name)\lib\$($b.NuGetDir)"
3933
$workingLibDirectory = "$workingDirectory\lib\$($b.NuGetDir)"
4034
Create-Directory $workingLibDirectory

Source/Platforms/NLog/NLogExceptionlessLog.cs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
using System;
22
using Exceptionless.Logging;
3+
using NLog;
34
using NLog.Fluent;
5+
using LogLevel = Exceptionless.Logging.LogLevel;
46

57
namespace Exceptionless.NLog {
68
public class NLogExceptionlessLog : IExceptionlessLog {
9+
private readonly Logger _logger = LogManager.GetCurrentClassLogger();
10+
711
public NLogExceptionlessLog(LogLevel? minimumLogLevel = null) {
812
if (minimumLogLevel.HasValue)
913
MinimumLogLevel = minimumLogLevel.Value;
@@ -15,35 +19,35 @@ public void Error(string message, string source = null, Exception exception = nu
1519
if (LogLevel.Error < MinimumLogLevel)
1620
return;
1721

18-
Log.Error().Message(message).LoggerName(source).Exception(exception).Write();
22+
_logger.Error().Message(message).LoggerName(source).Exception(exception).Write();
1923
}
2024

2125
public void Info(string message, string source = null) {
2226
if (LogLevel.Info < MinimumLogLevel)
2327
return;
2428

25-
Log.Info().Message(message).LoggerName(source).Write();
29+
_logger.Info().Message(message).LoggerName(source).Write();
2630
}
2731

2832
public void Debug(string message, string source = null) {
2933
if (LogLevel.Debug < MinimumLogLevel)
3034
return;
3135

32-
Log.Debug().Message(message).LoggerName(source).Write();
36+
_logger.Debug().Message(message).LoggerName(source).Write();
3337
}
3438

3539
public void Warn(string message, string source = null) {
3640
if (LogLevel.Warn < MinimumLogLevel)
3741
return;
3842

39-
Log.Warn().Message(message).LoggerName(source).Write();
43+
_logger.Warn().Message(message).LoggerName(source).Write();
4044
}
4145

4246
public void Trace(string message, string source = null) {
4347
if (LogLevel.Trace < MinimumLogLevel)
4448
return;
4549

46-
Log.Trace().Message(message).LoggerName(source).Write();
50+
_logger.Trace().Message(message).LoggerName(source).Write();
4751
}
4852

4953
public void Flush() { }

Source/Platforms/NLog/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="NLog" version="3.2.1" targetFramework="net40" />
3+
<package id="NLog" version="3.2.1" targetFramework="net4" />
44
</packages>

0 commit comments

Comments
 (0)