fixed remaining warnings

Author: FreeAndNil

src/log4net.Tests/Appender/AdoNet/Log4NetCommand.cs

@@ -24,7 +24,7 @@
 
 namespace log4net.Tests.Appender.AdoNet;
 
-public class Log4NetCommand : IDbCommand
+internal sealed class Log4NetCommand : IDbCommand
 {
   public Log4NetCommand()
   {
@@ -48,10 +48,7 @@ public int ExecuteNonQuery()
 
   public int ExecuteNonQueryCount { get; private set; }
 
-  public IDbDataParameter CreateParameter()
-  {
-    return new Log4NetParameter();
-  }
+  public IDbDataParameter CreateParameter() => new Log4NetParameter();
 
 #pragma warning disable CS8766 // Nullability of reference types in return type doesn't match implicitly implemented member (possibly because of nullability attributes).
   public string? CommandText { get; set; }
@@ -68,25 +65,13 @@ public void Prepare()
 
   public static Log4NetCommand? MostRecentInstance { get; private set; }
 
-  public void Cancel()
-  {
-    throw new NotImplementedException();
-  }
+  public void Cancel() => throw new NotImplementedException();
 
-  public IDataReader ExecuteReader()
-  {
-    throw new NotImplementedException();
-  }
+  public IDataReader ExecuteReader() => throw new NotImplementedException();
 
-  public IDataReader ExecuteReader(CommandBehavior behavior)
-  {
-    throw new NotImplementedException();
-  }
+  public IDataReader ExecuteReader(CommandBehavior behavior) => throw new NotImplementedException();
 
-  public object ExecuteScalar()
-  {
-    throw new NotImplementedException();
-  }
+  public object ExecuteScalar() => throw new NotImplementedException();
 
   public IDbConnection? Connection
   {

src/log4net.Tests/Appender/AdoNet/Log4NetConnection.cs

@@ -24,59 +24,35 @@
 
 namespace log4net.Tests.Appender.AdoNet;
 
-public class Log4NetConnection : IDbConnection
+internal sealed class Log4NetConnection : IDbConnection
 {
   private bool _open;
 
-  public Log4NetConnection()
-  {
-    MostRecentInstance = this;
-  }
+  public Log4NetConnection() => MostRecentInstance = this;
 
-  public void Close()
-  {
-    _open = false;
-  }
+  public void Close() => _open = false;
 
   public ConnectionState State => _open ? ConnectionState.Open : ConnectionState.Closed;
 
 #pragma warning disable CS8766 // Nullability of reference types in return type doesn't match implicitly implemented member (possibly because of nullability attributes).
   public string? ConnectionString { get; set; }
 #pragma warning restore CS8766
 
-  public IDbTransaction BeginTransaction()
-  {
-    return new Log4NetTransaction();
-  }
+  public IDbTransaction BeginTransaction() => new Log4NetTransaction();
 
-  public IDbCommand CreateCommand()
-  {
-    return new Log4NetCommand();
-  }
+  public IDbCommand CreateCommand() => new Log4NetCommand();
 
-  public void Open()
-  {
-    _open = true;
-  }
+  public void Open() => _open = true;
 
   public static Log4NetConnection? MostRecentInstance { get; private set; }
 
-  public IDbTransaction BeginTransaction(IsolationLevel il)
-  {
-    throw new NotImplementedException();
-  }
+  public IDbTransaction BeginTransaction(IsolationLevel il) => throw new NotImplementedException();
 
-  public void ChangeDatabase(string databaseName)
-  {
-    throw new NotImplementedException();
-  }
+  public void ChangeDatabase(string databaseName) => throw new NotImplementedException();
 
   public int ConnectionTimeout => throw new NotImplementedException();
 
   public string Database => throw new NotImplementedException();
 
-  public void Dispose()
-  {
-    throw new NotImplementedException();
-  }
+  public void Dispose() => throw new NotImplementedException();
 }

src/log4net.Tests/Appender/AdoNet/Log4NetParameterCollection.cs

@@ -26,7 +26,7 @@
 
 namespace log4net.Tests.Appender.AdoNet;
 
-public class Log4NetParameterCollection : CollectionBase, IDataParameterCollection
+internal sealed class Log4NetParameterCollection : CollectionBase, IDataParameterCollection
 {
   private readonly Dictionary<string, int> _parameterNameToIndex = new(StringComparer.Ordinal);
 
@@ -55,13 +55,7 @@ public object this[string parameterName]
     set => InnerList[IndexOf(parameterName)] = value;
   }
 
-  public void RemoveAt(string parameterName)
-  {
-    throw new NotImplementedException();
-  }
+  public void RemoveAt(string parameterName) => throw new NotImplementedException();
 
-  public bool Contains(string parameterName)
-  {
-    throw new NotImplementedException();
-  }
+  public bool Contains(string parameterName) => throw new NotImplementedException();
 }

src/log4net.Tests/Appender/AdoNet/Log4NetTransaction.cs

@@ -24,7 +24,7 @@
 
 namespace log4net.Tests.Appender.AdoNet;
 
-public class Log4NetTransaction : IDbTransaction
+internal sealed class Log4NetTransaction : IDbTransaction
 {
   public void Commit()
   {
@@ -40,8 +40,5 @@ public void Rollback()
 
   public IsolationLevel IsolationLevel => throw new NotImplementedException();
 
-  public void Dispose()
-  {
-    throw new NotImplementedException();
-  }
+  public void Dispose() => throw new NotImplementedException();
 }

src/log4net.Tests/Appender/CountingAppender.cs

@@ -44,17 +44,11 @@ public class CountingAppender : AppenderSkeleton
   /// <summary>
   /// Reset the counter to zero
   /// </summary>
-  public void ResetCounter()
-  {
-    Counter = 0;
-  }
+  public void ResetCounter() => Counter = 0;
 
   /// <summary>
   /// Registers how many times the method has been called.
   /// </summary>
-  /// <param name="logEvent">The logging event.</param>
-  protected override void Append(LoggingEvent logEvent)
-  {
-    Counter++;
-  }
-}
+  /// <param name="loggingEvent">The logging event.</param>
+  protected override void Append(LoggingEvent loggingEvent) => Counter++;
+}

src/log4net.Tests/Appender/EventRaisingAppender.cs

@@ -27,20 +27,9 @@ namespace log4net.Tests.Appender;
 /// <summary>
 /// Provides data for the <see cref="EventRaisingAppender.LoggingEventAppended"/> event.
 /// </summary>
-/// <seealso cref="System.EventArgs" />
-public class LoggingEventEventArgs : EventArgs
+public class LoggingEventEventArgs(LoggingEvent loggingEvent) : EventArgs
 {
-  public LoggingEvent LoggingEvent { get; private set; }
-
-  public LoggingEventEventArgs(LoggingEvent loggingEvent)
-  {
-    if (loggingEvent is null)
-    {
-      throw new ArgumentNullException(nameof(loggingEvent));
-    }
-
-    LoggingEvent = loggingEvent;
-  }
+  public LoggingEvent LoggingEvent { get; } = loggingEvent ?? throw new ArgumentNullException(nameof(loggingEvent));
 }
 
 /// <summary>
@@ -55,18 +44,13 @@ public class EventRaisingAppender : log4net.Appender.IAppender
   public event EventHandler<LoggingEventEventArgs>? LoggingEventAppended;
 
   protected void OnLoggingEventAppended(LoggingEventEventArgs e)
-  {
-    LoggingEventAppended?.Invoke(this, e);
-  }
+    => LoggingEventAppended?.Invoke(this, e);
 
   public void Close()
-  {
-  }
+  { }
 
   public void DoAppend(LoggingEvent loggingEvent)
-  {
-    OnLoggingEventAppended(new LoggingEventEventArgs(loggingEvent));
-  }
+    => OnLoggingEventAppended(new LoggingEventEventArgs(loggingEvent));
 
   public string Name { get; set; } = string.Empty;
-}
+}

src/log4net.Tests/Context/LogicalThreadContextTest.cs

@@ -41,10 +41,7 @@ namespace log4net.Tests.Context;
 public class LogicalThreadContextTest
 {
   [TearDown]
-  public void TearDown()
-  {
-    Utils.RemovePropertyFromAllContexts();
-  }
+  public void TearDown() => Utils.RemovePropertyFromAllContexts();
 
   [Test]
   public void TestLogicalThreadPropertiesPatternBasicGetSet()
@@ -100,7 +97,7 @@ public async Task TestLogicalThreadPropertiesPatternAsyncAwait()
     Assert.That(stringAppender.GetString(), Is.EqualTo(testValueForCurrentContext), "Test logical thread properties value set");
     stringAppender.Reset();
 
-    var strings = await Task.WhenAll(Enumerable.Range(0, 10).Select(x => SomeWorkProperties(x.ToString())));
+    string[] strings = await Task.WhenAll(Enumerable.Range(0, 10).Select(x => SomeWorkProperties(x.ToString()))).ConfigureAwait(false);
 
     // strings should be ["00AA0BB0", "01AA1BB1", "02AA2BB2", ...]
     for (int i = 0; i < strings.Length; i++)
@@ -274,7 +271,7 @@ public async Task TestLogicalThreadStackPatternAsyncAwait()
       Assert.That(stringAppender.GetString(), Is.EqualTo(testValueForCurrentContext), "Test logical thread stack value set");
       stringAppender.Reset();
 
-      strings = await Task.WhenAll(Enumerable.Range(0, 10).Select(x => SomeWorkStack(x.ToString())));
+      strings = await Task.WhenAll(Enumerable.Range(0, 10).Select(x => SomeWorkStack(x.ToString()))).ConfigureAwait(false);
     }
 
     // strings should be ["Outer 0 AOuter 0 AOuter 0Outer 0 BOuter 0 B Outer 0", ...]
@@ -305,9 +302,9 @@ static async Task<string> SomeWorkProperties(string propertyName)
     LogicalThreadContext.Properties[Utils.PropertyKey] = propertyName;
     log.Info("TestMessage");
 
-    await MoreWorkProperties(log, "A");
+    await MoreWorkProperties(log, "A").ConfigureAwait(false);
     log.Info("TestMessage");
-    await MoreWorkProperties(log, "B");
+    await MoreWorkProperties(log, "B").ConfigureAwait(false);
     log.Info("TestMessage");
     return stringAppender.GetString();
   }
@@ -316,7 +313,7 @@ static async Task MoreWorkProperties(ILog log, string propertyName)
   {
     LogicalThreadContext.Properties[Utils.PropertyKey] = propertyName;
     log.Info("TestMessage");
-    await Task.Delay(1);
+    await Task.Delay(1).ConfigureAwait(false);
     log.Info("TestMessage");
   }
 
@@ -338,9 +335,9 @@ private static async Task<string> SomeWorkStack(string stackName)
       Assert.That(stringAppender.GetString(), Is.EqualTo(string.Format("Outer {0}", stackName)), "Test logical thread stack value set");
       stringAppender.Reset();
 
-      await MoreWorkStack(log, "A");
+      await MoreWorkStack(log, "A").ConfigureAwait(false);
       log.Info("TestMessage");
-      await MoreWorkStack(log, "B");
+      await MoreWorkStack(log, "B").ConfigureAwait(false);
       log.Info("TestMessage");
     }
 
@@ -352,7 +349,7 @@ static async Task MoreWorkStack(ILog log, string stackName)
     using (LogicalThreadContext.Stacks[Utils.PropertyKey].Push(stackName))
     {
       log.Info("TestMessage");
-      await Task.Delay(1);
+      await Task.Delay(1).ConfigureAwait(false);
       log.Info("TestMessage");
     }
   }

src/log4net.Tests/Core/EvaluatorTest.cs

@@ -30,6 +30,7 @@
 namespace log4net.Tests.Core;
 
 [TestFixture]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2201:Do not raise reserved exception types")]
 public class EvaluatorTest
 {
   private BufferingForwardingAppender _bufferingForwardingAppender = new();

src/log4net.Tests/Core/LoggingEventTest.cs

@@ -38,6 +38,7 @@ private static readonly DateTime _localTime
 
   [Test]
   [System.Diagnostics.CodeAnalysis.SuppressMessage("Security", "CA2300:Do not use insecure deserializer BinaryFormatter")]
+  [System.Diagnostics.CodeAnalysis.SuppressMessage("Security", "CA2301:Do not use insecure deserializer BinaryFormatter")]
   public void SerializeDeserialize_BinaryFormatter()
   {
     Utils.InconclusiveOnMono();
@@ -88,6 +89,7 @@ public void SerializeDeserialize_BinaryFormatter()
   /// </summary>
   [Test]
   [System.Diagnostics.CodeAnalysis.SuppressMessage("Security", "CA2300:Do not use insecure deserializer BinaryFormatter")]
+  [System.Diagnostics.CodeAnalysis.SuppressMessage("Security", "CA2301:Do not use insecure deserializer BinaryFormatter")]
   public void DeserializeV2()
   {
     Utils.InconclusiveOnMono();

src/log4net.Tests/Core/StringFormatTest.cs

@@ -31,6 +31,7 @@
 namespace log4net.Tests.Core;
 
 [TestFixture]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2201:Do not raise reserved exception types")]
 public class StringFormatTest
 {
   private CultureInfo? _currentCulture;