Code cleanup

.gitignore

@@ -1,203 +1,6 @@
-## 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
-
+. idea/
+bin/
+obj/
+test/
 artifacts/

sample/Sample/Sample.csproj

@@ -16,13 +16,13 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
     <PackageReference Include="Serilog.Enrichers.Environment" Version="2.3.0" />
     <PackageReference Include="Serilog.Expressions" Version="4.0.0" />
     <PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0" />
     <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
-    <PackageReference Include="PolySharp" Version="1.13.2" PrivateAssets="all" />
+    <PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

src/Serilog.Settings.Configuration/Serilog.Settings.Configuration.csproj

@@ -9,7 +9,6 @@
         the target version. -->
     <TargetFrameworks>net462;netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AssemblyName>Serilog.Settings.Configuration</AssemblyName>
     <PackageTags>serilog;json</PackageTags>
     <PackageIcon>icon.png</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>
@@ -24,12 +23,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Using Remove="System.Net.Http" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    <PackageReference Include="PolySharp" Version="1.13.2" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="All" />
     <PackageReference Include="Serilog" Version="3.1.1" />
     <None Include="..\..\assets\icon.png" Pack="true" PackagePath="" Visible="false" />
     <None Include="..\..\README.md" Pack="true" PackagePath="" />

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,

src/Serilog.Settings.Configuration/Settings/Configuration/ObjectArgumentValue.cs

@@ -91,7 +91,7 @@ bool TryCreateContainer([NotNullWhen(true)] out object? result)
             {
                 var argumentValue = ConfigurationReader.GetArgumentValue(configurationElements[i], _configurationAssemblies);
                 var value = argumentValue.ConvertTo(elementType, resolutionContext);
-                addMethod.Invoke(result, new[] { value });
+                addMethod.Invoke(result, [value]);
             }
 
             return true;

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}";
     }

test/Serilog.Settings.Configuration.Tests/ApiApprovalTests.cs

@@ -1,4 +1,4 @@
-#if NET7_0
+#if NET8_0
 
 using PublicApiGenerator;
 using Shouldly;
@@ -15,7 +15,7 @@ public void PublicApi_Should_Not_Change_Unintentionally()
             new()
             {
                 IncludeAssemblyAttributes = false,
-                ExcludeAttributes = new[] { "System.Diagnostics.DebuggerDisplayAttribute" },
+                ExcludeAttributes = ["System.Diagnostics.DebuggerDisplayAttribute"],
             });
 
         publicApi.ShouldMatchApproved(options => options.WithFilenameGenerator((_, _, fileType, fileExtension) => $"{assembly.GetName().Name!}.{fileType}.{fileExtension}"));

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))]