fix merge

Jan Zahradník · Jan Zahradník · commit 82199f021d06 · 2019-01-06T22:39:06.000+01:00
diff --git a/src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs b/src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs
@@ -380,6 +380,11 @@ internal static MethodInfo SelectConfigurationMethod(IEnumerable<MethodInfo> can
             return selectedMethod;
         }
 
+        static bool ParameterNameMatches(string actualParameterName, string suppliedName)
+        {
+            return suppliedName.Equals(actualParameterName, StringComparison.OrdinalIgnoreCase);
+        }
+
         static bool ParameterNameMatches(string actualParameterName, IEnumerable<string> suppliedNames)
         {
             return suppliedNames.Any(s => ParameterNameMatches(actualParameterName, s));

Original file line number	Diff line number	Diff line change
`@@ -380,6 +380,11 @@ internal static MethodInfo SelectConfigurationMethod(IEnumerable<MethodInfo> can`
`380`	`380`	`return selectedMethod;`
`381`	`381`	`}`
`382`	`382`
	`383`	`+ static bool ParameterNameMatches(string actualParameterName, string suppliedName)`
	`384`	`+ {`
	`385`	`+ return suppliedName.Equals(actualParameterName, StringComparison.OrdinalIgnoreCase);`
	`386`	`+ }`
	`387`	`+`
`383`	`388`	`static bool ParameterNameMatches(string actualParameterName, IEnumerable<string> suppliedNames)`
`384`	`389`	`{`
`385`	`390`	`return suppliedNames.Any(s => ParameterNameMatches(actualParameterName, s));`