Add MapStaticAssets.

framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs

@@ -1,18 +1,25 @@
 using System;
+using System.IO;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.RequestLocalization;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.AspNetCore.StaticAssets;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Options;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.Auditing;
 using Volo.Abp.AspNetCore.ExceptionHandling;
 using Volo.Abp.AspNetCore.Security;
 using Volo.Abp.AspNetCore.Security.Claims;
 using Volo.Abp.AspNetCore.Tracing;
 using Volo.Abp.AspNetCore.Uow;
+using Volo.Abp.AspNetCore.VirtualFileSystem;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Threading;
+using Volo.Abp.VirtualFileSystem;
 
 namespace Microsoft.AspNetCore.Builder;
 
@@ -117,4 +124,28 @@ public static IApplicationBuilder UseDynamicClaims(this IApplicationBuilder app)
     {
         return app.UseMiddleware<AbpDynamicClaimsMiddleware>();
     }
+
+    public static StaticAssetsEndpointConventionBuilder MapStaticAssets(this IApplicationBuilder app, string? staticAssetsManifestPath = null)
+    {
+        if (app is not IEndpointRouteBuilder endpoints)
+        {
+            throw new AbpException("The app(IApplicationBuilder) is not an IEndpointRouteBuilder.");
+        }
+
+        var contentTypeProvider = endpoints.ServiceProvider.GetRequiredService<AbpFileExtensionContentTypeProvider>();
+        var webContentFileProvider = new WebContentFileProvider(
+            endpoints.ServiceProvider.GetRequiredService<IVirtualFileProvider>(),
+            null,
+            endpoints.ServiceProvider.GetRequiredService<IOptions<AbpAspNetCoreContentOptions>>()
+        );
+
+        app.UseStaticFiles(new StaticFileOptions()
+        {
+            ContentTypeProvider = contentTypeProvider,
+            FileProvider = webContentFileProvider
+        });
+
+        var result = endpoints.MapStaticAssets(staticAssetsManifestPath);
+        return result;
+    }
 }

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;
@@ -85,23 +85,25 @@ public virtual IChangeToken Watch(string filter)
         return new CompositeChangeToken(
             new[]
             {
-                    _fileProvider.Watch(_rootPath + filter),
-                    _fileProvider.Watch(filter)
+                _fileProvider.Watch(_rootPath + filter),
+                _fileProvider.Watch(filter)
             }
         );
     }
 
     protected virtual IFileProvider CreateFileProvider()
     {
         var fileProviders = new List<IFileProvider>
-            {
-                new PhysicalFileProvider(_hostingEnvironment.ContentRootPath),
-                _virtualFileProvider
-            };
+        {
+            _virtualFileProvider
+        };
 
-        return new CompositeFileProvider(
-            fileProviders
-        );
+        if (_hostingEnvironment != null)
+        {
+            fileProviders.Add(_hostingEnvironment.WebRootFileProvider);
+        }
+
+        return new CompositeFileProvider(fileProviders);
     }
 
     protected virtual bool ExtraAllowedFolder(string path)

modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/AbpAspNetCoreMvcUiBootstrapDemoModule.cs

@@ -31,7 +31,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
         }
 
         app.UseRouting();
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseConfiguredEndpoints();
     }
 

modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/AbpAspNetCoreMvcUiThemeBasicDemoModule.cs

@@ -55,7 +55,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
             app.UseDeveloperExceptionPage();
         }
 
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseRouting();
         app.UseConfiguredEndpoints();
     }

modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs

@@ -161,7 +161,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
                 app.UseErrorPage();
             }
 
-            app.UseStaticFiles();
+            app.MapStaticAssets();
 
             app.UseRouting();
 

modules/client-simulation/demo/Volo.ClientSimulation.Demo/ClientSimulationDemoModule.cs

@@ -40,7 +40,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
             app.UseDeveloperExceptionPage();
         }
 
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseRouting();
         app.UseConfiguredEndpoints();
     }

modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/CmsKitHttpApiHostModule.cs

@@ -172,7 +172,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
 
         app.UseHttpsRedirection();
         app.UseCorrelationId();
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseRouting();
         app.UseCors(DefaultCorsPolicyName);
         app.UseAuthentication();

modules/cms-kit/host/Volo.CmsKit.IdentityServer/CmsKitIdentityServerModule.cs

@@ -195,7 +195,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
 
         app.UseHttpsRedirection();
         app.UseCorrelationId();
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseRouting();
         app.UseCors(DefaultCorsPolicyName);
         app.UseAuthentication();

modules/cms-kit/host/Volo.CmsKit.Web.Host/CmsKitWebHostModule.cs

@@ -222,7 +222,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
         }
 
         app.UseHttpsRedirection();
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
 

modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs

@@ -263,7 +263,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
         }
 
         app.UseHttpsRedirection();
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
 

modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs

@@ -177,7 +177,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
             var app = context.GetApplicationBuilder();
             var env = context.GetEnvironment();
 
-            app.UseStaticFiles();
+            app.MapStaticAssets();
             app.UseRouting();
             app.UseAuthentication();
             app.UseAuthorization();

modules/openiddict/app/OpenIddict.Demo.Client.Mvc/Program.cs

@@ -49,7 +49,7 @@
 }
 
 app.UseHttpsRedirection();
-app.UseStaticFiles();
+app.MapStaticAssets();
 app.UseRouting();
 app.UseAuthentication();
 app.UseAuthorization();

modules/openiddict/app/OpenIddict.Demo.Server/Program.cs

@@ -47,7 +47,7 @@
 }
 
 app.UseHttpsRedirection();
-app.UseStaticFiles();
+app.MapStaticAssets();
 app.UseRouting();
 app.UseCors();
 app.UseAuthentication();

modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/DemoAppModule.cs

@@ -120,7 +120,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
         }
 
         app.UseHttpsRedirection();
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
         app.UseAuthorization();

modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/AbpVirtualFileExplorerDemoAppModule.cs

@@ -38,7 +38,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
     {
         var app = context.GetApplicationBuilder();
 
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseRouting();
         app.UseAbpRequestLocalization();
         app.UseConfiguredEndpoints();

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs

@@ -367,7 +367,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
 
         app.UseHttpsRedirection();
         app.UseCorrelationId();
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
         app.UseAbpOpenIddictValidation();

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs

@@ -384,7 +384,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
 
         app.UseHttpsRedirection();
         app.UseCorrelationId();
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
         app.UseAbpOpenIddictValidation();

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyProjectNameHostModule.cs

@@ -311,7 +311,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
 
             app.UseCorrelationId();
             app.UseBlazorFrameworkFiles();
-            app.UseStaticFiles();
+            app.MapStaticAssets();
             app.UseRouting();
             app.UseCors();
             app.UseAuthentication();

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyProjectNameHostModule.cs

@@ -330,7 +330,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
 
             app.UseCorrelationId();
             app.UseBlazorFrameworkFiles();
-            app.UseStaticFiles();
+            app.MapStaticAssets();
             app.UseRouting();
             app.UseCors();
             app.UseAuthentication();

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyProjectNameModule.cs

@@ -350,7 +350,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
         }
 
         app.UseCorrelationId();
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseRouting();
         app.UseCors();
         app.UseAuthentication();

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyProjectNameModule.cs

@@ -368,7 +368,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
         }
 
         app.UseCorrelationId();
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseRouting();
         app.UseCors();
         app.UseAuthentication();

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyProjectNameModule.cs

@@ -332,7 +332,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
         }
 
         app.UseCorrelationId();
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
         app.UseAbpOpenIddictValidation();

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyProjectNameModule.cs

@@ -349,7 +349,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
         }
 
         app.UseCorrelationId();
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
         app.UseAbpOpenIddictValidation();

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs

@@ -206,7 +206,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
         }
 
         app.UseCorrelationId();
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseRouting();
         app.UseCors();
         app.UseAuthentication();

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs

@@ -361,7 +361,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
         }
 
         app.UseCorrelationId();
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
 

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs

@@ -271,7 +271,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
 
         app.UseHttpsRedirection();
         app.UseCorrelationId();
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
         app.UseAbpOpenIddictValidation();

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/MyProjectNameBlazorModule.cs

@@ -364,7 +364,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
         }
 
         app.UseCorrelationId();
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
 

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/MyProjectNameBlazorModule.cs

@@ -274,7 +274,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
 
         app.UseHttpsRedirection();
         app.UseCorrelationId();
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
         app.UseAbpOpenIddictValidation();

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Program.cs

@@ -33,7 +33,7 @@
 
 app.UseHttpsRedirection();
 
-app.UseStaticFiles();
+app.MapStaticAssets();
 app.UseAntiforgery();
 
 app.MapRazorComponents<App>()

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs

@@ -188,7 +188,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
 
         app.UseAbpRequestLocalization();
         app.UseCorrelationId();
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseRouting();
         app.UseCors();
         app.UseAuthentication();

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs

@@ -193,7 +193,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
         }
 
         app.UseCorrelationId();
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseRouting();
         app.UseCors();
         app.UseAuthentication();

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs

@@ -313,7 +313,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
         }
 
         app.UseCorrelationId();
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
 

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs

@@ -1,3 +1,4 @@
+using System;
 using System.IO;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Extensions.DependencyInjection;
@@ -225,7 +226,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
         }
 
         app.UseCorrelationId();
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
         app.UseAbpOpenIddictValidation();

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs

@@ -210,7 +210,7 @@ public async override Task OnApplicationInitializationAsync(ApplicationInitializ
 
         app.UseHttpsRedirection();
         app.UseCorrelationId();
-        app.UseStaticFiles();
+        app.MapStaticAssets();
         app.UseRouting();
         app.UseCors();
         app.UseAuthentication();