diff --git a/Volo.Abp.sln b/Volo.Abp.sln index 204bd1b52b..df63c27a76 100644 --- a/Volo.Abp.sln +++ b/Volo.Abp.sln @@ -1,113 +1,110 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26228.4 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CBCC288A-53C3-402F-99F7-E468738560F5}" - ProjectSection(SolutionItems) = preProject - global.json = global.json - EndProjectSection -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp", "src\Volo.Abp\Volo.Abp.xproj", "{FC5F7372-EA60-4052-B943-0EE070221CC1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{447C8A77-E5F0-4538-8687-7383196D04EA}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.Tests", "test\Volo.Abp.Tests\Volo.Abp.Tests.xproj", "{E9A85F1B-A5CB-4E19-B2BB-A7F97BB25EE1}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abp", "Abp", "{4C753F64-0C93-4D65-96C2-A40893AFC1E8}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abp", "Abp", "{37087D1B-3693-4E96-983D-A69F210BDE53}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpTestBase", "test\AbpTestBase\AbpTestBase.xproj", "{1020F5FD-6A97-40C2-AFCA-EBDF641DF111}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AbpDesk", "AbpDesk", "{1187F469-0063-4065-9419-A1D956C80145}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.AspNetCore", "src\Volo.Abp.AspNetCore\Volo.Abp.AspNetCore.xproj", "{02BE03BA-3411-448C-AB61-CB36407CC49A}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AbpDesk", "AbpDesk", "{61708AC8-CE70-4351-9B31-13EA8213D208}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.AspNetCore.Tests", "test\Volo.Abp.AspNetCore.Tests\Volo.Abp.AspNetCore.Tests.xproj", "{B1D860BB-6EC6-4BAE-ADAA-C2AEC2FFB510}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abp.Identity", "Abp.Identity", "{1895A5C9-50D4-4568-9A3A-14657E615A5E}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.MultiTenancy", "src\Volo.Abp.MultiTenancy\Volo.Abp.MultiTenancy.xproj", "{58FA9F8F-216D-4C93-8929-D40D22B11CA7}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abp.Identity", "Abp.Identity", "{146F561E-C7B8-4166-9383-47E1BC1A2E62}" 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}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docker-files", "docker-files", "{0BEA55D6-E0B8-40DD-A256-B34C4DD990A5}" + ProjectSection(SolutionItems) = preProject + docker\docker-compose.yml = docker\docker-compose.yml + docker\down.ps1 = docker\down.ps1 + docker\haproxy.cfg = docker\haproxy.cfg + docker\up.ps1 = docker\up.ps1 + EndProjectSection EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.AspNetCore.MultiTenancy", "src\Volo.Abp.AspNetCore.MultiTenancy\Volo.Abp.AspNetCore.MultiTenancy.xproj", "{7CC7946B-E026-4F66-8D4F-4F78F4801D43}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abp.UI", "Abp.UI", "{6F776E78-862A-4147-86BA-12B6B64E8958}" 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}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6D893E48-0739-401A-9AD1-286BCB6E5517}" + ProjectSection(SolutionItems) = preProject + build\build.ps1 = build\build.ps1 + EndProjectSection 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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp", "src\Volo.Abp\Volo.Abp.csproj", "{FC5F7372-EA60-4052-B943-0EE070221CC1}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.EntityFrameworkCore", "src\Volo.Abp.EntityFrameworkCore\Volo.Abp.EntityFrameworkCore.xproj", "{A1AE63E9-0CF4-4AFB-A584-65D826DEA3CB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Tests", "test\Volo.Abp.Tests\Volo.Abp.Tests.csproj", "{E9A85F1B-A5CB-4E19-B2BB-A7F97BB25EE1}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AbpDesk", "AbpDesk", "{1187F469-0063-4065-9419-A1D956C80145}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbpTestBase", "test\AbpTestBase\AbpTestBase.csproj", "{1020F5FD-6A97-40C2-AFCA-EBDF641DF111}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpDesk.Domain", "src\AbpDesk\AbpDesk.Domain\AbpDesk.Domain.xproj", "{2DBA20A3-8B1C-49F0-90F6-EB09DB78B1B8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore", "src\Volo.Abp.AspNetCore\Volo.Abp.AspNetCore.csproj", "{02BE03BA-3411-448C-AB61-CB36407CC49A}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpDesk.Application.Contracts", "src\AbpDesk\AbpDesk.Application.Contracts\AbpDesk.Application.Contracts.xproj", "{E45B2BA3-7917-4236-99CD-B0A25285A652}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.Tests", "test\Volo.Abp.AspNetCore.Tests\Volo.Abp.AspNetCore.Tests.csproj", "{B1D860BB-6EC6-4BAE-ADAA-C2AEC2FFB510}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpDesk.Application", "src\AbpDesk\AbpDesk.Application\AbpDesk.Application.xproj", "{B6E622CE-0AEE-45DA-81AB-C244196CB583}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.MultiTenancy", "src\Volo.Abp.MultiTenancy\Volo.Abp.MultiTenancy.csproj", "{58FA9F8F-216D-4C93-8929-D40D22B11CA7}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpDesk.EntityFrameworkCore", "src\AbpDesk\AbpDesk.EntityFrameworkCore\AbpDesk.EntityFrameworkCore.xproj", "{35624E7C-6501-4B42-9AA7-70555666A8B3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.MultiTenancy.Tests", "test\Volo.Abp.MultiTenancy.Tests\Volo.Abp.MultiTenancy.Tests.csproj", "{05271341-7A15-484C-9FD6-802A4193F4DE}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpDesk.ConsoleDemo", "src\AbpDesk\AbpDesk.ConsoleDemo\AbpDesk.ConsoleDemo.xproj", "{1A1575D7-E57E-4A40-8113-FD01BB1753D5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.MultiTenancy", "src\Volo.Abp.AspNetCore.MultiTenancy\Volo.Abp.AspNetCore.MultiTenancy.csproj", "{7CC7946B-E026-4F66-8D4F-4F78F4801D43}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.AspNetCore.Mvc", "src\Volo.Abp.AspNetCore.Mvc\Volo.Abp.AspNetCore.Mvc.xproj", "{3FB342CA-23B6-4795-91EF-C664527C07B7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.MultiTenancy.Tests", "test\Volo.Abp.AspNetCore.MultiTenancy.Tests\Volo.Abp.AspNetCore.MultiTenancy.Tests.csproj", "{2C282467-2CD5-4750-BE1F-CA8BD8ECC6EA}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AbpDesk", "AbpDesk", "{61708AC8-CE70-4351-9B31-13EA8213D208}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.TestBase", "src\Volo.Abp.AspNetCore.TestBase\Volo.Abp.AspNetCore.TestBase.csproj", "{DDEC5D74-212F-41BD-974C-4B4E88E574E1}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpDesk.Application.Tests", "test\AbpDesk\AbpDesk.Application.Tests\AbpDesk.Application.Tests.xproj", "{E6E2467C-184A-4A0A-929F-932D5097953E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.EntityFrameworkCore", "src\Volo.Abp.EntityFrameworkCore\Volo.Abp.EntityFrameworkCore.csproj", "{A1AE63E9-0CF4-4AFB-A584-65D826DEA3CB}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.TestBase", "src\Volo.Abp.TestBase\Volo.Abp.TestBase.xproj", "{8CECCEAF-F0D8-4257-96BA-EACF4763AF42}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbpDesk.Domain", "src\AbpDesk\AbpDesk.Domain\AbpDesk.Domain.csproj", "{2DBA20A3-8B1C-49F0-90F6-EB09DB78B1B8}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpDesk.Web.Mvc", "src\AbpDesk\AbpDesk.Web.Mvc\AbpDesk.Web.Mvc.xproj", "{12E14D95-4ABA-4290-AB1D-CCF5EB158411}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbpDesk.Application.Contracts", "src\AbpDesk\AbpDesk.Application.Contracts\AbpDesk.Application.Contracts.csproj", "{E45B2BA3-7917-4236-99CD-B0A25285A652}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abp.Identity", "Abp.Identity", "{1895A5C9-50D4-4568-9A3A-14657E615A5E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbpDesk.Application", "src\AbpDesk\AbpDesk.Application\AbpDesk.Application.csproj", "{B6E622CE-0AEE-45DA-81AB-C244196CB583}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.Identity", "src\Volo.Abp.Identity\Volo.Abp.Identity.xproj", "{17DBB40A-243E-41F7-A672-FA316ECB1E33}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbpDesk.EntityFrameworkCore", "src\AbpDesk\AbpDesk.EntityFrameworkCore\AbpDesk.EntityFrameworkCore.csproj", "{35624E7C-6501-4B42-9AA7-70555666A8B3}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abp.Identity", "Abp.Identity", "{146F561E-C7B8-4166-9383-47E1BC1A2E62}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbpDesk.ConsoleDemo", "src\AbpDesk\AbpDesk.ConsoleDemo\AbpDesk.ConsoleDemo.csproj", "{1A1575D7-E57E-4A40-8113-FD01BB1753D5}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.Identity.EntityFrameworkCore", "src\Volo.Abp.Identity.EntityFrameworkCore\Volo.Abp.Identity.EntityFrameworkCore.xproj", "{439DFC0F-1BA2-464F-900E-EA7E18C08975}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.Mvc", "src\Volo.Abp.AspNetCore.Mvc\Volo.Abp.AspNetCore.Mvc.csproj", "{3FB342CA-23B6-4795-91EF-C664527C07B7}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.Identity.Tests", "test\Volo.Abp.Identity.Tests\Volo.Abp.Identity.Tests.xproj", "{4AB91077-82DC-4335-9274-BCE017BD9C8B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbpDesk.Application.Tests", "test\AbpDesk\AbpDesk.Application.Tests\AbpDesk.Application.Tests.csproj", "{E6E2467C-184A-4A0A-929F-932D5097953E}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.MongoDB", "src\Volo.Abp.MongoDB\Volo.Abp.MongoDB.xproj", "{B31FFAE3-5DAC-4E51-BD17-F7446B741A36}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.TestBase", "src\Volo.Abp.TestBase\Volo.Abp.TestBase.csproj", "{8CECCEAF-F0D8-4257-96BA-EACF4763AF42}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpDesk.MongoBlog", "src\AbpDesk\AbpDesk.MongoBlog\AbpDesk.MongoBlog.xproj", "{63244DC7-34BE-44E1-BF6F-F2672E59AF36}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbpDesk.Web.Mvc", "src\AbpDesk\AbpDesk.Web.Mvc\AbpDesk.Web.Mvc.csproj", "{12E14D95-4ABA-4290-AB1D-CCF5EB158411}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpDesk.SamplePlugInModule", "src\AbpDesk\AbpDesk.SamplePlugInModule\AbpDesk.SamplePlugInModule.xproj", "{ADFAF85B-B785-41EA-B57D-422775989FA6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Identity", "src\Volo.Abp.Identity\Volo.Abp.Identity.csproj", "{17DBB40A-243E-41F7-A672-FA316ECB1E33}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docker-files", "docker-files", "{0BEA55D6-E0B8-40DD-A256-B34C4DD990A5}" - ProjectSection(SolutionItems) = preProject - docker\docker-compose.yml = docker\docker-compose.yml - docker\down.ps1 = docker\down.ps1 - docker\haproxy.cfg = docker\haproxy.cfg - docker\up.ps1 = docker\up.ps1 - EndProjectSection +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Identity.EntityFrameworkCore", "src\Volo.Abp.Identity.EntityFrameworkCore\Volo.Abp.Identity.EntityFrameworkCore.csproj", "{439DFC0F-1BA2-464F-900E-EA7E18C08975}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.AspNetCore.Mvc.UI", "src\Volo.Abp.AspNetCore.Mvc.UI\Volo.Abp.AspNetCore.Mvc.UI.xproj", "{BF9AB22C-F48D-4DDE-A894-BC28EB37166B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Identity.Tests", "test\Volo.Abp.Identity.Tests\Volo.Abp.Identity.Tests.csproj", "{4AB91077-82DC-4335-9274-BCE017BD9C8B}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.AspNetCore.EmbeddedFiles", "src\Volo.Abp.AspNetCore.EmbeddedFiles\Volo.Abp.AspNetCore.EmbeddedFiles.xproj", "{B6182BF1-9EC6-403D-A42C-D6441CF7B390}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.MongoDB", "src\Volo.Abp.MongoDB\Volo.Abp.MongoDB.csproj", "{B31FFAE3-5DAC-4E51-BD17-F7446B741A36}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abp.UI", "Abp.UI", "{6F776E78-862A-4147-86BA-12B6B64E8958}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbpDesk.MongoBlog", "src\AbpDesk\AbpDesk.MongoBlog\AbpDesk.MongoBlog.csproj", "{63244DC7-34BE-44E1-BF6F-F2672E59AF36}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.AspNetCore.Mvc.UI.Bootstrap", "src\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.xproj", "{C761A3F7-787D-4C7E-A41C-5FAB07F6B774}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbpDesk.SamplePlugInModule", "src\AbpDesk\AbpDesk.SamplePlugInModule\AbpDesk.SamplePlugInModule.csproj", "{ADFAF85B-B785-41EA-B57D-422775989FA6}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.Identity.Application.Contracts", "src\Volo.Abp.Identity.Application.Contracts\Volo.Abp.Identity.Application.Contracts.xproj", "{C714A3AB-8402-4DC2-B120-ACCB2E29BD8F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.Mvc.UI", "src\Volo.Abp.AspNetCore.Mvc.UI\Volo.Abp.AspNetCore.Mvc.UI.csproj", "{BF9AB22C-F48D-4DDE-A894-BC28EB37166B}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.Identity.Application", "src\Volo.Abp.Identity.Application\Volo.Abp.Identity.Application.xproj", "{54592671-9CB6-48AE-9AE0-84CD016E87FF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.EmbeddedFiles", "src\Volo.Abp.AspNetCore.EmbeddedFiles\Volo.Abp.AspNetCore.EmbeddedFiles.csproj", "{B6182BF1-9EC6-403D-A42C-D6441CF7B390}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.Identity.HttpApi", "src\Volo.Abp.Identity.HttpApi\Volo.Abp.Identity.HttpApi.xproj", "{57FCA6CB-9D99-411E-8ABF-20ACFBD61D61}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.Mvc.UI.Bootstrap", "src\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap\Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj", "{C761A3F7-787D-4C7E-A41C-5FAB07F6B774}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.Identity.HttpApi.Host", "src\Volo.Abp.Identity.HttpApi.Host\Volo.Abp.Identity.HttpApi.Host.xproj", "{EB902D57-C047-4CDF-828B-FDC204AC7398}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Identity.Application.Contracts", "src\Volo.Abp.Identity.Application.Contracts\Volo.Abp.Identity.Application.Contracts.csproj", "{C714A3AB-8402-4DC2-B120-ACCB2E29BD8F}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.Identity.Web", "src\Volo.Abp.Identity.Web\Volo.Abp.Identity.Web.xproj", "{17B14A48-5248-4F4C-A8E6-6926AA94EB7C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Identity.Application", "src\Volo.Abp.Identity.Application\Volo.Abp.Identity.Application.csproj", "{54592671-9CB6-48AE-9AE0-84CD016E87FF}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6D893E48-0739-401A-9AD1-286BCB6E5517}" - ProjectSection(SolutionItems) = preProject - build\build.ps1 = build\build.ps1 - EndProjectSection +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Identity.HttpApi", "src\Volo.Abp.Identity.HttpApi\Volo.Abp.Identity.HttpApi.csproj", "{57FCA6CB-9D99-411E-8ABF-20ACFBD61D61}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Identity.HttpApi.Host", "src\Volo.Abp.Identity.HttpApi.Host\Volo.Abp.Identity.HttpApi.Host.csproj", "{EB902D57-C047-4CDF-828B-FDC204AC7398}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.Identity.HttpApi.Client", "src\Volo.Abp.Identity.HttpApi.Client\Volo.Abp.Identity.HttpApi.Client.xproj", "{00B240B6-EC44-461A-9578-EF4F1BE9C688}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Identity.Web", "src\Volo.Abp.Identity.Web\Volo.Abp.Identity.Web.csproj", "{17B14A48-5248-4F4C-A8E6-6926AA94EB7C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Identity.HttpApi.Client", "src\Volo.Abp.Identity.HttpApi.Client\Volo.Abp.Identity.HttpApi.Client.csproj", "{00B240B6-EC44-461A-9578-EF4F1BE9C688}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -260,10 +257,17 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {FC5F7372-EA60-4052-B943-0EE070221CC1} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} - {E9A85F1B-A5CB-4E19-B2BB-A7F97BB25EE1} = {37087D1B-3693-4E96-983D-A69F210BDE53} {4C753F64-0C93-4D65-96C2-A40893AFC1E8} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {37087D1B-3693-4E96-983D-A69F210BDE53} = {447C8A77-E5F0-4538-8687-7383196D04EA} + {1187F469-0063-4065-9419-A1D956C80145} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} + {61708AC8-CE70-4351-9B31-13EA8213D208} = {447C8A77-E5F0-4538-8687-7383196D04EA} + {1895A5C9-50D4-4568-9A3A-14657E615A5E} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} + {146F561E-C7B8-4166-9383-47E1BC1A2E62} = {447C8A77-E5F0-4538-8687-7383196D04EA} + {0BEA55D6-E0B8-40DD-A256-B34C4DD990A5} = {CBCC288A-53C3-402F-99F7-E468738560F5} + {6F776E78-862A-4147-86BA-12B6B64E8958} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} + {6D893E48-0739-401A-9AD1-286BCB6E5517} = {CBCC288A-53C3-402F-99F7-E468738560F5} + {FC5F7372-EA60-4052-B943-0EE070221CC1} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} + {E9A85F1B-A5CB-4E19-B2BB-A7F97BB25EE1} = {37087D1B-3693-4E96-983D-A69F210BDE53} {1020F5FD-6A97-40C2-AFCA-EBDF641DF111} = {447C8A77-E5F0-4538-8687-7383196D04EA} {02BE03BA-3411-448C-AB61-CB36407CC49A} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} {B1D860BB-6EC6-4BAE-ADAA-C2AEC2FFB510} = {37087D1B-3693-4E96-983D-A69F210BDE53} @@ -273,36 +277,29 @@ Global {2C282467-2CD5-4750-BE1F-CA8BD8ECC6EA} = {37087D1B-3693-4E96-983D-A69F210BDE53} {DDEC5D74-212F-41BD-974C-4B4E88E574E1} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} {A1AE63E9-0CF4-4AFB-A584-65D826DEA3CB} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} - {1187F469-0063-4065-9419-A1D956C80145} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {2DBA20A3-8B1C-49F0-90F6-EB09DB78B1B8} = {1187F469-0063-4065-9419-A1D956C80145} {E45B2BA3-7917-4236-99CD-B0A25285A652} = {1187F469-0063-4065-9419-A1D956C80145} {B6E622CE-0AEE-45DA-81AB-C244196CB583} = {1187F469-0063-4065-9419-A1D956C80145} {35624E7C-6501-4B42-9AA7-70555666A8B3} = {1187F469-0063-4065-9419-A1D956C80145} {1A1575D7-E57E-4A40-8113-FD01BB1753D5} = {1187F469-0063-4065-9419-A1D956C80145} {3FB342CA-23B6-4795-91EF-C664527C07B7} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} - {61708AC8-CE70-4351-9B31-13EA8213D208} = {447C8A77-E5F0-4538-8687-7383196D04EA} {E6E2467C-184A-4A0A-929F-932D5097953E} = {61708AC8-CE70-4351-9B31-13EA8213D208} {8CECCEAF-F0D8-4257-96BA-EACF4763AF42} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} {12E14D95-4ABA-4290-AB1D-CCF5EB158411} = {1187F469-0063-4065-9419-A1D956C80145} - {1895A5C9-50D4-4568-9A3A-14657E615A5E} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {17DBB40A-243E-41F7-A672-FA316ECB1E33} = {1895A5C9-50D4-4568-9A3A-14657E615A5E} - {146F561E-C7B8-4166-9383-47E1BC1A2E62} = {447C8A77-E5F0-4538-8687-7383196D04EA} {439DFC0F-1BA2-464F-900E-EA7E18C08975} = {1895A5C9-50D4-4568-9A3A-14657E615A5E} {4AB91077-82DC-4335-9274-BCE017BD9C8B} = {146F561E-C7B8-4166-9383-47E1BC1A2E62} {B31FFAE3-5DAC-4E51-BD17-F7446B741A36} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} {63244DC7-34BE-44E1-BF6F-F2672E59AF36} = {1187F469-0063-4065-9419-A1D956C80145} {ADFAF85B-B785-41EA-B57D-422775989FA6} = {1187F469-0063-4065-9419-A1D956C80145} - {0BEA55D6-E0B8-40DD-A256-B34C4DD990A5} = {CBCC288A-53C3-402F-99F7-E468738560F5} {BF9AB22C-F48D-4DDE-A894-BC28EB37166B} = {6F776E78-862A-4147-86BA-12B6B64E8958} {B6182BF1-9EC6-403D-A42C-D6441CF7B390} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} - {6F776E78-862A-4147-86BA-12B6B64E8958} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {C761A3F7-787D-4C7E-A41C-5FAB07F6B774} = {6F776E78-862A-4147-86BA-12B6B64E8958} {C714A3AB-8402-4DC2-B120-ACCB2E29BD8F} = {1895A5C9-50D4-4568-9A3A-14657E615A5E} {54592671-9CB6-48AE-9AE0-84CD016E87FF} = {1895A5C9-50D4-4568-9A3A-14657E615A5E} {57FCA6CB-9D99-411E-8ABF-20ACFBD61D61} = {1895A5C9-50D4-4568-9A3A-14657E615A5E} {EB902D57-C047-4CDF-828B-FDC204AC7398} = {1895A5C9-50D4-4568-9A3A-14657E615A5E} {17B14A48-5248-4F4C-A8E6-6926AA94EB7C} = {1895A5C9-50D4-4568-9A3A-14657E615A5E} - {6D893E48-0739-401A-9AD1-286BCB6E5517} = {CBCC288A-53C3-402F-99F7-E468738560F5} {00B240B6-EC44-461A-9578-EF4F1BE9C688} = {1895A5C9-50D4-4568-9A3A-14657E615A5E} EndGlobalSection EndGlobal diff --git a/global.json b/global.json deleted file mode 100644 index 6bdcde3b48..0000000000 --- a/global.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "projects": [ "src", "test", "src/AbpDesk" ], - "sdk": { - "version": "1.0.0-preview2-003131" - } -} diff --git a/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk.Application.Contracts.csproj b/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk.Application.Contracts.csproj new file mode 100644 index 0000000000..8dd603e569 --- /dev/null +++ b/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk.Application.Contracts.csproj @@ -0,0 +1,17 @@ + + + + netstandard1.6 + AbpDesk.Application.Contracts + AbpDesk.Application.Contracts + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + diff --git a/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk.Application.Contracts.xproj b/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk.Application.Contracts.xproj deleted file mode 100644 index 84e839aaa0..0000000000 --- a/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk.Application.Contracts.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - e45b2ba3-7917-4236-99cd-b0a25285a652 - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/AbpDesk/AbpDesk.Application.Contracts/project.json b/src/AbpDesk/AbpDesk.Application.Contracts/project.json deleted file mode 100644 index 617f95fb0e..0000000000 --- a/src/AbpDesk/AbpDesk.Application.Contracts/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "Volo.Abp": "1.0.0-*" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/src/AbpDesk/AbpDesk.Application/AbpDesk.Application.csproj b/src/AbpDesk/AbpDesk.Application/AbpDesk.Application.csproj new file mode 100644 index 0000000000..0eb041911a --- /dev/null +++ b/src/AbpDesk/AbpDesk.Application/AbpDesk.Application.csproj @@ -0,0 +1,18 @@ + + + + netstandard1.6 + AbpDesk.Application + AbpDesk.Application + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + + diff --git a/src/AbpDesk/AbpDesk.Application/AbpDesk.Application.xproj b/src/AbpDesk/AbpDesk.Application/AbpDesk.Application.xproj deleted file mode 100644 index f02f0d2056..0000000000 --- a/src/AbpDesk/AbpDesk.Application/AbpDesk.Application.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - b6e622ce-0aee-45da-81ab-c244196cb583 - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/AbpDesk/AbpDesk.Application/project.json b/src/AbpDesk/AbpDesk.Application/project.json deleted file mode 100644 index 55c7b6057f..0000000000 --- a/src/AbpDesk/AbpDesk.Application/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "AbpDesk.Application.Contracts": "1.0.0-*", - "AbpDesk.Domain": "1.0.0-*" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk.ConsoleDemo.csproj b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk.ConsoleDemo.csproj new file mode 100644 index 0000000000..6f4c0a98ae --- /dev/null +++ b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk.ConsoleDemo.csproj @@ -0,0 +1,41 @@ + + + + netcoreapp1.1 + AbpDesk.ConsoleDemo + Exe + AbpDesk.ConsoleDemo + 1.1.1 + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + PreserveNewest + + + + + + + + + + + + + + + All + + + + + + + + + diff --git a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk.ConsoleDemo.xproj b/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk.ConsoleDemo.xproj deleted file mode 100644 index fadb40151e..0000000000 --- a/src/AbpDesk/AbpDesk.ConsoleDemo/AbpDesk.ConsoleDemo.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 1a1575d7-e57e-4a40-8113-fd01bb1753d5 - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/AbpDesk/AbpDesk.ConsoleDemo/project.json b/src/AbpDesk/AbpDesk.ConsoleDemo/project.json deleted file mode 100644 index 70a50353db..0000000000 --- a/src/AbpDesk/AbpDesk.ConsoleDemo/project.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": "1.0.0-*", - - "frameworks": { - "netcoreapp1.1": { - "imports": "dnxcore50" - } - }, - - "dependencies": { - "AbpDesk.Application": "1.0.0-*", - "AbpDesk.Application.Contracts": "1.0.0-*", - "AbpDesk.EntityFrameworkCore": "1.0.0-*", - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - }, - "Microsoft.EntityFrameworkCore.Tools": { - "type": "build", - "version": "1.1.0-preview4-final" - }, - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "Volo.Abp.Identity": "1.0.0-*", - "Volo.Abp.Identity.EntityFrameworkCore": "1.0.0-*", - "AbpDesk.MongoBlog": "1.0.0-*" - }, - - "tools": { - "Microsoft.EntityFrameworkCore.Tools": "1.1.0-preview4-final" - }, - - "buildOptions": { - "emitEntryPoint": true, - "copyToOutput": [ - "appsettings.json" - ] - } -} diff --git a/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.csproj b/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.csproj new file mode 100644 index 0000000000..ff8e0113c4 --- /dev/null +++ b/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.csproj @@ -0,0 +1,21 @@ + + + + netstandard1.6 + AbpDesk.Domain + AbpDesk.Domain + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + + + + + diff --git a/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.xproj b/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.xproj deleted file mode 100644 index 06dc1d78df..0000000000 --- a/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 2dba20a3-8b1c-49f0-90f6-eb09db78b1b8 - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/AbpDesk/AbpDesk.Domain/project.json b/src/AbpDesk/AbpDesk.Domain/project.json deleted file mode 100644 index 9df5bbef6d..0000000000 --- a/src/AbpDesk/AbpDesk.Domain/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "System.ComponentModel.Annotations": "4.3.0", - "Volo.Abp": "1.0.0-*" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk.EntityFrameworkCore.csproj b/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk.EntityFrameworkCore.csproj new file mode 100644 index 0000000000..ad8c6336d8 --- /dev/null +++ b/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk.EntityFrameworkCore.csproj @@ -0,0 +1,29 @@ + + + + netstandard1.6 + AbpDesk.EntityFrameworkCore + AbpDesk.EntityFrameworkCore + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + + + + + All + + + + + + + + diff --git a/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk.EntityFrameworkCore.xproj b/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk.EntityFrameworkCore.xproj deleted file mode 100644 index e0860dcfa1..0000000000 --- a/src/AbpDesk/AbpDesk.EntityFrameworkCore/AbpDesk.EntityFrameworkCore.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 35624e7c-6501-4b42-9aa7-70555666a8b3 - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/AbpDesk/AbpDesk.EntityFrameworkCore/project.json b/src/AbpDesk/AbpDesk.EntityFrameworkCore/project.json deleted file mode 100644 index 030b01323c..0000000000 --- a/src/AbpDesk/AbpDesk.EntityFrameworkCore/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "AbpDesk.Domain": "1.0.0-*", - "Volo.Abp.EntityFrameworkCore": "1.0.0-*", - "Microsoft.EntityFrameworkCore.SqlServer": "1.1.0", - "Microsoft.EntityFrameworkCore.Tools": { - "type": "build", - "version": "1.1.0-preview4-final" - } - }, - - "tools": { - "Microsoft.EntityFrameworkCore.Tools": "1.1.0-preview4-final" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk.MongoBlog.csproj b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk.MongoBlog.csproj new file mode 100644 index 0000000000..1d5166ff6a --- /dev/null +++ b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk.MongoBlog.csproj @@ -0,0 +1,26 @@ + + + + netstandard1.6 + AbpDesk.MongoBlog + AbpDesk.MongoBlog + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + + + + + + + + + + diff --git a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk.MongoBlog.xproj b/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk.MongoBlog.xproj deleted file mode 100644 index b5646e990e..0000000000 --- a/src/AbpDesk/AbpDesk.MongoBlog/AbpDesk.MongoBlog.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 63244dc7-34be-44e1-bf6f-f2672e59af36 - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/AbpDesk/AbpDesk.MongoBlog/project.json b/src/AbpDesk/AbpDesk.MongoBlog/project.json deleted file mode 100644 index f034394965..0000000000 --- a/src/AbpDesk/AbpDesk.MongoBlog/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "Volo.Abp.MongoDB": "1.0.0-*", - "Volo.Abp.AspNetCore.Mvc": "1.0.0-*" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - }, - - "buildOptions": { - "embed": { - "include": [ - "Areas/**/*.*" - ] - } - }, - - "scripts": { - "postcompile": [ "xcopy /y %compile:OutputDir%\\AbpDesk.MongoBlog.dll ..\\Web_PlugIns\\" ] - } -} diff --git a/src/AbpDesk/AbpDesk.SamplePlugInModule/AbpDesk.SamplePlugInModule.csproj b/src/AbpDesk/AbpDesk.SamplePlugInModule/AbpDesk.SamplePlugInModule.csproj new file mode 100644 index 0000000000..3149106f1e --- /dev/null +++ b/src/AbpDesk/AbpDesk.SamplePlugInModule/AbpDesk.SamplePlugInModule.csproj @@ -0,0 +1,17 @@ + + + + netstandard1.6 + AbpDesk.SamplePlugInModule + AbpDesk.SamplePlugInModule + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + diff --git a/src/AbpDesk/AbpDesk.SamplePlugInModule/AbpDesk.SamplePlugInModule.xproj b/src/AbpDesk/AbpDesk.SamplePlugInModule/AbpDesk.SamplePlugInModule.xproj deleted file mode 100644 index cea27bbf28..0000000000 --- a/src/AbpDesk/AbpDesk.SamplePlugInModule/AbpDesk.SamplePlugInModule.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - adfaf85b-b785-41ea-b57d-422775989fa6 - AbpDesk.SamplePlugInModule - .\obj - .\bin\ - v4.6.1 - - - - 2.0 - - - diff --git a/src/AbpDesk/AbpDesk.SamplePlugInModule/project.json b/src/AbpDesk/AbpDesk.SamplePlugInModule/project.json deleted file mode 100644 index 617f95fb0e..0000000000 --- a/src/AbpDesk/AbpDesk.SamplePlugInModule/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "Volo.Abp": "1.0.0-*" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj new file mode 100644 index 0000000000..0a7edee89b --- /dev/null +++ b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj @@ -0,0 +1,51 @@ + + + + netcoreapp1.1 + true + AbpDesk.Web.Mvc + Exe + AbpDesk.Web.Mvc + 1.1.1 + $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + All + + + + + + + + + + diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.xproj b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.xproj deleted file mode 100644 index d7fd8cb478..0000000000 --- a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.xproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 12e14d95-4aba-4290-ab1d-ccf5eb158411 - AbpDesk.Web.Mvc - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - - - - - \ No newline at end of file diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/project.json b/src/AbpDesk/AbpDesk.Web.Mvc/project.json deleted file mode 100644 index 2e7fc556f9..0000000000 --- a/src/AbpDesk/AbpDesk.Web.Mvc/project.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.AspNetCore.Diagnostics": "1.1.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.AspNetCore.StaticFiles": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - "AbpDesk.Application.Contracts": "1.0.0-*", - "Microsoft.EntityFrameworkCore.Tools": { - "type": "build", - "version": "1.1.0-preview4-final" - }, - "Microsoft.AspNetCore.Razor.Tools": { - "type": "build", - "version": "1.1.0-preview4-final" - }, - "Volo.Abp.AspNetCore.Mvc": "1.0.0-*", - "AbpDesk.EntityFrameworkCore": "1.0.0-*", - "AbpDesk.Application": "1.0.0-*", - "Volo.Abp.AspNetCore.Mvc.UI.Bootstrap": "1.0.0-*", - "Volo.Abp.AspNetCore.EmbeddedFiles": "1.0.0-*", - "Volo.Abp.Identity.Web": "1.0.0-*", - "Volo.Abp.MongoDB": "1.0.0-*", - "Volo.Abp.Identity.HttpApi.Client": "1.0.0-*", - "Serilog.Extensions.Logging": "1.4.0", - "Serilog.Sinks.RollingFile": "3.3.0" - }, - - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.1.0-preview4-final", - "Microsoft.EntityFrameworkCore.Tools": "1.1.0-preview4-final", - "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview4-final" - }, - - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dotnet5.6", - "portable-net45+win8" - ] - } - }, - - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - - "publishOptions": { - "include": [ - "wwwroot", - "Areas", - "Views", - "web.config", - "appsettings.json", - "appsettings.Staging.json", - "Dockerfile" - ] - }, - - "scripts": { - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - } -} diff --git a/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll b/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll index c52f28ef08..5b879aad29 100644 Binary files a/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll and b/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll differ diff --git a/src/Volo.Abp.AspNetCore.EmbeddedFiles/Volo.Abp.AspNetCore.EmbeddedFiles.csproj b/src/Volo.Abp.AspNetCore.EmbeddedFiles/Volo.Abp.AspNetCore.EmbeddedFiles.csproj new file mode 100644 index 0000000000..2066e04528 --- /dev/null +++ b/src/Volo.Abp.AspNetCore.EmbeddedFiles/Volo.Abp.AspNetCore.EmbeddedFiles.csproj @@ -0,0 +1,21 @@ + + + + netstandard1.6 + Volo.Abp.AspNetCore.EmbeddedFiles + Volo.Abp.AspNetCore.EmbeddedFiles + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + + + + + diff --git a/src/Volo.Abp.AspNetCore.EmbeddedFiles/Volo.Abp.AspNetCore.EmbeddedFiles.xproj b/src/Volo.Abp.AspNetCore.EmbeddedFiles/Volo.Abp.AspNetCore.EmbeddedFiles.xproj deleted file mode 100644 index e0a4299906..0000000000 --- a/src/Volo.Abp.AspNetCore.EmbeddedFiles/Volo.Abp.AspNetCore.EmbeddedFiles.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - b6182bf1-9ec6-403d-a42c-d6441cf7b390 - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.EmbeddedFiles/project.json b/src/Volo.Abp.AspNetCore.EmbeddedFiles/project.json deleted file mode 100644 index 9c32bbfcc1..0000000000 --- a/src/Volo.Abp.AspNetCore.EmbeddedFiles/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "Volo.Abp.AspNetCore": "1.0.0-*", - "Microsoft.AspNetCore.StaticFiles": "1.1.0" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj b/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj new file mode 100644 index 0000000000..5aa2e728bd --- /dev/null +++ b/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj @@ -0,0 +1,18 @@ + + + + netstandard1.6 + Volo.Abp.AspNetCore.MultiTenancy + Volo.Abp.AspNetCore.MultiTenancy + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + + diff --git a/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.xproj b/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.xproj deleted file mode 100644 index 5d264e68e9..0000000000 --- a/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 7cc7946b-e026-4f66-8d4f-4f78f4801d43 - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.MultiTenancy/project.json b/src/Volo.Abp.AspNetCore.MultiTenancy/project.json deleted file mode 100644 index b9dfd6a0fb..0000000000 --- a/src/Volo.Abp.AspNetCore.MultiTenancy/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "Volo.Abp.AspNetCore": "1.0.0-*", - "Volo.Abp.MultiTenancy": "1.0.0-*" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj new file mode 100644 index 0000000000..80e83b7420 --- /dev/null +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj @@ -0,0 +1,18 @@ + + + + netstandard1.6 + Volo.Abp.AspNetCore.Mvc.UI.Bootstrap + Volo.Abp.AspNetCore.Mvc.UI.Bootstrap + $(PackageTargetFallback);dnxcore50 + + + + + + + + + + + diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.xproj b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.xproj deleted file mode 100644 index f79b96d762..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.xproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - c761a3f7-787d-4c7e-a41c-5fab07f6b774 - Volo.Abp.AspNetCore.Mvc.UI.Bootstrap - .\obj - .\bin\ - v4.6.1 - - - - 2.0 - - - - - - - diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/project.json b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/project.json deleted file mode 100644 index 4361e7858c..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "dependencies": { - "Volo.Abp.AspNetCore.Mvc.UI": "1.0.0-*" - }, - - "tools": { - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - }, - - "buildOptions": { - "embed": { - "include": [ - "Views/**/*.*", - "libs/**/*.*" - ] - } - } -} diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj new file mode 100644 index 0000000000..393198408a --- /dev/null +++ b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj @@ -0,0 +1,18 @@ + + + + netstandard1.6 + Volo.Abp.AspNetCore.Mvc.UI + Volo.Abp.AspNetCore.Mvc.UI + $(PackageTargetFallback);dnxcore50 + + + + + + + + + + + diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.xproj b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.xproj deleted file mode 100644 index 51b53b05cd..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.xproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - bf9ab22c-f48d-4dde-a894-bc28eb37166b - Volo.Abp.AspNetCore.Mvc - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - - - - - \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/project.json b/src/Volo.Abp.AspNetCore.Mvc.UI/project.json deleted file mode 100644 index be1eb953b9..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "dependencies": { - "Volo.Abp.AspNetCore.Mvc": "1.0.0-*" - }, - - "tools": { - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - }, - - "buildOptions": { - "embed": { - "include": [ - "Views/**/*.*" - ] - } - } -} diff --git a/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj b/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj new file mode 100644 index 0000000000..74ce40d9a1 --- /dev/null +++ b/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj @@ -0,0 +1,21 @@ + + + + netstandard1.6 + Volo.Abp.AspNetCore.Mvc + Volo.Abp.AspNetCore.Mvc + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + + + + + diff --git a/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.xproj b/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.xproj deleted file mode 100644 index 0751f3be58..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 3fb342ca-23b6-4795-91ef-c664527c07b7 - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore.Mvc/project.json b/src/Volo.Abp.AspNetCore.Mvc/project.json deleted file mode 100644 index b7003c901e..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "Volo.Abp.AspNetCore": "1.0.0-*", - "Microsoft.AspNetCore.Mvc": "1.1.0" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj b/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj new file mode 100644 index 0000000000..3ac44bc148 --- /dev/null +++ b/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj @@ -0,0 +1,21 @@ + + + + netstandard1.6 + Volo.Abp.AspNetCore.TestBase + Volo.Abp.AspNetCore.TestBase + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + + + + + diff --git a/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.xproj b/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.xproj deleted file mode 100644 index da343e0aff..0000000000 --- a/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 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/src/Volo.Abp.AspNetCore.TestBase/project.json b/src/Volo.Abp.AspNetCore.TestBase/project.json deleted file mode 100644 index 65b18e175f..0000000000 --- a/src/Volo.Abp.AspNetCore.TestBase/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "Volo.Abp.AspNetCore": "1.0.0-*", - "Microsoft.AspNetCore.TestHost": "1.1.0" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj b/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj new file mode 100644 index 0000000000..b9bd281f0b --- /dev/null +++ b/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj @@ -0,0 +1,23 @@ + + + + netstandard1.6 + Volo.Abp.AspNetCore + Volo.Abp.AspNetCore + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + + + + + + + diff --git a/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.xproj b/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.xproj deleted file mode 100644 index e05cd5fd00..0000000000 --- a/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 02be03ba-3411-448c-ab61-cb36407cc49a - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Volo.Abp.AspNetCore/project.json b/src/Volo.Abp.AspNetCore/project.json deleted file mode 100644 index a1bd5b1e9b..0000000000 --- a/src/Volo.Abp.AspNetCore/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "Volo.Abp": "1.0.0-*", - "Microsoft.AspNetCore.Hosting.Abstractions": "1.1.0", - "Microsoft.AspNetCore.Routing.Abstractions": "1.1.0", - "Microsoft.AspNetCore.Http": "1.1.0" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj b/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj new file mode 100644 index 0000000000..773d4f9147 --- /dev/null +++ b/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj @@ -0,0 +1,21 @@ + + + + netstandard1.6 + Volo.Abp.EntityFrameworkCore + Volo.Abp.EntityFrameworkCore + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + + + + + diff --git a/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.xproj b/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.xproj deleted file mode 100644 index 4d18ec7898..0000000000 --- a/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - a1ae63e9-0cf4-4afb-a584-65d826dea3cb - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Volo.Abp.EntityFrameworkCore/project.json b/src/Volo.Abp.EntityFrameworkCore/project.json deleted file mode 100644 index 7f6304f129..0000000000 --- a/src/Volo.Abp.EntityFrameworkCore/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "Microsoft.EntityFrameworkCore": "1.1.0", - "Volo.Abp": "1.0.0-*" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/src/Volo.Abp.Identity.Application.Contracts/Volo.Abp.Identity.Application.Contracts.csproj b/src/Volo.Abp.Identity.Application.Contracts/Volo.Abp.Identity.Application.Contracts.csproj new file mode 100644 index 0000000000..ebc800f65a --- /dev/null +++ b/src/Volo.Abp.Identity.Application.Contracts/Volo.Abp.Identity.Application.Contracts.csproj @@ -0,0 +1,17 @@ + + + + netstandard1.6 + Volo.Abp.Identity.Application.Contracts + Volo.Abp.Identity.Application.Contracts + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + diff --git a/src/Volo.Abp.Identity.Application.Contracts/Volo.Abp.Identity.Application.Contracts.xproj b/src/Volo.Abp.Identity.Application.Contracts/Volo.Abp.Identity.Application.Contracts.xproj deleted file mode 100644 index d65cea4271..0000000000 --- a/src/Volo.Abp.Identity.Application.Contracts/Volo.Abp.Identity.Application.Contracts.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - c714a3ab-8402-4dc2-b120-accb2e29bd8f - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Volo.Abp.Identity.Application.Contracts/project.json b/src/Volo.Abp.Identity.Application.Contracts/project.json deleted file mode 100644 index 617f95fb0e..0000000000 --- a/src/Volo.Abp.Identity.Application.Contracts/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "Volo.Abp": "1.0.0-*" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.csproj b/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.csproj new file mode 100644 index 0000000000..32561792ca --- /dev/null +++ b/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.csproj @@ -0,0 +1,18 @@ + + + + netstandard1.6 + Volo.Abp.Identity.Application + Volo.Abp.Identity.Application + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + + diff --git a/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.xproj b/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.xproj deleted file mode 100644 index b79d02e301..0000000000 --- a/src/Volo.Abp.Identity.Application/Volo.Abp.Identity.Application.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 54592671-9cb6-48ae-9ae0-84cd016e87ff - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Volo.Abp.Identity.Application/project.json b/src/Volo.Abp.Identity.Application/project.json deleted file mode 100644 index 24b67e1fe3..0000000000 --- a/src/Volo.Abp.Identity.Application/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "Volo.Abp.Identity": "1.0.0-*", - "Volo.Abp.Identity.Application.Contracts": "1.0.0-*" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.csproj b/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.csproj new file mode 100644 index 0000000000..bf1f1ee277 --- /dev/null +++ b/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.csproj @@ -0,0 +1,23 @@ + + + + netstandard1.6 + Volo.Abp.Identity.EntityFrameworkCore + Volo.Abp.Identity.EntityFrameworkCore + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + + + + + + + diff --git a/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.xproj b/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.xproj deleted file mode 100644 index 4513a5b097..0000000000 --- a/src/Volo.Abp.Identity.EntityFrameworkCore/Volo.Abp.Identity.EntityFrameworkCore.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 439dfc0f-1ba2-464f-900e-ea7e18c08975 - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Volo.Abp.Identity.EntityFrameworkCore/project.json b/src/Volo.Abp.Identity.EntityFrameworkCore/project.json deleted file mode 100644 index aa4421ea6a..0000000000 --- a/src/Volo.Abp.Identity.EntityFrameworkCore/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "Volo.Abp.EntityFrameworkCore": "1.0.0-*", - "Microsoft.EntityFrameworkCore.Relational": "1.1.0", - "Microsoft.EntityFrameworkCore.SqlServer": "1.1.0", - "Volo.Abp.Identity": "1.0.0-*" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.csproj b/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.csproj new file mode 100644 index 0000000000..31ffed3439 --- /dev/null +++ b/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.csproj @@ -0,0 +1,21 @@ + + + + netstandard1.6 + Volo.Abp.Identity.HttpApi.Client + Volo.Abp.Identity.HttpApi.Client + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + + + + + diff --git a/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.xproj b/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.xproj deleted file mode 100644 index c03a788be0..0000000000 --- a/src/Volo.Abp.Identity.HttpApi.Client/Volo.Abp.Identity.HttpApi.Client.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 00b240b6-ec44-461a-9578-ef4f1be9c688 - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Volo.Abp.Identity.HttpApi.Client/project.json b/src/Volo.Abp.Identity.HttpApi.Client/project.json deleted file mode 100644 index c490a0429a..0000000000 --- a/src/Volo.Abp.Identity.HttpApi.Client/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "Volo.Abp.Identity.Application.Contracts": "1.0.0-*", - "System.Net.Http": "4.3.1" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/src/Volo.Abp.Identity.HttpApi.Host/Volo.Abp.Identity.HttpApi.Host.csproj b/src/Volo.Abp.Identity.HttpApi.Host/Volo.Abp.Identity.HttpApi.Host.csproj new file mode 100644 index 0000000000..b80321aa5b --- /dev/null +++ b/src/Volo.Abp.Identity.HttpApi.Host/Volo.Abp.Identity.HttpApi.Host.csproj @@ -0,0 +1,41 @@ + + + + netcoreapp1.1 + true + Volo.Abp.Identity.HttpApi.Host + Exe + Volo.Abp.Identity.HttpApi.Host + 1.1.1 + $(PackageTargetFallback);dotnet5.6;portable-net45+win8 + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + All + + + + + + + + diff --git a/src/Volo.Abp.Identity.HttpApi.Host/Volo.Abp.Identity.HttpApi.Host.xproj b/src/Volo.Abp.Identity.HttpApi.Host/Volo.Abp.Identity.HttpApi.Host.xproj deleted file mode 100644 index e58ab94ee4..0000000000 --- a/src/Volo.Abp.Identity.HttpApi.Host/Volo.Abp.Identity.HttpApi.Host.xproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - eb902d57-c047-4cdf-828b-fdc204ac7398 - Volo.Abp.Identity.HttpApi.Host - .\obj - .\bin\ - v4.6.1 - - - - 2.0 - - - - - - - diff --git a/src/Volo.Abp.Identity.HttpApi.Host/project.json b/src/Volo.Abp.Identity.HttpApi.Host/project.json deleted file mode 100644 index 6a6e58b1ef..0000000000 --- a/src/Volo.Abp.Identity.HttpApi.Host/project.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - }, - "Microsoft.AspNetCore.Diagnostics": "1.1.0", - "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0", - "Microsoft.Extensions.Logging.Console": "1.1.0", - "Microsoft.Extensions.Logging.Debug": "1.1.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0", - "Microsoft.Extensions.Configuration.Json": "1.1.0", - - "Microsoft.EntityFrameworkCore.Tools": { - "type": "build", - "version": "1.1.0-preview4-final" - }, - - "Volo.Abp.Identity.EntityFrameworkCore": "1.0.0-*", - "Volo.Abp.Identity.HttpApi": "1.0.0-*" - }, - - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.1.0-preview4-final", - "Microsoft.EntityFrameworkCore.Tools": "1.1.0-preview4-final" - }, - - "frameworks": { - "netcoreapp1.1": { - "imports": [ - "dotnet5.6", - "portable-net45+win8" - ] - } - }, - - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, - - "runtimeOptions": { - "configProperties": { - "System.GC.Server": true - } - }, - - "publishOptions": { - "include": [ - "wwwroot", - "web.config", - "appsettings.json", - "appsettings.Staging.json", - "Dockerfile" - ] - }, - - "scripts": { - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - } -} diff --git a/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.csproj b/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.csproj new file mode 100644 index 0000000000..f9d58e02a2 --- /dev/null +++ b/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.csproj @@ -0,0 +1,18 @@ + + + + netstandard1.6 + Volo.Abp.Identity.HttpApi + Volo.Abp.Identity.HttpApi + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + + diff --git a/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.xproj b/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.xproj deleted file mode 100644 index bd4aa1d2e8..0000000000 --- a/src/Volo.Abp.Identity.HttpApi/Volo.Abp.Identity.HttpApi.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 57fca6cb-9d99-411e-8abf-20acfbd61d61 - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Volo.Abp.Identity.HttpApi/project.json b/src/Volo.Abp.Identity.HttpApi/project.json deleted file mode 100644 index a966e5b21c..0000000000 --- a/src/Volo.Abp.Identity.HttpApi/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "Volo.Abp.AspNetCore.Mvc": "1.0.0-*", - "Volo.Abp.Identity.Application": "1.0.0-*" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj b/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj new file mode 100644 index 0000000000..ba413d98b6 --- /dev/null +++ b/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj @@ -0,0 +1,19 @@ + + + + netstandard1.6 + Volo.Abp.Identity.Web + Volo.Abp.Identity.Web + $(PackageTargetFallback);dnxcore50 + + + + + + + + + + + + diff --git a/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.xproj b/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.xproj deleted file mode 100644 index 4b46e1b9ea..0000000000 --- a/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.xproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 17b14a48-5248-4f4c-a8e6-6926aa94eb7c - Volo.Abp.Identity.Web - .\obj - .\bin\ - v4.6.1 - - - - 2.0 - - - - - - - diff --git a/src/Volo.Abp.Identity.Web/project.json b/src/Volo.Abp.Identity.Web/project.json deleted file mode 100644 index 658c95f28c..0000000000 --- a/src/Volo.Abp.Identity.Web/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "dependencies": { - "Volo.Abp.AspNetCore.Mvc": "1.0.0-*", - "Volo.Abp.Identity.Application.Contracts": "1.0.0-*" - }, - - "tools": { - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - }, - - "buildOptions": { - "embed": { - "include": [ - "Areas/**/*.*" - ] - } - } -} diff --git a/src/Volo.Abp.Identity/Volo.Abp.Identity.csproj b/src/Volo.Abp.Identity/Volo.Abp.Identity.csproj new file mode 100644 index 0000000000..785b28375b --- /dev/null +++ b/src/Volo.Abp.Identity/Volo.Abp.Identity.csproj @@ -0,0 +1,21 @@ + + + + netstandard1.6 + Volo.Abp.Identity + Volo.Abp.Identity + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + + + + + diff --git a/src/Volo.Abp.Identity/Volo.Abp.Identity.xproj b/src/Volo.Abp.Identity/Volo.Abp.Identity.xproj deleted file mode 100644 index c205403593..0000000000 --- a/src/Volo.Abp.Identity/Volo.Abp.Identity.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 17dbb40a-243e-41f7-a672-fa316ecb1e33 - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Volo.Abp.Identity/project.json b/src/Volo.Abp.Identity/project.json deleted file mode 100644 index ada96865ef..0000000000 --- a/src/Volo.Abp.Identity/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "Microsoft.AspNetCore.Identity": "1.1.0", - "Volo.Abp": "1.0.0-*" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj b/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj new file mode 100644 index 0000000000..f71c358fa1 --- /dev/null +++ b/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj @@ -0,0 +1,21 @@ + + + + netstandard1.6 + Volo.Abp.MongoDB + Volo.Abp.MongoDB + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + + + + + diff --git a/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.xproj b/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.xproj deleted file mode 100644 index 9a29ff2af5..0000000000 --- a/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - b31ffae3-5dac-4e51-bd17-f7446b741a36 - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Volo.Abp.MongoDB/project.json b/src/Volo.Abp.MongoDB/project.json deleted file mode 100644 index d8e528d680..0000000000 --- a/src/Volo.Abp.MongoDB/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "Volo.Abp": "1.0.0-*", - "MongoDB.Driver": "2.4.0" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.csproj b/src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.csproj new file mode 100644 index 0000000000..15e3bb3d62 --- /dev/null +++ b/src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.csproj @@ -0,0 +1,17 @@ + + + + netstandard1.6 + Volo.Abp.MultiTenancy + Volo.Abp.MultiTenancy + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + diff --git a/src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.xproj b/src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.xproj deleted file mode 100644 index e641308882..0000000000 --- a/src/Volo.Abp.MultiTenancy/Volo.Abp.MultiTenancy.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 58fa9f8f-216d-4c93-8929-d40d22b11ca7 - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Volo.Abp.MultiTenancy/project.json b/src/Volo.Abp.MultiTenancy/project.json deleted file mode 100644 index 617f95fb0e..0000000000 --- a/src/Volo.Abp.MultiTenancy/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "Volo.Abp": "1.0.0-*" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/src/Volo.Abp.TestBase/Volo.Abp.TestBase.csproj b/src/Volo.Abp.TestBase/Volo.Abp.TestBase.csproj new file mode 100644 index 0000000000..199953ea21 --- /dev/null +++ b/src/Volo.Abp.TestBase/Volo.Abp.TestBase.csproj @@ -0,0 +1,17 @@ + + + + netstandard1.6 + Volo.Abp.TestBase + Volo.Abp.TestBase + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + diff --git a/src/Volo.Abp.TestBase/Volo.Abp.TestBase.xproj b/src/Volo.Abp.TestBase/Volo.Abp.TestBase.xproj deleted file mode 100644 index 14b8782246..0000000000 --- a/src/Volo.Abp.TestBase/Volo.Abp.TestBase.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 8cecceaf-f0d8-4257-96ba-eacf4763af42 - Volo.Abp.TestBase - .\obj - .\bin\ - v4.6.1 - - - - 2.0 - - - diff --git a/src/Volo.Abp.TestBase/project.json b/src/Volo.Abp.TestBase/project.json deleted file mode 100644 index 617f95fb0e..0000000000 --- a/src/Volo.Abp.TestBase/project.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "Volo.Abp": "1.0.0-*" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/src/Volo.Abp/Volo.Abp.csproj b/src/Volo.Abp/Volo.Abp.csproj new file mode 100644 index 0000000000..0a104b900e --- /dev/null +++ b/src/Volo.Abp/Volo.Abp.csproj @@ -0,0 +1,27 @@ + + + + netstandard1.6 + Volo.Abp + Volo.Abp + 1.6.1 + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + + + + + + + + + + diff --git a/src/Volo.Abp/Volo.Abp.xproj b/src/Volo.Abp/Volo.Abp.xproj deleted file mode 100644 index 20a6e28b15..0000000000 --- a/src/Volo.Abp/Volo.Abp.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - fc5f7372-ea60-4052-b943-0ee070221cc1 - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Volo.Abp/project.json b/src/Volo.Abp/project.json deleted file mode 100644 index 8dc093b1bd..0000000000 --- a/src/Volo.Abp/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "NETStandard.Library": "1.6.1", - "Microsoft.Extensions.DependencyInjection": "1.1.0", - "Microsoft.Extensions.Options": "1.1.0", - "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0", - "Microsoft.Extensions.Logging": "1.1.0", - "System.Collections.Immutable": "1.3.0", - "System.Runtime.Loader": "4.3.0", - "System.Linq.Queryable": "4.3.0", - "JetBrains.Annotations": "10.2.1", - "Newtonsoft.Json": "9.0.1", - "Nito.AsyncEx.Context": "1.1.0" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/test/AbpDesk/AbpDesk.Application.Tests/AbpDesk.Application.Tests.csproj b/test/AbpDesk/AbpDesk.Application.Tests/AbpDesk.Application.Tests.csproj new file mode 100644 index 0000000000..9cadba0e02 --- /dev/null +++ b/test/AbpDesk/AbpDesk.Application.Tests/AbpDesk.Application.Tests.csproj @@ -0,0 +1,31 @@ + + + + netcoreapp1.1 + AbpDesk.Application.Tests + AbpDesk.Application.Tests + true + 1.1.1 + false + false + false + + + + + + + + + + + + + + + + + + + + diff --git a/test/AbpDesk/AbpDesk.Application.Tests/AbpDesk.Application.Tests.xproj b/test/AbpDesk/AbpDesk.Application.Tests/AbpDesk.Application.Tests.xproj deleted file mode 100644 index a800374f8a..0000000000 --- a/test/AbpDesk/AbpDesk.Application.Tests/AbpDesk.Application.Tests.xproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - e6e2467c-184a-4a0a-929f-932d5097953e - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/AbpDesk/AbpDesk.Application.Tests/project.json b/test/AbpDesk/AbpDesk.Application.Tests/project.json deleted file mode 100644 index 746825c0c5..0000000000 --- a/test/AbpDesk/AbpDesk.Application.Tests/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": "1.0.0-*", - - "testRunner": "xunit", - - "dependencies": { - "AbpDesk.Application": "1.0.0-*", - "AbpDesk.EntityFrameworkCore": "1.0.0-*", - "AbpTestBase": "1.0.0-*", - "Microsoft.EntityFrameworkCore.InMemory": "1.1.0" - }, - - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - } - } - } -} diff --git a/test/AbpTestBase/AbpTestBase.csproj b/test/AbpTestBase/AbpTestBase.csproj new file mode 100644 index 0000000000..3c053722b1 --- /dev/null +++ b/test/AbpTestBase/AbpTestBase.csproj @@ -0,0 +1,24 @@ + + + + netcoreapp1.1 + AbpTestBase + AbpTestBase + 1.1.1 + false + false + false + + + + + + + + + + + + + + diff --git a/test/AbpTestBase/AbpTestBase.xproj b/test/AbpTestBase/AbpTestBase.xproj deleted file mode 100644 index ba6cf8a59f..0000000000 --- a/test/AbpTestBase/AbpTestBase.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 1020f5fd-6a97-40c2-afca-ebdf641df111 - AbpTestBase - .\obj - .\bin\ - v4.6.1 - - - - 2.0 - - - diff --git a/test/AbpTestBase/project.json b/test/AbpTestBase/project.json deleted file mode 100644 index 689d474114..0000000000 --- a/test/AbpTestBase/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "dotnet-test-xunit": "2.2.0-preview2-build1029", - "NSubstitute": "2.0.0-rc", - "Shouldly": "2.8.2", - "Volo.Abp.TestBase": "1.0.0-*", - "xunit": "2.2.0-beta4-build3444", - "xunit.extensibility.execution": "2.2.0-beta4-build3444" - }, - - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - } - } - } -} diff --git a/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.csproj b/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.csproj new file mode 100644 index 0000000000..3a2408fda3 --- /dev/null +++ b/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.csproj @@ -0,0 +1,30 @@ + + + + netcoreapp1.1 + Volo.Abp.AspNetCore.MultiTenancy.Tests + Volo.Abp.AspNetCore.MultiTenancy.Tests + true + 1.1.1 + false + false + false + + + + + + + + + + + + + + + + + + + diff --git a/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.xproj b/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.xproj deleted file mode 100644 index d3adbc9bb8..0000000000 --- a/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.xproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 2c282467-2cd5-4750-be1f-ca8bd8ecc6ea - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/project.json b/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/project.json deleted file mode 100644 index 7b3877cad8..0000000000 --- a/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - - "testRunner": "xunit", - - "dependencies": { - "AbpTestBase": "1.0.0-*", - "Volo.Abp.AspNetCore.MultiTenancy": "1.0.0-*", - "Volo.Abp.AspNetCore.TestBase": "1.0.0-*" - }, - - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - } - } - } -} diff --git a/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.csproj b/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.csproj new file mode 100644 index 0000000000..54041a4b79 --- /dev/null +++ b/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.csproj @@ -0,0 +1,25 @@ + + + + netcoreapp1.1 + Volo.Abp.AspNetCore.Tests + Volo.Abp.AspNetCore.Tests + true + 1.1.1 + false + false + false + + + + + + + + + + + + + + diff --git a/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.xproj b/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.xproj deleted file mode 100644 index cfe78af7db..0000000000 --- a/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - b1d860bb-6ec6-4bae-adaa-c2aec2ffb510 - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/test/Volo.Abp.AspNetCore.Tests/project.json b/test/Volo.Abp.AspNetCore.Tests/project.json deleted file mode 100644 index 57a4ceb8c0..0000000000 --- a/test/Volo.Abp.AspNetCore.Tests/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - - "testRunner": "xunit", - - "dependencies": { - "AbpTestBase": "1.0.0-*", - "Volo.Abp.AspNetCore": "1.0.0-*" - }, - - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - } - } - } -} diff --git a/test/Volo.Abp.Identity.Tests/Volo.Abp.Identity.Tests.csproj b/test/Volo.Abp.Identity.Tests/Volo.Abp.Identity.Tests.csproj new file mode 100644 index 0000000000..cab0745904 --- /dev/null +++ b/test/Volo.Abp.Identity.Tests/Volo.Abp.Identity.Tests.csproj @@ -0,0 +1,31 @@ + + + + netcoreapp1.1 + Volo.Abp.Identity.Tests + Volo.Abp.Identity.Tests + true + 1.1.1 + false + false + false + + + + + + + + + + + + + + + + + + + + diff --git a/test/Volo.Abp.Identity.Tests/Volo.Abp.Identity.Tests.xproj b/test/Volo.Abp.Identity.Tests/Volo.Abp.Identity.Tests.xproj deleted file mode 100644 index 22b8879caa..0000000000 --- a/test/Volo.Abp.Identity.Tests/Volo.Abp.Identity.Tests.xproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 4ab91077-82dc-4335-9274-bce017bd9c8b - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Volo.Abp.Identity.Tests/project.json b/test/Volo.Abp.Identity.Tests/project.json deleted file mode 100644 index 564aa89a19..0000000000 --- a/test/Volo.Abp.Identity.Tests/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": "1.0.0-*", - - "testRunner": "xunit", - - "dependencies": { - "AbpTestBase": "1.0.0-*", - "Microsoft.EntityFrameworkCore.InMemory": "1.1.0", - "Volo.Abp.Identity": "1.0.0-*", - "Volo.Abp.Identity.EntityFrameworkCore": "1.0.0-*" - }, - - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - } - } - } -} diff --git a/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.csproj b/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.csproj new file mode 100644 index 0000000000..9cab38de44 --- /dev/null +++ b/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.1 + Volo.Abp.MultiTenancy.Tests + Volo.Abp.MultiTenancy.Tests + true + 1.1.1 + false + false + false + + + + + + + + + + + + + + + + + + diff --git a/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.xproj b/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.xproj deleted file mode 100644 index a07ca9c705..0000000000 --- a/test/Volo.Abp.MultiTenancy.Tests/Volo.Abp.MultiTenancy.Tests.xproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 05271341-7a15-484c-9fd6-802a4193f4de - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Volo.Abp.MultiTenancy.Tests/project.json b/test/Volo.Abp.MultiTenancy.Tests/project.json deleted file mode 100644 index 1095588853..0000000000 --- a/test/Volo.Abp.MultiTenancy.Tests/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "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" - } - } - } - } -} diff --git a/test/Volo.Abp.Tests/Volo.Abp.Tests.csproj b/test/Volo.Abp.Tests/Volo.Abp.Tests.csproj new file mode 100644 index 0000000000..656c76ca9b --- /dev/null +++ b/test/Volo.Abp.Tests/Volo.Abp.Tests.csproj @@ -0,0 +1,33 @@ + + + + netcoreapp1.1 + Volo.Abp.Tests + Volo.Abp.Tests + true + 1.1.1 + false + false + false + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/Volo.Abp.Tests/Volo.Abp.Tests.xproj b/test/Volo.Abp.Tests/Volo.Abp.Tests.xproj deleted file mode 100644 index 9763dad6e1..0000000000 --- a/test/Volo.Abp.Tests/Volo.Abp.Tests.xproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - e9a85f1b-a5cb-4e19-b2bb-a7f97bb25ee1 - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Volo.Abp.Tests/project.json b/test/Volo.Abp.Tests/project.json deleted file mode 100644 index db83a50b16..0000000000 --- a/test/Volo.Abp.Tests/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "version": "1.0.0-*", - - "testRunner": "xunit", - - "dependencies": { - "AbpTestBase": "1.0.0-*", - "Volo.Abp": "1.0.0-*" - }, - - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - } - } - }, - - "buildOptions": { - "embed": { - "include": [ - "Volo/Abp/EmbeddedFiles/MyResources/js/*.js" - ] - } - } -}