From e5ea49e17ba678d006f0d247c91b0ecc6ea58971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Fri, 11 Oct 2019 14:09:46 +0300
Subject: [PATCH] Register IConfiguration if not registered before.

---
 .../InternalServiceCollectionExtensions.cs        | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/InternalServiceCollectionExtensions.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/InternalServiceCollectionExtensions.cs
index 5b50e6fee2..609328216e 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/Internal/InternalServiceCollectionExtensions.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/Internal/InternalServiceCollectionExtensions.cs
@@ -24,14 +24,19 @@ namespace Volo.Abp.Internal
             var assemblyFinder = new AssemblyFinder(abpApplication);
             var typeFinder = new TypeFinder(assemblyFinder);
 
-            services.TryAddSingleton<IConfigurationAccessor>(
-                new DefaultConfigurationAccessor(
-                    ConfigurationHelper.BuildConfiguration(
-                        applicationCreationOptions.Configuration
-                    )
+            var configurationAccessor = new DefaultConfigurationAccessor(
+                ConfigurationHelper.BuildConfiguration(
+                    applicationCreationOptions.Configuration
                 )
             );
 
+            services.TryAddSingleton<IConfigurationAccessor>(configurationAccessor);
+
+            if (!services.IsAdded<IConfiguration>())
+            {
+                services.AddSingleton<IConfiguration>(configurationAccessor.Configuration);
+            }
+
             services.TryAddSingleton<IModuleLoader>(moduleLoader);
             services.TryAddSingleton<IAssemblyFinder>(assemblyFinder);
             services.TryAddSingleton<ITypeFinder>(typeFinder);