diff --git a/Volo.Abp.sln b/Volo.Abp.sln index 30892ce8a6..0f81d3e35d 100644 --- a/Volo.Abp.sln +++ b/Volo.Abp.sln @@ -38,8 +38,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6D893E48 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp", "src\Volo.Abp\Volo.Abp.csproj", "{FC5F7372-EA60-4052-B943-0EE070221CC1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Tests", "test\Volo.Abp.Tests\Volo.Abp.Tests.csproj", "{E9A85F1B-A5CB-4E19-B2BB-A7F97BB25EE1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbpTestBase", "test\AbpTestBase\AbpTestBase.csproj", "{1020F5FD-6A97-40C2-AFCA-EBDF641DF111}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore", "src\Volo.Abp.AspNetCore\Volo.Abp.AspNetCore.csproj", "{02BE03BA-3411-448C-AB61-CB36407CC49A}" @@ -174,31 +172,37 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Data.Tests", "test EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.MultiTenancy.Abstractions", "src\Volo.Abp.MultiTenancy.Abstractions\Volo.Abp.MultiTenancy.Abstractions.csproj", "{10EB789E-C993-4BE8-BA43-C419936C7233}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.ObjectMapping", "src\Volo.Abp.ObjectMapping\Volo.Abp.ObjectMapping.csproj", "{8D22063D-88DE-4F7A-A917-C81AB4ACE601}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.ObjectMapping", "src\Volo.Abp.ObjectMapping\Volo.Abp.ObjectMapping.csproj", "{8D22063D-88DE-4F7A-A917-C81AB4ACE601}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Validation", "src\Volo.Abp.Validation\Volo.Abp.Validation.csproj", "{5BECBCEF-459F-424B-A15A-0558D291842A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Validation", "src\Volo.Abp.Validation\Volo.Abp.Validation.csproj", "{5BECBCEF-459F-424B-A15A-0558D291842A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Validation.Tests", "test\Volo.Abp.Validation.Tests\Volo.Abp.Validation.Tests.csproj", "{87117AFB-4C87-40CB-889E-F1D97C504906}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Security", "src\Volo.Abp.Security\Volo.Abp.Security.csproj", "{D43CC2C9-449A-4619-B5C6-CBC72BCA0512}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Security", "src\Volo.Abp.Security\Volo.Abp.Security.csproj", "{D43CC2C9-449A-4619-B5C6-CBC72BCA0512}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Session", "src\Volo.Abp.Session\Volo.Abp.Session.csproj", "{2FCC8412-8558-465A-A659-025A7BB88F2C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Ddd", "src\Volo.Abp.Ddd\Volo.Abp.Ddd.csproj", "{020D0322-A427-406C-988A-C65196EC6DA2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Guids", "src\Volo.Abp.Guids\Volo.Abp.Guids.csproj", "{75C24B75-7B8A-4FC5-9DE4-91BF6168BCC0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Session", "src\Volo.Abp.Session\Volo.Abp.Session.csproj", "{2FCC8412-8558-465A-A659-025A7BB88F2C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Threading", "src\Volo.Abp.Threading\Volo.Abp.Threading.csproj", "{B17BAA37-27E8-4421-A18B-DDF6D146EA06}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Ddd", "src\Volo.Abp.Ddd\Volo.Abp.Ddd.csproj", "{020D0322-A427-406C-988A-C65196EC6DA2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Ddd.Tests", "test\Volo.Abp.Ddd.Tests\Volo.Abp.Ddd.Tests.csproj", "{C6CE997A-DE6F-4669-822F-5654BA72C0B0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Guids", "src\Volo.Abp.Guids\Volo.Abp.Guids.csproj", "{75C24B75-7B8A-4FC5-9DE4-91BF6168BCC0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Http.Abstractions", "src\Volo.Abp.Http.Abstractions\Volo.Abp.Http.Abstractions.csproj", "{BA4E3D59-2929-4797-A5F0-7565D76F4076}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Threading", "src\Volo.Abp.Threading\Volo.Abp.Threading.csproj", "{B17BAA37-27E8-4421-A18B-DDF6D146EA06}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Authorization", "src\Volo.Abp.Authorization\Volo.Abp.Authorization.csproj", "{74ECE2F5-A7FB-4363-BDD3-EDAF13F845C8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Ddd.Tests", "test\Volo.Abp.Ddd.Tests\Volo.Abp.Ddd.Tests.csproj", "{C6CE997A-DE6F-4669-822F-5654BA72C0B0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Json", "src\Volo.Abp.Json\Volo.Abp.Json.csproj", "{89E49906-6606-4126-AB3C-1605E17A1F68}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Http.Abstractions", "src\Volo.Abp.Http.Abstractions\Volo.Abp.Http.Abstractions.csproj", "{BA4E3D59-2929-4797-A5F0-7565D76F4076}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Timing", "src\Volo.Abp.Timing\Volo.Abp.Timing.csproj", "{46EF4B32-327C-4AFF-B39D-8202580847DB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Authorization", "src\Volo.Abp.Authorization\Volo.Abp.Authorization.csproj", "{74ECE2F5-A7FB-4363-BDD3-EDAF13F845C8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.UI", "src\Volo.Abp.UI\Volo.Abp.UI.csproj", "{4AFAFAF8-06FB-48D4-AFA6-B32215584E96}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Json", "src\Volo.Abp.Json\Volo.Abp.Json.csproj", "{89E49906-6606-4126-AB3C-1605E17A1F68}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.UI.Navigation", "src\Volo.Abp.UI.Navigation\Volo.Abp.UI.Navigation.csproj", "{6F80DD0F-D91C-4A69-A20E-BB687036EFA8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Timing", "src\Volo.Abp.Timing\Volo.Abp.Timing.csproj", "{46EF4B32-327C-4AFF-B39D-8202580847DB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.UI.Navigation.Tests", "test\Volo.Abp.UI.Navigation.Tests\Volo.Abp.UI.Navigation.Tests.csproj", "{975056D6-0B2D-43BA-9BF8-0E937581F873}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -210,10 +214,6 @@ Global {FC5F7372-EA60-4052-B943-0EE070221CC1}.Debug|Any CPU.Build.0 = Debug|Any CPU {FC5F7372-EA60-4052-B943-0EE070221CC1}.Release|Any CPU.ActiveCfg = Release|Any CPU {FC5F7372-EA60-4052-B943-0EE070221CC1}.Release|Any CPU.Build.0 = Release|Any CPU - {E9A85F1B-A5CB-4E19-B2BB-A7F97BB25EE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E9A85F1B-A5CB-4E19-B2BB-A7F97BB25EE1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E9A85F1B-A5CB-4E19-B2BB-A7F97BB25EE1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E9A85F1B-A5CB-4E19-B2BB-A7F97BB25EE1}.Release|Any CPU.Build.0 = Release|Any CPU {1020F5FD-6A97-40C2-AFCA-EBDF641DF111}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1020F5FD-6A97-40C2-AFCA-EBDF641DF111}.Debug|Any CPU.Build.0 = Debug|Any CPU {1020F5FD-6A97-40C2-AFCA-EBDF641DF111}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -530,6 +530,18 @@ Global {46EF4B32-327C-4AFF-B39D-8202580847DB}.Debug|Any CPU.Build.0 = Debug|Any CPU {46EF4B32-327C-4AFF-B39D-8202580847DB}.Release|Any CPU.ActiveCfg = Release|Any CPU {46EF4B32-327C-4AFF-B39D-8202580847DB}.Release|Any CPU.Build.0 = Release|Any CPU + {4AFAFAF8-06FB-48D4-AFA6-B32215584E96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4AFAFAF8-06FB-48D4-AFA6-B32215584E96}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4AFAFAF8-06FB-48D4-AFA6-B32215584E96}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4AFAFAF8-06FB-48D4-AFA6-B32215584E96}.Release|Any CPU.Build.0 = Release|Any CPU + {6F80DD0F-D91C-4A69-A20E-BB687036EFA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6F80DD0F-D91C-4A69-A20E-BB687036EFA8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6F80DD0F-D91C-4A69-A20E-BB687036EFA8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6F80DD0F-D91C-4A69-A20E-BB687036EFA8}.Release|Any CPU.Build.0 = Release|Any CPU + {975056D6-0B2D-43BA-9BF8-0E937581F873}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {975056D6-0B2D-43BA-9BF8-0E937581F873}.Debug|Any CPU.Build.0 = Debug|Any CPU + {975056D6-0B2D-43BA-9BF8-0E937581F873}.Release|Any CPU.ActiveCfg = Release|Any CPU + {975056D6-0B2D-43BA-9BF8-0E937581F873}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -545,7 +557,6 @@ Global {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} @@ -626,6 +637,9 @@ Global {74ECE2F5-A7FB-4363-BDD3-EDAF13F845C8} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} {89E49906-6606-4126-AB3C-1605E17A1F68} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} {46EF4B32-327C-4AFF-B39D-8202580847DB} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} + {4AFAFAF8-06FB-48D4-AFA6-B32215584E96} = {6F776E78-862A-4147-86BA-12B6B64E8958} + {6F80DD0F-D91C-4A69-A20E-BB687036EFA8} = {6F776E78-862A-4147-86BA-12B6B64E8958} + {975056D6-0B2D-43BA-9BF8-0E937581F873} = {37087D1B-3693-4E96-983D-A69F210BDE53} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5} diff --git a/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk/Tickets/ITicketAppService.cs b/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk/Tickets/ITicketAppService.cs index 721aa3f90c..ddb47cfa60 100644 --- a/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk/Tickets/ITicketAppService.cs +++ b/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk/Tickets/ITicketAppService.cs @@ -10,7 +10,5 @@ namespace AbpDesk.Tickets Task> GetAll(GetAllTicketsInput input); ListResultDto GetAll2(GetAllTicketsInput input); - - void TestException(); } } diff --git a/src/AbpDesk/AbpDesk.Application/AbpDesk/Tickets/TicketAppService.cs b/src/AbpDesk/AbpDesk.Application/AbpDesk/Tickets/TicketAppService.cs index c824893322..dcc897d516 100644 --- a/src/AbpDesk/AbpDesk.Application/AbpDesk/Tickets/TicketAppService.cs +++ b/src/AbpDesk/AbpDesk.Application/AbpDesk/Tickets/TicketAppService.cs @@ -7,7 +7,6 @@ using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.Domain.Repositories; using Volo.Abp.Linq; -using Volo.Abp.Ui; namespace AbpDesk.Tickets { @@ -52,10 +51,5 @@ namespace AbpDesk.Tickets ObjectMapper.Map, List>(tickets) ); } - - public void TestException() - { - throw new UserFriendlyException("a user friendly message!"); - } } } diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/AbpAspNetCoreMvcUiModule.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/AbpAspNetCoreMvcUiModule.cs index c7d22cabde..deda579544 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/AbpAspNetCoreMvcUiModule.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI/AbpAspNetCoreMvcUiModule.cs @@ -2,11 +2,13 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AspNetCore.Mvc.Bundling; using Volo.Abp.Modularity; +using Volo.Abp.Ui.Navigation; using Volo.Abp.VirtualFileSystem; namespace Volo.Abp.AspNetCore.Mvc { [DependsOn(typeof(AbpAspNetCoreMvcModule))] + [DependsOn(typeof(AbpUiNavigationModule))] public class AbpAspNetCoreMvcUiModule : AbpModule { public override void ConfigureServices(IServiceCollection services) 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 index 9b311b1d31..f4b290c20e 100644 --- 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 @@ -29,6 +29,7 @@ + diff --git a/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj b/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj index e05c8eaff1..7d6fa9ee7b 100644 --- a/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj +++ b/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj @@ -17,6 +17,7 @@ + diff --git a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs index 3449dffd40..fa4212571b 100644 --- a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs +++ b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs @@ -21,12 +21,14 @@ using Volo.Abp.AspNetCore.Mvc.Localization; using Volo.Abp.AspNetCore.VirtualFileSystem; using Volo.Abp.Http; using Volo.Abp.Http.Modeling; +using Volo.Abp.Ui; namespace Volo.Abp.AspNetCore.Mvc { [DependsOn(typeof(AbpHttpModule))] [DependsOn(typeof(AbpDddModule))] //TODO: Ideally, AbpAspNetCoreMvcModule should not depend on Ddd module...? [DependsOn(typeof(AbpAspNetCoreModule))] + [DependsOn(typeof(AbpUiModule))] public class AbpAspNetCoreMvcModule : AbpModule { public override void PreConfigureServices(IServiceCollection services) diff --git a/src/Volo.Abp.Core/Properties/AssemblyInfo.cs b/src/Volo.Abp.Core/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..729055dbdc --- /dev/null +++ b/src/Volo.Abp.Core/Properties/AssemblyInfo.cs @@ -0,0 +1,3 @@ +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Volo.Abp.Core.Tests")] diff --git a/src/Volo.Abp/Volo/Abp/IHasErrorCode.cs b/src/Volo.Abp.Core/Volo/Abp/IHasErrorCode.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/IHasErrorCode.cs rename to src/Volo.Abp.Core/Volo/Abp/IHasErrorCode.cs diff --git a/src/Volo.Abp/Volo/Abp/NameValue.cs b/src/Volo.Abp.Core/Volo/Abp/NameValue.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/NameValue.cs rename to src/Volo.Abp.Core/Volo/Abp/NameValue.cs diff --git a/src/Volo.Abp/Volo/Abp/Text/Formatting/FormatStringToken.cs b/src/Volo.Abp.Core/Volo/Abp/Text/Formatting/FormatStringToken.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Text/Formatting/FormatStringToken.cs rename to src/Volo.Abp.Core/Volo/Abp/Text/Formatting/FormatStringToken.cs diff --git a/src/Volo.Abp/Volo/Abp/Text/Formatting/FormatStringTokenType.cs b/src/Volo.Abp.Core/Volo/Abp/Text/Formatting/FormatStringTokenType.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Text/Formatting/FormatStringTokenType.cs rename to src/Volo.Abp.Core/Volo/Abp/Text/Formatting/FormatStringTokenType.cs diff --git a/src/Volo.Abp/Volo/Abp/Text/Formatting/FormatStringTokenizer.cs b/src/Volo.Abp.Core/Volo/Abp/Text/Formatting/FormatStringTokenizer.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Text/Formatting/FormatStringTokenizer.cs rename to src/Volo.Abp.Core/Volo/Abp/Text/Formatting/FormatStringTokenizer.cs diff --git a/src/Volo.Abp/Volo/Abp/Text/Formatting/FormattedStringValueExtracter.cs b/src/Volo.Abp.Core/Volo/Abp/Text/Formatting/FormattedStringValueExtracter.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Text/Formatting/FormattedStringValueExtracter.cs rename to src/Volo.Abp.Core/Volo/Abp/Text/Formatting/FormattedStringValueExtracter.cs diff --git a/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityAppServiceBase.cs b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityAppServiceBase.cs index a6392dfb48..3f1919323f 100644 --- a/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityAppServiceBase.cs +++ b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityAppServiceBase.cs @@ -2,7 +2,6 @@ using System.Linq; using Microsoft.AspNetCore.Identity; using Volo.Abp.Application.Services; -using Volo.Abp.Ui; namespace Volo.Abp.Identity { @@ -12,7 +11,8 @@ namespace Volo.Abp.Identity { if (!identityResult.Succeeded) { - throw new UserFriendlyException("Operation failed: " + identityResult.Errors.Select(e => $"[{e.Code}] {e.Description}").JoinAsString(", ")); + //TODO: A better exception that can be shown on UI as localized? + throw new AbpException("Operation failed: " + identityResult.Errors.Select(e => $"[{e.Code}] {e.Description}").JoinAsString(", ")); } //identityResult.CheckErrors(LocalizationManager); //TODO: Get from old Abp diff --git a/src/Volo.Abp.UI.Navigation/Volo.Abp.UI.Navigation.csproj b/src/Volo.Abp.UI.Navigation/Volo.Abp.UI.Navigation.csproj new file mode 100644 index 0000000000..c0892f1369 --- /dev/null +++ b/src/Volo.Abp.UI.Navigation/Volo.Abp.UI.Navigation.csproj @@ -0,0 +1,21 @@ + + + + + + netstandard2.0 + Volo.Abp.Navigation + Volo.Abp.Navigation + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + false + false + false + + + + + + + + + \ No newline at end of file diff --git a/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/AbpUiNavigationModule.cs b/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/AbpUiNavigationModule.cs new file mode 100644 index 0000000000..af741c5198 --- /dev/null +++ b/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/AbpUiNavigationModule.cs @@ -0,0 +1,14 @@ +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.Modularity; + +namespace Volo.Abp.Ui.Navigation +{ + [DependsOn(typeof(AbpUiModule))] + public class AbpUiNavigationModule : AbpModule + { + public override void ConfigureServices(IServiceCollection services) + { + services.AddAssemblyOf(); + } + } +} diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/ApplicationMenu.cs b/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/ApplicationMenu.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Ui/Navigation/ApplicationMenu.cs rename to src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/ApplicationMenu.cs diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/ApplicationMenuItem.cs b/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/ApplicationMenuItem.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Ui/Navigation/ApplicationMenuItem.cs rename to src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/ApplicationMenuItem.cs diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/IHasMenuItems.cs b/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/IHasMenuItems.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Ui/Navigation/IHasMenuItems.cs rename to src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/IHasMenuItems.cs diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuConfigurationContext.cs b/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/IMenuConfigurationContext.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuConfigurationContext.cs rename to src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/IMenuConfigurationContext.cs diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuContributor.cs b/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/IMenuContributor.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuContributor.cs rename to src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/IMenuContributor.cs diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuManager.cs b/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/IMenuManager.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Ui/Navigation/IMenuManager.cs rename to src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/IMenuManager.cs diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/MenuConfigurationContext.cs b/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuConfigurationContext.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Ui/Navigation/MenuConfigurationContext.cs rename to src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuConfigurationContext.cs diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/MenuManager.cs b/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuManager.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Ui/Navigation/MenuManager.cs rename to src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuManager.cs diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/NavigationOptions.cs b/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/NavigationOptions.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Ui/Navigation/NavigationOptions.cs rename to src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/NavigationOptions.cs diff --git a/src/Volo.Abp/Volo/Abp/Ui/Navigation/StandardMenus.cs b/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/StandardMenus.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Ui/Navigation/StandardMenus.cs rename to src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/StandardMenus.cs diff --git a/src/Volo.Abp.UI/Volo.Abp.UI.csproj b/src/Volo.Abp.UI/Volo.Abp.UI.csproj new file mode 100644 index 0000000000..77a2f7059e --- /dev/null +++ b/src/Volo.Abp.UI/Volo.Abp.UI.csproj @@ -0,0 +1,20 @@ + + + + + + netstandard2.0 + Volo.Abp.UI + Volo.Abp.UI + $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; + false + false + false + + + + + + + + \ No newline at end of file diff --git a/src/Volo.Abp.UI/Volo/Abp/Ui/AbpUiModule.cs b/src/Volo.Abp.UI/Volo/Abp/Ui/AbpUiModule.cs new file mode 100644 index 0000000000..81d4e7a68a --- /dev/null +++ b/src/Volo.Abp.UI/Volo/Abp/Ui/AbpUiModule.cs @@ -0,0 +1,13 @@ +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.Modularity; + +namespace Volo.Abp.Ui +{ + public class AbpUiModule : AbpModule + { + public override void ConfigureServices(IServiceCollection services) + { + services.AddAssemblyOf(); + } + } +} diff --git a/src/Volo.Abp/Volo/Abp/Ui/IUserFriendlyException.cs b/src/Volo.Abp.UI/Volo/Abp/Ui/IUserFriendlyException.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Ui/IUserFriendlyException.cs rename to src/Volo.Abp.UI/Volo/Abp/Ui/IUserFriendlyException.cs diff --git a/src/Volo.Abp/Volo/Abp/Ui/UserFriendlyException.cs b/src/Volo.Abp.UI/Volo/Abp/Ui/UserFriendlyException.cs similarity index 100% rename from src/Volo.Abp/Volo/Abp/Ui/UserFriendlyException.cs rename to src/Volo.Abp.UI/Volo/Abp/Ui/UserFriendlyException.cs diff --git a/test/Volo.Abp.Autofac.Tests/Volo.Abp.Autofac.Tests.csproj b/test/Volo.Abp.Autofac.Tests/Volo.Abp.Autofac.Tests.csproj index c0f1b8b347..b69742f68b 100644 --- a/test/Volo.Abp.Autofac.Tests/Volo.Abp.Autofac.Tests.csproj +++ b/test/Volo.Abp.Autofac.Tests/Volo.Abp.Autofac.Tests.csproj @@ -14,7 +14,7 @@ - + diff --git a/test/Volo.Abp.Tests/Volo/Abp/DynamicProxy/AbpInterceptionTestBase.cs b/test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/AbpInterceptionTestBase.cs similarity index 100% rename from test/Volo.Abp.Tests/Volo/Abp/DynamicProxy/AbpInterceptionTestBase.cs rename to test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/AbpInterceptionTestBase.cs diff --git a/test/Volo.Abp.Tests/Volo/Abp/DynamicProxy/CachedTestObject.cs b/test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/CachedTestObject.cs similarity index 100% rename from test/Volo.Abp.Tests/Volo/Abp/DynamicProxy/CachedTestObject.cs rename to test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/CachedTestObject.cs diff --git a/test/Volo.Abp.Tests/Volo/Abp/DynamicProxy/SimpleAsyncInterceptor.cs b/test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/SimpleAsyncInterceptor.cs similarity index 100% rename from test/Volo.Abp.Tests/Volo/Abp/DynamicProxy/SimpleAsyncInterceptor.cs rename to test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/SimpleAsyncInterceptor.cs diff --git a/test/Volo.Abp.Tests/Volo/Abp/DynamicProxy/SimpleAsyncInterceptor2.cs b/test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/SimpleAsyncInterceptor2.cs similarity index 100% rename from test/Volo.Abp.Tests/Volo/Abp/DynamicProxy/SimpleAsyncInterceptor2.cs rename to test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/SimpleAsyncInterceptor2.cs diff --git a/test/Volo.Abp.Tests/Volo/Abp/DynamicProxy/SimpleInterceptionTargetClass.cs b/test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/SimpleInterceptionTargetClass.cs similarity index 100% rename from test/Volo.Abp.Tests/Volo/Abp/DynamicProxy/SimpleInterceptionTargetClass.cs rename to test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/SimpleInterceptionTargetClass.cs diff --git a/test/Volo.Abp.Tests/Volo/Abp/DynamicProxy/SimpleResultCacheTestInterceptor.cs b/test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/SimpleResultCacheTestInterceptor.cs similarity index 100% rename from test/Volo.Abp.Tests/Volo/Abp/DynamicProxy/SimpleResultCacheTestInterceptor.cs rename to test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/SimpleResultCacheTestInterceptor.cs diff --git a/test/Volo.Abp.Tests/Volo/Abp/DynamicProxy/SimpleSyncInterceptor.cs b/test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/SimpleSyncInterceptor.cs similarity index 100% rename from test/Volo.Abp.Tests/Volo/Abp/DynamicProxy/SimpleSyncInterceptor.cs rename to test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/SimpleSyncInterceptor.cs diff --git a/test/Volo.Abp.Tests/Volo/Abp/Text/Formatting/FormattedStringTokenizer_Test.cs b/test/Volo.Abp.Core.Tests/Volo/Abp/Text/Formatting/FormattedStringTokenizer_Test.cs similarity index 100% rename from test/Volo.Abp.Tests/Volo/Abp/Text/Formatting/FormattedStringTokenizer_Test.cs rename to test/Volo.Abp.Core.Tests/Volo/Abp/Text/Formatting/FormattedStringTokenizer_Test.cs diff --git a/test/Volo.Abp.Tests/Volo/Abp/Text/Formatting/FormattedStringValueExtracter_Tests.cs b/test/Volo.Abp.Core.Tests/Volo/Abp/Text/Formatting/FormattedStringValueExtracter_Tests.cs similarity index 100% rename from test/Volo.Abp.Tests/Volo/Abp/Text/Formatting/FormattedStringValueExtracter_Tests.cs rename to test/Volo.Abp.Core.Tests/Volo/Abp/Text/Formatting/FormattedStringValueExtracter_Tests.cs diff --git a/test/Volo.Abp.Tests/Volo/Abp/Threading/AsyncHelper_Tests.cs b/test/Volo.Abp.Core.Tests/Volo/Abp/Threading/AsyncHelper_Tests.cs similarity index 100% rename from test/Volo.Abp.Tests/Volo/Abp/Threading/AsyncHelper_Tests.cs rename to test/Volo.Abp.Core.Tests/Volo/Abp/Threading/AsyncHelper_Tests.cs diff --git a/test/Volo.Abp.Tests/Volo.Abp.Tests.csproj b/test/Volo.Abp.Tests/Volo.Abp.Tests.csproj index b8012353ee..1d269a9889 100644 --- a/test/Volo.Abp.Tests/Volo.Abp.Tests.csproj +++ b/test/Volo.Abp.Tests/Volo.Abp.Tests.csproj @@ -26,4 +26,8 @@ + + + + diff --git a/test/Volo.Abp.UI.Navigation.Tests/Volo.Abp.UI.Navigation.Tests.csproj b/test/Volo.Abp.UI.Navigation.Tests/Volo.Abp.UI.Navigation.Tests.csproj new file mode 100644 index 0000000000..d7bbe59c52 --- /dev/null +++ b/test/Volo.Abp.UI.Navigation.Tests/Volo.Abp.UI.Navigation.Tests.csproj @@ -0,0 +1,23 @@ + + + + netcoreapp2.0 + Volo.Abp.UI.Navigation.Tests + Volo.Abp.UI.Navigation.Tests + true + false + false + false + + + + + + + + + + + + + diff --git a/test/Volo.Abp.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs b/test/Volo.Abp.UI.Navigation.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs similarity index 98% rename from test/Volo.Abp.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs rename to test/Volo.Abp.UI.Navigation.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs index bf286dd056..ffc864d3a2 100644 --- a/test/Volo.Abp.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs +++ b/test/Volo.Abp.UI.Navigation.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs @@ -32,7 +32,7 @@ namespace Volo.Abp.Ui.Navigation mainMenu.Items[1].Items[2].Name.ShouldBe("Administration.DashboardSettings"); } - [DependsOn(typeof(AbpCommonModule))] + [DependsOn(typeof(AbpUiNavigationModule))] public class TestModule : AbpModule { public override void ConfigureServices(IServiceCollection services)