added Serilog.Expressions support

Sergey Komisarchik · Sergey Komisarchik · commit dd7523938f41 · 2020-11-17T18:20:17.000+03:00
diff --git a/src/Serilog.Settings.Configuration/Settings/Configuration/LoggingFilterSwitchProxy.cs b/src/Serilog.Settings.Configuration/Settings/Configuration/LoggingFilterSwitchProxy.cs
@@ -34,8 +34,11 @@ public string Expression
 
         public static LoggingFilterSwitchProxy Create(string expression = null)
         {
-            var filterSwitchType = Type.GetType("Serilog.Filters.Expressions.LoggingFilterSwitch, Serilog.Filters.Expressions");
-            if (filterSwitchType == null)
+            var filterSwitchType =
+                Type.GetType("Serilog.Expressions.LoggingFilterSwitch, Serilog.Expressions") ??
+                Type.GetType("Serilog.Filters.Expressions.LoggingFilterSwitch, Serilog.Filters.Expressions");
+
+            if (filterSwitchType is null)
             {
                 return null;
             }
diff --git a/src/Serilog.Settings.Configuration/Settings/Configuration/StringArgumentValue.cs b/src/Serilog.Settings.Configuration/Settings/Configuration/StringArgumentValue.cs
@@ -35,7 +35,8 @@ public object ConvertTo(Type toType, ResolutionContext resolutionContext)
                 return resolutionContext.LookUpLevelSwitchByName(argumentValue);
             }
 
-            if (toType.FullName == "Serilog.Filters.Expressions.LoggingFilterSwitch")
+            if (toType.FullName is ("Serilog.Expressions.LoggingFilterSwitch" or
+                                    "Serilog.Filters.Expressions.LoggingFilterSwitch"))
             {
                 return resolutionContext.LookUpFilterSwitchByName(argumentValue).RealSwitch;
             }
diff --git a/test/Serilog.Settings.Configuration.Tests/ConfigurationSettingsTests.cs b/test/Serilog.Settings.Configuration.Tests/ConfigurationSettingsTests.cs
@@ -343,7 +343,7 @@ public void LoggingFilterSwitchIsConfigured()
         {
             var json = @"{
                 'Serilog': {
-                    'FilterSwitches': { '$mySwitch': 'Prop = \'Val\'' },
+                    'FilterSwitches': { '$mySwitch': 'Prop = 42' },
                     'Filter:BySwitch': {
                         'Name': 'ControlledBy',
                         'Args': {
@@ -361,7 +361,7 @@ public void LoggingFilterSwitchIsConfigured()
             log.Write(Some.InformationEvent());
             Assert.Null(evt);
 
-            log.ForContext("Prop", "Val").Write(Some.InformationEvent());
+            log.ForContext("Prop", 42).Write(Some.InformationEvent());
             Assert.NotNull(evt);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,11 @@ public string Expression`
`34`	`34`
`35`	`35`	`public static LoggingFilterSwitchProxy Create(string expression = null)`
`36`	`36`	`{`
`37`		`- var filterSwitchType = Type.GetType("Serilog.Filters.Expressions.LoggingFilterSwitch, Serilog.Filters.Expressions");`
`38`		`- if (filterSwitchType == null)`
	`37`	`+ var filterSwitchType =`
	`38`	`+ Type.GetType("Serilog.Expressions.LoggingFilterSwitch, Serilog.Expressions") ??`
	`39`	`+ Type.GetType("Serilog.Filters.Expressions.LoggingFilterSwitch, Serilog.Filters.Expressions");`
	`40`	`+`
	`41`	`+ if (filterSwitchType is null)`
`39`	`42`	`{`
`40`	`43`	`return null;`
`41`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@ public object ConvertTo(Type toType, ResolutionContext resolutionContext)`
`35`	`35`	`return resolutionContext.LookUpLevelSwitchByName(argumentValue);`
`36`	`36`	`}`
`37`	`37`
`38`		`- if (toType.FullName == "Serilog.Filters.Expressions.LoggingFilterSwitch")`
	`38`	`+ if (toType.FullName is ("Serilog.Expressions.LoggingFilterSwitch" or`
	`39`	`+ "Serilog.Filters.Expressions.LoggingFilterSwitch"))`
`39`	`40`	`{`
`40`	`41`	`return resolutionContext.LookUpFilterSwitchByName(argumentValue).RealSwitch;`
`41`	`42`	`}`