From e0501a3ad91a9bd8f5d4f4363c92a1c293336d67 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Mon, 28 Nov 2022 15:41:22 +0800
Subject: [PATCH] Change `EnvironmentName` on `PreConfigureServices` method.

---
 .../AbpAspNetCoreComponentsWebAssemblyModule.cs      | 12 ++++++------
 .../Volo/Abp/AspNetCore/AbpAspNetCoreModule.cs       |  5 ++++-
 .../src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs |  9 ++++++---
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpAspNetCoreComponentsWebAssemblyModule.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpAspNetCoreComponentsWebAssemblyModule.cs
index 2df5733a99..8496d4dcef 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpAspNetCoreComponentsWebAssemblyModule.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/AbpAspNetCoreComponentsWebAssemblyModule.cs
@@ -24,6 +24,12 @@ public class AbpAspNetCoreComponentsWebAssemblyModule : AbpModule
 {
     public override void PreConfigureServices(ServiceConfigurationContext context)
     {
+        var abpHostEnvironment = context.Services.GetSingletonInstance<IAbpHostEnvironment>();
+        if (abpHostEnvironment.EnvironmentName.IsNullOrWhiteSpace())
+        {
+            abpHostEnvironment.EnvironmentName = context.Services.GetWebAssemblyHostEnvironment().Environment;
+        }
+
         PreConfigure<AbpHttpClientBuilderOptions>(options =>
         {
             options.ProxyClientBuildActions.Add((_, builder) =>
@@ -35,12 +41,6 @@ public class AbpAspNetCoreComponentsWebAssemblyModule : AbpModule
 
     public override void ConfigureServices(ServiceConfigurationContext context)
     {
-        var abpHostEnvironment = context.Services.GetSingletonInstance<IAbpHostEnvironment>();
-        if (abpHostEnvironment.EnvironmentName.IsNullOrWhiteSpace())
-        {
-            abpHostEnvironment.EnvironmentName = context.Services.GetWebAssemblyHostEnvironment().Environment;
-        }
-
         context.Services
             .GetHostBuilder().Logging
             .AddProvider(new AbpExceptionHandlingLoggerProvider(context.Services));
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 8cef208bc5..bad4b7c491 100644
--- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/AbpAspNetCoreModule.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/AbpAspNetCoreModule.cs
@@ -29,14 +29,17 @@ namespace Volo.Abp.AspNetCore;
     )]
 public class AbpAspNetCoreModule : AbpModule
 {
-    public override void ConfigureServices(ServiceConfigurationContext context)
+    public override void PreConfigureServices(ServiceConfigurationContext context)
     {
         var abpHostEnvironment = context.Services.GetSingletonInstance<IAbpHostEnvironment>();
         if (abpHostEnvironment.EnvironmentName.IsNullOrWhiteSpace())
         {
             abpHostEnvironment.EnvironmentName = context.Services.GetHostingEnvironment().EnvironmentName;
         }
+    }
 
+    public override void ConfigureServices(ServiceConfigurationContext context)
+    {
         context.Services.AddAuthorization();
 
         Configure<AbpAuditingOptions>(options =>
diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs b/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs
index 24ae3a6995..51f0615838 100644
--- a/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs
+++ b/framework/src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs
@@ -67,10 +67,13 @@ public abstract class AbpApplicationBase : IAbpApplication
             ConfigureServices();
         }
 
-        var abpHostEnvironment = services.GetSingletonInstance<IAbpHostEnvironment>();
-        if (abpHostEnvironment.EnvironmentName.IsNullOrWhiteSpace())
+        if (options.Environment.IsNullOrWhiteSpace())
         {
-            abpHostEnvironment.EnvironmentName = Environments.Production;
+            var abpHostEnvironment = services.GetSingletonInstance<IAbpHostEnvironment>();
+            if (abpHostEnvironment.EnvironmentName.IsNullOrWhiteSpace())
+            {
+                abpHostEnvironment.EnvironmentName = Environments.Production;
+            }
         }
     }