diff --git a/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll b/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll index 8eeb6eab29..f7ed13b4ce 100644 Binary files a/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll and b/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll differ diff --git a/src/Volo.Abp/System/ComparableExtensions.cs b/src/Volo.Abp/System/AbpComparableExtensions.cs similarity index 93% rename from src/Volo.Abp/System/ComparableExtensions.cs rename to src/Volo.Abp/System/AbpComparableExtensions.cs index f16904047a..c708231b97 100644 --- a/src/Volo.Abp/System/ComparableExtensions.cs +++ b/src/Volo.Abp/System/AbpComparableExtensions.cs @@ -5,7 +5,7 @@ namespace Volo.ExtensionMethods /// /// Extension methods for . /// - public static class ComparableExtensions + public static class AbpComparableExtensions { /// /// Checks a value is between a minimum and maximum value. diff --git a/src/Volo.Abp/System/DayOfWeekExtensions.cs b/src/Volo.Abp/System/AbpDayOfWeekExtensions.cs similarity index 85% rename from src/Volo.Abp/System/DayOfWeekExtensions.cs rename to src/Volo.Abp/System/AbpDayOfWeekExtensions.cs index 9bf633bcdc..ee954ea67d 100644 --- a/src/Volo.Abp/System/DayOfWeekExtensions.cs +++ b/src/Volo.Abp/System/AbpDayOfWeekExtensions.cs @@ -3,9 +3,9 @@ namespace Volo.ExtensionMethods { /// - /// Extension methods for . + /// Extension methods for . /// - public static class DayOfWeekExtensions + public static class AbpDayOfWeekExtensions { /// /// Check if given value is weekend. diff --git a/src/Volo.Abp/System/EventHandlerExtensions.cs b/src/Volo.Abp/System/AbpEventHandlerExtensions.cs similarity index 96% rename from src/Volo.Abp/System/EventHandlerExtensions.cs rename to src/Volo.Abp/System/AbpEventHandlerExtensions.cs index e0247d68ea..459c405d7a 100644 --- a/src/Volo.Abp/System/EventHandlerExtensions.cs +++ b/src/Volo.Abp/System/AbpEventHandlerExtensions.cs @@ -5,7 +5,7 @@ namespace Volo.ExtensionMethods /// /// Extension methods for . /// - public static class EventHandlerExtensions + public static class AbpEventHandlerExtensions { /// /// Raises given event safely with given arguments. diff --git a/src/Volo.Abp/System/ExceptionExtensions.cs b/src/Volo.Abp/System/AbpExceptionExtensions.cs similarity index 92% rename from src/Volo.Abp/System/ExceptionExtensions.cs rename to src/Volo.Abp/System/AbpExceptionExtensions.cs index e7ba296b41..be677b91da 100644 --- a/src/Volo.Abp/System/ExceptionExtensions.cs +++ b/src/Volo.Abp/System/AbpExceptionExtensions.cs @@ -6,7 +6,7 @@ namespace Volo.ExtensionMethods /// /// Extension methods for class. /// - public static class ExceptionExtensions + public static class AbpExceptionExtensions { /// /// Uses method to re-throws exception diff --git a/src/Volo.Abp/System/ObjectExtensions.cs b/src/Volo.Abp/System/AbpObjectExtensions.cs similarity index 97% rename from src/Volo.Abp/System/ObjectExtensions.cs rename to src/Volo.Abp/System/AbpObjectExtensions.cs index 3b8190bb6b..80e16e25c6 100644 --- a/src/Volo.Abp/System/ObjectExtensions.cs +++ b/src/Volo.Abp/System/AbpObjectExtensions.cs @@ -7,7 +7,7 @@ namespace Volo.ExtensionMethods /// /// Extension methods for all objects. /// - public static class ObjectExtensions + public static class AbpObjectExtensions { /// /// Used to simplify and beautify casting an object to a type. diff --git a/src/Volo.Abp/System/StringExtensions.cs b/src/Volo.Abp/System/AbpStringExtensions.cs similarity index 99% rename from src/Volo.Abp/System/StringExtensions.cs rename to src/Volo.Abp/System/AbpStringExtensions.cs index a2878fbf0d..b960ee218a 100644 --- a/src/Volo.Abp/System/StringExtensions.cs +++ b/src/Volo.Abp/System/AbpStringExtensions.cs @@ -9,7 +9,7 @@ namespace Volo.ExtensionMethods /// /// Extension methods for String class. /// - public static class StringExtensions + public static class AbpStringExtensions { /// /// Adds a char to end of given string if it does not ends with the char. diff --git a/src/Volo.Abp/System/TypeExtensions.cs b/src/Volo.Abp/System/AbpTypeExtensions.cs similarity index 81% rename from src/Volo.Abp/System/TypeExtensions.cs rename to src/Volo.Abp/System/AbpTypeExtensions.cs index f24dfb562b..4440bfb9cf 100644 --- a/src/Volo.Abp/System/TypeExtensions.cs +++ b/src/Volo.Abp/System/AbpTypeExtensions.cs @@ -2,7 +2,7 @@ namespace System { - public static class TypeExtensions + public static class AbpTypeExtensions { public static Assembly GetAssembly(this Type type) { diff --git a/src/Volo.Abp/System/Collections/Generic/CollectionExtensions.cs b/src/Volo.Abp/System/Collections/Generic/AbpCollectionExtensions.cs similarity index 96% rename from src/Volo.Abp/System/Collections/Generic/CollectionExtensions.cs rename to src/Volo.Abp/System/Collections/Generic/AbpCollectionExtensions.cs index db560d1b06..66693d266c 100644 --- a/src/Volo.Abp/System/Collections/Generic/CollectionExtensions.cs +++ b/src/Volo.Abp/System/Collections/Generic/AbpCollectionExtensions.cs @@ -8,7 +8,7 @@ namespace Volo.ExtensionMethods.Collections.Generic /// /// Extension methods for Collections. /// - public static class CollectionExtensions + public static class AbpCollectionExtensions { /// /// Checks whatever given collection object is null or has no item. diff --git a/src/Volo.Abp/System/Collections/Generic/DictionaryExtensions.cs b/src/Volo.Abp/System/Collections/Generic/AbpDictionaryExtensions.cs similarity index 98% rename from src/Volo.Abp/System/Collections/Generic/DictionaryExtensions.cs rename to src/Volo.Abp/System/Collections/Generic/AbpDictionaryExtensions.cs index 37727402b7..48c78a2f38 100644 --- a/src/Volo.Abp/System/Collections/Generic/DictionaryExtensions.cs +++ b/src/Volo.Abp/System/Collections/Generic/AbpDictionaryExtensions.cs @@ -6,7 +6,7 @@ namespace Volo.ExtensionMethods.Collections.Generic /// /// Extension methods for Dictionary. /// - public static class DictionaryExtensions + public static class AbpDictionaryExtensions { /// /// This method is used to try to get a value in a dictionary if it does exists. diff --git a/src/Volo.Abp/System/Collections/Generic/EnumerableExtensions.cs b/src/Volo.Abp/System/Collections/Generic/AbpEnumerableExtensions.cs similarity index 98% rename from src/Volo.Abp/System/Collections/Generic/EnumerableExtensions.cs rename to src/Volo.Abp/System/Collections/Generic/AbpEnumerableExtensions.cs index 01f67130c9..edee9c15d4 100644 --- a/src/Volo.Abp/System/Collections/Generic/EnumerableExtensions.cs +++ b/src/Volo.Abp/System/Collections/Generic/AbpEnumerableExtensions.cs @@ -7,7 +7,7 @@ namespace Volo.ExtensionMethods.Collections.Generic /// /// Extension methods for . /// - public static class EnumerableExtensions + public static class AbpEnumerableExtensions { /// /// Concatenates the members of a constructed collection of type System.String, using the specified separator between each member. diff --git a/src/Volo.Abp/System/Collections/Generic/ListExtensions.cs b/src/Volo.Abp/System/Collections/Generic/AbpListExtensions.cs similarity index 98% rename from src/Volo.Abp/System/Collections/Generic/ListExtensions.cs rename to src/Volo.Abp/System/Collections/Generic/AbpListExtensions.cs index b2db839574..9dbbf0496d 100644 --- a/src/Volo.Abp/System/Collections/Generic/ListExtensions.cs +++ b/src/Volo.Abp/System/Collections/Generic/AbpListExtensions.cs @@ -8,7 +8,7 @@ namespace Volo.ExtensionMethods.Collections.Generic /// /// Extension methods for . /// - public static class ListExtensions + public static class AbpListExtensions { public static void MoveItem(this List source, Predicate selector, int targetIndex) { diff --git a/src/Volo.Abp/System/Globalization/CultureHelper.cs b/src/Volo.Abp/System/Globalization/AbpCultureHelper.cs similarity index 96% rename from src/Volo.Abp/System/Globalization/CultureHelper.cs rename to src/Volo.Abp/System/Globalization/AbpCultureHelper.cs index 8f7e3be667..c42e0e2091 100644 --- a/src/Volo.Abp/System/Globalization/CultureHelper.cs +++ b/src/Volo.Abp/System/Globalization/AbpCultureHelper.cs @@ -4,7 +4,7 @@ using Volo.Abp; namespace System.Globalization { - public static class CultureHelper + public static class AbpCultureHelper { public static IDisposable Use([NotNull] string culture, string uiCulture = null) { diff --git a/src/Volo.Abp/System/IO/StreamExtensions.cs b/src/Volo.Abp/System/IO/AbpStreamExtensions.cs similarity index 88% rename from src/Volo.Abp/System/IO/StreamExtensions.cs rename to src/Volo.Abp/System/IO/AbpStreamExtensions.cs index 96df44a41c..e8f05cece9 100644 --- a/src/Volo.Abp/System/IO/StreamExtensions.cs +++ b/src/Volo.Abp/System/IO/AbpStreamExtensions.cs @@ -2,7 +2,7 @@ namespace Volo.ExtensionMethods { - public static class StreamExtensions + public static class AbpStreamExtensions { public static byte[] GetAllBytes(this Stream stream) { diff --git a/test/Volo.Abp.Tests/Volo/ExtensionMethods/StringExtensions_Tests.cs b/test/Volo.Abp.Tests/Volo/ExtensionMethods/StringExtensions_Tests.cs index 41788436fd..6d0b740a7a 100644 --- a/test/Volo.Abp.Tests/Volo/ExtensionMethods/StringExtensions_Tests.cs +++ b/test/Volo.Abp.Tests/Volo/ExtensionMethods/StringExtensions_Tests.cs @@ -11,7 +11,7 @@ namespace Volo.ExtensionMethods public StringExtensions_Tests() { - _cultureScope = CultureHelper.Use("en-US"); + _cultureScope = AbpCultureHelper.Use("en-US"); } [Fact] @@ -31,7 +31,7 @@ namespace Volo.ExtensionMethods [Fact] public void EnsureEndsWith_CultureSpecific_Test() { - using (CultureHelper.Use("tr-TR")) + using (AbpCultureHelper.Use("tr-TR")) { "Kırmızı".EnsureEndsWith('I', StringComparison.CurrentCultureIgnoreCase).ShouldBe("Kırmızı"); } @@ -59,7 +59,7 @@ namespace Volo.ExtensionMethods [Fact] public void ToPascalCase_CurrentCulture_Test() { - using (CultureHelper.Use("tr-TR")) + using (AbpCultureHelper.Use("tr-TR")) { "istanbul".ToPascalCase(true).ShouldBe("İstanbul"); }