Separate Volo.Abp.AspNetCore.Mvc.UI.Bundling and Volo.Abp.AspNetCore.Mvc.UI.Packages modules.

Volo.Abp.sln

@@ -186,7 +186,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.Mvc.UI.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Emailing", "src\Volo.Abp.Emailing\Volo.Abp.Emailing.csproj", "{8B1CB44B-BA40-4C78-9447-A7864126D7C3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Sms", "src\Volo.Abp.Sms\Volo.Abp.Sms.csproj", "{8BB10746-8BAD-4317-8EE5-A36805DB93F6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Sms", "src\Volo.Abp.Sms\Volo.Abp.Sms.csproj", "{8BB10746-8BAD-4317-8EE5-A36805DB93F6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Mvc.UI.Bundling", "src\Volo.Abp.AspNetCore.Mvc.UI.Bundling\Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj", "{EC71FBDD-A6BD-4B5D-92FE-E108FE12CE8B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Mvc.UI.Packages", "src\Volo.Abp.AspNetCore.Mvc.UI.Packages\Volo.Abp.AspNetCore.Mvc.UI.Packages.csproj", "{CAE68246-70A8-4E87-9B83-A9F7DA343E5E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -526,6 +530,14 @@ Global
 		{8BB10746-8BAD-4317-8EE5-A36805DB93F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8BB10746-8BAD-4317-8EE5-A36805DB93F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8BB10746-8BAD-4317-8EE5-A36805DB93F6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EC71FBDD-A6BD-4B5D-92FE-E108FE12CE8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC71FBDD-A6BD-4B5D-92FE-E108FE12CE8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC71FBDD-A6BD-4B5D-92FE-E108FE12CE8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EC71FBDD-A6BD-4B5D-92FE-E108FE12CE8B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CAE68246-70A8-4E87-9B83-A9F7DA343E5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CAE68246-70A8-4E87-9B83-A9F7DA343E5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CAE68246-70A8-4E87-9B83-A9F7DA343E5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CAE68246-70A8-4E87-9B83-A9F7DA343E5E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -616,6 +628,8 @@ Global
 		{869F7453-7DDC-4915-B92C-7861466AB68B} = {447C8A77-E5F0-4538-8687-7383196D04EA}
 		{8B1CB44B-BA40-4C78-9447-A7864126D7C3} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 		{8BB10746-8BAD-4317-8EE5-A36805DB93F6} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
+		{EC71FBDD-A6BD-4B5D-92FE-E108FE12CE8B} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
+		{CAE68246-70A8-4E87-9B83-A9F7DA343E5E} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5}

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <RootNamespace />
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj" />
+  </ItemGroup>
+
+</Project>

src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo/Abp/AspNetCore/Mvc/UI/Bundling/AbpAspNetCoreMvcUiBundlingModule.cs

@@ -0,0 +1,15 @@
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling
+{
+    [DependsOn(typeof(AbpAspNetCoreMvcUiBootstrapModule))]
+    public class AbpAspNetCoreMvcUiBundlingModule : AbpModule
+    {
+        public override void ConfigureServices(IServiceCollection services)
+        {
+            services.AddAssemblyOf<AbpAspNetCoreMvcUiBundlingModule>();
+        }
+    }
+}

src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo.Abp.AspNetCore.Mvc.UI.Packages.csproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <RootNamespace />
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.UI.Bundling\Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj" />
+  </ItemGroup>
+
+</Project>

src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Pages/_ViewImports.cshtml

@@ -1,3 +1,4 @@
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI
-@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling

src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Themes/Basic/_ViewImports.cshtml

@@ -1,3 +1,4 @@
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI
-@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling

src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/_ViewImports.cshtml

@@ -1,3 +1,4 @@
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI
-@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling

src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/AbpAspNetCoreMvcUiThemeSharedModule.cs

@@ -1,6 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Packages;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling;
 using Volo.Abp.Modularity;
 using Volo.Abp.VirtualFileSystem;
@@ -8,7 +9,8 @@ using Volo.Abp.VirtualFileSystem;
 namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared
 {
     [DependsOn(
-        typeof(AbpAspNetCoreMvcUiBootstrapModule)
+        typeof(AbpAspNetCoreMvcUiBootstrapModule),
+        typeof(AbpAspNetCoreMvcUiPackagesModule)
         )]
     public class AbpAspNetCoreMvcUiThemeSharedModule : AbpModule
     {

src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj

@@ -27,6 +27,7 @@
   
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj" />
+    <ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.UI.Packages\Volo.Abp.AspNetCore.Mvc.UI.Packages.csproj" />
   </ItemGroup>
 
 </Project>

src/Volo.Abp.AspNetCore.Mvc.UI/UI/AbpAspNetCoreMvcUiModule.cs

@@ -1,7 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
-using Volo.Abp.VirtualFileSystem;
 
 namespace Volo.Abp.AspNetCore.Mvc.UI
 {
@@ -12,11 +11,6 @@ namespace Volo.Abp.AspNetCore.Mvc.UI
         public override void ConfigureServices(IServiceCollection services)
         {
             services.AddAssemblyOf<AbpAspNetCoreMvcUiModule>();
-
-            services.Configure<VirtualFileSystemOptions>(options =>
-            {
-                options.FileSets.AddEmbedded<AbpAspNetCoreMvcUiModule>("Volo.Abp.AspNetCore.Mvc");
-            });
         }
     }
 }

src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/Bootstrap/BootstrapScriptContributor.cs

@@ -1,14 +0,0 @@
-using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.JQuery;
-using Volo.Abp.Modularity;
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.Bootstrap
-{
-    [DependsOn(typeof(JQueryScriptContributor))]
-    public class BootstrapScriptContributor : BundleContributor
-    {
-        public override void ConfigureBundle(BundleConfigurationContext context)
-        {
-            context.Files.Add("/libs/bootstrap/js/bootstrap.bundle.js");
-        }
-    }
-}

src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/Bootstrap/BootstrapStyleContributor.cs

@@ -1,10 +0,0 @@
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.Bootstrap
-{
-    public class BootstrapStyleContributor : BundleContributor
-    {
-        public override void ConfigureBundle(BundleConfigurationContext context)
-        {
-            context.Files.Add("/libs/bootstrap/css/bootstrap.css");
-        }
-    }
-}

src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/Core/CoreScriptContributor.cs

@@ -1,10 +0,0 @@
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.Core
-{
-    public class CoreScriptContributor : BundleContributor
-    {
-        public override void ConfigureBundle(BundleConfigurationContext context)
-        {
-            context.Files.Add("/libs/abp/core/abp.js");
-        }
-    }
-}

src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/DatatablesNet/DatatablesNetScriptContributor.cs

@@ -1,14 +0,0 @@
-using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.JQuery;
-using Volo.Abp.Modularity;
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.DatatablesNet
-{
-    [DependsOn(typeof(JQueryScriptContributor))]
-    public class DatatablesNetScriptContributor : BundleContributor
-    {
-        public override void ConfigureBundle(BundleConfigurationContext context)
-        {
-            context.Files.Add("/libs/datatables.net/js/jquery.dataTables.js");
-        }
-    }
-}

src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/DatatablesNetBs4/DatatablesNetBs4ScriptContributor.cs

@@ -1,16 +0,0 @@
-using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.Bootstrap;
-using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.DatatablesNet;
-using Volo.Abp.Modularity;
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.DatatablesNetBs4
-{
-    [DependsOn(typeof(DatatablesNetScriptContributor))]
-    [DependsOn(typeof(BootstrapScriptContributor))]
-    public class DatatablesNetBs4ScriptContributor : BundleContributor
-    {
-        public override void ConfigureBundle(BundleConfigurationContext context)
-        {
-            context.Files.Add("/libs/datatables.net-bs4/js/dataTables.bootstrap4.js");
-        }
-    }
-}

src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/DatatablesNetBs4/DatatablesNetBs4StyleContributor.cs

@@ -1,14 +0,0 @@
-using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.Bootstrap;
-using Volo.Abp.Modularity;
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.DatatablesNetBs4
-{
-    [DependsOn(typeof(BootstrapStyleContributor))]
-    public class DatatablesNetBs4StyleContributor : BundleContributor
-    {
-        public override void ConfigureBundle(BundleConfigurationContext context)
-        {
-            context.Files.Add("/libs/datatables.net-bs4/css/dataTables.bootstrap4.css");
-        }
-    }
-}

src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/FontAwesome/BootstrapStyleBundleContributor.cs

@@ -1,10 +0,0 @@
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.FontAwesome
-{
-    public class FontAwesomeStyleContributor : BundleContributor
-    {
-        public override void ConfigureBundle(BundleConfigurationContext context)
-        {
-            context.Files.Add("/libs/font-awesome/css/font-awesome.css");
-        }
-    }
-}

src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/JQuery/JQueryScriptContributor.cs

@@ -1,15 +0,0 @@
-using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.Core;
-using Volo.Abp.Modularity;
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.JQuery
-{
-    [DependsOn(typeof(CoreScriptContributor))]
-    public class JQueryScriptContributor : BundleContributor
-    {
-        public override void ConfigureBundle(BundleConfigurationContext context)
-        {
-            context.Files.Add("/libs/jquery/jquery.js");
-            context.Files.Add("/libs/abp/jquery/abp.jquery.js");
-        }
-    }
-}

src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/JQueryForm/JQueryFormScriptContributor.cs

@@ -1,14 +0,0 @@
-using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.JQuery;
-using Volo.Abp.Modularity;
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.JQueryForm
-{
-    [DependsOn(typeof(JQueryScriptContributor))]
-    public class JQueryFormScriptContributor : BundleContributor
-    {
-        public override void ConfigureBundle(BundleConfigurationContext context)
-        {
-            context.Files.Add("/libs/jquery-form/jquery.form.min.js");
-        }
-    }
-}

src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/JQueryValidation/JQueryValidationScriptContributor.cs

@@ -1,14 +0,0 @@
-using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.JQuery;
-using Volo.Abp.Modularity;
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.JQueryValidation
-{
-    [DependsOn(typeof(JQueryScriptContributor))]
-    public class JQueryValidationScriptContributor : BundleContributor
-    {
-        public override void ConfigureBundle(BundleConfigurationContext context)
-        {
-            context.Files.Add("/libs/jquery-validation/jquery.validate.js");
-        }
-    }
-}

src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/JQueryValidationUnobtrusive/JQueryValidationUnobtrusiveScriptContributor.cs

@@ -1,14 +0,0 @@
-using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.JQueryValidation;
-using Volo.Abp.Modularity;
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.JQueryValidationUnobtrusive
-{
-    [DependsOn(typeof(JQueryValidationScriptContributor))]
-    public class JQueryValidationUnobtrusiveScriptContributor : BundleContributor
-    {
-        public override void ConfigureBundle(BundleConfigurationContext context)
-        {
-            context.Files.Add("/libs/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js");
-        }
-    }
-}

src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/SweetAlert/SweetalertScriptContributor.cs

@@ -1,14 +0,0 @@
-using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.Core;
-using Volo.Abp.Modularity;
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.SweetAlert
-{
-    [DependsOn(typeof(CoreScriptContributor))]
-    public class SweetalertScriptContributor : BundleContributor
-    {
-        public override void ConfigureBundle(BundleConfigurationContext context)
-        {
-            context.Files.Add("/libs/sweetalert/sweetalert.min.js");
-        }
-    }
-}

src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/Toastr/ToastrScriptBundleContributor.cs

@@ -1,14 +0,0 @@
-using Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.JQuery;
-using Volo.Abp.Modularity;
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.Toastr
-{
-    [DependsOn(typeof(JQueryScriptContributor))]
-    public class ToastrScriptBundleContributor : BundleContributor
-    {
-        public override void ConfigureBundle(BundleConfigurationContext context)
-        {
-            context.Files.Add("/libs/toastr/toastr.min.js");
-        }
-    }
-}

src/Volo.Abp.AspNetCore.Mvc.UI/UI/Bundling/Libraries/Toastr/ToastrStyleBundleContributor.cs

@@ -1,10 +0,0 @@
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bundling.Libraries.Toastr
-{
-    public class ToastrStyleBundleContributor : BundleContributor
-    {
-        public override void ConfigureBundle(BundleConfigurationContext context)
-        {
-            context.Files.Add("/libs/toastr/toastr.min.css");
-        }
-    }
-}

test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/_ViewImports.cshtml

@@ -1,3 +1,4 @@
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI
-@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling

test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo.Abp.AspNetCore.Mvc.UI.Tests.csproj

@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Volo.Abp.AspNetCore.Mvc.UI\Volo.Abp.AspNetCore.Mvc.UI.csproj" />
+    <ProjectReference Include="..\..\src\Volo.Abp.AspNetCore.Mvc.UI.Bundling\Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj" />
     <ProjectReference Include="..\..\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
     <ProjectReference Include="..\Volo.Abp.AspNetCore.Tests\Volo.Abp.AspNetCore.Tests.csproj" />
   </ItemGroup>

test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo/Abp/AspNetCore/Mvc/UI/AbpAspNetCoreMvcUiTestModule.cs

@@ -1,4 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.AspNetCore.TestBase;
 using Volo.Abp.Autofac;
 using Volo.Abp.Modularity;
@@ -7,7 +8,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI
 {
     [DependsOn(
         typeof(AbpAspNetCoreTestBaseModule),
-        typeof(AbpAspNetCoreMvcUiModule),
+        typeof(AbpAspNetCoreMvcUiBundlingModule),
         typeof(AbpAutofacModule)
     )]
     public class AbpAspNetCoreMvcUiTestModule : AbpModule