From 50f6cd08b4dd77deab19c798987970677245e7d1 Mon Sep 17 00:00:00 2001 From: Ivan Maximov Date: Tue, 26 Jul 2022 00:34:53 +0300 Subject: [PATCH 1/4] remove ! operator from nulls in conditions (#1689) --- src/Serilog/Core/Logger.cs | 12 ++++++------ src/Serilog/ILogger.cs | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Serilog/Core/Logger.cs b/src/Serilog/Core/Logger.cs index 533a67b33..b9e2ad36a 100644 --- a/src/Serilog/Core/Logger.cs +++ b/src/Serilog/Core/Logger.cs @@ -102,7 +102,7 @@ internal Logger( /// A logger that will enrich log events as specified. public ILogger ForContext(ILogEventEnricher enricher) { - if (enricher == null!) + if (enricher == null) return this; // No context here, so little point writing to SelfLog. return new Logger( @@ -122,7 +122,7 @@ public ILogger ForContext(ILogEventEnricher enricher) /// A logger that will enrich log events as specified. public ILogger ForContext(IEnumerable enrichers) { - if (enrichers == null!) + if (enrichers == null) return this; // No context here, so little point writing to SelfLog. return ForContext(new SafeAggregateEnricher(enrichers)); @@ -175,7 +175,7 @@ public ILogger ForContext(string propertyName, object? value, bool destructureOb /// A logger that will enrich log events as specified. public ILogger ForContext(Type source) { - if (source == null!) + if (source == null) return this; // Little point in writing to SelfLog here because we don't have any contextual information return ForContext(Constants.SourceContextPropertyName, source.FullName); @@ -363,7 +363,7 @@ public void Write(LogEventLevel level, Exception? exception, string public void Write(LogEventLevel level, Exception? exception, string messageTemplate, params object?[]? propertyValues) { if (!IsEnabled(level)) return; - if (messageTemplate == null!) return; + if (messageTemplate == null) return; // Catch a common pitfall when a single non-object array is cast to object[] if (propertyValues != null && @@ -383,7 +383,7 @@ public void Write(LogEventLevel level, Exception? exception, string messageTempl /// The event to write. public void Write(LogEvent logEvent) { - if (logEvent == null!) return; + if (logEvent == null) return; if (!IsEnabled(logEvent.Level)) return; Dispatch(logEvent); } @@ -1332,7 +1332,7 @@ public bool BindMessageTemplate(string messageTemplate, object?[]? propertyValue [NotNullWhen(true)] out MessageTemplate? parsedTemplate, [NotNullWhen(true)] out IEnumerable? boundProperties) { - if (messageTemplate == null!) + if (messageTemplate == null) { parsedTemplate = null; boundProperties = null; diff --git a/src/Serilog/ILogger.cs b/src/Serilog/ILogger.cs index 1a3135707..5155539d7 100644 --- a/src/Serilog/ILogger.cs +++ b/src/Serilog/ILogger.cs @@ -69,7 +69,7 @@ ILogger ForContext(ILogEventEnricher enricher) ILogger ForContext(IEnumerable enrichers) #if FEATURE_DEFAULT_INTERFACE { - if (enrichers == null!) + if (enrichers == null) return this; // No context here, so little point writing to SelfLog. return ForContext(new Core.Enrichers.SafeAggregateEnricher(enrichers)); @@ -120,7 +120,7 @@ ILogger ForContext() ILogger ForContext(Type source) #if FEATURE_DEFAULT_INTERFACE { - if (source == null!) + if (source == null) return this; // Little point in writing to SelfLog here because we don't have any contextual information return ForContext(Constants.SourceContextPropertyName, source.FullName); @@ -331,7 +331,7 @@ void Write(LogEventLevel level, Exception? exception, string messageTemplate, pa #if FEATURE_DEFAULT_INTERFACE { if (!IsEnabled(level)) return; - if (messageTemplate == null!) return; + if (messageTemplate == null) return; // Catch a common pitfall when a single non-object array is cast to object[] if (propertyValues != null && From e5883c5a8b646613885bd4428727df8e4a2f742d Mon Sep 17 00:00:00 2001 From: Nicholas Blumhardt Date: Tue, 26 Jul 2022 07:55:54 +1000 Subject: [PATCH 2/4] Revert "remove ! operator from nulls in conditions (#1689)" (#1706) This reverts commit 50f6cd08b4dd77deab19c798987970677245e7d1. --- src/Serilog/Core/Logger.cs | 12 ++++++------ src/Serilog/ILogger.cs | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Serilog/Core/Logger.cs b/src/Serilog/Core/Logger.cs index b9e2ad36a..533a67b33 100644 --- a/src/Serilog/Core/Logger.cs +++ b/src/Serilog/Core/Logger.cs @@ -102,7 +102,7 @@ internal Logger( /// A logger that will enrich log events as specified. public ILogger ForContext(ILogEventEnricher enricher) { - if (enricher == null) + if (enricher == null!) return this; // No context here, so little point writing to SelfLog. return new Logger( @@ -122,7 +122,7 @@ public ILogger ForContext(ILogEventEnricher enricher) /// A logger that will enrich log events as specified. public ILogger ForContext(IEnumerable enrichers) { - if (enrichers == null) + if (enrichers == null!) return this; // No context here, so little point writing to SelfLog. return ForContext(new SafeAggregateEnricher(enrichers)); @@ -175,7 +175,7 @@ public ILogger ForContext(string propertyName, object? value, bool destructureOb /// A logger that will enrich log events as specified. public ILogger ForContext(Type source) { - if (source == null) + if (source == null!) return this; // Little point in writing to SelfLog here because we don't have any contextual information return ForContext(Constants.SourceContextPropertyName, source.FullName); @@ -363,7 +363,7 @@ public void Write(LogEventLevel level, Exception? exception, string public void Write(LogEventLevel level, Exception? exception, string messageTemplate, params object?[]? propertyValues) { if (!IsEnabled(level)) return; - if (messageTemplate == null) return; + if (messageTemplate == null!) return; // Catch a common pitfall when a single non-object array is cast to object[] if (propertyValues != null && @@ -383,7 +383,7 @@ public void Write(LogEventLevel level, Exception? exception, string messageTempl /// The event to write. public void Write(LogEvent logEvent) { - if (logEvent == null) return; + if (logEvent == null!) return; if (!IsEnabled(logEvent.Level)) return; Dispatch(logEvent); } @@ -1332,7 +1332,7 @@ public bool BindMessageTemplate(string messageTemplate, object?[]? propertyValue [NotNullWhen(true)] out MessageTemplate? parsedTemplate, [NotNullWhen(true)] out IEnumerable? boundProperties) { - if (messageTemplate == null) + if (messageTemplate == null!) { parsedTemplate = null; boundProperties = null; diff --git a/src/Serilog/ILogger.cs b/src/Serilog/ILogger.cs index 5155539d7..1a3135707 100644 --- a/src/Serilog/ILogger.cs +++ b/src/Serilog/ILogger.cs @@ -69,7 +69,7 @@ ILogger ForContext(ILogEventEnricher enricher) ILogger ForContext(IEnumerable enrichers) #if FEATURE_DEFAULT_INTERFACE { - if (enrichers == null) + if (enrichers == null!) return this; // No context here, so little point writing to SelfLog. return ForContext(new Core.Enrichers.SafeAggregateEnricher(enrichers)); @@ -120,7 +120,7 @@ ILogger ForContext() ILogger ForContext(Type source) #if FEATURE_DEFAULT_INTERFACE { - if (source == null) + if (source == null!) return this; // Little point in writing to SelfLog here because we don't have any contextual information return ForContext(Constants.SourceContextPropertyName, source.FullName); @@ -331,7 +331,7 @@ void Write(LogEventLevel level, Exception? exception, string messageTemplate, pa #if FEATURE_DEFAULT_INTERFACE { if (!IsEnabled(level)) return; - if (messageTemplate == null) return; + if (messageTemplate == null!) return; // Catch a common pitfall when a single non-object array is cast to object[] if (propertyValues != null && From ec5d81f83f35ed92872558b364ca5dea399e6a69 Mon Sep 17 00:00:00 2001 From: Nicholas Blumhardt Date: Fri, 6 Dec 2024 15:42:07 +1000 Subject: [PATCH 3/4] Dev version bump [skip ci] --- Directory.Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Version.props b/Directory.Version.props index 7e88a7611..480e7e97a 100644 --- a/Directory.Version.props +++ b/Directory.Version.props @@ -1,5 +1,5 @@ - 4.2.0 + 4.2.1 From eece180a463d26d4ac0733e627aca4195cca688d Mon Sep 17 00:00:00 2001 From: Nicholas Blumhardt Date: Fri, 6 Dec 2024 15:42:42 +1000 Subject: [PATCH 4/4] Revert version update (wrong branch) [skip ci] --- Directory.Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Version.props b/Directory.Version.props index 480e7e97a..7e88a7611 100644 --- a/Directory.Version.props +++ b/Directory.Version.props @@ -1,5 +1,5 @@ - 4.2.1 + 4.2.0