From bf910b8b35b777dff23ea00a341dd05b47a6c9bd Mon Sep 17 00:00:00 2001
From: Jonathan Horvath <byteme@bytedreamer.com>
Date: Tue, 16 Sep 2025 10:03:53 -0400
Subject: [PATCH] Update ACUConsolePresenter.cs

---
 src/ACUConsole/ACUConsolePresenter.cs | 36 ++++++++++++++-------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/ACUConsole/ACUConsolePresenter.cs b/src/ACUConsole/ACUConsolePresenter.cs
index 5303fa3..13c9a6f 100644
--- a/src/ACUConsole/ACUConsolePresenter.cs
+++ b/src/ACUConsole/ACUConsolePresenter.cs
@@ -133,23 +133,25 @@ private void ConfigureLog4NetForSingleFile()
             // For single-file deployment, use a very basic configuration that avoids Assembly.CodeBase
             try
             {
-                // Use default configuration without specifying repository to avoid Assembly.CodeBase issues
-                var repository = LogManager.CreateRepository(Assembly.GetEntryAssembly(), typeof(log4net.Repository.Hierarchy.Hierarchy));
+                // Use default configuration without specifying a repository to avoid Assembly.CodeBase issues
+                var repository = LogManager.CreateRepository(Assembly.GetEntryAssembly()!, typeof(log4net.Repository.Hierarchy.Hierarchy));
                 ConfigureLog4NetProgrammatically(repository);
             }
             catch
             {
                 // If even this fails, log4net might not work in single-file mode
-                // In this case, logging will simply not work but app won't crash
+                // In this case, logging will simply not work, but app won't crash
                 Console.WriteLine("Warning: Could not initialize logging in single-file mode");
             }
         }
 
         private void ConfigureLog4NetProgrammatically(log4net.Repository.ILoggerRepository repository)
         {
-            // Create appender programmatically to match log4net.config
-            var appender = new ACUConsole.CustomAppender();
-            appender.Layout = new log4net.Layout.PatternLayout("%date | %thread | %-5level | %logger | %message%newline");
+            // Create an appender programmatically to match log4net.config
+            var appender = new CustomAppender
+            {
+                Layout = new log4net.Layout.PatternLayout("%date | %thread | %-5level | %logger | %message%newline")
+            };
             appender.ActivateOptions();
 
             // Configure root logger
@@ -157,7 +159,7 @@ private void ConfigureLog4NetProgrammatically(log4net.Repository.ILoggerReposito
             rootLogger.Level = log4net.Core.Level.All;
             rootLogger.AddAppender(appender);
 
-            // Mark repository as configured
+            // Mark the repository as configured
             ((log4net.Repository.Hierarchy.Hierarchy)repository).Configured = true;
             
             // Set up custom appender to redirect log messages
@@ -220,40 +222,40 @@ private void LoadSettings()
             }
         }
 
-        private Settings GetDefaultSettings()
+        private static Settings GetDefaultSettings()
         {
             return new Settings
             {
-                SerialConnectionSettings = new ACUConsole.Configuration.SerialConnectionSettings
+                SerialConnectionSettings = new SerialConnectionSettings
                 {
                     PortName = "COM4",
                     BaudRate = 9600,
                     ReplyTimeout = 200
                 },
-                TcpServerConnectionSettings = new ACUConsole.Configuration.TcpServerConnectionSettings
+                TcpServerConnectionSettings = new TcpServerConnectionSettings
                 {
                     PortNumber = 5000,
                     BaudRate = 9600,
                     ReplyTimeout = 200
                 },
-                TcpClientConnectionSettings = new ACUConsole.Configuration.TcpClientConnectionSettings
+                TcpClientConnectionSettings = new TcpClientConnectionSettings
                 {
                     Host = "",
                     PortNumber = 5000,
                     BaudRate = 9600,
                     ReplyTimeout = 200
                 },
-                Devices = new List<ACUConsole.Configuration.DeviceSetting>
-                {
-                    new ACUConsole.Configuration.DeviceSetting
+                Devices =
+                [
+                    new DeviceSetting
                     {
                         Name = "Secure",
                         Address = 0,
                         UseSecureChannel = true,
                         UseCrc = true,
-                        SecureChannelKey = ACUConsole.Configuration.DeviceSetting.DefaultKey
+                        SecureChannelKey = DeviceSetting.DefaultKey
                     }
-                },
+                ],
                 PollingInterval = 200,
                 LastFileTransferDirectory = null,
                 IsTracing = false
@@ -859,4 +861,4 @@ public void Dispose()
             _loggerFactory?.Dispose();
         }
     }
-}
\ No newline at end of file
+}