Merge pull request #11862 from abpframework/auto-merge/rel-5-2/909

Merge branch dev with rel-5.2

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/ChartJs/ChartjsScriptContributor.cs

@@ -6,6 +6,6 @@ public class ChartjsScriptContributor : BundleContributor
 {
     public override void ConfigureBundle(BundleConfigurationContext context)
     {
-        context.Files.Add("/libs/chart.js/Chart.js");
+        context.Files.Add("/libs/chart.js/chart.js");
     }
 }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/ChartJs/ChartjsStyleContributor.cs

@@ -1,11 +0,0 @@
-using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
-
-namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.ChartJs;
-
-public class ChartjsStyleContributor : BundleContributor
-{
-    public override void ConfigureBundle(BundleConfigurationContext context)
-    {
-        context.Files.Add("/libs/chart.js/Chart.css");
-    }
-}

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/FlagIconCss/FlagIconCssStyleContributor.cs

@@ -7,6 +7,6 @@ public class FlagIconCssStyleContributor : BundleContributor
 {
     public override void ConfigureBundle(BundleConfigurationContext context)
     {
-        context.Files.AddIfNotContains("/libs/flag-icon-css/css/flag-icon.min.css");
+        context.Files.AddIfNotContains("/libs/flag-icon-css/css/flag-icons.min.css");
     }
 }