From 9387f3dfa62df827f1d475016c76c4fb0fe429e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Wed, 17 Mar 2021 13:06:19 +0300
Subject: [PATCH] Check if environment is available.

---
 .../ApplicationInitializationContextExtensions.cs  |  9 ++++++++-
 .../Volo/Abp/AspNetCore/AbpAspNetCoreModule.cs     | 14 +++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/ApplicationInitializationContextExtensions.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/ApplicationInitializationContextExtensions.cs
index a2b66c76c2..04ef8ca81b 100644
--- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/ApplicationInitializationContextExtensions.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/ApplicationInitializationContextExtensions.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Builder;
+using JetBrains.Annotations;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -19,6 +20,12 @@ namespace Volo.Abp
             return context.ServiceProvider.GetRequiredService<IWebHostEnvironment>();
         }
 
+        [CanBeNull]
+        public static IWebHostEnvironment GetEnvironmentOrNull(this ApplicationInitializationContext context)
+        {
+            return context.ServiceProvider.GetService<IWebHostEnvironment>();
+        }
+
         public static IConfiguration GetConfiguration(this ApplicationInitializationContext context)
         {
             return context.ServiceProvider.GetRequiredService<IConfiguration>();
diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/AbpAspNetCoreModule.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/AbpAspNetCoreModule.cs
index f3e666037f..9c5df84743 100644
--- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/AbpAspNetCoreModule.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/AbpAspNetCoreModule.cs
@@ -55,11 +55,15 @@ namespace Volo.Abp.AspNetCore
 
         public override void OnApplicationInitialization(ApplicationInitializationContext context)
         {
-            context.GetEnvironment().WebRootFileProvider =
-                new CompositeFileProvider(
-                    context.GetEnvironment().WebRootFileProvider,
-                    context.ServiceProvider.GetRequiredService<IWebContentFileProvider>()
-                );
+            var environment = context.GetEnvironmentOrNull();
+            if (environment != null)
+            {
+                environment.WebRootFileProvider =
+                    new CompositeFileProvider(
+                        context.GetEnvironment().WebRootFileProvider,
+                        context.ServiceProvider.GetRequiredService<IWebContentFileProvider>()
+                    );
+            }
         }
     }
 }