From 815d5bab41e921df511d4ae1b0798c064d7a19a9 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Mon, 20 Sep 2021 14:27:52 +0800 Subject: [PATCH 01/12] Update all dependency versions to the latest --- Directory.Build.props | 4 ++-- configureawait.props | 2 +- .../Volo.Abp.AspNetCore.Mvc.UI.csproj | 2 +- .../src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj | 2 +- .../Volo.Abp.BlobStoring.Aws.csproj | 4 ++-- .../Volo.Abp.BlobStoring.Azure.csproj | 2 +- .../Volo.Abp.BlobStoring.FileSystem.csproj | 2 +- .../src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj | 6 +++--- framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj | 4 ++-- framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj | 4 ++-- framework/src/Volo.Abp.Dapper/Volo.Abp.Dapper.csproj | 2 +- .../Volo.Abp.EntityFrameworkCore.MySQL.csproj | 2 +- .../Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj | 2 +- .../Volo.Abp.EntityFrameworkCore.PostgreSql.csproj | 2 +- .../Volo.Abp.FluentValidation.csproj | 2 +- framework/src/Volo.Abp.Kafka/Volo.Abp.Kafka.csproj | 2 +- framework/src/Volo.Abp.Ldap/Volo.Abp.Ldap.csproj | 2 +- .../src/Volo.Abp.MailKit/Volo.Abp.MailKit.csproj | 2 +- framework/src/Volo.Abp.Minify/Volo.Abp.Minify.csproj | 2 +- .../src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj | 2 +- framework/src/Volo.Abp.Quartz/Volo.Abp.Quartz.csproj | 6 +++--- .../src/Volo.Abp.RabbitMQ/Volo.Abp.RabbitMQ.csproj | 2 +- .../Volo.Abp.Sms.Aliyun/Volo.Abp.Sms.Aliyun.csproj | 11 +++++------ .../Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.csproj | 2 +- .../Volo.Abp.TextTemplating.Scriban.csproj | 2 +- framework/src/Volo.Abp.Timing/Volo.Abp.Timing.csproj | 2 +- ....Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.csproj | 2 +- ...Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.csproj | 2 +- ...Storing.Database.Host.ConsoleApp.ConsoleApp.csproj | 2 +- ...panyName.MyProjectName.Blazor.Server.Tiered.csproj | 2 +- .../MyCompanyName.MyProjectName.Blazor.Server.csproj | 2 +- .../MyCompanyName.MyProjectName.DbMigrator.csproj | 2 +- .../MyCompanyName.MyProjectName.HttpApi.Host.csproj | 2 +- ...mpanyName.MyProjectName.HttpApi.HostWithIds.csproj | 2 +- .../MyCompanyName.MyProjectName.IdentityServer.csproj | 2 +- .../MyCompanyName.MyProjectName.Web.Host.csproj | 2 +- .../MyCompanyName.MyProjectName.Web.csproj | 2 +- ...CompanyName.MyProjectName.Application.Tests.csproj | 2 +- .../MyCompanyName.MyProjectName.Domain.Tests.csproj | 2 +- ...ame.MyProjectName.EntityFrameworkCore.Tests.csproj | 2 +- .../MyCompanyName.MyProjectName.MongoDB.Tests.csproj | 4 ++-- .../MyCompanyName.MyProjectName.TestBase.csproj | 2 +- .../MyCompanyName.MyProjectName.Web.Tests.csproj | 2 +- .../MyCompanyName.MyProjectName.csproj | 2 +- templates/module/aspnet-core/common.props | 2 +- ...ompanyName.MyProjectName.Blazor.Server.Host.csproj | 2 +- .../MyCompanyName.MyProjectName.HttpApi.Host.csproj | 2 +- .../MyCompanyName.MyProjectName.IdentityServer.csproj | 2 +- .../MyCompanyName.MyProjectName.Web.Host.csproj | 2 +- .../MyCompanyName.MyProjectName.Web.Unified.csproj | 2 +- ...CompanyName.MyProjectName.Application.Tests.csproj | 2 +- .../MyCompanyName.MyProjectName.Domain.Tests.csproj | 2 +- ...ame.MyProjectName.EntityFrameworkCore.Tests.csproj | 2 +- .../MyCompanyName.MyProjectName.MongoDB.Tests.csproj | 4 ++-- .../MyCompanyName.MyProjectName.TestBase.csproj | 2 +- .../MyCompanyName.MyProjectName.csproj | 2 +- test/DistEvents/DistDemoApp/DistDemoApp.csproj | 2 +- 57 files changed, 71 insertions(+), 72 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index e14b4c3bc4..261be160a9 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -5,7 +5,7 @@ 6.0.0-rc.* - 16.9.1 + 16.11.0 4.2.2 @@ -23,7 +23,7 @@ 2.4.3 - 3.1.1 + 3.1.3 \ No newline at end of file diff --git a/configureawait.props b/configureawait.props index 8b0b7f5933..b0cf9ef298 100644 --- a/configureawait.props +++ b/configureawait.props @@ -1,7 +1,7 @@ - + All runtime; build; native; contentfiles; analyzers diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj index 205e63d3a8..96dd3f826a 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj @@ -15,7 +15,7 @@ - + diff --git a/framework/src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj b/framework/src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj index cd3c6bd2fb..05259475f3 100644 --- a/framework/src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj +++ b/framework/src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj @@ -15,7 +15,7 @@ - + diff --git a/framework/src/Volo.Abp.BlobStoring.Aws/Volo.Abp.BlobStoring.Aws.csproj b/framework/src/Volo.Abp.BlobStoring.Aws/Volo.Abp.BlobStoring.Aws.csproj index 76692b5653..94bc8be064 100644 --- a/framework/src/Volo.Abp.BlobStoring.Aws/Volo.Abp.BlobStoring.Aws.csproj +++ b/framework/src/Volo.Abp.BlobStoring.Aws/Volo.Abp.BlobStoring.Aws.csproj @@ -17,8 +17,8 @@ - - + + diff --git a/framework/src/Volo.Abp.BlobStoring.Azure/Volo.Abp.BlobStoring.Azure.csproj b/framework/src/Volo.Abp.BlobStoring.Azure/Volo.Abp.BlobStoring.Azure.csproj index 3273ae33c8..c2f1f3e44a 100644 --- a/framework/src/Volo.Abp.BlobStoring.Azure/Volo.Abp.BlobStoring.Azure.csproj +++ b/framework/src/Volo.Abp.BlobStoring.Azure/Volo.Abp.BlobStoring.Azure.csproj @@ -16,7 +16,7 @@ - + diff --git a/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo.Abp.BlobStoring.FileSystem.csproj b/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo.Abp.BlobStoring.FileSystem.csproj index 65242db157..8f81808a76 100644 --- a/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo.Abp.BlobStoring.FileSystem.csproj +++ b/framework/src/Volo.Abp.BlobStoring.FileSystem/Volo.Abp.BlobStoring.FileSystem.csproj @@ -16,7 +16,7 @@ - + diff --git a/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj b/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj index 76abf2d095..dc6d9cacad 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj +++ b/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj @@ -14,13 +14,13 @@ - + - + - + diff --git a/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj b/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj index 4d3be9ccb4..de3ed40924 100644 --- a/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj +++ b/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj b/framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj index 9b007ca69c..b0dd6cd872 100644 --- a/framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj +++ b/framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj @@ -26,9 +26,9 @@ - + - + diff --git a/framework/src/Volo.Abp.Dapper/Volo.Abp.Dapper.csproj b/framework/src/Volo.Abp.Dapper/Volo.Abp.Dapper.csproj index 91ff215792..140379599a 100644 --- a/framework/src/Volo.Abp.Dapper/Volo.Abp.Dapper.csproj +++ b/framework/src/Volo.Abp.Dapper/Volo.Abp.Dapper.csproj @@ -19,7 +19,7 @@ - + diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.csproj b/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.csproj index ff205f4670..0c98c467da 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.csproj +++ b/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.csproj @@ -19,7 +19,7 @@ - + diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj index c7bc5befdd..9d8766eb1f 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj +++ b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj @@ -19,7 +19,7 @@ - + diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj b/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj index 50f9207ef0..5704a8a2c0 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj +++ b/framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj @@ -19,7 +19,7 @@ - + diff --git a/framework/src/Volo.Abp.FluentValidation/Volo.Abp.FluentValidation.csproj b/framework/src/Volo.Abp.FluentValidation/Volo.Abp.FluentValidation.csproj index f42977cd75..9389183d6f 100644 --- a/framework/src/Volo.Abp.FluentValidation/Volo.Abp.FluentValidation.csproj +++ b/framework/src/Volo.Abp.FluentValidation/Volo.Abp.FluentValidation.csproj @@ -15,7 +15,7 @@ - + diff --git a/framework/src/Volo.Abp.Kafka/Volo.Abp.Kafka.csproj b/framework/src/Volo.Abp.Kafka/Volo.Abp.Kafka.csproj index b14caecacb..156feea359 100644 --- a/framework/src/Volo.Abp.Kafka/Volo.Abp.Kafka.csproj +++ b/framework/src/Volo.Abp.Kafka/Volo.Abp.Kafka.csproj @@ -9,7 +9,7 @@ - + diff --git a/framework/src/Volo.Abp.Ldap/Volo.Abp.Ldap.csproj b/framework/src/Volo.Abp.Ldap/Volo.Abp.Ldap.csproj index 584c3e74c0..68651c1c86 100644 --- a/framework/src/Volo.Abp.Ldap/Volo.Abp.Ldap.csproj +++ b/framework/src/Volo.Abp.Ldap/Volo.Abp.Ldap.csproj @@ -15,7 +15,7 @@ - + diff --git a/framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.csproj b/framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.csproj index 94c9411bc2..acea499215 100644 --- a/framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.csproj +++ b/framework/src/Volo.Abp.MailKit/Volo.Abp.MailKit.csproj @@ -15,7 +15,7 @@ - + diff --git a/framework/src/Volo.Abp.Minify/Volo.Abp.Minify.csproj b/framework/src/Volo.Abp.Minify/Volo.Abp.Minify.csproj index 6bb0997c87..3b1b302946 100644 --- a/framework/src/Volo.Abp.Minify/Volo.Abp.Minify.csproj +++ b/framework/src/Volo.Abp.Minify/Volo.Abp.Minify.csproj @@ -19,7 +19,7 @@ - + diff --git a/framework/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj b/framework/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj index 1888ddf869..d72f308510 100644 --- a/framework/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj +++ b/framework/src/Volo.Abp.MongoDB/Volo.Abp.MongoDB.csproj @@ -15,7 +15,7 @@ - + diff --git a/framework/src/Volo.Abp.Quartz/Volo.Abp.Quartz.csproj b/framework/src/Volo.Abp.Quartz/Volo.Abp.Quartz.csproj index 3566c9fabb..ce9131fb35 100644 --- a/framework/src/Volo.Abp.Quartz/Volo.Abp.Quartz.csproj +++ b/framework/src/Volo.Abp.Quartz/Volo.Abp.Quartz.csproj @@ -15,9 +15,9 @@ - - - + + + diff --git a/framework/src/Volo.Abp.RabbitMQ/Volo.Abp.RabbitMQ.csproj b/framework/src/Volo.Abp.RabbitMQ/Volo.Abp.RabbitMQ.csproj index abec7828ab..7876bdb0b7 100644 --- a/framework/src/Volo.Abp.RabbitMQ/Volo.Abp.RabbitMQ.csproj +++ b/framework/src/Volo.Abp.RabbitMQ/Volo.Abp.RabbitMQ.csproj @@ -15,7 +15,7 @@ - + diff --git a/framework/src/Volo.Abp.Sms.Aliyun/Volo.Abp.Sms.Aliyun.csproj b/framework/src/Volo.Abp.Sms.Aliyun/Volo.Abp.Sms.Aliyun.csproj index 83cea09848..039a21d1e2 100644 --- a/framework/src/Volo.Abp.Sms.Aliyun/Volo.Abp.Sms.Aliyun.csproj +++ b/framework/src/Volo.Abp.Sms.Aliyun/Volo.Abp.Sms.Aliyun.csproj @@ -1,6 +1,6 @@ - - + + netstandard2.0 @@ -10,16 +10,15 @@ false false false - + - + - - + diff --git a/framework/src/Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.csproj b/framework/src/Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.csproj index 39757f8454..6b87fe3751 100644 --- a/framework/src/Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.csproj +++ b/framework/src/Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.csproj @@ -15,7 +15,7 @@ - + diff --git a/framework/src/Volo.Abp.TextTemplating.Scriban/Volo.Abp.TextTemplating.Scriban.csproj b/framework/src/Volo.Abp.TextTemplating.Scriban/Volo.Abp.TextTemplating.Scriban.csproj index 4581050b6a..df1c7fec7f 100644 --- a/framework/src/Volo.Abp.TextTemplating.Scriban/Volo.Abp.TextTemplating.Scriban.csproj +++ b/framework/src/Volo.Abp.TextTemplating.Scriban/Volo.Abp.TextTemplating.Scriban.csproj @@ -13,7 +13,7 @@ - + diff --git a/framework/src/Volo.Abp.Timing/Volo.Abp.Timing.csproj b/framework/src/Volo.Abp.Timing/Volo.Abp.Timing.csproj index 30206bb255..26f61b230c 100644 --- a/framework/src/Volo.Abp.Timing/Volo.Abp.Timing.csproj +++ b/framework/src/Volo.Abp.Timing/Volo.Abp.Timing.csproj @@ -25,7 +25,7 @@ - + diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.csproj b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.csproj index d7011a5982..fe3a18f578 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.csproj +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.csproj @@ -21,7 +21,7 @@ - + diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.csproj b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.csproj index 74956778e6..490b1f651e 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.csproj +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.csproj @@ -18,7 +18,7 @@ - + diff --git a/modules/blob-storing-database/host/BlobStoring.Database.Host.ConsoleApp/src/BlobStoring.Database.Host.ConsoleApp.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.ConsoleApp.csproj b/modules/blob-storing-database/host/BlobStoring.Database.Host.ConsoleApp/src/BlobStoring.Database.Host.ConsoleApp.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.ConsoleApp.csproj index 2a15590cb2..fbb60d2c6b 100644 --- a/modules/blob-storing-database/host/BlobStoring.Database.Host.ConsoleApp/src/BlobStoring.Database.Host.ConsoleApp.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.ConsoleApp.csproj +++ b/modules/blob-storing-database/host/BlobStoring.Database.Host.ConsoleApp/src/BlobStoring.Database.Host.ConsoleApp.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.ConsoleApp.csproj @@ -22,7 +22,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj index 51edd9276c..957a21133d 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj @@ -16,7 +16,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj index fbfff14538..8e0e4fb9a1 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj @@ -16,7 +16,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj index f6243f97ba..85c4a0b8a0 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj @@ -18,7 +18,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj index bbcae3e2b2..8041e654cf 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj @@ -11,7 +11,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj index 5359c3d010..5fbd48f168 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj @@ -11,7 +11,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj index 4712daf542..1fce1e3300 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj @@ -32,7 +32,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj index 4737f9a746..58156811c1 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj @@ -16,7 +16,7 @@ - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj index 22c7760681..976724f276 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj @@ -32,7 +32,7 @@ - + diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj index a6c9600d35..aa6e9dd689 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj @@ -13,7 +13,7 @@ - + diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj index 3555ab2f8f..6657fa42f4 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj index 0c02048b87..2800b17595 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj @@ -14,7 +14,7 @@ - + diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj index 1fa143e4f5..cba983970a 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj index d548c8fa51..2580f1c57e 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj @@ -15,7 +15,7 @@ - + diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyCompanyName.MyProjectName.Web.Tests.csproj b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyCompanyName.MyProjectName.Web.Tests.csproj index 4c87bb24da..964309fec9 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyCompanyName.MyProjectName.Web.Tests.csproj +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyCompanyName.MyProjectName.Web.Tests.csproj @@ -13,7 +13,7 @@ - + diff --git a/templates/console/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj b/templates/console/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj index 22dc8171c6..1a7f8b556d 100644 --- a/templates/console/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj +++ b/templates/console/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj @@ -14,7 +14,7 @@ - + diff --git a/templates/module/aspnet-core/common.props b/templates/module/aspnet-core/common.props index 01eae141c7..87cf88dc65 100644 --- a/templates/module/aspnet-core/common.props +++ b/templates/module/aspnet-core/common.props @@ -8,7 +8,7 @@ - + All runtime; build; native; contentfiles; analyzers diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj index b97bcb2f7e..779c5ac57a 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj @@ -15,7 +15,7 @@ - + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj index 41529b7b4a..392b4eeeb0 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj @@ -11,7 +11,7 @@ - + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj index 6921ac3af0..c55a8af820 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj @@ -11,7 +11,7 @@ - + all diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj index 3407a44f2c..8ebd636810 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj @@ -11,7 +11,7 @@ - + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj index fa9eb63367..5792a83a43 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/MyCompanyName.MyProjectName.Web.Unified.csproj @@ -11,7 +11,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj index 897dd312a6..20269aa37b 100644 --- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Application.Tests/MyCompanyName.MyProjectName.Application.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj index 57541159f6..aa03ce2497 100644 --- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj index df563104bb..80f76340c0 100644 --- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj index 3ce40c8f0c..9d62fb7d38 100644 --- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj index 8d8b6a7f0c..9e49ab428f 100644 --- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.TestBase/MyCompanyName.MyProjectName.TestBase.csproj @@ -8,7 +8,7 @@ - + diff --git a/templates/wpf/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj b/templates/wpf/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj index d716303e11..a99e36c988 100644 --- a/templates/wpf/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj +++ b/templates/wpf/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj @@ -15,7 +15,7 @@ - + diff --git a/test/DistEvents/DistDemoApp/DistDemoApp.csproj b/test/DistEvents/DistDemoApp/DistDemoApp.csproj index 9695a92f04..3c519b49d1 100644 --- a/test/DistEvents/DistDemoApp/DistDemoApp.csproj +++ b/test/DistEvents/DistDemoApp/DistDemoApp.csproj @@ -8,7 +8,7 @@ - + From e8126cd0609166baa2a88f2a120cc699dacc3f30 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Mon, 20 Sep 2021 17:02:44 +0800 Subject: [PATCH 02/12] Update NuGet packages to the latest --- .../Volo.Abp.BackgroundJobs.DemoApp.Quartz.csproj | 2 +- .../Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj | 2 +- ...BlobStoring.Database.Host.ConsoleApp.ConsoleApp.csproj | 4 ++-- .../app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj | 6 +++--- .../Volo.Blogging.Admin.Web.csproj | 2 +- .../src/Volo.Blogging.Web/Volo.Blogging.Web.csproj | 2 +- .../Volo.ClientSimulation.Demo.csproj | 4 ++-- .../Volo.CmsKit.HttpApi.Host.csproj | 8 ++++---- .../Volo.CmsKit.IdentityServer.csproj | 6 +++--- .../host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.csproj | 6 +++--- .../Volo.CmsKit.Web.Unified.csproj | 4 ++-- .../Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj | 2 +- modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj | 6 +++--- .../Volo.Docs.Domain.Shared.csproj | 2 +- modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj | 4 ++-- modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj | 4 ++-- .../Volo.Abp.IdentityServer.Domain.csproj | 2 +- .../Volo.Abp.SettingManagement.DemoApp.csproj | 6 +++--- .../Volo.Abp.VirtualFileExplorer.DemoApp.csproj | 4 ++-- .../MyCompanyName.MyProjectName.DbMigrator.csproj | 4 ++-- .../MyCompanyName.MyProjectName.csproj | 4 ++-- .../MyCompanyName.MyProjectName.csproj | 2 +- test/DistEvents/DistDemoApp/DistDemoApp.csproj | 4 ++-- 23 files changed, 45 insertions(+), 45 deletions(-) diff --git a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.Quartz/Volo.Abp.BackgroundJobs.DemoApp.Quartz.csproj b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.Quartz/Volo.Abp.BackgroundJobs.DemoApp.Quartz.csproj index 4a1bb8303d..9d96010a1b 100644 --- a/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.Quartz/Volo.Abp.BackgroundJobs.DemoApp.Quartz.csproj +++ b/modules/background-jobs/app/Volo.Abp.BackgroundJobs.DemoApp.Quartz/Volo.Abp.BackgroundJobs.DemoApp.Quartz.csproj @@ -6,7 +6,7 @@ - + diff --git a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj index 7f05af8016..25ccdc747e 100644 --- a/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj +++ b/modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj @@ -10,7 +10,7 @@ - + diff --git a/modules/blob-storing-database/host/BlobStoring.Database.Host.ConsoleApp/src/BlobStoring.Database.Host.ConsoleApp.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.ConsoleApp.csproj b/modules/blob-storing-database/host/BlobStoring.Database.Host.ConsoleApp/src/BlobStoring.Database.Host.ConsoleApp.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.ConsoleApp.csproj index fbb60d2c6b..ef767dab68 100644 --- a/modules/blob-storing-database/host/BlobStoring.Database.Host.ConsoleApp/src/BlobStoring.Database.Host.ConsoleApp.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.ConsoleApp.csproj +++ b/modules/blob-storing-database/host/BlobStoring.Database.Host.ConsoleApp/src/BlobStoring.Database.Host.ConsoleApp.ConsoleApp/BlobStoring.Database.Host.ConsoleApp.ConsoleApp.csproj @@ -23,8 +23,8 @@ - - + + diff --git a/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj b/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj index 76186b55a8..97ad545ddb 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj +++ b/modules/blogging/app/Volo.BloggingTestApp/Volo.BloggingTestApp.csproj @@ -15,9 +15,9 @@ - - - + + + diff --git a/modules/blogging/src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.csproj b/modules/blogging/src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.csproj index 341cf01c83..e6a2f6c2fe 100644 --- a/modules/blogging/src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.csproj +++ b/modules/blogging/src/Volo.Blogging.Admin.Web/Volo.Blogging.Admin.Web.csproj @@ -20,7 +20,7 @@ - + diff --git a/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj b/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj index 81c9a15c19..ca504b6800 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj +++ b/modules/blogging/src/Volo.Blogging.Web/Volo.Blogging.Web.csproj @@ -20,7 +20,7 @@ - + diff --git a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj index 21bf8ebf5d..47cac805fd 100644 --- a/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj +++ b/modules/client-simulation/demo/Volo.ClientSimulation.Demo/Volo.ClientSimulation.Demo.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.csproj b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.csproj index 646828b228..f72684cfa5 100644 --- a/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.csproj +++ b/modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.csproj @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Volo.CmsKit.IdentityServer.csproj b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Volo.CmsKit.IdentityServer.csproj index d840257465..25c253de40 100644 --- a/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Volo.CmsKit.IdentityServer.csproj +++ b/modules/cms-kit/host/Volo.CmsKit.IdentityServer/Volo.CmsKit.IdentityServer.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.csproj b/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.csproj index d6275bb3b7..4432a79f55 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.csproj +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Host/Volo.CmsKit.Web.Host.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.csproj b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.csproj index 70fe0968ce..bd172561ca 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.csproj +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/Volo.CmsKit.Web.Unified.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj index 9e3e272063..5ab0e7bf44 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj +++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj @@ -16,7 +16,7 @@ - + diff --git a/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj b/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj index 8b103d8f94..d557d273c9 100644 --- a/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj +++ b/modules/docs/app/VoloDocs.Web/VoloDocs.Web.csproj @@ -17,9 +17,9 @@ - - - + + + diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo.Docs.Domain.Shared.csproj b/modules/docs/src/Volo.Docs.Domain.Shared/Volo.Docs.Domain.Shared.csproj index 3ace59af1e..57b75baa39 100644 --- a/modules/docs/src/Volo.Docs.Domain.Shared/Volo.Docs.Domain.Shared.csproj +++ b/modules/docs/src/Volo.Docs.Domain.Shared/Volo.Docs.Domain.Shared.csproj @@ -11,7 +11,7 @@ - + diff --git a/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj b/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj index 79f6a77679..b68893b40b 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj +++ b/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj b/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj index b5b274e33e..1795b0f9b8 100644 --- a/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj +++ b/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj @@ -21,8 +21,8 @@ - - + + diff --git a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.csproj b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.csproj index 6ebc61c30e..525cea6871 100644 --- a/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.csproj +++ b/modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo.Abp.IdentityServer.Domain.csproj @@ -25,7 +25,7 @@ - + diff --git a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/Volo.Abp.SettingManagement.DemoApp.csproj b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/Volo.Abp.SettingManagement.DemoApp.csproj index 7703e724bf..e222e6b98e 100644 --- a/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/Volo.Abp.SettingManagement.DemoApp.csproj +++ b/modules/setting-management/app/Volo.Abp.SettingManagement.DemoApp/Volo.Abp.SettingManagement.DemoApp.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/Volo.Abp.VirtualFileExplorer.DemoApp.csproj b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/Volo.Abp.VirtualFileExplorer.DemoApp.csproj index a09e088a30..5d3d56720d 100644 --- a/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/Volo.Abp.VirtualFileExplorer.DemoApp.csproj +++ b/modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/Volo.Abp.VirtualFileExplorer.DemoApp.csproj @@ -6,9 +6,9 @@ - + - + diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj index 85c4a0b8a0..7ee3d93b80 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj @@ -19,8 +19,8 @@ - - + + diff --git a/templates/console/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj b/templates/console/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj index 1a7f8b556d..eb878dd72c 100644 --- a/templates/console/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj +++ b/templates/console/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/templates/wpf/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj b/templates/wpf/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj index a99e36c988..36c8329d49 100644 --- a/templates/wpf/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj +++ b/templates/wpf/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj @@ -16,7 +16,7 @@ - + diff --git a/test/DistEvents/DistDemoApp/DistDemoApp.csproj b/test/DistEvents/DistDemoApp/DistDemoApp.csproj index 3c519b49d1..26077529ea 100644 --- a/test/DistEvents/DistDemoApp/DistDemoApp.csproj +++ b/test/DistEvents/DistDemoApp/DistDemoApp.csproj @@ -9,8 +9,8 @@ - - + + From 4fa617a633f81e5d1109ec15e3d145dfd09cf11c Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Mon, 20 Sep 2021 17:09:04 +0800 Subject: [PATCH 03/12] Update Volo.Abp.EntityFrameworkCore.MySQL.csproj --- .../Volo.Abp.EntityFrameworkCore.MySQL.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.csproj b/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.csproj index 0c98c467da..7394d03b33 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.csproj +++ b/framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.csproj @@ -19,7 +19,7 @@ - + From dba16280a33e0e0dc92d92c4d8cb6efa0f8dfb06 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Mon, 20 Sep 2021 17:56:58 +0800 Subject: [PATCH 04/12] Disable publishing oracle packages --- .../Volo.Abp.EntityFrameworkCore.Oracle.csproj | 2 +- nupkg/common.ps1 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.csproj b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.csproj index f35ee22f82..87bab3aaa9 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.csproj +++ b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.csproj @@ -19,7 +19,7 @@ - + diff --git a/nupkg/common.ps1 b/nupkg/common.ps1 index df0d99b19c..7e357fa64b 100644 --- a/nupkg/common.ps1 +++ b/nupkg/common.ps1 @@ -94,8 +94,8 @@ $projects = ( "framework/src/Volo.Abp.Emailing", "framework/src/Volo.Abp.EntityFrameworkCore", "framework/src/Volo.Abp.EntityFrameworkCore.MySQL", - "framework/src/Volo.Abp.EntityFrameworkCore.Oracle", - "framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart", + # "framework/src/Volo.Abp.EntityFrameworkCore.Oracle", + # "framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart", "framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql", "framework/src/Volo.Abp.EntityFrameworkCore.Sqlite", "framework/src/Volo.Abp.EntityFrameworkCore.SqlServer", From 11d8391157c4d79735aadb217de894203a6a6326 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Mon, 20 Sep 2021 20:55:17 +0800 Subject: [PATCH 05/12] Upgrade HtmlAgilityPack --- .../MyCompanyName.MyProjectName.Web.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyCompanyName.MyProjectName.Web.Tests.csproj b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyCompanyName.MyProjectName.Web.Tests.csproj index 964309fec9..2d98f18334 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyCompanyName.MyProjectName.Web.Tests.csproj +++ b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyCompanyName.MyProjectName.Web.Tests.csproj @@ -14,7 +14,7 @@ - + From 87de01471e9847b4f3a2e25f9e092163591feeb9 Mon Sep 17 00:00:00 2001 From: maliming Date: Wed, 22 Sep 2021 14:16:57 +0800 Subject: [PATCH 06/12] Upgrade Scriban to 4.0.2 --- .../Volo.Abp.TextTemplating.Scriban.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.TextTemplating.Scriban/Volo.Abp.TextTemplating.Scriban.csproj b/framework/src/Volo.Abp.TextTemplating.Scriban/Volo.Abp.TextTemplating.Scriban.csproj index df1c7fec7f..bd14d4fd21 100644 --- a/framework/src/Volo.Abp.TextTemplating.Scriban/Volo.Abp.TextTemplating.Scriban.csproj +++ b/framework/src/Volo.Abp.TextTemplating.Scriban/Volo.Abp.TextTemplating.Scriban.csproj @@ -13,7 +13,7 @@ - + From 9ce38f5cb42dbc30691c25498ad49fda1ef977f1 Mon Sep 17 00:00:00 2001 From: maliming Date: Sat, 25 Sep 2021 15:54:41 +0800 Subject: [PATCH 07/12] How to override localization strings of depending modules Resolve #10080 --- .../1.png | Bin 0 -> 32743 bytes .../2.png | Bin 0 -> 26738 bytes .../POST.md | 88 ++++++++++++++++++ 3 files changed, 88 insertions(+) create mode 100644 docs/en/Community-Articles/2021-09-25-How-to-Override-Localization-Strings-Of-Depending-Modules/1.png create mode 100644 docs/en/Community-Articles/2021-09-25-How-to-Override-Localization-Strings-Of-Depending-Modules/2.png create mode 100644 docs/en/Community-Articles/2021-09-25-How-to-Override-Localization-Strings-Of-Depending-Modules/POST.md diff --git a/docs/en/Community-Articles/2021-09-25-How-to-Override-Localization-Strings-Of-Depending-Modules/1.png b/docs/en/Community-Articles/2021-09-25-How-to-Override-Localization-Strings-Of-Depending-Modules/1.png new file mode 100644 index 0000000000000000000000000000000000000000..adb430b2ceed3b13461aa601906c5e331fa9506c GIT binary patch literal 32743 zcmc$`1yof3-v5ha=ZD(NZ+55X=zOT>g{n;T(3R2I|iO^9{P@Vy$#Z^#H?gLR!?v*}y zjC_a2q{I%nxaXuIC5lqiPXb52cxe7s{w)g1�%D?;jywquEQpb3#GEr@sAn52ymz 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 b?cII*Kb^S=KY54jDF#!~RxVP!e((PPi0kha literal 0 HcmV?d00001 diff --git a/docs/en/Community-Articles/2021-09-25-How-to-Override-Localization-Strings-Of-Depending-Modules/2.png b/docs/en/Community-Articles/2021-09-25-How-to-Override-Localization-Strings-Of-Depending-Modules/2.png new file mode 100644 index 0000000000000000000000000000000000000000..8d617c0367bc16c8621ac7d94356330540c1b88c GIT binary patch literal 26738 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

Ak&*HxUQkKkrfcN4nPg|W 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 MiKTJ%uYW%If9#)BYXATM literal 0 HcmV?d00001 diff --git a/docs/en/Community-Articles/2021-09-25-How-to-Override-Localization-Strings-Of-Depending-Modules/POST.md b/docs/en/Community-Articles/2021-09-25-How-to-Override-Localization-Strings-Of-Depending-Modules/POST.md new file mode 100644 index 0000000000..cb1b21d7fd --- /dev/null +++ b/docs/en/Community-Articles/2021-09-25-How-to-Override-Localization-Strings-Of-Depending-Modules/POST.md @@ -0,0 +1,88 @@ +# How to override localization strings of depending modules + +## Source Code + +You can find the source of the example solution used in this article [here](https://github.com/abpframework/abp-samples/tree/master/DocumentationSamples/ExtendLocalizationResource). + +## Getting Started + +This example is based on the following document +https://docs.abp.io/en/abp/latest/Localization#extending-existing-resource + +We will change the default `DisplayName:Abp.Timing.Timezone` and `Description:Abp.Timing.Timezone` of [`AbpTimingResource`](https://github.com/abpframework/abp/blob/dev/framework/src/Volo.Abp.Timing/Volo/Abp/Timing/Localization/AbpTimingResource.cs) and add localized text in [Russian language(`ru`)](https://github.com/abpframework/abp/blob/dev/framework/src/Volo.Abp.Timing/Volo/Abp/Timing/Localization/en.json). + +I created the `AbpTiming` folder in the `Localization` directory of the `ExtendLocalizationResource.Domain.Shared` project. + +Create `en.json` and `ru.json` in its directory. + +`en.json` +```json +{ + "culture": "en", + "texts": { + "DisplayName:Abp.Timing.Timezone": "My Time zone", + "Description:Abp.Timing.Timezone": "My Application time zone" + } +} +``` + +`ru.json` +```json +{ + "culture": "ru", + "texts": { + "DisplayName:Abp.Timing.Timezone": "Часовой пояс", + "Description:Abp.Timing.Timezone": "Часовой пояс приложения" + } +} +``` + +![](1.png) + +We have below content in `ExtendLocalizationResource.Domain.Shared.csproj` file, See [Virtual-File-System](https://docs.abp.io/en/abp/latest/Virtual-File-System#working-with-the-embedded-files) understand how it works. + +```xml + + + + + + + + +``` + +Change the code of the `ConfigureServices` method in `ExtendLocalizationResourceDomainSharedModule`. + +```cs +Configure(options => +{ + options.Resources + .Add("en") + .AddBaseTypes(typeof(AbpValidationResource)) + .AddVirtualJson("/Localization/ExtendLocalizationResource"); + + //add following code + options.Resources + .Get() + .AddVirtualJson("/Localization/AbpTiming"); + + options.DefaultResourceType = typeof(ExtendLocalizationResourceResource); +}); +``` + +Execute `ExtendLocalizationResource.DbMigrator` to migrate the database and run `ExtendLocalizationResource.Web`. + +We have changed the English localization text and added Russian localization. + +### Index page + +```cs +

@AbpTimingResource["DisplayName:Abp.Timing.Timezone"]

+@using(CultureHelper.Use("ru")) +{ +

@AbpTimingResource["DisplayName:Abp.Timing.Timezone"]

+} +``` + +![](2.png) \ No newline at end of file From 61e0d0859a32a54c6d1d616e2966a120db3da8bc Mon Sep 17 00:00:00 2001 From: Berkan Sasmaz Date: Tue, 28 Sep 2021 12:36:31 +0300 Subject: [PATCH 08/12] Add new localizations --- .../Admin/Localization/Resources/en.json | 41 ++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json index e23ed3fe5b..f7094c94a7 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json @@ -310,6 +310,45 @@ "DeleteInvoice" : "Delete Invoice", "SuccessfullyDeleted": "Successfully deleted!", "PaymentStateSetTo" : "Payment state set to {0}", - "ChangeState": "Change State" + "ChangeState": "Change State", + "Permission:TrialLicense" : "Trial License", + "Permission:ManageTrialLicense": "Manage Trial License", + "Menu:TrialLicenses": "Trial Licenses", + "TrialLicenses": "Trial Licenses", + "UserNameFilter": "Username", + "TrialLicenseStatusFilter": "Status", + "TrialLicenseStartDateFilter": "Start date", + "TrialLicenseEndDateFilter": "End date", + "FirsName": "First name", + "LastName": "Last name", + "Status": "Status", + "StartDate": "Start date", + "EndDate": "End date", + "CompanyName": "Company name", + "PurchasedDate": "Purchased date", + "OrganizationDetail": "Organization Detail", + "SendActivationMail": "Send Activation Mail", + "ActivationMailSentSuccessfully": "Activation mail sent successfully!", + "TrialLicenseStatus": "Trial license status", + "TrialLicenseDetail": "Trial License Detail", + "AcceptsMarketingCommunications": "Marketing Communications", + "PurposeOfUsage": "Purpose of usage", + "CountryName": "Country name", + "CompanySize": "Company size", + "DetailTrialLicense": "Details", + "Requested": "Requested", + "Activated": "Activated", + "PurchasedToNormalLicense": "Purchased", + "Expired": "Expired", + "TrialLicenseDeletionWarningMessage": "Trial license and if any organization and qa organization will be deleted!", + "IsTrial": "Is trial", + "Volo.AbpIo.Commercial:030000": "You already used your trial period.", + "Volo.AbpIo.Commercial:030001": "This organization name already exists.", + "Volo.AbpIo.Commercial:030002": "Once activated, trial license cannot be set to requested!", + "Volo.AbpIo.Commercial:030003": "There is no such status!", + "Volo.AbpIo.Commercial:030004": "Status could not be changed due to an unexpected error!", + "Volo.AbpIo.Commercial:030005": "Start date and end date cannot be given when the trial license is in the requested state!", + "Volo.AbpIo.Commercial:030006": "End date must always be greater than start date!", + "Volo.AbpIo.Commercial:030007": "This trial license has already been activated once!" } } From 9d06c42d1f8d991e2663685930b1d53e473d455e Mon Sep 17 00:00:00 2001 From: muhammedaltug Date: Tue, 28 Sep 2021 14:20:23 +0300 Subject: [PATCH 09/12] Angular UI: Check setting management feature to allow the setting management page to open --- .../config/src/providers/features.token.ts | 39 ++++++++++++++++ .../config/src/providers/index.ts | 1 + .../config/src/providers/route.provider.ts | 46 +++++++++---------- .../config/src/providers/visible.provider.ts | 30 ++++++++++++ .../src/setting-management-config.module.ts | 13 ++++-- 5 files changed, 103 insertions(+), 26 deletions(-) create mode 100644 npm/ng-packs/packages/setting-management/config/src/providers/features.token.ts create mode 100644 npm/ng-packs/packages/setting-management/config/src/providers/visible.provider.ts diff --git a/npm/ng-packs/packages/setting-management/config/src/providers/features.token.ts b/npm/ng-packs/packages/setting-management/config/src/providers/features.token.ts new file mode 100644 index 0000000000..f161832972 --- /dev/null +++ b/npm/ng-packs/packages/setting-management/config/src/providers/features.token.ts @@ -0,0 +1,39 @@ +import { ConfigStateService, featuresFactory, noop } from '@abp/ng.core'; +import { APP_INITIALIZER, inject, InjectionToken } from '@angular/core'; +import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; + +export const SETTING_MANAGEMENT_FEATURES = new InjectionToken>( + 'SETTING_MANAGEMENT_FEATURES', + { + providedIn: 'root', + factory: () => { + const configState = inject(ConfigStateService); + const featureKey = 'SettingManagement.Enable'; + const mapFn = features => ({ + enable: features[featureKey].toLowerCase() !== 'false', + }); + return featuresFactory(configState, [featureKey], mapFn); + }, + }, +); + +export const SETTING_MANAGEMENT_ROUTE_VISIBILITY = new InjectionToken>( + 'SETTING_MANAGEMENT_ROUTE_VISIBILITY', + { + providedIn: 'root', + factory: () => { + const stream = inject(SETTING_MANAGEMENT_FEATURES); + return stream.pipe(map(features => features.enable)); + }, + }, +); + +export const SETTING_MANAGEMENT_FEATURES_PROVIDERS = [ + { + provide: APP_INITIALIZER, + useFactory: noop, + deps: [SETTING_MANAGEMENT_ROUTE_VISIBILITY], + multi: true, + }, +]; diff --git a/npm/ng-packs/packages/setting-management/config/src/providers/index.ts b/npm/ng-packs/packages/setting-management/config/src/providers/index.ts index a1e873bacc..b44902e5d5 100644 --- a/npm/ng-packs/packages/setting-management/config/src/providers/index.ts +++ b/npm/ng-packs/packages/setting-management/config/src/providers/index.ts @@ -1,2 +1,3 @@ export * from './route.provider'; export * from './setting-tab.provider'; +export * from './visible.provider'; diff --git a/npm/ng-packs/packages/setting-management/config/src/providers/route.provider.ts b/npm/ng-packs/packages/setting-management/config/src/providers/route.provider.ts index 9d272b8be0..6bed72f2fc 100644 --- a/npm/ng-packs/packages/setting-management/config/src/providers/route.provider.ts +++ b/npm/ng-packs/packages/setting-management/config/src/providers/route.provider.ts @@ -1,18 +1,9 @@ -import { eLayoutType, RoutesService, SettingTabsService } from '@abp/ng.core'; +import { eLayoutType, noop, RoutesService, SettingTabsService } from '@abp/ng.core'; import { eThemeSharedRouteNames } from '@abp/ng.theme.shared'; -import { APP_INITIALIZER } from '@angular/core'; +import { APP_INITIALIZER, inject, InjectionToken } from '@angular/core'; import { debounceTime, map } from 'rxjs/operators'; import { eSettingManagementRouteNames } from '../enums/route-names'; - -export const SETTING_MANAGEMENT_ROUTE_PROVIDERS = [ - { provide: APP_INITIALIZER, useFactory: configureRoutes, deps: [RoutesService], multi: true }, - { - provide: APP_INITIALIZER, - useFactory: hideRoutes, - deps: [RoutesService, SettingTabsService], - multi: true, - }, -]; +import { Observable } from 'rxjs'; export function configureRoutes(routesService: RoutesService) { return () => { @@ -28,16 +19,25 @@ export function configureRoutes(routesService: RoutesService) { ]); }; } - -export function hideRoutes(routesService: RoutesService, settingTabsService: SettingTabsService) { - return () => { - settingTabsService.visible$ - .pipe( +export const SETTING_MANAGEMENT_HAS_SETTING = new InjectionToken>( + 'SETTING_MANAGEMENT_HAS_SETTING', + { + factory: () => { + const settingTabsService = inject(SettingTabsService); + return settingTabsService.visible$.pipe( debounceTime(0), - map(nodes => !nodes.length), - ) - .subscribe(invisible => - routesService.patch(eSettingManagementRouteNames.Settings, { invisible }), + map(nodes => !!nodes.length), ); - }; -} + }, + }, +); + +export const SETTING_MANAGEMENT_ROUTE_PROVIDERS = [ + { provide: APP_INITIALIZER, useFactory: configureRoutes, deps: [RoutesService], multi: true }, + { + provide: APP_INITIALIZER, + useFactory: noop, + deps: [SETTING_MANAGEMENT_HAS_SETTING], + multi: true, + }, +]; diff --git a/npm/ng-packs/packages/setting-management/config/src/providers/visible.provider.ts b/npm/ng-packs/packages/setting-management/config/src/providers/visible.provider.ts new file mode 100644 index 0000000000..c7f9bc8e8e --- /dev/null +++ b/npm/ng-packs/packages/setting-management/config/src/providers/visible.provider.ts @@ -0,0 +1,30 @@ +import { APP_INITIALIZER, Injector } from '@angular/core'; +import { combineLatest } from 'rxjs'; +import { RoutesService } from '@abp/ng.core'; +import { SETTING_MANAGEMENT_HAS_SETTING } from './route.provider'; +import { SETTING_MANAGEMENT_ROUTE_VISIBILITY } from './features.token'; +import { eSettingManagementRouteNames } from '../enums'; + +export const SETTING_MANAGEMENT_VISIBLE_PROVIDERS = [ + { + provide: APP_INITIALIZER, + useFactory: setSettingManagementVisibility, + deps: [Injector], + multi: true, + }, +]; + +export function setSettingManagementVisibility(injector: Injector) { + return () => { + const settingManagementHasSetting$ = injector.get(SETTING_MANAGEMENT_HAS_SETTING); + const isSettingManagementFeatureOpen$ = injector.get(SETTING_MANAGEMENT_ROUTE_VISIBILITY); + const routes = injector.get(RoutesService); + combineLatest([settingManagementHasSetting$, isSettingManagementFeatureOpen$]).subscribe( + ([settingManagementHasSetting, isSettingManagementFeatureOpen]) => { + routes.patch(eSettingManagementRouteNames.Settings, { + invisible: !(settingManagementHasSetting && isSettingManagementFeatureOpen), + }); + }, + ); + }; +} diff --git a/npm/ng-packs/packages/setting-management/config/src/setting-management-config.module.ts b/npm/ng-packs/packages/setting-management/config/src/setting-management-config.module.ts index 38c04c68a0..4821dad145 100644 --- a/npm/ng-packs/packages/setting-management/config/src/setting-management-config.module.ts +++ b/npm/ng-packs/packages/setting-management/config/src/setting-management-config.module.ts @@ -1,9 +1,11 @@ import { ModuleWithProviders, NgModule } from '@angular/core'; import { CoreModule } from '@abp/ng.core'; -import { EmailSettingGroupComponent } from './components/email-setting-group/email-setting-group.component'; +import { NgxValidateCoreModule } from '@ngx-validate/core'; +import { SETTING_MANAGEMENT_FEATURES_PROVIDERS } from './providers/features.token'; +import { SETTING_MANAGEMENT_VISIBLE_PROVIDERS } from './providers/visible.provider'; import { SETTING_MANAGEMENT_ROUTE_PROVIDERS } from './providers/route.provider'; import { SETTING_MANAGEMENT_SETTING_TAB_PROVIDERS } from './providers/setting-tab.provider'; -import { NgxValidateCoreModule } from '@ngx-validate/core'; +import { EmailSettingGroupComponent } from './components/email-setting-group/email-setting-group.component'; @NgModule({ imports: [CoreModule, NgxValidateCoreModule], @@ -14,7 +16,12 @@ export class SettingManagementConfigModule { static forRoot(): ModuleWithProviders { return { ngModule: SettingManagementConfigModule, - providers: [SETTING_MANAGEMENT_ROUTE_PROVIDERS, SETTING_MANAGEMENT_SETTING_TAB_PROVIDERS], + providers: [ + SETTING_MANAGEMENT_ROUTE_PROVIDERS, + SETTING_MANAGEMENT_SETTING_TAB_PROVIDERS, + SETTING_MANAGEMENT_FEATURES_PROVIDERS, + SETTING_MANAGEMENT_VISIBLE_PROVIDERS, + ], }; } } From 45befe09ead58de1e0862f166c1f3f263f49a810 Mon Sep 17 00:00:00 2001 From: muhammedaltug Date: Tue, 28 Sep 2021 14:43:59 +0300 Subject: [PATCH 10/12] rename variable --- .../config/src/providers/visible.provider.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/npm/ng-packs/packages/setting-management/config/src/providers/visible.provider.ts b/npm/ng-packs/packages/setting-management/config/src/providers/visible.provider.ts index c7f9bc8e8e..e70e037da6 100644 --- a/npm/ng-packs/packages/setting-management/config/src/providers/visible.provider.ts +++ b/npm/ng-packs/packages/setting-management/config/src/providers/visible.provider.ts @@ -17,12 +17,12 @@ export const SETTING_MANAGEMENT_VISIBLE_PROVIDERS = [ export function setSettingManagementVisibility(injector: Injector) { return () => { const settingManagementHasSetting$ = injector.get(SETTING_MANAGEMENT_HAS_SETTING); - const isSettingManagementFeatureOpen$ = injector.get(SETTING_MANAGEMENT_ROUTE_VISIBILITY); + const isSettingManagementFeatureEnable$ = injector.get(SETTING_MANAGEMENT_ROUTE_VISIBILITY); const routes = injector.get(RoutesService); - combineLatest([settingManagementHasSetting$, isSettingManagementFeatureOpen$]).subscribe( - ([settingManagementHasSetting, isSettingManagementFeatureOpen]) => { + combineLatest([settingManagementHasSetting$, isSettingManagementFeatureEnable$]).subscribe( + ([settingManagementHasSetting, isSettingManagementFeatureEnable]) => { routes.patch(eSettingManagementRouteNames.Settings, { - invisible: !(settingManagementHasSetting && isSettingManagementFeatureOpen), + invisible: !(settingManagementHasSetting && isSettingManagementFeatureEnable), }); }, ); From 40115687d7b1179f2f66f2b969b8357e1faeae05 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Wed, 29 Sep 2021 10:16:02 +0800 Subject: [PATCH 11/12] Upgrade Devart.Data.Oracle.EFCore package --- .../Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj index 9d8766eb1f..37b173eaef 100644 --- a/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj +++ b/framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj @@ -19,7 +19,7 @@ - + From a308491d1dd4688a7d2d81ebe7d92520122bbaeb Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Wed, 29 Sep 2021 11:59:34 +0800 Subject: [PATCH 12/12] Update module template --- .../MyCompanyName.MyProjectName.csproj | 2 +- test/DistEvents/DistDemoApp/DistDemoApp.csproj | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/console/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj b/templates/console/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj index eb878dd72c..047febe96b 100644 --- a/templates/console/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj +++ b/templates/console/src/MyCompanyName.MyProjectName/MyCompanyName.MyProjectName.csproj @@ -13,7 +13,7 @@ - + diff --git a/test/DistEvents/DistDemoApp/DistDemoApp.csproj b/test/DistEvents/DistDemoApp/DistDemoApp.csproj index 26077529ea..524fda1046 100644 --- a/test/DistEvents/DistDemoApp/DistDemoApp.csproj +++ b/test/DistEvents/DistDemoApp/DistDemoApp.csproj @@ -2,12 +2,12 @@ Exe - net5.0 + net6.0 - - + + @@ -19,7 +19,7 @@ - + runtime; build; native; contentfiles; analyzers compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native