From c02a2844ed28fb0d97bf6168143166b000daf272 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Wed, 22 Dec 2021 12:21:52 +0300
Subject: [PATCH] Refactor GetHostingEnvironment

---
 .../AbpAspNetCoreServiceCollectionExtensions.cs             | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore/Microsoft/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs b/framework/src/Volo.Abp.AspNetCore/Microsoft/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs
index d672952b09..41f0a16167 100644
--- a/framework/src/Volo.Abp.AspNetCore/Microsoft/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Microsoft/Extensions/DependencyInjection/AbpAspNetCoreServiceCollectionExtensions.cs
@@ -8,7 +8,9 @@ namespace Microsoft.Extensions.DependencyInjection
     {
         public static IWebHostEnvironment GetHostingEnvironment(this IServiceCollection services)
         {
-            if (!services.Any(d => d.ServiceType == typeof(IWebHostEnvironment)))
+            var hostingEnvironment = services.GetSingletonInstanceOrNull<IWebHostEnvironment>();
+
+            if (hostingEnvironment == null)
             {
                 return new EmptyHostingEnvironment()
                 {
@@ -16,7 +18,7 @@ namespace Microsoft.Extensions.DependencyInjection
                 };
             }
 
-            return services.GetSingletonInstance<IWebHostEnvironment>();
+            return hostingEnvironment;
         }
     }
 }