Splits the Enrich section into Enrich and Properties, so that the top-level Enrich syntax reads consistently with WriteTo.

Author: nblumhardt

README.md

@@ -13,11 +13,9 @@ Configuration is read from the `Serilog` section.
       { "Name": "LiterateConsole" },
       { "Name": "File", "Args": { "path": "%TEMP%\\Logs\\serilog-configuration-sample.txt" } }
     ],
-    "Enrich": {
-      "With": ["FromLogContext", "WithMachineName", "WithThreadId"],
-      "WithProperties": {
-        "Application": "Sample"
-      }
+    "Enrich": ["FromLogContext", "WithMachineName", "WithThreadId"],
+    "Properties": {
+		"Application": "Sample"
     }
   }
 }
@@ -45,7 +43,7 @@ public class Program
 }
 ```
 
-The `WriteTo` and `Enrich.With` sections support the same syntax, for example the following is valid if no arguments are needed by the sinks:
+The `WriteTo` and `Enrich` sections support the same syntax, for example the following is valid if no arguments are needed by the sinks:
 
 ```json
 "WriteTo": ["LiterateConsole", "DiagnosticTrace"]

sample/Sample/appsettings.json

@@ -4,17 +4,17 @@
     "MinimumLevel": "Debug",
     "WriteTo": [
       { "Name": "LiterateConsole" },
-      { "Name": "File", "Args": { "path": "%TEMP%\\Logs\\serilog-configuration-sample.txt" } }
-    ],
-    "Enrich": {
-      "With": [
-        "FromLogContext",
-        "WithMachineName",
-        "WithThreadId"
-      ],
-      "WithProperties": {
-        "Application": "Sample"
+      {        
+        "Name": "File",
+        "Args": {
+          "path": "%TEMP%\\Logs\\serilog-configuration-sample.txt",
+          "outputTemplate": "{Timestamp:o} [{Level}] ({Application}/{MachineName}/{ThreadId}) {Message}{NewLine}{Exception}"
+        }
       }
+    ],
+    "Enrich": ["FromLogContext", "WithMachineName", "WithThreadId"],
+    "Properties": {
+      "Application": "Sample"
     }
   }
 }

src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs

@@ -48,21 +48,17 @@ void ApplyEnrichment(LoggerConfiguration loggerConfiguration, Assembly[] configu
             var enrichDirective = _configuration.GetSection("Enrich");
             if (enrichDirective != null)
             {
-                var withPropertiesDirective = enrichDirective.GetSection("WithProperties");
-                if (withPropertiesDirective != null)
-                {
-                    foreach (var enrichProperyDirective in withPropertiesDirective.GetChildren())
-                    {
-                        loggerConfiguration.Enrich.WithProperty(enrichProperyDirective.Key, enrichProperyDirective.Value);
-                    }
-                }
+                var methodCalls = GetMethodCalls(enrichDirective);
+                CallConfigurationMethods(methodCalls, FindEventEnricherConfigurationMethods(configurationAssemblies),
+                    loggerConfiguration.Enrich);
+            }
 
-                var withDirective = enrichDirective.GetSection("With");
-                if (withDirective != null)
+            var propertiesDirective = _configuration.GetSection("Properties");
+            if (propertiesDirective != null)
+            {
+                foreach (var enrichProperyDirective in propertiesDirective.GetChildren())
                 {
-                    var methodCalls = GetMethodCalls(withDirective);
-                    CallConfigurationMethods(methodCalls, FindEventEnricherConfigurationMethods(configurationAssemblies),
-                        loggerConfiguration.Enrich);
+                    loggerConfiguration.Enrich.WithProperty(enrichProperyDirective.Key, enrichProperyDirective.Value);
                 }
             }
         }