From b9a82ff6a9c69be427911f633bdfe253742940ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Fri, 9 Dec 2016 14:20:09 +0300 Subject: [PATCH] Created Volo.Abp.AspNetCore.TestBase package. --- Volo.Abp.sln | 7 +++++++ .../Properties/AssemblyInfo.cs | 19 ++++++++++++++++++ .../Volo.Abp.AspNetCore.TestBase.xproj | 20 +++++++++++++++++++ .../AbpAspNetCoreIntegratedTestBase.cs | 0 src/Volo.Abp.AspNetCore.TestBase/project.json | 15 ++++++++++++++ src/Volo.Abp.AspNetCore/project.json | 3 ++- .../project.json | 3 +-- 7 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 src/Volo.Abp.AspNetCore.TestBase/Properties/AssemblyInfo.cs create mode 100644 src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.xproj rename {test/Volo.Abp.AspNetCore.MultiTenancy.Tests => src/Volo.Abp.AspNetCore.TestBase}/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreIntegratedTestBase.cs (100%) create mode 100644 src/Volo.Abp.AspNetCore.TestBase/project.json diff --git a/Volo.Abp.sln b/Volo.Abp.sln index 502d2dde2b..dd6ed5ba4a 100644 --- a/Volo.Abp.sln +++ b/Volo.Abp.sln @@ -50,6 +50,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.AspNetCore.MultiTe EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.AspNetCore.MultiTenancy.Tests", "test\Volo.Abp.AspNetCore.MultiTenancy.Tests\Volo.Abp.AspNetCore.MultiTenancy.Tests.xproj", "{2C282467-2CD5-4750-BE1F-CA8BD8ECC6EA}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.AspNetCore.TestBase", "src\Volo.Abp.AspNetCore.TestBase\Volo.Abp.AspNetCore.TestBase.xproj", "{DDEC5D74-212F-41BD-974C-4B4E88E574E1}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -112,6 +114,10 @@ Global {2C282467-2CD5-4750-BE1F-CA8BD8ECC6EA}.Debug|Any CPU.Build.0 = Debug|Any CPU {2C282467-2CD5-4750-BE1F-CA8BD8ECC6EA}.Release|Any CPU.ActiveCfg = Release|Any CPU {2C282467-2CD5-4750-BE1F-CA8BD8ECC6EA}.Release|Any CPU.Build.0 = Release|Any CPU + {DDEC5D74-212F-41BD-974C-4B4E88E574E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DDEC5D74-212F-41BD-974C-4B4E88E574E1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DDEC5D74-212F-41BD-974C-4B4E88E574E1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DDEC5D74-212F-41BD-974C-4B4E88E574E1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -136,5 +142,6 @@ Global {05271341-7A15-484C-9FD6-802A4193F4DE} = {37087D1B-3693-4E96-983D-A69F210BDE53} {7CC7946B-E026-4F66-8D4F-4F78F4801D43} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} {2C282467-2CD5-4750-BE1F-CA8BD8ECC6EA} = {37087D1B-3693-4E96-983D-A69F210BDE53} + {DDEC5D74-212F-41BD-974C-4B4E88E574E1} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} EndGlobalSection EndGlobal diff --git a/src/Volo.Abp.AspNetCore.TestBase/Properties/AssemblyInfo.cs b/src/Volo.Abp.AspNetCore.TestBase/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..bc9bb8cf01 --- /dev/null +++ b/src/Volo.Abp.AspNetCore.TestBase/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.AspNetCore.TestBase")] +[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("ddec5d74-212f-41bd-974c-4b4e88e574e1")] diff --git a/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.xproj b/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.xproj new file mode 100644 index 0000000000..da343e0aff --- /dev/null +++ b/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.xproj @@ -0,0 +1,20 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + ddec5d74-212f-41bd-974c-4b4e88e574e1 + + + .\obj + .\bin\ + v4.6.1 + + + 2.0 + + + \ No newline at end of file diff --git a/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreIntegratedTestBase.cs b/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreIntegratedTestBase.cs similarity index 100% rename from test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreIntegratedTestBase.cs rename to src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreIntegratedTestBase.cs diff --git a/src/Volo.Abp.AspNetCore.TestBase/project.json b/src/Volo.Abp.AspNetCore.TestBase/project.json new file mode 100644 index 0000000000..393c529ea9 --- /dev/null +++ b/src/Volo.Abp.AspNetCore.TestBase/project.json @@ -0,0 +1,15 @@ +{ + "version": "1.0.0-*", + + "dependencies": { + "NETStandard.Library": "1.6.1", + "Volo.Abp.AspNetCore": "1.0.0-*", + "Microsoft.AspNetCore.TestHost": "1.1.0" + }, + + "frameworks": { + "netstandard1.6": { + "imports": "dnxcore50" + } + } +} diff --git a/src/Volo.Abp.AspNetCore/project.json b/src/Volo.Abp.AspNetCore/project.json index f231b64bf2..044b5d6107 100644 --- a/src/Volo.Abp.AspNetCore/project.json +++ b/src/Volo.Abp.AspNetCore/project.json @@ -5,7 +5,8 @@ "NETStandard.Library": "1.6.1", "Volo.Abp": "1.0.0-*", "Microsoft.AspNetCore.Http.Abstractions": "1.1.0", - "Microsoft.AspNetCore.Hosting.Abstractions": "1.1.0" + "Microsoft.AspNetCore.Hosting.Abstractions": "1.1.0", + "Microsoft.AspNetCore.Routing.Abstractions": "1.1.0" }, "frameworks": { diff --git a/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/project.json b/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/project.json index d8078e4e8f..7b3877cad8 100644 --- a/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/project.json +++ b/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/project.json @@ -6,8 +6,7 @@ "dependencies": { "AbpTestBase": "1.0.0-*", "Volo.Abp.AspNetCore.MultiTenancy": "1.0.0-*", - "Microsoft.AspNetCore.TestHost": "1.1.0", - "Microsoft.AspNetCore.Routing.Abstractions": "1.1.0" + "Volo.Abp.AspNetCore.TestBase": "1.0.0-*" }, "frameworks": {