Detect Microsoft.Extensions.Logging with either the event id or name

Author: 0xced

src/Log4NetTextFormatter.cs

@@ -151,9 +151,7 @@ internal static string DefaultMessageFormatter(LogEvent logEvent, IFormatProvide
         // https://github.com/serilog/serilog-extensions-logging/blob/v9.0.1/src/Serilog.Extensions.Logging/Extensions/Logging/EventIdPropertyCache.cs#L58-L73
         var isMicrosoftExtensionsLoggingEvent = logEvent.Properties.TryGetValue(EventIdPropertyName, out var property)
                                                 && property is StructureValue structure
-                                                && structure.Properties.Count == 2
-                                                && structure.Properties[0].Name == "Id"
-                                                && structure.Properties[1].Name == "Name";
+                                                && structure.Properties.Any(e => e.Name is "Id" or "Name");
 
         if (isMicrosoftExtensionsLoggingEvent)
         {

tests/Log4NetTextFormatterTest.DefaultMessageFormatter_eventId=0_eventIdName=EventName.verified.xml

@@ -0,0 +1,7 @@
+<log4net:event timestamp="2003-01-04T15:09:26.535+01:00" level="INFO" xmlns:log4net="http://logging.apache.org/log4net/schemas/log4net-events-1.2/">
+  <log4net:properties>
+    <log4net:data name="Name" value="World" />
+    <log4net:data name="EventId.Name" value="EventName" />
+  </log4net:properties>
+  <log4net:message><![CDATA[Hello World!]]></log4net:message>
+</log4net:event>

tests/Log4NetTextFormatterTest.DefaultMessageFormatter_hasEventId=False.verified.xml renamed to tests/Log4NetTextFormatterTest.DefaultMessageFormatter_eventId=0_eventIdName=null.verified.xml

@@ -0,0 +1,9 @@
+<log4net:event timestamp="2003-01-04T15:09:26.535+01:00" level="INFO" xmlns:log4net="http://logging.apache.org/log4net/schemas/log4net-events-1.2/">
+  <log4net:properties>
+    <log4net:data name="Name" value="World" />
+    <log4net:data name="EventId.Id" value="1" />
+    <log4net:data name="EventId.Name" value="EventName" />
+    <log4net:data name="EventId.More" />
+  </log4net:properties>
+  <log4net:message><![CDATA[Hello World!]]></log4net:message>
+</log4net:event>

tests/Log4NetTextFormatterTest.DefaultMessageFormatter_eventId=1_eventIdName=EventName.verified.xml

@@ -2,7 +2,6 @@
   <log4net:properties>
     <log4net:data name="Name" value="World" />
     <log4net:data name="EventId.Id" value="1" />
-    <log4net:data name="EventId.Name" value="EventIdName" />
   </log4net:properties>
   <log4net:message><![CDATA[Hello World!]]></log4net:message>
 </log4net:event>

tests/Log4NetTextFormatterTest.DefaultMessageFormatter_hasEventId=True.verified.xml renamed to tests/Log4NetTextFormatterTest.DefaultMessageFormatter_eventId=1_eventIdName=null.verified.xml

@@ -451,16 +451,30 @@ public Task Exception()
     }
 
     [Theory]
-    [InlineData(true)]
-    [InlineData(false)]
-    public Task DefaultMessageFormatter(bool hasEventId)
+    [InlineData(0, null)]
+    [InlineData(0, "EventName")]
+    [InlineData(1, null)]
+    [InlineData(1, "EventName")]
+    public Task DefaultMessageFormatter(int eventId, string? eventIdName)
     {
         // Arrange
         using var output = new StringWriter();
         List<LogEventProperty> properties = [ new("Name", new ScalarValue("World")) ];
-        if (hasEventId)
+        List<LogEventProperty> eventIdProperties = [];
+        if (eventId != 0)
+        {
+            eventIdProperties.Add(new LogEventProperty("Id", new ScalarValue(eventId)));
+        }
+        if (eventIdName != null)
         {
-            LogEventProperty[] eventIdProperties = [ new("Id", new ScalarValue(1)), new("Name", new ScalarValue("EventIdName")) ];
+            eventIdProperties.Add(new LogEventProperty("Name", new ScalarValue(eventIdName)));
+        }
+        if (eventIdProperties.Count > 0)
+        {
+            if (eventIdProperties.Count == 2)
+            {
+                eventIdProperties.Add(new LogEventProperty("More", new ScalarValue(null)));
+            }
             properties.Add(new LogEventProperty("EventId", new StructureValue(eventIdProperties)));
         }
         var logEvent = CreateLogEvent(messageTemplate: "Hello {Name}!", properties: properties.ToArray());
@@ -470,7 +484,7 @@ public Task DefaultMessageFormatter(bool hasEventId)
         formatter.Format(logEvent, output);
 
         // Assert
-        return Verify(output).UseParameters(hasEventId);
+        return Verify(output).UseParameters(eventId, eventIdName);
     }
 
     [Fact]