Re-format code according to serilog standards

Thibaud DESODT · Thibaud DESODT · commit 7034ca6064a4 · 2018-02-13T08:28:22.000+01:00
Copy over .editorconfig and .sln.DotSettings from core repo
Fix ReSharper red squigglies
Fix remaining ReSharper warnings (possible multiple enumeration)
Remove implicit "private" keywords
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,16 @@
+root = true
+
+[*]
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+
+[*.{csproj,json,config,yml}]
+indent_size = 2
+
+[*.sh]
+end_of_line = lf
+
+[*.{cmd, bat}]
+end_of_line = crlf
diff --git a/serilog-settings-configuration.sln b/serilog-settings-configuration.sln
@@ -7,11 +7,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4E41FD57-5FA
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{62D0B904-1D11-4962-A4A8-DE28672AA28B}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
 		appveyor.yml = appveyor.yml
 		Build.ps1 = Build.ps1
 		CHANGES.md = CHANGES.md
 		LICENSE = LICENSE
 		README.md = README.md
+		serilog-settings-configuration.sln.DotSettings = serilog-settings-configuration.sln.DotSettings
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{D551DCB0-7771-4D01-BEBD-F7B57D1CF0E3}"
diff --git a/serilog-settings-configuration.sln.DotSettings b/serilog-settings-configuration.sln.DotSettings
diff --git a/src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs b/src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs
@@ -22,7 +22,7 @@ class ConfigurationReader : IConfigurationReader
 
         readonly IConfigurationSection _configuration;
         readonly DependencyContext _dependencyContext;
-        readonly Assembly[] _configurationAssemblies;
+        readonly IReadOnlyCollection<Assembly> _configurationAssemblies;
 
         public ConfigurationReader(IConfigurationSection configuration, DependencyContext dependencyContext)
         {
@@ -31,7 +31,7 @@ public ConfigurationReader(IConfigurationSection configuration, DependencyContex
             _configurationAssemblies = LoadConfigurationAssemblies();
         }
 
-        ConfigurationReader(IConfigurationSection configuration, Assembly[] configurationAssemblies, DependencyContext dependencyContext)
+        ConfigurationReader(IConfigurationSection configuration, IReadOnlyCollection<Assembly> configurationAssemblies, DependencyContext dependencyContext)
         {
             _configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));
             _dependencyContext = dependencyContext;
@@ -48,7 +48,7 @@ public void Configure(LoggerConfiguration loggerConfiguration)
             ApplyAuditSinks(loggerConfiguration, declaredLevelSwitches);
         }
 
-        private IReadOnlyDictionary<string, LoggingLevelSwitch> ProcessLevelSwitchDeclarations()
+        IReadOnlyDictionary<string, LoggingLevelSwitch> ProcessLevelSwitchDeclarations()
         {
             var levelSwitchesDirective = _configuration.GetSection("LevelSwitches");
             var namedSwitches = new Dictionary<string, LoggingLevelSwitch>();
@@ -198,7 +198,7 @@ void ApplyEnrichment(LoggerConfiguration loggerConfiguration,
 
         internal ILookup<string, Dictionary<string, IConfigurationArgumentValue>> GetMethodCalls(IConfigurationSection directive)
         {
-            var children = directive.GetChildren();
+            var children = directive.GetChildren().ToList();
 
             var result =
                 (from child in children
@@ -242,7 +242,7 @@ string GetSectionName(IConfigurationSection s)
             }
         }
 
-        Assembly[] LoadConfigurationAssemblies()
+        IReadOnlyCollection<Assembly> LoadConfigurationAssemblies()
         {
             var assemblies = new Dictionary<string, Assembly>();
 
@@ -268,11 +268,12 @@ Assembly[] LoadConfigurationAssemblies()
                     assemblies.Add(assumed.FullName, assumed);
             }
 
-            return assemblies.Values.ToArray();
+            return assemblies.Values.ToList().AsReadOnly();
         }
 
         AssemblyName[] GetSerilogConfigurationAssemblies()
         {
+            // ReSharper disable once RedundantAssignment
             var query = Enumerable.Empty<AssemblyName>();
             var filter = new Func<string, bool>(name => name != null && name.ToLowerInvariant().Contains("serilog"));
 
@@ -324,7 +325,7 @@ internal static MethodInfo SelectConfigurationMethod(IEnumerable<MethodInfo> can
                 .FirstOrDefault();
         }
 
-        internal static IList<MethodInfo> FindSinkConfigurationMethods(IEnumerable<Assembly> configurationAssemblies)
+        internal static IList<MethodInfo> FindSinkConfigurationMethods(IReadOnlyCollection<Assembly> configurationAssemblies)
         {
             var found = FindConfigurationMethods(configurationAssemblies, typeof(LoggerSinkConfiguration));
             if (configurationAssemblies.Contains(typeof(LoggerSinkConfiguration).GetTypeInfo().Assembly))
@@ -333,14 +334,14 @@ internal static IList<MethodInfo> FindSinkConfigurationMethods(IEnumerable<Assem
             return found;
         }
 
-        internal static IList<MethodInfo> FindAuditSinkConfigurationMethods(IEnumerable<Assembly> configurationAssemblies)
+        internal static IList<MethodInfo> FindAuditSinkConfigurationMethods(IReadOnlyCollection<Assembly> configurationAssemblies)
         {
             var found = FindConfigurationMethods(configurationAssemblies, typeof(LoggerAuditSinkConfiguration));
 
             return found;
         }
 
-        internal static IList<MethodInfo> FindFilterConfigurationMethods(IEnumerable<Assembly> configurationAssemblies)
+        internal static IList<MethodInfo> FindFilterConfigurationMethods(IReadOnlyCollection<Assembly> configurationAssemblies)
         {
             var found = FindConfigurationMethods(configurationAssemblies, typeof(LoggerFilterConfiguration));
             if (configurationAssemblies.Contains(typeof(LoggerFilterConfiguration).GetTypeInfo().Assembly))
@@ -349,7 +350,7 @@ internal static IList<MethodInfo> FindFilterConfigurationMethods(IEnumerable<Ass
             return found;
         }
 
-        internal static IList<MethodInfo> FindEventEnricherConfigurationMethods(IEnumerable<Assembly> configurationAssemblies)
+        internal static IList<MethodInfo> FindEventEnricherConfigurationMethods(IReadOnlyCollection<Assembly> configurationAssemblies)
         {
             var found = FindConfigurationMethods(configurationAssemblies, typeof(LoggerEnrichmentConfiguration));
             if (configurationAssemblies.Contains(typeof(LoggerEnrichmentConfiguration).GetTypeInfo().Assembly))
@@ -358,7 +359,7 @@ internal static IList<MethodInfo> FindEventEnricherConfigurationMethods(IEnumera
             return found;
         }
 
-        internal static IList<MethodInfo> FindConfigurationMethods(IEnumerable<Assembly> configurationAssemblies, Type configType)
+        internal static IList<MethodInfo> FindConfigurationMethods(IReadOnlyCollection<Assembly> configurationAssemblies, Type configType)
         {
             return configurationAssemblies
                 .SelectMany(a => a.ExportedTypes
diff --git a/src/Serilog.Settings.Configuration/Settings/Configuration/LevelSwitchDictionaryExtensions.cs b/src/Serilog.Settings.Configuration/Settings/Configuration/LevelSwitchDictionaryExtensions.cs
@@ -1,8 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Serilog.Core;
 
 namespace Serilog.Settings.Configuration
diff --git a/src/Serilog.Settings.Configuration/Settings/Configuration/StringArgumentValue.cs b/src/Serilog.Settings.Configuration/Settings/Configuration/StringArgumentValue.cs
@@ -16,7 +16,7 @@ class StringArgumentValue : IConfigurationArgumentValue
         readonly Func<string> _valueProducer;
         readonly Func<IChangeToken> _changeTokenProducer;
 
-        private static readonly Regex StaticMemberAccessorRegex = new Regex("^(?<shortTypeName>[^:]+)::(?<memberName>[A-Za-z][A-Za-z0-9]*)(?<typeNameExtraQualifiers>[^:]*)$");
+        static readonly Regex StaticMemberAccessorRegex = new Regex("^(?<shortTypeName>[^:]+)::(?<memberName>[A-Za-z][A-Za-z0-9]*)(?<typeNameExtraQualifiers>[^:]*)$");
 
         public StringArgumentValue(Func<string> valueProducer, Func<IChangeToken> changeTokenProducer = null)
         {
diff --git a/test/Serilog.Settings.Configuration.Tests/ConfigurationReaderTests.cs b/test/Serilog.Settings.Configuration.Tests/ConfigurationReaderTests.cs
@@ -71,7 +71,7 @@ public void WriteToSupportExpandedSyntaxWithArgs()
 
             Assert.Equal(1, result["LiterateConsole"].Count());
 
-            var args = result["LiterateConsole"].Single().Cast<KeyValuePair<string, IConfigurationArgumentValue>>().ToArray();
+            var args = result["LiterateConsole"].Single().ToArray();
 
             Assert.Equal(1, args.Length);
             Assert.Equal("outputTemplate", args[0].Key);
diff --git a/test/Serilog.Settings.Configuration.Tests/ConfigurationSettingsTests.cs b/test/Serilog.Settings.Configuration.Tests/ConfigurationSettingsTests.cs
@@ -12,7 +12,7 @@ namespace Serilog.Settings.Configuration.Tests
 {
     public class ConfigurationSettingsTests
     {
-        private static LoggerConfiguration ConfigFromJson(string jsonString)
+        static LoggerConfiguration ConfigFromJson(string jsonString)
         {
             var config = new ConfigurationBuilder().AddJsonString(jsonString).Build();
             return new LoggerConfiguration()

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class ConfigurationReader : IConfigurationReader`
`22`	`22`
`23`	`23`	`readonly IConfigurationSection _configuration;`
`24`	`24`	`readonly DependencyContext _dependencyContext;`
`25`		`- readonly Assembly[] _configurationAssemblies;`
	`25`	`+ readonly IReadOnlyCollection<Assembly> _configurationAssemblies;`
`26`	`26`
`27`	`27`	`public ConfigurationReader(IConfigurationSection configuration, DependencyContext dependencyContext)`
`28`	`28`	`{`
`@@ -31,7 +31,7 @@ public ConfigurationReader(IConfigurationSection configuration, DependencyContex`
`31`	`31`	`_configurationAssemblies = LoadConfigurationAssemblies();`
`32`	`32`	`}`
`33`	`33`
`34`		`- ConfigurationReader(IConfigurationSection configuration, Assembly[] configurationAssemblies, DependencyContext dependencyContext)`
	`34`	`+ ConfigurationReader(IConfigurationSection configuration, IReadOnlyCollection<Assembly> configurationAssemblies, DependencyContext dependencyContext)`
`35`	`35`	`{`
`36`	`36`	`_configuration = configuration ?? throw new ArgumentNullException(nameof(configuration));`
`37`	`37`	`_dependencyContext = dependencyContext;`
`@@ -48,7 +48,7 @@ public void Configure(LoggerConfiguration loggerConfiguration)`
`48`	`48`	`ApplyAuditSinks(loggerConfiguration, declaredLevelSwitches);`
`49`	`49`	`}`
`50`	`50`
`51`		`- private IReadOnlyDictionary<string, LoggingLevelSwitch> ProcessLevelSwitchDeclarations()`
	`51`	`+ IReadOnlyDictionary<string, LoggingLevelSwitch> ProcessLevelSwitchDeclarations()`
`52`	`52`	`{`
`53`	`53`	`var levelSwitchesDirective = _configuration.GetSection("LevelSwitches");`
`54`	`54`	`var namedSwitches = new Dictionary<string, LoggingLevelSwitch>();`
`@@ -198,7 +198,7 @@ void ApplyEnrichment(LoggerConfiguration loggerConfiguration,`
`198`	`198`
`199`	`199`	`internal ILookup<string, Dictionary<string, IConfigurationArgumentValue>> GetMethodCalls(IConfigurationSection directive)`
`200`	`200`	`{`
`201`		`- var children = directive.GetChildren();`
	`201`	`+ var children = directive.GetChildren().ToList();`
`202`	`202`
`203`	`203`	`var result =`
`204`	`204`	`(from child in children`
`@@ -242,7 +242,7 @@ string GetSectionName(IConfigurationSection s)`
`242`	`242`	`}`
`243`	`243`	`}`
`244`	`244`
`245`		`- Assembly[] LoadConfigurationAssemblies()`
	`245`	`+ IReadOnlyCollection<Assembly> LoadConfigurationAssemblies()`
`246`	`246`	`{`
`247`	`247`	`var assemblies = new Dictionary<string, Assembly>();`
`248`	`248`
`@@ -268,11 +268,12 @@ Assembly[] LoadConfigurationAssemblies()`
`268`	`268`	`assemblies.Add(assumed.FullName, assumed);`
`269`	`269`	`}`
`270`	`270`
`271`		`- return assemblies.Values.ToArray();`
	`271`	`+ return assemblies.Values.ToList().AsReadOnly();`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`AssemblyName[] GetSerilogConfigurationAssemblies()`
`275`	`275`	`{`
	`276`	`+ // ReSharper disable once RedundantAssignment`
`276`	`277`	`var query = Enumerable.Empty<AssemblyName>();`
`277`	`278`	`var filter = new Func<string, bool>(name => name != null && name.ToLowerInvariant().Contains("serilog"));`
`278`	`279`
`@@ -324,7 +325,7 @@ internal static MethodInfo SelectConfigurationMethod(IEnumerable<MethodInfo> can`
`324`	`325`	`.FirstOrDefault();`
`325`	`326`	`}`
`326`	`327`
`327`		`- internal static IList<MethodInfo> FindSinkConfigurationMethods(IEnumerable<Assembly> configurationAssemblies)`
	`328`	`+ internal static IList<MethodInfo> FindSinkConfigurationMethods(IReadOnlyCollection<Assembly> configurationAssemblies)`
`328`	`329`	`{`
`329`	`330`	`var found = FindConfigurationMethods(configurationAssemblies, typeof(LoggerSinkConfiguration));`
`330`	`331`	`if (configurationAssemblies.Contains(typeof(LoggerSinkConfiguration).GetTypeInfo().Assembly))`
`@@ -333,14 +334,14 @@ internal static IList<MethodInfo> FindSinkConfigurationMethods(IEnumerable<Assem`
`333`	`334`	`return found;`
`334`	`335`	`}`
`335`	`336`
`336`		`- internal static IList<MethodInfo> FindAuditSinkConfigurationMethods(IEnumerable<Assembly> configurationAssemblies)`
	`337`	`+ internal static IList<MethodInfo> FindAuditSinkConfigurationMethods(IReadOnlyCollection<Assembly> configurationAssemblies)`
`337`	`338`	`{`
`338`	`339`	`var found = FindConfigurationMethods(configurationAssemblies, typeof(LoggerAuditSinkConfiguration));`
`339`	`340`
`340`	`341`	`return found;`
`341`	`342`	`}`
`342`	`343`
`343`		`- internal static IList<MethodInfo> FindFilterConfigurationMethods(IEnumerable<Assembly> configurationAssemblies)`
	`344`	`+ internal static IList<MethodInfo> FindFilterConfigurationMethods(IReadOnlyCollection<Assembly> configurationAssemblies)`
`344`	`345`	`{`
`345`	`346`	`var found = FindConfigurationMethods(configurationAssemblies, typeof(LoggerFilterConfiguration));`
`346`	`347`	`if (configurationAssemblies.Contains(typeof(LoggerFilterConfiguration).GetTypeInfo().Assembly))`
`@@ -349,7 +350,7 @@ internal static IList<MethodInfo> FindFilterConfigurationMethods(IEnumerable<Ass`
`349`	`350`	`return found;`
`350`	`351`	`}`
`351`	`352`
`352`		`- internal static IList<MethodInfo> FindEventEnricherConfigurationMethods(IEnumerable<Assembly> configurationAssemblies)`
	`353`	`+ internal static IList<MethodInfo> FindEventEnricherConfigurationMethods(IReadOnlyCollection<Assembly> configurationAssemblies)`
`353`	`354`	`{`
`354`	`355`	`var found = FindConfigurationMethods(configurationAssemblies, typeof(LoggerEnrichmentConfiguration));`
`355`	`356`	`if (configurationAssemblies.Contains(typeof(LoggerEnrichmentConfiguration).GetTypeInfo().Assembly))`
`@@ -358,7 +359,7 @@ internal static IList<MethodInfo> FindEventEnricherConfigurationMethods(IEnumera`
`358`	`359`	`return found;`
`359`	`360`	`}`
`360`	`361`
`361`		`- internal static IList<MethodInfo> FindConfigurationMethods(IEnumerable<Assembly> configurationAssemblies, Type configType)`
	`362`	`+ internal static IList<MethodInfo> FindConfigurationMethods(IReadOnlyCollection<Assembly> configurationAssemblies, Type configType)`
`362`	`363`	`{`
`363`	`364`	`return configurationAssemblies`
`364`	`365`	`.SelectMany(a => a.ExportedTypes`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class StringArgumentValue : IConfigurationArgumentValue`
`16`	`16`	`readonly Func<string> _valueProducer;`
`17`	`17`	`readonly Func<IChangeToken> _changeTokenProducer;`
`18`	`18`
`19`		`- private static readonly Regex StaticMemberAccessorRegex = new Regex("^(?<shortTypeName>[^:]+)::(?<memberName>[A-Za-z][A-Za-z0-9])(?<typeNameExtraQualifiers>[^:])$");`
	`19`	`+ static readonly Regex StaticMemberAccessorRegex = new Regex("^(?<shortTypeName>[^:]+)::(?<memberName>[A-Za-z][A-Za-z0-9])(?<typeNameExtraQualifiers>[^:])$");`
`20`	`20`
`21`	`21`	`public StringArgumentValue(Func<string> valueProducer, Func<IChangeToken> changeTokenProducer = null)`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace Serilog.Settings.Configuration.Tests`
`12`	`12`	`{`
`13`	`13`	`public class ConfigurationSettingsTests`
`14`	`14`	`{`
`15`		`- private static LoggerConfiguration ConfigFromJson(string jsonString)`
	`15`	`+ static LoggerConfiguration ConfigFromJson(string jsonString)`
`16`	`16`	`{`
`17`	`17`	`var config = new ConfigurationBuilder().AddJsonString(jsonString).Build();`
`18`	`18`	`return new LoggerConfiguration()`