From 0f24054c6af36a2b75ebfdb74be7a581d8c1fe83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Mon, 14 Oct 2019 11:43:07 +0300
Subject: [PATCH] GetConfiguration from HostBuilderContext

---
 .../ServiceCollectionConfigurationExtensions.cs       | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionConfigurationExtensions.cs b/framework/src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionConfigurationExtensions.cs
index 940e7f6965..97a6ed4189 100644
--- a/framework/src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionConfigurationExtensions.cs
+++ b/framework/src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionConfigurationExtensions.cs
@@ -1,11 +1,14 @@
-using Microsoft.Extensions.Configuration;
+using System;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Hosting;
 using Volo.Abp.Configuration;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
     public static class ServiceCollectionConfigurationExtensions
     {
+        [Obsolete]
         public static IServiceCollection SetConfiguration(this IServiceCollection services, IConfigurationRoot configurationRoot)
         {
             return services.Replace(ServiceDescriptor.Singleton<IConfigurationAccessor>(new DefaultConfigurationAccessor(configurationRoot)));
@@ -13,6 +16,12 @@ namespace Microsoft.Extensions.DependencyInjection
 
         public static IConfigurationRoot GetConfiguration(this IServiceCollection services)
         {
+            var hostBuilderContext = services.GetSingletonInstanceOrNull<HostBuilderContext>();
+            if (hostBuilderContext?.Configuration != null)
+            {
+                return hostBuilderContext.Configuration as IConfigurationRoot;
+            }
+
             return services.GetSingletonInstance<IConfigurationAccessor>().Configuration;
         }
     }