From 5cce0bec0c27f75ceb68a4a09231334e2a285563 Mon Sep 17 00:00:00 2001 From: Ilkay Ilknur Date: Thu, 19 Nov 2020 16:36:24 +0300 Subject: [PATCH] typo fix. --- ...ndleContributer.cs => BasicThemeBundleContributor.cs} | 2 +- ...gBundleContributer.cs => ThemingBundleContributor.cs} | 2 +- ...uter.cs => ComponentsWebAssemblyBundleContributor.cs} | 2 +- ...dleContributer.cs => BlazoriseUIBundleContributor.cs} | 2 +- .../Volo/Abp/Cli/Bundling/BundlingService.cs | 4 ++-- .../src/Volo.Abp.Core/Volo/Abp/Bundling/BundleContext.cs | 9 ++++++--- .../{IBundleContributer.cs => IBundleContributor.cs} | 2 +- ...r.cs => IdentityModelWebAssemblyBundleContributor.cs} | 2 +- ...eContributer.cs => MyProjectNameBundleContributor.cs} | 2 +- 9 files changed, 15 insertions(+), 12 deletions(-) rename framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/{BasicThemeBundleContributer.cs => BasicThemeBundleContributor.cs} (85%) rename framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/{ThemingBundleContributer.cs => ThemingBundleContributor.cs} (92%) rename framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/{ComponentsWebAssemblyBundleContributer.cs => ComponentsWebAssemblyBundleContributor.cs} (81%) rename framework/src/Volo.Abp.BlazoriseUI/{BlazoriseUIBundleContributer.cs => BlazoriseUIBundleContributor.cs} (89%) rename framework/src/Volo.Abp.Core/Volo/Abp/Bundling/{IBundleContributer.cs => IBundleContributor.cs} (78%) rename framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo/Abp/Http/Client/IdentityModel/WebAssembly/{IdentityModelWebAssemblyBundleContributer.cs => IdentityModelWebAssemblyBundleContributor.cs} (82%) rename templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/{MyProjectNameBundleContributer.cs => MyProjectNameBundleContributor.cs} (79%) diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/BasicThemeBundleContributer.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/BasicThemeBundleContributor.cs similarity index 85% rename from framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/BasicThemeBundleContributer.cs rename to framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/BasicThemeBundleContributor.cs index adfdf9d503..edef97eb52 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/BasicThemeBundleContributer.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/BasicThemeBundleContributor.cs @@ -2,7 +2,7 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme { - public class BasicThemeBundleContributer : IBundleContributer + public class BasicThemeBundleContributor : IBundleContributor { public void AddScripts(BundleContext context) { diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/ThemingBundleContributer.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/ThemingBundleContributor.cs similarity index 92% rename from framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/ThemingBundleContributer.cs rename to framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/ThemingBundleContributor.cs index 8476190b59..70382a7dba 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/ThemingBundleContributer.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/ThemingBundleContributor.cs @@ -2,7 +2,7 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly.Theming { - public class ThemingBundleContributer : IBundleContributer + public class ThemingBundleContributor : IBundleContributor { public void AddScripts(BundleContext context) { diff --git a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/ComponentsWebAssemblyBundleContributer.cs b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/ComponentsWebAssemblyBundleContributor.cs similarity index 81% rename from framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/ComponentsWebAssemblyBundleContributer.cs rename to framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/ComponentsWebAssemblyBundleContributor.cs index 5bab349483..9f05ff24d1 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/ComponentsWebAssemblyBundleContributer.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/ComponentsWebAssemblyBundleContributor.cs @@ -2,7 +2,7 @@ namespace Volo.Abp.AspNetCore.Components.WebAssembly { - public class ComponentsWebAssemblyBundleContributer : IBundleContributer + public class ComponentsWebAssemblyBundleContributor : IBundleContributor { public void AddScripts(BundleContext context) { diff --git a/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUIBundleContributer.cs b/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUIBundleContributor.cs similarity index 89% rename from framework/src/Volo.Abp.BlazoriseUI/BlazoriseUIBundleContributer.cs rename to framework/src/Volo.Abp.BlazoriseUI/BlazoriseUIBundleContributor.cs index 2a26fe6dec..5dcc51c76a 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUIBundleContributer.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/BlazoriseUIBundleContributor.cs @@ -2,7 +2,7 @@ namespace Volo.Abp.BlazoriseUI { - public class BlazoriseUIBundleContributer : IBundleContributer + public class BlazoriseUIBundleContributor : IBundleContributor { public void AddScripts(BundleContext context) { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs index d74f943c34..698b0978c2 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Bundling/BundlingService.cs @@ -161,9 +161,9 @@ namespace Volo.Abp.Cli.Bundling return builder.ToString(); } - private IBundleContributer CreateContributerInstance(Type bundleContributerType) + private IBundleContributor CreateContributerInstance(Type bundleContributerType) { - return (IBundleContributer) Activator.CreateInstance(bundleContributerType); + return (IBundleContributor)Activator.CreateInstance(bundleContributerType); } private void FindBundleContributersRecursively( diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Bundling/BundleContext.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Bundling/BundleContext.cs index e30d6d9b3f..69f6e8d9e9 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Bundling/BundleContext.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Bundling/BundleContext.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; namespace Volo.Abp.Bundling { @@ -17,9 +16,13 @@ namespace Volo.Abp.Bundling var bundleDefinition = new BundleDefinition { Source = source, - AdditionalProperties = additionalProperties }; + if (additionalProperties != null) + { + bundleDefinition.AdditionalProperties = additionalProperties; + } + BundleDefinitions.AddIfNotContains((item) => item.Source == bundleDefinition.Source, () => bundleDefinition); } } diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Bundling/IBundleContributer.cs b/framework/src/Volo.Abp.Core/Volo/Abp/Bundling/IBundleContributor.cs similarity index 78% rename from framework/src/Volo.Abp.Core/Volo/Abp/Bundling/IBundleContributer.cs rename to framework/src/Volo.Abp.Core/Volo/Abp/Bundling/IBundleContributor.cs index bca0f62eb6..5388070cbd 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Bundling/IBundleContributer.cs +++ b/framework/src/Volo.Abp.Core/Volo/Abp/Bundling/IBundleContributor.cs @@ -1,6 +1,6 @@ namespace Volo.Abp.Bundling { - public interface IBundleContributer + public interface IBundleContributor { void AddScripts(BundleContext context); void AddStyles(BundleContext context); diff --git a/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo/Abp/Http/Client/IdentityModel/WebAssembly/IdentityModelWebAssemblyBundleContributer.cs b/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo/Abp/Http/Client/IdentityModel/WebAssembly/IdentityModelWebAssemblyBundleContributor.cs similarity index 82% rename from framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo/Abp/Http/Client/IdentityModel/WebAssembly/IdentityModelWebAssemblyBundleContributer.cs rename to framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo/Abp/Http/Client/IdentityModel/WebAssembly/IdentityModelWebAssemblyBundleContributor.cs index cc4cfc3308..7ee8c8108f 100644 --- a/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo/Abp/Http/Client/IdentityModel/WebAssembly/IdentityModelWebAssemblyBundleContributer.cs +++ b/framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo/Abp/Http/Client/IdentityModel/WebAssembly/IdentityModelWebAssemblyBundleContributor.cs @@ -2,7 +2,7 @@ namespace Volo.Abp.Http.Client.IdentityModel.WebAssembly { - public class IdentityModelWebAssemblyBundleContributer : IBundleContributer + public class IdentityModelWebAssemblyBundleContributor : IBundleContributor { public void AddScripts(BundleContext context) { diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBundleContributer.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBundleContributor.cs similarity index 79% rename from templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBundleContributer.cs rename to templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBundleContributor.cs index f2f904314b..a30dbc8f78 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBundleContributer.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBundleContributor.cs @@ -2,7 +2,7 @@ namespace MyCompanyName.MyProjectName.Blazor { - public class MyProjectNameBundleContributer : IBundleContributer + public class MyProjectNameBundleContributor : IBundleContributor { public void AddScripts(BundleContext context) {