wip: 更新 Disposable 相关类

Author: gmf520

src/OSharp.EntityFrameworkCore/UnitOfWork.cs

@@ -264,7 +264,21 @@ protected override void Dispose(bool disposing)
 
         base.Dispose(disposing);
     }
-        
+
+    /// <summary>
+    /// 重写以实现释放派生类资源的逻辑
+    /// </summary>
+    protected override void Disposing()
+    {
+        foreach (var contexts in _contextDict.Values)
+        {
+            foreach (var context in contexts)
+            {
+                context.Dispose();
+            }
+        }
+    }
+
     /// <summary>
     /// 对数据库连接开启事务
     /// </summary>

src/OSharp.Utils/Data/Disposable.cs

@@ -1,4 +1,4 @@
-// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
 //  <copyright file="Disposable.cs" company="OSharp开源团队">
 //      Copyright (c) 2014-2020 OSharp. All rights reserved.
 //  </copyright>
@@ -21,12 +21,22 @@ public abstract class Disposable : IDisposable
 
         protected virtual void Dispose(bool disposing)
         {
+            if (Disposed)
+            {
+                return;
+            }
             if (disposing)
             {
-                Disposed = true; 
+                Disposing();
             }
+            Disposed = true;
         }
 
+        /// <summary>
+        /// 重写以实现释放派生类资源的逻辑
+        /// </summary>
+        protected abstract void Disposing();
+
         /// <summary>执行与释放或重置非托管资源关联的应用程序定义的任务。</summary>
         public void Dispose()
         {
@@ -39,4 +49,4 @@ public void Dispose()
             Dispose(false);
         }
     }
-}
+}

src/OSharp.Utils/Logging/RollingFile/RollingFileLoggerProvider.cs

@@ -1,4 +1,4 @@
-// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
 //  <copyright file="RollingFileLoggerProvider.cs" company="OSharp开源团队">
 //      Copyright (c) 2014-2017 OSharp. All rights reserved.
 //  </copyright>
@@ -101,5 +101,13 @@ protected void RollFiles()
                 }
             }
         }
+
+        /// <summary>
+        /// 重写以实现释放派生类资源的逻辑
+        /// </summary>
+        protected override void Disposing()
+        {
+            
+        }
     }
-}
+}

src/OSharp.Utils/Reflection/ComLibraryLoader.cs

@@ -1,4 +1,4 @@
-// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
 //  <copyright file="ComLibraryLoader.cs" company="OSharp开源团队">
 //      Copyright (c) 2014-2017 OSharp. All rights reserved.
 //  </copyright>
@@ -101,13 +101,12 @@ public object CreateObjectFromPath(string dllPath, Guid clsid, bool setSearchPat
             return Activator.CreateInstance(type);
         }
 
-        protected override void Dispose(bool disposing)
+        /// <summary>
+        /// 重写以实现释放派生类资源的逻辑
+        /// </summary>
+        protected override void Disposing()
         {
-            if (!Disposed)
-            {
-                NativeMethods.FreeLibrary(_lib);
-            }
-            base.Dispose(disposing);
+            NativeMethods.FreeLibrary(_lib);
         }
     }
-}
+}

src/OSharp/Dependency/ServiceLocator.cs

@@ -273,10 +273,12 @@ public async Task<TResult> ExecuteScopedWorkAsync<TResult>(Func<IServiceProvider
         }
     }
 
-    protected override void Dispose(bool disposing)
+    /// <summary>
+    /// 重写以实现释放派生类资源的逻辑
+    /// </summary>
+    protected override void Disposing()
     {
         _services = null;
         _provider = null;
-        base.Dispose(disposing);
     }
-}
+}

src/OSharp/EventBuses/Internal/EventHandlerDisposeWrapper.cs

@@ -30,12 +30,11 @@ public EventHandlerDisposeWrapper(IEventHandler eventHandler, Action disposeActi
     /// </summary>
     public IEventHandler EventHandler { get; set; }
 
-    protected override void Dispose(bool disposing)
+    /// <summary>
+    /// 重写以实现释放派生类资源的逻辑
+    /// </summary>
+    protected override void Disposing()
     {
-        if (!Disposed)
-        {
-            _disposeAction?.Invoke();
-        }
-        base.Dispose(disposing);
+        _disposeAction?.Invoke();
     }
-}
+}