From 908f28297a5bb61e5e6662bbcb4b094280965184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mehmet=20Tu=CC=88ken?= <mehmetuken@hotmail.com>
Date: Thu, 2 Jan 2020 02:31:47 +0300
Subject: [PATCH] Implement IDisposable on AutofacServiceProvider.

---
 .../AutofacServiceProvider.cs                 | 53 +++++++++++++++----
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacServiceProvider.cs b/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacServiceProvider.cs
index ff2d45b2a4..1c1a24ff66 100644
--- a/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacServiceProvider.cs
+++ b/framework/src/Volo.Abp.Autofac/Autofac/Extensions/DependencyInjection/AutofacServiceProvider.cs
@@ -1,6 +1,6 @@
 // This software is part of the Autofac IoC container
 // Copyright © 2015 Autofac Contributors
-// http://autofac.org
+// https://autofac.org
 //
 // Permission is hereby granted, free of charge, to any person
 // obtaining a copy of this software and associated documentation
@@ -33,19 +33,21 @@ namespace Autofac.Extensions.DependencyInjection
     /// </summary>
     /// <seealso cref="System.IServiceProvider" />
     /// <seealso cref="Microsoft.Extensions.DependencyInjection.ISupportRequiredService" />
-    public class AutofacServiceProvider : IServiceProvider, ISupportRequiredService
+    public class AutofacServiceProvider : IServiceProvider, ISupportRequiredService, IDisposable
     {
-        private readonly IComponentContext _componentContext;
+        private readonly ILifetimeScope _lifetimeScope;
+
+        private bool _disposed = false;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="AutofacServiceProvider"/> class.
         /// </summary>
-        /// <param name="componentContext">
-        /// The component context from which services should be resolved.
+        /// <param name="lifetimeScope">
+        /// The lifetime scope from which services will be resolved.
         /// </param>
-        public AutofacServiceProvider(IComponentContext componentContext)
+        public AutofacServiceProvider(ILifetimeScope lifetimeScope)
         {
-            this._componentContext = componentContext;
+            this._lifetimeScope = lifetimeScope;
         }
 
         /// <summary>
@@ -66,7 +68,7 @@ namespace Autofac.Extensions.DependencyInjection
         /// </exception>
         public object GetRequiredService(Type serviceType)
         {
-            return this._componentContext.Resolve(serviceType);
+            return this._lifetimeScope.Resolve(serviceType);
         }
 
         /// <summary>
@@ -81,7 +83,40 @@ namespace Autofac.Extensions.DependencyInjection
         /// </returns>
         public object GetService(Type serviceType)
         {
-            return this._componentContext.ResolveOptional(serviceType);
+            return this._lifetimeScope.ResolveOptional(serviceType);
+        }
+
+        /// <summary>
+        /// Gets the underlying instance of <see cref="ILifetimeScope" />.
+        /// </summary>
+        public ILifetimeScope LifetimeScope => _lifetimeScope;
+
+        /// <summary>
+        /// Releases unmanaged and - optionally - managed resources.
+        /// </summary>
+        /// <param name="disposing">
+        /// <see langword="true" /> to release both managed and unmanaged resources;
+        /// <see langword="false" /> to release only unmanaged resources.
+        /// </param>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!this._disposed)
+            {
+                this._disposed = true;
+                if (disposing)
+                {
+                    this._lifetimeScope.Dispose();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        public void Dispose()
+        {
+            this.Dispose(true);
+            GC.SuppressFinalize(this);
         }
     }
 }
\ No newline at end of file