Maui 中使用统一的 IServiceProvider

src/Common.CoreLib/DI.cs

@@ -18,6 +18,17 @@ public static partial class DI
 
     internal static bool IsConfigured => value != null;
 
+    public static void Dispose()
+    {
+        if (value is IDisposable disposable) disposable.Dispose();
+    }
+
+    public static async ValueTask DisposeAsync()
+    {
+        if (value is IAsyncDisposable disposable) await disposable.DisposeAsync();
+        else Dispose();
+    }
+
     /// <summary>
     /// 初始化依赖注入服务组(通过配置服务项的方式)
     /// </summary>

src/ST.Client.CommandLine/CommandLineHost.cs

@@ -9,13 +9,14 @@ namespace System.Application.CommandLine;
 /// <summary>
 /// 命令行工具(Command Line Tools/CLT)
 /// </summary>
-public abstract class CommandLineHost
+public abstract class CommandLineHost : IDisposable
 {
     public const string command_main = "main";
+    bool disposedValue;
 
     protected abstract IApplication.IDesktopProgramHost Host { get; }
 
-    protected abstract void ConfigureServices(IApplication.IStartupArgs args, DILevel level);
+    protected abstract void ConfigureServices(DILevel level);
 
 #if StartWatchTrace
     protected abstract void StartWatchTraceRecord(string? mark = null, bool dispose = false);
@@ -44,7 +45,7 @@ void MainHandler_(Action? onInitStartuped)
 #if StartWatchTrace
             StartWatchTraceRecord("ProcessCheck");
 #endif
-            ConfigureServices(Host, Host.IsMainProcess ? DILevel.MainProcess : DILevel.Min);
+            ConfigureServices(Host.IsMainProcess ? DILevel.MainProcess : DILevel.Min);
 #if StartWatchTrace
             StartWatchTraceRecord("Startup.Init");
 #endif
@@ -166,7 +167,7 @@ void MainHandlerByCLT_(Action? onInitStartuped)
         {
             if (!string.IsNullOrEmpty(account))
             {
-                ConfigureServices(Host, DILevel.Steam);
+                ConfigureServices(DILevel.Steam);
 
                 var steamService = ISteamService.Instance;
 
@@ -198,13 +199,13 @@ void MainHandlerByCLT_(Action? onInitStartuped)
                 if (id <= 0) return;
                 if (!silence)
                 {
-                    ConfigureServices(Host, DILevel.GUI | DILevel.Steam | DILevel.HttpClientFactory);
+                    ConfigureServices(DILevel.GUI | DILevel.Steam | DILevel.HttpClientFactory);
                     IViewModelManager.Instance.InitUnlockAchievement(id);
                     StartApplication(args);
                 }
                 else
                 {
-                    ConfigureServices(Host, DILevel.Steam);
+                    ConfigureServices(DILevel.Steam);
                     SteamConnectService.Current.Initialize(id);
                     TaskCompletionSource tcs = new();
                     await tcs.Task;
@@ -220,4 +221,35 @@ void MainHandlerByCLT_(Action? onInitStartuped)
         var r = rootCommand.InvokeAsync(args).GetAwaiter().GetResult();
         return r;
     }
+
+    protected virtual void Dispose(bool disposing)
+    {
+        if (!disposedValue)
+        {
+            if (disposing)
+            {
+                // TODO: 释放托管状态(托管对象)
+                AppInstance?.Dispose();
+                Application?.Dispose();
+            }
+
+            // TODO: 释放未托管的资源(未托管的对象)并重写终结器
+            // TODO: 将大型字段设置为 null
+            disposedValue = true;
+        }
+    }
+
+    // // TODO: 仅当“Dispose(bool disposing)”拥有用于释放未托管资源的代码时才替代终结器
+    // ~CommandLineHost()
+    // {
+    //     // 不要更改此代码。请将清理代码放入“Dispose(bool disposing)”方法中
+    //     Dispose(disposing: false);
+    // }
+
+    public void Dispose()
+    {
+        // 不要更改此代码。请将清理代码放入“Dispose(bool disposing)”方法中
+        Dispose(disposing: true);
+        GC.SuppressFinalize(this);
+    }
 }

src/ST.Client.Desktop.Avalonia.App/Program.cs

@@ -71,25 +71,8 @@ static int Main(string[] args)
             }
             finally
             {
-                try
-                {
-                    host.Application?.Dispose();
-                }
-                catch
-                {
-
-                }
-                try
-                {
-                    host.AppInstance?.Dispose();
-                }
-                catch
-                {
-
-                }
                 // Ensure to flush and stop internal timers/threads before application-exit (Avoid segmentation fault on Linux)
-                LogManager.Shutdown();
-                ArchiSteamFarm.LogManager.Shutdown();
+                DI.Dispose();
             }
         }
 

src/ST.Client.Desktop.Avalonia.App/Program.shared.cs

@@ -33,7 +33,7 @@ partial class ProgramHost : IApplication.IDesktopProgramHost
 
         public bool IsTrayProcess { get; set; }
 
-        public void ConfigureServices(DILevel level) => Program.ConfigureServices(this, level);
+        void IApplication.IProgramHost.ConfigureServices(DILevel level) => ConfigureServices(level);
 
         public void InitVisualStudioAppCenterSDK()
         {
@@ -57,8 +57,19 @@ partial class ProgramHost : CommandLineHost
     {
         protected override IApplication.IDesktopProgramHost Host => this;
 
-        protected override void ConfigureServices(IApplication.IStartupArgs args, DILevel level)
-            => Program.ConfigureServices(args, level);
+        public Action<DILevel>? ConfigureServicesDelegate { get; set; }
+
+        protected override void ConfigureServices(DILevel level)
+        {
+            if (ConfigureServicesDelegate != null)
+            {
+                ConfigureServicesDelegate.Invoke(level);
+            }
+            else
+            {
+                Program.ConfigureServices(this, level);
+            }
+        }
 
 #if StartWatchTrace
         protected override void StartWatchTraceRecord(string? mark = null, bool dispose = false)
@@ -67,7 +78,7 @@ protected override void StartWatchTraceRecord(string? mark = null, bool dispose
 
         protected override void StartApplication(string[] args) =>
 #if MAUI
-            StartMauiApp();
+            StartMauiApp(args);
 #else
             StartAvaloniaApp(args);
 #endif

src/ST.Client.Desktop/ServiceCollectionExtensions.AddGeneralLogging.cs

@@ -1,6 +1,7 @@
-using Microsoft.Extensions.Logging;
-using System.Application.UI;
+using System;
 using System.Logging;
+using System.Application.UI;
+using Microsoft.Extensions.Logging;
 using _ThisAssembly = System.Properties.ThisAssembly;
 
 // ReSharper disable once CheckNamespace
@@ -35,7 +36,44 @@ public static IServiceCollection AddGeneralLogging(this IServiceCollection servi
             {
                 o.MinLevel = minLevel;
             });
+            services.AddSingleton(new NLogDisposable());
             return services;
         }
+
+        sealed class NLogDisposable : IDisposable
+        {
+            bool disposedValue;
+
+            private void Dispose(bool disposing)
+            {
+                if (!disposedValue)
+                {
+                    if (disposing)
+                    {
+                        // TODO: 释放托管状态(托管对象)
+                        NLog.LogManager.Shutdown();
+                        ArchiSteamFarm.LogManager.Shutdown();
+                    }
+
+                    // TODO: 释放未托管的资源(未托管的对象)并重写终结器
+                    // TODO: 将大型字段设置为 null
+                    disposedValue = true;
+                }
+            }
+
+            // // TODO: 仅当“Dispose(bool disposing)”拥有用于释放未托管资源的代码时才替代终结器
+            // ~LogManagerShutdown()
+            // {
+            //     // 不要更改此代码。请将清理代码放入“Dispose(bool disposing)”方法中
+            //     Dispose(disposing: false);
+            // }
+
+            public void Dispose()
+            {
+                // 不要更改此代码。请将清理代码放入“Dispose(bool disposing)”方法中
+                Dispose(disposing: true);
+                GC.SuppressFinalize(this);
+            }
+        }
     }
 }