fixed remaining warnings in integration tests

Author: FreeAndNil

.editorconfig

@@ -1,7 +1,4 @@
-indent_style = space
-indent_size = 2
-
-[*.{cs,vb}]
+[*.cs]
 #### Naming styles ####
 
 # Naming rules
@@ -64,6 +61,7 @@ dotnet_naming_style.pascal_case.capitalization = pascal_case
 dotnet_style_operator_placement_when_wrapping = beginning_of_line
 tab_width = 2
 indent_size = 2
+indent_style = space
 end_of_line = crlf
 dotnet_style_coalesce_expression = true:suggestion
 dotnet_style_null_propagation = true:suggestion
@@ -88,20 +86,15 @@ dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
 dotnet_style_allow_multiple_blank_lines_experimental = true:silent
 dotnet_style_allow_statement_immediately_after_block_experimental = true:silent
 dotnet_code_quality_unused_parameters = all:suggestion
-dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
-dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
-dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
 dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
 dotnet_style_qualification_for_field = false:silent
 dotnet_style_qualification_for_property = false:silent
 dotnet_style_qualification_for_method = false:silent
 dotnet_style_qualification_for_event = false:silent
 
-[*.cs]
 csharp_indent_labels = one_less_than_current
 csharp_using_directive_placement = outside_namespace:silent
 csharp_prefer_simple_using_statement = true:suggestion
-csharp_prefer_braces = true:suggestion
 csharp_style_namespace_declarations = block_scoped:silent
 csharp_style_prefer_method_group_conversion = true:silent
 csharp_style_prefer_top_level_statements = false:silent
@@ -143,9 +136,52 @@ csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
 csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
 csharp_style_prefer_not_pattern = true:suggestion
 csharp_style_prefer_extended_property_pattern = true:suggestion
-csharp_style_var_for_built_in_types = false:silent
-csharp_style_var_when_type_is_apparent = false:silent
-csharp_style_var_elsewhere = false:silent
+
+# Microsoft .NET properties
+csharp_new_line_before_members_in_object_initializers = false
+csharp_preferred_modifier_order = public, private, protected, internal, file, static, volatile, async, sealed, extern, virtual, abstract, new, unsafe, override, readonly, required:suggestion
+csharp_prefer_braces = true:none
+csharp_preserve_single_line_blocks = true
+csharp_style_var_elsewhere = false:suggestion
+csharp_style_var_for_built_in_types = false:suggestion
+csharp_style_var_when_type_is_apparent = false:suggestion
+dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:none
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:none
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:none
+
+# ReSharper properties
+resharper_align_multiline_binary_expressions_chain = false
+resharper_blank_lines_after_block_statements = 0
+resharper_blank_lines_after_start_comment = 0
+resharper_blank_lines_after_using_list = 0
+resharper_blank_lines_around_property = 0
+resharper_blank_lines_around_single_line_local_method = 1
+resharper_braces_redundant = true
+resharper_constructor_or_destructor_body = expression_body
+resharper_csharp_blank_lines_around_field = 0
+resharper_csharp_blank_lines_around_invocable = 0
+resharper_csharp_blank_lines_around_region = 0
+resharper_csharp_blank_lines_inside_region = 0
+resharper_csharp_empty_block_style = together
+resharper_csharp_indent_size = 2
+resharper_csharp_keep_existing_enum_arrangement = false
+resharper_csharp_remove_blank_lines_near_braces_in_declarations = false
+resharper_csharp_wrap_before_binary_opsign = true
+resharper_instance_members_qualify_declared_in = 
+resharper_max_attribute_length_for_same_line = 70
+resharper_method_or_operator_body = expression_body
+resharper_parentheses_redundancy_style = remove
+resharper_place_accessorholder_attribute_on_same_line = false
+resharper_place_expr_accessor_on_single_line = true
+resharper_place_expr_property_on_single_line = true
+resharper_place_field_attribute_on_same_line = false
+resharper_place_simple_initializer_on_single_line = false
+resharper_space_between_attribute_sections = false
+resharper_use_roslyn_logic_for_evident_types = true
+resharper_wrap_after_primary_constructor_declaration_lpar = false
+resharper_wrap_before_arrow_with_expressions = true
+resharper_wrap_object_and_collection_initializer_style = chop_always
+resharper_wrap_primary_constructor_parameters_style = wrap_if_long
 
 # SYSLIB0003: Type or member is obsolete
 dotnet_diagnostic.SYSLIB0003.severity = none

src/integration-testing/log4net-611-lib/DerivedAppender.cs

@@ -1,4 +1,6 @@
-using log4net.Appender;
+using System;
+using System.Diagnostics;
+using log4net.Appender;
 using log4net.Core;
 
 namespace log4net_611_lib;
@@ -7,6 +9,10 @@ public class DerivedAppender : RollingFileAppender
 {
   protected override void Append(LoggingEvent loggingEvent)
   {
+    if (loggingEvent is null)
+    {
+      throw new ArgumentNullException(nameof(loggingEvent));
+    }
     loggingEvent.Properties["appender-class-name"] = nameof(DerivedAppender);
     base.Append(loggingEvent);
   }

src/integration-testing/log4net-672/Program.cs

@@ -70,7 +70,7 @@ int CountIdentifierInLogs(Guid id)
 int CountIdentifierInFile(Guid id, string filePath)
 {
   var contents = File.ReadAllLines(filePath);
-  return contents.Count(line => line.Contains(id.ToString()));
+  return contents.Count(line => line.Contains(id.ToString(), StringComparison.Ordinal));
 }
 
 int LogWith(Guid identifier, int howManyLogs)

src/integration-testing/log4net-673/Program.cs

@@ -4,16 +4,17 @@
 using System.Threading;
 using log4net;
 using log4net.Config;
+using log4net.Repository;
 
-var appPath = new Uri(Assembly.GetExecutingAssembly().Location).LocalPath;
-var appFolder = Path.GetDirectoryName(appPath);
+string appPath = new Uri(Assembly.GetExecutingAssembly().Location).LocalPath;
+string appFolder = Path.GetDirectoryName(appPath);
 // force loading the assembly, otherwise the appender type isn't found later
 if (appFolder is null)
 {
   throw new InvalidOperationException("Can't find myself");
 }
 
-var configFile = Path.Combine(appFolder, "log4net.config");
+string configFile = Path.Combine(appFolder, "log4net.config");
 if (!File.Exists(configFile))
 {
   throw new InvalidOperationException($"log4net.config not found at {configFile}");
@@ -22,28 +23,28 @@
 if (Directory.Exists("log"))
 {
   Console.WriteLine("Clearing out old logs...");
-  foreach (var file in Directory.EnumerateFiles("log"))
+  foreach (string file in Directory.EnumerateFiles("log"))
   {
     File.Delete(file);
   }
 }
 
-var info = new FileInfo(configFile);
-var logRepo = LogManager.GetRepository(Assembly.GetExecutingAssembly());
+FileInfo info = new FileInfo(configFile);
+ILoggerRepository logRepo = LogManager.GetRepository(Assembly.GetExecutingAssembly());
 XmlConfigurator.ConfigureAndWatch(logRepo, info);
 
-var logger = LogManager.GetLogger(typeof(Program));
+ILog logger = LogManager.GetLogger(typeof(Program));
 
 Console.WriteLine("logging...");
-for (var i = 0; i < 10; i++)
+for (int i = 0; i < 10; i++)
 {
   logger.Info($"test log {i}");
   logger.Error($"error log {i}");
   logger.Warn($"warning log {i}");
 }
 
 
-foreach (var file in Directory.EnumerateFiles("log"))
+foreach (string file in Directory.EnumerateFiles("log"))
 {
   Console.WriteLine($"log file: {file}");
   TryDumpFile(file);
@@ -57,14 +58,14 @@ static void TryDumpFile(string at)
     return;
   }
 
-  for (var i = 0; i < 10; i++)
+  for (int i = 0; i < 10; i++)
   {
     try
     {
       Console.WriteLine(File.ReadAllText(at));
       return;
     }
-    catch
+    catch(IOException)
     {
       Thread.Sleep(100);
     }

src/log4net.Tests/Appender/RollingFileAppenderTest.cs

@@ -171,7 +171,7 @@ private static void CreateFile(int fileNumber)
         {
           fileStream.Close();
         }
-        catch (Exception e) when (e is not null)
+        catch (ObjectDisposedException)
         {
           // Ignore
         }
@@ -320,7 +320,7 @@ private RollingFileAppender CreateAppender(FileAppender.LockingModelBase lockMod
   /// Used for test purposes, a table of these objects can be used to identify
   /// any existing files and their expected length.
   /// </summary>
-  private record RollFileEntry(string FileName, long FileLength);
+  private sealed record RollFileEntry(string FileName, long FileLength);
 
   /// <summary>
   /// Used for table-driven testing.  This class holds information that can be used
@@ -334,7 +334,7 @@ private record RollFileEntry(string FileName, long FileLength);
   /// A table of entries showing files that should exist and their expected sizes
   /// after a message is logged
   /// </param>
-  private record RollConditions(IList<RollFileEntry> PreLogFileEntries, IList<RollFileEntry> PostLogFileEntries);
+  private sealed record RollConditions(IList<RollFileEntry> PreLogFileEntries, IList<RollFileEntry> PostLogFileEntries);
 
   private static void VerifyExistenceAndRemoveFromList(List<string> existing,
     string fileName, FileInfo file, RollFileEntry entry)
@@ -481,6 +481,7 @@ private static List<RollFileEntry> MakeBackupFileEntriesFromBackupGroup(
     string backupGroup, 
     int backupFileLength)
   {
+    // ReSharper disable once ArrangeMethodOrOperatorBody
     return backupGroup.Split(' ')
       .Where(file => file.Trim().Length > 0)
       .Select(file => new RollFileEntry(file, backupFileLength))
@@ -527,6 +528,7 @@ private sealed record RollingStats(
     /// <summary>
     /// Number of total bytes a log file can reach.
     /// </summary>
+    // ReSharper disable once MemberHidesStaticFromOuterClass
     public int MaximumFileSize => TotalMessageLength * MessagesPerFile;
 
     /// <summary>

src/log4net.globalconfig

@@ -77,7 +77,7 @@ dotnet_diagnostic.CA1064.severity = warning
 dotnet_diagnostic.CA1066.severity = warning
 
 #CA1303: Do not pass literals as localized parameters
-dotnet_diagnostic.CA1303.severity = warning
+dotnet_diagnostic.CA1303.severity = none
 
 #CA1307: Specify StringComparison for clarity
 dotnet_diagnostic.CA1307.severity = warning
@@ -137,7 +137,7 @@ dotnet_diagnostic.CA1802.severity = warning
 dotnet_diagnostic.CA1810.severity = warning
 
 #CA1812: Avoid uninstantiated internal classes
-dotnet_diagnostic.CA1812.severity = warning
+dotnet_diagnostic.CA1812.severity = none
 
 #CA1813: Avoid unsealed attributes
 dotnet_diagnostic.CA1813.severity = warning