diff --git a/Volo.Abp.sln b/Volo.Abp.sln index 82e8d2f7fb..74fce7f22d 100644 --- a/Volo.Abp.sln +++ b/Volo.Abp.sln @@ -52,8 +52,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpDesk.ConsoleDemo", "src\ 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}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.ApplicationContracts", "src\Volo.Abp.ApplicationContracts\Volo.Abp.ApplicationContracts.xproj", "{69C72C98-B864-43F7-88B8-19536C7C9B43}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AbpDesk", "AbpDesk", "{61708AC8-CE70-4351-9B31-13EA8213D208}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpDesk.Application.Tests", "test\AbpDesk\AbpDesk.Application.Tests\AbpDesk.Application.Tests.xproj", "{E6E2467C-184A-4A0A-929F-932D5097953E}" @@ -154,10 +152,6 @@ Global {3FB342CA-23B6-4795-91EF-C664527C07B7}.Debug|Any CPU.Build.0 = Debug|Any CPU {3FB342CA-23B6-4795-91EF-C664527C07B7}.Release|Any CPU.ActiveCfg = Release|Any CPU {3FB342CA-23B6-4795-91EF-C664527C07B7}.Release|Any CPU.Build.0 = Release|Any CPU - {69C72C98-B864-43F7-88B8-19536C7C9B43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {69C72C98-B864-43F7-88B8-19536C7C9B43}.Debug|Any CPU.Build.0 = Debug|Any CPU - {69C72C98-B864-43F7-88B8-19536C7C9B43}.Release|Any CPU.ActiveCfg = Release|Any CPU - {69C72C98-B864-43F7-88B8-19536C7C9B43}.Release|Any CPU.Build.0 = Release|Any CPU {E6E2467C-184A-4A0A-929F-932D5097953E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E6E2467C-184A-4A0A-929F-932D5097953E}.Debug|Any CPU.Build.0 = Debug|Any CPU {E6E2467C-184A-4A0A-929F-932D5097953E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -223,7 +217,6 @@ Global {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} - {69C72C98-B864-43F7-88B8-19536C7C9B43} = {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} diff --git a/src/AbpDesk/AbpDesk.Application.Contracts/project.json b/src/AbpDesk/AbpDesk.Application.Contracts/project.json index f8ff58d0f6..863659ace7 100644 --- a/src/AbpDesk/AbpDesk.Application.Contracts/project.json +++ b/src/AbpDesk/AbpDesk.Application.Contracts/project.json @@ -3,7 +3,7 @@ "dependencies": { "NETStandard.Library": "1.6.1", - "Volo.Abp.ApplicationContracts": "1.0.0-*" + "Volo.Abp": "1.0.0-*" }, "frameworks": { diff --git a/src/Volo.Abp.ApplicationContracts/Properties/AssemblyInfo.cs b/src/Volo.Abp.ApplicationContracts/Properties/AssemblyInfo.cs deleted file mode 100644 index 821c30c9b8..0000000000 --- a/src/Volo.Abp.ApplicationContracts/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,19 +0,0 @@ -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.ApplicationContracts")] -[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("69c72c98-b864-43f7-88b8-19536c7c9b43")] diff --git a/src/Volo.Abp.ApplicationContracts/Volo.Abp.ApplicationContracts.xproj b/src/Volo.Abp.ApplicationContracts/Volo.Abp.ApplicationContracts.xproj deleted file mode 100644 index 6c9dc31cd7..0000000000 --- a/src/Volo.Abp.ApplicationContracts/Volo.Abp.ApplicationContracts.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 69c72c98-b864-43f7-88b8-19536c7c9b43 - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Volo.Abp.ApplicationContracts/project.json b/src/Volo.Abp.ApplicationContracts/project.json deleted file mode 100644 index c30f7f5abd..0000000000 --- a/src/Volo.Abp.ApplicationContracts/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "NETStandard.Library": "1.6.1", - "Volo.Abp.DependencyInjection.Abstractions": "1.0.0-*" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/src/Volo.Abp.ApplicationContracts/Volo/Abp/Application/Services/Dtos/EntityDto.cs b/src/Volo.Abp/Volo/Abp/Application/Services/Dtos/EntityDto.cs similarity index 100% rename from src/Volo.Abp.ApplicationContracts/Volo/Abp/Application/Services/Dtos/EntityDto.cs rename to src/Volo.Abp/Volo/Abp/Application/Services/Dtos/EntityDto.cs diff --git a/src/Volo.Abp.ApplicationContracts/Volo/Abp/Application/Services/Dtos/IEntityDto.cs b/src/Volo.Abp/Volo/Abp/Application/Services/Dtos/IEntityDto.cs similarity index 100% rename from src/Volo.Abp.ApplicationContracts/Volo/Abp/Application/Services/Dtos/IEntityDto.cs rename to src/Volo.Abp/Volo/Abp/Application/Services/Dtos/IEntityDto.cs diff --git a/src/Volo.Abp.ApplicationContracts/Volo/Abp/Application/Services/Dtos/ILimitedResultRequest.cs b/src/Volo.Abp/Volo/Abp/Application/Services/Dtos/ILimitedResultRequest.cs similarity index 100% rename from src/Volo.Abp.ApplicationContracts/Volo/Abp/Application/Services/Dtos/ILimitedResultRequest.cs rename to src/Volo.Abp/Volo/Abp/Application/Services/Dtos/ILimitedResultRequest.cs diff --git a/src/Volo.Abp.ApplicationContracts/Volo/Abp/Application/Services/Dtos/IPagedResultRequest.cs b/src/Volo.Abp/Volo/Abp/Application/Services/Dtos/IPagedResultRequest.cs similarity index 100% rename from src/Volo.Abp.ApplicationContracts/Volo/Abp/Application/Services/Dtos/IPagedResultRequest.cs rename to src/Volo.Abp/Volo/Abp/Application/Services/Dtos/IPagedResultRequest.cs diff --git a/src/Volo.Abp.ApplicationContracts/Volo/Abp/Application/Services/Dtos/ListResultDto.cs b/src/Volo.Abp/Volo/Abp/Application/Services/Dtos/ListResultDto.cs similarity index 100% rename from src/Volo.Abp.ApplicationContracts/Volo/Abp/Application/Services/Dtos/ListResultDto.cs rename to src/Volo.Abp/Volo/Abp/Application/Services/Dtos/ListResultDto.cs diff --git a/src/Volo.Abp.ApplicationContracts/Volo/Abp/Application/Services/IApplicationService.cs b/src/Volo.Abp/Volo/Abp/Application/Services/IApplicationService.cs similarity index 100% rename from src/Volo.Abp.ApplicationContracts/Volo/Abp/Application/Services/IApplicationService.cs rename to src/Volo.Abp/Volo/Abp/Application/Services/IApplicationService.cs diff --git a/src/Volo.Abp/project.json b/src/Volo.Abp/project.json index c943df9775..0005f17548 100644 --- a/src/Volo.Abp/project.json +++ b/src/Volo.Abp/project.json @@ -8,7 +8,6 @@ "Nito.AsyncEx.Context": "1.1.0", "System.Runtime.Loader": "4.3.0", "System.Linq.Queryable": "4.3.0", - "Volo.Abp.ApplicationContracts": "1.0.0-*", "Microsoft.Extensions.Options": "1.1.0", "JetBrains.Annotations": "10.2.1", "Volo.Abp.DependencyInjection.Abstractions": "1.0.0-*"