Browse Source

Upgraded project.json files and added current tenant accessor.

pull/81/head
Halil İbrahim Kalkan 9 years ago
parent
commit
ad680601eb
  1. 14
      Volo.Abp.sln
  2. 41
      src/Volo.Abp.MultiTenancy/ICurrentTenantAccessor.cs
  3. 19
      src/Volo.Abp.MultiTenancy/Properties/AssemblyInfo.cs
  4. 21
      src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.xproj
  5. 14
      src/Volo.Abp.MultiTenancy/project.json
  6. 4
      test/AbpTestBase/project.json
  7. 4
      test/Apps/AspNetCoreDemo/project.json
  8. 4
      test/Volo.Abp.AspNetCore.Tests/project.json
  9. 19
      test/Volo.Abp.MultiTenancy.Tests/Properties/AssemblyInfo.cs
  10. 21
      test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.xproj
  11. 21
      test/Volo.Abp.MultiTenancy.Tests/project.json
  12. 4
      test/Volo.Abp.Tests/project.json
  13. 4
      test/Volo.DependencyInjection.Tests/project.json
  14. 4
      test/Volo.ExtensionMethods.Tests/project.json

14
Volo.Abp.sln

@ -42,6 +42,10 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.ExtensionMethods", "sr
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.ExtensionMethods.Tests", "test\Volo.ExtensionMethods.Tests\Volo.ExtensionMethods.Tests.xproj", "{B520B696-86C7-46D2-A359-C2E9013A7BED}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.MultiTenancy", "src\Volo.Abp.MultiTenancy\Volo.Abp.MultiTenancy.xproj", "{58FA9F8F-216D-4C93-8929-D40D22B11CA7}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.MultiTenancy.Tests", "test\Volo.Abp.MultiTenancy.Tests\Volo.Abp.MultiTenancy.Tests.xproj", "{05271341-7A15-484C-9FD6-802A4193F4DE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -88,6 +92,14 @@ Global
{B520B696-86C7-46D2-A359-C2E9013A7BED}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B520B696-86C7-46D2-A359-C2E9013A7BED}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B520B696-86C7-46D2-A359-C2E9013A7BED}.Release|Any CPU.Build.0 = Release|Any CPU
{58FA9F8F-216D-4C93-8929-D40D22B11CA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{58FA9F8F-216D-4C93-8929-D40D22B11CA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{58FA9F8F-216D-4C93-8929-D40D22B11CA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{58FA9F8F-216D-4C93-8929-D40D22B11CA7}.Release|Any CPU.Build.0 = Release|Any CPU
{05271341-7A15-484C-9FD6-802A4193F4DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{05271341-7A15-484C-9FD6-802A4193F4DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{05271341-7A15-484C-9FD6-802A4193F4DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{05271341-7A15-484C-9FD6-802A4193F4DE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -108,5 +120,7 @@ Global
{12E14D95-4ABA-4290-AB1D-CCF5EB158411} = {A3A3B258-B3D5-4FDE-9D84-CAA8CBB70586}
{FC889503-0BF4-4959-AC80-F51073787025} = {9A4A646B-CC96-44FB-A717-E50C5C148B54}
{B520B696-86C7-46D2-A359-C2E9013A7BED} = {82B41A0A-6068-410F-9C6B-2508CA763E21}
{58FA9F8F-216D-4C93-8929-D40D22B11CA7} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8}
{05271341-7A15-484C-9FD6-802A4193F4DE} = {37087D1B-3693-4E96-983D-A69F210BDE53}
EndGlobalSection
EndGlobal

41
src/Volo.Abp.MultiTenancy/ICurrentTenantAccessor.cs

@ -0,0 +1,41 @@
using System;
using System.Collections.Generic;
namespace Volo.Abp.MultiTenancy
{
public interface ICurrentTenantAccessor
{
Guid Id { get; }
string Name { get; }
}
public class CurrentTenantAccessor : ICurrentTenantAccessor
{
public Guid Id => GetTenantId();
public string Name { get; }
private readonly IEnumerable<ICurrentTenantResolver> _currentTenantResolvers;
public CurrentTenantAccessor(IEnumerable<ICurrentTenantResolver> currentTenantResolvers)
{
_currentTenantResolvers = currentTenantResolvers;
}
public virtual Guid GetTenantId()
{
throw new NotImplementedException();
}
}
public interface ICurrentTenantResolver
{
void Resolve(ICurrentTenantResolveContext context);
}
public interface ICurrentTenantResolveContext
{
}
}

19
src/Volo.Abp.MultiTenancy/Properties/AssemblyInfo.cs

@ -0,0 +1,19 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Volo.Abp.MultiTenancy")]
[assembly: AssemblyTrademark("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("58fa9f8f-216d-4c93-8929-d40d22b11ca7")]

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

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<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>
<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>

14
src/Volo.Abp.MultiTenancy/project.json

@ -0,0 +1,14 @@
{
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.6.1",
"Volo.Abp": "1.0.0-*"
},
"frameworks": {
"netstandard1.6": {
"imports": "dnxcore50"
}
}
}

4
test/AbpTestBase/project.json

@ -10,11 +10,11 @@
},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.1.0"
}
}
}

4
test/Apps/AspNetCoreDemo/project.json

@ -1,7 +1,7 @@
{
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.1",
"version": "1.1.0",
"type": "platform"
},
"Microsoft.AspNetCore.Diagnostics": "1.1.0",
@ -16,7 +16,7 @@
},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"imports": [
"dotnet5.6",
"portable-net45+win8"

4
test/Volo.Abp.AspNetCore.Tests/project.json

@ -9,11 +9,11 @@
},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.1.0"
}
}
}

19
test/Volo.Abp.MultiTenancy.Tests/Properties/AssemblyInfo.cs

@ -0,0 +1,19 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Volo.Abp.MultiTenancy.Tests")]
[assembly: AssemblyTrademark("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("05271341-7a15-484c-9fd6-802a4193f4de")]

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

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<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>
<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>

21
test/Volo.Abp.MultiTenancy.Tests/project.json

@ -0,0 +1,21 @@
{
"version": "1.0.0-*",
"testRunner": "xunit",
"dependencies": {
"AbpTestBase": "1.0.0-*",
"Volo.Abp.MultiTenancy": "1.0.0-*"
},
"frameworks": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.1.0"
}
}
}
}
}

4
test/Volo.Abp.Tests/project.json

@ -10,11 +10,11 @@
},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.1.0"
}
}
}

4
test/Volo.DependencyInjection.Tests/project.json

@ -9,11 +9,11 @@
},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.1.0"
}
}
}

4
test/Volo.ExtensionMethods.Tests/project.json

@ -9,11 +9,11 @@
},
"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.1.0"
}
}
}

Loading…
Cancel
Save