Rename `MapStaticAssets` extension name to `MapAbpStaticAssets`.

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

@@ -125,27 +125,43 @@ public static class AbpApplicationBuilderExtensions
         return app.UseMiddleware<AbpDynamicClaimsMiddleware>();
     }
 
-    public static StaticAssetsEndpointConventionBuilder MapStaticAssets(this IApplicationBuilder app, string? staticAssetsManifestPath = null)
+    /// <summary>
+    /// MapAbpStaticAssets is used to serve the files from the abp virtual file system embedded resources(js/css) and call the MapStaticAssets.
+    /// </summary>
+    public static StaticAssetsEndpointConventionBuilder MapAbpStaticAssets(this WebApplication app, string? staticAssetsManifestPath = null)
+    {
+        return app.As<IApplicationBuilder>().MapAbpStaticAssets(staticAssetsManifestPath);
+    }
+
+    /// <summary>
+    /// MapAbpStaticAssets is used to serve the files from the abp virtual file system embedded resources(js/css) and call the MapStaticAssets.
+    /// </summary>
+    public static StaticAssetsEndpointConventionBuilder MapAbpStaticAssets(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.UseVirtualStaticFiles();
 
-        app.UseStaticFiles(new StaticFileOptions()
+        return endpoints.MapStaticAssets(staticAssetsManifestPath);
+    }
+
+    /// <summary>
+    /// This static file provider is used to serve the files from the abp virtual file system embedded resources(js/css).
+    /// It will not serve the files from the application's wwwroot folder.
+    /// </summary>
+    public static IApplicationBuilder UseVirtualStaticFiles(this IApplicationBuilder app)
+    {
+        return app.UseStaticFiles(new StaticFileOptions()
         {
-            ContentTypeProvider = contentTypeProvider,
-            FileProvider = webContentFileProvider
+            ContentTypeProvider = app.ApplicationServices.GetRequiredService<AbpFileExtensionContentTypeProvider>(),
+            FileProvider = new WebContentFileProvider(
+                app.ApplicationServices.GetRequiredService<IVirtualFileProvider>(),
+                null,
+                app.ApplicationServices.GetRequiredService<IOptions<AbpAspNetCoreContentOptions>>()
+            )
         });
-
-        var result = endpoints.MapStaticAssets(staticAssetsManifestPath);
-        return result;
     }
 }

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

@@ -31,7 +31,7 @@ public class AbpAspNetCoreMvcUiBootstrapDemoModule : AbpModule
         }
 
         app.UseRouting();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseConfiguredEndpoints();
     }
     

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

@@ -55,7 +55,7 @@ public class AbpAspNetCoreMvcUiThemeBasicDemoModule : AbpModule
             app.UseDeveloperExceptionPage();
         }
 
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseConfiguredEndpoints();
     }

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

@@ -161,7 +161,7 @@ namespace Volo.BloggingTestApp
                 app.UseErrorPage();
             }
 
-            app.MapStaticAssets();
+            app.MapAbpStaticAssets();
 
             app.UseRouting();
 

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

@@ -40,7 +40,7 @@ public class ClientSimulationDemoModule : AbpModule
             app.UseDeveloperExceptionPage();
         }
 
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseConfiguredEndpoints();
     }

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

@@ -172,7 +172,7 @@ public class CmsKitHttpApiHostModule : AbpModule
 
         app.UseHttpsRedirection();
         app.UseCorrelationId();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseCors(DefaultCorsPolicyName);
         app.UseAuthentication();

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

@@ -195,7 +195,7 @@ public class CmsKitIdentityServerModule : AbpModule
 
         app.UseHttpsRedirection();
         app.UseCorrelationId();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseCors(DefaultCorsPolicyName);
         app.UseAuthentication();

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

@@ -222,7 +222,7 @@ public class CmsKitWebHostModule : AbpModule
         }
 
         app.UseHttpsRedirection();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
 

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

@@ -263,7 +263,7 @@ public class CmsKitWebUnifiedModule : AbpModule
         }
 
         app.UseHttpsRedirection();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
 

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

@@ -177,7 +177,7 @@ namespace VoloDocs.Web
             var app = context.GetApplicationBuilder();
             var env = context.GetEnvironment();
 
-            app.MapStaticAssets();
+            app.MapAbpStaticAssets();
             app.UseRouting();
             app.UseAuthentication();
             app.UseAuthorization();

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

@@ -49,7 +49,7 @@ if (!app.Environment.IsDevelopment())
 }
 
 app.UseHttpsRedirection();
-app.MapStaticAssets();
+app.MapAbpStaticAssets();
 app.UseRouting();
 app.UseAuthentication();
 app.UseAuthorization();

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

@@ -47,7 +47,7 @@ if (!app.Environment.IsDevelopment())
 }
 
 app.UseHttpsRedirection();
-app.MapStaticAssets();
+app.MapAbpStaticAssets();
 app.UseRouting();
 app.UseCors();
 app.UseAuthentication();

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

@@ -120,7 +120,7 @@ public class DemoAppModule : AbpModule
         }
 
         app.UseHttpsRedirection();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
         app.UseAuthorization();

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

@@ -38,7 +38,7 @@ public class AbpVirtualFileExplorerDemoAppModule : AbpModule
     {
         var app = context.GetApplicationBuilder();
 
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseAbpRequestLocalization();
         app.UseConfiguredEndpoints();

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

@@ -367,7 +367,7 @@ public class MyProjectNameModule : AbpModule
 
         app.UseHttpsRedirection();
         app.UseCorrelationId();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
         app.UseAbpOpenIddictValidation();

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

@@ -384,7 +384,7 @@ public class MyProjectNameModule : AbpModule
 
         app.UseHttpsRedirection();
         app.UseCorrelationId();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
         app.UseAbpOpenIddictValidation();

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

@@ -311,7 +311,7 @@ public class MyProjectNameHostModule : AbpModule
 
             app.UseCorrelationId();
             app.UseBlazorFrameworkFiles();
-            app.MapStaticAssets();
+            app.MapAbpStaticAssets();
             app.UseRouting();
             app.UseCors();
             app.UseAuthentication();

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

@@ -330,7 +330,7 @@ public class MyProjectNameHostModule : AbpModule
 
             app.UseCorrelationId();
             app.UseBlazorFrameworkFiles();
-            app.MapStaticAssets();
+            app.MapAbpStaticAssets();
             app.UseRouting();
             app.UseCors();
             app.UseAuthentication();

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

@@ -350,7 +350,7 @@ public class MyProjectNameModule : AbpModule
         }
 
         app.UseCorrelationId();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseCors();
         app.UseAuthentication();

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

@@ -368,7 +368,7 @@ public class MyProjectNameModule : AbpModule
         }
 
         app.UseCorrelationId();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseCors();
         app.UseAuthentication();

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

@@ -332,7 +332,7 @@ public class MyProjectNameModule : AbpModule
         }
 
         app.UseCorrelationId();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
         app.UseAbpOpenIddictValidation();

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

@@ -349,7 +349,7 @@ public class MyProjectNameModule : AbpModule
         }
 
         app.UseCorrelationId();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
         app.UseAbpOpenIddictValidation();

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

@@ -206,7 +206,7 @@ public class MyProjectNameAuthServerModule : AbpModule
         }
 
         app.UseCorrelationId();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseCors();
         app.UseAuthentication();

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

@@ -361,7 +361,7 @@ public class MyProjectNameBlazorModule : AbpModule
         }
 
         app.UseCorrelationId();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
 

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

@@ -271,7 +271,7 @@ public class MyProjectNameBlazorModule : AbpModule
 
         app.UseHttpsRedirection();
         app.UseCorrelationId();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
         app.UseAbpOpenIddictValidation();

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

@@ -364,7 +364,7 @@ public class MyProjectNameBlazorModule : AbpModule
         }
 
         app.UseCorrelationId();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
 

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

@@ -274,7 +274,7 @@ public class MyProjectNameBlazorModule : AbpModule
 
         app.UseHttpsRedirection();
         app.UseCorrelationId();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
         app.UseAbpOpenIddictValidation();

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

@@ -188,7 +188,7 @@ public class MyProjectNameHttpApiHostModule : AbpModule
 
         app.UseAbpRequestLocalization();
         app.UseCorrelationId();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseCors();
         app.UseAuthentication();

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

@@ -193,7 +193,7 @@ public class MyProjectNameHttpApiHostModule : AbpModule
         }
 
         app.UseCorrelationId();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseCors();
         app.UseAuthentication();

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

@@ -313,7 +313,7 @@ public class MyProjectNameWebModule : AbpModule
         }
 
         app.UseCorrelationId();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
 

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

@@ -226,7 +226,7 @@ public class MyProjectNameWebModule : AbpModule
         }
 
         app.UseCorrelationId();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
         app.UseAbpOpenIddictValidation();

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

@@ -210,7 +210,7 @@ public class MyProjectNameAuthServerModule : AbpModule
 
         app.UseHttpsRedirection();
         app.UseCorrelationId();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseCors();
         app.UseAuthentication();

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyProjectNameBlazorHostModule.cs

@@ -254,7 +254,7 @@ public class MyProjectNameBlazorHostModule : AbpModule
 
         app.UseHttpsRedirection();
         app.UseCorrelationId();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
         app.UseAbpOpenIddictValidation();

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs

@@ -175,7 +175,7 @@ public class MyProjectNameHttpApiHostModule : AbpModule
 
         app.UseHttpsRedirection();
         app.UseCorrelationId();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseCors();
         app.UseAuthentication();

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebHostModule.cs

@@ -240,7 +240,7 @@ public class MyProjectNameWebHostModule : AbpModule
         }
 
         app.UseHttpsRedirection();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
 

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyProjectNameWebUnifiedModule.cs

@@ -158,7 +158,7 @@ public class MyProjectNameWebUnifiedModule : AbpModule
         }
 
         app.UseHttpsRedirection();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseAuthentication();