From 61165fade607083aabf6764f31c12295dbc30b9c Mon Sep 17 00:00:00 2001
From: maliming <6908465+maliming@users.noreply.github.com>
Date: Tue, 24 Sep 2024 19:42:16 +0800
Subject: [PATCH] Use `EmptyHostingEnvironment` to create
 `WebContentFileProvider`.

---
 .../AspNetCore/Builder/AbpApplicationBuilderExtensions.cs   | 2 +-
 .../AspNetCore/VirtualFileSystem/WebContentFileProvider.cs  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs
index c40e6f27a4..4dafe38bcc 100644
--- a/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs
@@ -161,7 +161,7 @@ public static class AbpApplicationBuilderExtensions
             ContentTypeProvider = app.ApplicationServices.GetRequiredService<AbpFileExtensionContentTypeProvider>(),
             FileProvider = new WebContentFileProvider(
                 app.ApplicationServices.GetRequiredService<IVirtualFileProvider>(),
-                null,
+                new EmptyHostingEnvironment(),
                 app.ApplicationServices.GetRequiredService<IOptions<AbpAspNetCoreContentOptions>>()
             )
         });
diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/WebContentFileProvider.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/WebContentFileProvider.cs
index cffa9687e2..313ded53ac 100644
--- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/WebContentFileProvider.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/WebContentFileProvider.cs
@@ -15,14 +15,14 @@ public class WebContentFileProvider : IWebContentFileProvider, ISingletonDepende
 {
     private readonly IVirtualFileProvider _virtualFileProvider;
     private readonly IFileProvider _fileProvider;
-    private readonly IWebHostEnvironment? _hostingEnvironment;
+    private readonly IWebHostEnvironment _hostingEnvironment;
     private string _rootPath = "/wwwroot";
 
     protected AbpAspNetCoreContentOptions Options { get; }
 
     public WebContentFileProvider(
         IVirtualFileProvider virtualFileProvider,
-        IWebHostEnvironment? hostingEnvironment,
+        IWebHostEnvironment hostingEnvironment,
         IOptions<AbpAspNetCoreContentOptions> options)
     {
         _virtualFileProvider = virtualFileProvider;
@@ -94,7 +94,7 @@ public class WebContentFileProvider : IWebContentFileProvider, ISingletonDepende
     protected virtual IFileProvider CreateFileProvider()
     {
         var fileProviders = new List<IFileProvider>();
-        if (_hostingEnvironment != null)
+        if (!_hostingEnvironment.ContentRootPath.IsNullOrEmpty())
         {
             fileProviders.Add(new PhysicalFileProvider(_hostingEnvironment.ContentRootPath));
         }