diff --git a/src/Volo.Abp.AspNetCore/Abp/AspNetCore/AbpApplicationBuilderExtensions.cs b/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs similarity index 100% rename from src/Volo.Abp.AspNetCore/Abp/AspNetCore/AbpApplicationBuilderExtensions.cs rename to src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs diff --git a/src/Volo.Abp.AspNetCore/Abp/AspNetCore/AbpServiceCollectionExtensions.cs b/src/Volo.Abp.AspNetCore/Microsoft/Extensions/DependencyInjection/AbpServiceCollectionExtensions.cs similarity index 100% rename from src/Volo.Abp.AspNetCore/Abp/AspNetCore/AbpServiceCollectionExtensions.cs rename to src/Volo.Abp.AspNetCore/Microsoft/Extensions/DependencyInjection/AbpServiceCollectionExtensions.cs diff --git a/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.xproj b/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.xproj index 423d263a92..e05cd5fd00 100644 --- a/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.xproj +++ b/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.xproj @@ -7,7 +7,8 @@ 02be03ba-3411-448c-ab61-cb36407cc49a - Volo + + .\obj .\bin\ v4.6.1 diff --git a/src/Volo.Abp.AspNetCore/Abp/AspNetCore/AbpAspNetCoreModule.cs b/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/AbpAspNetCoreModule.cs similarity index 100% rename from src/Volo.Abp.AspNetCore/Abp/AspNetCore/AbpAspNetCoreModule.cs rename to src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/AbpAspNetCoreModule.cs diff --git a/src/Volo.Abp.AspNetCore/Abp/AspNetCore/Modularity/ApplicationInitializationContextExtensions.cs b/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Modularity/ApplicationInitializationContextExtensions.cs similarity index 100% rename from src/Volo.Abp.AspNetCore/Abp/AspNetCore/Modularity/ApplicationInitializationContextExtensions.cs rename to src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Modularity/ApplicationInitializationContextExtensions.cs diff --git a/src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.xproj b/src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.xproj index 8e3386368f..e641308882 100644 --- a/src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.xproj +++ b/src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.xproj @@ -4,18 +4,17 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - 58fa9f8f-216d-4c93-8929-d40d22b11ca7 - Volo.Abp.MultiTenancy + + .\obj .\bin\ v4.6.1 - 2.0 - + \ No newline at end of file diff --git a/src/Volo.Abp.MultiTenancy/ICurrentTenantAccessor.cs b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyManager.cs similarity index 59% rename from src/Volo.Abp.MultiTenancy/ICurrentTenantAccessor.cs rename to src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyManager.cs index 810002d45b..94c90d06bc 100644 --- a/src/Volo.Abp.MultiTenancy/ICurrentTenantAccessor.cs +++ b/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenancyManager.cs @@ -3,27 +3,30 @@ using System.Collections.Generic; namespace Volo.Abp.MultiTenancy { - public interface ICurrentTenantAccessor + public interface ITenantInfo { Guid Id { get; } string Name { get; } } - public class CurrentTenantAccessor : ICurrentTenantAccessor + public interface IMultiTenancyManager { - public Guid Id => GetTenantId(); + ITenantInfo CurrentTenant { get; } + } - public string Name { get; } + public class MultiTenancyManager : IMultiTenancyManager + { + public ITenantInfo CurrentTenant => GetCurrentTenant(); private readonly IEnumerable _currentTenantResolvers; - public CurrentTenantAccessor(IEnumerable currentTenantResolvers) + public MultiTenancyManager(IEnumerable currentTenantResolvers) { _currentTenantResolvers = currentTenantResolvers; } - public virtual Guid GetTenantId() + public virtual ITenantInfo GetCurrentTenant() { throw new NotImplementedException(); } diff --git a/src/Volo.Abp/Volo.Abp.xproj b/src/Volo.Abp/Volo.Abp.xproj index e23a5c913e..20a6e28b15 100644 --- a/src/Volo.Abp/Volo.Abp.xproj +++ b/src/Volo.Abp/Volo.Abp.xproj @@ -7,7 +7,8 @@ fc5f7372-ea60-4052-b943-0ee070221cc1 - Volo + + .\obj .\bin\ v4.6.1 diff --git a/src/Volo.Abp/Abp/AbpApplication.cs b/src/Volo.Abp/Volo/Abp/AbpApplication.cs similarity index 100% rename from src/Volo.Abp/Abp/AbpApplication.cs rename to src/Volo.Abp/Volo/Abp/AbpApplication.cs diff --git a/src/Volo.Abp/Abp/AbpException.cs b/src/Volo.Abp/Volo/Abp/AbpException.cs similarity index 100% rename from src/Volo.Abp/Abp/AbpException.cs rename to src/Volo.Abp/Volo/Abp/AbpException.cs diff --git a/src/Volo.Abp/Abp/AbpKernelModule.cs b/src/Volo.Abp/Volo/Abp/AbpKernelModule.cs similarity index 100% rename from src/Volo.Abp/Abp/AbpKernelModule.cs rename to src/Volo.Abp/Volo/Abp/AbpKernelModule.cs diff --git a/src/Volo.Abp/Abp/AbpServiceCollectionExtensions.cs b/src/Volo.Abp/Volo/Abp/AbpServiceCollectionExtensions.cs similarity index 100% rename from src/Volo.Abp/Abp/AbpServiceCollectionExtensions.cs rename to src/Volo.Abp/Volo/Abp/AbpServiceCollectionExtensions.cs diff --git a/src/Volo.Abp/Abp/Modularity/AbpModule.cs b/src/Volo.Abp/Volo/Abp/Modularity/AbpModule.cs similarity index 100% rename from src/Volo.Abp/Abp/Modularity/AbpModule.cs rename to src/Volo.Abp/Volo/Abp/Modularity/AbpModule.cs diff --git a/src/Volo.Abp/Abp/Modularity/AbpModuleDescriptor.cs b/src/Volo.Abp/Volo/Abp/Modularity/AbpModuleDescriptor.cs similarity index 100% rename from src/Volo.Abp/Abp/Modularity/AbpModuleDescriptor.cs rename to src/Volo.Abp/Volo/Abp/Modularity/AbpModuleDescriptor.cs diff --git a/src/Volo.Abp/Abp/Modularity/ApplicationInitializationContext.cs b/src/Volo.Abp/Volo/Abp/Modularity/ApplicationInitializationContext.cs similarity index 100% rename from src/Volo.Abp/Abp/Modularity/ApplicationInitializationContext.cs rename to src/Volo.Abp/Volo/Abp/Modularity/ApplicationInitializationContext.cs diff --git a/src/Volo.Abp/Abp/Modularity/DefaultModuleInitializer.cs b/src/Volo.Abp/Volo/Abp/Modularity/DefaultModuleInitializer.cs similarity index 100% rename from src/Volo.Abp/Abp/Modularity/DefaultModuleInitializer.cs rename to src/Volo.Abp/Volo/Abp/Modularity/DefaultModuleInitializer.cs diff --git a/src/Volo.Abp/Abp/Modularity/DependsOnAttribute.cs b/src/Volo.Abp/Volo/Abp/Modularity/DependsOnAttribute.cs similarity index 100% rename from src/Volo.Abp/Abp/Modularity/DependsOnAttribute.cs rename to src/Volo.Abp/Volo/Abp/Modularity/DependsOnAttribute.cs diff --git a/src/Volo.Abp/Abp/Modularity/IAbpModule.cs b/src/Volo.Abp/Volo/Abp/Modularity/IAbpModule.cs similarity index 100% rename from src/Volo.Abp/Abp/Modularity/IAbpModule.cs rename to src/Volo.Abp/Volo/Abp/Modularity/IAbpModule.cs diff --git a/src/Volo.Abp/Abp/Modularity/IDependedModuleTypesProvider.cs b/src/Volo.Abp/Volo/Abp/Modularity/IDependedModuleTypesProvider.cs similarity index 100% rename from src/Volo.Abp/Abp/Modularity/IDependedModuleTypesProvider.cs rename to src/Volo.Abp/Volo/Abp/Modularity/IDependedModuleTypesProvider.cs diff --git a/src/Volo.Abp/Abp/Modularity/IModuleInitializer.cs b/src/Volo.Abp/Volo/Abp/Modularity/IModuleInitializer.cs similarity index 100% rename from src/Volo.Abp/Abp/Modularity/IModuleInitializer.cs rename to src/Volo.Abp/Volo/Abp/Modularity/IModuleInitializer.cs diff --git a/src/Volo.Abp/Abp/Modularity/IModuleLoader.cs b/src/Volo.Abp/Volo/Abp/Modularity/IModuleLoader.cs similarity index 100% rename from src/Volo.Abp/Abp/Modularity/IModuleLoader.cs rename to src/Volo.Abp/Volo/Abp/Modularity/IModuleLoader.cs diff --git a/src/Volo.Abp/Abp/Modularity/IModuleManager.cs b/src/Volo.Abp/Volo/Abp/Modularity/IModuleManager.cs similarity index 100% rename from src/Volo.Abp/Abp/Modularity/IModuleManager.cs rename to src/Volo.Abp/Volo/Abp/Modularity/IModuleManager.cs diff --git a/src/Volo.Abp/Abp/Modularity/IOnApplicationInitialization.cs b/src/Volo.Abp/Volo/Abp/Modularity/IOnApplicationInitialization.cs similarity index 100% rename from src/Volo.Abp/Abp/Modularity/IOnApplicationInitialization.cs rename to src/Volo.Abp/Volo/Abp/Modularity/IOnApplicationInitialization.cs diff --git a/src/Volo.Abp/Abp/Modularity/ModuleLoader.cs b/src/Volo.Abp/Volo/Abp/Modularity/ModuleLoader.cs similarity index 100% rename from src/Volo.Abp/Abp/Modularity/ModuleLoader.cs rename to src/Volo.Abp/Volo/Abp/Modularity/ModuleLoader.cs diff --git a/src/Volo.Abp/Abp/Modularity/ModuleManager.cs b/src/Volo.Abp/Volo/Abp/Modularity/ModuleManager.cs similarity index 100% rename from src/Volo.Abp/Abp/Modularity/ModuleManager.cs rename to src/Volo.Abp/Volo/Abp/Modularity/ModuleManager.cs diff --git a/src/Volo.DependencyInjection/DependencyInjection/CommonServiceCollectionExtensions.cs b/src/Volo.DependencyInjection/Microsoft/Extensions/DependencyInjection/CommonServiceCollectionExtensions.cs similarity index 94% rename from src/Volo.DependencyInjection/DependencyInjection/CommonServiceCollectionExtensions.cs rename to src/Volo.DependencyInjection/Microsoft/Extensions/DependencyInjection/CommonServiceCollectionExtensions.cs index 0aa6ab7182..a8dc9a77c3 100644 --- a/src/Volo.DependencyInjection/DependencyInjection/CommonServiceCollectionExtensions.cs +++ b/src/Volo.DependencyInjection/Microsoft/Extensions/DependencyInjection/CommonServiceCollectionExtensions.cs @@ -1,8 +1,8 @@ using System; using System.Linq; -using Microsoft.Extensions.DependencyInjection; +using Volo.DependencyInjection; -namespace Volo.DependencyInjection +namespace Microsoft.Extensions.DependencyInjection { public static class CommonServiceCollectionExtensions { diff --git a/src/Volo.DependencyInjection/DependencyInjection/ServiceCollectionRegistrationExtensions.cs b/src/Volo.DependencyInjection/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationExtensions.cs similarity index 97% rename from src/Volo.DependencyInjection/DependencyInjection/ServiceCollectionRegistrationExtensions.cs rename to src/Volo.DependencyInjection/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationExtensions.cs index 3f6278b528..f66651a1f0 100644 --- a/src/Volo.DependencyInjection/DependencyInjection/ServiceCollectionRegistrationExtensions.cs +++ b/src/Volo.DependencyInjection/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationExtensions.cs @@ -2,11 +2,11 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using Microsoft.Extensions.DependencyInjection; +using Volo.DependencyInjection; using Volo.ExtensionMethods; using Volo.Internal; -namespace Volo.DependencyInjection +namespace Microsoft.Extensions.DependencyInjection { public static class ServiceCollectionRegistrationExtensions { diff --git a/src/Volo.DependencyInjection/Volo.DependencyInjection.xproj b/src/Volo.DependencyInjection/Volo.DependencyInjection.xproj index 7bc2713b81..c8b527e090 100644 --- a/src/Volo.DependencyInjection/Volo.DependencyInjection.xproj +++ b/src/Volo.DependencyInjection/Volo.DependencyInjection.xproj @@ -7,7 +7,8 @@ f6f172f4-977b-4e20-bb9d-d4b083624011 - Volo + + .\obj .\bin\ v4.6.1 diff --git a/src/Volo.DependencyInjection/DependencyInjection/DisableAutoDependencyInjectionRegistrationAttribute.cs b/src/Volo.DependencyInjection/Volo/DependencyInjection/DisableAutoDependencyInjectionRegistrationAttribute.cs similarity index 100% rename from src/Volo.DependencyInjection/DependencyInjection/DisableAutoDependencyInjectionRegistrationAttribute.cs rename to src/Volo.DependencyInjection/Volo/DependencyInjection/DisableAutoDependencyInjectionRegistrationAttribute.cs diff --git a/src/Volo.DependencyInjection/DependencyInjection/ExposeServicesAttribute.cs b/src/Volo.DependencyInjection/Volo/DependencyInjection/ExposeServicesAttribute.cs similarity index 100% rename from src/Volo.DependencyInjection/DependencyInjection/ExposeServicesAttribute.cs rename to src/Volo.DependencyInjection/Volo/DependencyInjection/ExposeServicesAttribute.cs diff --git a/src/Volo.DependencyInjection/DependencyInjection/IExposedServiceTypesProvider.cs b/src/Volo.DependencyInjection/Volo/DependencyInjection/IExposedServiceTypesProvider.cs similarity index 100% rename from src/Volo.DependencyInjection/DependencyInjection/IExposedServiceTypesProvider.cs rename to src/Volo.DependencyInjection/Volo/DependencyInjection/IExposedServiceTypesProvider.cs diff --git a/src/Volo.DependencyInjection/DependencyInjection/IObjectAccessor.cs b/src/Volo.DependencyInjection/Volo/DependencyInjection/IObjectAccessor.cs similarity index 100% rename from src/Volo.DependencyInjection/DependencyInjection/IObjectAccessor.cs rename to src/Volo.DependencyInjection/Volo/DependencyInjection/IObjectAccessor.cs diff --git a/src/Volo.DependencyInjection/DependencyInjection/IScopedDependency.cs b/src/Volo.DependencyInjection/Volo/DependencyInjection/IScopedDependency.cs similarity index 100% rename from src/Volo.DependencyInjection/DependencyInjection/IScopedDependency.cs rename to src/Volo.DependencyInjection/Volo/DependencyInjection/IScopedDependency.cs diff --git a/src/Volo.DependencyInjection/DependencyInjection/ISingletonDependency.cs b/src/Volo.DependencyInjection/Volo/DependencyInjection/ISingletonDependency.cs similarity index 100% rename from src/Volo.DependencyInjection/DependencyInjection/ISingletonDependency.cs rename to src/Volo.DependencyInjection/Volo/DependencyInjection/ISingletonDependency.cs diff --git a/src/Volo.DependencyInjection/DependencyInjection/ITransientDependency.cs b/src/Volo.DependencyInjection/Volo/DependencyInjection/ITransientDependency.cs similarity index 100% rename from src/Volo.DependencyInjection/DependencyInjection/ITransientDependency.cs rename to src/Volo.DependencyInjection/Volo/DependencyInjection/ITransientDependency.cs diff --git a/src/Volo.DependencyInjection/DependencyInjection/ObjectAccessor.cs b/src/Volo.DependencyInjection/Volo/DependencyInjection/ObjectAccessor.cs similarity index 100% rename from src/Volo.DependencyInjection/DependencyInjection/ObjectAccessor.cs rename to src/Volo.DependencyInjection/Volo/DependencyInjection/ObjectAccessor.cs diff --git a/src/Volo.DependencyInjection/Internal/AssemblyHelper.cs b/src/Volo.DependencyInjection/Volo/Internal/AssemblyHelper.cs similarity index 100% rename from src/Volo.DependencyInjection/Internal/AssemblyHelper.cs rename to src/Volo.DependencyInjection/Volo/Internal/AssemblyHelper.cs diff --git a/src/Volo.ExtensionMethods/Volo.ExtensionMethods.xproj b/src/Volo.ExtensionMethods/Volo.ExtensionMethods.xproj index a30b12f5b1..256e71750c 100644 --- a/src/Volo.ExtensionMethods/Volo.ExtensionMethods.xproj +++ b/src/Volo.ExtensionMethods/Volo.ExtensionMethods.xproj @@ -7,7 +7,8 @@ fc889503-0bf4-4959-ac80-f51073787025 - Volo + + .\obj .\bin\ v4.6.1 diff --git a/src/Volo.ExtensionMethods/Check.cs b/src/Volo.ExtensionMethods/Volo/Check.cs similarity index 100% rename from src/Volo.ExtensionMethods/Check.cs rename to src/Volo.ExtensionMethods/Volo/Check.cs diff --git a/src/Volo.ExtensionMethods/ExtensionMethods/Collections/Generic/CollectionExtensions.cs b/src/Volo.ExtensionMethods/Volo/ExtensionMethods/Collections/Generic/CollectionExtensions.cs similarity index 100% rename from src/Volo.ExtensionMethods/ExtensionMethods/Collections/Generic/CollectionExtensions.cs rename to src/Volo.ExtensionMethods/Volo/ExtensionMethods/Collections/Generic/CollectionExtensions.cs diff --git a/src/Volo.ExtensionMethods/ExtensionMethods/Collections/Generic/DictionaryExtensions.cs b/src/Volo.ExtensionMethods/Volo/ExtensionMethods/Collections/Generic/DictionaryExtensions.cs similarity index 100% rename from src/Volo.ExtensionMethods/ExtensionMethods/Collections/Generic/DictionaryExtensions.cs rename to src/Volo.ExtensionMethods/Volo/ExtensionMethods/Collections/Generic/DictionaryExtensions.cs diff --git a/src/Volo.ExtensionMethods/ExtensionMethods/Collections/Generic/EnumerableExtensions.cs b/src/Volo.ExtensionMethods/Volo/ExtensionMethods/Collections/Generic/EnumerableExtensions.cs similarity index 100% rename from src/Volo.ExtensionMethods/ExtensionMethods/Collections/Generic/EnumerableExtensions.cs rename to src/Volo.ExtensionMethods/Volo/ExtensionMethods/Collections/Generic/EnumerableExtensions.cs diff --git a/src/Volo.ExtensionMethods/ExtensionMethods/Collections/Generic/ListExtensions.cs b/src/Volo.ExtensionMethods/Volo/ExtensionMethods/Collections/Generic/ListExtensions.cs similarity index 100% rename from src/Volo.ExtensionMethods/ExtensionMethods/Collections/Generic/ListExtensions.cs rename to src/Volo.ExtensionMethods/Volo/ExtensionMethods/Collections/Generic/ListExtensions.cs diff --git a/src/Volo.ExtensionMethods/ExtensionMethods/ComparableExtensions.cs b/src/Volo.ExtensionMethods/Volo/ExtensionMethods/ComparableExtensions.cs similarity index 100% rename from src/Volo.ExtensionMethods/ExtensionMethods/ComparableExtensions.cs rename to src/Volo.ExtensionMethods/Volo/ExtensionMethods/ComparableExtensions.cs diff --git a/src/Volo.ExtensionMethods/ExtensionMethods/DayOfWeekExtensions.cs b/src/Volo.ExtensionMethods/Volo/ExtensionMethods/DayOfWeekExtensions.cs similarity index 100% rename from src/Volo.ExtensionMethods/ExtensionMethods/DayOfWeekExtensions.cs rename to src/Volo.ExtensionMethods/Volo/ExtensionMethods/DayOfWeekExtensions.cs diff --git a/src/Volo.ExtensionMethods/ExtensionMethods/EventHandlerExtensions.cs b/src/Volo.ExtensionMethods/Volo/ExtensionMethods/EventHandlerExtensions.cs similarity index 100% rename from src/Volo.ExtensionMethods/ExtensionMethods/EventHandlerExtensions.cs rename to src/Volo.ExtensionMethods/Volo/ExtensionMethods/EventHandlerExtensions.cs diff --git a/src/Volo.ExtensionMethods/ExtensionMethods/ExceptionExtensions.cs b/src/Volo.ExtensionMethods/Volo/ExtensionMethods/ExceptionExtensions.cs similarity index 100% rename from src/Volo.ExtensionMethods/ExtensionMethods/ExceptionExtensions.cs rename to src/Volo.ExtensionMethods/Volo/ExtensionMethods/ExceptionExtensions.cs diff --git a/src/Volo.ExtensionMethods/ExtensionMethods/ObjectExtensions.cs b/src/Volo.ExtensionMethods/Volo/ExtensionMethods/ObjectExtensions.cs similarity index 100% rename from src/Volo.ExtensionMethods/ExtensionMethods/ObjectExtensions.cs rename to src/Volo.ExtensionMethods/Volo/ExtensionMethods/ObjectExtensions.cs diff --git a/src/Volo.ExtensionMethods/ExtensionMethods/StringExtensions.cs b/src/Volo.ExtensionMethods/Volo/ExtensionMethods/StringExtensions.cs similarity index 100% rename from src/Volo.ExtensionMethods/ExtensionMethods/StringExtensions.cs rename to src/Volo.ExtensionMethods/Volo/ExtensionMethods/StringExtensions.cs diff --git a/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.xproj b/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.xproj index 5fec7c1689..cfe78af7db 100644 --- a/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.xproj +++ b/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.xproj @@ -4,18 +4,17 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - b1d860bb-6ec6-4bae-adaa-c2aec2ffb510 - Volo.Abp.AspNetCore.Tests + + .\obj .\bin\ v4.6.1 - 2.0 - + \ No newline at end of file diff --git a/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.xproj b/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.xproj index a34afbd089..a26006a441 100644 --- a/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.xproj +++ b/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.xproj @@ -4,18 +4,17 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - 05271341-7a15-484c-9fd6-802a4193f4de - Volo.Abp.MultiTenancy.Tests + + .\obj .\bin\ v4.6.1 - 2.0 - + \ No newline at end of file diff --git a/test/Volo.Abp.Tests/AbpApplication_Tests.cs b/test/Volo.Abp.Tests/AbpApplication_Tests.cs index d8858fafb6..12da9b7695 100644 --- a/test/Volo.Abp.Tests/AbpApplication_Tests.cs +++ b/test/Volo.Abp.Tests/AbpApplication_Tests.cs @@ -1,31 +1,29 @@ using Microsoft.Extensions.DependencyInjection; using Shouldly; -using Volo.Abp.Tests.Modularity; +using Volo.Abp; +using Volo.Abp.Modularity; using Xunit; -namespace Volo.Abp.Tests +public class AbpApplication_Tests { - public class AbpApplication_Tests + [Fact] + public void Should_Initialize_SingleModule_Application() { - [Fact] - public void Should_Initialize_SingleModule_Application() - { - //Arrange + //Arrange - var services = new ServiceCollection(); + var services = new ServiceCollection(); - using (var application = AbpApplication.Create(services)) - { - //Act + using (var application = AbpApplication.Create(services)) + { + //Act - application.Initialize(services.BuildServiceProvider()); + application.Initialize(services.BuildServiceProvider()); - //Assert + //Assert - var module = application.ServiceProvider.GetRequiredService(); - module.ConfigureServicesIsCalled.ShouldBeTrue(); - module.OnApplicationInitializeIsCalled.ShouldBeTrue(); - } + var module = application.ServiceProvider.GetRequiredService(); + module.ConfigureServicesIsCalled.ShouldBeTrue(); + module.OnApplicationInitializeIsCalled.ShouldBeTrue(); } } -} +} \ No newline at end of file diff --git a/test/Volo.Abp.Tests/Volo.Abp.Tests.xproj b/test/Volo.Abp.Tests/Volo.Abp.Tests.xproj index c18f10d2ed..9763dad6e1 100644 --- a/test/Volo.Abp.Tests/Volo.Abp.Tests.xproj +++ b/test/Volo.Abp.Tests/Volo.Abp.Tests.xproj @@ -7,7 +7,8 @@ e9a85f1b-a5cb-4e19-b2bb-a7f97bb25ee1 - Volo.Abp.Tests + + .\obj .\bin\ v4.6.1 diff --git a/test/Volo.Abp.Tests/Modularity/IndependentEmptyModule.cs b/test/Volo.Abp.Tests/Volo/Abp/Modularity/IndependentEmptyModule.cs similarity index 89% rename from test/Volo.Abp.Tests/Modularity/IndependentEmptyModule.cs rename to test/Volo.Abp.Tests/Volo/Abp/Modularity/IndependentEmptyModule.cs index b5459bd14c..eadc9f8887 100644 --- a/test/Volo.Abp.Tests/Modularity/IndependentEmptyModule.cs +++ b/test/Volo.Abp.Tests/Volo/Abp/Modularity/IndependentEmptyModule.cs @@ -1,7 +1,6 @@ using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Modularity; -namespace Volo.Abp.Tests.Modularity +namespace Volo.Abp.Modularity { public class IndependentEmptyModule : AbpModule { diff --git a/test/Volo.Abp.Tests/Modularity/ModuleLoader_Tests.cs b/test/Volo.Abp.Tests/Volo/Abp/Modularity/ModuleLoader_Tests.cs similarity index 93% rename from test/Volo.Abp.Tests/Modularity/ModuleLoader_Tests.cs rename to test/Volo.Abp.Tests/Volo/Abp/Modularity/ModuleLoader_Tests.cs index 2a541a4450..4452ccdbd8 100644 --- a/test/Volo.Abp.Tests/Modularity/ModuleLoader_Tests.cs +++ b/test/Volo.Abp.Tests/Volo/Abp/Modularity/ModuleLoader_Tests.cs @@ -1,9 +1,8 @@ using Microsoft.Extensions.DependencyInjection; using Shouldly; -using Volo.Abp.Modularity; using Xunit; -namespace Volo.Abp.Tests.Modularity +namespace Volo.Abp.Modularity { public class ModuleLoader_Tests { diff --git a/test/Volo.DependencyInjection.Tests/AbpConventionalDependencyInjectionExtensions_Tests.cs b/test/Volo.DependencyInjection.Tests/Microsoft/Extensions/DependencyInjection/AbpConventionalDependencyInjectionExtensions_Tests.cs similarity index 96% rename from test/Volo.DependencyInjection.Tests/AbpConventionalDependencyInjectionExtensions_Tests.cs rename to test/Volo.DependencyInjection.Tests/Microsoft/Extensions/DependencyInjection/AbpConventionalDependencyInjectionExtensions_Tests.cs index a70cbb1914..bee0615771 100644 --- a/test/Volo.DependencyInjection.Tests/AbpConventionalDependencyInjectionExtensions_Tests.cs +++ b/test/Volo.DependencyInjection.Tests/Microsoft/Extensions/DependencyInjection/AbpConventionalDependencyInjectionExtensions_Tests.cs @@ -1,8 +1,8 @@ -using Microsoft.Extensions.DependencyInjection; -using Shouldly; +using Shouldly; +using Volo.DependencyInjection; using Xunit; -namespace Volo.DependencyInjection.Tests +namespace Microsoft.Extensions.DependencyInjection { public class AbpConventionalDependencyInjectionExtensions_Tests { diff --git a/test/Volo.DependencyInjection.Tests/ServiceCollectionShouldlyExtensions.cs b/test/Volo.DependencyInjection.Tests/Microsoft/Extensions/DependencyInjection/ServiceCollectionShouldlyExtensions.cs similarity index 96% rename from test/Volo.DependencyInjection.Tests/ServiceCollectionShouldlyExtensions.cs rename to test/Volo.DependencyInjection.Tests/Microsoft/Extensions/DependencyInjection/ServiceCollectionShouldlyExtensions.cs index 71b3edb830..abd075ab9b 100644 --- a/test/Volo.DependencyInjection.Tests/ServiceCollectionShouldlyExtensions.cs +++ b/test/Volo.DependencyInjection.Tests/Microsoft/Extensions/DependencyInjection/ServiceCollectionShouldlyExtensions.cs @@ -1,9 +1,8 @@ using System; using System.Linq; -using Microsoft.Extensions.DependencyInjection; using Shouldly; -namespace Volo.DependencyInjection.Tests +namespace Microsoft.Extensions.DependencyInjection { public static class ServiceCollectionShouldlyExtensions { diff --git a/test/Volo.DependencyInjection.Tests/Volo.DependencyInjection.Tests.xproj b/test/Volo.DependencyInjection.Tests/Volo.DependencyInjection.Tests.xproj index 5fc164aa1e..469823b16a 100644 --- a/test/Volo.DependencyInjection.Tests/Volo.DependencyInjection.Tests.xproj +++ b/test/Volo.DependencyInjection.Tests/Volo.DependencyInjection.Tests.xproj @@ -7,7 +7,8 @@ d68b762e-2a55-4a9f-9f2f-d4361b0925b0 - Volo.DependencyInjection.Tests + + .\obj .\bin\ v4.6.1 diff --git a/test/Volo.ExtensionMethods.Tests/Volo.ExtensionMethods.Tests.xproj b/test/Volo.ExtensionMethods.Tests/Volo.ExtensionMethods.Tests.xproj index 7476ebf9d1..adb273a6f2 100644 --- a/test/Volo.ExtensionMethods.Tests/Volo.ExtensionMethods.Tests.xproj +++ b/test/Volo.ExtensionMethods.Tests/Volo.ExtensionMethods.Tests.xproj @@ -7,7 +7,8 @@ b520b696-86c7-46d2-a359-c2e9013a7bed - Volo.ExtensionMethods.Tests + + .\obj .\bin\ v4.6.1 diff --git a/test/Volo.ExtensionMethods.Tests/ComparableExtensions_Tests.cs b/test/Volo.ExtensionMethods.Tests/Volo/ExtensionMethods/ComparableExtensions_Tests.cs similarity index 95% rename from test/Volo.ExtensionMethods.Tests/ComparableExtensions_Tests.cs rename to test/Volo.ExtensionMethods.Tests/Volo/ExtensionMethods/ComparableExtensions_Tests.cs index 00eb8840ba..61805523bf 100644 --- a/test/Volo.ExtensionMethods.Tests/ComparableExtensions_Tests.cs +++ b/test/Volo.ExtensionMethods.Tests/Volo/ExtensionMethods/ComparableExtensions_Tests.cs @@ -2,7 +2,7 @@ using Shouldly; using Xunit; -namespace Volo.ExtensionMethods.Tests +namespace Volo.ExtensionMethods { public class ComparableExtensions_Tests { diff --git a/test/Volo.ExtensionMethods.Tests/DayOfWeekExtensions_Tests.cs b/test/Volo.ExtensionMethods.Tests/Volo/ExtensionMethods/DayOfWeekExtensions_Tests.cs similarity index 95% rename from test/Volo.ExtensionMethods.Tests/DayOfWeekExtensions_Tests.cs rename to test/Volo.ExtensionMethods.Tests/Volo/ExtensionMethods/DayOfWeekExtensions_Tests.cs index 8f99793553..97874ca977 100644 --- a/test/Volo.ExtensionMethods.Tests/DayOfWeekExtensions_Tests.cs +++ b/test/Volo.ExtensionMethods.Tests/Volo/ExtensionMethods/DayOfWeekExtensions_Tests.cs @@ -2,7 +2,7 @@ using System; using Shouldly; using Xunit; -namespace Volo.ExtensionMethods.Tests +namespace Volo.ExtensionMethods { public class DayOfWeekExtensions_Tests { diff --git a/test/Volo.ExtensionMethods.Tests/ObjectExtension_Test.cs b/test/Volo.ExtensionMethods.Tests/Volo/ExtensionMethods/ObjectExtension_Test.cs similarity index 97% rename from test/Volo.ExtensionMethods.Tests/ObjectExtension_Test.cs rename to test/Volo.ExtensionMethods.Tests/Volo/ExtensionMethods/ObjectExtension_Test.cs index 06fbb6d7da..df395c323c 100644 --- a/test/Volo.ExtensionMethods.Tests/ObjectExtension_Test.cs +++ b/test/Volo.ExtensionMethods.Tests/Volo/ExtensionMethods/ObjectExtension_Test.cs @@ -2,7 +2,7 @@ using Shouldly; using Xunit; -namespace Volo.ExtensionMethods.Tests +namespace Volo.ExtensionMethods { public class ObjectExtensions_Tests { diff --git a/test/Volo.ExtensionMethods.Tests/StringExtensions_Tests.cs b/test/Volo.ExtensionMethods.Tests/Volo/ExtensionMethods/StringExtensions_Tests.cs similarity index 99% rename from test/Volo.ExtensionMethods.Tests/StringExtensions_Tests.cs rename to test/Volo.ExtensionMethods.Tests/Volo/ExtensionMethods/StringExtensions_Tests.cs index a9c50c56d5..109c00e718 100644 --- a/test/Volo.ExtensionMethods.Tests/StringExtensions_Tests.cs +++ b/test/Volo.ExtensionMethods.Tests/Volo/ExtensionMethods/StringExtensions_Tests.cs @@ -2,7 +2,7 @@ using Shouldly; using Xunit; -namespace Volo.ExtensionMethods.Tests +namespace Volo.ExtensionMethods { public class StringExtensions_Tests {