diff --git a/Directory.Build.props b/Directory.Build.props index 2b620bc..bc073ac 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -7,6 +7,7 @@ $(MSBuildThisFileDirectory)assets/Serilog.snk true enable + enable diff --git a/samples/Sample/Program.cs b/samples/Sample/Program.cs index d70b9aa..903bd4d 100644 --- 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>(); 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 index 951b742..6fb8da7 100644 --- a/samples/Sample/Sample.csproj +++ b/samples/Sample/Sample.csproj @@ -1,10 +1,8 @@ - + net8.0 - Sample Exe - enable diff --git a/samples/SampleWithExternalScope/Program.cs b/samples/SampleWithExternalScope/Program.cs index 3a1a018..e02c500 100644 --- 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>(); 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 index 045c31a..12beb9e 100644 --- a/samples/SampleWithExternalScope/SampleWithExternalScope.csproj +++ b/samples/SampleWithExternalScope/SampleWithExternalScope.csproj @@ -1,11 +1,8 @@ - + - Exe net8.0 - enable Exe - enable @@ -13,8 +10,6 @@ - - diff --git a/src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLoggerProvider.cs b/src/Serilog.Extensions.Logging/Extensions/Logging/SerilogLoggerProvider.cs index 5a603bc..0923b45 100644 --- 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(); + scopeItems ??= []; scopeItems.Add(scopeItem); } } @@ -84,7 +84,7 @@ public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory) if (scopeItem != null) { - scopeItems ??= new List(); + 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 index a197a45..e49f22f 100644 --- a/src/Serilog.Extensions.Logging/Serilog.Extensions.Logging.csproj +++ b/src/Serilog.Extensions.Logging/Serilog.Extensions.Logging.csproj @@ -28,7 +28,6 @@ - diff --git a/test/Serilog.Extensions.Logging.Benchmarks/Serilog.Extensions.Logging.Benchmarks.csproj b/test/Serilog.Extensions.Logging.Benchmarks/Serilog.Extensions.Logging.Benchmarks.csproj index 155847e..3abb810 100644 --- 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 @@ net8.0 - enable diff --git a/test/Serilog.Extensions.Logging.Tests/Serilog.Extensions.Logging.Tests.csproj b/test/Serilog.Extensions.Logging.Tests/Serilog.Extensions.Logging.Tests.csproj index 7c1a2f8..3da27bb 100644 --- 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 @@ net8.0;net48 - enable diff --git a/test/Serilog.Extensions.Logging.Tests/SerilogLogValuesTests.cs b/test/Serilog.Extensions.Logging.Tests/SerilogLogValuesTests.cs index a1f3025..09f346a 100644 --- 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()); + var seq = new SequenceValue([]); var lv = new SerilogLogValues(MessageTemplate.Empty, new Dictionary { [name] = seq }); var kvp = lv.Single(p => p.Key == name); var sv = Assert.IsType(kvp.Value); diff --git a/test/Serilog.Extensions.Logging.Tests/SerilogLoggerScopeTests.cs b/test/Serilog.Extensions.Logging.Tests/SerilogLoggerScopeTests.cs index 442d737..7c60913 100644 --- 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()); + var messageTemplate = new MessageTemplate([]); var properties = Enumerable.Empty(); 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() { { 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[] { new KeyValuePair(propertyName, expectedValue) }; + var state = new KeyValuePair[] { 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 index 84bba82..e578fe4 100644 --- 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 _scopes = new List(); + private readonly List _scopes = []; public void ForEachScope(Action callback, TState state) { diff --git a/test/Serilog.Extensions.Logging.Tests/Support/ExtensionsProvider.cs b/test/Serilog.Extensions.Logging.Tests/Support/ExtensionsProvider.cs index a27d0bd..7ccaead 100644 --- 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 index 12d34af..a84c504 100644 --- 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 index d26aac5..3d6cefa 100644 --- 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 Writes { get; set; } = new(); + public List Writes { get; set; } = []; public void Emit(LogEvent logEvent) {