Skip to content

Commit 3701273

Browse files
Merge pull request #183 from NLog/cleanup-#if
Cleanup #if
2 parents c63ca9c + d151511 commit 3701273

2 files changed

Lines changed: 0 additions & 27 deletions

File tree

src/NLog.Extensions.Logging/Logging/NLogLogger.cs

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ private static bool IsNonDigitValue(string value)
6363
return !String.IsNullOrEmpty(value) && (value.Length != 1 || !Char.IsDigit(value[0]));
6464
}
6565

66-
#if !NETSTANDARD1_3
67-
6866
/// <summary>
6967
/// Create Log Event with multiple parameters (last parameter is the {OriginalFormat})
7068
/// </summary>
@@ -96,29 +94,6 @@ private static void SetEventInfoParameters(LogEventInfo eventInfo, NLogMessagePa
9694
eventInfo.Parameters[i] = messageTemplateParameters[i].Value;
9795
}
9896

99-
#else
100-
101-
/// <summary>
102-
/// Create Log Event with multiple parameters (last parameter is the {OriginalFormat})
103-
/// </summary>
104-
private LogEventInfo CreateLogEventInfoWithMultipleParameters(LogLevel nLogLogLevel, string message, IReadOnlyList<KeyValuePair<string, object>> parameterList)
105-
{
106-
var eventInfo = LogEventInfo.Create(nLogLogLevel, _logger.Name, message);
107-
for (int i = 0; i < parameterList.Count; ++i)
108-
{
109-
var parameter = parameterList[i];
110-
if (string.IsNullOrEmpty(parameter.Key))
111-
break; // Skip capture of invalid parameters
112-
113-
var parameterName = RemoveMarkerFromName(parameter.Key);
114-
eventInfo.Properties[parameterName] = parameter.Value;
115-
}
116-
return eventInfo;
117-
}
118-
119-
#endif
120-
121-
12297
private void CaptureEventId(LogEventInfo eventInfo, EventId eventId)
12398
{
12499
if (!_options.IgnoreEmptyEventId || eventId.Id != 0 || !String.IsNullOrEmpty(eventId.Name))

src/NLog.Extensions.Logging/Logging/NLogMessageParameterList.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace NLog.Extensions.Logging
66
{
7-
#if !NETSTANDARD1_3
87
/// <summary>
98
/// Converts Microsoft Extension Logging ParameterList into NLog MessageTemplate ParameterList
109
/// </summary>
@@ -157,5 +156,4 @@ IEnumerator IEnumerable.GetEnumerator()
157156
return GetEnumerator();
158157
}
159158
}
160-
#endif
161159
}

0 commit comments

Comments
 (0)