Merge pull request #414 from sungam3r/cleanup

nblumhardt · web-flow · commit dfb4df490fa4 · 2024-12-03T10:33:39.000+10:00
Code cleanup
diff --git a/.gitignore b/.gitignore
@@ -1,205 +1,8 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-build/
-bld/
-[Bb]in/
-[Oo]bj/
-
-# Visual Studo 2015 cache/options directory
 .vs/
-
-# JetBrains project files
 .idea/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUNIT
-*.VisualState.xml
-TestResult.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-*_i.c
-*_p.c
-*_i.h
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-*.cachefile
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# JustCode is a .NET coding addin-in
-.JustCode
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings
-# but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
-*.publishproj
-
-# NuGet Packages
-*.nupkg
-# The packages folder can be ignored because of Package Restore
-**/packages/*
-# except build/, which is used as an MSBuild target.
-!**/packages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
-
-# Windows Azure Build Output
-csx/
-*.build.csdef
-
-# Windows Store app package directory
-AppPackages/
-
-# Others
-*.[Cc]ache
-ClientBin/
-[Ss]tyle[Cc]op.*
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.pfx
-*.publishsettings
-node_modules/
-bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-*.mdf
-*.ldf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-project.lock.json
-
+bin/
+obj/
+test/
 artifacts/
 
 .DS_Store
diff --git a/src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs b/src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs
@@ -18,7 +18,7 @@ class ConfigurationReader : IConfigurationReader
     const string LevelSwitchNameRegex = @"^\${0,1}[A-Za-z]+[A-Za-z0-9]*$";
 
     // Section names that can be handled by Serilog itself (hence builtin) without requiring any additional assemblies.
-    static readonly string[] BuiltinSectionNames = { "LevelSwitches", "MinimumLevel", "Properties" };
+    static readonly string[] BuiltinSectionNames = ["LevelSwitches", "MinimumLevel", "Properties"];
 
     readonly IConfiguration _section;
     readonly IReadOnlyCollection<Assembly> _configurationAssemblies;
@@ -218,7 +218,7 @@ void ApplyMinimumLevelConfiguration(IConfigurationSection directive, Action<Logg
         }
     }
 
-    void SubscribeToLoggingLevelChanges(IConfigurationSection levelSection, LoggingLevelSwitch levelSwitch)
+    static void SubscribeToLoggingLevelChanges(IConfigurationSection levelSection, LoggingLevelSwitch levelSwitch)
     {
         ChangeToken.OnChange(
             levelSection.GetReloadToken,
diff --git a/src/Serilog.Settings.Configuration/Settings/Configuration/ObjectArgumentValue.cs b/src/Serilog.Settings.Configuration/Settings/Configuration/ObjectArgumentValue.cs
@@ -101,7 +101,7 @@ bool TryCreateContainer([NotNullWhen(true)] out object? result)
                 {
                     var argumentValue = FromSection(section, _configurationAssemblies);
                     var value = argumentValue.ConvertTo(elementType, resolutionContext);
-                    addMethod.Invoke(result, new[] { value });
+                    addMethod.Invoke(result, [value]);
                 }
                 return true;
             }
diff --git a/src/Serilog.Settings.Configuration/Settings/Configuration/ResolutionContext.cs b/src/Serilog.Settings.Configuration/Settings/Configuration/ResolutionContext.cs
@@ -70,7 +70,7 @@ public void AddFilterSwitch(string filterSwitchName, LoggingFilterSwitchProxy fi
         _declaredFilterSwitches[referenceName] = filterSwitch;
     }
 
-    string ToSwitchReference(string switchName)
+    static string ToSwitchReference(string switchName)
     {
         return switchName.StartsWith("$") ? switchName : $"${switchName}";
     }
diff --git a/test/Serilog.Settings.Configuration.Tests/ConfigurationReaderTests.cs b/test/Serilog.Settings.Configuration.Tests/ConfigurationReaderTests.cs
@@ -185,17 +185,17 @@ public void MethodsAreSelectedBasedOnCountOfMatchedArgumentsAndThenStringType()
         Assert.Equal(typeof(string), selected?.GetParameters()[2].ParameterType);
     }
 
-    public static IEnumerable<object[]> FlatMinimumLevel => new List<object[]>
-    {
-        new object[] { GetConfigRoot(appsettingsJsonLevel: minimumLevelFlatTemplate.Format(LogEventLevel.Error)), LogEventLevel.Error },
-        new object[] { GetConfigRoot(appsettingsDevelopmentJsonLevel: minimumLevelFlatTemplate.Format(LogEventLevel.Error)), LogEventLevel.Error },
-        new object[] { GetConfigRoot(envVariables: new Dictionary<string, string?> {{minimumLevelFlatKey, LogEventLevel.Error.ToString()}}), LogEventLevel.Error},
-        new object[] { GetConfigRoot(
+    public static IEnumerable<object[]> FlatMinimumLevel =>
+    [
+        [GetConfigRoot(appsettingsJsonLevel: minimumLevelFlatTemplate.Format(LogEventLevel.Error)), LogEventLevel.Error],
+        [GetConfigRoot(appsettingsDevelopmentJsonLevel: minimumLevelFlatTemplate.Format(LogEventLevel.Error)), LogEventLevel.Error],
+        [GetConfigRoot(envVariables: new Dictionary<string, string?> {{minimumLevelFlatKey, LogEventLevel.Error.ToString()}}), LogEventLevel.Error],
+        [GetConfigRoot(
                 appsettingsJsonLevel: minimumLevelFlatTemplate.Format(LogEventLevel.Debug),
                 envVariables: new Dictionary<string, string?> {{minimumLevelFlatKey, LogEventLevel.Error.ToString()}}),
             LogEventLevel.Error
-        }
-    };
+        ]
+    ];
 
     [Theory]
     [MemberData(nameof(FlatMinimumLevel))]
@@ -209,17 +209,17 @@ public void FlatMinimumLevelCorrectOneIsEnabledOnLogger(IConfigurationRoot root,
         AssertLogEventLevels(loggerConfig, expectedMinimumLevel);
     }
 
-    public static IEnumerable<object[]> ObjectMinimumLevel => new List<object[]>
-    {
-        new object[] { GetConfigRoot(appsettingsJsonLevel: minimumLevelObjectTemplate.Format(LogEventLevel.Error)), LogEventLevel.Error },
-        new object[] { GetConfigRoot(appsettingsJsonLevel: minimumLevelObjectTemplate.Format(LogEventLevel.Error.ToString().ToUpper())), LogEventLevel.Error },
-        new object[] { GetConfigRoot(appsettingsDevelopmentJsonLevel: minimumLevelObjectTemplate.Format(LogEventLevel.Error)), LogEventLevel.Error },
-        new object[] { GetConfigRoot(envVariables: new Dictionary<string, string?>{{minimumLevelObjectKey, LogEventLevel.Error.ToString() } }), LogEventLevel.Error },
-        new object[] { GetConfigRoot(
+    public static IEnumerable<object[]> ObjectMinimumLevel =>
+    [
+        [GetConfigRoot(appsettingsJsonLevel: minimumLevelObjectTemplate.Format(LogEventLevel.Error)), LogEventLevel.Error],
+        [GetConfigRoot(appsettingsJsonLevel: minimumLevelObjectTemplate.Format(LogEventLevel.Error.ToString().ToUpper())), LogEventLevel.Error],
+        [GetConfigRoot(appsettingsDevelopmentJsonLevel: minimumLevelObjectTemplate.Format(LogEventLevel.Error)), LogEventLevel.Error],
+        [GetConfigRoot(envVariables: new Dictionary<string, string?>{{minimumLevelObjectKey, LogEventLevel.Error.ToString() } }), LogEventLevel.Error],
+        [GetConfigRoot(
             appsettingsJsonLevel: minimumLevelObjectTemplate.Format(LogEventLevel.Error),
             appsettingsDevelopmentJsonLevel: minimumLevelObjectTemplate.Format(LogEventLevel.Debug)),
-            LogEventLevel.Debug }
-    };
+            LogEventLevel.Debug ]
+    ];
 
     [Theory]
     [MemberData(nameof(ObjectMinimumLevel))]
@@ -234,34 +234,31 @@ public void ObjectMinimumLevelCorrectOneIsEnabledOnLogger(IConfigurationRoot roo
     }
 
     // currently only works in the .NET 4.6.1 and .NET Standard builds of Serilog.Settings.Configuration
-    public static IEnumerable<object[]> MixedMinimumLevel => new List<object[]>
-    {
-        new object[]
-        {
+    public static IEnumerable<object[]> MixedMinimumLevel =>
+    [
+        [
             GetConfigRoot(
                 appsettingsJsonLevel: minimumLevelObjectTemplate.Format(LogEventLevel.Error),
                 appsettingsDevelopmentJsonLevel: minimumLevelFlatTemplate.Format(LogEventLevel.Debug)),
             LogEventLevel.Debug
-        },
-        new object[]
-        {
+        ],
+        [
             GetConfigRoot(
                 appsettingsJsonLevel: minimumLevelFlatTemplate.Format(LogEventLevel.Error),
                 appsettingsDevelopmentJsonLevel: minimumLevelObjectTemplate.Format(LogEventLevel.Debug)),
             LogEventLevel.Debug
-        },
+        ],
         // precedence should be flat > object if from the same source
-        new object[]
-        {
+        [
             GetConfigRoot(
                 envVariables: new Dictionary<string, string?>()
                 {
                     {minimumLevelObjectKey, LogEventLevel.Error.ToString()},
                     {minimumLevelFlatKey, LogEventLevel.Debug.ToString()}
                 }),
             LogEventLevel.Debug
-        }
-    };
+        ]
+    ];
 
     [Theory]
     [MemberData(nameof(MixedMinimumLevel))]
diff --git a/test/Serilog.Settings.Configuration.Tests/Support/ConfigurationReaderTestHelpers.cs b/test/Serilog.Settings.Configuration.Tests/Support/ConfigurationReaderTestHelpers.cs
@@ -55,7 +55,7 @@ public static IConfigurationRoot GetConfigRoot(
 
         configBuilder.AddJsonString(appsettingsJsonLevel ?? "{}");
         configBuilder.AddJsonString(appsettingsDevelopmentJsonLevel ?? "{}");
-        configBuilder.Add(new ReloadableConfigurationSource(envVariables ?? new Dictionary<string, string?>()));
+        configBuilder.Add(new ReloadableConfigurationSource(envVariables ?? []));
 
         return configBuilder.Build();
     }
diff --git a/test/Serilog.Settings.Configuration.Tests/Support/TestApp.cs b/test/Serilog.Settings.Configuration.Tests/Support/TestApp.cs
@@ -26,7 +26,7 @@ public TestApp(IMessageSink messageSink)
         {
             file.CopyTo(_workingDirectory.File(file.Name).FullName, overwrite: true);
         }
-        _executables = new Dictionary<PublishMode, FileInfo>();
+        _executables = [];
     }
 
     async Task IAsyncLifetime.InitializeAsync()
diff --git a/test/TestDummies/Console/DummyConsoleSink.cs b/test/TestDummies/Console/DummyConsoleSink.cs
@@ -17,7 +17,7 @@ public DummyConsoleSink(ConsoleTheme? theme = null)
     [ThreadStatic]
     static List<LogEvent>? EmittedList;
 
-    public static List<LogEvent> Emitted => EmittedList ??= new List<LogEvent>();
+    public static List<LogEvent> Emitted => EmittedList ??= [];
 
     public void Emit(LogEvent logEvent)
     {
diff --git a/test/TestDummies/DummyConfigurationSink.cs b/test/TestDummies/DummyConfigurationSink.cs
@@ -15,7 +15,7 @@ public class DummyConfigurationSink : ILogEventSink
     [ThreadStatic]
     static IConfigurationSection? _configSection;
 
-    public static List<LogEvent> Emitted => _emitted ?? (_emitted = new List<LogEvent>());
+    public static List<LogEvent> Emitted => _emitted ?? (_emitted = []);
 
     public static IConfiguration? Configuration => _configuration;
 
diff --git a/test/TestDummies/DummyPolicy.cs b/test/TestDummies/DummyPolicy.cs
@@ -34,7 +34,7 @@ public bool TryDestructure(object value, ILogEventPropertyValueFactory propertyV
 
 public class CustomCollection<T> : IEnumerable<T>
 {
-    private readonly List<T> inner = new List<T>();
+    private readonly List<T> inner = [];
 
     public void Add(T item) => inner.Add(item);
 
diff --git a/test/TestDummies/DummyRollingFileAuditSink.cs b/test/TestDummies/DummyRollingFileAuditSink.cs
@@ -8,7 +8,7 @@ public class DummyRollingFileAuditSink : ILogEventSink
     [ThreadStatic]
     static List<LogEvent>? _emitted;
 
-    public static List<LogEvent> Emitted => _emitted ??= new List<LogEvent>();
+    public static List<LogEvent> Emitted => _emitted ??= [];
 
     public void Emit(LogEvent logEvent)
     {
diff --git a/test/TestDummies/DummyRollingFileSink.cs b/test/TestDummies/DummyRollingFileSink.cs
diff --git a/test/TestDummies/DummyWithLevelSwitchSink.cs b/test/TestDummies/DummyWithLevelSwitchSink.cs
diff --git a/test/TestDummies/DummyWrappingSink.cs b/test/TestDummies/DummyWrappingSink.cs

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class ConfigurationReader : IConfigurationReader`
`18`	`18`	`const string LevelSwitchNameRegex = @"^\${0,1}[A-Za-z]+[A-Za-z0-9]*$";`
`19`	`19`
`20`	`20`	`// Section names that can be handled by Serilog itself (hence builtin) without requiring any additional assemblies.`
`21`		`- static readonly string[] BuiltinSectionNames = { "LevelSwitches", "MinimumLevel", "Properties" };`
	`21`	`+ static readonly string[] BuiltinSectionNames = ["LevelSwitches", "MinimumLevel", "Properties"];`
`22`	`22`
`23`	`23`	`readonly IConfiguration _section;`
`24`	`24`	`readonly IReadOnlyCollection<Assembly> _configurationAssemblies;`
`@@ -218,7 +218,7 @@ void ApplyMinimumLevelConfiguration(IConfigurationSection directive, Action<Logg`
`218`	`218`	`}`
`219`	`219`	`}`
`220`	`220`
`221`		`- void SubscribeToLoggingLevelChanges(IConfigurationSection levelSection, LoggingLevelSwitch levelSwitch)`
	`221`	`+ static void SubscribeToLoggingLevelChanges(IConfigurationSection levelSection, LoggingLevelSwitch levelSwitch)`
`222`	`222`	`{`
`223`	`223`	`ChangeToken.OnChange(`
`224`	`224`	`levelSection.GetReloadToken,`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ bool TryCreateContainer([NotNullWhen(true)] out object? result)`
`101`	`101`	`{`
`102`	`102`	`var argumentValue = FromSection(section, _configurationAssemblies);`
`103`	`103`	`var value = argumentValue.ConvertTo(elementType, resolutionContext);`
`104`		`- addMethod.Invoke(result, new[] { value });`
	`104`	`+ addMethod.Invoke(result, [value]);`
`105`	`105`	`}`
`106`	`106`	`return true;`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public void AddFilterSwitch(string filterSwitchName, LoggingFilterSwitchProxy fi`
`70`	`70`	`_declaredFilterSwitches[referenceName] = filterSwitch;`
`71`	`71`	`}`
`72`	`72`
`73`		`- string ToSwitchReference(string switchName)`
	`73`	`+ static string ToSwitchReference(string switchName)`
`74`	`74`	`{`
`75`	`75`	`return switchName.StartsWith("$") ? switchName : $"${switchName}";`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public static IConfigurationRoot GetConfigRoot(`
`55`	`55`
`56`	`56`	`configBuilder.AddJsonString(appsettingsJsonLevel ?? "{}");`
`57`	`57`	`configBuilder.AddJsonString(appsettingsDevelopmentJsonLevel ?? "{}");`
`58`		`- configBuilder.Add(new ReloadableConfigurationSource(envVariables ?? new Dictionary<string, string?>()));`
	`58`	`+ configBuilder.Add(new ReloadableConfigurationSource(envVariables ?? []));`
`59`	`59`
`60`	`60`	`return configBuilder.Build();`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public TestApp(IMessageSink messageSink)`
`26`	`26`	`{`
`27`	`27`	`file.CopyTo(_workingDirectory.File(file.Name).FullName, overwrite: true);`
`28`	`28`	`}`
`29`		`- _executables = new Dictionary<PublishMode, FileInfo>();`
	`29`	`+ _executables = [];`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`async Task IAsyncLifetime.InitializeAsync()`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public DummyConsoleSink(ConsoleTheme? theme = null)`
`17`	`17`	`[ThreadStatic]`
`18`	`18`	`static List<LogEvent>? EmittedList;`
`19`	`19`
`20`		`- public static List<LogEvent> Emitted => EmittedList ??= new List<LogEvent>();`
	`20`	`+ public static List<LogEvent> Emitted => EmittedList ??= [];`
`21`	`21`
`22`	`22`	`public void Emit(LogEvent logEvent)`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public bool TryDestructure(object value, ILogEventPropertyValueFactory propertyV`
`34`	`34`
`35`	`35`	`public class CustomCollection<T> : IEnumerable<T>`
`36`	`36`	`{`
`37`		`- private readonly List<T> inner = new List<T>();`
	`37`	`+ private readonly List<T> inner = [];`
`38`	`38`
`39`	`39`	`public void Add(T item) => inner.Add(item);`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public class DummyRollingFileAuditSink : ILogEventSink`
`8`	`8`	`[ThreadStatic]`
`9`	`9`	`static List<LogEvent>? _emitted;`
`10`	`10`
`11`		`- public static List<LogEvent> Emitted => _emitted ??= new List<LogEvent>();`
	`11`	`+ public static List<LogEvent> Emitted => _emitted ??= [];`
`12`	`12`
`13`	`13`	`public void Emit(LogEvent logEvent)`
`14`	`14`	`{`