From 1f3ca2fc9236ccb1fe758b789aa7067257a9f1b4 Mon Sep 17 00:00:00 2001 From: jxnkwlp Date: Mon, 25 Nov 2024 19:59:09 +0800 Subject: [PATCH 1/3] fix: replace all tfw --- .../Passingwind.Abp.Account.Installer.csproj | 2 +- .../Passingwind.Abp.ApiKey.Installer.csproj | 2 +- .../Passingwind.Abp.FileManagement.AuthServer.csproj | 2 +- .../Passingwind.Abp.FileManagement.HttpApi.Host.csproj | 2 +- .../Passingwind.Abp.FileManagement.Installer.csproj | 2 +- .../Passingwind.Abp.IdentityClient.Installer.csproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/account/src/Passingwind.Abp.Account.Installer/Passingwind.Abp.Account.Installer.csproj b/modules/account/src/Passingwind.Abp.Account.Installer/Passingwind.Abp.Account.Installer.csproj index dc1e14c..06ce45f 100644 --- a/modules/account/src/Passingwind.Abp.Account.Installer/Passingwind.Abp.Account.Installer.csproj +++ b/modules/account/src/Passingwind.Abp.Account.Installer/Passingwind.Abp.Account.Installer.csproj @@ -3,7 +3,7 @@ - net7.0 + $(TFVersion) enable true Passingwind.Abp.Account diff --git a/modules/api-keys/src/Passingwind.Abp.ApiKey.Installer/Passingwind.Abp.ApiKey.Installer.csproj b/modules/api-keys/src/Passingwind.Abp.ApiKey.Installer/Passingwind.Abp.ApiKey.Installer.csproj index 3e0a884..50f0153 100644 --- a/modules/api-keys/src/Passingwind.Abp.ApiKey.Installer/Passingwind.Abp.ApiKey.Installer.csproj +++ b/modules/api-keys/src/Passingwind.Abp.ApiKey.Installer/Passingwind.Abp.ApiKey.Installer.csproj @@ -3,7 +3,7 @@ - net7.0 + $(TFVersion) enable true Passingwind.Abp.ApiKey diff --git a/modules/file-management/host/Passingwind.Abp.FileManagement.AuthServer/Passingwind.Abp.FileManagement.AuthServer.csproj b/modules/file-management/host/Passingwind.Abp.FileManagement.AuthServer/Passingwind.Abp.FileManagement.AuthServer.csproj index 3a09757..c6d5cc3 100644 --- a/modules/file-management/host/Passingwind.Abp.FileManagement.AuthServer/Passingwind.Abp.FileManagement.AuthServer.csproj +++ b/modules/file-management/host/Passingwind.Abp.FileManagement.AuthServer/Passingwind.Abp.FileManagement.AuthServer.csproj @@ -3,7 +3,7 @@ - net7.0 + $(TFVersion) enable Passingwind.Abp.FileManagement true diff --git a/modules/file-management/host/Passingwind.Abp.FileManagement.HttpApi.Host/Passingwind.Abp.FileManagement.HttpApi.Host.csproj b/modules/file-management/host/Passingwind.Abp.FileManagement.HttpApi.Host/Passingwind.Abp.FileManagement.HttpApi.Host.csproj index af0a5bb..1fbacb7 100644 --- a/modules/file-management/host/Passingwind.Abp.FileManagement.HttpApi.Host/Passingwind.Abp.FileManagement.HttpApi.Host.csproj +++ b/modules/file-management/host/Passingwind.Abp.FileManagement.HttpApi.Host/Passingwind.Abp.FileManagement.HttpApi.Host.csproj @@ -3,7 +3,7 @@ - net7.0 + $(TFVersion) enable Passingwind.Abp.FileManagement true diff --git a/modules/file-management/src/Passingwind.Abp.FileManagement.Installer/Passingwind.Abp.FileManagement.Installer.csproj b/modules/file-management/src/Passingwind.Abp.FileManagement.Installer/Passingwind.Abp.FileManagement.Installer.csproj index 3ec7862..0dab574 100644 --- a/modules/file-management/src/Passingwind.Abp.FileManagement.Installer/Passingwind.Abp.FileManagement.Installer.csproj +++ b/modules/file-management/src/Passingwind.Abp.FileManagement.Installer/Passingwind.Abp.FileManagement.Installer.csproj @@ -3,7 +3,7 @@ - net7.0 + $(TFVersion) enable true Passingwind.Abp.FileManagement diff --git a/modules/identity-client/src/Passingwind.Abp.IdentityClient.Installer/Passingwind.Abp.IdentityClient.Installer.csproj b/modules/identity-client/src/Passingwind.Abp.IdentityClient.Installer/Passingwind.Abp.IdentityClient.Installer.csproj index 1d3bbd4..1a593e2 100644 --- a/modules/identity-client/src/Passingwind.Abp.IdentityClient.Installer/Passingwind.Abp.IdentityClient.Installer.csproj +++ b/modules/identity-client/src/Passingwind.Abp.IdentityClient.Installer/Passingwind.Abp.IdentityClient.Installer.csproj @@ -3,7 +3,7 @@ - net7.0 + $(TFVersion) enable true Passingwind.Abp.IdentityClientManagement From fc8e35bb7e3299250a05d789f6399f3c8d047990 Mon Sep 17 00:00:00 2001 From: jxnkwlp Date: Mon, 25 Nov 2024 21:22:45 +0800 Subject: [PATCH 2/3] feat: update abp version to 9.0 & dotnet 9.0 --- common.props | 5 +- .../SamplePermissionDefinitionProvider.cs | 9 +- .../SampleDtoExtensions.cs | 26 +- .../Sample.Application.csproj | 2 +- .../DbMigratorHostedService.cs | 8 +- host/src/Sample.DbMigrator/Program.cs | 8 +- .../Sample.DbMigrator.csproj | 4 +- .../SampleDbMigratorModule.cs | 1 - .../Localization/SampleResource.cs | 1 - .../Sample.Domain.Shared.csproj | 4 +- .../SampleDomainSharedModule.cs | 12 +- .../SampleGlobalFeatureConfigurator.cs | 14 +- .../SampleModuleExtensionConfigurator.cs | 5 +- .../OpenIddictDataSeedContributor.cs | 4 +- host/src/Sample.Domain/Sample.Domain.csproj | 2 +- .../SampleDbContextFactory.cs | 3 +- .../SampleEfCoreEntityExtensionMappings.cs | 47 +- .../20241125132408_Update_Abp_90.Designer.cs | 2613 +++++++++++++++++ .../20241125132408_Update_Abp_90.cs | 195 ++ .../SampleDbContextModelSnapshot.cs | 70 +- .../Properties/AssemblyInfo.cs | 2 +- .../Sample.EntityFrameworkCore.csproj | 2 +- .../SampleHttpApiClientModule.cs | 7 +- .../Sample.HttpApi.Host.csproj | 4 +- .../SampleHttpApiHostModule.cs | 2 +- host/src/Sample.HttpApi/Sample.HttpApi.csproj | 2 +- .../IAccountImpersonationAppService.cs | 3 - .../IAccountLinkUserAppService.cs | 3 - .../IAccountLoginAppService.cs | 10 - .../IAccountTfaAppService.cs | 3 - .../IAccountUserDelegationAppService.cs | 3 - ...Passingwind.Abp.Account.Application.csproj | 2 +- ...p.Account.AspNetCore.IdentityClient.csproj | 2 +- .../Passingwind.Abp.Account.AspNetCore.csproj | 2 +- ...ssingwind.Abp.Account.Domain.Shared.csproj | 2 +- .../Passingwind.Abp.Account.HttpApi.csproj | 2 +- .../IApiKeyRecordAppService.cs | 3 - .../Passingwind.Abp.ApiKey.Application.csproj | 2 +- .../Passingwind.Abp.ApiKey.AspNetCore.csproj | 2 +- ...assingwind.Abp.ApiKey.Domain.Shared.csproj | 2 +- .../ApiKeyRecordManager.cs | 4 +- .../Passingwind.Abp.ApiKey.Domain.csproj | 2 +- ...wind.Abp.ApiKey.EntityFrameworkCore.csproj | 2 +- .../Passingwind.Abp.ApiKey.HttpApi.csproj | 2 +- .../Passingwind.Abp.ApiKey.MongoDB.csproj | 2 +- modules/common.props | 2 +- ...bp.DictionaryManagement.Application.csproj | 2 +- ....DictionaryManagement.Domain.Shared.csproj | 2 +- ...onaryManagement.EntityFrameworkCore.csproj | 2 +- ...nd.Abp.DictionaryManagement.HttpApi.csproj | 2 +- ...tionaryManagement.Application.Tests.csproj | 10 +- .../DictionaryManagerTests.cs | 12 +- ...p.DictionaryManagement.Domain.Tests.csproj | 4 +- ...anagement.EntityFrameworkCore.Tests.csproj | 12 +- ....DictionaryManagement.MongoDB.Tests.csproj | 12 +- ...d.Abp.DictionaryManagement.TestBase.csproj | 10 +- .../FileManagementAppService.cs | 9 - .../Files/FileAppService.cs | 2 - .../Files/FileShareAppService.cs | 8 +- ...wind.Abp.FileManagement.Application.csproj | 2 +- ...nd.Abp.FileManagement.Domain.Shared.csproj | 2 +- .../FileHashDuplicateDetectionProvider.cs | 3 +- .../Files/IFileInfoCheckProvider.cs | 3 - .../Files/IFileManager.cs | 15 - ....FileManagement.EntityFrameworkCore.csproj | 2 +- ...singwind.Abp.FileManagement.HttpApi.csproj | 2 +- .../Repositories/FileContainerRepository.cs | 2 +- .../ISaml2AppService.cs | 3 - ...wind.Abp.IdentityClient.Application.csproj | 2 +- ...gwind.Abp.IdentityClient.AspNetCore.csproj | 4 +- .../IdentityClientDomainSharedModule.cs | 1 - ...nd.Abp.IdentityClient.Domain.Shared.csproj | 2 +- .../Identity/IdentityClaimMapRunner.cs | 2 +- .../IdentityClientConfigurationHelper.cs | 2 +- ...ssingwind.Abp.IdentityClient.Domain.csproj | 2 +- ....IdentityClient.EntityFrameworkCore.csproj | 2 +- ...singwind.Abp.IdentityClient.HttpApi.csproj | 2 +- ...singwind.Abp.IdentityClient.MongoDB.csproj | 2 +- .../IdentityPermissionDefinitionProvider.cs | 10 +- .../IdentityUserV2AppService.cs | 4 +- ...assingwind.Abp.Identity.Application.csproj | 2 +- ...Passingwind.Abp.Identity.AspNetCore.csproj | 2 +- ...singwind.Abp.Identity.Domain.Shared.csproj | 2 +- .../IdentityUserTwoFactorManager.cs | 8 +- .../Passingwind.Abp.Identity.Domain.csproj | 2 +- .../AuthenticatorTokenProviderV2.cs | 2 - .../TokenProviders/EmailTokenProviderV2.cs | 2 - .../PhoneNumberTokenProviderV2.cs | 2 - ...nd.Abp.Identity.EntityFrameworkCore.csproj | 2 +- .../Passingwind.Abp.Identity.HttpApi.csproj | 2 +- .../MongoDB/IdentityMongoDbModule.cs | 1 - .../Passingwind.Abp.Identity.MongoDB.csproj | 2 +- ...ionManagement.Application.Contracts.csproj | 2 +- ...bp.PermissionManagement.Application.csproj | 2 +- ....PermissionManagement.Domain.Shared.csproj | 4 +- .../DynamicPermissionLocalEventHander.cs | 2 +- ...ind.Abp.PermissionManagement.Domain.csproj | 2 +- ...ssionManagement.EntityFrameworkCore.csproj | 2 +- ...PermissionManagement.HttpApi.Client.csproj | 2 +- ...nd.Abp.PermissionManagement.HttpApi.csproj | 2 +- ...nd.Abp.PermissionManagement.MongoDB.csproj | 2 +- 101 files changed, 2981 insertions(+), 331 deletions(-) create mode 100644 host/src/Sample.EntityFrameworkCore/Migrations/20241125132408_Update_Abp_90.Designer.cs create mode 100644 host/src/Sample.EntityFrameworkCore/Migrations/20241125132408_Update_Abp_90.cs diff --git a/common.props b/common.props index 0417794..dc6507c 100644 --- a/common.props +++ b/common.props @@ -1,8 +1,9 @@  - 8.0.6 - 8.3.0 + net9.0 + 9.0.0 + 9.0.0 enable diff --git a/host/src/Sample.Application.Contracts/Permissions/SamplePermissionDefinitionProvider.cs b/host/src/Sample.Application.Contracts/Permissions/SamplePermissionDefinitionProvider.cs index c268d15..6c07e32 100644 --- a/host/src/Sample.Application.Contracts/Permissions/SamplePermissionDefinitionProvider.cs +++ b/host/src/Sample.Application.Contracts/Permissions/SamplePermissionDefinitionProvider.cs @@ -1,6 +1,4 @@ -using Sample.Localization; -using Volo.Abp.Authorization.Permissions; -using Volo.Abp.Localization; +using Volo.Abp.Authorization.Permissions; namespace Sample.Permissions; @@ -12,9 +10,4 @@ public override void Define(IPermissionDefinitionContext context) //Define your own permissions here. Example: //myGroup.AddPermission(SamplePermissions.MyPermission1, L("Permission:MyPermission1")); } - - private static LocalizableString L(string name) - { - return LocalizableString.Create(name); - } } diff --git a/host/src/Sample.Application.Contracts/SampleDtoExtensions.cs b/host/src/Sample.Application.Contracts/SampleDtoExtensions.cs index ee55860..098c430 100644 --- a/host/src/Sample.Application.Contracts/SampleDtoExtensions.cs +++ b/host/src/Sample.Application.Contracts/SampleDtoExtensions.cs @@ -1,6 +1,4 @@ -using Volo.Abp.Identity; -using Volo.Abp.ObjectExtending; -using Volo.Abp.Threading; +using Volo.Abp.Threading; namespace Sample; @@ -12,17 +10,17 @@ public static void Configure() { OneTimeRunner.Run(() => { - /* You can add extension properties to DTOs - * defined in the depended modules. - * - * Example: - * - * ObjectExtensionManager.Instance - * .AddOrUpdateProperty("Title"); - * - * See the documentation for more: - * https://docs.abp.io/en/abp/latest/Object-Extensions - */ + /* You can add extension properties to DTOs + * defined in the depended modules. + * + * Example: + * + * ObjectExtensionManager.Instance + * .AddOrUpdateProperty("Title"); + * + * See the documentation for more: + * https://docs.abp.io/en/abp/latest/Object-Extensions + */ }); } } diff --git a/host/src/Sample.Application/Sample.Application.csproj b/host/src/Sample.Application/Sample.Application.csproj index b540126..0727dfe 100644 --- a/host/src/Sample.Application/Sample.Application.csproj +++ b/host/src/Sample.Application/Sample.Application.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Sample diff --git a/host/src/Sample.DbMigrator/DbMigratorHostedService.cs b/host/src/Sample.DbMigrator/DbMigratorHostedService.cs index a9af16f..d030dc7 100644 --- a/host/src/Sample.DbMigrator/DbMigratorHostedService.cs +++ b/host/src/Sample.DbMigrator/DbMigratorHostedService.cs @@ -25,10 +25,10 @@ public virtual async Task StartAsync(CancellationToken cancellationToken) { using (var application = await AbpApplicationFactory.CreateAsync(options => { - options.Services.ReplaceConfiguration(_configuration); - options.UseAutofac(); - options.Services.AddLogging(c => c.AddSerilog()); - options.AddDataMigrationEnvironment(); + options.Services.ReplaceConfiguration(_configuration); + options.UseAutofac(); + options.Services.AddLogging(c => c.AddSerilog()); + options.AddDataMigrationEnvironment(); })) { await application.InitializeAsync(); diff --git a/host/src/Sample.DbMigrator/Program.cs b/host/src/Sample.DbMigrator/Program.cs index 6b06943..f91a866 100644 --- a/host/src/Sample.DbMigrator/Program.cs +++ b/host/src/Sample.DbMigrator/Program.cs @@ -1,4 +1,3 @@ -using System.IO; using System.Threading.Tasks; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -9,7 +8,7 @@ namespace Sample.DbMigrator; -class Program +static class Program { static async Task Main(string[] args) { @@ -34,8 +33,5 @@ public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) .AddAppSettingsSecretsJson() .ConfigureLogging((context, logging) => logging.ClearProviders()) - .ConfigureServices((hostContext, services) => - { - services.AddHostedService(); - }); + .ConfigureServices((hostContext, services) => services.AddHostedService()); } diff --git a/host/src/Sample.DbMigrator/Sample.DbMigrator.csproj b/host/src/Sample.DbMigrator/Sample.DbMigrator.csproj index 0474874..ee8b53a 100644 --- a/host/src/Sample.DbMigrator/Sample.DbMigrator.csproj +++ b/host/src/Sample.DbMigrator/Sample.DbMigrator.csproj @@ -4,7 +4,7 @@ Exe - net8.0 + $(Tfw) enable @@ -13,7 +13,7 @@ - + diff --git a/host/src/Sample.DbMigrator/SampleDbMigratorModule.cs b/host/src/Sample.DbMigrator/SampleDbMigratorModule.cs index b5c338b..fe87927 100644 --- a/host/src/Sample.DbMigrator/SampleDbMigratorModule.cs +++ b/host/src/Sample.DbMigrator/SampleDbMigratorModule.cs @@ -11,5 +11,4 @@ namespace Sample.DbMigrator; )] public class SampleDbMigratorModule : AbpModule { - } diff --git a/host/src/Sample.Domain.Shared/Localization/SampleResource.cs b/host/src/Sample.Domain.Shared/Localization/SampleResource.cs index c8a3547..ca9e0a5 100644 --- a/host/src/Sample.Domain.Shared/Localization/SampleResource.cs +++ b/host/src/Sample.Domain.Shared/Localization/SampleResource.cs @@ -5,5 +5,4 @@ namespace Sample.Localization; [LocalizationResourceName("Sample")] public class SampleResource { - } diff --git a/host/src/Sample.Domain.Shared/Sample.Domain.Shared.csproj b/host/src/Sample.Domain.Shared/Sample.Domain.Shared.csproj index 76bfa33..132c8a1 100644 --- a/host/src/Sample.Domain.Shared/Sample.Domain.Shared.csproj +++ b/host/src/Sample.Domain.Shared/Sample.Domain.Shared.csproj @@ -1,4 +1,4 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/host/src/Sample.Domain.Shared/SampleDomainSharedModule.cs b/host/src/Sample.Domain.Shared/SampleDomainSharedModule.cs index 8ce9972..c895d32 100644 --- a/host/src/Sample.Domain.Shared/SampleDomainSharedModule.cs +++ b/host/src/Sample.Domain.Shared/SampleDomainSharedModule.cs @@ -23,7 +23,7 @@ namespace Sample; typeof(AbpOpenIddictDomainSharedModule), typeof(AbpPermissionManagementDomainSharedModule), typeof(AbpSettingManagementDomainSharedModule), - typeof(AbpTenantManagementDomainSharedModule) + typeof(AbpTenantManagementDomainSharedModule) )] public class SampleDomainSharedModule : AbpModule { @@ -35,10 +35,7 @@ public override void PreConfigureServices(ServiceConfigurationContext context) public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => - { - options.FileSets.AddEmbedded(); - }); + Configure(options => options.FileSets.AddEmbedded()); Configure(options => { @@ -50,9 +47,6 @@ public override void ConfigureServices(ServiceConfigurationContext context) options.DefaultResourceType = typeof(SampleResource); }); - Configure(options => - { - options.MapCodeNamespace("Sample", typeof(SampleResource)); - }); + Configure(options => options.MapCodeNamespace("Sample", typeof(SampleResource))); } } diff --git a/host/src/Sample.Domain.Shared/SampleGlobalFeatureConfigurator.cs b/host/src/Sample.Domain.Shared/SampleGlobalFeatureConfigurator.cs index 58227b6..e6faafb 100644 --- a/host/src/Sample.Domain.Shared/SampleGlobalFeatureConfigurator.cs +++ b/host/src/Sample.Domain.Shared/SampleGlobalFeatureConfigurator.cs @@ -10,13 +10,13 @@ public static void Configure() { OneTimeRunner.Run(() => { - /* You can configure (enable/disable) global features of the used modules here. - * - * YOU CAN SAFELY DELETE THIS CLASS AND REMOVE ITS USAGES IF YOU DON'T NEED TO IT! - * - * Please refer to the documentation to lear more about the Global Features System: - * https://docs.abp.io/en/abp/latest/Global-Features - */ + /* You can configure (enable/disable) global features of the used modules here. + * + * YOU CAN SAFELY DELETE THIS CLASS AND REMOVE ITS USAGES IF YOU DON'T NEED TO IT! + * + * Please refer to the documentation to lear more about the Global Features System: + * https://docs.abp.io/en/abp/latest/Global-Features + */ }); } } diff --git a/host/src/Sample.Domain.Shared/SampleModuleExtensionConfigurator.cs b/host/src/Sample.Domain.Shared/SampleModuleExtensionConfigurator.cs index 35a86fe..d6af6f6 100644 --- a/host/src/Sample.Domain.Shared/SampleModuleExtensionConfigurator.cs +++ b/host/src/Sample.Domain.Shared/SampleModuleExtensionConfigurator.cs @@ -1,7 +1,4 @@ -using System.ComponentModel.DataAnnotations; -using Volo.Abp.Identity; -using Volo.Abp.ObjectExtending; -using Volo.Abp.Threading; +using Volo.Abp.Threading; namespace Sample; diff --git a/host/src/Sample.Domain/OpenIddict/OpenIddictDataSeedContributor.cs b/host/src/Sample.Domain/OpenIddict/OpenIddictDataSeedContributor.cs index c4bc7c9..4f878ff 100644 --- a/host/src/Sample.Domain/OpenIddict/OpenIddictDataSeedContributor.cs +++ b/host/src/Sample.Domain/OpenIddict/OpenIddictDataSeedContributor.cs @@ -82,7 +82,7 @@ private async Task CreateApplicationsAsync() var webClientId = configurationSection["Sample_Web:ClientId"]; if (!webClientId.IsNullOrWhiteSpace()) { - var webClientRootUrl = configurationSection["Sample_Web:RootUrl"].EnsureEndsWith('/'); + var webClientRootUrl = configurationSection["Sample_Web:RootUrl"]!.EnsureEndsWith('/'); /* Sample_Web client is only needed if you created a tiered * solution. Otherwise, you can delete this client. */ @@ -156,7 +156,7 @@ await CreateApplicationAsync( var blazorServerTieredClientId = configurationSection["Sample_BlazorServerTiered:ClientId"]; if (!blazorServerTieredClientId.IsNullOrWhiteSpace()) { - var blazorServerTieredRootUrl = configurationSection["Sample_BlazorServerTiered:RootUrl"].EnsureEndsWith('/'); + var blazorServerTieredRootUrl = configurationSection["Sample_BlazorServerTiered:RootUrl"]!.EnsureEndsWith('/'); await CreateApplicationAsync( name: blazorServerTieredClientId!, diff --git a/host/src/Sample.Domain/Sample.Domain.csproj b/host/src/Sample.Domain/Sample.Domain.csproj index a42b0f2..e182e15 100644 --- a/host/src/Sample.Domain/Sample.Domain.csproj +++ b/host/src/Sample.Domain/Sample.Domain.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Sample diff --git a/host/src/Sample.EntityFrameworkCore/EntityFrameworkCore/SampleDbContextFactory.cs b/host/src/Sample.EntityFrameworkCore/EntityFrameworkCore/SampleDbContextFactory.cs index 61c7ce7..9acfd8c 100644 --- a/host/src/Sample.EntityFrameworkCore/EntityFrameworkCore/SampleDbContextFactory.cs +++ b/host/src/Sample.EntityFrameworkCore/EntityFrameworkCore/SampleDbContextFactory.cs @@ -1,5 +1,4 @@ -using System; -using System.IO; +using System.IO; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Design; using Microsoft.Extensions.Configuration; diff --git a/host/src/Sample.EntityFrameworkCore/EntityFrameworkCore/SampleEfCoreEntityExtensionMappings.cs b/host/src/Sample.EntityFrameworkCore/EntityFrameworkCore/SampleEfCoreEntityExtensionMappings.cs index 88f78c2..91c00ff 100644 --- a/host/src/Sample.EntityFrameworkCore/EntityFrameworkCore/SampleEfCoreEntityExtensionMappings.cs +++ b/host/src/Sample.EntityFrameworkCore/EntityFrameworkCore/SampleEfCoreEntityExtensionMappings.cs @@ -1,7 +1,4 @@ -using Microsoft.EntityFrameworkCore; -using Volo.Abp.Identity; -using Volo.Abp.ObjectExtending; -using Volo.Abp.Threading; +using Volo.Abp.Threading; namespace Sample.EntityFrameworkCore; @@ -16,29 +13,29 @@ public static void Configure() OneTimeRunner.Run(() => { - /* You can configure extra properties for the - * entities defined in the modules used by your application. - * - * This class can be used to map these extra properties to table fields in the database. - * - * USE THIS CLASS ONLY TO CONFIGURE EF CORE RELATED MAPPING. - * USE SampleModuleExtensionConfigurator CLASS (in the Domain.Shared project) - * FOR A HIGH LEVEL API TO DEFINE EXTRA PROPERTIES TO ENTITIES OF THE USED MODULES - * - * Example: Map a property to a table field: + /* You can configure extra properties for the + * entities defined in the modules used by your application. + * + * This class can be used to map these extra properties to table fields in the database. + * + * USE THIS CLASS ONLY TO CONFIGURE EF CORE RELATED MAPPING. + * USE SampleModuleExtensionConfigurator CLASS (in the Domain.Shared project) + * FOR A HIGH LEVEL API TO DEFINE EXTRA PROPERTIES TO ENTITIES OF THE USED MODULES + * + * Example: Map a property to a table field: - ObjectExtensionManager.Instance - .MapEfCoreProperty( - "MyProperty", - (entityBuilder, propertyBuilder) => - { - propertyBuilder.HasMaxLength(128); - } - ); + ObjectExtensionManager.Instance + .MapEfCoreProperty( + "MyProperty", + (entityBuilder, propertyBuilder) => + { + propertyBuilder.HasMaxLength(128); + } + ); - * See the documentation for more: - * https://docs.abp.io/en/abp/latest/Customizing-Application-Modules-Extending-Entities - */ + * See the documentation for more: + * https://docs.abp.io/en/abp/latest/Customizing-Application-Modules-Extending-Entities + */ }); } } diff --git a/host/src/Sample.EntityFrameworkCore/Migrations/20241125132408_Update_Abp_90.Designer.cs b/host/src/Sample.EntityFrameworkCore/Migrations/20241125132408_Update_Abp_90.Designer.cs new file mode 100644 index 0000000..3b1316e --- /dev/null +++ b/host/src/Sample.EntityFrameworkCore/Migrations/20241125132408_Update_Abp_90.Designer.cs @@ -0,0 +1,2613 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Sample.EntityFrameworkCore; +using Volo.Abp.EntityFrameworkCore; + +#nullable disable + +namespace Sample.Migrations +{ + [DbContext(typeof(SampleDbContext))] + [Migration("20241125132408_Update_Abp_90")] + partial class Update_Abp_90 + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) + .HasAnnotation("ProductVersion", "9.0.0") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); + + modelBuilder.Entity("Passingwind.Abp.ApiKey.ApiKeyRecord", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasMaxLength(40) + .HasColumnType("nvarchar(40)") + .HasColumnName("ConcurrencyStamp"); + + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnType("uniqueidentifier") + .HasColumnName("CreatorId"); + + b.Property("ExpirationTime") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("LastModificationTime") + .HasColumnType("datetime2") + .HasColumnName("LastModificationTime"); + + b.Property("LastModifierId") + .HasColumnType("uniqueidentifier") + .HasColumnName("LastModifierId"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("nvarchar(32)"); + + b.Property("Secret") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("CreationTime") + .IsDescending(); + + b.HasIndex("Name"); + + b.HasIndex("Secret"); + + b.ToTable("PassingwindApiKeys", (string)null); + }); + + modelBuilder.Entity("Passingwind.Abp.FileManagement.Files.File", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("BlobName") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasMaxLength(40) + .HasColumnType("nvarchar(40)") + .HasColumnName("ConcurrencyStamp"); + + b.Property("ContainerId") + .HasColumnType("uniqueidentifier"); + + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnType("uniqueidentifier") + .HasColumnName("CreatorId"); + + b.Property("DeleterId") + .HasColumnType("uniqueidentifier") + .HasColumnName("DeleterId"); + + b.Property("DeletionTime") + .HasColumnType("datetime2") + .HasColumnName("DeletionTime"); + + b.Property("ExtraProperties") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("FileName") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("Hash") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false) + .HasColumnName("IsDeleted"); + + b.Property("IsDirectory") + .HasColumnType("bit"); + + b.Property("LastModificationTime") + .HasColumnType("datetime2") + .HasColumnName("LastModificationTime"); + + b.Property("LastModifierId") + .HasColumnType("uniqueidentifier") + .HasColumnName("LastModifierId"); + + b.Property("Length") + .HasColumnType("bigint"); + + b.Property("MimeType") + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("ParentId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.Property("UniqueId") + .IsRequired() + .HasMaxLength(32) + .HasColumnType("nvarchar(32)"); + + b.HasKey("Id"); + + b.HasIndex("ContainerId"); + + b.HasIndex("CreationTime") + .IsDescending(); + + b.HasIndex("FileName"); + + b.HasIndex("Hash"); + + b.HasIndex("UniqueId"); + + b.ToTable("FmFiles", (string)null); + }); + + modelBuilder.Entity("Passingwind.Abp.FileManagement.Files.FileAccessToken", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasMaxLength(40) + .HasColumnType("nvarchar(40)") + .HasColumnName("ConcurrencyStamp"); + + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnType("uniqueidentifier") + .HasColumnName("CreatorId"); + + b.Property("DownloadCount") + .HasColumnType("bigint"); + + b.Property("ExpirationTime") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("FileId") + .HasColumnType("uniqueidentifier"); + + b.Property("Token") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("FileId"); + + b.HasIndex("Token"); + + b.ToTable("FmFileAccessTokens", (string)null); + }); + + modelBuilder.Entity("Passingwind.Abp.FileManagement.Files.FileContainer", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("AccessMode") + .HasColumnType("int"); + + b.Property("AllowAnyFileExtension") + .HasColumnType("bit"); + + b.Property("AllowedFileExtensions") + .HasColumnType("nvarchar(max)"); + + b.Property("AutoDeleteBlob") + .HasColumnType("bit"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasMaxLength(40) + .HasColumnType("nvarchar(40)") + .HasColumnName("ConcurrencyStamp"); + + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnType("uniqueidentifier") + .HasColumnName("CreatorId"); + + b.Property("DeleterId") + .HasColumnType("uniqueidentifier") + .HasColumnName("DeleterId"); + + b.Property("DeletionTime") + .HasColumnType("datetime2") + .HasColumnName("DeletionTime"); + + b.Property("Description") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("ExtraProperties") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("FilesCount") + .HasColumnType("int"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false) + .HasColumnName("IsDeleted"); + + b.Property("LastModificationTime") + .HasColumnType("datetime2") + .HasColumnName("LastModificationTime"); + + b.Property("LastModifierId") + .HasColumnType("uniqueidentifier") + .HasColumnName("LastModifierId"); + + b.Property("MaximumEachFileSize") + .HasColumnType("bigint"); + + b.Property("MaximumFileQuantity") + .HasColumnType("int"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("OverrideBehavior") + .HasColumnType("int"); + + b.Property("ProhibitedFileExtensions") + .HasColumnType("nvarchar(max)"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("Name"); + + b.ToTable("FmFileContainers", (string)null); + }); + + modelBuilder.Entity("Passingwind.Abp.Identity.IdentityUserTwoFactor", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasMaxLength(40) + .HasColumnType("nvarchar(40)") + .HasColumnName("ConcurrencyStamp"); + + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnType("uniqueidentifier") + .HasColumnName("CreatorId"); + + b.Property("EmailToken") + .HasColumnType("bit"); + + b.Property("ExtraProperties") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("LastModificationTime") + .HasColumnType("datetime2") + .HasColumnName("LastModificationTime"); + + b.Property("LastModifierId") + .HasColumnType("uniqueidentifier") + .HasColumnName("LastModifierId"); + + b.Property("PhoneNumberToken") + .HasColumnType("bit"); + + b.Property("PreferredProvider") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.HasKey("Id"); + + b.ToTable("AbpUserTwoFactors", (string)null); + }); + + modelBuilder.Entity("Passingwind.Abp.IdentityClient.IdentityClient", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasMaxLength(40) + .HasColumnType("nvarchar(40)") + .HasColumnName("ConcurrencyStamp"); + + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnType("uniqueidentifier") + .HasColumnName("CreatorId"); + + b.Property("DeleterId") + .HasColumnType("uniqueidentifier") + .HasColumnName("DeleterId"); + + b.Property("DeletionTime") + .HasColumnType("datetime2") + .HasColumnName("DeletionTime"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("DisplayOrder") + .HasColumnType("int"); + + b.Property("ExtraProperties") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("IsDebugMode") + .HasColumnType("bit"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false) + .HasColumnName("IsDeleted"); + + b.Property("IsEnabled") + .HasColumnType("bit"); + + b.Property("LastModificationTime") + .HasColumnType("datetime2") + .HasColumnName("LastModificationTime"); + + b.Property("LastModifierId") + .HasColumnType("uniqueidentifier") + .HasColumnName("LastModifierId"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("ProviderName") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("ProviderType") + .HasColumnType("int"); + + b.Property("RequiredClaimTypes") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("CreationTime") + .IsDescending(); + + b.HasIndex("Name"); + + b.HasIndex("ProviderName"); + + b.ToTable("PassingwindIdentityClients", (string)null); + }); + + modelBuilder.Entity("Passingwind.Abp.IdentityClient.IdentityClientClaimMap", b => + { + b.Property("IdentityClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("ClaimType") + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("Action") + .HasColumnType("int"); + + b.Property("RawValue") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("ValueFromType") + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.HasKey("IdentityClientId", "ClaimType"); + + b.ToTable("PassingwindIdentityClientClaimMaps", (string)null); + }); + + modelBuilder.Entity("Passingwind.Abp.IdentityClient.IdentityClientConfiguration", b => + { + b.Property("IdentityClientId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("Value") + .HasColumnType("nvarchar(max)"); + + b.HasKey("IdentityClientId", "Name"); + + b.ToTable("PassingwindIdentityClientConfigurations", (string)null); + }); + + modelBuilder.Entity("Passingwind.Abp.PermissionManagement.DynamicPermissions.DynamicPermissionDefinition", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasMaxLength(40) + .HasColumnType("nvarchar(40)") + .HasColumnName("ConcurrencyStamp"); + + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnType("uniqueidentifier") + .HasColumnName("CreatorId"); + + b.Property("Description") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("ExtraProperties") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("GroupId") + .HasColumnType("uniqueidentifier"); + + b.Property("IsEnabled") + .HasColumnType("bit"); + + b.Property("LastModificationTime") + .HasColumnType("datetime2") + .HasColumnName("LastModificationTime"); + + b.Property("LastModifierId") + .HasColumnType("uniqueidentifier") + .HasColumnName("LastModifierId"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("ParentId") + .HasColumnType("uniqueidentifier"); + + b.Property("TargetName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.HasKey("Id"); + + b.HasIndex("GroupId"); + + b.HasIndex("Name") + .IsUnique(); + + b.HasIndex("ParentId"); + + b.ToTable("AbpDynamicPermissions", (string)null); + }); + + modelBuilder.Entity("Passingwind.Abp.PermissionManagement.DynamicPermissions.DynamicPermissionGroupDefinition", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasMaxLength(40) + .HasColumnType("nvarchar(40)") + .HasColumnName("ConcurrencyStamp"); + + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnType("uniqueidentifier") + .HasColumnName("CreatorId"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("ExtraProperties") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("LastModificationTime") + .HasColumnType("datetime2") + .HasColumnName("LastModificationTime"); + + b.Property("LastModifierId") + .HasColumnType("uniqueidentifier") + .HasColumnName("LastModifierId"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("TargetName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.HasKey("Id"); + + b.HasIndex("Name") + .IsUnique(); + + b.ToTable("AbpDynamicPermissionGroups", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ApplicationName") + .HasMaxLength(96) + .HasColumnType("nvarchar(96)") + .HasColumnName("ApplicationName"); + + b.Property("BrowserInfo") + .HasMaxLength(512) + .HasColumnType("nvarchar(512)") + .HasColumnName("BrowserInfo"); + + b.Property("ClientId") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)") + .HasColumnName("ClientId"); + + b.Property("ClientIpAddress") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)") + .HasColumnName("ClientIpAddress"); + + b.Property("ClientName") + .HasMaxLength(128) + .HasColumnType("nvarchar(128)") + .HasColumnName("ClientName"); + + b.Property("Comments") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)") + .HasColumnName("Comments"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasMaxLength(40) + .HasColumnType("nvarchar(40)") + .HasColumnName("ConcurrencyStamp"); + + b.Property("CorrelationId") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)") + .HasColumnName("CorrelationId"); + + b.Property("Exceptions") + .HasColumnType("nvarchar(max)"); + + b.Property("ExecutionDuration") + .HasColumnType("int") + .HasColumnName("ExecutionDuration"); + + b.Property("ExecutionTime") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("HttpMethod") + .HasMaxLength(16) + .HasColumnType("nvarchar(16)") + .HasColumnName("HttpMethod"); + + b.Property("HttpStatusCode") + .HasColumnType("int") + .HasColumnName("HttpStatusCode"); + + b.Property("ImpersonatorTenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("ImpersonatorTenantId"); + + b.Property("ImpersonatorTenantName") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)") + .HasColumnName("ImpersonatorTenantName"); + + b.Property("ImpersonatorUserId") + .HasColumnType("uniqueidentifier") + .HasColumnName("ImpersonatorUserId"); + + b.Property("ImpersonatorUserName") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)") + .HasColumnName("ImpersonatorUserName"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.Property("TenantName") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)") + .HasColumnName("TenantName"); + + b.Property("Url") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)") + .HasColumnName("Url"); + + b.Property("UserId") + .HasColumnType("uniqueidentifier") + .HasColumnName("UserId"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)") + .HasColumnName("UserName"); + + b.HasKey("Id"); + + b.HasIndex("TenantId", "ExecutionTime"); + + b.HasIndex("TenantId", "UserId", "ExecutionTime"); + + b.ToTable("AbpAuditLogs", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("AuditLogId") + .HasColumnType("uniqueidentifier") + .HasColumnName("AuditLogId"); + + b.Property("ExecutionDuration") + .HasColumnType("int") + .HasColumnName("ExecutionDuration"); + + b.Property("ExecutionTime") + .HasColumnType("datetime2") + .HasColumnName("ExecutionTime"); + + b.Property("ExtraProperties") + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("MethodName") + .HasMaxLength(128) + .HasColumnType("nvarchar(128)") + .HasColumnName("MethodName"); + + b.Property("Parameters") + .HasMaxLength(2000) + .HasColumnType("nvarchar(2000)") + .HasColumnName("Parameters"); + + b.Property("ServiceName") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)") + .HasColumnName("ServiceName"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("AuditLogId"); + + b.HasIndex("TenantId", "ServiceName", "MethodName", "ExecutionTime"); + + b.ToTable("AbpAuditLogActions", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("AuditLogId") + .HasColumnType("uniqueidentifier") + .HasColumnName("AuditLogId"); + + b.Property("ChangeTime") + .HasColumnType("datetime2") + .HasColumnName("ChangeTime"); + + b.Property("ChangeType") + .HasColumnType("tinyint") + .HasColumnName("ChangeType"); + + b.Property("EntityId") + .HasMaxLength(128) + .HasColumnType("nvarchar(128)") + .HasColumnName("EntityId"); + + b.Property("EntityTenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("EntityTypeFullName") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)") + .HasColumnName("EntityTypeFullName"); + + b.Property("ExtraProperties") + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("AuditLogId"); + + b.HasIndex("TenantId", "EntityTypeFullName", "EntityId"); + + b.ToTable("AbpEntityChanges", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("EntityChangeId") + .HasColumnType("uniqueidentifier"); + + b.Property("NewValue") + .HasMaxLength(512) + .HasColumnType("nvarchar(512)") + .HasColumnName("NewValue"); + + b.Property("OriginalValue") + .HasMaxLength(512) + .HasColumnType("nvarchar(512)") + .HasColumnName("OriginalValue"); + + b.Property("PropertyName") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)") + .HasColumnName("PropertyName"); + + b.Property("PropertyTypeFullName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("nvarchar(64)") + .HasColumnName("PropertyTypeFullName"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("EntityChangeId"); + + b.ToTable("AbpEntityPropertyChanges", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.BackgroundJobs.BackgroundJobRecord", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasMaxLength(40) + .HasColumnType("nvarchar(40)") + .HasColumnName("ConcurrencyStamp"); + + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + + b.Property("ExtraProperties") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("IsAbandoned") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false); + + b.Property("JobArgs") + .IsRequired() + .HasMaxLength(1048576) + .HasColumnType("nvarchar(max)"); + + b.Property("JobName") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("LastTryTime") + .HasColumnType("datetime2"); + + b.Property("NextTryTime") + .HasColumnType("datetime2"); + + b.Property("Priority") + .ValueGeneratedOnAdd() + .HasColumnType("tinyint") + .HasDefaultValue((byte)15); + + b.Property("TryCount") + .ValueGeneratedOnAdd() + .HasColumnType("smallint") + .HasDefaultValue((short)0); + + b.HasKey("Id"); + + b.HasIndex("IsAbandoned", "NextTryTime"); + + b.ToTable("AbpBackgroundJobs", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureDefinitionRecord", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("AllowedProviders") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("DefaultValue") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("Description") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("ExtraProperties") + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("GroupName") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("IsAvailableToHost") + .HasColumnType("bit"); + + b.Property("IsVisibleToClients") + .HasColumnType("bit"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("ParentName") + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("ValueType") + .HasMaxLength(2048) + .HasColumnType("nvarchar(2048)"); + + b.HasKey("Id"); + + b.HasIndex("GroupName"); + + b.HasIndex("Name") + .IsUnique(); + + b.ToTable("AbpFeatures", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureGroupDefinitionRecord", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("ExtraProperties") + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.HasKey("Id"); + + b.HasIndex("Name") + .IsUnique(); + + b.ToTable("AbpFeatureGroups", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.FeatureManagement.FeatureValue", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("ProviderKey") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("ProviderName") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("Value") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.HasKey("Id"); + + b.HasIndex("Name", "ProviderName", "ProviderKey") + .IsUnique() + .HasFilter("[ProviderName] IS NOT NULL AND [ProviderKey] IS NOT NULL"); + + b.ToTable("AbpFeatureValues", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityClaimType", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasMaxLength(40) + .HasColumnType("nvarchar(40)") + .HasColumnName("ConcurrencyStamp"); + + b.Property("Description") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("ExtraProperties") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("IsStatic") + .HasColumnType("bit"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("Regex") + .HasMaxLength(512) + .HasColumnType("nvarchar(512)"); + + b.Property("RegexDescription") + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("Required") + .HasColumnType("bit"); + + b.Property("ValueType") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.ToTable("AbpClaimTypes", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityLinkUser", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("SourceTenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("SourceUserId") + .HasColumnType("uniqueidentifier"); + + b.Property("TargetTenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("TargetUserId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("SourceUserId", "SourceTenantId", "TargetUserId", "TargetTenantId") + .IsUnique() + .HasFilter("[SourceTenantId] IS NOT NULL AND [TargetTenantId] IS NOT NULL"); + + b.ToTable("AbpLinkUsers", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasMaxLength(40) + .HasColumnType("nvarchar(40)") + .HasColumnName("ConcurrencyStamp"); + + b.Property("EntityVersion") + .HasColumnType("int"); + + b.Property("ExtraProperties") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("IsDefault") + .HasColumnType("bit") + .HasColumnName("IsDefault"); + + b.Property("IsPublic") + .HasColumnType("bit") + .HasColumnName("IsPublic"); + + b.Property("IsStatic") + .HasColumnType("bit") + .HasColumnName("IsStatic"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("NormalizedName") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName"); + + b.ToTable("AbpRoles", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("ClaimType") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("ClaimValue") + .HasMaxLength(1024) + .HasColumnType("nvarchar(1024)"); + + b.Property("RoleId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AbpRoleClaims", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentitySecurityLog", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("Action") + .HasMaxLength(96) + .HasColumnType("nvarchar(96)"); + + b.Property("ApplicationName") + .HasMaxLength(96) + .HasColumnType("nvarchar(96)"); + + b.Property("BrowserInfo") + .HasMaxLength(512) + .HasColumnType("nvarchar(512)"); + + b.Property("ClientId") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("ClientIpAddress") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasMaxLength(40) + .HasColumnType("nvarchar(40)") + .HasColumnName("ConcurrencyStamp"); + + b.Property("CorrelationId") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("CreationTime") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("Identity") + .HasMaxLength(96) + .HasColumnType("nvarchar(96)"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.Property("TenantName") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("TenantId", "Action"); + + b.HasIndex("TenantId", "ApplicationName"); + + b.HasIndex("TenantId", "Identity"); + + b.HasIndex("TenantId", "UserId"); + + b.ToTable("AbpSecurityLogs", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentitySession", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("ClientId") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("Device") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("DeviceInfo") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("ExtraProperties") + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("IpAddresses") + .HasMaxLength(2048) + .HasColumnType("nvarchar(2048)"); + + b.Property("LastAccessed") + .HasColumnType("datetime2"); + + b.Property("SessionId") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("SignedIn") + .HasColumnType("datetime2"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("Device"); + + b.HasIndex("SessionId"); + + b.HasIndex("TenantId", "UserId"); + + b.ToTable("AbpSessions", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("AccessFailedCount") + .ValueGeneratedOnAdd() + .HasColumnType("int") + .HasDefaultValue(0) + .HasColumnName("AccessFailedCount"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasMaxLength(40) + .HasColumnType("nvarchar(40)") + .HasColumnName("ConcurrencyStamp"); + + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnType("uniqueidentifier") + .HasColumnName("CreatorId"); + + b.Property("DeleterId") + .HasColumnType("uniqueidentifier") + .HasColumnName("DeleterId"); + + b.Property("DeletionTime") + .HasColumnType("datetime2") + .HasColumnName("DeletionTime"); + + b.Property("Email") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)") + .HasColumnName("Email"); + + b.Property("EmailConfirmed") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false) + .HasColumnName("EmailConfirmed"); + + b.Property("EntityVersion") + .HasColumnType("int"); + + b.Property("ExtraProperties") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("IsActive") + .HasColumnType("bit") + .HasColumnName("IsActive"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false) + .HasColumnName("IsDeleted"); + + b.Property("IsExternal") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false) + .HasColumnName("IsExternal"); + + b.Property("LastModificationTime") + .HasColumnType("datetime2") + .HasColumnName("LastModificationTime"); + + b.Property("LastModifierId") + .HasColumnType("uniqueidentifier") + .HasColumnName("LastModifierId"); + + b.Property("LastPasswordChangeTime") + .HasColumnType("datetimeoffset"); + + b.Property("LockoutEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false) + .HasColumnName("LockoutEnabled"); + + b.Property("LockoutEnd") + .HasColumnType("datetimeoffset"); + + b.Property("Name") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)") + .HasColumnName("Name"); + + b.Property("NormalizedEmail") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)") + .HasColumnName("NormalizedEmail"); + + b.Property("NormalizedUserName") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)") + .HasColumnName("NormalizedUserName"); + + b.Property("PasswordHash") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)") + .HasColumnName("PasswordHash"); + + b.Property("PhoneNumber") + .HasMaxLength(16) + .HasColumnType("nvarchar(16)") + .HasColumnName("PhoneNumber"); + + b.Property("PhoneNumberConfirmed") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false) + .HasColumnName("PhoneNumberConfirmed"); + + b.Property("SecurityStamp") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)") + .HasColumnName("SecurityStamp"); + + b.Property("ShouldChangePasswordOnNextLogin") + .HasColumnType("bit"); + + b.Property("Surname") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)") + .HasColumnName("Surname"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.Property("TwoFactorEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false) + .HasColumnName("TwoFactorEnabled"); + + b.Property("UserName") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)") + .HasColumnName("UserName"); + + b.HasKey("Id"); + + b.HasIndex("Email"); + + b.HasIndex("NormalizedEmail"); + + b.HasIndex("NormalizedUserName"); + + b.HasIndex("UserName"); + + b.ToTable("AbpUsers", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("ClaimType") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("ClaimValue") + .HasMaxLength(1024) + .HasColumnType("nvarchar(1024)"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AbpUserClaims", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserDelegation", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("EndTime") + .HasColumnType("datetime2"); + + b.Property("SourceUserId") + .HasColumnType("uniqueidentifier"); + + b.Property("StartTime") + .HasColumnType("datetime2"); + + b.Property("TargetUserId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.HasKey("Id"); + + b.ToTable("AbpUserDelegations", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => + { + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.Property("LoginProvider") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("ProviderDisplayName") + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("ProviderKey") + .IsRequired() + .HasMaxLength(196) + .HasColumnType("nvarchar(196)"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.HasKey("UserId", "LoginProvider"); + + b.HasIndex("LoginProvider", "ProviderKey"); + + b.ToTable("AbpUserLogins", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b => + { + b.Property("OrganizationUnitId") + .HasColumnType("uniqueidentifier"); + + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnType("uniqueidentifier") + .HasColumnName("CreatorId"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.HasKey("OrganizationUnitId", "UserId"); + + b.HasIndex("UserId", "OrganizationUnitId"); + + b.ToTable("AbpUserOrganizationUnits", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => + { + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.Property("RoleId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId", "UserId"); + + b.ToTable("AbpUserRoles", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("uniqueidentifier"); + + b.Property("LoginProvider") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("Name") + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.Property("Value") + .HasColumnType("nvarchar(max)"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AbpUserTokens", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("Code") + .IsRequired() + .HasMaxLength(95) + .HasColumnType("nvarchar(95)") + .HasColumnName("Code"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasMaxLength(40) + .HasColumnType("nvarchar(40)") + .HasColumnName("ConcurrencyStamp"); + + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnType("uniqueidentifier") + .HasColumnName("CreatorId"); + + b.Property("DeleterId") + .HasColumnType("uniqueidentifier") + .HasColumnName("DeleterId"); + + b.Property("DeletionTime") + .HasColumnType("datetime2") + .HasColumnName("DeletionTime"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)") + .HasColumnName("DisplayName"); + + b.Property("EntityVersion") + .HasColumnType("int"); + + b.Property("ExtraProperties") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false) + .HasColumnName("IsDeleted"); + + b.Property("LastModificationTime") + .HasColumnType("datetime2") + .HasColumnName("LastModificationTime"); + + b.Property("LastModifierId") + .HasColumnType("uniqueidentifier") + .HasColumnName("LastModifierId"); + + b.Property("ParentId") + .HasColumnType("uniqueidentifier"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("Code"); + + b.HasIndex("ParentId"); + + b.ToTable("AbpOrganizationUnits", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b => + { + b.Property("OrganizationUnitId") + .HasColumnType("uniqueidentifier"); + + b.Property("RoleId") + .HasColumnType("uniqueidentifier"); + + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnType("uniqueidentifier") + .HasColumnName("CreatorId"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.HasKey("OrganizationUnitId", "RoleId"); + + b.HasIndex("RoleId", "OrganizationUnitId"); + + b.ToTable("AbpOrganizationUnitRoles", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.OpenIddict.Applications.OpenIddictApplication", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ApplicationType") + .HasMaxLength(50) + .HasColumnType("nvarchar(50)"); + + b.Property("ClientId") + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); + + b.Property("ClientSecret") + .HasColumnType("nvarchar(max)"); + + b.Property("ClientType") + .HasMaxLength(50) + .HasColumnType("nvarchar(50)"); + + b.Property("ClientUri") + .HasColumnType("nvarchar(max)"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasMaxLength(40) + .HasColumnType("nvarchar(40)") + .HasColumnName("ConcurrencyStamp"); + + b.Property("ConsentType") + .HasMaxLength(50) + .HasColumnType("nvarchar(50)"); + + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnType("uniqueidentifier") + .HasColumnName("CreatorId"); + + b.Property("DeleterId") + .HasColumnType("uniqueidentifier") + .HasColumnName("DeleterId"); + + b.Property("DeletionTime") + .HasColumnType("datetime2") + .HasColumnName("DeletionTime"); + + b.Property("DisplayName") + .HasColumnType("nvarchar(max)"); + + b.Property("DisplayNames") + .HasColumnType("nvarchar(max)"); + + b.Property("ExtraProperties") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false) + .HasColumnName("IsDeleted"); + + b.Property("JsonWebKeySet") + .HasColumnType("nvarchar(max)"); + + b.Property("LastModificationTime") + .HasColumnType("datetime2") + .HasColumnName("LastModificationTime"); + + b.Property("LastModifierId") + .HasColumnType("uniqueidentifier") + .HasColumnName("LastModifierId"); + + b.Property("LogoUri") + .HasColumnType("nvarchar(max)"); + + b.Property("Permissions") + .HasColumnType("nvarchar(max)"); + + b.Property("PostLogoutRedirectUris") + .HasColumnType("nvarchar(max)"); + + b.Property("Properties") + .HasColumnType("nvarchar(max)"); + + b.Property("RedirectUris") + .HasColumnType("nvarchar(max)"); + + b.Property("Requirements") + .HasColumnType("nvarchar(max)"); + + b.Property("Settings") + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.HasIndex("ClientId"); + + b.ToTable("OpenIddictApplications", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.OpenIddict.Authorizations.OpenIddictAuthorization", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ApplicationId") + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasMaxLength(40) + .HasColumnType("nvarchar(40)") + .HasColumnName("ConcurrencyStamp"); + + b.Property("CreationDate") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("Properties") + .HasColumnType("nvarchar(max)"); + + b.Property("Scopes") + .HasColumnType("nvarchar(max)"); + + b.Property("Status") + .HasMaxLength(50) + .HasColumnType("nvarchar(50)"); + + b.Property("Subject") + .HasMaxLength(400) + .HasColumnType("nvarchar(400)"); + + b.Property("Type") + .HasMaxLength(50) + .HasColumnType("nvarchar(50)"); + + b.HasKey("Id"); + + b.HasIndex("ApplicationId", "Status", "Subject", "Type"); + + b.ToTable("OpenIddictAuthorizations", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.OpenIddict.Scopes.OpenIddictScope", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasMaxLength(40) + .HasColumnType("nvarchar(40)") + .HasColumnName("ConcurrencyStamp"); + + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnType("uniqueidentifier") + .HasColumnName("CreatorId"); + + b.Property("DeleterId") + .HasColumnType("uniqueidentifier") + .HasColumnName("DeleterId"); + + b.Property("DeletionTime") + .HasColumnType("datetime2") + .HasColumnName("DeletionTime"); + + b.Property("Description") + .HasColumnType("nvarchar(max)"); + + b.Property("Descriptions") + .HasColumnType("nvarchar(max)"); + + b.Property("DisplayName") + .HasColumnType("nvarchar(max)"); + + b.Property("DisplayNames") + .HasColumnType("nvarchar(max)"); + + b.Property("ExtraProperties") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false) + .HasColumnName("IsDeleted"); + + b.Property("LastModificationTime") + .HasColumnType("datetime2") + .HasColumnName("LastModificationTime"); + + b.Property("LastModifierId") + .HasColumnType("uniqueidentifier") + .HasColumnName("LastModifierId"); + + b.Property("Name") + .HasMaxLength(200) + .HasColumnType("nvarchar(200)"); + + b.Property("Properties") + .HasColumnType("nvarchar(max)"); + + b.Property("Resources") + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.HasIndex("Name"); + + b.ToTable("OpenIddictScopes", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.OpenIddict.Tokens.OpenIddictToken", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("ApplicationId") + .HasColumnType("uniqueidentifier"); + + b.Property("AuthorizationId") + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasMaxLength(40) + .HasColumnType("nvarchar(40)") + .HasColumnName("ConcurrencyStamp"); + + b.Property("CreationDate") + .HasColumnType("datetime2"); + + b.Property("ExpirationDate") + .HasColumnType("datetime2"); + + b.Property("ExtraProperties") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("Payload") + .HasColumnType("nvarchar(max)"); + + b.Property("Properties") + .HasColumnType("nvarchar(max)"); + + b.Property("RedemptionDate") + .HasColumnType("datetime2"); + + b.Property("ReferenceId") + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); + + b.Property("Status") + .HasMaxLength(50) + .HasColumnType("nvarchar(50)"); + + b.Property("Subject") + .HasMaxLength(400) + .HasColumnType("nvarchar(400)"); + + b.Property("Type") + .HasMaxLength(50) + .HasColumnType("nvarchar(50)"); + + b.HasKey("Id"); + + b.HasIndex("AuthorizationId"); + + b.HasIndex("ReferenceId"); + + b.HasIndex("ApplicationId", "Status", "Subject", "Type"); + + b.ToTable("OpenIddictTokens", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionDefinitionRecord", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("ExtraProperties") + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("GroupName") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("IsEnabled") + .HasColumnType("bit"); + + b.Property("MultiTenancySide") + .HasColumnType("tinyint"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("ParentName") + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("Providers") + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("StateCheckers") + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.HasKey("Id"); + + b.HasIndex("GroupName"); + + b.HasIndex("Name") + .IsUnique(); + + b.ToTable("AbpPermissions", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGrant", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("ProviderKey") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("ProviderName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + + b.HasKey("Id"); + + b.HasIndex("TenantId", "Name", "ProviderName", "ProviderKey") + .IsUnique() + .HasFilter("[TenantId] IS NOT NULL"); + + b.ToTable("AbpPermissionGrants", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.PermissionManagement.PermissionGroupDefinitionRecord", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("ExtraProperties") + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.HasKey("Id"); + + b.HasIndex("Name") + .IsUnique(); + + b.ToTable("AbpPermissionGroups", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.SettingManagement.Setting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("ProviderKey") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("ProviderName") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("Value") + .IsRequired() + .HasMaxLength(2048) + .HasColumnType("nvarchar(2048)"); + + b.HasKey("Id"); + + b.HasIndex("Name", "ProviderName", "ProviderKey") + .IsUnique() + .HasFilter("[ProviderName] IS NOT NULL AND [ProviderKey] IS NOT NULL"); + + b.ToTable("AbpSettings", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.SettingManagement.SettingDefinitionRecord", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uniqueidentifier"); + + b.Property("DefaultValue") + .HasMaxLength(2048) + .HasColumnType("nvarchar(2048)"); + + b.Property("Description") + .HasMaxLength(512) + .HasColumnType("nvarchar(512)"); + + b.Property("DisplayName") + .IsRequired() + .HasMaxLength(256) + .HasColumnType("nvarchar(256)"); + + b.Property("ExtraProperties") + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("IsEncrypted") + .HasColumnType("bit"); + + b.Property("IsInherited") + .HasColumnType("bit"); + + b.Property("IsVisibleToClients") + .HasColumnType("bit"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(128) + .HasColumnType("nvarchar(128)"); + + b.Property("Providers") + .HasMaxLength(1024) + .HasColumnType("nvarchar(1024)"); + + b.HasKey("Id"); + + b.HasIndex("Name") + .IsUnique(); + + b.ToTable("AbpSettingDefinitions", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b => + { + b.Property("Id") + .HasColumnType("uniqueidentifier"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .IsRequired() + .HasMaxLength(40) + .HasColumnType("nvarchar(40)") + .HasColumnName("ConcurrencyStamp"); + + b.Property("CreationTime") + .HasColumnType("datetime2") + .HasColumnName("CreationTime"); + + b.Property("CreatorId") + .HasColumnType("uniqueidentifier") + .HasColumnName("CreatorId"); + + b.Property("DeleterId") + .HasColumnType("uniqueidentifier") + .HasColumnName("DeleterId"); + + b.Property("DeletionTime") + .HasColumnType("datetime2") + .HasColumnName("DeletionTime"); + + b.Property("EntityVersion") + .HasColumnType("int"); + + b.Property("ExtraProperties") + .IsRequired() + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + + b.Property("IsDeleted") + .ValueGeneratedOnAdd() + .HasColumnType("bit") + .HasDefaultValue(false) + .HasColumnName("IsDeleted"); + + b.Property("LastModificationTime") + .HasColumnType("datetime2") + .HasColumnName("LastModificationTime"); + + b.Property("LastModifierId") + .HasColumnType("uniqueidentifier") + .HasColumnName("LastModifierId"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("NormalizedName") + .IsRequired() + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.HasKey("Id"); + + b.HasIndex("Name"); + + b.HasIndex("NormalizedName"); + + b.ToTable("AbpTenants", (string)null); + }); + + modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => + { + b.Property("TenantId") + .HasColumnType("uniqueidentifier"); + + b.Property("Name") + .HasMaxLength(64) + .HasColumnType("nvarchar(64)"); + + b.Property("Value") + .IsRequired() + .HasMaxLength(1024) + .HasColumnType("nvarchar(1024)"); + + b.HasKey("TenantId", "Name"); + + b.ToTable("AbpTenantConnectionStrings", (string)null); + }); + + modelBuilder.Entity("Passingwind.Abp.IdentityClient.IdentityClientClaimMap", b => + { + b.HasOne("Passingwind.Abp.IdentityClient.IdentityClient", null) + .WithMany("ClaimMaps") + .HasForeignKey("IdentityClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Passingwind.Abp.IdentityClient.IdentityClientConfiguration", b => + { + b.HasOne("Passingwind.Abp.IdentityClient.IdentityClient", null) + .WithMany("Configurations") + .HasForeignKey("IdentityClientId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLogAction", b => + { + b.HasOne("Volo.Abp.AuditLogging.AuditLog", null) + .WithMany("Actions") + .HasForeignKey("AuditLogId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => + { + b.HasOne("Volo.Abp.AuditLogging.AuditLog", null) + .WithMany("EntityChanges") + .HasForeignKey("AuditLogId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityPropertyChange", b => + { + b.HasOne("Volo.Abp.AuditLogging.EntityChange", null) + .WithMany("PropertyChanges") + .HasForeignKey("EntityChangeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRoleClaim", b => + { + b.HasOne("Volo.Abp.Identity.IdentityRole", null) + .WithMany("Claims") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserClaim", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser", null) + .WithMany("Claims") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserLogin", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser", null) + .WithMany("Logins") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserOrganizationUnit", b => + { + b.HasOne("Volo.Abp.Identity.OrganizationUnit", null) + .WithMany() + .HasForeignKey("OrganizationUnitId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Volo.Abp.Identity.IdentityUser", null) + .WithMany("OrganizationUnits") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserRole", b => + { + b.HasOne("Volo.Abp.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Volo.Abp.Identity.IdentityUser", null) + .WithMany("Roles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUserToken", b => + { + b.HasOne("Volo.Abp.Identity.IdentityUser", null) + .WithMany("Tokens") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b => + { + b.HasOne("Volo.Abp.Identity.OrganizationUnit", null) + .WithMany() + .HasForeignKey("ParentId"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnitRole", b => + { + b.HasOne("Volo.Abp.Identity.OrganizationUnit", null) + .WithMany("Roles") + .HasForeignKey("OrganizationUnitId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("Volo.Abp.Identity.IdentityRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Volo.Abp.OpenIddict.Authorizations.OpenIddictAuthorization", b => + { + b.HasOne("Volo.Abp.OpenIddict.Applications.OpenIddictApplication", null) + .WithMany() + .HasForeignKey("ApplicationId"); + }); + + modelBuilder.Entity("Volo.Abp.OpenIddict.Tokens.OpenIddictToken", b => + { + b.HasOne("Volo.Abp.OpenIddict.Applications.OpenIddictApplication", null) + .WithMany() + .HasForeignKey("ApplicationId"); + + b.HasOne("Volo.Abp.OpenIddict.Authorizations.OpenIddictAuthorization", null) + .WithMany() + .HasForeignKey("AuthorizationId"); + }); + + modelBuilder.Entity("Volo.Abp.TenantManagement.TenantConnectionString", b => + { + b.HasOne("Volo.Abp.TenantManagement.Tenant", null) + .WithMany("ConnectionStrings") + .HasForeignKey("TenantId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Passingwind.Abp.IdentityClient.IdentityClient", b => + { + b.Navigation("ClaimMaps"); + + b.Navigation("Configurations"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.AuditLog", b => + { + b.Navigation("Actions"); + + b.Navigation("EntityChanges"); + }); + + modelBuilder.Entity("Volo.Abp.AuditLogging.EntityChange", b => + { + b.Navigation("PropertyChanges"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityRole", b => + { + b.Navigation("Claims"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.IdentityUser", b => + { + b.Navigation("Claims"); + + b.Navigation("Logins"); + + b.Navigation("OrganizationUnits"); + + b.Navigation("Roles"); + + b.Navigation("Tokens"); + }); + + modelBuilder.Entity("Volo.Abp.Identity.OrganizationUnit", b => + { + b.Navigation("Roles"); + }); + + modelBuilder.Entity("Volo.Abp.TenantManagement.Tenant", b => + { + b.Navigation("ConnectionStrings"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/host/src/Sample.EntityFrameworkCore/Migrations/20241125132408_Update_Abp_90.cs b/host/src/Sample.EntityFrameworkCore/Migrations/20241125132408_Update_Abp_90.cs new file mode 100644 index 0000000..9ab9567 --- /dev/null +++ b/host/src/Sample.EntityFrameworkCore/Migrations/20241125132408_Update_Abp_90.cs @@ -0,0 +1,195 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace Sample.Migrations +{ + /// + public partial class Update_Abp_90 : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "CreationTime", + table: "OpenIddictTokens"); + + migrationBuilder.DropColumn( + name: "CreatorId", + table: "OpenIddictTokens"); + + migrationBuilder.DropColumn( + name: "DeleterId", + table: "OpenIddictTokens"); + + migrationBuilder.DropColumn( + name: "DeletionTime", + table: "OpenIddictTokens"); + + migrationBuilder.DropColumn( + name: "IsDeleted", + table: "OpenIddictTokens"); + + migrationBuilder.DropColumn( + name: "LastModificationTime", + table: "OpenIddictTokens"); + + migrationBuilder.DropColumn( + name: "LastModifierId", + table: "OpenIddictTokens"); + + migrationBuilder.DropColumn( + name: "CreationTime", + table: "OpenIddictAuthorizations"); + + migrationBuilder.DropColumn( + name: "CreatorId", + table: "OpenIddictAuthorizations"); + + migrationBuilder.DropColumn( + name: "DeleterId", + table: "OpenIddictAuthorizations"); + + migrationBuilder.DropColumn( + name: "DeletionTime", + table: "OpenIddictAuthorizations"); + + migrationBuilder.DropColumn( + name: "IsDeleted", + table: "OpenIddictAuthorizations"); + + migrationBuilder.DropColumn( + name: "LastModificationTime", + table: "OpenIddictAuthorizations"); + + migrationBuilder.DropColumn( + name: "LastModifierId", + table: "OpenIddictAuthorizations"); + + migrationBuilder.AlterColumn( + name: "IpAddresses", + table: "AbpSessions", + type: "nvarchar(2048)", + maxLength: 2048, + nullable: true, + oldClrType: typeof(string), + oldType: "nvarchar(256)", + oldMaxLength: 256, + oldNullable: true); + + migrationBuilder.AddColumn( + name: "ExtraProperties", + table: "AbpSessions", + type: "nvarchar(max)", + nullable: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "ExtraProperties", + table: "AbpSessions"); + + migrationBuilder.AddColumn( + name: "CreationTime", + table: "OpenIddictTokens", + type: "datetime2", + nullable: false, + defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); + + migrationBuilder.AddColumn( + name: "CreatorId", + table: "OpenIddictTokens", + type: "uniqueidentifier", + nullable: true); + + migrationBuilder.AddColumn( + name: "DeleterId", + table: "OpenIddictTokens", + type: "uniqueidentifier", + nullable: true); + + migrationBuilder.AddColumn( + name: "DeletionTime", + table: "OpenIddictTokens", + type: "datetime2", + nullable: true); + + migrationBuilder.AddColumn( + name: "IsDeleted", + table: "OpenIddictTokens", + type: "bit", + nullable: false, + defaultValue: false); + + migrationBuilder.AddColumn( + name: "LastModificationTime", + table: "OpenIddictTokens", + type: "datetime2", + nullable: true); + + migrationBuilder.AddColumn( + name: "LastModifierId", + table: "OpenIddictTokens", + type: "uniqueidentifier", + nullable: true); + + migrationBuilder.AddColumn( + name: "CreationTime", + table: "OpenIddictAuthorizations", + type: "datetime2", + nullable: false, + defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); + + migrationBuilder.AddColumn( + name: "CreatorId", + table: "OpenIddictAuthorizations", + type: "uniqueidentifier", + nullable: true); + + migrationBuilder.AddColumn( + name: "DeleterId", + table: "OpenIddictAuthorizations", + type: "uniqueidentifier", + nullable: true); + + migrationBuilder.AddColumn( + name: "DeletionTime", + table: "OpenIddictAuthorizations", + type: "datetime2", + nullable: true); + + migrationBuilder.AddColumn( + name: "IsDeleted", + table: "OpenIddictAuthorizations", + type: "bit", + nullable: false, + defaultValue: false); + + migrationBuilder.AddColumn( + name: "LastModificationTime", + table: "OpenIddictAuthorizations", + type: "datetime2", + nullable: true); + + migrationBuilder.AddColumn( + name: "LastModifierId", + table: "OpenIddictAuthorizations", + type: "uniqueidentifier", + nullable: true); + + migrationBuilder.AlterColumn( + name: "IpAddresses", + table: "AbpSessions", + type: "nvarchar(256)", + maxLength: 256, + nullable: true, + oldClrType: typeof(string), + oldType: "nvarchar(2048)", + oldMaxLength: 2048, + oldNullable: true); + } + } +} diff --git a/host/src/Sample.EntityFrameworkCore/Migrations/SampleDbContextModelSnapshot.cs b/host/src/Sample.EntityFrameworkCore/Migrations/SampleDbContextModelSnapshot.cs index 33cc1da..d81ab05 100644 --- a/host/src/Sample.EntityFrameworkCore/Migrations/SampleDbContextModelSnapshot.cs +++ b/host/src/Sample.EntityFrameworkCore/Migrations/SampleDbContextModelSnapshot.cs @@ -19,7 +19,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) #pragma warning disable 612, 618 modelBuilder .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer) - .HasAnnotation("ProductVersion", "8.0.4") + .HasAnnotation("ProductVersion", "9.0.0") .HasAnnotation("Relational:MaxIdentifierLength", 128); SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); @@ -1352,9 +1352,13 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasMaxLength(64) .HasColumnType("nvarchar(64)"); + b.Property("ExtraProperties") + .HasColumnType("nvarchar(max)") + .HasColumnName("ExtraProperties"); + b.Property("IpAddresses") - .HasMaxLength(256) - .HasColumnType("nvarchar(256)"); + .HasMaxLength(2048) + .HasColumnType("nvarchar(2048)"); b.Property("LastAccessed") .HasColumnType("datetime2"); @@ -1936,41 +1940,11 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("CreationDate") .HasColumnType("datetime2"); - b.Property("CreationTime") - .HasColumnType("datetime2") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnType("uniqueidentifier") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnType("uniqueidentifier") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnType("datetime2") - .HasColumnName("DeletionTime"); - b.Property("ExtraProperties") .IsRequired() .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnType("bit") - .HasDefaultValue(false) - .HasColumnName("IsDeleted"); - - b.Property("LastModificationTime") - .HasColumnType("datetime2") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnType("uniqueidentifier") - .HasColumnName("LastModifierId"); - b.Property("Properties") .HasColumnType("nvarchar(max)"); @@ -2095,22 +2069,6 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("CreationDate") .HasColumnType("datetime2"); - b.Property("CreationTime") - .HasColumnType("datetime2") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnType("uniqueidentifier") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnType("uniqueidentifier") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnType("datetime2") - .HasColumnName("DeletionTime"); - b.Property("ExpirationDate") .HasColumnType("datetime2"); @@ -2119,20 +2077,6 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnType("bit") - .HasDefaultValue(false) - .HasColumnName("IsDeleted"); - - b.Property("LastModificationTime") - .HasColumnType("datetime2") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnType("uniqueidentifier") - .HasColumnName("LastModifierId"); - b.Property("Payload") .HasColumnType("nvarchar(max)"); diff --git a/host/src/Sample.EntityFrameworkCore/Properties/AssemblyInfo.cs b/host/src/Sample.EntityFrameworkCore/Properties/AssemblyInfo.cs index 4118e4e..986ecdb 100644 --- a/host/src/Sample.EntityFrameworkCore/Properties/AssemblyInfo.cs +++ b/host/src/Sample.EntityFrameworkCore/Properties/AssemblyInfo.cs @@ -1,2 +1,2 @@ using System.Runtime.CompilerServices; -[assembly:InternalsVisibleToAttribute("Sample.EntityFrameworkCore.Tests")] +[assembly: InternalsVisibleToAttribute("Sample.EntityFrameworkCore.Tests")] diff --git a/host/src/Sample.EntityFrameworkCore/Sample.EntityFrameworkCore.csproj b/host/src/Sample.EntityFrameworkCore/Sample.EntityFrameworkCore.csproj index 0df6495..c15d136 100644 --- a/host/src/Sample.EntityFrameworkCore/Sample.EntityFrameworkCore.csproj +++ b/host/src/Sample.EntityFrameworkCore/Sample.EntityFrameworkCore.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Sample diff --git a/host/src/Sample.HttpApi.Client/SampleHttpApiClientModule.cs b/host/src/Sample.HttpApi.Client/SampleHttpApiClientModule.cs index 7d512f0..9455be4 100644 --- a/host/src/Sample.HttpApi.Client/SampleHttpApiClientModule.cs +++ b/host/src/Sample.HttpApi.Client/SampleHttpApiClientModule.cs @@ -4,8 +4,8 @@ using Volo.Abp.Identity; using Volo.Abp.Modularity; using Volo.Abp.PermissionManagement; -using Volo.Abp.TenantManagement; using Volo.Abp.SettingManagement; +using Volo.Abp.TenantManagement; using Volo.Abp.VirtualFileSystem; namespace Sample; @@ -30,9 +30,6 @@ public override void ConfigureServices(ServiceConfigurationContext context) RemoteServiceName ); - Configure(options => - { - options.FileSets.AddEmbedded(); - }); + Configure(options => options.FileSets.AddEmbedded()); } } diff --git a/host/src/Sample.HttpApi.Host/Sample.HttpApi.Host.csproj b/host/src/Sample.HttpApi.Host/Sample.HttpApi.Host.csproj index c72bec5..4172506 100644 --- a/host/src/Sample.HttpApi.Host/Sample.HttpApi.Host.csproj +++ b/host/src/Sample.HttpApi.Host/Sample.HttpApi.Host.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Sample true @@ -24,7 +24,7 @@ - + diff --git a/host/src/Sample.HttpApi.Host/SampleHttpApiHostModule.cs b/host/src/Sample.HttpApi.Host/SampleHttpApiHostModule.cs index 2301630..4c36ebb 100644 --- a/host/src/Sample.HttpApi.Host/SampleHttpApiHostModule.cs +++ b/host/src/Sample.HttpApi.Host/SampleHttpApiHostModule.cs @@ -278,7 +278,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex app.UseSwagger(); app.UseAbpSwaggerUI(c => { - c.SwaggerEndpoint("/swagger/v1/swagger.json", "Sample API"); + c.SwaggerEndpoint("/swagger/v1/swagger.json", "Sample API"); c.DisplayOperationId(); c.DisplayRequestDuration(); c.DocExpansion(Swashbuckle.AspNetCore.SwaggerUI.DocExpansion.None); diff --git a/host/src/Sample.HttpApi/Sample.HttpApi.csproj b/host/src/Sample.HttpApi/Sample.HttpApi.csproj index 28d16d9..c18dfc2 100644 --- a/host/src/Sample.HttpApi/Sample.HttpApi.csproj +++ b/host/src/Sample.HttpApi/Sample.HttpApi.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Sample diff --git a/modules/account/src/Passingwind.Abp.Account.Application.Contracts/IAccountImpersonationAppService.cs b/modules/account/src/Passingwind.Abp.Account.Application.Contracts/IAccountImpersonationAppService.cs index dc2c947..f3ce400 100644 --- a/modules/account/src/Passingwind.Abp.Account.Application.Contracts/IAccountImpersonationAppService.cs +++ b/modules/account/src/Passingwind.Abp.Account.Application.Contracts/IAccountImpersonationAppService.cs @@ -14,18 +14,15 @@ public interface IAccountImpersonationAppService : IApplicationService /// /// Login to specified user with id /// - /// Task LoginAsync(Guid userId); /// /// Link login to specified user with id /// - /// Task LinkLoginAsync(Guid userId); /// /// Delegation login /// - /// Task DelegationLoginAsync(Guid id); } diff --git a/modules/account/src/Passingwind.Abp.Account.Application.Contracts/IAccountLinkUserAppService.cs b/modules/account/src/Passingwind.Abp.Account.Application.Contracts/IAccountLinkUserAppService.cs index 49ff6c1..56a4956 100644 --- a/modules/account/src/Passingwind.Abp.Account.Application.Contracts/IAccountLinkUserAppService.cs +++ b/modules/account/src/Passingwind.Abp.Account.Application.Contracts/IAccountLinkUserAppService.cs @@ -9,7 +9,6 @@ public interface IAccountLinkUserAppService : IApplicationService /// /// Get current user account link list /// - /// Task> GetListAsync(AccountLinkUserListRequestDto input); /// @@ -20,12 +19,10 @@ public interface IAccountLinkUserAppService : IApplicationService /// /// Verify the token for specify user, if true, link to current user /// - /// Task VerifyLinkTokenAsync(AccountLinkTokenValidationRequestDto input); /// /// Unlink specify user for current account /// - /// Task UnlinkAsync(AccountUnlinkDto input); } diff --git a/modules/account/src/Passingwind.Abp.Account.Application.Contracts/IAccountLoginAppService.cs b/modules/account/src/Passingwind.Abp.Account.Application.Contracts/IAccountLoginAppService.cs index a2434b2..57829c3 100644 --- a/modules/account/src/Passingwind.Abp.Account.Application.Contracts/IAccountLoginAppService.cs +++ b/modules/account/src/Passingwind.Abp.Account.Application.Contracts/IAccountLoginAppService.cs @@ -19,20 +19,16 @@ public interface IAccountLoginAppService : IApplicationService /// /// Password login /// - /// Task LoginAsync(AccountLoginRequestDto input); /// /// Login with 2fa code /// - /// - /// Task LoginWithTfaAsync(string provider, AccountLoginWithTfaRequestDto input); /// /// Login with authenticator recovery code /// - /// Task LoginWithAuthenticatorRecoveryCodeAsync(AccountLoginWithAuthenticatorRecoveryCodeRequestDto input); /// @@ -43,7 +39,6 @@ public interface IAccountLoginAppService : IApplicationService /// /// Check password /// - /// Task CheckPasswordAsync(AccountLoginRequestDto input); #endregion Login @@ -58,14 +53,11 @@ public interface IAccountLoginAppService : IApplicationService /// /// Send 2fa token when requires 2fa /// - /// Task SendTfaTokenAsync(string provider); /// /// verify 2fa token /// - /// - /// Task VerifyTfaTokenAsync(string provider, AccountLoginVerifyTwoFactorTokenDto input); #endregion tfa @@ -75,7 +67,6 @@ public interface IAccountLoginAppService : IApplicationService /// /// Change password /// - /// Task ChangePasswordAsync(AccountRequiredChangePasswordRequestDto input); #endregion ChangePassword @@ -95,7 +86,6 @@ public interface IAccountLoginAppService : IApplicationService /// /// Tfa authentication user verify authenticator code /// - /// Task VerifyAuthenticatorToken(AccountAuthenticatorCodeVerifyRequestDto input); #endregion Authenticator diff --git a/modules/account/src/Passingwind.Abp.Account.Application.Contracts/IAccountTfaAppService.cs b/modules/account/src/Passingwind.Abp.Account.Application.Contracts/IAccountTfaAppService.cs index ce8c3cb..54143af 100644 --- a/modules/account/src/Passingwind.Abp.Account.Application.Contracts/IAccountTfaAppService.cs +++ b/modules/account/src/Passingwind.Abp.Account.Application.Contracts/IAccountTfaAppService.cs @@ -38,12 +38,10 @@ public interface IAccountTfaAppService : IApplicationService /// /// Update authenticator state /// - /// Task UpdateAuthenticatorAsync(AccountAuthenticatorCodeVerifyRequestDto input); /// /// Verify authenticator token /// - /// Task VerifyAuthenticatorTokenAsync(AccountAuthenticatorCodeVerifyRequestDto input); /// /// Regenerate authenticator recovery codes @@ -58,7 +56,6 @@ public interface IAccountTfaAppService : IApplicationService /// /// remove your authenticator key your authenticator app will not work until you reconfigure it /// - /// Task RemoveAuthenticatorAsync(AccountAuthenticatorCodeVerifyRequestDto input); /// diff --git a/modules/account/src/Passingwind.Abp.Account.Application.Contracts/IAccountUserDelegationAppService.cs b/modules/account/src/Passingwind.Abp.Account.Application.Contracts/IAccountUserDelegationAppService.cs index df0c8fc..332f2ca 100644 --- a/modules/account/src/Passingwind.Abp.Account.Application.Contracts/IAccountUserDelegationAppService.cs +++ b/modules/account/src/Passingwind.Abp.Account.Application.Contracts/IAccountUserDelegationAppService.cs @@ -20,18 +20,15 @@ public interface IAccountUserDelegationAppService : IApplicationService /// /// Create new delegation /// - /// Task CreateAsync(AccountUserDelegationCreateDto input); /// /// Delete delegation by id /// - /// Task DeleteAsync(Guid id); /// /// Search user /// - /// Task> UserLookupAsync(string? filter = null); } diff --git a/modules/account/src/Passingwind.Abp.Account.Application/Passingwind.Abp.Account.Application.csproj b/modules/account/src/Passingwind.Abp.Account.Application/Passingwind.Abp.Account.Application.csproj index 4ac8b43..e9a3d5a 100644 --- a/modules/account/src/Passingwind.Abp.Account.Application/Passingwind.Abp.Account.Application.csproj +++ b/modules/account/src/Passingwind.Abp.Account.Application/Passingwind.Abp.Account.Application.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.Account diff --git a/modules/account/src/Passingwind.Abp.Account.AspNetCore.IdentityClient/Passingwind.Abp.Account.AspNetCore.IdentityClient.csproj b/modules/account/src/Passingwind.Abp.Account.AspNetCore.IdentityClient/Passingwind.Abp.Account.AspNetCore.IdentityClient.csproj index c0dcaf0..ce65383 100644 --- a/modules/account/src/Passingwind.Abp.Account.AspNetCore.IdentityClient/Passingwind.Abp.Account.AspNetCore.IdentityClient.csproj +++ b/modules/account/src/Passingwind.Abp.Account.AspNetCore.IdentityClient/Passingwind.Abp.Account.AspNetCore.IdentityClient.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.Account diff --git a/modules/account/src/Passingwind.Abp.Account.AspNetCore/Passingwind.Abp.Account.AspNetCore.csproj b/modules/account/src/Passingwind.Abp.Account.AspNetCore/Passingwind.Abp.Account.AspNetCore.csproj index f0e4846..0470519 100644 --- a/modules/account/src/Passingwind.Abp.Account.AspNetCore/Passingwind.Abp.Account.AspNetCore.csproj +++ b/modules/account/src/Passingwind.Abp.Account.AspNetCore/Passingwind.Abp.Account.AspNetCore.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.Account diff --git a/modules/account/src/Passingwind.Abp.Account.Domain.Shared/Passingwind.Abp.Account.Domain.Shared.csproj b/modules/account/src/Passingwind.Abp.Account.Domain.Shared/Passingwind.Abp.Account.Domain.Shared.csproj index a9add81..0d033b2 100644 --- a/modules/account/src/Passingwind.Abp.Account.Domain.Shared/Passingwind.Abp.Account.Domain.Shared.csproj +++ b/modules/account/src/Passingwind.Abp.Account.Domain.Shared/Passingwind.Abp.Account.Domain.Shared.csproj @@ -14,7 +14,7 @@ - + diff --git a/modules/account/src/Passingwind.Abp.Account.HttpApi/Passingwind.Abp.Account.HttpApi.csproj b/modules/account/src/Passingwind.Abp.Account.HttpApi/Passingwind.Abp.Account.HttpApi.csproj index 6ef647e..5ecaa92 100644 --- a/modules/account/src/Passingwind.Abp.Account.HttpApi/Passingwind.Abp.Account.HttpApi.csproj +++ b/modules/account/src/Passingwind.Abp.Account.HttpApi/Passingwind.Abp.Account.HttpApi.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.Account diff --git a/modules/api-keys/src/Passingwind.Abp.ApiKey.Application.Contracts/IApiKeyRecordAppService.cs b/modules/api-keys/src/Passingwind.Abp.ApiKey.Application.Contracts/IApiKeyRecordAppService.cs index cfb4151..d6fbb80 100644 --- a/modules/api-keys/src/Passingwind.Abp.ApiKey.Application.Contracts/IApiKeyRecordAppService.cs +++ b/modules/api-keys/src/Passingwind.Abp.ApiKey.Application.Contracts/IApiKeyRecordAppService.cs @@ -13,18 +13,15 @@ public interface IApiKeyRecordAppService : IApplicationService /// /// Get ApiKeyRecord list by paged params /// - /// Task> GetListAsync(ApiKeyRecordListRequestDto input); /// /// Create ApiKeyRecord /// - /// Task CreateAsync(ApiKeyRecordCreateOrUpdateDto input); /// /// Delete ApiKeyRecord by id /// - /// Task DeleteAsync(Guid id); } diff --git a/modules/api-keys/src/Passingwind.Abp.ApiKey.Application/Passingwind.Abp.ApiKey.Application.csproj b/modules/api-keys/src/Passingwind.Abp.ApiKey.Application/Passingwind.Abp.ApiKey.Application.csproj index 4ac5cf1..48f7205 100644 --- a/modules/api-keys/src/Passingwind.Abp.ApiKey.Application/Passingwind.Abp.ApiKey.Application.csproj +++ b/modules/api-keys/src/Passingwind.Abp.ApiKey.Application/Passingwind.Abp.ApiKey.Application.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.ApiKey diff --git a/modules/api-keys/src/Passingwind.Abp.ApiKey.AspNetCore/Passingwind.Abp.ApiKey.AspNetCore.csproj b/modules/api-keys/src/Passingwind.Abp.ApiKey.AspNetCore/Passingwind.Abp.ApiKey.AspNetCore.csproj index 1e7b6e9..12e2874 100644 --- a/modules/api-keys/src/Passingwind.Abp.ApiKey.AspNetCore/Passingwind.Abp.ApiKey.AspNetCore.csproj +++ b/modules/api-keys/src/Passingwind.Abp.ApiKey.AspNetCore/Passingwind.Abp.ApiKey.AspNetCore.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.ApiKey diff --git a/modules/api-keys/src/Passingwind.Abp.ApiKey.Domain.Shared/Passingwind.Abp.ApiKey.Domain.Shared.csproj b/modules/api-keys/src/Passingwind.Abp.ApiKey.Domain.Shared/Passingwind.Abp.ApiKey.Domain.Shared.csproj index cf0aca4..02c3429 100644 --- a/modules/api-keys/src/Passingwind.Abp.ApiKey.Domain.Shared/Passingwind.Abp.ApiKey.Domain.Shared.csproj +++ b/modules/api-keys/src/Passingwind.Abp.ApiKey.Domain.Shared/Passingwind.Abp.ApiKey.Domain.Shared.csproj @@ -14,7 +14,7 @@ - + diff --git a/modules/api-keys/src/Passingwind.Abp.ApiKey.Domain/ApiKeyRecordManager.cs b/modules/api-keys/src/Passingwind.Abp.ApiKey.Domain/ApiKeyRecordManager.cs index c96318e..cb96a7b 100644 --- a/modules/api-keys/src/Passingwind.Abp.ApiKey.Domain/ApiKeyRecordManager.cs +++ b/modules/api-keys/src/Passingwind.Abp.ApiKey.Domain/ApiKeyRecordManager.cs @@ -66,8 +66,8 @@ public virtual async Task RegenerateValueAsync(ApiKeyRecord record { var user = await _userManager.GetByIdAsync(record.UserId); - record.Secret = await GenerateValueAsync(user.Id); + record.Secret = await GenerateValueAsync(user.Id, cancellationToken); - return await _apiKeyRecordRepository.UpdateAsync(record); + return await _apiKeyRecordRepository.UpdateAsync(record, cancellationToken: cancellationToken); } } diff --git a/modules/api-keys/src/Passingwind.Abp.ApiKey.Domain/Passingwind.Abp.ApiKey.Domain.csproj b/modules/api-keys/src/Passingwind.Abp.ApiKey.Domain/Passingwind.Abp.ApiKey.Domain.csproj index 6d5adf6..24fbd54 100644 --- a/modules/api-keys/src/Passingwind.Abp.ApiKey.Domain/Passingwind.Abp.ApiKey.Domain.csproj +++ b/modules/api-keys/src/Passingwind.Abp.ApiKey.Domain/Passingwind.Abp.ApiKey.Domain.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.ApiKey diff --git a/modules/api-keys/src/Passingwind.Abp.ApiKey.EntityFrameworkCore/Passingwind.Abp.ApiKey.EntityFrameworkCore.csproj b/modules/api-keys/src/Passingwind.Abp.ApiKey.EntityFrameworkCore/Passingwind.Abp.ApiKey.EntityFrameworkCore.csproj index 68a7573..c4b4d4d 100644 --- a/modules/api-keys/src/Passingwind.Abp.ApiKey.EntityFrameworkCore/Passingwind.Abp.ApiKey.EntityFrameworkCore.csproj +++ b/modules/api-keys/src/Passingwind.Abp.ApiKey.EntityFrameworkCore/Passingwind.Abp.ApiKey.EntityFrameworkCore.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.ApiKey diff --git a/modules/api-keys/src/Passingwind.Abp.ApiKey.HttpApi/Passingwind.Abp.ApiKey.HttpApi.csproj b/modules/api-keys/src/Passingwind.Abp.ApiKey.HttpApi/Passingwind.Abp.ApiKey.HttpApi.csproj index 0eb0098..a4dca3c 100644 --- a/modules/api-keys/src/Passingwind.Abp.ApiKey.HttpApi/Passingwind.Abp.ApiKey.HttpApi.csproj +++ b/modules/api-keys/src/Passingwind.Abp.ApiKey.HttpApi/Passingwind.Abp.ApiKey.HttpApi.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.ApiKey diff --git a/modules/api-keys/src/Passingwind.Abp.ApiKey.MongoDB/Passingwind.Abp.ApiKey.MongoDB.csproj b/modules/api-keys/src/Passingwind.Abp.ApiKey.MongoDB/Passingwind.Abp.ApiKey.MongoDB.csproj index e0c26c2..8793027 100644 --- a/modules/api-keys/src/Passingwind.Abp.ApiKey.MongoDB/Passingwind.Abp.ApiKey.MongoDB.csproj +++ b/modules/api-keys/src/Passingwind.Abp.ApiKey.MongoDB/Passingwind.Abp.ApiKey.MongoDB.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.ApiKey diff --git a/modules/common.props b/modules/common.props index 0ad7c56..7f4ffef 100644 --- a/modules/common.props +++ b/modules/common.props @@ -34,7 +34,7 @@ - + diff --git a/modules/dictionary-management/src/Passingwind.Abp.DictionaryManagement.Application/Passingwind.Abp.DictionaryManagement.Application.csproj b/modules/dictionary-management/src/Passingwind.Abp.DictionaryManagement.Application/Passingwind.Abp.DictionaryManagement.Application.csproj index cbee9e6..d5d6e2a 100644 --- a/modules/dictionary-management/src/Passingwind.Abp.DictionaryManagement.Application/Passingwind.Abp.DictionaryManagement.Application.csproj +++ b/modules/dictionary-management/src/Passingwind.Abp.DictionaryManagement.Application/Passingwind.Abp.DictionaryManagement.Application.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.DictionaryManagement diff --git a/modules/dictionary-management/src/Passingwind.Abp.DictionaryManagement.Domain.Shared/Passingwind.Abp.DictionaryManagement.Domain.Shared.csproj b/modules/dictionary-management/src/Passingwind.Abp.DictionaryManagement.Domain.Shared/Passingwind.Abp.DictionaryManagement.Domain.Shared.csproj index ac7ee0c..a21dff4 100644 --- a/modules/dictionary-management/src/Passingwind.Abp.DictionaryManagement.Domain.Shared/Passingwind.Abp.DictionaryManagement.Domain.Shared.csproj +++ b/modules/dictionary-management/src/Passingwind.Abp.DictionaryManagement.Domain.Shared/Passingwind.Abp.DictionaryManagement.Domain.Shared.csproj @@ -14,7 +14,7 @@ - + diff --git a/modules/dictionary-management/src/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore.csproj b/modules/dictionary-management/src/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore.csproj index 06bbc31..72bebee 100644 --- a/modules/dictionary-management/src/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore.csproj +++ b/modules/dictionary-management/src/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.DictionaryManagement diff --git a/modules/dictionary-management/src/Passingwind.Abp.DictionaryManagement.HttpApi/Passingwind.Abp.DictionaryManagement.HttpApi.csproj b/modules/dictionary-management/src/Passingwind.Abp.DictionaryManagement.HttpApi/Passingwind.Abp.DictionaryManagement.HttpApi.csproj index ecb5866..376d6a2 100644 --- a/modules/dictionary-management/src/Passingwind.Abp.DictionaryManagement.HttpApi/Passingwind.Abp.DictionaryManagement.HttpApi.csproj +++ b/modules/dictionary-management/src/Passingwind.Abp.DictionaryManagement.HttpApi/Passingwind.Abp.DictionaryManagement.HttpApi.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.DictionaryManagement diff --git a/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.Application.Tests/Passingwind.Abp.DictionaryManagement.Application.Tests.csproj b/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.Application.Tests/Passingwind.Abp.DictionaryManagement.Application.Tests.csproj index 596046e..98fcadf 100644 --- a/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.Application.Tests/Passingwind.Abp.DictionaryManagement.Application.Tests.csproj +++ b/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.Application.Tests/Passingwind.Abp.DictionaryManagement.Application.Tests.csproj @@ -3,16 +3,14 @@ - net8.0 + $(Tfw) Passingwind.Abp.DictionaryManagement - - - + + + \ No newline at end of file diff --git a/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.Domain.Tests/DictionaryManagerTests.cs b/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.Domain.Tests/DictionaryManagerTests.cs index ad581e5..04c4441 100644 --- a/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.Domain.Tests/DictionaryManagerTests.cs +++ b/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.Domain.Tests/DictionaryManagerTests.cs @@ -56,7 +56,7 @@ public async Task GroupTest(string name, bool result) [InlineData("a1", "a2", null, false)] [InlineData("a1", "a2", "", false)] [InlineData("a2", "a3", null, true)] - public async Task GroupCreateTest(string name, string displayName, string parentName, bool isPublic) + public async Task GroupCreateTest(string name, string displayName, string? parentName, bool isPublic) { var item = await _dictionaryManager.CreateGroupAsync(name, displayName, parentName, isPublic: isPublic); @@ -69,7 +69,7 @@ public async Task GroupCreateTest(string name, string displayName, string parent [Theory] [InlineData("a1", "a2", null, false)] [InlineData("a2", "a3", null, true)] - public async Task GroupPublicTest(string name, string displayName, string parentName, bool isPublic) + public async Task GroupPublicTest(string name, string displayName, string? parentName, bool isPublic) { await _dictionaryManager.CreateGroupAsync(name, displayName, parentName, isPublic: isPublic); @@ -106,7 +106,7 @@ public async Task ItemTest(string name, bool result) [InlineData("a1", "a2", null, false)] [InlineData("a1", "a2", "", false)] [InlineData("a2", "a3", null, true)] - public async Task ItemCreateTest(string name, string displayName, string parentName, bool isEnabled) + public async Task ItemCreateTest(string name, string displayName, string? parentName, bool isEnabled) { var item = await _dictionaryManager.CreateItemAsync(name, displayName, parentName, isEnabled: isEnabled); @@ -118,7 +118,7 @@ public async Task ItemCreateTest(string name, string displayName, string parentN [Theory] [InlineData("a1", "a2", null, false)] [InlineData("a2", "a3", null, true)] - public async Task ItemEnabledTest(string name, string displayName, string parentName, bool isEnabled) + public async Task ItemEnabledTest(string name, string displayName, string? parentName, bool isEnabled) { await _dictionaryManager.CreateItemAsync(name, displayName, parentName, isEnabled: isEnabled); @@ -136,11 +136,11 @@ public async Task ItemEnabledTest(string name, string displayName, string parent [InlineData("a2", "a2")] [InlineData("a3", "")] [InlineData("a4", null)] - public async Task ItemValueTest(string name, string value) + public async Task ItemValueTest(string name, string? value) { await _dictionaryManager.CreateItemAsync(name, name); - await _dictionaryManager.SetItemValueAsync(name, value); + await _dictionaryManager.SetItemValueAsync(name, value!); var item = await _dictionaryManager.GetItemAsync(name); diff --git a/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.Domain.Tests/Passingwind.Abp.DictionaryManagement.Domain.Tests.csproj b/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.Domain.Tests/Passingwind.Abp.DictionaryManagement.Domain.Tests.csproj index f806451..0a3f256 100644 --- a/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.Domain.Tests/Passingwind.Abp.DictionaryManagement.Domain.Tests.csproj +++ b/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.Domain.Tests/Passingwind.Abp.DictionaryManagement.Domain.Tests.csproj @@ -3,12 +3,12 @@ - net8.0 + $(Tfw) Passingwind.Abp.DictionaryManagement - + diff --git a/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore.Tests/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore.Tests.csproj b/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore.Tests/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore.Tests.csproj index 623f38e..f2cd977 100644 --- a/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore.Tests/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore.Tests.csproj +++ b/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore.Tests/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore.Tests.csproj @@ -3,17 +3,15 @@ - net8.0 + $(Tfw) Passingwind.Abp.DictionaryManagement - - - - + + + + diff --git a/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.MongoDB.Tests/Passingwind.Abp.DictionaryManagement.MongoDB.Tests.csproj b/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.MongoDB.Tests/Passingwind.Abp.DictionaryManagement.MongoDB.Tests.csproj index 5678219..5a99c33 100644 --- a/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.MongoDB.Tests/Passingwind.Abp.DictionaryManagement.MongoDB.Tests.csproj +++ b/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.MongoDB.Tests/Passingwind.Abp.DictionaryManagement.MongoDB.Tests.csproj @@ -3,17 +3,15 @@ - net8.0 + $(Tfw) Passingwind.Abp.DictionaryManagement - - - - + + + + \ No newline at end of file diff --git a/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.TestBase/Passingwind.Abp.DictionaryManagement.TestBase.csproj b/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.TestBase/Passingwind.Abp.DictionaryManagement.TestBase.csproj index b5c543e..abc12db 100644 --- a/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.TestBase/Passingwind.Abp.DictionaryManagement.TestBase.csproj +++ b/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.TestBase/Passingwind.Abp.DictionaryManagement.TestBase.csproj @@ -3,18 +3,18 @@ - net8.0 + $(Tfw) Passingwind.Abp.DictionaryManagement - + - - - + + + diff --git a/modules/file-management/src/Passingwind.Abp.FileManagement.Application/FileManagementAppService.cs b/modules/file-management/src/Passingwind.Abp.FileManagement.Application/FileManagementAppService.cs index b308abc..b5598c3 100644 --- a/modules/file-management/src/Passingwind.Abp.FileManagement.Application/FileManagementAppService.cs +++ b/modules/file-management/src/Passingwind.Abp.FileManagement.Application/FileManagementAppService.cs @@ -20,8 +20,6 @@ protected FileManagementAppService() /// /// Check current identity can access this container /// - /// - /// protected virtual async Task CanAccessContainerAsync(FileContainer container, bool write = false) { bool isGranted = await AuthorizationService.IsGrantedAsync(FileManagementPermissions.FileContainer.Default); @@ -51,10 +49,6 @@ protected virtual async Task CanAccessContainerAsync(FileContainer contain /// /// Check current identity can access this container /// - /// - /// - /// - /// /// protected virtual async Task CheckContainerPermissionAsync(IFileContainerRepository fileContainerRepository, string containerName, string? policyName = null, bool write = false) { @@ -70,9 +64,6 @@ protected virtual async Task CheckContainerPermissionAsync(IFileContainerReposit /// /// Check current identity can access this container /// - /// - /// - /// /// protected virtual async Task CheckContainerPermissionAsync(FileContainer container, string? policyName = null, bool write = false) { diff --git a/modules/file-management/src/Passingwind.Abp.FileManagement.Application/Files/FileAppService.cs b/modules/file-management/src/Passingwind.Abp.FileManagement.Application/Files/FileAppService.cs index 3778451..c948383 100644 --- a/modules/file-management/src/Passingwind.Abp.FileManagement.Application/Files/FileAppService.cs +++ b/modules/file-management/src/Passingwind.Abp.FileManagement.Application/Files/FileAppService.cs @@ -323,8 +323,6 @@ protected virtual async Task CreateFileAsync(FileContainer container, stri /// /// Check current identity can access this container /// - /// - /// protected override async Task CanAccessContainerAsync(FileContainer container, bool write = false) { bool isGranted = await AuthorizationService.IsGrantedAsync(FileManagementPermissions.FileContainer.Default); diff --git a/modules/file-management/src/Passingwind.Abp.FileManagement.Application/Files/FileShareAppService.cs b/modules/file-management/src/Passingwind.Abp.FileManagement.Application/Files/FileShareAppService.cs index 08159ac..cec40c2 100644 --- a/modules/file-management/src/Passingwind.Abp.FileManagement.Application/Files/FileShareAppService.cs +++ b/modules/file-management/src/Passingwind.Abp.FileManagement.Application/Files/FileShareAppService.cs @@ -68,7 +68,7 @@ public virtual async Task GetAsync(string token) File file = validationResult.File; - FileContainer container = await FileContainerRepository.FindAsync(file.ContainerId); + FileContainer? container = await FileContainerRepository.FindAsync(file.ContainerId); return container == null ? throw new BusinessException(FileManagementErrorCodes.ShareFileNotExistsOrExpired) @@ -95,7 +95,7 @@ public virtual async Task GetAsync(string token) File file = validationResult.File; - FileContainer container = await FileContainerRepository.FindAsync(file.ContainerId); + FileContainer? container = await FileContainerRepository.FindAsync(file.ContainerId); if (container == null) { @@ -119,7 +119,7 @@ public virtual async Task GetAsync(string token) File file = validationResult.File; - FileContainer container = await FileContainerRepository.FindAsync(file.ContainerId); + FileContainer? container = await FileContainerRepository.FindAsync(file.ContainerId); return container == null ? throw new BusinessException(FileManagementErrorCodes.ShareFileNotExistsOrExpired) @@ -138,7 +138,7 @@ public virtual async Task GetAsync(string token) File file = validationResult.File; - FileContainer container = await FileContainerRepository.FindAsync(file.ContainerId); + FileContainer? container = await FileContainerRepository.FindAsync(file.ContainerId); return container == null ? throw new BusinessException(FileManagementErrorCodes.ShareFileNotExistsOrExpired) diff --git a/modules/file-management/src/Passingwind.Abp.FileManagement.Application/Passingwind.Abp.FileManagement.Application.csproj b/modules/file-management/src/Passingwind.Abp.FileManagement.Application/Passingwind.Abp.FileManagement.Application.csproj index a5c475d..d3b3532 100644 --- a/modules/file-management/src/Passingwind.Abp.FileManagement.Application/Passingwind.Abp.FileManagement.Application.csproj +++ b/modules/file-management/src/Passingwind.Abp.FileManagement.Application/Passingwind.Abp.FileManagement.Application.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.FileManagement diff --git a/modules/file-management/src/Passingwind.Abp.FileManagement.Domain.Shared/Passingwind.Abp.FileManagement.Domain.Shared.csproj b/modules/file-management/src/Passingwind.Abp.FileManagement.Domain.Shared/Passingwind.Abp.FileManagement.Domain.Shared.csproj index 1c841b3..3035578 100644 --- a/modules/file-management/src/Passingwind.Abp.FileManagement.Domain.Shared/Passingwind.Abp.FileManagement.Domain.Shared.csproj +++ b/modules/file-management/src/Passingwind.Abp.FileManagement.Domain.Shared/Passingwind.Abp.FileManagement.Domain.Shared.csproj @@ -14,7 +14,7 @@ - + diff --git a/modules/file-management/src/Passingwind.Abp.FileManagement.Domain/Files/FileHashDuplicateDetectionProvider.cs b/modules/file-management/src/Passingwind.Abp.FileManagement.Domain/Files/FileHashDuplicateDetectionProvider.cs index c7f4e29..39db74e 100644 --- a/modules/file-management/src/Passingwind.Abp.FileManagement.Domain/Files/FileHashDuplicateDetectionProvider.cs +++ b/modules/file-management/src/Passingwind.Abp.FileManagement.Domain/Files/FileHashDuplicateDetectionProvider.cs @@ -1,5 +1,4 @@ -namespace Passingwind.Abp.FileManagement.Files; - + //public class FileHashDuplicateDetectionProvider : IFileDuplicateDetectionProvider //{ // private readonly IFileRepository _fileRepository; diff --git a/modules/file-management/src/Passingwind.Abp.FileManagement.Domain/Files/IFileInfoCheckProvider.cs b/modules/file-management/src/Passingwind.Abp.FileManagement.Domain/Files/IFileInfoCheckProvider.cs index 0721f8b..710ebac 100644 --- a/modules/file-management/src/Passingwind.Abp.FileManagement.Domain/Files/IFileInfoCheckProvider.cs +++ b/modules/file-management/src/Passingwind.Abp.FileManagement.Domain/Files/IFileInfoCheckProvider.cs @@ -9,8 +9,5 @@ public interface IFileInfoCheckProvider : ITransientDependency /// /// check file or directory when create or update /// - /// - /// - /// Task CheckAsync(FileContainer container, File file, CancellationToken cancellationToken = default); } diff --git a/modules/file-management/src/Passingwind.Abp.FileManagement.Domain/Files/IFileManager.cs b/modules/file-management/src/Passingwind.Abp.FileManagement.Domain/Files/IFileManager.cs index 7efa534..c99039c 100644 --- a/modules/file-management/src/Passingwind.Abp.FileManagement.Domain/Files/IFileManager.cs +++ b/modules/file-management/src/Passingwind.Abp.FileManagement.Domain/Files/IFileManager.cs @@ -13,21 +13,11 @@ public interface IFileManager : IDomainService /// /// Override an exist file with bytes /// - /// - /// - /// - /// Task UpdateFileAsync(FileContainer container, File file, byte[] bytes, CancellationToken cancellationToken = default); /// /// Create an new file with bytes /// - /// - /// - /// - /// - /// - /// Task CreateFileAsync(FileContainer container, string fileName, string mimeType, byte[] bytes, Guid? parentId = null, CancellationToken cancellationToken = default); Task CreateDirectoryAsync(FileContainer container, string name, Guid? parentId, CancellationToken cancellationToken = default); @@ -46,16 +36,11 @@ public interface IFileManager : IDomainService /// /// Delete an file /// - /// - /// - /// Task DeleteAsync(FileContainer container, File file, CancellationToken cancellationToken = default); /// /// Delete all files /// - /// - /// Task ClearContainerFilesAsync(FileContainer container, CancellationToken cancellationToken = default); Task GetFileBytesByFileIdAsync(string containerName, Guid id, CancellationToken cancellationToken = default); diff --git a/modules/file-management/src/Passingwind.Abp.FileManagement.EntityFrameworkCore/Passingwind.Abp.FileManagement.EntityFrameworkCore.csproj b/modules/file-management/src/Passingwind.Abp.FileManagement.EntityFrameworkCore/Passingwind.Abp.FileManagement.EntityFrameworkCore.csproj index a8d48a1..dfc12b8 100644 --- a/modules/file-management/src/Passingwind.Abp.FileManagement.EntityFrameworkCore/Passingwind.Abp.FileManagement.EntityFrameworkCore.csproj +++ b/modules/file-management/src/Passingwind.Abp.FileManagement.EntityFrameworkCore/Passingwind.Abp.FileManagement.EntityFrameworkCore.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.FileManagement diff --git a/modules/file-management/src/Passingwind.Abp.FileManagement.HttpApi/Passingwind.Abp.FileManagement.HttpApi.csproj b/modules/file-management/src/Passingwind.Abp.FileManagement.HttpApi/Passingwind.Abp.FileManagement.HttpApi.csproj index 3f46db6..490796b 100644 --- a/modules/file-management/src/Passingwind.Abp.FileManagement.HttpApi/Passingwind.Abp.FileManagement.HttpApi.csproj +++ b/modules/file-management/src/Passingwind.Abp.FileManagement.HttpApi/Passingwind.Abp.FileManagement.HttpApi.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.FileManagement diff --git a/modules/file-management/src/Passingwind.Abp.FileManagement.MongoDB/MongoDB/Repositories/FileContainerRepository.cs b/modules/file-management/src/Passingwind.Abp.FileManagement.MongoDB/MongoDB/Repositories/FileContainerRepository.cs index dff3742..8fe1238 100644 --- a/modules/file-management/src/Passingwind.Abp.FileManagement.MongoDB/MongoDB/Repositories/FileContainerRepository.cs +++ b/modules/file-management/src/Passingwind.Abp.FileManagement.MongoDB/MongoDB/Repositories/FileContainerRepository.cs @@ -77,7 +77,7 @@ public virtual async Task> GetPagedListAsync(int skipCount, .ToListAsync(cancellationToken); } - public virtual async Task IncrementFileCountAsync(string name, int adjustment=1, CancellationToken cancellationToken = default) + public virtual async Task IncrementFileCountAsync(string name, int adjustment = 1, CancellationToken cancellationToken = default) { var dbContext = await GetDbContextAsync(cancellationToken); var collection = dbContext.Collection(); diff --git a/modules/identity-client/src/Passingwind.Abp.IdentityClient.Application.Contracts/ISaml2AppService.cs b/modules/identity-client/src/Passingwind.Abp.IdentityClient.Application.Contracts/ISaml2AppService.cs index df88c92..b33f3b7 100644 --- a/modules/identity-client/src/Passingwind.Abp.IdentityClient.Application.Contracts/ISaml2AppService.cs +++ b/modules/identity-client/src/Passingwind.Abp.IdentityClient.Application.Contracts/ISaml2AppService.cs @@ -9,14 +9,11 @@ public interface ISaml2AppService : IApplicationService /// /// Response metadata content /// - /// - /// Task GetMetadataDescriptorAsync(Uri baseUri, string name); /// /// Receives a logout request and send a response. /// - /// Task LogoutAsync(string name); ///// diff --git a/modules/identity-client/src/Passingwind.Abp.IdentityClient.Application/Passingwind.Abp.IdentityClient.Application.csproj b/modules/identity-client/src/Passingwind.Abp.IdentityClient.Application/Passingwind.Abp.IdentityClient.Application.csproj index 3636810..e15bead 100644 --- a/modules/identity-client/src/Passingwind.Abp.IdentityClient.Application/Passingwind.Abp.IdentityClient.Application.csproj +++ b/modules/identity-client/src/Passingwind.Abp.IdentityClient.Application/Passingwind.Abp.IdentityClient.Application.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.IdentityClient diff --git a/modules/identity-client/src/Passingwind.Abp.IdentityClient.AspNetCore/Passingwind.Abp.IdentityClient.AspNetCore.csproj b/modules/identity-client/src/Passingwind.Abp.IdentityClient.AspNetCore/Passingwind.Abp.IdentityClient.AspNetCore.csproj index 6471e8a..d75f161 100644 --- a/modules/identity-client/src/Passingwind.Abp.IdentityClient.AspNetCore/Passingwind.Abp.IdentityClient.AspNetCore.csproj +++ b/modules/identity-client/src/Passingwind.Abp.IdentityClient.AspNetCore/Passingwind.Abp.IdentityClient.AspNetCore.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.IdentityClient @@ -14,7 +14,7 @@ - + diff --git a/modules/identity-client/src/Passingwind.Abp.IdentityClient.Domain.Shared/IdentityClientDomainSharedModule.cs b/modules/identity-client/src/Passingwind.Abp.IdentityClient.Domain.Shared/IdentityClientDomainSharedModule.cs index 59a7ee2..fb73939 100644 --- a/modules/identity-client/src/Passingwind.Abp.IdentityClient.Domain.Shared/IdentityClientDomainSharedModule.cs +++ b/modules/identity-client/src/Passingwind.Abp.IdentityClient.Domain.Shared/IdentityClientDomainSharedModule.cs @@ -2,7 +2,6 @@ using Volo.Abp.Localization; using Volo.Abp.Localization.ExceptionHandling; using Volo.Abp.Modularity; -using Volo.Abp.Validation; using Volo.Abp.VirtualFileSystem; namespace Passingwind.Abp.IdentityClient; diff --git a/modules/identity-client/src/Passingwind.Abp.IdentityClient.Domain.Shared/Passingwind.Abp.IdentityClient.Domain.Shared.csproj b/modules/identity-client/src/Passingwind.Abp.IdentityClient.Domain.Shared/Passingwind.Abp.IdentityClient.Domain.Shared.csproj index 1611b71..f697a0b 100644 --- a/modules/identity-client/src/Passingwind.Abp.IdentityClient.Domain.Shared/Passingwind.Abp.IdentityClient.Domain.Shared.csproj +++ b/modules/identity-client/src/Passingwind.Abp.IdentityClient.Domain.Shared/Passingwind.Abp.IdentityClient.Domain.Shared.csproj @@ -15,7 +15,7 @@ - + diff --git a/modules/identity-client/src/Passingwind.Abp.IdentityClient.Domain/Identity/IdentityClaimMapRunner.cs b/modules/identity-client/src/Passingwind.Abp.IdentityClient.Domain/Identity/IdentityClaimMapRunner.cs index 1bbe1d9..e732cdd 100644 --- a/modules/identity-client/src/Passingwind.Abp.IdentityClient.Domain/Identity/IdentityClaimMapRunner.cs +++ b/modules/identity-client/src/Passingwind.Abp.IdentityClient.Domain/Identity/IdentityClaimMapRunner.cs @@ -70,7 +70,7 @@ public virtual Task> RunAsync(IEnumerable source, List x.Type == map.ValueFromType); if (!string.IsNullOrWhiteSpace(value?.Value)) { - return new Claim(map.ClaimType, value?.Value); + return new Claim(map.ClaimType, value.Value); } } return null; diff --git a/modules/identity-client/src/Passingwind.Abp.IdentityClient.Domain/IdentityClientConfigurationHelper.cs b/modules/identity-client/src/Passingwind.Abp.IdentityClient.Domain/IdentityClientConfigurationHelper.cs index f593752..4a6e758 100644 --- a/modules/identity-client/src/Passingwind.Abp.IdentityClient.Domain/IdentityClientConfigurationHelper.cs +++ b/modules/identity-client/src/Passingwind.Abp.IdentityClient.Domain/IdentityClientConfigurationHelper.cs @@ -69,7 +69,7 @@ private static T ToObject(T instance, IEnumerable - net8.0 + $(Tfw) enable Passingwind.Abp.IdentityClient diff --git a/modules/identity-client/src/Passingwind.Abp.IdentityClient.EntityFrameworkCore/Passingwind.Abp.IdentityClient.EntityFrameworkCore.csproj b/modules/identity-client/src/Passingwind.Abp.IdentityClient.EntityFrameworkCore/Passingwind.Abp.IdentityClient.EntityFrameworkCore.csproj index 17a895b..6329bab 100644 --- a/modules/identity-client/src/Passingwind.Abp.IdentityClient.EntityFrameworkCore/Passingwind.Abp.IdentityClient.EntityFrameworkCore.csproj +++ b/modules/identity-client/src/Passingwind.Abp.IdentityClient.EntityFrameworkCore/Passingwind.Abp.IdentityClient.EntityFrameworkCore.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.IdentityClient diff --git a/modules/identity-client/src/Passingwind.Abp.IdentityClient.HttpApi/Passingwind.Abp.IdentityClient.HttpApi.csproj b/modules/identity-client/src/Passingwind.Abp.IdentityClient.HttpApi/Passingwind.Abp.IdentityClient.HttpApi.csproj index 87715a7..e64880b 100644 --- a/modules/identity-client/src/Passingwind.Abp.IdentityClient.HttpApi/Passingwind.Abp.IdentityClient.HttpApi.csproj +++ b/modules/identity-client/src/Passingwind.Abp.IdentityClient.HttpApi/Passingwind.Abp.IdentityClient.HttpApi.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.IdentityClient diff --git a/modules/identity-client/src/Passingwind.Abp.IdentityClient.MongoDB/Passingwind.Abp.IdentityClient.MongoDB.csproj b/modules/identity-client/src/Passingwind.Abp.IdentityClient.MongoDB/Passingwind.Abp.IdentityClient.MongoDB.csproj index a160775..d295621 100644 --- a/modules/identity-client/src/Passingwind.Abp.IdentityClient.MongoDB/Passingwind.Abp.IdentityClient.MongoDB.csproj +++ b/modules/identity-client/src/Passingwind.Abp.IdentityClient.MongoDB/Passingwind.Abp.IdentityClient.MongoDB.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.IdentityClient diff --git a/modules/identity/src/Passingwind.Abp.Identity.Application.Contracts/IdentityPermissionDefinitionProvider.cs b/modules/identity/src/Passingwind.Abp.Identity.Application.Contracts/IdentityPermissionDefinitionProvider.cs index a98ea4c..6de24b6 100644 --- a/modules/identity/src/Passingwind.Abp.Identity.Application.Contracts/IdentityPermissionDefinitionProvider.cs +++ b/modules/identity/src/Passingwind.Abp.Identity.Application.Contracts/IdentityPermissionDefinitionProvider.cs @@ -14,14 +14,14 @@ public override void Define(IPermissionDefinitionContext context) var identityGroup = context.GetGroup(IdentityPermissions.GroupName); var roleGroup = identityGroup.GetPermissionOrNull(IdentityPermissions.Roles.Default); - roleGroup.AddChild(IdentityPermissionNamesV2.Roles.ManageClaims, L("Permission:ManageClaims")); + roleGroup?.AddChild(IdentityPermissionNamesV2.Roles.ManageClaims, L("Permission:ManageClaims")); //roleGroup.AddChild(IdentityPermissionNamesV2.Roles.ChangeHistories, L("Permission:ChangeHistories")); var userGroup = identityGroup.GetPermissionOrNull(IdentityPermissions.Users.Default); - userGroup.AddChild(IdentityPermissionNamesV2.Users.ManageClaims, L("Permission:ManageClaims")); - userGroup.AddChild(IdentityPermissionNamesV2.Users.ManageRoles, L("Permission:ManageRoles")); - userGroup.AddChild(IdentityPermissionNamesV2.Users.ManageOrganizations, L("Permission:ManageOrganizations")); - userGroup.AddChild(IdentityPermissionNamesV2.Users.Impersonation, L("Permission:Users.Impersonation")); + userGroup?.AddChild(IdentityPermissionNamesV2.Users.ManageClaims, L("Permission:ManageClaims")); + userGroup?.AddChild(IdentityPermissionNamesV2.Users.ManageRoles, L("Permission:ManageRoles")); + userGroup?.AddChild(IdentityPermissionNamesV2.Users.ManageOrganizations, L("Permission:ManageOrganizations")); + userGroup?.AddChild(IdentityPermissionNamesV2.Users.Impersonation, L("Permission:Users.Impersonation")); //userGroup.AddChild(IdentityPermissionNamesV2.Users.Import, L("Permission:Import")); //userGroup.AddChild(IdentityPermissionNamesV2.Users.Export, L("Permission:Export")); //userGroup.AddChild(IdentityPermissionNamesV2.Users.ChangeHistories, L("Permission:ChangeHistories")); diff --git a/modules/identity/src/Passingwind.Abp.Identity.Application/IdentityUserV2AppService.cs b/modules/identity/src/Passingwind.Abp.Identity.Application/IdentityUserV2AppService.cs index f726e01..309657a 100644 --- a/modules/identity/src/Passingwind.Abp.Identity.Application/IdentityUserV2AppService.cs +++ b/modules/identity/src/Passingwind.Abp.Identity.Application/IdentityUserV2AppService.cs @@ -318,7 +318,7 @@ public virtual async Task CreateAsync(IdentityUserCreateV2Dto (await UserManager.UpdateAsync(user)).CheckErrors(); - await CurrentUnitOfWork.SaveChangesAsync(); + await CurrentUnitOfWork!.SaveChangesAsync(); return ObjectMapper.Map(user); } @@ -345,7 +345,7 @@ public virtual async Task UpdateAsync(Guid id, IdentityUserUp (await UserManager.AddPasswordAsync(user, input.Password!)).CheckErrors(); } - await CurrentUnitOfWork.SaveChangesAsync(); + await CurrentUnitOfWork!.SaveChangesAsync(); return ObjectMapper.Map(user); } diff --git a/modules/identity/src/Passingwind.Abp.Identity.Application/Passingwind.Abp.Identity.Application.csproj b/modules/identity/src/Passingwind.Abp.Identity.Application/Passingwind.Abp.Identity.Application.csproj index e322317..c9b75f6 100644 --- a/modules/identity/src/Passingwind.Abp.Identity.Application/Passingwind.Abp.Identity.Application.csproj +++ b/modules/identity/src/Passingwind.Abp.Identity.Application/Passingwind.Abp.Identity.Application.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.Identity diff --git a/modules/identity/src/Passingwind.Abp.Identity.AspNetCore/Passingwind.Abp.Identity.AspNetCore.csproj b/modules/identity/src/Passingwind.Abp.Identity.AspNetCore/Passingwind.Abp.Identity.AspNetCore.csproj index 5903e52..96a6db1 100644 --- a/modules/identity/src/Passingwind.Abp.Identity.AspNetCore/Passingwind.Abp.Identity.AspNetCore.csproj +++ b/modules/identity/src/Passingwind.Abp.Identity.AspNetCore/Passingwind.Abp.Identity.AspNetCore.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.Identity diff --git a/modules/identity/src/Passingwind.Abp.Identity.Domain.Shared/Passingwind.Abp.Identity.Domain.Shared.csproj b/modules/identity/src/Passingwind.Abp.Identity.Domain.Shared/Passingwind.Abp.Identity.Domain.Shared.csproj index 704d908..650690b 100644 --- a/modules/identity/src/Passingwind.Abp.Identity.Domain.Shared/Passingwind.Abp.Identity.Domain.Shared.csproj +++ b/modules/identity/src/Passingwind.Abp.Identity.Domain.Shared/Passingwind.Abp.Identity.Domain.Shared.csproj @@ -15,7 +15,7 @@ - + diff --git a/modules/identity/src/Passingwind.Abp.Identity.Domain/IdentityUserTwoFactorManager.cs b/modules/identity/src/Passingwind.Abp.Identity.Domain/IdentityUserTwoFactorManager.cs index ca2f977..6e4aa60 100644 --- a/modules/identity/src/Passingwind.Abp.Identity.Domain/IdentityUserTwoFactorManager.cs +++ b/modules/identity/src/Passingwind.Abp.Identity.Domain/IdentityUserTwoFactorManager.cs @@ -21,7 +21,7 @@ public virtual async Task SetPreferredProviderAsync(IdentityUser user, string pr entity.PreferredProvider = providerName; - await _identityUserTwoFactorRepository.UpdateAsync(entity, true); + await _identityUserTwoFactorRepository.UpdateAsync(entity, true, cancellationToken); } public virtual async Task GetPreferredProviderAsync(IdentityUser user, CancellationToken cancellationToken = default) @@ -37,7 +37,7 @@ public virtual async Task SetEmailTokenEnabledAsync(IdentityUser user, bool enab entity.EmailToken = enabled; - await _identityUserTwoFactorRepository.UpdateAsync(entity, true); + await _identityUserTwoFactorRepository.UpdateAsync(entity, true, cancellationToken); } public virtual async Task SetPhoneNumberTokenEnabledAsync(IdentityUser user, bool enabled, CancellationToken cancellationToken = default) @@ -46,7 +46,7 @@ public virtual async Task SetPhoneNumberTokenEnabledAsync(IdentityUser user, boo entity.PhoneNumberToken = enabled; - await _identityUserTwoFactorRepository.UpdateAsync(entity, true); + await _identityUserTwoFactorRepository.UpdateAsync(entity, true, cancellationToken); } public virtual async Task GetEmailTokenEnabledAsync(IdentityUser user, CancellationToken cancellationToken = default) @@ -71,7 +71,7 @@ protected virtual async Task EnsureEntityAsync(IdentityUs { entity = new IdentityUserTwoFactor(user.Id, tenantId: user.TenantId); - await _identityUserTwoFactorRepository.InsertAsync(entity, true); + await _identityUserTwoFactorRepository.InsertAsync(entity, true, cancellationToken); } return entity; diff --git a/modules/identity/src/Passingwind.Abp.Identity.Domain/Passingwind.Abp.Identity.Domain.csproj b/modules/identity/src/Passingwind.Abp.Identity.Domain/Passingwind.Abp.Identity.Domain.csproj index 3ef272f..6fd88ec 100644 --- a/modules/identity/src/Passingwind.Abp.Identity.Domain/Passingwind.Abp.Identity.Domain.csproj +++ b/modules/identity/src/Passingwind.Abp.Identity.Domain/Passingwind.Abp.Identity.Domain.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.Identity diff --git a/modules/identity/src/Passingwind.Abp.Identity.Domain/TokenProviders/AuthenticatorTokenProviderV2.cs b/modules/identity/src/Passingwind.Abp.Identity.Domain/TokenProviders/AuthenticatorTokenProviderV2.cs index 552feb2..896a58e 100644 --- a/modules/identity/src/Passingwind.Abp.Identity.Domain/TokenProviders/AuthenticatorTokenProviderV2.cs +++ b/modules/identity/src/Passingwind.Abp.Identity.Domain/TokenProviders/AuthenticatorTokenProviderV2.cs @@ -12,8 +12,6 @@ public class AuthenticatorTokenProviderV2 : AuthenticatorTokenProvider /// Checks if a two-factor authentication token can be generated for the specified . /// - /// - /// public override async Task CanGenerateTwoFactorTokenAsync(UserManager manager, TUser user) { var key = await manager.GetAuthenticatorKeyAsync(user); diff --git a/modules/identity/src/Passingwind.Abp.Identity.Domain/TokenProviders/EmailTokenProviderV2.cs b/modules/identity/src/Passingwind.Abp.Identity.Domain/TokenProviders/EmailTokenProviderV2.cs index 6023342..2e9df92 100644 --- a/modules/identity/src/Passingwind.Abp.Identity.Domain/TokenProviders/EmailTokenProviderV2.cs +++ b/modules/identity/src/Passingwind.Abp.Identity.Domain/TokenProviders/EmailTokenProviderV2.cs @@ -25,8 +25,6 @@ public EmailTokenProviderV2(IdentityUserTwoFactorManager userTwoFactorManager, I /// /// Checks if a two-factor authentication token can be generated for the specified . /// - /// - /// /// is null. public override async Task CanGenerateTwoFactorTokenAsync(UserManager manager, TUser user) { diff --git a/modules/identity/src/Passingwind.Abp.Identity.Domain/TokenProviders/PhoneNumberTokenProviderV2.cs b/modules/identity/src/Passingwind.Abp.Identity.Domain/TokenProviders/PhoneNumberTokenProviderV2.cs index 840d9c2..61fc48f 100644 --- a/modules/identity/src/Passingwind.Abp.Identity.Domain/TokenProviders/PhoneNumberTokenProviderV2.cs +++ b/modules/identity/src/Passingwind.Abp.Identity.Domain/TokenProviders/PhoneNumberTokenProviderV2.cs @@ -26,8 +26,6 @@ public PhoneNumberTokenProviderV2(IdentityUserTwoFactorManager userTwoFactorMana /// Returns a flag indicating whether the token provider can generate a token suitable for two-factor authentication token for /// the specified . /// - /// - /// /// is null. public override async Task CanGenerateTwoFactorTokenAsync(UserManager manager, IdentityUser user) { diff --git a/modules/identity/src/Passingwind.Abp.Identity.EntityFrameworkCore/Passingwind.Abp.Identity.EntityFrameworkCore.csproj b/modules/identity/src/Passingwind.Abp.Identity.EntityFrameworkCore/Passingwind.Abp.Identity.EntityFrameworkCore.csproj index 349813b..ba31753 100644 --- a/modules/identity/src/Passingwind.Abp.Identity.EntityFrameworkCore/Passingwind.Abp.Identity.EntityFrameworkCore.csproj +++ b/modules/identity/src/Passingwind.Abp.Identity.EntityFrameworkCore/Passingwind.Abp.Identity.EntityFrameworkCore.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.Identity diff --git a/modules/identity/src/Passingwind.Abp.Identity.HttpApi/Passingwind.Abp.Identity.HttpApi.csproj b/modules/identity/src/Passingwind.Abp.Identity.HttpApi/Passingwind.Abp.Identity.HttpApi.csproj index 61d9d9b..f444354 100644 --- a/modules/identity/src/Passingwind.Abp.Identity.HttpApi/Passingwind.Abp.Identity.HttpApi.csproj +++ b/modules/identity/src/Passingwind.Abp.Identity.HttpApi/Passingwind.Abp.Identity.HttpApi.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.Identity diff --git a/modules/identity/src/Passingwind.Abp.Identity.MongoDB/MongoDB/IdentityMongoDbModule.cs b/modules/identity/src/Passingwind.Abp.Identity.MongoDB/MongoDB/IdentityMongoDbModule.cs index 20395d3..42211bb 100644 --- a/modules/identity/src/Passingwind.Abp.Identity.MongoDB/MongoDB/IdentityMongoDbModule.cs +++ b/modules/identity/src/Passingwind.Abp.Identity.MongoDB/MongoDB/IdentityMongoDbModule.cs @@ -1,5 +1,4 @@ using Microsoft.Extensions.DependencyInjection; -using Passingwind.Abp.Identity.MongoDB.Repositories; using Volo.Abp.Modularity; using Volo.Abp.MongoDB; diff --git a/modules/identity/src/Passingwind.Abp.Identity.MongoDB/Passingwind.Abp.Identity.MongoDB.csproj b/modules/identity/src/Passingwind.Abp.Identity.MongoDB/Passingwind.Abp.Identity.MongoDB.csproj index cc5a3b2..0ee2af0 100644 --- a/modules/identity/src/Passingwind.Abp.Identity.MongoDB/Passingwind.Abp.Identity.MongoDB.csproj +++ b/modules/identity/src/Passingwind.Abp.Identity.MongoDB/Passingwind.Abp.Identity.MongoDB.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) enable Passingwind.Abp.Identity diff --git a/modules/permission-management/src/Passingwind.Abp.PermissionManagement.Application.Contracts/Passingwind.Abp.PermissionManagement.Application.Contracts.csproj b/modules/permission-management/src/Passingwind.Abp.PermissionManagement.Application.Contracts/Passingwind.Abp.PermissionManagement.Application.Contracts.csproj index 5979a24..f24d023 100644 --- a/modules/permission-management/src/Passingwind.Abp.PermissionManagement.Application.Contracts/Passingwind.Abp.PermissionManagement.Application.Contracts.csproj +++ b/modules/permission-management/src/Passingwind.Abp.PermissionManagement.Application.Contracts/Passingwind.Abp.PermissionManagement.Application.Contracts.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) Passingwind.Abp.PermissionManagement diff --git a/modules/permission-management/src/Passingwind.Abp.PermissionManagement.Application/Passingwind.Abp.PermissionManagement.Application.csproj b/modules/permission-management/src/Passingwind.Abp.PermissionManagement.Application/Passingwind.Abp.PermissionManagement.Application.csproj index cf01942..35e3c1c 100644 --- a/modules/permission-management/src/Passingwind.Abp.PermissionManagement.Application/Passingwind.Abp.PermissionManagement.Application.csproj +++ b/modules/permission-management/src/Passingwind.Abp.PermissionManagement.Application/Passingwind.Abp.PermissionManagement.Application.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) Passingwind.Abp.PermissionManagement diff --git a/modules/permission-management/src/Passingwind.Abp.PermissionManagement.Domain.Shared/Passingwind.Abp.PermissionManagement.Domain.Shared.csproj b/modules/permission-management/src/Passingwind.Abp.PermissionManagement.Domain.Shared/Passingwind.Abp.PermissionManagement.Domain.Shared.csproj index 1ed6380..7706ccc 100644 --- a/modules/permission-management/src/Passingwind.Abp.PermissionManagement.Domain.Shared/Passingwind.Abp.PermissionManagement.Domain.Shared.csproj +++ b/modules/permission-management/src/Passingwind.Abp.PermissionManagement.Domain.Shared/Passingwind.Abp.PermissionManagement.Domain.Shared.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) Passingwind.Abp.PermissionManagement true @@ -14,7 +14,7 @@ - + diff --git a/modules/permission-management/src/Passingwind.Abp.PermissionManagement.Domain/EventHandlers/DynamicPermissionLocalEventHander.cs b/modules/permission-management/src/Passingwind.Abp.PermissionManagement.Domain/EventHandlers/DynamicPermissionLocalEventHander.cs index 89a521e..8199a4d 100644 --- a/modules/permission-management/src/Passingwind.Abp.PermissionManagement.Domain/EventHandlers/DynamicPermissionLocalEventHander.cs +++ b/modules/permission-management/src/Passingwind.Abp.PermissionManagement.Domain/EventHandlers/DynamicPermissionLocalEventHander.cs @@ -115,7 +115,7 @@ public virtual async Task HandleEventAsync(EntityUpdatedEventData - net8.0 + $(Tfw) Passingwind.Abp.PermissionManagement diff --git a/modules/permission-management/src/Passingwind.Abp.PermissionManagement.EntityFrameworkCore/Passingwind.Abp.PermissionManagement.EntityFrameworkCore.csproj b/modules/permission-management/src/Passingwind.Abp.PermissionManagement.EntityFrameworkCore/Passingwind.Abp.PermissionManagement.EntityFrameworkCore.csproj index a305796..7be91f7 100644 --- a/modules/permission-management/src/Passingwind.Abp.PermissionManagement.EntityFrameworkCore/Passingwind.Abp.PermissionManagement.EntityFrameworkCore.csproj +++ b/modules/permission-management/src/Passingwind.Abp.PermissionManagement.EntityFrameworkCore/Passingwind.Abp.PermissionManagement.EntityFrameworkCore.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) Passingwind.Abp.PermissionManagement diff --git a/modules/permission-management/src/Passingwind.Abp.PermissionManagement.HttpApi.Client/Passingwind.Abp.PermissionManagement.HttpApi.Client.csproj b/modules/permission-management/src/Passingwind.Abp.PermissionManagement.HttpApi.Client/Passingwind.Abp.PermissionManagement.HttpApi.Client.csproj index 02a4f1f..592dea6 100644 --- a/modules/permission-management/src/Passingwind.Abp.PermissionManagement.HttpApi.Client/Passingwind.Abp.PermissionManagement.HttpApi.Client.csproj +++ b/modules/permission-management/src/Passingwind.Abp.PermissionManagement.HttpApi.Client/Passingwind.Abp.PermissionManagement.HttpApi.Client.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) Passingwind.Abp.PermissionManagement diff --git a/modules/permission-management/src/Passingwind.Abp.PermissionManagement.HttpApi/Passingwind.Abp.PermissionManagement.HttpApi.csproj b/modules/permission-management/src/Passingwind.Abp.PermissionManagement.HttpApi/Passingwind.Abp.PermissionManagement.HttpApi.csproj index 0ea5d58..9fb61c7 100644 --- a/modules/permission-management/src/Passingwind.Abp.PermissionManagement.HttpApi/Passingwind.Abp.PermissionManagement.HttpApi.csproj +++ b/modules/permission-management/src/Passingwind.Abp.PermissionManagement.HttpApi/Passingwind.Abp.PermissionManagement.HttpApi.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) Passingwind.Abp.PermissionManagement diff --git a/modules/permission-management/src/Passingwind.Abp.PermissionManagement.MongoDB/Passingwind.Abp.PermissionManagement.MongoDB.csproj b/modules/permission-management/src/Passingwind.Abp.PermissionManagement.MongoDB/Passingwind.Abp.PermissionManagement.MongoDB.csproj index ad6464a..a98572b 100644 --- a/modules/permission-management/src/Passingwind.Abp.PermissionManagement.MongoDB/Passingwind.Abp.PermissionManagement.MongoDB.csproj +++ b/modules/permission-management/src/Passingwind.Abp.PermissionManagement.MongoDB/Passingwind.Abp.PermissionManagement.MongoDB.csproj @@ -3,7 +3,7 @@ - net8.0 + $(Tfw) Passingwind.Abp.PermissionManagement From 19957b331716d6ec557523188009afbe6f70e9dc Mon Sep 17 00:00:00 2001 From: jxnkwlp Date: Mon, 25 Nov 2024 22:11:25 +0800 Subject: [PATCH 3/3] Bump all module version 1.6.0 --- common.props | 3 ++- modules/account/common.props | 3 +-- modules/api-keys/common.props | 4 ++-- modules/dictionary-management/common.props | 4 ++-- modules/file-management/common.props | 4 ++-- modules/identity-client/common.props | 4 ++-- modules/identity/common.props | 4 ++-- modules/permission-management/common.props | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/common.props b/common.props index dc6507c..e26c0ac 100644 --- a/common.props +++ b/common.props @@ -1,10 +1,11 @@  + enable net9.0 9.0.0 9.0.0 - enable + 1.6.0 diff --git a/modules/account/common.props b/modules/account/common.props index c4eac43..3bf8023 100644 --- a/modules/account/common.props +++ b/modules/account/common.props @@ -6,8 +6,7 @@ an abp module that provider account service, such as login, 2fa, account link, impersonation, settings. abp-module - 1.5.0 - 1.5.0 + $(ModuleVersion) diff --git a/modules/api-keys/common.props b/modules/api-keys/common.props index e95fb2c..15766e7 100644 --- a/modules/api-keys/common.props +++ b/modules/api-keys/common.props @@ -5,8 +5,8 @@ Passingwind.Abp.ApiKey an abp module that provider api key authentication and key management. abp-module, apikey - 1.3.0 - 1.3.0 + $(ModuleVersion) + $(ModuleVersion) diff --git a/modules/dictionary-management/common.props b/modules/dictionary-management/common.props index 6cbb133..dabf304 100644 --- a/modules/dictionary-management/common.props +++ b/modules/dictionary-management/common.props @@ -6,8 +6,8 @@ Passingwind.Abp.DictionaryManagement an abp module that provider dynamic dictionary management service abp-module - 1.3.0 - 1.3.0 + $(ModuleVersion) + $(ModuleVersion) diff --git a/modules/file-management/common.props b/modules/file-management/common.props index e598592..a637a55 100644 --- a/modules/file-management/common.props +++ b/modules/file-management/common.props @@ -5,8 +5,8 @@ Passingwind.Abp.FileManagement an abp module that provider file and file container management. abp-module - 1.3.0 - 1.3.0 + $(ModuleVersion) + $(ModuleVersion) diff --git a/modules/identity-client/common.props b/modules/identity-client/common.props index 07846a0..9f1212b 100644 --- a/modules/identity-client/common.props +++ b/modules/identity-client/common.props @@ -6,8 +6,8 @@ Passingwind.Abp.IdentityClientManagement an abp module that provider dynamic identity provider, support oidc, saml2 abp, abp-module, OIDC, SAML2 - 1.3.0 - 1.3.0 + $(ModuleVersion) + $(ModuleVersion) diff --git a/modules/identity/common.props b/modules/identity/common.props index 9ecf5c7..25406b3 100644 --- a/modules/identity/common.props +++ b/modules/identity/common.props @@ -5,8 +5,8 @@ Passingwind.Abp.Identity an abp module that extend identity service, include settings, organization unit. abp-module - 1.3.0 - 1.3.0 + $(ModuleVersion) + $(ModuleVersion) diff --git a/modules/permission-management/common.props b/modules/permission-management/common.props index 8bfcc34..fa4ccc6 100644 --- a/modules/permission-management/common.props +++ b/modules/permission-management/common.props @@ -6,8 +6,8 @@ Passingwind.Abp.PermissionManagement an abp module that provider dynamic permission management service abp, abp-module - 1.3.0 - 1.3.0 + $(ModuleVersion) + $(ModuleVersion)