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

src/Applications/ACATApp/Program.cs

@@ -22,10 +22,10 @@
 using ACAT.Extension;
 using ACAT.Extension.CommandHandlers;
 using ACATResources;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Windows.Forms;
-using System.Windows.Navigation;
 
 namespace ACATApp
 {
@@ -36,8 +36,9 @@ namespace ACATApp
     internal static class Program
     {
         private static Splash splash = null;
-        private static Microsoft.Extensions.Logging.ILoggerFactory modernLoggingFactory = null;
+        private static ILoggerFactory modernLoggingFactory = null;
         private static ILogger _logger;
+        private static IServiceProvider _serviceProvider;
 
         /// <summary>
         /// The main entry point for the application.
@@ -56,6 +57,7 @@ public static void Main(string[] args)
             InitializeGlobals();
             InitializeUser();
             InitializeLogging();
+            InitializeDependencyInjection();
             InitializeContext();
 
             if (!PerformOnboarding())
@@ -101,14 +103,31 @@ private static void InitializeLogging()
         {
             // Initialize legacy logging
             Log.SetupListeners();
-            
-            // Initialize modern logging infrastructure (ticket #3)
+
+            // Initialize modern logging infrastructure
             modernLoggingFactory = LoggingConfiguration.CreateLoggerFactory();
             _logger = modernLoggingFactory.CreateLogger(typeof(Program));
 
             _logger.LogDebug("ACAT Dashboard Application Launch");
         }
 
+        private static void InitializeDependencyInjection()
+        {
+            // Set up dependency injection for extension instantiation
+            var services = new ServiceCollection();
+
+            // Add logging (reuse existing factory)
+            services.AddSingleton<ILoggerFactory>(modernLoggingFactory);
+            services.AddLogging();
+
+            _serviceProvider = services.BuildServiceProvider();
+
+            // Make service provider available to Context for extension loading
+            Context.ServiceProvider = _serviceProvider;
+
+            _logger.LogDebug("Dependency injection initialized");
+        }
+
         private static void InitializeUser()
         {
             AppCommon.SetUserName();
@@ -213,7 +232,7 @@ private static void ShutdownApplication()
             Context.Dispose();
             Common.Uninit();
             CloseSplashScreen();
-            _logger.LogDebug("ACATTalk Application shutdown");
+            _logger.LogDebug("ACAT Dashboard Application shutdown");
             Log.Close();
             modernLoggingFactory?.Dispose();
             AppCommon.OnExit();

src/Applications/ACATConfigNext/Forms/SettingsForm.cs

@@ -6,6 +6,7 @@
 using ACAT.Core.WidgetManagement;
 using ACAT.Extension;
 using ACATConfigNext.UserControls;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -20,6 +21,7 @@ namespace ACATConfigNext.Forms
     public class SettingsForm : Form
     {
         private readonly ILogger<SettingsForm> _logger;
+        private readonly IServiceProvider _serviceProvider;
         private TableLayoutPanel basePanel;
         private FlowLayoutPanel leftPanel;
         private TableLayoutPanel navPanel;
@@ -42,13 +44,13 @@ public class SettingsForm : Form
 
         private bool _isDirty = false;
 
-        public SettingsForm(ILogger<SettingsForm> logger)
+        public SettingsForm(ILogger<SettingsForm> logger, IServiceProvider serviceProvider)
         {
             _logger = logger;
+            _serviceProvider = serviceProvider;
             WpfInitializationHelper.EnsureApplicationResources();
 
             InitializeComponent();
-
         }
 
         private FlowLayoutPanel CreateLeftPanel() 
@@ -159,7 +161,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);
             }
@@ -410,6 +412,12 @@ private void CopyPreferencesValues(IPreferences source, IPreferences target)
             }
         }
 
+        private object CreateExtensionInstance(Type type)
+        {
+            // Use shared helper method for consistent extension instantiation across all applications
+            return ExtensionHelper.CreateExtensionInstance(_serviceProvider, type, _logger);
+        }
+
 
         private IEnumerable<IExtension> LoadSettings(string category)
         {
@@ -431,7 +439,7 @@ private IEnumerable<IExtension> LoadSettings(string category)
                     {
                         var wordPredictorTypes = Context.AppWordPredictionManager.WordPredictorExtensions;
                         var wordPredictorExtensions = wordPredictorTypes
-                            .Select(type => Activator.CreateInstance(type) as IExtension)
+                            .Select(type => CreateExtensionInstance(type) as IExtension)
                             .Where(instance => instance != null);
                         return wordPredictorExtensions;
 
@@ -443,7 +451,7 @@ private IEnumerable<IExtension> LoadSettings(string category)
                     {
                         var ttsEngineTypes = Context.AppTTSManager.GetExtensions();
                         var ttsExtensions = ttsEngineTypes
-                            .Select(type => Activator.CreateInstance(type) as IExtension)
+                            .Select(type => CreateExtensionInstance(type) as IExtension)
                             .Where(instance => instance != null);
                         return ttsExtensions;
                     }

src/Applications/ACATConfigNext/Program.cs

@@ -1,4 +1,6 @@
 using ACATConfigNext.Forms;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Windows.Forms;
 
@@ -15,7 +17,27 @@ static void Main()
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
 
-            Application.Run(new SettingsForm());
+            // Set up dependency injection
+            var services = new ServiceCollection();
+            ConfigureServices(services);
+            var serviceProvider = services.BuildServiceProvider();
+
+            // Get SettingsForm from DI container
+            var settingsForm = serviceProvider.GetRequiredService<SettingsForm>();
+            Application.Run(settingsForm);
+        }
+
+        private static void ConfigureServices(IServiceCollection services)
+        {
+            // Configure logging
+            services.AddLogging(builder =>
+            {
+                builder.AddConsole();
+                builder.SetMinimumLevel(LogLevel.Information);
+            });
+
+            // Register SettingsForm - IServiceProvider will be injected automatically
+            services.AddTransient<SettingsForm>();
         }
     }
 }

src/Applications/ACATTalk/Program.cs

@@ -22,6 +22,7 @@
 using ACAT.Extension;
 using ACAT.Extension.CommandHandlers;
 using ACATResources;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Windows.Forms;
@@ -34,7 +35,9 @@ namespace ACATTalk
     internal static class Program
     {
         private static Splash splash = null;
+        private static ILoggerFactory modernLoggingFactory = null;
         private static ILogger _logger;
+        private static IServiceProvider _serviceProvider;
 
         /// <summary>
         /// The main entry point for the application.
@@ -50,11 +53,6 @@ public static void Main(string[] args)
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
 
-            //if (!AppCommon.CheckFontsInstalled())
-            //{
-            //    return;
-            //}
-
             CoreGlobals.AppId = "ACATTalk";
             CoreGlobals.ACATUserGuideFileName = "ACAT User Guide.pdf";
             FatalErrorHandler.EvtFatalError += CoreGlobals_EvtFatalError;
@@ -66,8 +64,6 @@ public static void Main(string[] args)
             AppCommon.SetUserName();
             AppCommon.SetProfileName();
 
-            bool freshInstallForUser = !UserManager.UserExists(UserManager.CurrentUser);
-
             if (!AppCommon.CreateUserAndProfile())
             {
                 return;
@@ -91,12 +87,17 @@ public static void Main(string[] args)
             // Initialize legacy logging system
             Log.SetupListeners();
 
-            // Initialize modern logging infrastructure (ticket #3)
-            var modernLoggingFactory = LoggingConfiguration.CreateLoggerFactory();
+            // Initialize modern logging infrastructure FIRST - before anything else needs it
+            modernLoggingFactory = LoggingConfiguration.CreateLoggerFactory();
+            LogManager.Initialize(modernLoggingFactory);  // Initialize global logger manager
+
             _logger = modernLoggingFactory.CreateLogger(typeof(Program));
 
             _logger.LogDebug("ACAT Talk Application Launch");
 
+            // Set up dependency injection for extension instantiation
+            InitializeDependencyInjection();
+
             AuditLog.Audit(new AuditEvent("Application", "start"));
 
             CommandDescriptors.Init();
@@ -193,7 +194,6 @@ public static void Main(string[] args)
 
                 Common.Uninit();
 
-
                 splash?.Close();
                 splash = null;
 
@@ -211,6 +211,23 @@ public static void Main(string[] args)
             AppCommon.OnExit();
         }
 
+        private static void InitializeDependencyInjection()
+        {
+            // Set up dependency injection for extension instantiation
+            var services = new ServiceCollection();
+
+            // Add logging (reuse existing factory)
+            services.AddSingleton<ILoggerFactory>(modernLoggingFactory);
+            services.AddLogging();
+
+            _serviceProvider = services.BuildServiceProvider();
+
+            // Make service provider available to Context for extension loading
+            Context.ServiceProvider = _serviceProvider;
+
+            _logger.LogDebug("Dependency injection initialized");
+        }
+
         /// <summary>
         /// A fatal error has occurred.  Try and gracefully exit ACAT
         /// </summary>
@@ -219,7 +236,6 @@ private static void CoreGlobals_EvtFatalError(string reason)
         {
             splash?.Close();
 
-
             if (Context.AppPanelManager != null && Context.AppPanelManager.GetCurrentForm() != null &&
                 Context.AppPanelManager.GetCurrentForm().PanelCommon != null && Context.AppPanelManager.GetCurrentForm().PanelCommon.RootWidget != null)
             {

src/Applications/AppCommon/ExtensionHelper.cs

@@ -0,0 +1,46 @@
+using ACAT.Core.Extensions;
+using ACAT.Core.Utility;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+
+namespace ACAT.Applications
+{
+    /// <summary>
+    /// Helper class for creating extension instances with proper dependency injection
+    /// Wrapper around ExtensionInstantiator from ACAT.Core for backward compatibility
+    /// </summary>
+    public static class ExtensionHelper
+    {
+        /// <summary>
+        /// Creates instances of extension types using dependency injection.
+        /// This ensures extensions receive proper logger instances and other registered services.
+        /// </summary>
+        /// <param name="serviceProvider">The service provider for dependency resolution</param>
+        /// <param name="extensionTypes">Collection of extension types to instantiate</param>
+        /// <param name="logger">Optional logger for diagnostics</param>
+        /// <returns>Collection of successfully created extension instances</returns>
+        public static IEnumerable<IExtension> CreateExtensionInstances(
+            IServiceProvider serviceProvider,
+            IEnumerable<Type> extensionTypes,
+            ILogger logger = null)
+        {
+            return ExtensionInstantiator.CreateExtensionInstances(serviceProvider, extensionTypes, logger);
+        }
+
+        /// <summary>
+        /// Creates a single extension instance using dependency injection
+        /// </summary>
+        /// <param name="serviceProvider">The service provider for dependency resolution</param>
+        /// <param name="extensionType">The extension type to instantiate</param>
+        /// <param name="logger">Optional logger for diagnostics</param>
+        /// <returns>The created extension instance, or null if creation fails</returns>
+        public static IExtension CreateExtensionInstance(
+            IServiceProvider serviceProvider,
+            Type extensionType,
+            ILogger logger = null)
+        {
+            return ExtensionInstantiator.CreateExtensionInstance(serviceProvider, extensionType, logger) as IExtension;
+        }
+    }
+}

src/Applications/AppCommon/Onboarding.cs

@@ -50,7 +50,7 @@ public static bool DoOnboarding()
 
         public static bool ResetAllPreferences(List<PreferencesCategory> currentCategory)
         {
-            var logger = LoggingConfiguration.CreateLogger(typeof(AppCommon));
+            var logger = LoggingConfiguration.CreateLogger<AppCommon>();
             try
             {
                 // Reset general preferences  
@@ -91,7 +91,7 @@ public static bool ResetAllPreferences(List<PreferencesCategory> currentCategory
 
         private static void CopyPreferencesValues(IPreferences source, IPreferences target)
         {
-            var logger = LoggingConfiguration.CreateLogger(typeof(AppCommon));
+            var logger = LoggingConfiguration.CreateLogger<AppCommon>();
             var sourceType = source.GetType();
             var targetType = target.GetType();
 

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"))
             {