Merge branch 'dev' of https://github.com/huoshan12345/serilog-extensi…

…ons-logging into bugfix/property-in-logevent-should-not-be-overridden-by-scope

# Conflicts:
#	src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLoggerProvider.cs
#	test/Serilog.Extensions.Logging.Tests/SerilogLoggerTests.cs

src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLoggerProvider.cs

@@ -105,10 +105,14 @@ public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
 
         scopeCollector.ReverseItems();
 
-        _externalScopeProvider?.ForEachScopeReversed((state, accumulatingLogEvent) =>
+        _externalScopeProvider?.ForEachScope(static (state, parameters) =>
         {
             SerilogLoggerScope.EnrichWithStateAndCreateScopeItem(
-                accumulatingLogEvent, propertyFactory, state, update: false, out var scopeItem);
+                parameters.LogEvent,
+                parameters.PropertyFactory,
+                state,
+                update: true,
+                out var scopeItem);
 
             if (scopeItem != null)
             {
@@ -173,17 +177,3 @@ public void AddItem(LogEventPropertyValue scopeItem)
         }
     }
 }
-
-file static class Extensions
-{
-    public static void ForEachScopeReversed<TState>(this IExternalScopeProvider provider, Action<object?, TState> callback, TState state)
-    {
-        var list = new List<(object?, TState)>();
-        provider.ForEachScope((m, n) => list.Add((m, n)), state);
-
-        for (var i = list.Count - 1; i >= 0; i--)
-        {
-            callback(list[i].Item1, list[i].Item2);
-        }
-    }
-}

test/Serilog.Extensions.Logging.Tests/SerilogLoggerTests.cs

@@ -619,32 +619,19 @@ static void AssertHasScalarProperty(LogEvent logEvent, string name, object? expe
         Assert.Equal(expectedValue, scalar.Value);
     }
 
-    [Theory]
-    [InlineData(true)]
-    [InlineData(false)]
-    public void LoggingScopeShouldNotReplacePropertyInLogEvent(bool withExternalScopeProvider)
+    [Fact]
+    public void ConflictingEventIdTemplatePropertyIsIgnored()
     {
-        var sink = new CollectingSink();
-        using var logger = new LoggerConfiguration().WriteTo.Sink(sink).CreateLogger();
-        var serilogLoggerProvider = new SerilogLoggerProvider(logger);
-
-        var services = new ServiceCollection();
-        services.AddLogging(l => l.AddSerilog(logger));
-
-        using var serviceProvider = services.BuildServiceProvider();
-        var msLogger = withExternalScopeProvider
-            ? serviceProvider.GetRequiredService<ILogger<SerilogLoggerTest>>()
-            : serilogLoggerProvider.CreateLogger(Name);
-
-        using (msLogger.BeginScope(new Dictionary<string, object?> { { "Value", 1 } }))
-        using (msLogger.BeginScope(new Dictionary<string, object?> { { "Value", 2 } }))
-        {
-            msLogger.LogInformation("Value: {Value}", 3);
-        }
+        var (logger, sink) = SetUp(LogLevel.Trace);
 
-        var logEvent = sink.Writes.First();
-        var value = (logEvent.Properties["Value"] as ScalarValue)?.Value;
+        var loggedEventId = 17;
+        logger.LogInformation(loggedEventId, "{EventId}", 42);
 
-        Assert.Equal(3, value);
+        var write = Assert.Single(sink.Writes);
+        var recordedEventIdProperty = Assert.IsType<StructureValue>(write.Properties["EventId"]);
+        var recordedEventIdStructure = Assert.Single(recordedEventIdProperty.Properties, p => p.Name == "Id");
+        var recordedEventIdPropertyValue = Assert.IsType<ScalarValue>(recordedEventIdStructure.Value);
+        var recordedEventId = Assert.IsType<int>(recordedEventIdPropertyValue.Value);
+        Assert.Equal(loggedEventId, recordedEventId);
     }
 }