pattern matching

Author: SimonCropp

src/Serilog.Extensions.Logging/Extensions/Logging/LoggerProviderCollectionSink.cs

@@ -33,8 +33,7 @@ public void Emit(LogEvent logEvent)
         EventId eventId = default;
 
         if (logEvent.Properties.TryGetValue("SourceContext", out var sourceContextProperty) &&
-            sourceContextProperty is ScalarValue sourceContextValue &&
-            sourceContextValue.Value is string sourceContext)
+            sourceContextProperty is ScalarValue {Value: string sourceContext})
         {
             categoryName = sourceContext;
         }
@@ -44,8 +43,8 @@ sourceContextProperty is ScalarValue sourceContextValue &&
             var id = 0;
             foreach (var item in structuredEventId.Properties)
             {
-                if (item.Name == "Id" && item.Value is ScalarValue sv && sv.Value is int i) id = i;
-                if (item.Name == "Name" && item.Value is ScalarValue sv2 && sv2.Value is string s) name = s;
+                if (item.Name == "Id" && item.Value is ScalarValue {Value: int i}) id = i;
+                if (item is {Name: "Name", Value: ScalarValue {Value: string s}}) name = s;
             }
 
             eventId = new EventId(id, name);

src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLogger.cs

@@ -95,7 +95,7 @@ void Write<TState>(LogEventLevel level, EventId eventId, TState state, Exception
         {
             foreach (var property in structure)
             {
-                if (property.Key == SerilogLoggerProvider.OriginalFormatPropertyName && property.Value is string value)
+                if (property is {Key: SerilogLoggerProvider.OriginalFormatPropertyName, Value: string value})
                 {
                     messageTemplate = value;
                 }

src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLoggerScope.cs

@@ -85,7 +85,7 @@ void AddProperty(KeyValuePair<string, object> stateProperty)
 
             foreach (var stateProperty in dictionary)
             {
-                if (stateProperty.Key == SerilogLoggerProvider.OriginalFormatPropertyName && stateProperty.Value is string)
+                if (stateProperty is {Key: SerilogLoggerProvider.OriginalFormatPropertyName, Value: string})
                     scopeItem = new ScalarValue(_state.ToString());
                 else
                     AddProperty(stateProperty);
@@ -97,7 +97,7 @@ void AddProperty(KeyValuePair<string, object> stateProperty)
 
             foreach (var stateProperty in stateProperties)
             {
-                if (stateProperty.Key == SerilogLoggerProvider.OriginalFormatPropertyName && stateProperty.Value is string)
+                if (stateProperty is {Key: SerilogLoggerProvider.OriginalFormatPropertyName, Value: string})
                     scopeItem = new ScalarValue(_state.ToString());
                 else
                     AddProperty(stateProperty);