Exclude bootstrap from `global.js/css`.

framework/src/Volo.Abp.AspNetCore.Components.MauiBlazor.Theming/ComponentsComponentsBundleContributor.cs

@@ -12,14 +12,17 @@ public class ComponentsComponentsBundleContributor : IBundleContributor
 
     public void AddStyles(BundleContext context)
     {
-        context.BundleDefinitions.Insert(0, new BundleDefinition
+        if (!context.InteractiveAuto)
         {
-            Source = "_content/Volo.Abp.AspNetCore.Components.MauiBlazor.Theming/libs/bootstrap/css/bootstrap.min.css"
-        });
-        context.BundleDefinitions.Insert(1, new BundleDefinition
-        {
-            Source = "_content/Volo.Abp.AspNetCore.Components.MauiBlazor.Theming/libs/fontawesome/css/all.css"
-        });
+            context.BundleDefinitions.Insert(0, new BundleDefinition
+            {
+                Source = "_content/Volo.Abp.AspNetCore.Components.MauiBlazor.Theming/libs/bootstrap/css/bootstrap.min.css"
+            });
+            context.BundleDefinitions.Insert(1, new BundleDefinition
+            {
+                Source = "_content/Volo.Abp.AspNetCore.Components.MauiBlazor.Theming/libs/fontawesome/css/all.css"
+            });
+        }
 
         context.Add("_content/Volo.Abp.AspNetCore.Components.MauiBlazor.Theming/libs/flag-icon/css/flag-icon.css");
         context.Add("_content/Blazorise/blazorise.css");

framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Bundling/AbpScripts.razor

@@ -20,16 +20,14 @@
 
     protected override async Task OnInitializedAsync()
     {
-        if (OperatingSystem.IsBrowser() && WebAssemblyScriptFiles != null)
-        {
-            ScriptFiles = WebAssemblyScriptFiles;
-            return;
-        }
-
         if (BundleName == null)
         {
             throw new AbpException("The BundleName parameter of the AbpScripts component can not be null!");
         }
         ScriptFiles = (await BundleManager.GetScriptBundleFilesAsync(BundleName!)).ToList();
+        if (OperatingSystem.IsBrowser() && WebAssemblyScriptFiles != null)
+        {
+            ScriptFiles.AddRange(WebAssemblyScriptFiles);
+        }
     }
 }

framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Bundling/AbpStyles.razor

@@ -20,16 +20,14 @@
 
     protected override async Task OnInitializedAsync()
     {
-        if (OperatingSystem.IsBrowser() && WebAssemblyStyleFiles != null)
-        {
-            StyleFiles = WebAssemblyStyleFiles;
-            return;
-        }
-
         if (BundleName == null)
         {
             throw new AbpException("The BundleName parameter of the AbpStyles component can not be null!");
         }
         StyleFiles = (await BundleManager.GetStyleBundleFilesAsync(BundleName!)).ToList();
+        if (OperatingSystem.IsBrowser() && WebAssemblyStyleFiles != null)
+        {
+            StyleFiles.AddRange(WebAssemblyStyleFiles);
+        }
     }
 }

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/ComponentsComponentsBundleContributor.cs

@@ -13,14 +13,17 @@ public class ComponentsComponentsBundleContributor : IBundleContributor
 
     public void AddStyles(BundleContext context)
     {
-        context.BundleDefinitions.Insert(0, new BundleDefinition
+        if (!context.InteractiveAuto)
         {
-            Source = "_content/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/libs/bootstrap/css/bootstrap.min.css"
-        });
-        context.BundleDefinitions.Insert(1, new BundleDefinition
-        {
-            Source = "_content/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/libs/fontawesome/css/all.css"
-        });
+            context.BundleDefinitions.Insert(0, new BundleDefinition
+            {
+                Source = "_content/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/libs/bootstrap/css/bootstrap.min.css"
+            });
+            context.BundleDefinitions.Insert(1, new BundleDefinition
+            {
+                Source = "_content/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/libs/fontawesome/css/all.css"
+            });
+        }
 
         context.Add("_content/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/libs/flag-icon/css/flag-icon.css");
         context.Add("_content/Blazorise/blazorise.css");

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundleConfig.cs

@@ -6,6 +6,8 @@ public class BundleConfig
 {
     public bool IsBlazorWebApp { get; set; } = false;
 
+    public bool InteractiveAuto { get; set; } = false;
+
     public BundlingMode Mode { get; set; } = BundlingMode.BundleAndMinify;
 
     public string Name { get; set; } = "global";

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs

@@ -104,27 +104,31 @@ public class BundlingService : IBundlingService, ITransientDependency
             scriptDefinitions = GenerateScriptDefinitions(scriptContext);
         }
 
-        string fileName;
-        if (bundleConfig.IsBlazorWebApp)
+        if (!bundleConfig.InteractiveAuto)
         {
-            var projectDirectory = Path.GetDirectoryName(directory);
-            fileName = Directory.GetFiles(projectDirectory!, "App.razor", SearchOption.AllDirectories).FirstOrDefault();
-        }
-        else
-        {
-            fileName = Path.Combine(PathHelper.GetWwwRootPath(directory), "index.html");
-        }
+            string fileName;
+            if (bundleConfig.IsBlazorWebApp)
+            {
+                var projectDirectory = Path.GetDirectoryName(directory);
+                fileName = Directory.GetFiles(projectDirectory!, "App.razor", SearchOption.AllDirectories).FirstOrDefault();
+            }
+            else
+            {
+                fileName = Path.Combine(PathHelper.GetWwwRootPath(directory), "index.html");
+            }
 
-        await UpdateDependenciesInBlazorFileAsync(fileName, styleDefinitions, scriptDefinitions);
+            await UpdateDependenciesInBlazorFileAsync(fileName, styleDefinitions, scriptDefinitions);
 
-        Logger.LogInformation($"Script and style references in the {fileName} file have been updated.");
+            Logger.LogInformation($"Script and style references in the {fileName} file have been updated.");
+        }
     }
 
     private BundleContext GetScriptContext(List<BundleTypeDefinition> bundleDefinitions, BundleConfig bundleConfig, string projectType)
     {
         var scriptContext = new BundleContext
         {
-            Parameters = bundleConfig.Parameters
+            Parameters = bundleConfig.Parameters,
+            InteractiveAuto = bundleConfig.InteractiveAuto
         };
 
         if (projectType == BundlingConsts.WebAssembly && !bundleConfig.IsBlazorWebApp)
@@ -147,7 +151,8 @@ public class BundlingService : IBundlingService, ITransientDependency
     {
         var styleContext = new BundleContext
         {
-            Parameters = bundleConfig.Parameters
+            Parameters = bundleConfig.Parameters,
+            InteractiveAuto = bundleConfig.InteractiveAuto
         };
 
         foreach (var bundleDefinition in bundleDefinitions)

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs

@@ -155,16 +155,10 @@ public class AbpIoSourceCodeStore : ISourceCodeStore, ITransientDependency
             throw new Exception("There is no version found with given version: " + version);
         }
 
-        var nugetVersion = await GetTemplateNugetVersionAsync(name, type, version) ?? version;
+        var nugetVersion = version;
 
-        if (!string.IsNullOrWhiteSpace(templateSource) && !IsNetworkSource(templateSource))
-        {
-            Logger.LogInformation("Using local " + type + ": " + name + ", version: " + version);
-            return new TemplateFile(File.ReadAllBytes(Path.Combine(templateSource, name + "-" + version + ".zip")),
-                version, latestVersion, nugetVersion);
-        }
 
-        var localCacheFile = Path.Combine(CliPaths.TemplateCache, name.Replace("/", ".") + "-" + version + ".zip");
+        var localCacheFile = Path.Combine(CliPaths.TemplateCache, name.Replace("/", ".") + ".zip");
 
 #if DEBUG
         if (File.Exists(localCacheFile))

framework/src/Volo.Abp.Core/Volo/Abp/Bundling/BundleContext.cs

@@ -6,6 +6,7 @@ public class BundleContext
 {
     public List<BundleDefinition> BundleDefinitions { get; set; }
     public BundleParameterDictionary Parameters { get; set; }
+    public bool InteractiveAuto { get; set; }
 
     public BundleContext()
     {

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/wwwroot/appsettings.json

@@ -9,6 +9,7 @@
       "Mode": "BundleAndMinify", /* Options: None, Bundle, BundleAndMinify */
       "Name": "global",
       "IsBlazorWebApp": true,
+      "InteractiveAuto": true,
       "Parameters": {
 
       }

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/wwwroot/appsettings.json

@@ -9,6 +9,7 @@
       "Mode": "BundleAndMinify", /* Options: None, Bundle, BundleAndMinify */
       "Name": "global",
       "IsBlazorWebApp": true,
+      "InteractiveAuto": true,
       "Parameters": {
 
       }

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/Components/App.razor

@@ -59,7 +59,6 @@
 
     private List<string> GlobalScripts =>
     [
-        "global.js",
         "global.js"
     ];
 

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/Components/App.razor

@@ -55,7 +55,6 @@
 
     private List<string> GlobalScripts =>
     [
-        "global.js",
         "global.js"
     ];
 }