Fixed code issues

elmahio · Nov 18, 2024 · 07a6847 · 07a6847
1 parent 91d06ce
commit 07a6847
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 30 deletions.
diff --git a/src/Serilog.Sinks.ElmahIO/Sinks/ElmahIo/ElmahIoSinkOptions.cs b/src/Serilog.Sinks.ElmahIO/Sinks/ElmahIo/ElmahIoSinkOptions.cs
@@ -3,7 +3,9 @@
 using Serilog.Events;
 using System;
 
+#pragma warning disable IDE0130 // Namespace does not match folder structure
 namespace Serilog.Sinks.ElmahIo
+#pragma warning restore IDE0130 // Namespace does not match folder structure
 {
     /// <summary>
     /// Provides ElmahIoSink with configurable options

diff --git a/src/Serilog.Sinks.ElmahIO/Sinks/ElmahIo/KeyValuePairExtensions.cs b/src/Serilog.Sinks.ElmahIO/Sinks/ElmahIo/KeyValuePairExtensions.cs
@@ -1,7 +1,9 @@
 using Elmah.Io.Client;
 using System.Collections.Generic;
 
+#pragma warning disable IDE0130 // Namespace does not match folder structure
 namespace Serilog.Sinks.ElmahIo
+#pragma warning restore IDE0130 // Namespace does not match folder structure
 {
     internal static class KeyValuePairExtensions
     {

diff --git a/src/Serilog.Sinks.ElmahIo/LoggerConfigurationElmahIOExtensions.cs b/src/Serilog.Sinks.ElmahIo/LoggerConfigurationElmahIOExtensions.cs
@@ -18,7 +18,9 @@
 using Serilog.Sinks.ElmahIo;
 using Serilog.Sinks.PeriodicBatching;
 
+#pragma warning disable IDE0130 // Namespace does not match folder structure
 namespace Serilog
+#pragma warning restore IDE0130 // Namespace does not match folder structure
 {
     /// <summary>
     /// Adds the WriteTo.ElmahIo() extension method to <see cref="LoggerConfiguration"/>.

diff --git a/src/Serilog.Sinks.ElmahIo/Sinks/ElmahIo/ElmahIOSink.cs b/src/Serilog.Sinks.ElmahIo/Sinks/ElmahIo/ElmahIOSink.cs
@@ -26,7 +26,9 @@
 using Serilog.Events;
 using Serilog.Sinks.PeriodicBatching;
 
+#pragma warning disable IDE0130 // Namespace does not match folder structure
 namespace Serilog.Sinks.ElmahIo
+#pragma warning restore IDE0130 // Namespace does not match folder structure
 {
     /// <summary>
     /// Writes log events to the elmah.io service.
@@ -183,7 +185,7 @@ private static IList<Item> QueryString(LogEvent logEvent)
                 queryString.AddRange(result
                     .Query
                     .TrimStart('?')
-                    .Split(new[] { '&' }, StringSplitOptions.RemoveEmptyEntries)
+                    .Split(['&'], StringSplitOptions.RemoveEmptyEntries)
                     .Select(s =>
                     {
                         var splitted = s.Split('=');

diff --git a/test/Serilog.Sinks.ElmahIo.Tests/Serilog.Sinks.ElmahIo.Tests.csproj b/test/Serilog.Sinks.ElmahIo.Tests/Serilog.Sinks.ElmahIo.Tests.csproj
@@ -4,7 +4,7 @@
 		<TargetFrameworks>net472;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
 		<AssemblyName>Serilog.Sinks.ElmahIo.Tests</AssemblyName>
 		<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-		<LangVersion>9.0</LangVersion>
+		<LangVersion>12.0</LangVersion>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/test/Serilog.Sinks.ElmahIo.Tests/Sinks/ElmahIo/ElmahIOSinkTest.cs b/test/Serilog.Sinks.ElmahIo.Tests/Sinks/ElmahIo/ElmahIOSinkTest.cs
@@ -8,9 +8,8 @@
 using NSubstitute;
 using NUnit.Framework;
 using Serilog.Events;
-using Serilog.Parsing;
 
-namespace Serilog.Sinks.ElmahIo.Tests
+namespace Serilog.Sinks.ElmahIo.Tests.Sinks.ElmahIo
 {
     public class ElmahIoSinkTest
     {
@@ -53,14 +52,14 @@ public async Task CanEmitCustomFields()
             };
 
             // Act
-            await sink.EmitBatchAsync(new List<LogEvent>
-            {
+            await sink.EmitBatchAsync(
+            [
                 new(
                     Now,
                     LogEventLevel.Error,
                     null,
-                    new MessageTemplate("{type} {hostname} {application} {user} {source} {method} {version} {url} {statusCode}", new List<MessageTemplateToken>()), new List<LogEventProperty>
-                    {
+                    new MessageTemplate("{type} {hostname} {application} {user} {source} {method} {version} {url} {statusCode}", []),
+                    [
                         new("type", new ScalarValue("type")),
                         new("hostname", new ScalarValue("hostname")),
                         new("application", new ScalarValue("application")),
@@ -76,9 +75,9 @@ await sink.EmitBatchAsync(new List<LogEvent>
                         new("cookies", new DictionaryValue(cookies)),
                         new("form", new DictionaryValue(form)),
                         new("queryString", new DictionaryValue(queryString)),
-                    }
+                    ]
                 )
-            });
+            ]);
 
             // Assert
             Assert.That(loggedMessages != null);
@@ -114,18 +113,18 @@ public async Task CanEmit()
             Thread.CurrentPrincipal = principalMock;
 
             // Act
-            await sink.EmitBatchAsync(new List<LogEvent>
-            {
+            await sink.EmitBatchAsync(
+            [
                 new(
                     Now,
                     LogEventLevel.Error,
                     exception,
-                    new MessageTemplate("Simple test", new List<MessageTemplateToken>()), new List<LogEventProperty>
-                    {
+                    new MessageTemplate("Simple test", []),
+                    [
                         new("name", new ScalarValue("value"))
-                    }
+                    ]
                 )
-            });
+            ]);
 
             // Assert
             Assert.That(loggedMessages != null);
@@ -153,10 +152,10 @@ public async Task CanEmitApplicationFromOptions()
             var sink = new ElmahIoSink(new ElmahIoSinkOptions(string.Empty, Guid.Empty) { Application = "MyApp" }, clientMock);
 
             // Act
-            await sink.EmitBatchAsync(new List<LogEvent>
-            {
-                new(Now, LogEventLevel.Information, null, new MessageTemplate("Hello World", new List<MessageTemplateToken>()), new List<LogEventProperty>())
-            });
+            await sink.EmitBatchAsync(
+            [
+                new(Now, LogEventLevel.Information, null, new MessageTemplate("Hello World", []), [])
+            ]);
 
             // Assert
             Assert.That(loggedMessages != null);
@@ -172,18 +171,18 @@ public async Task CanEmitCategoryFromSourceContext()
             var sink = new ElmahIoSink(new ElmahIoSinkOptions(string.Empty, Guid.Empty), clientMock);
 
             // Act
-            await sink.EmitBatchAsync(new List<LogEvent>
-            {
+            await sink.EmitBatchAsync(
+            [
                 new(
                     Now,
                     LogEventLevel.Error,
                     null,
-                    new MessageTemplate("Test", new List<MessageTemplateToken>()), new List<LogEventProperty>
-                    {
+                    new MessageTemplate("Test", []),
+                    [
                         new("SourceContext", new ScalarValue("category")),
-                    }
+                    ]
                 )
-            });
+            ]);
 
             // Assert
             Assert.That(loggedMessages != null);
@@ -205,10 +204,10 @@ public async Task CanFilterBatchFromOptions()
             var sink = new ElmahIoSink(options);
 
             // Act
-            await sink.EmitBatchAsync(new List<LogEvent>
-            {
-                new(Now, LogEventLevel.Error, null, new MessageTemplate("Test1", new List<MessageTemplateToken>()), new List<LogEventProperty>())
-            });
+            await sink.EmitBatchAsync(
+            [
+                new(Now, LogEventLevel.Error, null, new MessageTemplate("Test1", []), [])
+            ]);
 
             // Assert
             Assert.That(messages, Is.EqualTo(0));