diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Bootstrap/BootstrapScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Bootstrap/BootstrapScriptContributor.cs index 0a714270ea..bfe5ecebb8 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Bootstrap/BootstrapScriptContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Bootstrap/BootstrapScriptContributor.cs @@ -1,4 +1,5 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Packages.JQuery; using Volo.Abp.Modularity; @@ -9,7 +10,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Bootstrap { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/libs/bootstrap/js/bootstrap.bundle.js"); + context.Files.AddIfNotContains("/libs/bootstrap/js/bootstrap.bundle.js"); } } } \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Bootstrap/BootstrapStyleContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Bootstrap/BootstrapStyleContributor.cs index 4714c374ee..c75f899315 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Bootstrap/BootstrapStyleContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Bootstrap/BootstrapStyleContributor.cs @@ -1,4 +1,5 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Bootstrap { @@ -6,7 +7,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Bootstrap { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/libs/bootstrap/css/bootstrap.css"); + context.Files.AddIfNotContains("/libs/bootstrap/css/bootstrap.css"); } } } \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Codemirror/CodemirrorScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Codemirror/CodemirrorScriptContributor.cs index 70b9a11289..bbd810943b 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Codemirror/CodemirrorScriptContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Codemirror/CodemirrorScriptContributor.cs @@ -1,4 +1,5 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Packages.Core; using Volo.Abp.Modularity; @@ -9,7 +10,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Codemirror { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/libs/codemirror/codemirror.js"); + context.Files.AddIfNotContains("/libs/codemirror/codemirror.js"); } } } diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Codemirror/CodemirrorStyleContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Codemirror/CodemirrorStyleContributor.cs index 7b8bcbd95f..b3eebe1248 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Codemirror/CodemirrorStyleContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Codemirror/CodemirrorStyleContributor.cs @@ -1,4 +1,5 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Codemirror { @@ -6,7 +7,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Codemirror { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/libs/codemirror/codemirror.css"); + context.Files.AddIfNotContains("/libs/codemirror/codemirror.css"); } } } \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Core/CoreScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Core/CoreScriptContributor.cs index 728f66148a..7373dd151c 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Core/CoreScriptContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Core/CoreScriptContributor.cs @@ -1,4 +1,5 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Core { @@ -6,7 +7,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Core { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/libs/abp/core/abp.js"); + context.Files.AddIfNotContains("/libs/abp/core/abp.js"); } } } diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/DatatablesNet/DatatablesNetScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/DatatablesNet/DatatablesNetScriptContributor.cs index a6652d8969..1a484159fc 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/DatatablesNet/DatatablesNetScriptContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/DatatablesNet/DatatablesNetScriptContributor.cs @@ -1,4 +1,5 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Packages.JQuery; using Volo.Abp.Modularity; @@ -9,7 +10,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.DatatablesNet { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/libs/datatables.net/js/jquery.dataTables.js"); + context.Files.AddIfNotContains("/libs/datatables.net/js/jquery.dataTables.js"); } } } \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/DatatablesNetBs4/DatatablesNetBs4ScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/DatatablesNetBs4/DatatablesNetBs4ScriptContributor.cs index 1060f8e6e6..bce344172b 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/DatatablesNetBs4/DatatablesNetBs4ScriptContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/DatatablesNetBs4/DatatablesNetBs4ScriptContributor.cs @@ -1,4 +1,5 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Packages.Bootstrap; using Volo.Abp.AspNetCore.Mvc.UI.Packages.DatatablesNet; using Volo.Abp.Modularity; @@ -11,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.DatatablesNetBs4 { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/libs/datatables.net-bs4/js/dataTables.bootstrap4.js"); + context.Files.AddIfNotContains("/libs/datatables.net-bs4/js/dataTables.bootstrap4.js"); } } } \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/DatatablesNetBs4/DatatablesNetBs4StyleContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/DatatablesNetBs4/DatatablesNetBs4StyleContributor.cs index e29127d58c..9ab5dfad7b 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/DatatablesNetBs4/DatatablesNetBs4StyleContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/DatatablesNetBs4/DatatablesNetBs4StyleContributor.cs @@ -1,4 +1,5 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Packages.Bootstrap; using Volo.Abp.Modularity; @@ -9,7 +10,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.DatatablesNetBs4 { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/libs/datatables.net-bs4/css/dataTables.bootstrap4.css"); + context.Files.AddIfNotContains("/libs/datatables.net-bs4/css/dataTables.bootstrap4.css"); } } } \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/FontAwesome/BootstrapStyleBundleContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/FontAwesome/FontAwesomeStyleContributor.cs similarity index 58% rename from src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/FontAwesome/BootstrapStyleBundleContributor.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/FontAwesome/FontAwesomeStyleContributor.cs index 362f8b51f5..7f01e15859 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/FontAwesome/BootstrapStyleBundleContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/FontAwesome/FontAwesomeStyleContributor.cs @@ -1,4 +1,5 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.FontAwesome { @@ -6,7 +7,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.FontAwesome { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/libs/font-awesome/css/font-awesome.css"); + context.Files.AddIfNotContains("/libs/font-awesome/css/font-awesome.css"); } } } \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/HighlightJs/HighlightJsScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/HighlightJs/HighlightJsScriptContributor.cs index bd71de0010..e135aba3a0 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/HighlightJs/HighlightJsScriptContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/HighlightJs/HighlightJsScriptContributor.cs @@ -1,4 +1,5 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Packages.Core; using Volo.Abp.Modularity; @@ -9,14 +10,14 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.HighlightJs { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/libs/highlight.js/highlight.js"); + context.Files.AddIfNotContains("/libs/highlight.js/highlight.js"); //TODO: Add related languages by configuration (these can be default!) - context.Files.Add("/libs/highlight.js/languages/cs.js"); - context.Files.Add("/libs/highlight.js/languages/css.js"); - context.Files.Add("/libs/highlight.js/languages/javascript.js"); - context.Files.Add("/libs/highlight.js/languages/json.js"); - context.Files.Add("/libs/highlight.js/languages/xml.js"); + context.Files.AddIfNotContains("/libs/highlight.js/languages/cs.js"); + context.Files.AddIfNotContains("/libs/highlight.js/languages/css.js"); + context.Files.AddIfNotContains("/libs/highlight.js/languages/javascript.js"); + context.Files.AddIfNotContains("/libs/highlight.js/languages/json.js"); + context.Files.AddIfNotContains("/libs/highlight.js/languages/xml.js"); } } } diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/HighlightJs/HighlightJsStyleContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/HighlightJs/HighlightJsStyleContributor.cs index 89bc81fc02..61df3edbc4 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/HighlightJs/HighlightJsStyleContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/HighlightJs/HighlightJsStyleContributor.cs @@ -1,4 +1,5 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.HighlightJs { @@ -7,7 +8,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.HighlightJs public override void ConfigureBundle(BundleConfigurationContext context) { //TODO: Make this configurable - context.Files.Add("/libs/highlight.js/styles/github.css"); + context.Files.AddIfNotContains("/libs/highlight.js/styles/github.css"); } } } \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQuery/JQueryScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQuery/JQueryScriptContributor.cs index 7fe8e9e946..97556bb8a2 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQuery/JQueryScriptContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQuery/JQueryScriptContributor.cs @@ -1,4 +1,5 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Packages.Core; using Volo.Abp.Modularity; @@ -9,8 +10,8 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.JQuery { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/libs/jquery/jquery.js"); - context.Files.Add("/libs/abp/jquery/abp.jquery.js"); + context.Files.AddIfNotContains("/libs/jquery/jquery.js"); + context.Files.AddIfNotContains("/libs/abp/jquery/abp.jquery.js"); } } } diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQueryForm/JQueryFormScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQueryForm/JQueryFormScriptContributor.cs index b0fd249e36..ae987fa3f7 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQueryForm/JQueryFormScriptContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQueryForm/JQueryFormScriptContributor.cs @@ -1,4 +1,5 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Packages.JQuery; using Volo.Abp.Modularity; @@ -9,7 +10,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.JQueryForm { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/libs/jquery-form/jquery.form.min.js"); + context.Files.AddIfNotContains("/libs/jquery-form/jquery.form.min.js"); } } } diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQueryValidation/JQueryValidationScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQueryValidation/JQueryValidationScriptContributor.cs index 3282bb396b..d3c8c7c0f5 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQueryValidation/JQueryValidationScriptContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQueryValidation/JQueryValidationScriptContributor.cs @@ -1,4 +1,5 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Packages.JQuery; using Volo.Abp.Modularity; @@ -9,7 +10,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.JQueryValidation { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/libs/jquery-validation/jquery.validate.js"); + context.Files.AddIfNotContains("/libs/jquery-validation/jquery.validate.js"); } } } diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQueryValidationUnobtrusive/JQueryValidationUnobtrusiveScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQueryValidationUnobtrusive/JQueryValidationUnobtrusiveScriptContributor.cs index 116a36dc34..f84319d248 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQueryValidationUnobtrusive/JQueryValidationUnobtrusiveScriptContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/JQueryValidationUnobtrusive/JQueryValidationUnobtrusiveScriptContributor.cs @@ -1,4 +1,5 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Packages.JQueryValidation; using Volo.Abp.Modularity; @@ -9,7 +10,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.JQueryValidationUnobtrusive { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/libs/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"); + context.Files.AddIfNotContains("/libs/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"); } } } diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Lodash/LodashScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Lodash/LodashScriptContributor.cs index cc308e87aa..3d24671fc6 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Lodash/LodashScriptContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Lodash/LodashScriptContributor.cs @@ -1,4 +1,5 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Packages.Core; using Volo.Abp.Modularity; @@ -9,7 +10,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Lodash { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/libs/loadash/lodash.min.js"); + context.Files.AddIfNotContains("/libs/loadash/lodash.min.js"); } } } diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/MarkdownIt/MarkdownItScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/MarkdownIt/MarkdownItScriptContributor.cs index 609f74b9b6..db1810fdb2 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/MarkdownIt/MarkdownItScriptContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/MarkdownIt/MarkdownItScriptContributor.cs @@ -1,4 +1,5 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Packages.Core; using Volo.Abp.Modularity; @@ -9,7 +10,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.MarkdownIt { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/libs/markdown-it/markdown-it.min.js"); + context.Files.AddIfNotContains("/libs/markdown-it/markdown-it.min.js"); } } } \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Select2/Select2ScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Select2/Select2ScriptContributor.cs index 6c4606d08e..1e5f138f97 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Select2/Select2ScriptContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Select2/Select2ScriptContributor.cs @@ -1,4 +1,5 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Packages.Core; using Volo.Abp.Modularity; @@ -10,7 +11,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Select2 public override void ConfigureBundle(BundleConfigurationContext context) { //TODO: Add select2.full.min.js or localize! - context.Files.Add("/libs/select2/js/select2.min.js"); + context.Files.AddIfNotContains("/libs/select2/js/select2.min.js"); } } } diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Select2/Select2StyleContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Select2/Select2StyleContributor.cs index 36b942a2c6..aaf67055e4 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Select2/Select2StyleContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Select2/Select2StyleContributor.cs @@ -1,4 +1,5 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Select2 { @@ -6,7 +7,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Select2 { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/libs/select2/css/select2.min.css"); + context.Files.AddIfNotContains("/libs/select2/css/select2.min.css"); } } } \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/SweetAlert/SweetalertScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/SweetAlert/SweetalertScriptContributor.cs index e75dc1ca90..eefc2e21a8 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/SweetAlert/SweetalertScriptContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/SweetAlert/SweetalertScriptContributor.cs @@ -1,4 +1,5 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Packages.Core; using Volo.Abp.Modularity; @@ -9,7 +10,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.SweetAlert { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/libs/sweetalert/sweetalert.min.js"); + context.Files.AddIfNotContains("/libs/sweetalert/sweetalert.min.js"); } } } diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Timeago/TimeagoScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Timeago/TimeagoScriptContributor.cs index a847cac78b..df9ac55c42 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Timeago/TimeagoScriptContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Timeago/TimeagoScriptContributor.cs @@ -1,4 +1,5 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Packages.JQuery; using Volo.Abp.Modularity; @@ -9,7 +10,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Timeago { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/libs/timeago/jquery.timeago.js"); + context.Files.AddIfNotContains("/libs/timeago/jquery.timeago.js"); } } } diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Toastr/ToastrScriptBundleContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Toastr/ToastrScriptBundleContributor.cs index 5f0fab497c..1a89adbfae 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Toastr/ToastrScriptBundleContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Toastr/ToastrScriptBundleContributor.cs @@ -1,4 +1,5 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Packages.JQuery; using Volo.Abp.Modularity; @@ -9,7 +10,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Toastr { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/libs/toastr/toastr.min.js"); + context.Files.AddIfNotContains("/libs/toastr/toastr.min.js"); } } } \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Toastr/ToastrStyleBundleContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Toastr/ToastrStyleBundleContributor.cs index bddab43863..507d891f20 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Toastr/ToastrStyleBundleContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Toastr/ToastrStyleBundleContributor.cs @@ -1,4 +1,5 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Toastr { @@ -6,7 +7,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Toastr { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/libs/toastr/toastr.min.css"); + context.Files.AddIfNotContains("/libs/toastr/toastr.min.css"); } } } \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalScriptContributor.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalScriptContributor.cs index bf2f574963..036cefe200 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalScriptContributor.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Bundling/SharedThemeGlobalScriptContributor.cs @@ -23,8 +23,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling typeof(SweetalertScriptContributor), typeof(ToastrScriptBundleContributor), typeof(TimeagoScriptContributor), - typeof(Select2ScriptContributor) - )] + typeof(Select2ScriptContributor))] public class SharedThemeGlobalScriptContributor : BundleContributor { public override void ConfigureBundle(BundleConfigurationContext context)