serilog · sungam3r · Mar 25, 2024 · Mar 25, 2024
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -7,6 +7,7 @@
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)assets/Serilog.snk</AssemblyOriginatorKeyFile>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
 </Project>
diff --git a/samples/Sample/Program.cs b/samples/Sample/Program.cs
@@ -29,7 +29,7 @@
 
 services.AddLogging(l => l.AddConsole());
 
-var serviceProvider = services.BuildServiceProvider();
+using var serviceProvider = services.BuildServiceProvider();
 var logger = serviceProvider.GetRequiredService<ILogger<Program>>();
 
 var startTime = DateTimeOffset.UtcNow;
@@ -64,5 +64,3 @@
 logger.LogInformation("{Result,-10:l}{StartTime,15:l}{EndTime,15:l}{Duration,15:l}", "RESULT", "START TIME", "END TIME", "DURATION(ms)");
 logger.LogInformation("{Result,-10:l}{StartTime,15:l}{EndTime,15:l}{Duration,15:l}", "------", "----- ----", "--- ----", "------------");
 logger.LogInformation("{Result,-10:l}{StartTime,15:mm:s tt}{EndTime,15:mm:s tt}{Duration,15}", "SUCCESS", startTime, endTime, (endTime - startTime).TotalMilliseconds);
-
-serviceProvider.Dispose();
diff --git a/samples/Sample/Sample.csproj b/samples/Sample/Sample.csproj
@@ -1,10 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <AssemblyName>Sample</AssemblyName>
     <OutputType>Exe</OutputType>
-    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/SampleWithExternalScope/Program.cs b/samples/SampleWithExternalScope/Program.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Serilog;
@@ -37,7 +37,7 @@
 // Run our test
 var activitySource = new ActivitySource("SomeActivitySource");
 
-var serviceProvider = services.BuildServiceProvider();
+using var serviceProvider = services.BuildServiceProvider();
 var logger = serviceProvider.GetRequiredService<ILogger<Program>>();
 
 using var activity = activitySource.StartActivity();
@@ -52,5 +52,3 @@
 });
 
 logger.LogInformation("Hello world!");
-
-serviceProvider.Dispose();
diff --git a/samples/SampleWithExternalScope/SampleWithExternalScope.csproj b/samples/SampleWithExternalScope/SampleWithExternalScope.csproj
@@ -1,20 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
     <OutputType>Exe</OutputType>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Serilog.Extensions.Logging\Serilog.Extensions.Logging.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
   </ItemGroup>
 

diff --git a/src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLoggerProvider.cs b/src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLoggerProvider.cs
@@ -71,7 +71,7 @@ public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
 
             if (scopeItem != null)
             {
-                scopeItems ??= new List<LogEventPropertyValue>();
+                scopeItems ??= [];
                 scopeItems.Add(scopeItem);
             }
         }
@@ -84,7 +84,7 @@ public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
 
             if (scopeItem != null)
             {
-                scopeItems ??= new List<LogEventPropertyValue>();
+                scopeItems ??= [];
                 scopeItems.Add(scopeItem);
             }
         }, logEvent);

diff --git a/src/Serilog.Extensions.Logging/Serilog.Extensions.Logging.csproj b/src/Serilog.Extensions.Logging/Serilog.Extensions.Logging.csproj
@@ -28,7 +28,6 @@
   <ItemGroup>
     <None Include="..\..\assets\serilog-extension-nuget.png" Pack="true" PackagePath="" Visible="false" />
     <None Include="..\..\README.md" Pack="true" PackagePath="\" Visible="false" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="Serilog" Version="3.1.1" />
     <!-- The version of this reference must match the major and minor components of the package version prefix. -->
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />

diff --git a/test/Serilog.Extensions.Logging.Benchmarks/Serilog.Extensions.Logging.Benchmarks.csproj b/test/Serilog.Extensions.Logging.Benchmarks/Serilog.Extensions.Logging.Benchmarks.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/Serilog.Extensions.Logging.Tests/Serilog.Extensions.Logging.Tests.csproj b/test/Serilog.Extensions.Logging.Tests/Serilog.Extensions.Logging.Tests.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>net8.0;net48</TargetFrameworks>
-    <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net48' ">

diff --git a/test/Serilog.Extensions.Logging.Tests/SerilogLogValuesTests.cs b/test/Serilog.Extensions.Logging.Tests/SerilogLogValuesTests.cs
@@ -1,4 +1,4 @@
-using Serilog.Events;
+using Serilog.Events;
 using Serilog.Parsing;
 using Xunit;
 
@@ -29,10 +29,10 @@ public void ScalarPropertiesAreSimplified()
     }
 
     [Fact]
-    public void NonscalarPropertiesAreWrapped()
+    public void NonScalarPropertiesAreWrapped()
     {
         const string name = "Sequence";
-        var seq = new SequenceValue(Enumerable.Empty<LogEventPropertyValue>());
+        var seq = new SequenceValue([]);
         var lv = new SerilogLogValues(MessageTemplate.Empty, new Dictionary<string, LogEventPropertyValue> { [name] = seq });
         var kvp = lv.Single(p => p.Key == name);
         var sv = Assert.IsType<SequenceValue>(kvp.Value);

diff --git a/test/Serilog.Extensions.Logging.Tests/SerilogLoggerScopeTests.cs b/test/Serilog.Extensions.Logging.Tests/SerilogLoggerScopeTests.cs
@@ -7,6 +7,7 @@
 using Xunit;
 
 namespace Serilog.Extensions.Logging.Tests;
+
 public class SerilogLoggerScopeTests
 {
     static (SerilogLoggerProvider, LogEventPropertyFactory, LogEvent) SetUp()
@@ -16,7 +17,7 @@ public class SerilogLoggerScopeTests
         var logEventPropertyFactory = new LogEventPropertyFactory();
 
         var dateTimeOffset = new DateTimeOffset(2000, 1, 1, 0, 0, 0, TimeSpan.Zero);
-        var messageTemplate = new MessageTemplate(Enumerable.Empty<Parsing.MessageTemplateToken>());
+        var messageTemplate = new MessageTemplate([]);
         var properties = Enumerable.Empty<LogEventProperty>();
         var logEvent = new LogEvent(dateTimeOffset, LogEventLevel.Information, null, messageTemplate, properties);
 
@@ -31,12 +32,11 @@ public void EnrichWithDictionaryStringObject()
 
         var(loggerProvider, logEventPropertyFactory, logEvent) = SetUp();
 
-
         var state = new Dictionary<string, object?>() { { propertyName, expectedValue } };
 
         var loggerScope = new SerilogLoggerScope(loggerProvider, state);
 
-        loggerScope.EnrichAndCreateScopeItem(logEvent, logEventPropertyFactory, out LogEventPropertyValue? scopeItem);
+        loggerScope.EnrichAndCreateScopeItem(logEvent, logEventPropertyFactory, out LogEventPropertyValue? _);
 
         Assert.Contains(propertyName, logEvent.Properties);
 
@@ -56,12 +56,11 @@ public void EnrichWithIEnumerableKeyValuePairStringObject()
 
         var (loggerProvider, logEventPropertyFactory, logEvent) = SetUp();
 
-
-        var state = new KeyValuePair<string, object?>[] { new KeyValuePair<string, object?>(propertyName, expectedValue) };
+        var state = new KeyValuePair<string, object?>[] { new(propertyName, expectedValue) };
 
         var loggerScope = new SerilogLoggerScope(loggerProvider, state);
 
-        loggerScope.EnrichAndCreateScopeItem(logEvent, logEventPropertyFactory, out LogEventPropertyValue? scopeItem);
+        loggerScope.EnrichAndCreateScopeItem(logEvent, logEventPropertyFactory, out LogEventPropertyValue? _);
 
         Assert.Contains(propertyName, logEvent.Properties);
 
@@ -81,12 +80,11 @@ public void EnrichWithTupleStringObject()
 
         var (loggerProvider, logEventPropertyFactory, logEvent) = SetUp();
 
-
         var state = (propertyName, (object)expectedValue);
 
         var loggerScope = new SerilogLoggerScope(loggerProvider, state);
 
-        loggerScope.EnrichAndCreateScopeItem(logEvent, logEventPropertyFactory, out LogEventPropertyValue? scopeItem);
+        loggerScope.EnrichAndCreateScopeItem(logEvent, logEventPropertyFactory, out LogEventPropertyValue? _);
 
         Assert.Contains(propertyName, logEvent.Properties);
 

diff --git a/test/Serilog.Extensions.Logging.Tests/SerilogLoggerTests.cs b/test/Serilog.Extensions.Logging.Tests/SerilogLoggerTests.cs
@@ -193,7 +193,7 @@ public void StringifyScopeProperty()
     {
         var (logger, sink) = SetUp(LogLevel.Trace);
 
-        using (logger.BeginScope("{$values}", new [] { 1, 2, 3, 4 }))
+        using (logger.BeginScope("{$values}", new[] { 1, 2, 3, 4 }))
         {
             logger.Log(LogLevel.Information, 0, TestMessage, null!, null!);
         }
@@ -482,7 +482,7 @@ class Person
 
     class FakeExternalScopeProvider : IExternalScopeProvider
     {
-        private readonly List<Scope> _scopes = new List<Scope>();
+        private readonly List<Scope> _scopes = [];
 
         public void ForEachScope<TState>(Action<object?, TState> callback, TState state)
         {

diff --git a/test/Serilog.Extensions.Logging.Tests/Support/ExtensionsProvider.cs b/test/Serilog.Extensions.Logging.Tests/Support/ExtensionsProvider.cs
@@ -9,7 +9,7 @@ sealed class ExtensionsProvider : ILoggerProvider, Microsoft.Extensions.Logging.
 {
     readonly LogLevel _enabledLevel;
 
-    public List<(LogLevel logLevel, EventId eventId, object? state, Exception? exception, string message)> Writes { get; } = new();
+    public List<(LogLevel logLevel, EventId eventId, object? state, Exception? exception, string message)> Writes { get; } = [];
 
     public ExtensionsProvider(LogLevel enabledLevel)
     {

diff --git a/test/Serilog.Extensions.Logging.Tests/Support/LogEventPropertyFactory.cs b/test/Serilog.Extensions.Logging.Tests/Support/LogEventPropertyFactory.cs
@@ -5,6 +5,7 @@
 using Serilog.Events;
 
 namespace Serilog.Extensions.Logging.Tests.Support;
+
 internal class LogEventPropertyFactory : ILogEventPropertyFactory
 {
     public LogEventProperty CreateProperty(string name, object? value, bool destructureObjects = false)

diff --git a/test/Serilog.Extensions.Logging.Tests/Support/SerilogSink.cs b/test/Serilog.Extensions.Logging.Tests/Support/SerilogSink.cs
@@ -8,7 +8,7 @@ namespace Serilog.Extensions.Logging.Tests.Support;
 
 public class SerilogSink : ILogEventSink
 {
-    public List<LogEvent> Writes { get; set; } = new();
+    public List<LogEvent> Writes { get; set; } = [];
 
     public void Emit(LogEvent logEvent)
     {