Revised solution and project structure.

src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.xproj

@@ -7,7 +7,8 @@
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>02be03ba-3411-448c-ab61-cb36407cc49a</ProjectGuid>
-    <RootNamespace>Volo</RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>

src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.xproj

@@ -4,18 +4,17 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>58fa9f8f-216d-4c93-8929-d40d22b11ca7</ProjectGuid>
-    <RootNamespace>Volo.Abp.MultiTenancy</RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>

src/Volo.Abp.MultiTenancy/ICurrentTenantAccessor.cs → 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<ICurrentTenantResolver> _currentTenantResolvers;
 
-        public CurrentTenantAccessor(IEnumerable<ICurrentTenantResolver> currentTenantResolvers)
+        public MultiTenancyManager(IEnumerable<ICurrentTenantResolver> currentTenantResolvers)
         {
             _currentTenantResolvers = currentTenantResolvers;
         }
 
-        public virtual Guid GetTenantId()
+        public virtual ITenantInfo GetCurrentTenant()
         {
             throw new NotImplementedException();
         }

src/Volo.Abp/Volo.Abp.xproj

@@ -7,7 +7,8 @@
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>fc5f7372-ea60-4052-b943-0ee070221cc1</ProjectGuid>
-    <RootNamespace>Volo</RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>

src/Volo.DependencyInjection/DependencyInjection/CommonServiceCollectionExtensions.cs → 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
     {

src/Volo.DependencyInjection/DependencyInjection/ServiceCollectionRegistrationExtensions.cs → 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
     {

src/Volo.DependencyInjection/Volo.DependencyInjection.xproj

@@ -7,7 +7,8 @@
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>f6f172f4-977b-4e20-bb9d-d4b083624011</ProjectGuid>
-    <RootNamespace>Volo</RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>

src/Volo.ExtensionMethods/Volo.ExtensionMethods.xproj

@@ -7,7 +7,8 @@
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>fc889503-0bf4-4959-ac80-f51073787025</ProjectGuid>
-    <RootNamespace>Volo</RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>

test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.xproj

@@ -4,18 +4,17 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>b1d860bb-6ec6-4bae-adaa-c2aec2ffb510</ProjectGuid>
-    <RootNamespace>Volo.Abp.AspNetCore.Tests</RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>

test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.xproj

@@ -4,18 +4,17 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>05271341-7a15-484c-9fd6-802a4193f4de</ProjectGuid>
-    <RootNamespace>Volo.Abp.MultiTenancy.Tests</RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>

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]
+        //Arrange
-        public void Should_Initialize_SingleModule_Application()
-        {
-            //Arrange
 
-            var services = new ServiceCollection();
+        var services = new ServiceCollection();
 
-            using (var application = AbpApplication.Create<IndependentEmptyModule>(services))
+        using (var application = AbpApplication.Create<IndependentEmptyModule>(services))
-            {
+        {
-                //Act
+            //Act
 
-                application.Initialize(services.BuildServiceProvider());
+            application.Initialize(services.BuildServiceProvider());
 
-                //Assert
+            //Assert
 
-                var module = application.ServiceProvider.GetRequiredService<IndependentEmptyModule>();
+            var module = application.ServiceProvider.GetRequiredService<IndependentEmptyModule>();
-                module.ConfigureServicesIsCalled.ShouldBeTrue();
+            module.ConfigureServicesIsCalled.ShouldBeTrue();
-                module.OnApplicationInitializeIsCalled.ShouldBeTrue();
+            module.OnApplicationInitializeIsCalled.ShouldBeTrue();
-            }
         }
     }
-}
+}

test/Volo.Abp.Tests/Volo.Abp.Tests.xproj

@@ -7,7 +7,8 @@
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>e9a85f1b-a5cb-4e19-b2bb-a7f97bb25ee1</ProjectGuid>
-    <RootNamespace>Volo.Abp.Tests</RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>

test/Volo.Abp.Tests/Modularity/IndependentEmptyModule.cs → 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
     {

test/Volo.Abp.Tests/Modularity/ModuleLoader_Tests.cs → 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
     {

test/Volo.DependencyInjection.Tests/AbpConventionalDependencyInjectionExtensions_Tests.cs → 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
     {

test/Volo.DependencyInjection.Tests/ServiceCollectionShouldlyExtensions.cs → 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
     {

test/Volo.DependencyInjection.Tests/Volo.DependencyInjection.Tests.xproj

@@ -7,7 +7,8 @@
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>d68b762e-2a55-4a9f-9f2f-d4361b0925b0</ProjectGuid>
-    <RootNamespace>Volo.DependencyInjection.Tests</RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>

test/Volo.ExtensionMethods.Tests/Volo.ExtensionMethods.Tests.xproj

@@ -7,7 +7,8 @@
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>b520b696-86c7-46d2-a359-c2e9013a7bed</ProjectGuid>
-    <RootNamespace>Volo.ExtensionMethods.Tests</RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>

test/Volo.ExtensionMethods.Tests/ComparableExtensions_Tests.cs → 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
     {

test/Volo.ExtensionMethods.Tests/DayOfWeekExtensions_Tests.cs → 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
     {

test/Volo.ExtensionMethods.Tests/ObjectExtension_Test.cs → 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
     {

test/Volo.ExtensionMethods.Tests/StringExtensions_Tests.cs → 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
     {