Exclude "{OriginalFormat}" when provided through enrichment

Author: nblumhardt

src/Serilog.Framework.Logging/SerilogLogger.cs

@@ -64,7 +64,7 @@ public void Log(LogLevel logLevel, int eventId, object state, Exception exceptio
             {
                 foreach (var property in structure.GetValues())
                 {
-                    if (property.Key == "{OriginalFormat}" && property.Value is string)
+                    if (property.Key == SerilogLoggerProvider.OriginalFormatPropertyName && property.Value is string)
                     {
                         messageTemplate = (string)property.Value;
                     }

src/Serilog.Framework.Logging/SerilogLoggerProvider.cs

@@ -17,6 +17,8 @@ namespace Serilog.Framework.Logging
 {
     public class SerilogLoggerProvider : ILoggerProvider, ILogEventEnricher
     {
+        public const string OriginalFormatPropertyName = "{OriginalFormat}";
+
         // May be null; if it is, Log.Logger will be lazily used
         readonly ILogger _logger;
 
@@ -45,6 +47,9 @@ public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
                 {
                     foreach (var keyValue in stateStructure.GetValues())
                     {
+                        if (keyValue.Key == OriginalFormatPropertyName && keyValue.Value is string)
+                            continue;
+
                         var property = propertyFactory.CreateProperty(keyValue.Key, keyValue.Value);
                         logEvent.AddPropertyIfAbsent(property);
                     }