From 69d66ecc32ddfca9ac835854af2dd4b85d92bfdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Sun, 4 Dec 2016 19:06:13 +0300 Subject: [PATCH] Revised namespaces. --- .../Abp/AspNetCore/AbpApplicationBuilderExtensions.cs | 6 +++--- .../Abp/AspNetCore/AbpServiceCollectionExtensions.cs | 4 ++-- .../AbpConventionalDependencyInjectionExtensions.cs | 2 +- .../Collections/Generic/DictionaryExtensions.cs | 4 ++-- .../ExtensionMethods/ComparableExtensions.cs | 2 +- .../ExtensionMethods/EventHandlerExtensions.cs | 2 +- .../ExtensionMethods/ObjectExtensions.cs | 2 +- .../ExtensionMethods/StringExtensions.cs | 5 ++--- test/Apps/AspNetCoreDemo/Startup.cs | 2 -- .../ComparableExtensions_Tests.cs | 3 +-- .../DayOfWeekExtensions_Tests.cs | 3 +-- test/Volo.ExtensionMethods.Tests/ObjectExtension_Test.cs | 3 +-- test/Volo.ExtensionMethods.Tests/StringExtensions_Tests.cs | 3 +-- 13 files changed, 17 insertions(+), 24 deletions(-) diff --git a/src/Volo.Abp.AspNetCore/Abp/AspNetCore/AbpApplicationBuilderExtensions.cs b/src/Volo.Abp.AspNetCore/Abp/AspNetCore/AbpApplicationBuilderExtensions.cs index 66b9383c89..ec4abe08e3 100644 --- a/src/Volo.Abp.AspNetCore/Abp/AspNetCore/AbpApplicationBuilderExtensions.cs +++ b/src/Volo.Abp.AspNetCore/Abp/AspNetCore/AbpApplicationBuilderExtensions.cs @@ -1,8 +1,8 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp; using Volo.DependencyInjection; -namespace Volo.Abp.AspNetCore +namespace Microsoft.AspNetCore.Builder { public static class AbpApplicationBuilderExtensions { diff --git a/src/Volo.Abp.AspNetCore/Abp/AspNetCore/AbpServiceCollectionExtensions.cs b/src/Volo.Abp.AspNetCore/Abp/AspNetCore/AbpServiceCollectionExtensions.cs index 42224c30d7..a2e03dbad5 100644 --- a/src/Volo.Abp.AspNetCore/Abp/AspNetCore/AbpServiceCollectionExtensions.cs +++ b/src/Volo.Abp.AspNetCore/Abp/AspNetCore/AbpServiceCollectionExtensions.cs @@ -1,7 +1,7 @@ -using Microsoft.Extensions.DependencyInjection; +using Volo.Abp; using Volo.Abp.Modularity; -namespace Volo.Abp.AspNetCore +namespace Microsoft.Extensions.DependencyInjection { //TODO: Decide to move ABP? public static class AbpServiceCollectionExtensions diff --git a/src/Volo.DependencyInjection/DependencyInjection/AbpConventionalDependencyInjectionExtensions.cs b/src/Volo.DependencyInjection/DependencyInjection/AbpConventionalDependencyInjectionExtensions.cs index e08100fa78..3ede37227d 100644 --- a/src/Volo.DependencyInjection/DependencyInjection/AbpConventionalDependencyInjectionExtensions.cs +++ b/src/Volo.DependencyInjection/DependencyInjection/AbpConventionalDependencyInjectionExtensions.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using Abp.Extensions; using Microsoft.Extensions.DependencyInjection; +using Volo.ExtensionMethods; using Volo.Internal; namespace Volo.DependencyInjection diff --git a/src/Volo.ExtensionMethods/ExtensionMethods/Collections/Generic/DictionaryExtensions.cs b/src/Volo.ExtensionMethods/ExtensionMethods/Collections/Generic/DictionaryExtensions.cs index ff51c3ef50..37727402b7 100644 --- a/src/Volo.ExtensionMethods/ExtensionMethods/Collections/Generic/DictionaryExtensions.cs +++ b/src/Volo.ExtensionMethods/ExtensionMethods/Collections/Generic/DictionaryExtensions.cs @@ -1,7 +1,7 @@ -using System; +using System; using System.Collections.Generic; -namespace Volo.Collections.Generic +namespace Volo.ExtensionMethods.Collections.Generic { /// /// Extension methods for Dictionary. diff --git a/src/Volo.ExtensionMethods/ExtensionMethods/ComparableExtensions.cs b/src/Volo.ExtensionMethods/ExtensionMethods/ComparableExtensions.cs index 032ef879e2..f16904047a 100644 --- a/src/Volo.ExtensionMethods/ExtensionMethods/ComparableExtensions.cs +++ b/src/Volo.ExtensionMethods/ExtensionMethods/ComparableExtensions.cs @@ -1,6 +1,6 @@ using System; -namespace Abp.Extensions +namespace Volo.ExtensionMethods { /// /// Extension methods for . diff --git a/src/Volo.ExtensionMethods/ExtensionMethods/EventHandlerExtensions.cs b/src/Volo.ExtensionMethods/ExtensionMethods/EventHandlerExtensions.cs index d1a0614a47..e0247d68ea 100644 --- a/src/Volo.ExtensionMethods/ExtensionMethods/EventHandlerExtensions.cs +++ b/src/Volo.ExtensionMethods/ExtensionMethods/EventHandlerExtensions.cs @@ -1,6 +1,6 @@ using System; -namespace Abp.Extensions +namespace Volo.ExtensionMethods { /// /// Extension methods for . diff --git a/src/Volo.ExtensionMethods/ExtensionMethods/ObjectExtensions.cs b/src/Volo.ExtensionMethods/ExtensionMethods/ObjectExtensions.cs index c146b156b9..3b8190bb6b 100644 --- a/src/Volo.ExtensionMethods/ExtensionMethods/ObjectExtensions.cs +++ b/src/Volo.ExtensionMethods/ExtensionMethods/ObjectExtensions.cs @@ -2,7 +2,7 @@ using System.Globalization; using System.Linq; -namespace Abp.Extensions +namespace Volo.ExtensionMethods { /// /// Extension methods for all objects. diff --git a/src/Volo.ExtensionMethods/ExtensionMethods/StringExtensions.cs b/src/Volo.ExtensionMethods/ExtensionMethods/StringExtensions.cs index a8212062c5..ff610b4bc8 100644 --- a/src/Volo.ExtensionMethods/ExtensionMethods/StringExtensions.cs +++ b/src/Volo.ExtensionMethods/ExtensionMethods/StringExtensions.cs @@ -1,12 +1,11 @@ using System; -using System.Globalization; using System.Security.Cryptography; using System.Text; using System.Text.RegularExpressions; using Volo.CodeAnnotations; -using Volo.Collections.Generic; +using Volo.ExtensionMethods.Collections.Generic; -namespace Abp.Extensions +namespace Volo.ExtensionMethods { //TODO: Not working properly with cultures! diff --git a/test/Apps/AspNetCoreDemo/Startup.cs b/test/Apps/AspNetCoreDemo/Startup.cs index a790b82084..a14dc1edcf 100644 --- a/test/Apps/AspNetCoreDemo/Startup.cs +++ b/test/Apps/AspNetCoreDemo/Startup.cs @@ -1,9 +1,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Volo.Abp.AspNetCore; namespace AspNetCoreDemo { diff --git a/test/Volo.ExtensionMethods.Tests/ComparableExtensions_Tests.cs b/test/Volo.ExtensionMethods.Tests/ComparableExtensions_Tests.cs index eee8ac090d..00eb8840ba 100644 --- a/test/Volo.ExtensionMethods.Tests/ComparableExtensions_Tests.cs +++ b/test/Volo.ExtensionMethods.Tests/ComparableExtensions_Tests.cs @@ -1,9 +1,8 @@ using System; -using Abp.Extensions; using Shouldly; using Xunit; -namespace Abp.Tests.Extensions +namespace Volo.ExtensionMethods.Tests { public class ComparableExtensions_Tests { diff --git a/test/Volo.ExtensionMethods.Tests/DayOfWeekExtensions_Tests.cs b/test/Volo.ExtensionMethods.Tests/DayOfWeekExtensions_Tests.cs index cf22fccc54..8f99793553 100644 --- a/test/Volo.ExtensionMethods.Tests/DayOfWeekExtensions_Tests.cs +++ b/test/Volo.ExtensionMethods.Tests/DayOfWeekExtensions_Tests.cs @@ -1,9 +1,8 @@ using System; -using Abp.Extensions; using Shouldly; using Xunit; -namespace Abp.Tests.Extensions +namespace Volo.ExtensionMethods.Tests { public class DayOfWeekExtensions_Tests { diff --git a/test/Volo.ExtensionMethods.Tests/ObjectExtension_Test.cs b/test/Volo.ExtensionMethods.Tests/ObjectExtension_Test.cs index 7d4c71316d..06fbb6d7da 100644 --- a/test/Volo.ExtensionMethods.Tests/ObjectExtension_Test.cs +++ b/test/Volo.ExtensionMethods.Tests/ObjectExtension_Test.cs @@ -1,9 +1,8 @@ using System; -using Abp.Extensions; using Shouldly; using Xunit; -namespace Abp.Tests.Extensions +namespace Volo.ExtensionMethods.Tests { public class ObjectExtensions_Tests { diff --git a/test/Volo.ExtensionMethods.Tests/StringExtensions_Tests.cs b/test/Volo.ExtensionMethods.Tests/StringExtensions_Tests.cs index f05166f86e..a9c50c56d5 100644 --- a/test/Volo.ExtensionMethods.Tests/StringExtensions_Tests.cs +++ b/test/Volo.ExtensionMethods.Tests/StringExtensions_Tests.cs @@ -1,9 +1,8 @@ using System.Globalization; -using Abp.Extensions; using Shouldly; using Xunit; -namespace Abp.Tests.Extensions +namespace Volo.ExtensionMethods.Tests { public class StringExtensions_Tests {