Complete logging migration from static Log.* to ILogger<T> dependency injection

src/Applications/ACATConfigNext/Forms/SettingsForm.cs

@@ -159,7 +159,7 @@ private void ButtonClicked_Save(object sender, EventArgs e)
             }
             catch (Exception ex)
             {
-                Log.Exception(ex);
+                _logger.LogError(ex, "Error occurred while saving settings");
                 MessageBox.Show("An error occurred while saving settings.", "Save Error",
                     MessageBoxButtons.OK, MessageBoxIcon.Error);
             }

src/Extensions/ACAT.Extensions.Onboarding/Onboarding/OnboardingLanguageSelect.cs

@@ -9,6 +9,7 @@
 using ACAT.Extensions.Onboarding.UI.UserControls;
 using ACAT.Extensions.Onboarding.UI;
 using ACAT.Core.CoreInterfaces;
+using Microsoft.Extensions.Logging;
 using System.Globalization;
 
 namespace ACAT.Extensions.Onboarding.Onboarding
@@ -25,8 +26,14 @@ public class OnboardingLanguageSelect : OnboardingExtensionBase
         // TODO - Localize Me
         private const string Step1 = "STEP 1";
 
+        private readonly ILogger<OnboardingLanguageSelect> _logger;
         private IOnboardingWizard _wizard;
 
+        public OnboardingLanguageSelect()
+        {
+            _logger = LoggingConfiguration.CreateLogger<OnboardingLanguageSelect>();
+        }
+
         public override ClassDescriptorAttribute Descriptor
         {
             get { return ClassDescriptorAttribute.GetDescriptor(GetType()); }
@@ -85,7 +92,7 @@ public override void OnEndStep(IOnboardingUserControl userControl, Reason reason
             {
                 case Step1:
                     var cultureInfo = userControlLang.currentCulture;
-                    Log.Debug ("User selected language: " + cultureInfo.DisplayName);
+                    _logger.LogDebug("User selected language: {LanguageName}", cultureInfo.DisplayName);
 
                     CoreGlobals.AppPreferences.Language = cultureInfo.TwoLetterISOLanguageName;
                     CoreGlobals.AppPreferences.Save();

src/Extensions/ACAT.Extensions.Onboarding/UI/UserControls/UserControlHardwareSwitchSetup.cs

@@ -481,7 +481,7 @@ private void UserControlHardwareSwitchSetup_Load(object sender, EventArgs e)
             }
 
             String html = String.Format(_htmlTemplate, headStyle, bodyStyle, textStyle, "Click <a href=" + HtmlUtils.EncodeString(CoreGlobals.ACATUserGuideFileName) + "#" + bookmark + ">here</a> for help");
-            Log.Debug(html);
+            _logger.LogDebug("Generated HTML: {Html}", html);
 
             webBrowser.DocumentText = html;
             //webBrowser.DocumentText =

src/Extensions/ACAT.Extensions.Onboarding/UI/UserControls/UserControlHardwareSwitchTest.cs

@@ -334,7 +334,7 @@ private void WebBrowser_Navigating(object sender, WebBrowserNavigatingEventArgs
         {
             var str = e.Url.ToString();
 
-            Log.Debug("Url is [" + str + "]");
+            _logger.LogDebug("Url is [{Url}]", str);
 
             if (str.ToLower().Contains("blank"))
             {

src/Extensions/ACAT.Extensions.UI/UserControls/Toolbars/LargeToolbarUserControl.cs

@@ -1,6 +1,7 @@
 using ACAT.Core.Utility;
 using ACAT.Core.WidgetManagement;
 using ACAT.Extension.UI.UserControls;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -13,6 +14,7 @@ namespace ACAT.Extensions.UI.UserControls.Toolbars
     [DesignerCategory("code")]
     public abstract class LargeToolbarUserControl : KeyboardUserControl
     {
+        private readonly ILogger<LargeToolbarUserControl> _logger;
         private readonly TableLayoutPanel ToolbarBox = new()
         {
             Name = "ToolbarBox",
@@ -55,6 +57,7 @@ protected class ButtonSpec
         }
         public LargeToolbarUserControl(string name)
         {
+            _logger = LoggingConfiguration.CreateLogger<LargeToolbarUserControl>();
             Name = name;
             InitializeButtonsList();
             InitializeComponent();
@@ -154,7 +157,7 @@ protected virtual void InitializeComponent()
 
         protected override void OnPaint(PaintEventArgs e)
         {
-            Log.Debug($"{e.Graphics.DpiX} x {e.Graphics.DpiY}");
+            _logger.LogDebug("{DpiX} x {DpiY}", e.Graphics.DpiX, e.Graphics.DpiY);
 
             e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit;
             base.OnPaint(e);

src/Extensions/ACAT.Extensions.UI/UserControls/Toolbars/LaunchAppUserControl.cs

@@ -1,6 +1,7 @@
 using ACAT.Core.PanelManagement;
 using ACAT.Core.Utility;
 using ACAT.Core.WidgetManagement;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -14,6 +15,8 @@ namespace ACAT.Extensions.UI.UserControls.Toolbars
     [DesignerCategory("code")]
     public class LaunchAppUserControl : LargeToolbarUserControl
     {
+        private static readonly ILogger<LaunchAppUserControl> _logger = LoggingConfiguration.CreateLogger<LaunchAppUserControl>();
+
         private class LaunchButtonSpec : ButtonSpec
         {
             public AppInfo AppInfo { get; set; }
@@ -51,7 +54,7 @@ public LaunchAppUserControl() : base("LaunchAppUserControl")
         public override void OnButtonClicked(object s, EventArgs e)
         {
             string buttonName = e.ToString();
-            Log.Info($"Button clicked: {buttonName}");
+            _logger.LogInformation("Button clicked: {ButtonName}", buttonName);
 
             var dict = Buttons.ToDictionary(x => x.Name);
 

src/Extensions/BCI/ACAT.Extensions.BCI.UI/Scanners/TalkApplicationBCIScanner.cs

@@ -34,6 +34,7 @@
 using ACAT.Extensions.BCI.Common.BCIInterfaceUtilities;
 using ACAT.Extensions.BCI.UI.UserControls;
 using ACATResources;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -65,6 +66,11 @@ public partial class TalkApplicationBCIScanner : Form, IScannerPanel, ISupportsS
         /// </summary>
         private readonly Dispatcher _dispatcher;
 
+        /// <summary>
+        /// Logger instance for this class
+        /// </summary>
+        private readonly ILogger<TalkApplicationBCIScanner> _logger;
+
         /// <summary>
         /// The AlphabetScannerCommon object. Has a number of
         /// helper functions
@@ -187,8 +193,9 @@ public partial class TalkApplicationBCIScanner : Form, IScannerPanel, ISupportsS
         /// <summary>
         /// Initializes a new instance of the class.
         /// </summary>
-        public TalkApplicationBCIScanner()
+        public TalkApplicationBCIScanner(ILogger<TalkApplicationBCIScanner> logger = null)
         {
+            _logger = logger;
             _scannerCommon = new ScannerCommon(this);
             InitializeComponent();
             this.DoubleBuffered = true;
@@ -737,7 +744,7 @@ private void BciActuator_EvtIoctlResponse(int opcode, object response)
                     {
                         if (!_RequestCalibration)//have a delay before start typing so the user can see the options and suggestions and start looking where is desired
                         {
-                            Log.Debug("BCI LOG | Delay before Typing ");//Run the delay in another therad to avoid blocking the UI
+                            _logger?.LogDebug("BCI LOG | Delay before Typing ");//Run the delay in another therad to avoid blocking the UI
                             _ = ShowTimedMessageBoxAsync().ConfigureAwait(false);
                         }
                         else
@@ -752,14 +759,14 @@ private void BciActuator_EvtIoctlResponse(int opcode, object response)
                     if (_BCIState == BCIState.BCIStartSession)
                     {
                         _BCIState = BCIState.BCIInitDone;
-                        Log.Debug("BCI LOG | BCI Init state: " + BCIState.BCIInitDone);
+                        _logger?.LogDebug("BCI LOG | BCI Init state: {State}", BCIState.BCIInitDone);
                     }
                     break;
 
                 case (int)OpCodes.SendCalibrationStatus:
                     //STEP - 1
                     var bciCalibrationStatus = response as BCICalibrationStatus;
-                    Log.Debug("BCI LOG | bciCalibrationStatus.OkToGoToTyping: " + bciCalibrationStatus.OkToGoToTyping);
+                    _logger?.LogDebug("BCI LOG | bciCalibrationStatus.OkToGoToTyping: {OkToGoToTyping}", bciCalibrationStatus.OkToGoToTyping);
                     if (_ShowMainOptions)//This window should only display once
                     {
                         _ShowMainOptions = false;
@@ -988,7 +995,7 @@ private void BCIShowRecalibrationWindowMessage()
             }
             catch (Exception es)
             {
-                Log.Exception("BCI LOG | " + es.Message.ToString());
+                _logger?.LogError("BCI LOG | {Message}", es.Message.ToString());
             }
         }
 
@@ -1006,40 +1013,40 @@ private void BCIUpdateBCI(BCIState bCIState)
                         break;
 
                     case BCIState.UIRefresh://1 Init state
-                        Log.Debug("BCI LOG | BCI Init state: " + BCIState.UIRefresh);
+                        _logger?.LogDebug("BCI LOG | BCI Init state: {State}", BCIState.UIRefresh);
                         _BCIState = BCIState.UIRefresh;
                         _ = ControlsUIAdjustment().ConfigureAwait(false);
                         break;
 
                     case BCIState.Initializing://2 Init state
-                        Log.Debug("BCI LOG | BCI Init state: " + BCIState.Initializing);
+                        _logger?.LogDebug("BCI LOG | BCI Init state: {State}", BCIState.Initializing);
                         _BCIState = BCIState.Initializing;
                         _ = InitializeBCI().ConfigureAwait(false);
                         break;
 
                     case BCIState.ReqCalibrationStatus://3 Init state
                         _BCIState = BCIState.ReqCalibrationStatus;
-                        Log.Debug("BCI LOG | BCI Init state: " + BCIState.ReqCalibrationStatus);
+                        _logger?.LogDebug("BCI LOG | BCI Init state: {State}", BCIState.ReqCalibrationStatus);
                         _ = BCIRequestCalibrationStatus().ConfigureAwait(false);
                         break;
 
                     case BCIState.StartBCIReqParams://4 Init state
                         //STEP - 4
-                        Log.Debug("BCI LOG | BCI Init state: " + BCIState.StartBCIReqParams);
+                        _logger?.LogDebug("BCI LOG | BCI Init state: {State}", BCIState.StartBCIReqParams);
                         _BCIState = BCIState.StartBCIReqParams;
                         _ = BCIStartBCIReqParams().ConfigureAwait(false);
                         break;
 
                     case BCIState.BCIStartSession://5 Init state
-                        Log.Debug("BCI LOG | BCI Init state: " + BCIState.BCIStartSession);
+                        _logger?.LogDebug("BCI LOG | BCI Init state: {State}", BCIState.BCIStartSession);
                         _BCIState = BCIState.BCIStartSession;
                         _ = BCIStartSession().ConfigureAwait(false);
                         break;
                 }
             }
             catch (Exception ex)
             {
-                Log.Exception("BCI LOG | Error in BCI Init state: " + bCIState + "  Messagge: " + ex.Message);
+                _logger?.LogError("BCI LOG | Error in BCI Init state: {State} Message: {Message}", bCIState, ex.Message);
             }
         }
 
@@ -1129,7 +1136,7 @@ private void ExitApplication()
             }
             catch (Exception e)
             {
-                Log.Exception("BCI LOG | Error in ExitApplication() BCI: " + e.Message);
+                _logger?.LogError("BCI LOG | Error in ExitApplication() BCI: {Message}", e.Message);
             }
         }
 
@@ -1250,8 +1257,8 @@ private void LearnCannedPhrases(string textToLearn)
         private void LogAssemblyVersion()
         {
             var version = ACATPreferences.ApplicationAssembly.GetName().Version.Major + "." + ACATPreferences.ApplicationAssembly.GetName().Version.Minor;
-            Log.Debug("BCI LOG | ACAT - Assembly version info");
-            Log.Debug("BCI LOG | AssemblyVersion: " + version);
+            _logger?.LogDebug("BCI LOG | ACAT - Assembly version info");
+            _logger?.LogDebug("BCI LOG | AssemblyVersion: {Version}", version);
         }
 
         /// <summary>
@@ -1348,7 +1355,7 @@ private void SetCaretPositionForTextBoxUC(UserControl userControl, Control panel
                         if (BCIInterfaceUtils.GetCaretPositionOfTextBoxUC() != currentCaretPosition)
                         {
                             Windows.SetCaretPosition(_textBoxTalkWindow, BCIInterfaceUtils.GetCaretPositionOfTextBoxUC());
-                            Log.Debug("BCI LOG | Caret position reestablish | Textbox user control changed");
+                            _logger?.LogDebug("BCI LOG | Caret position reestablish | Textbox user control changed");
                         }
                     }
                 }
@@ -1359,14 +1366,14 @@ private void SetCaretPositionForTextBoxUC(UserControl userControl, Control panel
                         if (BCIInterfaceUtils.GetCaretPhrasePositionOfTextBoxUC() != currentCaretPosition)
                         {
                             Windows.SetCaretPosition(_textBoxTalkWindow, BCIInterfaceUtils.GetCaretPhrasePositionOfTextBoxUC());
-                            Log.Debug("BCI LOG | Caret position reestablish | Textbox user control changed");
+                            _logger?.LogDebug("BCI LOG | Caret position reestablish | Textbox user control changed");
                         }
                     }
                 }
             }
             catch (Exception ex)
             {
-                Log.Debug("BCI LOG | Error | SetCaretPositionForTextBoxUC: " + ex.Message);
+                _logger?.LogDebug("BCI LOG | Error | SetCaretPositionForTextBoxUC: {Message}", ex.Message);
             }
         }
 
@@ -1540,7 +1547,7 @@ private void TextBoxTalkWindowOnKeyPress(object sender, KeyPressEventArgs keyPre
             }
             catch (Exception ex)
             {
-                Log.Exception(ex);
+                _logger?.LogError(ex, ex.Message);
             }
         }
 
@@ -1552,9 +1559,9 @@ private void TextToSpeech(String text)
         {
             if (!String.IsNullOrEmpty(text))
             {
-                Log.Debug("*** TTS *** : " + text);
+                _logger?.LogDebug("*** TTS *** : {Text}", text);
                 TTSManager.Instance.ActiveEngine.Speak(text);
-                Log.Debug("*** TTS *** : sent text!");
+                _logger?.LogDebug("*** TTS *** : sent text!");
 
                 AuditLog.Audit(new AuditEventTextToSpeech(TTSManager.Instance.ActiveEngine.Descriptor.Name));
             }
@@ -1660,7 +1667,7 @@ public override bool Execute(ref bool handled)
                 {
                     handled = true;
                     List<Widget>[] widgets;
-                    Log.Debug("BCI LOG | Command | selected | Pressed | " + Command.ToString());
+                    _logger?.LogDebug("BCI LOG | Command | selected | Pressed | {Command}", Command.ToString());
                     switch (Command)
                     {
                         case "CmdEditScanner":
@@ -1871,7 +1878,7 @@ public override bool Execute(ref bool handled)
                     }
                 }
                 else
-                    Log.Debug("BCI LOG | Command | selected | Pressed in calibration | No action | " + Command.ToString());
+                    _logger?.LogDebug("BCI LOG | Command | selected | Pressed in calibration | No action | {Command}", Command.ToString());
                 return true;
             }
         }