From f293e2e47de0dbdf87a48f73e134cd2f5f3e37ce Mon Sep 17 00:00:00 2001 From: berkansasmaz Date: Thu, 30 Dec 2021 10:26:21 +0300 Subject: [PATCH] Upgrade to ABP v5.0.1 and remove all unused namespaces in code --- ...ventHub.Admin.Application.Contracts.csproj | 6 +- .../Users/IUserAppService.cs | 3 +- .../EventHub.Admin.Application.csproj | 6 +- .../EventRegistrationAppService.cs | 7 +- .../OrganizationMembershipAppService.cs | 1 - .../EventHub.Admin.HttpApi.Client.csproj | 6 +- .../EventRegistrationController.cs | 1 - .../Controllers/Users/UserController.cs | 4 +- .../EventHub.Admin.HttpApi.Host.csproj | 10 +- .../EventHubAdminHttpApiHostModule.cs | 1 - .../EventHub.Admin.HttpApi.csproj | 6 +- .../Components/UserPicker/UserPicker.razor.cs | 12 +- .../EventHub.Admin.Web.csproj | 10 +- .../Pages/AttendeeDetail.razor | 4 +- .../Pages/AttendeeDetail.razor.cs | 10 +- .../Pages/EventManagement.razor | 5 +- .../Pages/EventManagement.razor.cs | 17 +- .../Pages/OrganizationManagement.razor | 5 +- .../Pages/OrganizationManagement.razor.cs | 7 +- .../OrganizationMembershipManagement.razor | 1 - .../EventHub.Application.Contracts.csproj | 2 +- .../Events/EventDetailDto.cs | 1 - .../EventHub.Application.csproj | 2 +- .../EventRegistrationAppService.cs | 2 +- .../Organizations/OrganizationAppService.cs | 1 - .../Properties/AssemblyInfo.cs | 1 + .../EventHub.BackgroundServices.csproj | 6 +- .../Data/EventHubSampleDataSeedContributor.cs | 1 - .../DbMigratorHostedService.cs | 2 +- .../EventHub.DbMigrator.csproj | 2 +- src/EventHub.DbMigrator/Program.cs | 1 - .../EventHub.Domain.Shared.csproj | 14 +- .../EventHubDomainSharedModule.cs | 4 +- .../EventHubModuleExtensionConfigurator.cs | 5 +- src/EventHub.Domain/EventHub.Domain.csproj | 18 +- src/EventHub.Domain/EventHubDomainModule.cs | 4 +- src/EventHub.Domain/Events/EventManager.cs | 1 - .../IOrganizationMembershipRepository.cs | 1 - .../Organizations/Organization.cs | 1 - .../Properties/AssemblyInfo.cs | 1 + ...tyFrameworkCoreEventHubDbSchemaMigrator.cs | 2 +- .../EntityFrameworkCore/EventHubDbContext.cs | 1 - ...ventHubDbContextModelCreatingExtensions.cs | 1 - .../EventHubEfCoreEntityExtensionMappings.cs | 5 +- .../EventHubEntityFrameworkCoreModule.cs | 12 +- .../EventRegistrationRepository.cs | 7 +- .../EventHub.EntityFrameworkCore.csproj | 18 +- .../Properties/AssemblyInfo.cs | 1 + .../EventHub.HttpApi.Client.csproj | 2 +- .../EventHubHttpApiClientModule.cs | 2 +- .../EventHub.HttpApi.Host.csproj | 10 +- .../EventHubHttpApiHostModule.cs | 16 +- .../EventRegistrationController.cs | 1 - .../OrganizationMembershipController.cs | 1 - .../Organizations/OrganizationController.cs | 1 - src/EventHub.HttpApi/EventHub.HttpApi.csproj | 2 +- src/EventHub.HttpApi/EventHubHttpApiModule.cs | 6 +- .../EventHub.IdentityServer.csproj | 14 +- .../EventHubBrandingProvider.cs | 4 +- .../EventHubIdentityServerModule.cs | 14 +- .../Pages/Account/LoggedOut.cshtml | 4 +- .../Pages/Account/Manage.cshtml | 4 +- .../Pages/Index.cshtml | 2 +- src/EventHub.IdentityServer/package.json | 2 +- .../wwwroot/libs/abp/core/abp.css | 112 +- .../wwwroot/libs/abp/core/abp.js | 1552 ++++++++--------- .../wwwroot/libs/abp/jquery/abp.jquery.js | 806 ++++----- .../wwwroot/libs/abp/luxon/abp.luxon.js | 92 +- .../libs/abp/utils/abp-utils.umd.js.map | 2 +- .../libs/abp/utils/abp-utils.umd.min.js.map | 2 +- .../bootstrap.enable.tooltips.everywhere.js | 10 +- src/EventHub.IdentityServer/yarn.lock | 238 +-- .../EventHub.Web.Theme.csproj | 4 +- .../Helpers/TagHelpers/GravatarTagHelper.cs | 3 +- .../EventHub/Components/Footer/Default.cshtml | 9 +- .../Components/MainNavbar/Default.cshtml | 11 +- .../EventHub/Components/Menu/Default.cshtml | 3 +- .../EventHub/Components/Menu/_MenuItem.cshtml | 3 +- .../Components/Toolbar/Default.cshtml | 3 +- .../Toolbar/LanguageSwitch/Default.cshtml | 6 +- .../Toolbar/UserMenu/Default.cshtml | 13 +- .../Themes/EventHub/Layouts/Account.cshtml | 10 +- .../EventHub/Layouts/Application.cshtml | 6 +- .../Toolbar/LoginLink/Default.cshtml | 4 +- src/EventHub.Web/EventHub.Web.csproj | 18 +- src/EventHub.Web/EventHubBrandingProvider.cs | 4 +- .../EventHubWebAutoMapperProfile.cs | 1 - src/EventHub.Web/EventHubWebModule.cs | 21 +- .../Menus/EventHubMenuContributor.cs | 2 +- .../Menus/EventHubToolbarContributor.cs | 2 +- .../_sessionSection.cshtml | 2 +- .../EventsArea/_eventListSection.cshtml | 1 - .../Components/LocationArea/Default.cshtml | 2 +- .../RegistrationArea/Default.cshtml | 4 +- src/EventHub.Web/Pages/Events/Detail.cshtml | 4 +- src/EventHub.Web/Pages/Index.cshtml | 5 +- .../Components/JoinArea/Default.cshtml | 2 +- .../OrganizationsAreaViewComponent.cs | 3 +- .../Pages/Organizations/Edit.cshtml | 1 - .../Pages/Organizations/Edit.cshtml.cs | 1 - .../Pages/Organizations/Profile.cshtml | 1 - .../Pages/Payment/PostCheckout.cshtml | 2 +- .../Pages/Payment/PreCheckout.cshtml | 3 +- src/EventHub.Web/Pages/User.cshtml | 6 +- src/EventHub.Web/Properties/AssemblyInfo.cs | 1 + src/EventHub.Web/package.json | 4 +- .../wwwroot/libs/abp/core/abp.css | 112 +- src/EventHub.Web/wwwroot/libs/abp/core/abp.js | 1552 ++++++++--------- .../wwwroot/libs/abp/jquery/abp.jquery.js | 806 ++++----- .../wwwroot/libs/abp/luxon/abp.luxon.js | 92 +- .../libs/abp/utils/abp-utils.umd.js.map | 2 +- .../libs/abp/utils/abp-utils.umd.min.js.map | 2 +- .../wwwroot/libs/awesomplete/.codeclimate.yml | 14 - .../wwwroot/libs/awesomplete/.eslintrc | 254 --- .../wwwroot/libs/awesomplete/.travis.yml | 28 - .../bootstrap.enable.tooltips.everywhere.js | 10 +- src/EventHub.Web/yarn.lock | 238 +-- .../Events/EventAppServiceTests.cs | 1 - .../OrganizationAppServiceTests.cs | 1 - .../Events/EventManager_Tests.cs | 2 - .../EventRegistrationManager_UnitTests.cs | 6 +- .../EventRegistrationRepository_Tests.cs | 1 - .../EventHubEntityFrameworkCoreTestBase.cs | 4 +- .../EventHub.EntityFrameworkCore.Tests.csproj | 2 +- .../EventHub.TestBase.csproj | 6 +- test/EventHub.TestBase/EventHubTestBase.cs | 2 +- .../EventHubTestBaseModule.cs | 5 +- 127 files changed, 3052 insertions(+), 3391 deletions(-) delete mode 100644 src/EventHub.Web/wwwroot/libs/awesomplete/.codeclimate.yml delete mode 100644 src/EventHub.Web/wwwroot/libs/awesomplete/.eslintrc delete mode 100644 src/EventHub.Web/wwwroot/libs/awesomplete/.travis.yml diff --git a/src/EventHub.Admin.Application.Contracts/EventHub.Admin.Application.Contracts.csproj b/src/EventHub.Admin.Application.Contracts/EventHub.Admin.Application.Contracts.csproj index c48c9e7..b0e1f53 100644 --- a/src/EventHub.Admin.Application.Contracts/EventHub.Admin.Application.Contracts.csproj +++ b/src/EventHub.Admin.Application.Contracts/EventHub.Admin.Application.Contracts.csproj @@ -13,9 +13,9 @@ - - - + + + diff --git a/src/EventHub.Admin.Application.Contracts/Users/IUserAppService.cs b/src/EventHub.Admin.Application.Contracts/Users/IUserAppService.cs index 4920226..d74a7e4 100644 --- a/src/EventHub.Admin.Application.Contracts/Users/IUserAppService.cs +++ b/src/EventHub.Admin.Application.Contracts/Users/IUserAppService.cs @@ -1,5 +1,4 @@ -using System; -using System.Threading.Tasks; +using System.Threading.Tasks; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; diff --git a/src/EventHub.Admin.Application/EventHub.Admin.Application.csproj b/src/EventHub.Admin.Application/EventHub.Admin.Application.csproj index 2dc0e91..004dd59 100644 --- a/src/EventHub.Admin.Application/EventHub.Admin.Application.csproj +++ b/src/EventHub.Admin.Application/EventHub.Admin.Application.csproj @@ -14,9 +14,9 @@ - - - + + + diff --git a/src/EventHub.Admin.Application/Events/Registrations/EventRegistrationAppService.cs b/src/EventHub.Admin.Application/Events/Registrations/EventRegistrationAppService.cs index 26495c5..af9ccff 100644 --- a/src/EventHub.Admin.Application/Events/Registrations/EventRegistrationAppService.cs +++ b/src/EventHub.Admin.Application/Events/Registrations/EventRegistrationAppService.cs @@ -1,14 +1,13 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Linq.Dynamic.Core; using System.Threading.Tasks; using EventHub.Admin.Permissions; -using Volo.Abp.Application.Dtos; -using EventHub.Events.Registrations; -using Microsoft.AspNetCore.Authorization; using EventHub.Events; +using EventHub.Events.Registrations; using EventHub.Users; +using Microsoft.AspNetCore.Authorization; +using Volo.Abp.Application.Dtos; namespace EventHub.Admin.Events.Registrations { diff --git a/src/EventHub.Admin.Application/Organizations/Memberships/OrganizationMembershipAppService.cs b/src/EventHub.Admin.Application/Organizations/Memberships/OrganizationMembershipAppService.cs index afba9ec..ac113ae 100644 --- a/src/EventHub.Admin.Application/Organizations/Memberships/OrganizationMembershipAppService.cs +++ b/src/EventHub.Admin.Application/Organizations/Memberships/OrganizationMembershipAppService.cs @@ -11,7 +11,6 @@ using Volo.Abp.Application.Services; using Volo.Abp.Domain.Repositories; using Volo.Abp.Identity; - namespace EventHub.Admin.Organizations.Memberships { [Authorize(EventHubPermissions.Organizations.Memberships.Default)] diff --git a/src/EventHub.Admin.HttpApi.Client/EventHub.Admin.HttpApi.Client.csproj b/src/EventHub.Admin.HttpApi.Client/EventHub.Admin.HttpApi.Client.csproj index 970910c..d38f1bb 100644 --- a/src/EventHub.Admin.HttpApi.Client/EventHub.Admin.HttpApi.Client.csproj +++ b/src/EventHub.Admin.HttpApi.Client/EventHub.Admin.HttpApi.Client.csproj @@ -13,9 +13,9 @@ - - - + + + diff --git a/src/EventHub.Admin.HttpApi.Host/Controllers/Events/Registrations/EventRegistrationController.cs b/src/EventHub.Admin.HttpApi.Host/Controllers/Events/Registrations/EventRegistrationController.cs index 7abd373..1332a00 100644 --- a/src/EventHub.Admin.HttpApi.Host/Controllers/Events/Registrations/EventRegistrationController.cs +++ b/src/EventHub.Admin.HttpApi.Host/Controllers/Events/Registrations/EventRegistrationController.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Threading.Tasks; using EventHub.Admin.Events.Registrations; using Microsoft.AspNetCore.Mvc; diff --git a/src/EventHub.Admin.HttpApi.Host/Controllers/Users/UserController.cs b/src/EventHub.Admin.HttpApi.Host/Controllers/Users/UserController.cs index 75ff77e..4f301b4 100644 --- a/src/EventHub.Admin.HttpApi.Host/Controllers/Users/UserController.cs +++ b/src/EventHub.Admin.HttpApi.Host/Controllers/Users/UserController.cs @@ -1,6 +1,6 @@ -using EventHub.Admin.Users; +using System.Threading.Tasks; +using EventHub.Admin.Users; using Microsoft.AspNetCore.Mvc; -using System.Threading.Tasks; using Volo.Abp; using Volo.Abp.Application.Dtos; using Volo.Abp.AspNetCore.Mvc; diff --git a/src/EventHub.Admin.HttpApi.Host/EventHub.Admin.HttpApi.Host.csproj b/src/EventHub.Admin.HttpApi.Host/EventHub.Admin.HttpApi.Host.csproj index 24e8327..6993204 100644 --- a/src/EventHub.Admin.HttpApi.Host/EventHub.Admin.HttpApi.Host.csproj +++ b/src/EventHub.Admin.HttpApi.Host/EventHub.Admin.HttpApi.Host.csproj @@ -15,11 +15,11 @@ - - - - - + + + + + diff --git a/src/EventHub.Admin.HttpApi.Host/EventHubAdminHttpApiHostModule.cs b/src/EventHub.Admin.HttpApi.Host/EventHubAdminHttpApiHostModule.cs index 7bb8d9b..c93e3f6 100644 --- a/src/EventHub.Admin.HttpApi.Host/EventHubAdminHttpApiHostModule.cs +++ b/src/EventHub.Admin.HttpApi.Host/EventHubAdminHttpApiHostModule.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.Globalization; using System.IO; -using System.Linq; using EventHub.Admin.Events; using EventHub.Admin.Organizations; using EventHub.Admin.Utils; diff --git a/src/EventHub.Admin.HttpApi/EventHub.Admin.HttpApi.csproj b/src/EventHub.Admin.HttpApi/EventHub.Admin.HttpApi.csproj index bd8b091..49f8fca 100644 --- a/src/EventHub.Admin.HttpApi/EventHub.Admin.HttpApi.csproj +++ b/src/EventHub.Admin.HttpApi/EventHub.Admin.HttpApi.csproj @@ -13,9 +13,9 @@ - - - + + + diff --git a/src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor.cs b/src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor.cs index f8469db..cb9fc16 100644 --- a/src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor.cs +++ b/src/EventHub.Admin.Web/Components/UserPicker/UserPicker.razor.cs @@ -1,11 +1,11 @@ -using Blazorise; -using EventHub.Admin.Users; -using Microsoft.AspNetCore.Components; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using Blazorise; using Blazorise.DataGrid; +using EventHub.Admin.Users; +using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components.Web; using Volo.Abp.Application.Dtos; @@ -120,9 +120,11 @@ namespace EventHub.Admin.Web.Components.UserPicker await SaveFormAsync.InvokeAsync(); } - private void ClosingUserPickerModal(ModalClosingEventArgs eventArgs) + private Task ClosingUserPickerModal(ModalClosingEventArgs eventArgs) { eventArgs.Cancel = eventArgs.CloseReason == CloseReason.FocusLostClosing; + + return Task.CompletedTask; } } } diff --git a/src/EventHub.Admin.Web/EventHub.Admin.Web.csproj b/src/EventHub.Admin.Web/EventHub.Admin.Web.csproj index 02e0418..9f8a2d2 100644 --- a/src/EventHub.Admin.Web/EventHub.Admin.Web.csproj +++ b/src/EventHub.Admin.Web/EventHub.Admin.Web.csproj @@ -11,16 +11,16 @@ - - + + - - - + + + diff --git a/src/EventHub.Admin.Web/Pages/AttendeeDetail.razor b/src/EventHub.Admin.Web/Pages/AttendeeDetail.razor index c9061d4..6526d7b 100644 --- a/src/EventHub.Admin.Web/Pages/AttendeeDetail.razor +++ b/src/EventHub.Admin.Web/Pages/AttendeeDetail.razor @@ -11,7 +11,7 @@

@L["Attendees"]

- + @if (CanAddAttendee) {