Rename MapStaticAssets extension name to MapAbpStaticAssets.

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

@@ -125,27 +125,43 @@ public static IApplicationBuilder UseDynamicClaims(this IApplicationBuilder app)
         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 override void OnApplicationInitialization(ApplicationInitializationContex
         }
 
         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 override void OnApplicationInitialization(ApplicationInitializationContex
             app.UseDeveloperExceptionPage();
         }
 
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseConfiguredEndpoints();
     }

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

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

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

@@ -40,7 +40,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
             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 override void OnApplicationInitialization(ApplicationInitializationContex
 
         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 override void OnApplicationInitialization(ApplicationInitializationContex
 
         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 override void OnApplicationInitialization(ApplicationInitializationContex
         }
 
         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 override void OnApplicationInitialization(ApplicationInitializationContex
         }
 
         app.UseHttpsRedirection();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         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.MapStaticAssets();
+            app.MapAbpStaticAssets();
             app.UseRouting();
             app.UseAuthentication();
             app.UseAuthorization();

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

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

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

@@ -47,7 +47,7 @@
 }
 
 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 override void OnApplicationInitialization(ApplicationInitializationContex
         }
 
         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 override void OnApplicationInitialization(ApplicationInitializationContex
     {
         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 override void OnApplicationInitialization(ApplicationInitializationContex
 
         app.UseHttpsRedirection();
         app.UseCorrelationId();
-        app.MapStaticAssets();
+        app.MapAbpStaticAssets();
         app.UseRouting();
         app.UseAuthentication();
         app.UseAbpOpenIddictValidation();