diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 000000000..6f2501679 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,13 @@ + + + true + + + + + all + runtime; build; native; contentfiles; analyzers + + + + diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 000000000..cb0e20c59 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,256 @@ + + + 8.1.0 + 2.14.1 + 8.1.0 + 8.0.0 + 8.0.0 + 8.0.0 + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/NuGet.Config b/NuGet.Config new file mode 100644 index 000000000..08027d47f --- /dev/null +++ b/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/aspnet-core/Directory.Build.props b/aspnet-core/Directory.Build.props deleted file mode 100644 index 9573001e5..000000000 --- a/aspnet-core/Directory.Build.props +++ /dev/null @@ -1,50 +0,0 @@ - - - 8.1.0 - 3.0.5 - 8.1.0 - 1.12.0 - 1.0.2 - 8.1.0 - 2.14.1 - 1.5.10 - 2.13.0 - 3.0.712 - 1.6.9 - 2.0.3 - 1.8.6 - 6.2.0 - 7.15.1 - 13.0.1 - 1.8.0 - 1.8.0 - 1.8.1 - 1.8.1 - 1.0.0-beta.11 - 3.7.0 - 2.7.4 - 3.1.1 - 8.0.0 - 2.3.0 - 2.0.0 - 2.0.2 - 3.1.0 - 8.0.0 - 8.0.0 - 5.0.0 - 9.0.3 - 5.0.0 - 2.0.1 - 6.5.0 - 8.2.0 - 0.34.0 - 8.0.* - 8.0.0 - 2.6.1 - 2.5.5 - 4.2.1 - 5.1.0 - 17.8.0 - 3.0.2 - - \ No newline at end of file diff --git a/aspnet-core/LINGYUN.MicroService.All.sln b/aspnet-core/LINGYUN.MicroService.All.sln index 3f9dde932..f9be2f979 100644 --- a/aspnet-core/LINGYUN.MicroService.All.sln +++ b/aspnet-core/LINGYUN.MicroService.All.sln @@ -331,11 +331,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Serilog.Enriche EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A76A4741-AF91-44EF-A7B6-8E7AF4961146}" ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - common.props = common.props - configureawait.props = configureawait.props - Directory.Build.props = Directory.Build.props - NuGet.Config = NuGet.Config + ..\common.props = ..\common.props + ..\common.secrets.props = ..\common.secrets.props + ..\configureawait.props = ..\configureawait.props + ..\Directory.Build.props = ..\Directory.Build.props + ..\Directory.Packages.props = ..\Directory.Packages.props + ..\NuGet.Config = ..\NuGet.Config EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Tencent.SettingManagement", "framework\cloud-tencent\LINGYUN.Abp.Tencent.SettingManagement\LINGYUN.Abp.Tencent.SettingManagement.csproj", "{C7CF4193-6397-4450-AF42-3BACD7CF292E}" diff --git a/aspnet-core/LINGYUN.MicroService.Common.sln b/aspnet-core/LINGYUN.MicroService.Common.sln index fc7e1cd2d..028b9c194 100644 --- a/aspnet-core/LINGYUN.MicroService.Common.sln +++ b/aspnet-core/LINGYUN.MicroService.Common.sln @@ -304,9 +304,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Tencent.TTS", " EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B8DA7627-E691-400A-AE4D-0E151A6EA0F8}" ProjectSection(SolutionItems) = preProject - common.props = common.props - configureawait.props = configureawait.props - Directory.Build.props = Directory.Build.props + ..\common.props = ..\common.props + ..\common.secrets.props = ..\common.secrets.props + ..\configureawait.props = ..\configureawait.props + ..\Directory.Build.props = ..\Directory.Build.props + ..\Directory.Packages.props = ..\Directory.Packages.props EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.AspNetCore.Mvc.Idempotent", "framework\mvc\LINGYUN.Abp.AspNetCore.Mvc.Idempotent\LINGYUN.Abp.AspNetCore.Mvc.Idempotent.csproj", "{347413DD-1B30-46B5-87A0-828A11FAA87D}" diff --git a/aspnet-core/LINGYUN.MicroService.SingleProject.sln b/aspnet-core/LINGYUN.MicroService.SingleProject.sln index a6a89f171..ea8e6b660 100644 --- a/aspnet-core/LINGYUN.MicroService.SingleProject.sln +++ b/aspnet-core/LINGYUN.MicroService.SingleProject.sln @@ -419,9 +419,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LY.MicroService.Application EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D1A85853-3504-45A8-A745-5091E9240682}" ProjectSection(SolutionItems) = preProject - common.props = common.props - configureawait.props = configureawait.props - Directory.Build.props = Directory.Build.props + ..\common.props = ..\common.props + ..\common.secrets.props = ..\common.secrets.props + ..\configureawait.props = ..\configureawait.props + ..\Directory.Build.props = ..\Directory.Build.props + ..\Directory.Packages.props = ..\Directory.Packages.props + ..\NuGet.Config = ..\NuGet.Config EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dapr", "dapr", "{FD9F5933-FDE5-4504-99BF-9050E0435C6D}" @@ -510,7 +513,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.AuditLogging.El EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.BackgroundTasks.TaskManagement", "modules\task-management\LINGYUN.Abp.BackgroundTasks.TaskManagement\LINGYUN.Abp.BackgroundTasks.TaskManagement.csproj", "{A99F5406-37DC-4677-9166-9BDE90C26CA6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Abp.Saas.Jobs", "modules\saas\LINGYUN.Abp.Saas.Jobs\LINGYUN.Abp.Saas.Jobs.csproj", "{8FA3ED81-19AB-4E0C-B36A-DF49131A2AB3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Saas.Jobs", "modules\saas\LINGYUN.Abp.Saas.Jobs\LINGYUN.Abp.Saas.Jobs.csproj", "{8FA3ED81-19AB-4E0C-B36A-DF49131A2AB3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/aspnet-core/common.props b/aspnet-core/common.props deleted file mode 100644 index 9a5de77bd..000000000 --- a/aspnet-core/common.props +++ /dev/null @@ -1,38 +0,0 @@ - - - latest - 8.1.0 - colin - $(NoWarn);CS1591;CS0436;CS8618;NU1803 - https://github.com/colinin/abp-next-admin - $(SolutionDir)LocalNuget - 8.1.0 - MIT - git - https://github.com/colinin/abp-next-admin - true - - - - - - - - - - - - - - - - - - - - - - $(SolutionDir)LocalNuget - - - \ No newline at end of file diff --git a/aspnet-core/configureawait.props b/aspnet-core/configureawait.props deleted file mode 100644 index 2e04405b2..000000000 --- a/aspnet-core/configureawait.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - - All - runtime; build; native; contentfiles; analyzers - - - \ No newline at end of file diff --git a/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.Elasticsearch/LINGYUN.Abp.AuditLogging.Elasticsearch.csproj b/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.Elasticsearch/LINGYUN.Abp.AuditLogging.Elasticsearch.csproj index 846ff9c16..8eb7367c1 100644 --- a/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.Elasticsearch/LINGYUN.Abp.AuditLogging.Elasticsearch.csproj +++ b/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.Elasticsearch/LINGYUN.Abp.AuditLogging.Elasticsearch.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.EntityFrameworkCore/LINGYUN.Abp.AuditLogging.EntityFrameworkCore.csproj b/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.EntityFrameworkCore/LINGYUN.Abp.AuditLogging.EntityFrameworkCore.csproj index d191edaaf..5fb21ab37 100644 --- a/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.EntityFrameworkCore/LINGYUN.Abp.AuditLogging.EntityFrameworkCore.csproj +++ b/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging.EntityFrameworkCore/LINGYUN.Abp.AuditLogging.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,9 +9,9 @@ - - - + + + diff --git a/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging/LINGYUN.Abp.AuditLogging.csproj b/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging/LINGYUN.Abp.AuditLogging.csproj index eeb04f852..e5bcce1fa 100644 --- a/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging/LINGYUN.Abp.AuditLogging.csproj +++ b/aspnet-core/framework/auditing/LINGYUN.Abp.AuditLogging/LINGYUN.Abp.AuditLogging.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,9 +9,9 @@ - - - + + + diff --git a/aspnet-core/framework/authentication/LINGYUN.Abp.Authentication.QQ/LINGYUN.Abp.Authentication.QQ.csproj b/aspnet-core/framework/authentication/LINGYUN.Abp.Authentication.QQ/LINGYUN.Abp.Authentication.QQ.csproj index 90b63df3f..45a96fd72 100644 --- a/aspnet-core/framework/authentication/LINGYUN.Abp.Authentication.QQ/LINGYUN.Abp.Authentication.QQ.csproj +++ b/aspnet-core/framework/authentication/LINGYUN.Abp.Authentication.QQ/LINGYUN.Abp.Authentication.QQ.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/authentication/LINGYUN.Abp.Authentication.WeChat/LINGYUN.Abp.Authentication.WeChat.csproj b/aspnet-core/framework/authentication/LINGYUN.Abp.Authentication.WeChat/LINGYUN.Abp.Authentication.WeChat.csproj index bdf494d32..6589cb3cd 100644 --- a/aspnet-core/framework/authentication/LINGYUN.Abp.Authentication.WeChat/LINGYUN.Abp.Authentication.WeChat.csproj +++ b/aspnet-core/framework/authentication/LINGYUN.Abp.Authentication.WeChat/LINGYUN.Abp.Authentication.WeChat.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/authorization/LINGYUN.Abp.Authorization.OrganizationUnits/LINGYUN.Abp.Authorization.OrganizationUnits.csproj b/aspnet-core/framework/authorization/LINGYUN.Abp.Authorization.OrganizationUnits/LINGYUN.Abp.Authorization.OrganizationUnits.csproj index ae4bcbb28..4945248cf 100644 --- a/aspnet-core/framework/authorization/LINGYUN.Abp.Authorization.OrganizationUnits/LINGYUN.Abp.Authorization.OrganizationUnits.csproj +++ b/aspnet-core/framework/authorization/LINGYUN.Abp.Authorization.OrganizationUnits/LINGYUN.Abp.Authorization.OrganizationUnits.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj b/aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj index 72758fad3..a632246c7 100644 --- a/aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj +++ b/aspnet-core/framework/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj @@ -1,6 +1,6 @@  - + Exe @@ -27,16 +27,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/aspnet-core/framework/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN.Abp.Aliyun.SettingManagement.csproj b/aspnet-core/framework/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN.Abp.Aliyun.SettingManagement.csproj index c22e63dda..3a0994868 100644 --- a/aspnet-core/framework/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN.Abp.Aliyun.SettingManagement.csproj +++ b/aspnet-core/framework/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN.Abp.Aliyun.SettingManagement.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,18 +9,13 @@ - - + + - - - - - - - + + diff --git a/aspnet-core/framework/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN.Abp.Aliyun.csproj b/aspnet-core/framework/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN.Abp.Aliyun.csproj index 7e02994c0..7fc6a14a1 100644 --- a/aspnet-core/framework/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN.Abp.Aliyun.csproj +++ b/aspnet-core/framework/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN.Abp.Aliyun.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.BlobStoring.Tencent/LINGYUN.Abp.BlobStoring.Tencent.csproj b/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.BlobStoring.Tencent/LINGYUN.Abp.BlobStoring.Tencent.csproj index 830cba0c3..6dde853cf 100644 --- a/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.BlobStoring.Tencent/LINGYUN.Abp.BlobStoring.Tencent.csproj +++ b/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.BlobStoring.Tencent/LINGYUN.Abp.BlobStoring.Tencent.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -18,8 +18,8 @@ - - + + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/FodyWeavers.xsd b/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.Sms.Tencent/FodyWeavers.xsd similarity index 100% rename from aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/FodyWeavers.xsd rename to aspnet-core/framework/cloud-tencent/LINGYUN.Abp.Sms.Tencent/FodyWeavers.xsd diff --git a/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.Sms.Tencent/LINGYUN.Abp.Sms.Tencent.csproj b/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.Sms.Tencent/LINGYUN.Abp.Sms.Tencent.csproj index b9c40a0f7..c90d4a4e5 100644 --- a/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.Sms.Tencent/LINGYUN.Abp.Sms.Tencent.csproj +++ b/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.Sms.Tencent/LINGYUN.Abp.Sms.Tencent.csproj @@ -1,15 +1,18 @@  - - netstandard2.0 - + + + + + netstandard2.0 + - + - + diff --git a/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.Tencent.QQ/LINGYUN.Abp.Tencent.QQ.csproj b/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.Tencent.QQ/LINGYUN.Abp.Tencent.QQ.csproj index 85dad069e..6034b8c69 100644 --- a/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.Tencent.QQ/LINGYUN.Abp.Tencent.QQ.csproj +++ b/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.Tencent.QQ/LINGYUN.Abp.Tencent.QQ.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 diff --git a/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN.Abp.Tencent.SettingManagement.csproj b/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN.Abp.Tencent.SettingManagement.csproj index c0fc22524..8dea7a964 100644 --- a/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN.Abp.Tencent.SettingManagement.csproj +++ b/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.Tencent.SettingManagement/LINGYUN.Abp.Tencent.SettingManagement.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -13,8 +13,8 @@ - - + + diff --git a/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.Tencent.TTS/LINGYUN.Abp.Tencent.TTS.csproj b/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.Tencent.TTS/LINGYUN.Abp.Tencent.TTS.csproj index 0024cd280..75783d708 100644 --- a/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.Tencent.TTS/LINGYUN.Abp.Tencent.TTS.csproj +++ b/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.Tencent.TTS/LINGYUN.Abp.Tencent.TTS.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -12,9 +12,8 @@ - - - + + diff --git a/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.Tencent/LINGYUN.Abp.Tencent.csproj b/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.Tencent/LINGYUN.Abp.Tencent.csproj index 7e686b5c5..85e329491 100644 --- a/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.Tencent/LINGYUN.Abp.Tencent.csproj +++ b/aspnet-core/framework/cloud-tencent/LINGYUN.Abp.Tencent/LINGYUN.Abp.Tencent.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -18,12 +18,12 @@ - - - - - - + + + + + + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.AspNetCore.HttpOverrides/LINGYUN.Abp.AspNetCore.HttpOverrides.csproj b/aspnet-core/framework/common/LINGYUN.Abp.AspNetCore.HttpOverrides/LINGYUN.Abp.AspNetCore.HttpOverrides.csproj index cc2d765e6..2298ea3fd 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.AspNetCore.HttpOverrides/LINGYUN.Abp.AspNetCore.HttpOverrides.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.AspNetCore.HttpOverrides/LINGYUN.Abp.AspNetCore.HttpOverrides.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.AspNetCore.Mvc.Client/LINGYUN.Abp.AspNetCore.Mvc.Client.csproj b/aspnet-core/framework/common/LINGYUN.Abp.AspNetCore.Mvc.Client/LINGYUN.Abp.AspNetCore.Mvc.Client.csproj index b0642876c..0d78d75bd 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.AspNetCore.Mvc.Client/LINGYUN.Abp.AspNetCore.Mvc.Client.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.AspNetCore.Mvc.Client/LINGYUN.Abp.AspNetCore.Mvc.Client.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -11,8 +11,8 @@ - - + + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json/LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json.csproj b/aspnet-core/framework/common/LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json/LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json.csproj index ccf2580f6..182624c7e 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json/LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json/LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json.csproj @@ -1,7 +1,7 @@ - + - - + + net8.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.AspNetCore.SignalR/LINGYUN.Abp.AspNetCore.SignalR.JwtToken.csproj b/aspnet-core/framework/common/LINGYUN.Abp.AspNetCore.SignalR/LINGYUN.Abp.AspNetCore.SignalR.JwtToken.csproj index 5b9a9436d..f24dee4b4 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.AspNetCore.SignalR/LINGYUN.Abp.AspNetCore.SignalR.JwtToken.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.AspNetCore.SignalR/LINGYUN.Abp.AspNetCore.SignalR.JwtToken.csproj @@ -1,7 +1,7 @@ - + - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.AspNetCore.Wrapper/LINGYUN.Abp.AspNetCore.Wrapper.csproj b/aspnet-core/framework/common/LINGYUN.Abp.AspNetCore.Wrapper/LINGYUN.Abp.AspNetCore.Wrapper.csproj index a93bcec11..cc471bca2 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.AspNetCore.Wrapper/LINGYUN.Abp.AspNetCore.Wrapper.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.AspNetCore.Wrapper/LINGYUN.Abp.AspNetCore.Wrapper.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.BackgroundJobs.Hangfire/LINGYUN.Abp.BackgroundJobs.Hangfire.csproj b/aspnet-core/framework/common/LINGYUN.Abp.BackgroundJobs.Hangfire/LINGYUN.Abp.BackgroundJobs.Hangfire.csproj index 9a20ebf8b..7787ce63d 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.BackgroundJobs.Hangfire/LINGYUN.Abp.BackgroundJobs.Hangfire.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.BackgroundJobs.Hangfire/LINGYUN.Abp.BackgroundJobs.Hangfire.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.BackgroundWorkers.Hangfire/LINGYUN.Abp.BackgroundWorkers.Hangfire.csproj b/aspnet-core/framework/common/LINGYUN.Abp.BackgroundWorkers.Hangfire/LINGYUN.Abp.BackgroundWorkers.Hangfire.csproj index c5c71fe2f..34d901703 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.BackgroundWorkers.Hangfire/LINGYUN.Abp.BackgroundWorkers.Hangfire.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.BackgroundWorkers.Hangfire/LINGYUN.Abp.BackgroundWorkers.Hangfire.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.BlobStoring.Aliyun/LINGYUN.Abp.BlobStoring.Aliyun.csproj b/aspnet-core/framework/common/LINGYUN.Abp.BlobStoring.Aliyun/LINGYUN.Abp.BlobStoring.Aliyun.csproj index d4ac5585a..b2815fb00 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.BlobStoring.Aliyun/LINGYUN.Abp.BlobStoring.Aliyun.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.BlobStoring.Aliyun/LINGYUN.Abp.BlobStoring.Aliyun.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -10,8 +10,8 @@ - - + + diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.RemoteService/FodyWeavers.xsd b/aspnet-core/framework/common/LINGYUN.Abp.Core/FodyWeavers.xsd similarity index 100% rename from aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.RemoteService/FodyWeavers.xsd rename to aspnet-core/framework/common/LINGYUN.Abp.Core/FodyWeavers.xsd diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Core/LINGYUN.Abp.Core.csproj b/aspnet-core/framework/common/LINGYUN.Abp.Core/LINGYUN.Abp.Core.csproj index c4304354a..df2ed0ce9 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.Core/LINGYUN.Abp.Core.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.Core/LINGYUN.Abp.Core.csproj @@ -1,6 +1,7 @@ - + + netstandard2.0 @@ -9,7 +10,7 @@ - + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Data.DbMigrator/LINGYUN.Abp.Data.DbMigrator.csproj b/aspnet-core/framework/common/LINGYUN.Abp.Data.DbMigrator/LINGYUN.Abp.Data.DbMigrator.csproj index 77d5bff41..9f4a03c21 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.Data.DbMigrator/LINGYUN.Abp.Data.DbMigrator.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.Data.DbMigrator/LINGYUN.Abp.Data.DbMigrator.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.csproj b/aspnet-core/framework/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.csproj index f6fa624b1..f38ad88bb 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -12,9 +12,9 @@ - - - + + + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.ExceptionHandling.Emailing/LINGYUN.Abp.ExceptionHandling.Emailing.csproj b/aspnet-core/framework/common/LINGYUN.Abp.ExceptionHandling.Emailing/LINGYUN.Abp.ExceptionHandling.Emailing.csproj index 055f35598..61d06fecd 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.ExceptionHandling.Emailing/LINGYUN.Abp.ExceptionHandling.Emailing.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.ExceptionHandling.Emailing/LINGYUN.Abp.ExceptionHandling.Emailing.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -23,7 +23,7 @@ - + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.ExceptionHandling/LINGYUN.Abp.ExceptionHandling.csproj b/aspnet-core/framework/common/LINGYUN.Abp.ExceptionHandling/LINGYUN.Abp.ExceptionHandling.csproj index 7666654f6..8781b6fca 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.ExceptionHandling/LINGYUN.Abp.ExceptionHandling.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.ExceptionHandling/LINGYUN.Abp.ExceptionHandling.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Features.LimitValidation.Redis.Client/LINGYUN.Abp.Features.LimitValidation.Redis.Client.csproj b/aspnet-core/framework/common/LINGYUN.Abp.Features.LimitValidation.Redis.Client/LINGYUN.Abp.Features.LimitValidation.Redis.Client.csproj index 9d8211760..0e8ed365a 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.Features.LimitValidation.Redis.Client/LINGYUN.Abp.Features.LimitValidation.Redis.Client.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.Features.LimitValidation.Redis.Client/LINGYUN.Abp.Features.LimitValidation.Redis.Client.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Features.LimitValidation.Redis/LINGYUN.Abp.Features.LimitValidation.Redis.csproj b/aspnet-core/framework/common/LINGYUN.Abp.Features.LimitValidation.Redis/LINGYUN.Abp.Features.LimitValidation.Redis.csproj index 5c34c7e31..341ddac82 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.Features.LimitValidation.Redis/LINGYUN.Abp.Features.LimitValidation.Redis.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.Features.LimitValidation.Redis/LINGYUN.Abp.Features.LimitValidation.Redis.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -10,9 +10,9 @@ - - - + + + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Features.LimitValidation/LINGYUN.Abp.Features.LimitValidation.csproj b/aspnet-core/framework/common/LINGYUN.Abp.Features.LimitValidation/LINGYUN.Abp.Features.LimitValidation.csproj index e19678531..f1509ae2f 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.Features.LimitValidation/LINGYUN.Abp.Features.LimitValidation.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.Features.LimitValidation/LINGYUN.Abp.Features.LimitValidation.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -19,8 +19,8 @@ - - + + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Hangfire.Dashboard/LINGYUN.Abp.Hangfire.Dashboard.csproj b/aspnet-core/framework/common/LINGYUN.Abp.Hangfire.Dashboard/LINGYUN.Abp.Hangfire.Dashboard.csproj index baa2e3b92..48715dcfa 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.Hangfire.Dashboard/LINGYUN.Abp.Hangfire.Dashboard.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.Hangfire.Dashboard/LINGYUN.Abp.Hangfire.Dashboard.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,9 +9,9 @@ - - - + + + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Hangfire.MySqlStorage/LINGYUN.Abp.Hangfire.Storage.MySql.csproj b/aspnet-core/framework/common/LINGYUN.Abp.Hangfire.MySqlStorage/LINGYUN.Abp.Hangfire.Storage.MySql.csproj index 5af680cbc..a9f1408cb 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.Hangfire.MySqlStorage/LINGYUN.Abp.Hangfire.Storage.MySql.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.Hangfire.MySqlStorage/LINGYUN.Abp.Hangfire.Storage.MySql.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Hangfire.Storage.SqlServer/LINGYUN.Abp.Hangfire.Storage.SqlServer.csproj b/aspnet-core/framework/common/LINGYUN.Abp.Hangfire.Storage.SqlServer/LINGYUN.Abp.Hangfire.Storage.SqlServer.csproj index 42309c9e9..47d2f4756 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.Hangfire.Storage.SqlServer/LINGYUN.Abp.Hangfire.Storage.SqlServer.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.Hangfire.Storage.SqlServer/LINGYUN.Abp.Hangfire.Storage.SqlServer.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Http.Client.Wrapper/LINGYUN.Abp.Http.Client.Wrapper.csproj b/aspnet-core/framework/common/LINGYUN.Abp.Http.Client.Wrapper/LINGYUN.Abp.Http.Client.Wrapper.csproj index 5b0d10451..a1335411b 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.Http.Client.Wrapper/LINGYUN.Abp.Http.Client.Wrapper.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.Http.Client.Wrapper/LINGYUN.Abp.Http.Client.Wrapper.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.IdGenerator/LINGYUN.Abp.IdGenerator.csproj b/aspnet-core/framework/common/LINGYUN.Abp.IdGenerator/LINGYUN.Abp.IdGenerator.csproj index 1e8e1ace6..020f81c7f 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.IdGenerator/LINGYUN.Abp.IdGenerator.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.IdGenerator/LINGYUN.Abp.IdGenerator.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Idempotent/LINGYUN.Abp.Idempotent.csproj b/aspnet-core/framework/common/LINGYUN.Abp.Idempotent/LINGYUN.Abp.Idempotent.csproj index ba3fbe876..8abb65412 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.Idempotent/LINGYUN.Abp.Idempotent.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.Idempotent/LINGYUN.Abp.Idempotent.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -18,9 +18,9 @@ - - - + + + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.IdentityModel/FodyWeavers.xml b/aspnet-core/framework/common/LINGYUN.Abp.IdentityModel/FodyWeavers.xml deleted file mode 100644 index 1715698cc..000000000 --- a/aspnet-core/framework/common/LINGYUN.Abp.IdentityModel/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/aspnet-core/framework/common/LINGYUN.Abp.IdentityModel/LINGYUN.Abp.IdentityModel.csproj b/aspnet-core/framework/common/LINGYUN.Abp.IdentityModel/LINGYUN.Abp.IdentityModel.csproj deleted file mode 100644 index 8b0ae6566..000000000 --- a/aspnet-core/framework/common/LINGYUN.Abp.IdentityModel/LINGYUN.Abp.IdentityModel.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - netstandard2.0 - - true - 3.1.0 - LINGYUN - - - - D:\LocalNuget - - - - - - - - diff --git a/aspnet-core/framework/common/LINGYUN.Abp.IdentityModel/LINGYUN/Abp/IdentityModel/AbpCachedIdentityModelModule.cs b/aspnet-core/framework/common/LINGYUN.Abp.IdentityModel/LINGYUN/Abp/IdentityModel/AbpCachedIdentityModelModule.cs deleted file mode 100644 index 9b58ec8ca..000000000 --- a/aspnet-core/framework/common/LINGYUN.Abp.IdentityModel/LINGYUN/Abp/IdentityModel/AbpCachedIdentityModelModule.cs +++ /dev/null @@ -1,13 +0,0 @@ -using Volo.Abp.Caching; -using Volo.Abp.IdentityModel; -using Volo.Abp.Modularity; - -namespace LINGYUN.Abp.IdentityModel -{ - [DependsOn( - typeof(AbpIdentityModelModule), - typeof(AbpCachingModule))] - public class AbpCachedIdentityModelModule : AbpModule - { - } -} diff --git a/aspnet-core/framework/common/LINGYUN.Abp.IdentityModel/LINGYUN/Abp/IdentityModel/IdentityModelAuthenticationCacheItem.cs b/aspnet-core/framework/common/LINGYUN.Abp.IdentityModel/LINGYUN/Abp/IdentityModel/IdentityModelAuthenticationCacheItem.cs deleted file mode 100644 index f9a4c6759..000000000 --- a/aspnet-core/framework/common/LINGYUN.Abp.IdentityModel/LINGYUN/Abp/IdentityModel/IdentityModelAuthenticationCacheItem.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; - -namespace LINGYUN.Abp.IdentityModel -{ - public class IdentityModelAuthenticationCacheItem - { - public string AccessToken { get; set; } - public IdentityModelAuthenticationCacheItem() - { - - } - - public IdentityModelAuthenticationCacheItem(string accessToken) - { - AccessToken = accessToken; - } - - public static string CalculateCacheKey(string grantType, string clientId, string userName = null) - { - if (userName.IsNullOrWhiteSpace()) - { - return "gt:" + grantType + ",ci:" + clientId; - } - return "gt:" + grantType + ",ci:" + clientId + ",un:" + userName; - } - } -} diff --git a/aspnet-core/framework/common/LINGYUN.Abp.IdentityModel/LINGYUN/Abp/IdentityModel/IdentityModelCachedAuthenticationService.cs b/aspnet-core/framework/common/LINGYUN.Abp.IdentityModel/LINGYUN/Abp/IdentityModel/IdentityModelCachedAuthenticationService.cs deleted file mode 100644 index 7554c0df4..000000000 --- a/aspnet-core/framework/common/LINGYUN.Abp.IdentityModel/LINGYUN/Abp/IdentityModel/IdentityModelCachedAuthenticationService.cs +++ /dev/null @@ -1,102 +0,0 @@ -using IdentityModel.Client; -using Microsoft.Extensions.Caching.Distributed; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; -using System; -using System.Net.Http; -using System.Threading.Tasks; -using Volo.Abp; -using Volo.Abp.Caching; -using Volo.Abp.DependencyInjection; -using Volo.Abp.IdentityModel; -using Volo.Abp.MultiTenancy; -using Volo.Abp.Security.Encryption; -using Volo.Abp.Threading; - -namespace LINGYUN.Abp.IdentityModel -{ - [Dependency(ServiceLifetime.Transient, ReplaceServices = true)] - [ExposeServices( - typeof(IIdentityModelAuthenticationService), - typeof(IdentityModelAuthenticationService))] - public class IdentityModelCachedAuthenticationService : IdentityModelAuthenticationService - { - protected IDistributedCache Cache { get; } - public IdentityModelCachedAuthenticationService( - IOptions options, - ICancellationTokenProvider cancellationTokenProvider, - IHttpClientFactory httpClientFactory, - ICurrentTenant currentTenant, - IDistributedCache cache, - IOptions identityModelHttpRequestMessageOptions) - : base(options, cancellationTokenProvider, httpClientFactory, currentTenant, identityModelHttpRequestMessageOptions) - { - Cache = cache; - } - - public override async Task GetAccessTokenAsync(IdentityClientConfiguration configuration) - { - var accessTokenCacheItem = await GetCacheItemAsync(configuration); - // 需要解密 - return accessTokenCacheItem.AccessToken; - } - - protected async virtual Task GetCacheItemAsync(IdentityClientConfiguration configuration) - { - var cacheKey = IdentityModelAuthenticationCacheItem.CalculateCacheKey(configuration.GrantType, configuration.ClientId, configuration.UserName); - - Logger.LogDebug($"IdentityModelCachedAuthenticationService.GetCacheItemAsync: {cacheKey}"); - - var cacheItem = await Cache.GetAsync(cacheKey); - - if (cacheItem != null) - { - Logger.LogDebug($"Found in the cache: {cacheKey}"); - return cacheItem; - } - - Logger.LogDebug($"Not found in the cache: {cacheKey}"); - - var tokenResponse = await GetAccessTokenResponseAsync(configuration); - cacheItem = new IdentityModelAuthenticationCacheItem(tokenResponse.AccessToken); - var cacheEntryOptions = new DistributedCacheEntryOptions - { - // 缓存前两分钟过期 - AbsoluteExpiration = DateTimeOffset.Now.AddSeconds(tokenResponse.ExpiresIn - 120) - }; - - Logger.LogDebug($"Setting the cache item: {cacheKey}"); - await Cache.SetAsync(cacheKey, cacheItem, cacheEntryOptions); - - Logger.LogDebug($"Finished setting the cache item: {cacheKey}"); - - return cacheItem; - } - - protected async virtual Task GetAccessTokenResponseAsync(IdentityClientConfiguration configuration) - { - var discoveryResponse = await GetDiscoveryResponse(configuration); - if (discoveryResponse.IsError) - { - throw new AbpException($"Could not retrieve the OpenId Connect discovery document! ErrorType: {discoveryResponse.ErrorType}. Error: {discoveryResponse.Error}"); - } - - var tokenResponse = await GetTokenResponse(discoveryResponse, configuration); - - if (tokenResponse.IsError) - { - if (tokenResponse.ErrorDescription != null) - { - throw new AbpException($"Could not get token from the OpenId Connect server! ErrorType: {tokenResponse.ErrorType}. Error: {tokenResponse.Error}. ErrorDescription: {tokenResponse.ErrorDescription}. HttpStatusCode: {tokenResponse.HttpStatusCode}"); - } - - var rawError = tokenResponse.Raw; - var withoutInnerException = rawError.Split(new string[] { "" }, StringSplitOptions.RemoveEmptyEntries); - throw new AbpException(withoutInnerException[0]); - } - - return tokenResponse; - } - } -} diff --git a/aspnet-core/framework/common/LINGYUN.Abp.IdentityModel/README.md b/aspnet-core/framework/common/LINGYUN.Abp.IdentityModel/README.md deleted file mode 100644 index 54b9056d7..000000000 --- a/aspnet-core/framework/common/LINGYUN.Abp.IdentityModel/README.md +++ /dev/null @@ -1,19 +0,0 @@ -# LINGYUN.Abp.IdentityModel - -abp框架 **IIdentityModelAuthenticationService**接口缓存版本 - -因官方**Volo.Abp.IdentityModel**模块没有对接口授权缓存,每次内部调用都会请求IDS服务器,会加重IDS服务器压力, -创建使用缓存的接口实现 - -## 配置使用 - -模块按需引用，需要配置**Volo.Abp.IdentityModel**模块所需配置项 - - -```csharp -[DependsOn(typeof(AbpCachedIdentityModelModule))] -public class YouProjectModule : AbpModule -{ - // other -} -``` \ No newline at end of file diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/FodyWeavers.xml b/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/FodyWeavers.xml deleted file mode 100644 index 1715698cc..000000000 --- a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN.Abp.Localization.Dynamic.csproj b/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN.Abp.Localization.Dynamic.csproj deleted file mode 100644 index 67d3258fb..000000000 --- a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN.Abp.Localization.Dynamic.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - netstandard2.0 - - - - - - - - - diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/AbpLocalizationDynamicModule.cs b/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/AbpLocalizationDynamicModule.cs deleted file mode 100644 index cc4d68af9..000000000 --- a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/AbpLocalizationDynamicModule.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.EventBus; -using Volo.Abp.Localization; -using Volo.Abp.Modularity; - -namespace LINGYUN.Abp.Localization.Dynamic -{ - [DependsOn( - typeof(AbpEventBusModule), - typeof(AbpLocalizationModule))] - public class AbpLocalizationDynamicModule : AbpModule - { - public override void ConfigureServices(ServiceConfigurationContext context) - { - context.Services.AddHostedService(); - } - } -} diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/AbpLocalizationDynamicOptions.cs b/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/AbpLocalizationDynamicOptions.cs deleted file mode 100644 index 2005df74d..000000000 --- a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/AbpLocalizationDynamicOptions.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Collections.Generic; -using Volo.Abp.Localization; - -namespace LINGYUN.Abp.Localization.Dynamic -{ - public class AbpLocalizationDynamicOptions - { - internal LocalizationDictionary LocalizationDictionary { get; } - - public AbpLocalizationDynamicOptions() - { - LocalizationDictionary = new LocalizationDictionary(); - } - - internal void AddOrUpdate(string resourceName, Dictionary dictionares) - { - var _dictionares = LocalizationDictionary - .GetOrAdd(resourceName, () => new Dictionary()); - _dictionares.AddIfNotContains(dictionares); - } - } -} diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/DefaultLocalizationStore.cs b/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/DefaultLocalizationStore.cs deleted file mode 100644 index 0ecc50c70..000000000 --- a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/DefaultLocalizationStore.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Localization; - -namespace LINGYUN.Abp.Localization.Dynamic -{ - public class DefaultLocalizationStore : ILocalizationStore, ITransientDependency - { - public DefaultLocalizationStore() - { - } - - public Task>> GetAllLocalizationDictionaryAsync(CancellationToken cancellationToken = default) - { - return Task.FromResult(new Dictionary>()); - } - - public Task> GetLanguageListAsync(CancellationToken cancellationToken = default) - { - return Task.FromResult(new List()); - } - - public Task> GetLocalizationDictionaryAsync(string resourceName, CancellationToken cancellationToken = default) - { - return Task.FromResult(new Dictionary()); - } - - public Task ResourceExistsAsync(string resourceName, CancellationToken cancellationToken = default) - { - return Task.FromResult(false); - } - } -} diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/DynamicLanguageProvider.cs b/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/DynamicLanguageProvider.cs deleted file mode 100644 index b580f7a4b..000000000 --- a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/DynamicLanguageProvider.cs +++ /dev/null @@ -1,42 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Options; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Localization; - -namespace LINGYUN.Abp.Localization.Dynamic -{ - [Dependency(ServiceLifetime.Transient, ReplaceServices = true)] - [ExposeServices( - typeof(ILanguageProvider), - typeof(DynamicLanguageProvider))] - public class DynamicLanguageProvider : ILanguageProvider - { - protected ILocalizationStore Store { get; } - protected AbpLocalizationOptions Options { get; } - - public DynamicLanguageProvider( - ILocalizationStore store, - IOptions options) - { - Store = store; - Options = options.Value; - } - - public async virtual Task> GetLanguagesAsync() - { - var languages = await Store.GetLanguageListAsync(); - - if (!languages.Any()) - { - return Options.Languages; - } - - return languages - .Distinct(new LanguageInfoComparer()) - .ToList(); - } - } -} diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/DynamicLocalizationInitializeService.cs b/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/DynamicLocalizationInitializeService.cs deleted file mode 100644 index 304d08d70..000000000 --- a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/DynamicLocalizationInitializeService.cs +++ /dev/null @@ -1,49 +0,0 @@ -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Options; -using System; -using System.Threading; -using System.Threading.Tasks; -using Volo.Abp.Localization; - -namespace LINGYUN.Abp.Localization.Dynamic -{ - public class DynamicLocalizationInitializeService : BackgroundService - { - protected ILocalizationStore Store { get; } - protected AbpLocalizationOptions LocalizationOptions { get; } - protected AbpLocalizationDynamicOptions DynamicOptions { get; } - - public DynamicLocalizationInitializeService( - ILocalizationStore store, - IOptions localizationOptions, - IOptions dynamicOptions) - { - Store = store; - DynamicOptions = dynamicOptions.Value; - LocalizationOptions = localizationOptions.Value; - } - - protected async override Task ExecuteAsync(CancellationToken stoppingToken) - { - try - { - var resourceTexts = await Store.GetAllLocalizationDictionaryAsync(stoppingToken); - - foreach (var resource in LocalizationOptions.Resources) - { - foreach (var contributor in resource.Value.Contributors) - { - if (contributor.GetType().IsAssignableFrom(typeof(DynamicLocalizationResourceContributor))) - { - if (resourceTexts.TryGetValue(resource.Value.ResourceName, out var resourceLocalizationDic)) - { - DynamicOptions.AddOrUpdate(resource.Value.ResourceName, resourceLocalizationDic); - } - } - } - } - } - catch (OperationCanceledException) { } // 忽略此异常 - } - } -} diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/DynamicLocalizationResourceContributor.cs b/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/DynamicLocalizationResourceContributor.cs deleted file mode 100644 index 71880f5b5..000000000 --- a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/DynamicLocalizationResourceContributor.cs +++ /dev/null @@ -1,41 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Localization; -using Microsoft.Extensions.Options; -using System.Collections.Generic; -using Volo.Abp.Localization; - -namespace LINGYUN.Abp.Localization.Dynamic -{ - public class DynamicLocalizationResourceContributor : ILocalizationResourceContributor - { - private readonly string _resourceName; - - private AbpLocalizationDynamicOptions _options; - - public DynamicLocalizationResourceContributor(string resourceName) - { - _resourceName = resourceName; - } - - public virtual void Initialize(LocalizationResourceInitializationContext context) - { - _options = context.ServiceProvider.GetService>().Value; - } - - public virtual void Fill(string cultureName, Dictionary dictionary) - { - GetDictionaries().GetOrDefault(cultureName)?.Fill(dictionary); - } - - public virtual LocalizedString GetOrNull(string cultureName, string name) - { - return GetDictionaries().GetOrDefault(cultureName)?.GetOrNull(name); - } - - protected virtual Dictionary GetDictionaries() - { - return _options.LocalizationDictionary - .GetOrAdd(_resourceName, () => new Dictionary()); - } - } -} diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/ILocalizationStore.cs b/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/ILocalizationStore.cs deleted file mode 100644 index 371ffc987..000000000 --- a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/ILocalizationStore.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; -using Volo.Abp.Localization; - -namespace LINGYUN.Abp.Localization.Dynamic -{ - public interface ILocalizationStore - { - /// - /// 获取语言列表 - /// - /// - /// - Task> GetLanguageListAsync( - CancellationToken cancellationToken = default); - /// - /// 资源是否存在 - /// - /// 资源名称 - /// - /// - Task ResourceExistsAsync( - string resourceName, - CancellationToken cancellationToken = default); - /// - /// 获取当前资源下的本地化字典 - /// - /// 资源名称 - /// - /// - Task> GetLocalizationDictionaryAsync( - string resourceName, - CancellationToken cancellationToken = default); - /// - /// 获取所有资源本地化字典 - /// - /// - /// - Task>> GetAllLocalizationDictionaryAsync(CancellationToken cancellationToken = default); - } -} diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/LanguageInfoComparer.cs b/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/LanguageInfoComparer.cs deleted file mode 100644 index 492eaa2b7..000000000 --- a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/LanguageInfoComparer.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Collections.Generic; -using Volo.Abp.Localization; - -namespace LINGYUN.Abp.Localization.Dynamic -{ - public class LanguageInfoComparer : IEqualityComparer - { - public bool Equals(LanguageInfo x, LanguageInfo y) - { - if (x == null || y == null) - { - return false; - } - - return x.CultureName.Equals(y.CultureName); - } - - public int GetHashCode(LanguageInfo obj) - { - return obj?.CultureName.GetHashCode() ?? GetHashCode(); - } - } -} diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/LocalizationCacheItem.cs b/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/LocalizationCacheItem.cs deleted file mode 100644 index c61b64bfb..000000000 --- a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/LocalizationCacheItem.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System.Collections.Generic; - -namespace LINGYUN.Abp.Localization.Dynamic -{ - public class LocalizationCacheItem - { - public string Resource { get; set; } - public string Culture { get; set; } - public List Texts { get; set; } - public LocalizationCacheItem() - { - Texts = new List(); - } - - public LocalizationCacheItem( - string resource, - string culture, - List texts) - { - Resource = resource; - Culture = culture; - Texts = texts; - } - - public static string NormalizeKey( - string resource, - string culture) - { - return $"p:Localization,r:{resource},c:{culture}"; - } - } - - public class LocalizationText - { - public string Key { get; set; } - public string Value { get; set; } - public LocalizationText() - { - - } - - public LocalizationText( - string key, - string value) - { - Key = key; - Value = value; - } - - } -} diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/LocalizationDictionary.cs b/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/LocalizationDictionary.cs deleted file mode 100644 index 3e38e7e1e..000000000 --- a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/LocalizationDictionary.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Collections.Generic; -using Volo.Abp.Localization; - -namespace LINGYUN.Abp.Localization.Dynamic -{ - public class LocalizationDictionary : Dictionary> - { - - } -} diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/LocalizationResetSynchronizer.cs b/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/LocalizationResetSynchronizer.cs deleted file mode 100644 index f259240d6..000000000 --- a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/LocalizationResetSynchronizer.cs +++ /dev/null @@ -1,72 +0,0 @@ -using Microsoft.Extensions.Localization; -using Microsoft.Extensions.Options; -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using Volo.Abp.DependencyInjection; -using Volo.Abp.EventBus.Distributed; -using Volo.Abp.Localization; - -namespace LINGYUN.Abp.Localization.Dynamic -{ - internal class LocalizationResetSynchronizer : - IDistributedEventHandler, - ITransientDependency - { - private readonly AbpLocalizationDynamicOptions _options; - - public LocalizationResetSynchronizer( - IOptions options) - { - _options = options.Value; - } - public virtual Task HandleEventAsync(LocalizedStringCacheResetEventData eventData) - { - var dictionaries = GetDictionaries(eventData.ResourceName); - if (!dictionaries.ContainsKey(eventData.CultureName)) - { - // TODO: 需要处理 data.Key data.Value 空引用 - var dictionary = new Dictionary(); - dictionary.Add(eventData.Key, new LocalizedString(eventData.Key, eventData.Value.NormalizeLineEndings())); - var newLocalizationDictionary = new StaticLocalizationDictionary(eventData.CultureName, dictionary); - - dictionaries.Add(eventData.CultureName, newLocalizationDictionary); - } - else - { - // 取出当前的缓存写入到新字典进行处理 - var nowLocalizationDictionary = dictionaries[eventData.CultureName]; - var dictionary = new Dictionary(); - nowLocalizationDictionary.Fill(dictionary); - - var existsKey = dictionary.ContainsKey(eventData.Key); - if (!existsKey) - { - // 如果不存在,则新增 - dictionary.Add(eventData.Key, new LocalizedString(eventData.Key, eventData.Value.NormalizeLineEndings())); - } - else if (existsKey && eventData.IsDeleted) - { - // 如果删掉了本地化的节点,删掉当前的缓存 - dictionary.Remove(eventData.Key); - } - - var newLocalizationDictionary = new StaticLocalizationDictionary(eventData.CultureName, dictionary); - - if (newLocalizationDictionary != null) - { - // 重新赋值变更过的缓存 - dictionaries[eventData.CultureName] = newLocalizationDictionary; - } - } - - return Task.CompletedTask; - } - - protected virtual Dictionary GetDictionaries(string resourceName) - { - return _options.LocalizationDictionary - .GetOrAdd(resourceName, () => new Dictionary()); - } - } -} diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/LocalizedStringCacheResetEventData.cs b/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/LocalizedStringCacheResetEventData.cs deleted file mode 100644 index ad0e870b9..000000000 --- a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/LINGYUN/Abp/Localization/Dynamic/LocalizedStringCacheResetEventData.cs +++ /dev/null @@ -1,29 +0,0 @@ -namespace LINGYUN.Abp.Localization.Dynamic -{ - public class LocalizedStringCacheResetEventData - { - public bool IsDeleted { get; set; } - public string ResourceName { get; set; } - public string CultureName { get; set; } - public string Key { get; set; } - public string Value { get; set; } - public LocalizedStringCacheResetEventData() - { - - } - - public LocalizedStringCacheResetEventData( - string resourceName, - string cultureName, - string key, - string value) - { - ResourceName = resourceName; - CultureName = cultureName; - Key = key; - Value = value; - - IsDeleted = false; - } - } -} diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/README.md b/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/README.md deleted file mode 100644 index 7b910e496..000000000 --- a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/README.md +++ /dev/null @@ -1,38 +0,0 @@ -# LINGYUN.Abp.Localization.Dynamic - -动态本地化提供者组件,添加动态提供者可实现运行时替换本地化文本 - -需要实现 ILocalizationStore 接口 - -LocalizationManagement项目提供支持 - -## 配置使用 - -```csharp -[DependsOn(typeof(AbpLocalizationDynamicModule))] -public class YouProjectModule : AbpModule -{ - // other - public override void ConfigureServices(ServiceConfigurationContext context) - { - Configure(options => - { - options.Resources - .Get() - .AddDynamic(); // 添加动态本地化文档支持 - - // 添加所有资源的动态文档支持,将监听所有的资源包文档变更事件 - // options.Resources.AddDynamic(); - - // 添加所有资源的动态文档支持,忽略 IdentityResource 资源 - // options.Resources.AddDynamic(typeof(IdentityResource)); - }); - } -} -``` - -## 注意事项 - -动态资源在启动时加载，如果通过LocalizationManagement模块查询，可能受后端存储资源体量影响整体启动时间 - -详情见: [DynamicLocalizationInitializeService](./LINGYUN/Abp/Localization/Dynamic/DynamicLocalizationInitializeService.cs#L25-L38) \ No newline at end of file diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/Volo/Abp/Localization/LocalizationResourceDictionaryExtensions.cs b/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/Volo/Abp/Localization/LocalizationResourceDictionaryExtensions.cs deleted file mode 100644 index b24c17728..000000000 --- a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/Volo/Abp/Localization/LocalizationResourceDictionaryExtensions.cs +++ /dev/null @@ -1,42 +0,0 @@ -using LINGYUN.Abp.Localization.Dynamic; -using System; -using System.Linq; - -namespace Volo.Abp.Localization -{ - public static class LocalizationResourceDictionaryExtensions - { - public static LocalizationResourceDictionary AddDynamic( - this LocalizationResourceDictionary resources, - params Type[] ignoreResourceTypes) - { - foreach (var resource in resources) - { - if (ShouldIgnoreType(resource.Key, ignoreResourceTypes)) - { - continue; - } - if (ShouldIgnoreType(resource.Value)) - { - continue; - } - resource.Value.AddDynamic(); - } - return resources; - } - - private static bool ShouldIgnoreType(Type resourceType, params Type[] ignoreResourceTypes) - { - if (ignoreResourceTypes == null) - { - return false; - } - return ignoreResourceTypes.Any(x => x == resourceType); - } - - private static bool ShouldIgnoreType(LocalizationResource resource) - { - return resource.Contributors.Exists(x => x is DynamicLocalizationResourceContributor); - } - } -} diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/Volo/Abp/Localization/LocalizationResourceExtensions.cs b/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/Volo/Abp/Localization/LocalizationResourceExtensions.cs deleted file mode 100644 index 56ae360f0..000000000 --- a/aspnet-core/framework/common/LINGYUN.Abp.Localization.Dynamic/Volo/Abp/Localization/LocalizationResourceExtensions.cs +++ /dev/null @@ -1,20 +0,0 @@ -using JetBrains.Annotations; -using LINGYUN.Abp.Localization.Dynamic; - -namespace Volo.Abp.Localization -{ - public static class DynamicLocalizationResourceExtensions - { - public static LocalizationResource AddDynamic( - [NotNull] this LocalizationResource localizationResource) - { - Check.NotNull(localizationResource, nameof(localizationResource)); - - localizationResource.Contributors.Add( - new DynamicLocalizationResourceContributor( - localizationResource.ResourceName)); - - return localizationResource; - } - } -} diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Location.Amap/LINGYUN.Abp.Location.Amap.csproj b/aspnet-core/framework/common/LINGYUN.Abp.Location.Amap/LINGYUN.Abp.Location.Amap.csproj index 4538b9a9e..94e43c8f1 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.Location.Amap/LINGYUN.Abp.Location.Amap.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.Location.Amap/LINGYUN.Abp.Location.Amap.csproj @@ -1,5 +1,8 @@ + + + netstandard2.0 @@ -16,10 +19,10 @@ - - - - + + + + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Location.Baidu/LINGYUN.Abp.Location.Baidu.csproj b/aspnet-core/framework/common/LINGYUN.Abp.Location.Baidu/LINGYUN.Abp.Location.Baidu.csproj index bf12c4e82..1fae7882d 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.Location.Baidu/LINGYUN.Abp.Location.Baidu.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.Location.Baidu/LINGYUN.Abp.Location.Baidu.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -18,10 +18,10 @@ - - - - + + + + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Location.Tencent/LINGYUN.Abp.Location.Tencent.csproj b/aspnet-core/framework/common/LINGYUN.Abp.Location.Tencent/LINGYUN.Abp.Location.Tencent.csproj index a77e70f7d..aee407408 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.Location.Tencent/LINGYUN.Abp.Location.Tencent.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.Location.Tencent/LINGYUN.Abp.Location.Tencent.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -18,10 +18,10 @@ - - - - + + + + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Location/LINGYUN.Abp.Location.csproj b/aspnet-core/framework/common/LINGYUN.Abp.Location/LINGYUN.Abp.Location.csproj index 42a07461e..e611b4a59 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.Location/LINGYUN.Abp.Location.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.Location/LINGYUN.Abp.Location.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -10,7 +10,7 @@ - + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.RealTime/LINGYUN.Abp.RealTime.csproj b/aspnet-core/framework/common/LINGYUN.Abp.RealTime/LINGYUN.Abp.RealTime.csproj index e44f02c63..80d9ff26c 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.RealTime/LINGYUN.Abp.RealTime.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.RealTime/LINGYUN.Abp.RealTime.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,9 +9,9 @@ - - - + + + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN.Abp.Sms.Aliyun.csproj b/aspnet-core/framework/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN.Abp.Sms.Aliyun.csproj index 415901aa3..1f9f993c9 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN.Abp.Sms.Aliyun.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN.Abp.Sms.Aliyun.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -10,17 +10,12 @@ - - + + - - - - - - + diff --git a/aspnet-core/framework/common/LINGYUN.Abp.Wrapper/LINGYUN.Abp.Wrapper.csproj b/aspnet-core/framework/common/LINGYUN.Abp.Wrapper/LINGYUN.Abp.Wrapper.csproj index 771e589ee..8f0936c07 100644 --- a/aspnet-core/framework/common/LINGYUN.Abp.Wrapper/LINGYUN.Abp.Wrapper.csproj +++ b/aspnet-core/framework/common/LINGYUN.Abp.Wrapper/LINGYUN.Abp.Wrapper.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/console/LINGYUN.Abp.Encryption.Console/LINGYUN.Abp.Encryption.Console.csproj b/aspnet-core/framework/console/LINGYUN.Abp.Encryption.Console/LINGYUN.Abp.Encryption.Console.csproj index df78d158d..218ca6e92 100644 --- a/aspnet-core/framework/console/LINGYUN.Abp.Encryption.Console/LINGYUN.Abp.Encryption.Console.csproj +++ b/aspnet-core/framework/console/LINGYUN.Abp.Encryption.Console/LINGYUN.Abp.Encryption.Console.csproj @@ -6,7 +6,7 @@ - + diff --git a/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr.Actors.AspNetCore.Wrapper/LINGYUN.Abp.Dapr.Actors.AspNetCore.Wrapper.csproj b/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr.Actors.AspNetCore.Wrapper/LINGYUN.Abp.Dapr.Actors.AspNetCore.Wrapper.csproj index 18a24ef67..e090a48a9 100644 --- a/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr.Actors.AspNetCore.Wrapper/LINGYUN.Abp.Dapr.Actors.AspNetCore.Wrapper.csproj +++ b/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr.Actors.AspNetCore.Wrapper/LINGYUN.Abp.Dapr.Actors.AspNetCore.Wrapper.csproj @@ -1,7 +1,7 @@ - - + + net8.0 diff --git a/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr.Actors.AspNetCore/LINGYUN.Abp.Dapr.Actors.AspNetCore.csproj b/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr.Actors.AspNetCore/LINGYUN.Abp.Dapr.Actors.AspNetCore.csproj index 9944a22d8..7cab47c8d 100644 --- a/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr.Actors.AspNetCore/LINGYUN.Abp.Dapr.Actors.AspNetCore.csproj +++ b/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr.Actors.AspNetCore/LINGYUN.Abp.Dapr.Actors.AspNetCore.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr.Actors/LINGYUN.Abp.Dapr.Actors.csproj b/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr.Actors/LINGYUN.Abp.Dapr.Actors.csproj index b5d4c44bd..047197726 100644 --- a/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr.Actors/LINGYUN.Abp.Dapr.Actors.csproj +++ b/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr.Actors/LINGYUN.Abp.Dapr.Actors.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - - + + diff --git a/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr.Client.Wrapper/LINGYUN.Abp.Dapr.Client.Wrapper.csproj b/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr.Client.Wrapper/LINGYUN.Abp.Dapr.Client.Wrapper.csproj index 9cea10975..c5dc53099 100644 --- a/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr.Client.Wrapper/LINGYUN.Abp.Dapr.Client.Wrapper.csproj +++ b/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr.Client.Wrapper/LINGYUN.Abp.Dapr.Client.Wrapper.csproj @@ -1,7 +1,7 @@ - - + + net8.0 diff --git a/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr.Client/LINGYUN.Abp.Dapr.Client.csproj b/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr.Client/LINGYUN.Abp.Dapr.Client.csproj index 5e2ab3fc6..cb37cce1a 100644 --- a/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr.Client/LINGYUN.Abp.Dapr.Client.csproj +++ b/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr.Client/LINGYUN.Abp.Dapr.Client.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr/LINGYUN.Abp.Dapr.csproj b/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr/LINGYUN.Abp.Dapr.csproj index acb78354e..e33433ddd 100644 --- a/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr/LINGYUN.Abp.Dapr.csproj +++ b/aspnet-core/framework/dapr/LINGYUN.Abp.Dapr/LINGYUN.Abp.Dapr.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/framework/dapr/LINGYUN.Abp.DistributedLocking.Dapr/LINGYUN.Abp.DistributedLocking.Dapr.csproj b/aspnet-core/framework/dapr/LINGYUN.Abp.DistributedLocking.Dapr/LINGYUN.Abp.DistributedLocking.Dapr.csproj index 93fba7354..9ffedd46c 100644 --- a/aspnet-core/framework/dapr/LINGYUN.Abp.DistributedLocking.Dapr/LINGYUN.Abp.DistributedLocking.Dapr.csproj +++ b/aspnet-core/framework/dapr/LINGYUN.Abp.DistributedLocking.Dapr/LINGYUN.Abp.DistributedLocking.Dapr.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,9 +9,9 @@ - - - + + + diff --git a/aspnet-core/framework/data-protection/LINGYUN.Abp.DataProtection.EntityFrameworkCore/LINGYUN.Abp.DataProtection.EntityFrameworkCore.csproj b/aspnet-core/framework/data-protection/LINGYUN.Abp.DataProtection.EntityFrameworkCore/LINGYUN.Abp.DataProtection.EntityFrameworkCore.csproj index 3d1f5a273..19a0fd98a 100644 --- a/aspnet-core/framework/data-protection/LINGYUN.Abp.DataProtection.EntityFrameworkCore/LINGYUN.Abp.DataProtection.EntityFrameworkCore.csproj +++ b/aspnet-core/framework/data-protection/LINGYUN.Abp.DataProtection.EntityFrameworkCore/LINGYUN.Abp.DataProtection.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -10,7 +10,7 @@ - + diff --git a/aspnet-core/framework/data-protection/LINGYUN.Abp.DataProtection/LINGYUN.Abp.DataProtection.csproj b/aspnet-core/framework/data-protection/LINGYUN.Abp.DataProtection/LINGYUN.Abp.DataProtection.csproj index d012adbc6..a7cb3454c 100644 --- a/aspnet-core/framework/data-protection/LINGYUN.Abp.DataProtection/LINGYUN.Abp.DataProtection.csproj +++ b/aspnet-core/framework/data-protection/LINGYUN.Abp.DataProtection/LINGYUN.Abp.DataProtection.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application.Contracts/LINGYUN.Abp.Dynamic.Queryable.Application.Contracts.csproj b/aspnet-core/framework/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application.Contracts/LINGYUN.Abp.Dynamic.Queryable.Application.Contracts.csproj index edb6a4681..6b1a73e80 100644 --- a/aspnet-core/framework/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application.Contracts/LINGYUN.Abp.Dynamic.Queryable.Application.Contracts.csproj +++ b/aspnet-core/framework/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application.Contracts/LINGYUN.Abp.Dynamic.Queryable.Application.Contracts.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application/LINGYUN.Abp.Dynamic.Queryable.Application.csproj b/aspnet-core/framework/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application/LINGYUN.Abp.Dynamic.Queryable.Application.csproj index 73797161d..318aa61ad 100644 --- a/aspnet-core/framework/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application/LINGYUN.Abp.Dynamic.Queryable.Application.csproj +++ b/aspnet-core/framework/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.Application/LINGYUN.Abp.Dynamic.Queryable.Application.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.HttpApi/LINGYUN.Abp.Dynamic.Queryable.HttpApi.csproj b/aspnet-core/framework/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.HttpApi/LINGYUN.Abp.Dynamic.Queryable.HttpApi.csproj index 3ce22b734..df1dc789a 100644 --- a/aspnet-core/framework/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.HttpApi/LINGYUN.Abp.Dynamic.Queryable.HttpApi.csproj +++ b/aspnet-core/framework/dynamic-queryable/LINGYUN.Abp.Dynamic.Queryable.HttpApi/LINGYUN.Abp.Dynamic.Queryable.HttpApi.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/dynamic-queryable/LINGYUN.Linq.Dynamic.Queryable/LINGYUN.Linq.Dynamic.Queryable.csproj b/aspnet-core/framework/dynamic-queryable/LINGYUN.Linq.Dynamic.Queryable/LINGYUN.Linq.Dynamic.Queryable.csproj index c7f4af453..797f2ce0f 100644 --- a/aspnet-core/framework/dynamic-queryable/LINGYUN.Linq.Dynamic.Queryable/LINGYUN.Linq.Dynamic.Queryable.csproj +++ b/aspnet-core/framework/dynamic-queryable/LINGYUN.Linq.Dynamic.Queryable/LINGYUN.Linq.Dynamic.Queryable.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/framework/elasticsearch/LINGYUN.Abp.Elasticsearch/LINGYUN.Abp.Elasticsearch.csproj b/aspnet-core/framework/elasticsearch/LINGYUN.Abp.Elasticsearch/LINGYUN.Abp.Elasticsearch.csproj index effa1aeb2..116d8d49d 100644 --- a/aspnet-core/framework/elasticsearch/LINGYUN.Abp.Elasticsearch/LINGYUN.Abp.Elasticsearch.csproj +++ b/aspnet-core/framework/elasticsearch/LINGYUN.Abp.Elasticsearch/LINGYUN.Abp.Elasticsearch.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/framework/entity-change/LINGYUN.Abp.EntityChange.Application.Contracts/LINGYUN.Abp.EntityChange.Application.Contracts.csproj b/aspnet-core/framework/entity-change/LINGYUN.Abp.EntityChange.Application.Contracts/LINGYUN.Abp.EntityChange.Application.Contracts.csproj index dbf1533f8..f394bfa99 100644 --- a/aspnet-core/framework/entity-change/LINGYUN.Abp.EntityChange.Application.Contracts/LINGYUN.Abp.EntityChange.Application.Contracts.csproj +++ b/aspnet-core/framework/entity-change/LINGYUN.Abp.EntityChange.Application.Contracts/LINGYUN.Abp.EntityChange.Application.Contracts.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -17,7 +17,7 @@ - + diff --git a/aspnet-core/framework/entity-change/LINGYUN.Abp.EntityChange.Application/LINGYUN.Abp.EntityChange.Application.csproj b/aspnet-core/framework/entity-change/LINGYUN.Abp.EntityChange.Application/LINGYUN.Abp.EntityChange.Application.csproj index ec878b93e..a66d30472 100644 --- a/aspnet-core/framework/entity-change/LINGYUN.Abp.EntityChange.Application/LINGYUN.Abp.EntityChange.Application.csproj +++ b/aspnet-core/framework/entity-change/LINGYUN.Abp.EntityChange.Application/LINGYUN.Abp.EntityChange.Application.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/framework/entity-change/LINGYUN.Abp.EntityChange.HttpApi/LINGYUN.Abp.EntityChange.HttpApi.csproj b/aspnet-core/framework/entity-change/LINGYUN.Abp.EntityChange.HttpApi/LINGYUN.Abp.EntityChange.HttpApi.csproj index 90d887274..8e5619c4b 100644 --- a/aspnet-core/framework/entity-change/LINGYUN.Abp.EntityChange.HttpApi/LINGYUN.Abp.EntityChange.HttpApi.csproj +++ b/aspnet-core/framework/entity-change/LINGYUN.Abp.EntityChange.HttpApi/LINGYUN.Abp.EntityChange.HttpApi.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/features/LINGYUN.Abp.FeatureManagement.Client/LINGYUN.Abp.FeatureManagement.Client.csproj b/aspnet-core/framework/features/LINGYUN.Abp.FeatureManagement.Client/LINGYUN.Abp.FeatureManagement.Client.csproj index 0999c6c8f..9b1cfd838 100644 --- a/aspnet-core/framework/features/LINGYUN.Abp.FeatureManagement.Client/LINGYUN.Abp.FeatureManagement.Client.csproj +++ b/aspnet-core/framework/features/LINGYUN.Abp.FeatureManagement.Client/LINGYUN.Abp.FeatureManagement.Client.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -14,8 +14,8 @@ - - + + diff --git a/aspnet-core/framework/features/LINGYUN.Abp.Features.Client/LINGYUN.Abp.Features.Client.csproj b/aspnet-core/framework/features/LINGYUN.Abp.Features.Client/LINGYUN.Abp.Features.Client.csproj index 984335a74..ee9a1dd77 100644 --- a/aspnet-core/framework/features/LINGYUN.Abp.Features.Client/LINGYUN.Abp.Features.Client.csproj +++ b/aspnet-core/framework/features/LINGYUN.Abp.Features.Client/LINGYUN.Abp.Features.Client.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN.Abp.AspNetCore.Mvc.Localization.csproj b/aspnet-core/framework/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN.Abp.AspNetCore.Mvc.Localization.csproj index 2b4637db2..68995e5c5 100644 --- a/aspnet-core/framework/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN.Abp.AspNetCore.Mvc.Localization.csproj +++ b/aspnet-core/framework/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN.Abp.AspNetCore.Mvc.Localization.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -17,7 +17,7 @@ - + diff --git a/aspnet-core/framework/localization/LINGYUN.Abp.Localization.CultureMap/LINGYUN.Abp.Localization.CultureMap.csproj b/aspnet-core/framework/localization/LINGYUN.Abp.Localization.CultureMap/LINGYUN.Abp.Localization.CultureMap.csproj index 2443d548d..2298ea3fd 100644 --- a/aspnet-core/framework/localization/LINGYUN.Abp.Localization.CultureMap/LINGYUN.Abp.Localization.CultureMap.csproj +++ b/aspnet-core/framework/localization/LINGYUN.Abp.Localization.CultureMap/LINGYUN.Abp.Localization.CultureMap.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/localization/LINGYUN.Abp.Localization.Json/LINGYUN.Abp.Localization.Json.csproj b/aspnet-core/framework/localization/LINGYUN.Abp.Localization.Json/LINGYUN.Abp.Localization.Json.csproj index 9cbe3915e..b0727fea2 100644 --- a/aspnet-core/framework/localization/LINGYUN.Abp.Localization.Json/LINGYUN.Abp.Localization.Json.csproj +++ b/aspnet-core/framework/localization/LINGYUN.Abp.Localization.Json/LINGYUN.Abp.Localization.Json.csproj @@ -1,6 +1,7 @@ - + + netstandard2.0 @@ -8,8 +9,8 @@ - - + + diff --git a/aspnet-core/framework/localization/LINGYUN.Abp.Localization.Persistence/LINGYUN.Abp.Localization.Persistence.csproj b/aspnet-core/framework/localization/LINGYUN.Abp.Localization.Persistence/LINGYUN.Abp.Localization.Persistence.csproj index f24dfbb81..903836158 100644 --- a/aspnet-core/framework/localization/LINGYUN.Abp.Localization.Persistence/LINGYUN.Abp.Localization.Persistence.csproj +++ b/aspnet-core/framework/localization/LINGYUN.Abp.Localization.Persistence/LINGYUN.Abp.Localization.Persistence.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/localization/LINGYUN.Abp.Localization.Xml/LINGYUN.Abp.Localization.Xml.csproj b/aspnet-core/framework/localization/LINGYUN.Abp.Localization.Xml/LINGYUN.Abp.Localization.Xml.csproj index 0bcb40dc0..b0727fea2 100644 --- a/aspnet-core/framework/localization/LINGYUN.Abp.Localization.Xml/LINGYUN.Abp.Localization.Xml.csproj +++ b/aspnet-core/framework/localization/LINGYUN.Abp.Localization.Xml/LINGYUN.Abp.Localization.Xml.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/framework/localization/LINGYUN.Abp.Localization/LINGYUN.Abp.Localization.csproj b/aspnet-core/framework/localization/LINGYUN.Abp.Localization/LINGYUN.Abp.Localization.csproj deleted file mode 100644 index 1062b61c3..000000000 --- a/aspnet-core/framework/localization/LINGYUN.Abp.Localization/LINGYUN.Abp.Localization.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - netstandard2.0 - - - - - - - - - - - - diff --git a/aspnet-core/framework/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN.Abp.Logging.Serilog.Elasticsearch.csproj b/aspnet-core/framework/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN.Abp.Logging.Serilog.Elasticsearch.csproj index 7f378153e..6330a774a 100644 --- a/aspnet-core/framework/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN.Abp.Logging.Serilog.Elasticsearch.csproj +++ b/aspnet-core/framework/logging/LINGYUN.Abp.Logging.Serilog.Elasticsearch/LINGYUN.Abp.Logging.Serilog.Elasticsearch.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.1 @@ -9,9 +9,9 @@ - - - + + + diff --git a/aspnet-core/framework/logging/LINGYUN.Abp.Logging/LINGYUN.Abp.Logging.csproj b/aspnet-core/framework/logging/LINGYUN.Abp.Logging/LINGYUN.Abp.Logging.csproj index 1e8e1ace6..020f81c7f 100644 --- a/aspnet-core/framework/logging/LINGYUN.Abp.Logging/LINGYUN.Abp.Logging.csproj +++ b/aspnet-core/framework/logging/LINGYUN.Abp.Logging/LINGYUN.Abp.Logging.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/logging/LINGYUN.Abp.Serilog.Enrichers.Application/LINGYUN.Abp.Serilog.Enrichers.Application.csproj b/aspnet-core/framework/logging/LINGYUN.Abp.Serilog.Enrichers.Application/LINGYUN.Abp.Serilog.Enrichers.Application.csproj index be06b024b..a062dce15 100644 --- a/aspnet-core/framework/logging/LINGYUN.Abp.Serilog.Enrichers.Application/LINGYUN.Abp.Serilog.Enrichers.Application.csproj +++ b/aspnet-core/framework/logging/LINGYUN.Abp.Serilog.Enrichers.Application/LINGYUN.Abp.Serilog.Enrichers.Application.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/framework/logging/LINGYUN.Abp.Serilog.Enrichers.UniqueId/LINGYUN.Abp.Serilog.Enrichers.UniqueId.csproj b/aspnet-core/framework/logging/LINGYUN.Abp.Serilog.Enrichers.UniqueId/LINGYUN.Abp.Serilog.Enrichers.UniqueId.csproj index bc3ce92b0..837aa3f4d 100644 --- a/aspnet-core/framework/logging/LINGYUN.Abp.Serilog.Enrichers.UniqueId/LINGYUN.Abp.Serilog.Enrichers.UniqueId.csproj +++ b/aspnet-core/framework/logging/LINGYUN.Abp.Serilog.Enrichers.UniqueId/LINGYUN.Abp.Serilog.Enrichers.UniqueId.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/mvc/LINGYUN.Abp.AspNetCore.Mvc.Idempotent.Wrapper/LINGYUN.Abp.AspNetCore.Mvc.Idempotent.Wrapper.csproj b/aspnet-core/framework/mvc/LINGYUN.Abp.AspNetCore.Mvc.Idempotent.Wrapper/LINGYUN.Abp.AspNetCore.Mvc.Idempotent.Wrapper.csproj index df6e45470..64fe150a7 100644 --- a/aspnet-core/framework/mvc/LINGYUN.Abp.AspNetCore.Mvc.Idempotent.Wrapper/LINGYUN.Abp.AspNetCore.Mvc.Idempotent.Wrapper.csproj +++ b/aspnet-core/framework/mvc/LINGYUN.Abp.AspNetCore.Mvc.Idempotent.Wrapper/LINGYUN.Abp.AspNetCore.Mvc.Idempotent.Wrapper.csproj @@ -1,7 +1,7 @@  - - + + net8.0 diff --git a/aspnet-core/framework/mvc/LINGYUN.Abp.AspNetCore.Mvc.Idempotent/LINGYUN.Abp.AspNetCore.Mvc.Idempotent.csproj b/aspnet-core/framework/mvc/LINGYUN.Abp.AspNetCore.Mvc.Idempotent/LINGYUN.Abp.AspNetCore.Mvc.Idempotent.csproj index 065ee5bf3..bdf8baacb 100644 --- a/aspnet-core/framework/mvc/LINGYUN.Abp.AspNetCore.Mvc.Idempotent/LINGYUN.Abp.AspNetCore.Mvc.Idempotent.csproj +++ b/aspnet-core/framework/mvc/LINGYUN.Abp.AspNetCore.Mvc.Idempotent/LINGYUN.Abp.AspNetCore.Mvc.Idempotent.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/mvc/LINGYUN.Abp.AspNetCore.Mvc.Wrapper/LINGYUN.Abp.AspNetCore.Mvc.Wrapper.csproj b/aspnet-core/framework/mvc/LINGYUN.Abp.AspNetCore.Mvc.Wrapper/LINGYUN.Abp.AspNetCore.Mvc.Wrapper.csproj index 5d3dd5549..c3929b190 100644 --- a/aspnet-core/framework/mvc/LINGYUN.Abp.AspNetCore.Mvc.Wrapper/LINGYUN.Abp.AspNetCore.Mvc.Wrapper.csproj +++ b/aspnet-core/framework/mvc/LINGYUN.Abp.AspNetCore.Mvc.Wrapper/LINGYUN.Abp.AspNetCore.Mvc.Wrapper.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -17,7 +17,7 @@ - + diff --git a/aspnet-core/framework/navigation/LINGYUN.Abp.UI.Navigation/LINGYUN.Abp.UI.Navigation.csproj b/aspnet-core/framework/navigation/LINGYUN.Abp.UI.Navigation/LINGYUN.Abp.UI.Navigation.csproj index e70a2762e..4f304bff9 100644 --- a/aspnet-core/framework/navigation/LINGYUN.Abp.UI.Navigation/LINGYUN.Abp.UI.Navigation.csproj +++ b/aspnet-core/framework/navigation/LINGYUN.Abp.UI.Navigation/LINGYUN.Abp.UI.Navigation.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/framework/nexus/LINGYUN.Abp.BlobStoring.Nexus/LINGYUN.Abp.BlobStoring.Nexus.csproj b/aspnet-core/framework/nexus/LINGYUN.Abp.BlobStoring.Nexus/LINGYUN.Abp.BlobStoring.Nexus.csproj index 65dc76e53..98d398801 100644 --- a/aspnet-core/framework/nexus/LINGYUN.Abp.BlobStoring.Nexus/LINGYUN.Abp.BlobStoring.Nexus.csproj +++ b/aspnet-core/framework/nexus/LINGYUN.Abp.BlobStoring.Nexus/LINGYUN.Abp.BlobStoring.Nexus.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -10,7 +10,7 @@ - + diff --git a/aspnet-core/framework/nexus/LINGYUN.Abp.Sonatype.Nexus/LINGYUN.Abp.Sonatype.Nexus.csproj b/aspnet-core/framework/nexus/LINGYUN.Abp.Sonatype.Nexus/LINGYUN.Abp.Sonatype.Nexus.csproj index e0e5d8f12..a75e050a8 100644 --- a/aspnet-core/framework/nexus/LINGYUN.Abp.Sonatype.Nexus/LINGYUN.Abp.Sonatype.Nexus.csproj +++ b/aspnet-core/framework/nexus/LINGYUN.Abp.Sonatype.Nexus/LINGYUN.Abp.Sonatype.Nexus.csproj @@ -1,7 +1,7 @@ - + - - + + netstandard2.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/framework/open-api/LINGYUN.Abp.OpenApi.Authorization/LINGYUN.Abp.OpenApi.Authorization.csproj b/aspnet-core/framework/open-api/LINGYUN.Abp.OpenApi.Authorization/LINGYUN.Abp.OpenApi.Authorization.csproj index ee35b88cd..baba1b680 100644 --- a/aspnet-core/framework/open-api/LINGYUN.Abp.OpenApi.Authorization/LINGYUN.Abp.OpenApi.Authorization.csproj +++ b/aspnet-core/framework/open-api/LINGYUN.Abp.OpenApi.Authorization/LINGYUN.Abp.OpenApi.Authorization.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/open-api/LINGYUN.Abp.OpenApi/LINGYUN.Abp.OpenApi.csproj b/aspnet-core/framework/open-api/LINGYUN.Abp.OpenApi/LINGYUN.Abp.OpenApi.csproj index 62609b9f6..9e02123db 100644 --- a/aspnet-core/framework/open-api/LINGYUN.Abp.OpenApi/LINGYUN.Abp.OpenApi.csproj +++ b/aspnet-core/framework/open-api/LINGYUN.Abp.OpenApi/LINGYUN.Abp.OpenApi.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -17,8 +17,8 @@ - - + + diff --git a/aspnet-core/framework/open-api/OpenApi.Sdk/OpenApi.Sdk.csproj b/aspnet-core/framework/open-api/OpenApi.Sdk/OpenApi.Sdk.csproj index aebf746c8..92151efd1 100644 --- a/aspnet-core/framework/open-api/OpenApi.Sdk/OpenApi.Sdk.csproj +++ b/aspnet-core/framework/open-api/OpenApi.Sdk/OpenApi.Sdk.csproj @@ -1,5 +1,8 @@ + + + netstandard2.0 false @@ -8,8 +11,8 @@ - - + + diff --git a/aspnet-core/framework/pushplus/LINGYUN.Abp.PushPlus.SettingManagement/LINGYUN.Abp.PushPlus.SettingManagement.csproj b/aspnet-core/framework/pushplus/LINGYUN.Abp.PushPlus.SettingManagement/LINGYUN.Abp.PushPlus.SettingManagement.csproj index eb05da163..a4b9ccfd5 100644 --- a/aspnet-core/framework/pushplus/LINGYUN.Abp.PushPlus.SettingManagement/LINGYUN.Abp.PushPlus.SettingManagement.csproj +++ b/aspnet-core/framework/pushplus/LINGYUN.Abp.PushPlus.SettingManagement/LINGYUN.Abp.PushPlus.SettingManagement.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -17,8 +17,8 @@ - - + + diff --git a/aspnet-core/framework/pushplus/LINGYUN.Abp.PushPlus/LINGYUN.Abp.PushPlus.csproj b/aspnet-core/framework/pushplus/LINGYUN.Abp.PushPlus/LINGYUN.Abp.PushPlus.csproj index 798960dd2..5d51f81c1 100644 --- a/aspnet-core/framework/pushplus/LINGYUN.Abp.PushPlus/LINGYUN.Abp.PushPlus.csproj +++ b/aspnet-core/framework/pushplus/LINGYUN.Abp.PushPlus/LINGYUN.Abp.PushPlus.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -17,9 +17,9 @@ - - - + + + diff --git a/aspnet-core/framework/rules/LINGYUN.Abp.Rules.NRules/LINGYUN.Abp.Rules.NRules.csproj b/aspnet-core/framework/rules/LINGYUN.Abp.Rules.NRules/LINGYUN.Abp.Rules.NRules.csproj index c37f286dc..f1dc8fdcd 100644 --- a/aspnet-core/framework/rules/LINGYUN.Abp.Rules.NRules/LINGYUN.Abp.Rules.NRules.csproj +++ b/aspnet-core/framework/rules/LINGYUN.Abp.Rules.NRules/LINGYUN.Abp.Rules.NRules.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/rules/LINGYUN.Abp.Rules.RulesEngine/LINGYUN.Abp.Rules.RulesEngine.csproj b/aspnet-core/framework/rules/LINGYUN.Abp.Rules.RulesEngine/LINGYUN.Abp.Rules.RulesEngine.csproj index 0087ac941..f44d62501 100644 --- a/aspnet-core/framework/rules/LINGYUN.Abp.Rules.RulesEngine/LINGYUN.Abp.Rules.RulesEngine.csproj +++ b/aspnet-core/framework/rules/LINGYUN.Abp.Rules.RulesEngine/LINGYUN.Abp.Rules.RulesEngine.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,9 +9,9 @@ - - - + + + diff --git a/aspnet-core/framework/rules/LINGYUN.Abp.Rules/LINGYUN.Abp.Rules.csproj b/aspnet-core/framework/rules/LINGYUN.Abp.Rules/LINGYUN.Abp.Rules.csproj index f8c807a24..6338ff173 100644 --- a/aspnet-core/framework/rules/LINGYUN.Abp.Rules/LINGYUN.Abp.Rules.csproj +++ b/aspnet-core/framework/rules/LINGYUN.Abp.Rules/LINGYUN.Abp.Rules.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/security/LINGYUN.Abp.Security/LINGYUN.Abp.Security.csproj b/aspnet-core/framework/security/LINGYUN.Abp.Security/LINGYUN.Abp.Security.csproj index bb74fcc26..0e279cec7 100644 --- a/aspnet-core/framework/security/LINGYUN.Abp.Security/LINGYUN.Abp.Security.csproj +++ b/aspnet-core/framework/security/LINGYUN.Abp.Security/LINGYUN.Abp.Security.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/framework/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN.Abp.SettingManagement.Application.Contracts.csproj b/aspnet-core/framework/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN.Abp.SettingManagement.Application.Contracts.csproj index 70f03f7d2..52d8095d5 100644 --- a/aspnet-core/framework/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN.Abp.SettingManagement.Application.Contracts.csproj +++ b/aspnet-core/framework/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN.Abp.SettingManagement.Application.Contracts.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -17,8 +17,8 @@ - - + + diff --git a/aspnet-core/framework/settings/LINGYUN.Abp.Settings/LINGYUN.Abp.Settings.csproj b/aspnet-core/framework/settings/LINGYUN.Abp.Settings/LINGYUN.Abp.Settings.csproj index 64511c20a..b92c7215d 100644 --- a/aspnet-core/framework/settings/LINGYUN.Abp.Settings/LINGYUN.Abp.Settings.csproj +++ b/aspnet-core/framework/settings/LINGYUN.Abp.Settings/LINGYUN.Abp.Settings.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/tenants/LINGYUN.Abp.MultiTenancy.Editions/LINGYUN.Abp.MultiTenancy.Editions.csproj b/aspnet-core/framework/tenants/LINGYUN.Abp.MultiTenancy.Editions/LINGYUN.Abp.MultiTenancy.Editions.csproj index d49ef84d9..afb3e1451 100644 --- a/aspnet-core/framework/tenants/LINGYUN.Abp.MultiTenancy.Editions/LINGYUN.Abp.MultiTenancy.Editions.csproj +++ b/aspnet-core/framework/tenants/LINGYUN.Abp.MultiTenancy.Editions/LINGYUN.Abp.MultiTenancy.Editions.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/framework/tui-juhe/LINGYUN.Abp.TuiJuhe.SettingManagement/LINGYUN.Abp.TuiJuhe.SettingManagement.csproj b/aspnet-core/framework/tui-juhe/LINGYUN.Abp.TuiJuhe.SettingManagement/LINGYUN.Abp.TuiJuhe.SettingManagement.csproj index c01a34aef..58d914621 100644 --- a/aspnet-core/framework/tui-juhe/LINGYUN.Abp.TuiJuhe.SettingManagement/LINGYUN.Abp.TuiJuhe.SettingManagement.csproj +++ b/aspnet-core/framework/tui-juhe/LINGYUN.Abp.TuiJuhe.SettingManagement/LINGYUN.Abp.TuiJuhe.SettingManagement.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -17,8 +17,8 @@ - - + + diff --git a/aspnet-core/framework/tui-juhe/LINGYUN.Abp.TuiJuhe/LINGYUN.Abp.TuiJuhe.csproj b/aspnet-core/framework/tui-juhe/LINGYUN.Abp.TuiJuhe/LINGYUN.Abp.TuiJuhe.csproj index 632868cb7..e799548cc 100644 --- a/aspnet-core/framework/tui-juhe/LINGYUN.Abp.TuiJuhe/LINGYUN.Abp.TuiJuhe.csproj +++ b/aspnet-core/framework/tui-juhe/LINGYUN.Abp.TuiJuhe/LINGYUN.Abp.TuiJuhe.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -17,9 +17,9 @@ - - - + + + diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.Identity.WeChat.Work/LINGYUN.Abp.Identity.WeChat.Work.csproj b/aspnet-core/framework/wechat/LINGYUN.Abp.Identity.WeChat.Work/LINGYUN.Abp.Identity.WeChat.Work.csproj index 8ec08c2e2..2da347de2 100644 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.Identity.WeChat.Work/LINGYUN.Abp.Identity.WeChat.Work.csproj +++ b/aspnet-core/framework/wechat/LINGYUN.Abp.Identity.WeChat.Work/LINGYUN.Abp.Identity.WeChat.Work.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.1 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.Identity.WeChat/LINGYUN.Abp.Identity.WeChat.csproj b/aspnet-core/framework/wechat/LINGYUN.Abp.Identity.WeChat/LINGYUN.Abp.Identity.WeChat.csproj index e1cd45144..386704ec5 100644 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.Identity.WeChat/LINGYUN.Abp.Identity.WeChat.csproj +++ b/aspnet-core/framework/wechat/LINGYUN.Abp.Identity.WeChat/LINGYUN.Abp.Identity.WeChat.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.1 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application.Contracts/LINGYUN.Abp.WeChat.Application.Contracts.csproj b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application.Contracts/LINGYUN.Abp.WeChat.Application.Contracts.csproj deleted file mode 100644 index bea65621c..000000000 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application.Contracts/LINGYUN.Abp.WeChat.Application.Contracts.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - netstandard2.0 - - - - - - - - diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application.Contracts/LINGYUN/Abp/WeChat/AbpWeChatApplicationContractsModule.cs b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application.Contracts/LINGYUN/Abp/WeChat/AbpWeChatApplicationContractsModule.cs deleted file mode 100644 index 57904a17f..000000000 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application.Contracts/LINGYUN/Abp/WeChat/AbpWeChatApplicationContractsModule.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Volo.Abp.Application; -using Volo.Abp.Modularity; - -namespace LINGYUN.Abp.WeChat -{ - [DependsOn( - typeof(AbpDddApplicationContractsModule))] - public class AbpWeChatApplicationContractsModule : AbpModule - { - } -} diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application.Contracts/LINGYUN/Abp/WeChat/Crypto/Dto/Gender.cs b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application.Contracts/LINGYUN/Abp/WeChat/Crypto/Dto/Gender.cs deleted file mode 100644 index c7a117fba..000000000 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application.Contracts/LINGYUN/Abp/WeChat/Crypto/Dto/Gender.cs +++ /dev/null @@ -1,21 +0,0 @@ -namespace LINGYUN.Abp.WeChat.Crypto -{ - /// - /// 性别 - /// - public enum Gender - { - /// - /// 未知 - /// - None = 0, - /// - /// 男性 - /// - Man = 1, - /// - /// 女性 - /// - Women = 2 - } -} diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application.Contracts/LINGYUN/Abp/WeChat/Crypto/Dto/GetUserInfoInput.cs b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application.Contracts/LINGYUN/Abp/WeChat/Crypto/Dto/GetUserInfoInput.cs deleted file mode 100644 index 1cc76c9ac..000000000 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application.Contracts/LINGYUN/Abp/WeChat/Crypto/Dto/GetUserInfoInput.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace LINGYUN.Abp.WeChat.Crypto -{ - public class GetUserInfoInput - { - public string EncryptedData { get; set; } - public string IV { get; set; } - public string Code { get; set; } - } -} diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application.Contracts/LINGYUN/Abp/WeChat/Crypto/Dto/UserInfoDto.cs b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application.Contracts/LINGYUN/Abp/WeChat/Crypto/Dto/UserInfoDto.cs deleted file mode 100644 index d1e1e41b7..000000000 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application.Contracts/LINGYUN/Abp/WeChat/Crypto/Dto/UserInfoDto.cs +++ /dev/null @@ -1,37 +0,0 @@ -namespace LINGYUN.Abp.WeChat.Crypto -{ - public class UserInfoDto - { - /// - /// 用户昵称 - /// - public string NickName { get; set; } - /// - /// 用户头像图片的 URL。 - /// URL 最后一个数值代表正方形头像大小（有 0、46、64、96、132 数值可选，0 代表 640x640 的正方形头像，46 表示 46x46 的正方形头像，剩余数值以此类推。默认132）， - /// 用户没有头像时该项为空。 - /// 若用户更换头像，原有头像 URL 将失效。 - /// - public string AvatarUrl { get; set; } - /// - /// 性别 - /// - public Gender Gender { get; set; } - /// - /// 用户所在国家 - /// - public string Country { get; set; } - /// - /// 用户所在省份 - /// - public string Province { get; set; } - /// - /// 用户所在城市 - /// - public string City { get; set; } - /// - /// 显示 country，province，city 所用的语言 - /// - public string Language { get; set; } - } -} diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application.Contracts/LINGYUN/Abp/WeChat/Crypto/ICryptoAppService.cs b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application.Contracts/LINGYUN/Abp/WeChat/Crypto/ICryptoAppService.cs deleted file mode 100644 index 99467d919..000000000 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application.Contracts/LINGYUN/Abp/WeChat/Crypto/ICryptoAppService.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Threading.Tasks; -using Volo.Abp.Application.Services; - -namespace LINGYUN.Abp.WeChat.Crypto -{ - public interface ICryptoAppService : IApplicationService - { - Task GetUserInfoAsync(GetUserInfoInput input); - } -} diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application.Contracts/LINGYUN/Abp/WeChat/WeChatRemoteServiceConsts.cs b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application.Contracts/LINGYUN/Abp/WeChat/WeChatRemoteServiceConsts.cs deleted file mode 100644 index 1825e9834..000000000 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application.Contracts/LINGYUN/Abp/WeChat/WeChatRemoteServiceConsts.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace LINGYUN.Abp.WeChat -{ - public static class WeChatRemoteServiceConsts - { - public const string RemoteServiceName = "AbpWeChat"; - } -} diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application/LINGYUN.Abp.WeChat.Application.csproj b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application/LINGYUN.Abp.WeChat.Application.csproj deleted file mode 100644 index 260960bca..000000000 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application/LINGYUN.Abp.WeChat.Application.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - netstandard2.0 - - - - - - - - - - - - - diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application/LINGYUN/Abp/WeChat/AbpWeChatApplicationModule.cs b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application/LINGYUN/Abp/WeChat/AbpWeChatApplicationModule.cs deleted file mode 100644 index c37f0217d..000000000 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application/LINGYUN/Abp/WeChat/AbpWeChatApplicationModule.cs +++ /dev/null @@ -1,14 +0,0 @@ -using LINGYUN.Abp.WeChat.MiniProgram; -using Volo.Abp.Application; -using Volo.Abp.Modularity; - -namespace LINGYUN.Abp.WeChat -{ - [DependsOn( - typeof(AbpWeChatMiniProgramModule), - typeof(AbpWeChatApplicationContractsModule), - typeof(AbpDddApplicationModule))] - public class AbpWeChatApplicationModule : AbpModule - { - } -} diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application/LINGYUN/Abp/WeChat/Crypto/CryptoAppService.cs b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application/LINGYUN/Abp/WeChat/Crypto/CryptoAppService.cs deleted file mode 100644 index adcdc0510..000000000 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application/LINGYUN/Abp/WeChat/Crypto/CryptoAppService.cs +++ /dev/null @@ -1,42 +0,0 @@ -using LINGYUN.Abp.WeChat.MiniProgram; -using LINGYUN.Abp.WeChat.OpenId; -using Microsoft.AspNetCore.Authorization; -using System; -using System.Threading.Tasks; -using Volo.Abp.Json; - -namespace LINGYUN.Abp.WeChat.Crypto -{ - [Authorize] - public class CryptoAppService : WeChatApplicationServiceBase, ICryptoAppService - { - protected IJsonSerializer JsonSerializer { get; } - protected IWeChatOpenIdFinder OpenIdFinder { get; } - protected IWeChatCryptoService WeChatCryptoService { get; } - protected AbpWeChatMiniProgramOptionsFactory MiniProgramOptionsFactory { get; } - - public CryptoAppService( - IJsonSerializer jsonSerializer, - IWeChatOpenIdFinder openIdFinder, - IWeChatCryptoService weChatCryptoService, - AbpWeChatMiniProgramOptionsFactory miniProgramOptionsFactory) - { - JsonSerializer = jsonSerializer; - OpenIdFinder = openIdFinder; - WeChatCryptoService = weChatCryptoService; - MiniProgramOptionsFactory = miniProgramOptionsFactory; - } - - public async virtual Task GetUserInfoAsync(GetUserInfoInput input) - { - var options = await MiniProgramOptionsFactory.CreateAsync(); - WeChatOpenId weChatOpenId = input.Code.IsNullOrWhiteSpace() - ? await OpenIdFinder.FindAsync(options.AppId) - : await OpenIdFinder.FindAsync(input.Code, options.AppId, options.AppSecret); - - var decryptedData = WeChatCryptoService.Decrypt(input.EncryptedData, input.IV, weChatOpenId.SessionKey); - - return JsonSerializer.Deserialize(decryptedData); - } - } -} diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application/LINGYUN/Abp/WeChat/WeChatApplicationServiceBase.cs b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application/LINGYUN/Abp/WeChat/WeChatApplicationServiceBase.cs deleted file mode 100644 index 9603a2909..000000000 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Application/LINGYUN/Abp/WeChat/WeChatApplicationServiceBase.cs +++ /dev/null @@ -1,14 +0,0 @@ -using LINGYUN.Abp.WeChat.Localization; -using Volo.Abp.Application.Services; - -namespace LINGYUN.Abp.WeChat -{ - public abstract class WeChatApplicationServiceBase : ApplicationService - { - protected WeChatApplicationServiceBase() - { - LocalizationResource = typeof(WeChatResource); - ObjectMapperContext = typeof(AbpWeChatApplicationModule); - } - } -} diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Common/LINGYUN.Abp.WeChat.Common.csproj b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Common/LINGYUN.Abp.WeChat.Common.csproj index f2794ccd9..9a3ec0a9d 100644 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Common/LINGYUN.Abp.WeChat.Common.csproj +++ b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Common/LINGYUN.Abp.WeChat.Common.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -14,8 +14,8 @@ - - + + diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.HttpApi/LINGYUN.Abp.WeChat.HttpApi.csproj b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.HttpApi/LINGYUN.Abp.WeChat.HttpApi.csproj deleted file mode 100644 index 9bb1c6615..000000000 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.HttpApi/LINGYUN.Abp.WeChat.HttpApi.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - net5.0 - - - - - - - - diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.HttpApi/LINGYUN/Abp/WeChat/AbpWeChatHttpApiModule.cs b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.HttpApi/LINGYUN/Abp/WeChat/AbpWeChatHttpApiModule.cs deleted file mode 100644 index d6010b62c..000000000 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.HttpApi/LINGYUN/Abp/WeChat/AbpWeChatHttpApiModule.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Volo.Abp.AspNetCore.Mvc; -using Volo.Abp.Modularity; - -namespace LINGYUN.Abp.WeChat -{ - [DependsOn( - typeof(AbpWeChatApplicationContractsModule), - typeof(AbpAspNetCoreMvcModule))] - public class AbpWeChatHttpApiModule : AbpModule - { - } -} diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.HttpApi/LINGYUN/Abp/WeChat/Crypto/CryptoController.cs b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.HttpApi/LINGYUN/Abp/WeChat/Crypto/CryptoController.cs deleted file mode 100644 index 2f7198db2..000000000 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.HttpApi/LINGYUN/Abp/WeChat/Crypto/CryptoController.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using System.Threading.Tasks; -using Volo.Abp; -using Volo.Abp.AspNetCore.Mvc; - -namespace LINGYUN.Abp.WeChat.Crypto -{ - [RemoteService(Name = WeChatRemoteServiceConsts.RemoteServiceName)] - [Area("account")] - [ApiVersion("1.0")] - [Route("api/wechat")] - public class CryptoController : AbpController, ICryptoAppService - { - private readonly ICryptoAppService _service; - - public CryptoController( - ICryptoAppService service) - { - _service = service; - } - - [HttpGet] - [Route("getUserInfo")] - public async virtual Task GetUserInfoAsync(GetUserInfoInput input) - { - return await _service.GetUserInfoAsync(input); - } - } -} diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.MiniProgram/LINGYUN.Abp.WeChat.MiniProgram.csproj b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.MiniProgram/LINGYUN.Abp.WeChat.MiniProgram.csproj index 1b1a0c5ef..6e6aa572b 100644 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.MiniProgram/LINGYUN.Abp.WeChat.MiniProgram.csproj +++ b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.MiniProgram/LINGYUN.Abp.WeChat.MiniProgram.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official.Application.Contracts/LINGYUN.Abp.WeChat.Official.Application.Contracts.csproj b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official.Application.Contracts/LINGYUN.Abp.WeChat.Official.Application.Contracts.csproj index 20daae9cc..e9c4263b3 100644 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official.Application.Contracts/LINGYUN.Abp.WeChat.Official.Application.Contracts.csproj +++ b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official.Application.Contracts/LINGYUN.Abp.WeChat.Official.Application.Contracts.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official.Application/LINGYUN.Abp.WeChat.Official.Application.csproj b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official.Application/LINGYUN.Abp.WeChat.Official.Application.csproj index 72e0f91c5..2814aa9c1 100644 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official.Application/LINGYUN.Abp.WeChat.Official.Application.csproj +++ b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official.Application/LINGYUN.Abp.WeChat.Official.Application.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official.HttpApi/LINGYUN.Abp.WeChat.Official.HttpApi.csproj b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official.HttpApi/LINGYUN.Abp.WeChat.Official.HttpApi.csproj index 8a3cfe6b3..8704f96ad 100644 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official.HttpApi/LINGYUN.Abp.WeChat.Official.HttpApi.csproj +++ b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official.HttpApi/LINGYUN.Abp.WeChat.Official.HttpApi.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official.Senparc/LINGYUN.Abp.WeChat.Official.Senparc.csproj b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official.Senparc/LINGYUN.Abp.WeChat.Official.Senparc.csproj index fc405c54f..47e9b9f4c 100644 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official.Senparc/LINGYUN.Abp.WeChat.Official.Senparc.csproj +++ b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official.Senparc/LINGYUN.Abp.WeChat.Official.Senparc.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official/LINGYUN.Abp.WeChat.Official.csproj b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official/LINGYUN.Abp.WeChat.Official.csproj index 00fc0bd69..e6088a243 100644 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official/LINGYUN.Abp.WeChat.Official.csproj +++ b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Official/LINGYUN.Abp.WeChat.Official.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.SettingManagement/LINGYUN.Abp.WeChat.SettingManagement.csproj b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.SettingManagement/LINGYUN.Abp.WeChat.SettingManagement.csproj index 5bcc0b1e6..39560879b 100644 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.SettingManagement/LINGYUN.Abp.WeChat.SettingManagement.csproj +++ b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.SettingManagement/LINGYUN.Abp.WeChat.SettingManagement.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -17,8 +17,8 @@ - - + + diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Work.Application.Contracts/LINGYUN.Abp.WeChat.Work.Application.Contracts.csproj b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Work.Application.Contracts/LINGYUN.Abp.WeChat.Work.Application.Contracts.csproj index 20daae9cc..e9c4263b3 100644 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Work.Application.Contracts/LINGYUN.Abp.WeChat.Work.Application.Contracts.csproj +++ b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Work.Application.Contracts/LINGYUN.Abp.WeChat.Work.Application.Contracts.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Work.Application/LINGYUN.Abp.WeChat.Work.Application.csproj b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Work.Application/LINGYUN.Abp.WeChat.Work.Application.csproj index 26b7c7a0e..2e9c96174 100644 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Work.Application/LINGYUN.Abp.WeChat.Work.Application.csproj +++ b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Work.Application/LINGYUN.Abp.WeChat.Work.Application.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Work.Common/LINGYUN.Abp.WeChat.Work.Common.csproj b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Work.Common/LINGYUN.Abp.WeChat.Work.Common.csproj index 4b3e4eb03..899829919 100644 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Work.Common/LINGYUN.Abp.WeChat.Work.Common.csproj +++ b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Work.Common/LINGYUN.Abp.WeChat.Work.Common.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Work.HttpApi/LINGYUN.Abp.WeChat.Work.HttpApi.csproj b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Work.HttpApi/LINGYUN.Abp.WeChat.Work.HttpApi.csproj index 3c8bc206b..354eb9ed7 100644 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Work.HttpApi/LINGYUN.Abp.WeChat.Work.HttpApi.csproj +++ b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Work.HttpApi/LINGYUN.Abp.WeChat.Work.HttpApi.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Work/LINGYUN.Abp.WeChat.Work.csproj b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Work/LINGYUN.Abp.WeChat.Work.csproj index cfceb8660..3f15746dd 100644 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Work/LINGYUN.Abp.WeChat.Work.csproj +++ b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat.Work/LINGYUN.Abp.WeChat.Work.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -14,11 +14,11 @@ - - - - - + + + + + diff --git a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat/LINGYUN.Abp.WeChat.csproj b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat/LINGYUN.Abp.WeChat.csproj index 6c4f0eb30..6cb648386 100644 --- a/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat/LINGYUN.Abp.WeChat.csproj +++ b/aspnet-core/framework/wechat/LINGYUN.Abp.WeChat/LINGYUN.Abp.WeChat.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -17,10 +17,10 @@ - - - - + + + + diff --git a/aspnet-core/framework/wx-pusher/LINGYUN.Abp.Identity.WxPusher/LINGYUN.Abp.Identity.WxPusher.csproj b/aspnet-core/framework/wx-pusher/LINGYUN.Abp.Identity.WxPusher/LINGYUN.Abp.Identity.WxPusher.csproj index 9e6a1560a..e37bb288f 100644 --- a/aspnet-core/framework/wx-pusher/LINGYUN.Abp.Identity.WxPusher/LINGYUN.Abp.Identity.WxPusher.csproj +++ b/aspnet-core/framework/wx-pusher/LINGYUN.Abp.Identity.WxPusher/LINGYUN.Abp.Identity.WxPusher.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.1 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/framework/wx-pusher/LINGYUN.Abp.WxPusher.SettingManagement/LINGYUN.Abp.WxPusher.SettingManagement.csproj b/aspnet-core/framework/wx-pusher/LINGYUN.Abp.WxPusher.SettingManagement/LINGYUN.Abp.WxPusher.SettingManagement.csproj index 27f6548fd..8e10d1665 100644 --- a/aspnet-core/framework/wx-pusher/LINGYUN.Abp.WxPusher.SettingManagement/LINGYUN.Abp.WxPusher.SettingManagement.csproj +++ b/aspnet-core/framework/wx-pusher/LINGYUN.Abp.WxPusher.SettingManagement/LINGYUN.Abp.WxPusher.SettingManagement.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -17,8 +17,8 @@ - - + + diff --git a/aspnet-core/framework/wx-pusher/LINGYUN.Abp.WxPusher/LINGYUN.Abp.WxPusher.csproj b/aspnet-core/framework/wx-pusher/LINGYUN.Abp.WxPusher/LINGYUN.Abp.WxPusher.csproj index 5c8a86938..bc79cce77 100644 --- a/aspnet-core/framework/wx-pusher/LINGYUN.Abp.WxPusher/LINGYUN.Abp.WxPusher.csproj +++ b/aspnet-core/framework/wx-pusher/LINGYUN.Abp.WxPusher/LINGYUN.Abp.WxPusher.csproj @@ -1,7 +1,8 @@  - - + + + netstandard2.0 @@ -17,9 +18,9 @@ - - - + + + diff --git a/aspnet-core/migrations/LY.MicroService.Applications.Single.DbMigrator/LY.MicroService.Applications.Single.DbMigrator.csproj b/aspnet-core/migrations/LY.MicroService.Applications.Single.DbMigrator/LY.MicroService.Applications.Single.DbMigrator.csproj index 5ea378f79..d4974c9a5 100644 --- a/aspnet-core/migrations/LY.MicroService.Applications.Single.DbMigrator/LY.MicroService.Applications.Single.DbMigrator.csproj +++ b/aspnet-core/migrations/LY.MicroService.Applications.Single.DbMigrator/LY.MicroService.Applications.Single.DbMigrator.csproj @@ -1,4 +1,6 @@ - + + + Exe @@ -8,15 +10,15 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -26,18 +28,6 @@ - - - - - - - PreserveNewest - true - PreserveNewest - - - diff --git a/aspnet-core/migrations/LY.MicroService.Applications.Single.EntityFrameworkCore/LY.MicroService.Applications.Single.EntityFrameworkCore.csproj b/aspnet-core/migrations/LY.MicroService.Applications.Single.EntityFrameworkCore/LY.MicroService.Applications.Single.EntityFrameworkCore.csproj index dd2fefc0b..34c2f1d33 100644 --- a/aspnet-core/migrations/LY.MicroService.Applications.Single.EntityFrameworkCore/LY.MicroService.Applications.Single.EntityFrameworkCore.csproj +++ b/aspnet-core/migrations/LY.MicroService.Applications.Single.EntityFrameworkCore/LY.MicroService.Applications.Single.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,15 +9,15 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + diff --git a/aspnet-core/migrations/LY.MicroService.AuthServer.DbMigrator/AuthServerDbMigratorHostedService.cs b/aspnet-core/migrations/LY.MicroService.AuthServer.DbMigrator/AuthServerDbMigratorHostedService.cs index e16591612..f65e6ecdc 100644 --- a/aspnet-core/migrations/LY.MicroService.AuthServer.DbMigrator/AuthServerDbMigratorHostedService.cs +++ b/aspnet-core/migrations/LY.MicroService.AuthServer.DbMigrator/AuthServerDbMigratorHostedService.cs @@ -26,6 +26,10 @@ public async Task StartAsync(CancellationToken cancellationToken) using var application = await AbpApplicationFactory .CreateAsync(options => { + // 从环境变量取用户机密配置, 适用于容器测试 + options.Configuration.UserSecretsId = Environment.GetEnvironmentVariable("APPLICATION_USER_SECRETS_ID"); + // 如果容器没有指定用户机密, 从项目读取 + options.Configuration.UserSecretsAssembly = typeof(AuthServerDbMigratorHostedService).Assembly; options.Services.ReplaceConfiguration(_configuration); options.UseAutofac(); options.Services.AddLogging(c => c.AddSerilog()); diff --git a/aspnet-core/migrations/LY.MicroService.AuthServer.DbMigrator/LY.MicroService.AuthServer.DbMigrator.csproj b/aspnet-core/migrations/LY.MicroService.AuthServer.DbMigrator/LY.MicroService.AuthServer.DbMigrator.csproj index cb61733b9..9a802a37e 100644 --- a/aspnet-core/migrations/LY.MicroService.AuthServer.DbMigrator/LY.MicroService.AuthServer.DbMigrator.csproj +++ b/aspnet-core/migrations/LY.MicroService.AuthServer.DbMigrator/LY.MicroService.AuthServer.DbMigrator.csproj @@ -1,4 +1,6 @@  + + Exe @@ -8,17 +10,17 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + @@ -28,24 +30,6 @@ - - - - - - - - PreserveNewest - true - PreserveNewest - - - PreserveNewest - true - PreserveNewest - - - diff --git a/aspnet-core/migrations/LY.MicroService.AuthServer.EntityFrameworkCore/LY.MicroService.AuthServer.EntityFrameworkCore.csproj b/aspnet-core/migrations/LY.MicroService.AuthServer.EntityFrameworkCore/LY.MicroService.AuthServer.EntityFrameworkCore.csproj index 8bc558761..de4969115 100644 --- a/aspnet-core/migrations/LY.MicroService.AuthServer.EntityFrameworkCore/LY.MicroService.AuthServer.EntityFrameworkCore.csproj +++ b/aspnet-core/migrations/LY.MicroService.AuthServer.EntityFrameworkCore/LY.MicroService.AuthServer.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,15 +9,15 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + diff --git a/aspnet-core/migrations/LY.MicroService.BackendAdmin.DbMigrator/BackendAdminDbMigratorHostedService.cs b/aspnet-core/migrations/LY.MicroService.BackendAdmin.DbMigrator/BackendAdminDbMigratorHostedService.cs index 3f0898a83..a8688c04a 100644 --- a/aspnet-core/migrations/LY.MicroService.BackendAdmin.DbMigrator/BackendAdminDbMigratorHostedService.cs +++ b/aspnet-core/migrations/LY.MicroService.BackendAdmin.DbMigrator/BackendAdminDbMigratorHostedService.cs @@ -26,6 +26,10 @@ public async Task StartAsync(CancellationToken cancellationToken) using var application = await AbpApplicationFactory .CreateAsync(options => { + // 从环境变量取用户机密配置, 适用于容器测试 + options.Configuration.UserSecretsId = Environment.GetEnvironmentVariable("APPLICATION_USER_SECRETS_ID"); + // 如果容器没有指定用户机密, 从项目读取 + options.Configuration.UserSecretsAssembly = typeof(BackendAdminDbMigratorHostedService).Assembly; options.Services.ReplaceConfiguration(_configuration); options.UseAutofac(); options.Services.AddLogging(c => c.AddSerilog()); diff --git a/aspnet-core/migrations/LY.MicroService.BackendAdmin.DbMigrator/LY.MicroService.BackendAdmin.DbMigrator.csproj b/aspnet-core/migrations/LY.MicroService.BackendAdmin.DbMigrator/LY.MicroService.BackendAdmin.DbMigrator.csproj index 1e9189f51..9b9862974 100644 --- a/aspnet-core/migrations/LY.MicroService.BackendAdmin.DbMigrator/LY.MicroService.BackendAdmin.DbMigrator.csproj +++ b/aspnet-core/migrations/LY.MicroService.BackendAdmin.DbMigrator/LY.MicroService.BackendAdmin.DbMigrator.csproj @@ -1,5 +1,7 @@  - + + + Exe net8.0 @@ -8,15 +10,15 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -26,24 +28,6 @@ - - - - - - - - PreserveNewest - true - PreserveNewest - - - PreserveNewest - true - PreserveNewest - - - diff --git a/aspnet-core/migrations/LY.MicroService.BackendAdmin.EntityFrameworkCore/LY.MicroService.BackendAdmin.EntityFrameworkCore.csproj b/aspnet-core/migrations/LY.MicroService.BackendAdmin.EntityFrameworkCore/LY.MicroService.BackendAdmin.EntityFrameworkCore.csproj index f62ed7abd..e41877d12 100644 --- a/aspnet-core/migrations/LY.MicroService.BackendAdmin.EntityFrameworkCore/LY.MicroService.BackendAdmin.EntityFrameworkCore.csproj +++ b/aspnet-core/migrations/LY.MicroService.BackendAdmin.EntityFrameworkCore/LY.MicroService.BackendAdmin.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,14 +9,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/aspnet-core/migrations/LY.MicroService.IdentityServer.DbMigrator/IdentityServerDbMigratorHostedService.cs b/aspnet-core/migrations/LY.MicroService.IdentityServer.DbMigrator/IdentityServerDbMigratorHostedService.cs index 1965c410a..f3443558d 100644 --- a/aspnet-core/migrations/LY.MicroService.IdentityServer.DbMigrator/IdentityServerDbMigratorHostedService.cs +++ b/aspnet-core/migrations/LY.MicroService.IdentityServer.DbMigrator/IdentityServerDbMigratorHostedService.cs @@ -26,6 +26,10 @@ public async Task StartAsync(CancellationToken cancellationToken) using var application = await AbpApplicationFactory .CreateAsync(options => { + // 从环境变量取用户机密配置, 适用于容器测试 + options.Configuration.UserSecretsId = Environment.GetEnvironmentVariable("APPLICATION_USER_SECRETS_ID"); + // 如果容器没有指定用户机密, 从项目读取 + options.Configuration.UserSecretsAssembly = typeof(IdentityServerDbMigratorHostedService).Assembly; options.Services.ReplaceConfiguration(_configuration); options.UseAutofac(); options.Services.AddLogging(c => c.AddSerilog()); diff --git a/aspnet-core/migrations/LY.MicroService.IdentityServer.DbMigrator/LY.MicroService.IdentityServer.DbMigrator.csproj b/aspnet-core/migrations/LY.MicroService.IdentityServer.DbMigrator/LY.MicroService.IdentityServer.DbMigrator.csproj index afba63a96..9095c4ea6 100644 --- a/aspnet-core/migrations/LY.MicroService.IdentityServer.DbMigrator/LY.MicroService.IdentityServer.DbMigrator.csproj +++ b/aspnet-core/migrations/LY.MicroService.IdentityServer.DbMigrator/LY.MicroService.IdentityServer.DbMigrator.csproj @@ -1,4 +1,6 @@  + + Exe @@ -8,17 +10,17 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + @@ -28,24 +30,6 @@ - - - - - - - - PreserveNewest - true - PreserveNewest - - - PreserveNewest - true - PreserveNewest - - - diff --git a/aspnet-core/migrations/LY.MicroService.IdentityServer.EntityFrameworkCore/LY.MicroService.IdentityServer.EntityFrameworkCore.csproj b/aspnet-core/migrations/LY.MicroService.IdentityServer.EntityFrameworkCore/LY.MicroService.IdentityServer.EntityFrameworkCore.csproj index 80ec3291c..281287d85 100644 --- a/aspnet-core/migrations/LY.MicroService.IdentityServer.EntityFrameworkCore/LY.MicroService.IdentityServer.EntityFrameworkCore.csproj +++ b/aspnet-core/migrations/LY.MicroService.IdentityServer.EntityFrameworkCore/LY.MicroService.IdentityServer.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,13 +9,13 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/aspnet-core/migrations/LY.MicroService.LocalizationManagement.DbMigrator/LY.MicroService.LocalizationManagement.DbMigrator.csproj b/aspnet-core/migrations/LY.MicroService.LocalizationManagement.DbMigrator/LY.MicroService.LocalizationManagement.DbMigrator.csproj index 33dcb2329..65109be7a 100644 --- a/aspnet-core/migrations/LY.MicroService.LocalizationManagement.DbMigrator/LY.MicroService.LocalizationManagement.DbMigrator.csproj +++ b/aspnet-core/migrations/LY.MicroService.LocalizationManagement.DbMigrator/LY.MicroService.LocalizationManagement.DbMigrator.csproj @@ -1,4 +1,6 @@  + + Exe @@ -8,19 +10,19 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + @@ -30,24 +32,6 @@ - - - - - - - - PreserveNewest - true - PreserveNewest - - - PreserveNewest - true - PreserveNewest - - - diff --git a/aspnet-core/migrations/LY.MicroService.LocalizationManagement.DbMigrator/LocalizationManagementDbMigratorHostedService.cs b/aspnet-core/migrations/LY.MicroService.LocalizationManagement.DbMigrator/LocalizationManagementDbMigratorHostedService.cs index 65633bbc3..99029178f 100644 --- a/aspnet-core/migrations/LY.MicroService.LocalizationManagement.DbMigrator/LocalizationManagementDbMigratorHostedService.cs +++ b/aspnet-core/migrations/LY.MicroService.LocalizationManagement.DbMigrator/LocalizationManagementDbMigratorHostedService.cs @@ -26,6 +26,10 @@ public async Task StartAsync(CancellationToken cancellationToken) using var application = await AbpApplicationFactory .CreateAsync(options => { + // 从环境变量取用户机密配置, 适用于容器测试 + options.Configuration.UserSecretsId = Environment.GetEnvironmentVariable("APPLICATION_USER_SECRETS_ID"); + // 如果容器没有指定用户机密, 从项目读取 + options.Configuration.UserSecretsAssembly = typeof(LocalizationManagementDbMigratorHostedService).Assembly; options.Services.ReplaceConfiguration(_configuration); options.UseAutofac(); options.Services.AddLogging(c => c.AddSerilog()); diff --git a/aspnet-core/migrations/LY.MicroService.LocalizationManagement.EntityFrameworkCore/LY.MicroService.LocalizationManagement.EntityFrameworkCore.csproj b/aspnet-core/migrations/LY.MicroService.LocalizationManagement.EntityFrameworkCore/LY.MicroService.LocalizationManagement.EntityFrameworkCore.csproj index c098ff1bd..15aec649f 100644 --- a/aspnet-core/migrations/LY.MicroService.LocalizationManagement.EntityFrameworkCore/LY.MicroService.LocalizationManagement.EntityFrameworkCore.csproj +++ b/aspnet-core/migrations/LY.MicroService.LocalizationManagement.EntityFrameworkCore/LY.MicroService.LocalizationManagement.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,14 +9,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/aspnet-core/migrations/LY.MicroService.Platform.DbMigrator/LY.MicroService.Platform.DbMigrator.csproj b/aspnet-core/migrations/LY.MicroService.Platform.DbMigrator/LY.MicroService.Platform.DbMigrator.csproj index 392177d94..17ca0720a 100644 --- a/aspnet-core/migrations/LY.MicroService.Platform.DbMigrator/LY.MicroService.Platform.DbMigrator.csproj +++ b/aspnet-core/migrations/LY.MicroService.Platform.DbMigrator/LY.MicroService.Platform.DbMigrator.csproj @@ -1,4 +1,6 @@  + + Exe @@ -8,20 +10,20 @@ - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + @@ -31,24 +33,6 @@ - - - - - - - - PreserveNewest - true - PreserveNewest - - - PreserveNewest - true - PreserveNewest - - - diff --git a/aspnet-core/migrations/LY.MicroService.Platform.DbMigrator/PlatformDbMigratorHostedService.cs b/aspnet-core/migrations/LY.MicroService.Platform.DbMigrator/PlatformDbMigratorHostedService.cs index 9cc97f097..6d184bb5c 100644 --- a/aspnet-core/migrations/LY.MicroService.Platform.DbMigrator/PlatformDbMigratorHostedService.cs +++ b/aspnet-core/migrations/LY.MicroService.Platform.DbMigrator/PlatformDbMigratorHostedService.cs @@ -26,6 +26,10 @@ public async Task StartAsync(CancellationToken cancellationToken) using var application = await AbpApplicationFactory .CreateAsync(options => { + // 从环境变量取用户机密配置, 适用于容器测试 + options.Configuration.UserSecretsId = Environment.GetEnvironmentVariable("APPLICATION_USER_SECRETS_ID"); + // 如果容器没有指定用户机密, 从项目读取 + options.Configuration.UserSecretsAssembly = typeof(PlatformDbMigratorHostedService).Assembly; options.Services.ReplaceConfiguration(_configuration); options.UseAutofac(); options.Services.AddLogging(c => c.AddSerilog()); diff --git a/aspnet-core/migrations/LY.MicroService.Platform.EntityFrameworkCore/LY.MicroService.Platform.EntityFrameworkCore.csproj b/aspnet-core/migrations/LY.MicroService.Platform.EntityFrameworkCore/LY.MicroService.Platform.EntityFrameworkCore.csproj index 097620226..21282577c 100644 --- a/aspnet-core/migrations/LY.MicroService.Platform.EntityFrameworkCore/LY.MicroService.Platform.EntityFrameworkCore.csproj +++ b/aspnet-core/migrations/LY.MicroService.Platform.EntityFrameworkCore/LY.MicroService.Platform.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,14 +9,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/aspnet-core/migrations/LY.MicroService.RealtimeMessage.DbMigrator/LY.MicroService.RealtimeMessage.DbMigrator.csproj b/aspnet-core/migrations/LY.MicroService.RealtimeMessage.DbMigrator/LY.MicroService.RealtimeMessage.DbMigrator.csproj index 917ee398f..8f79d3c17 100644 --- a/aspnet-core/migrations/LY.MicroService.RealtimeMessage.DbMigrator/LY.MicroService.RealtimeMessage.DbMigrator.csproj +++ b/aspnet-core/migrations/LY.MicroService.RealtimeMessage.DbMigrator/LY.MicroService.RealtimeMessage.DbMigrator.csproj @@ -1,4 +1,6 @@  + + Exe @@ -8,19 +10,19 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + @@ -30,24 +32,6 @@ - - - - - - - - PreserveNewest - true - PreserveNewest - - - PreserveNewest - true - PreserveNewest - - - diff --git a/aspnet-core/migrations/LY.MicroService.RealtimeMessage.DbMigrator/RealtimeMessageDbMigratorHostedService.cs b/aspnet-core/migrations/LY.MicroService.RealtimeMessage.DbMigrator/RealtimeMessageDbMigratorHostedService.cs index b771c083a..6090ac486 100644 --- a/aspnet-core/migrations/LY.MicroService.RealtimeMessage.DbMigrator/RealtimeMessageDbMigratorHostedService.cs +++ b/aspnet-core/migrations/LY.MicroService.RealtimeMessage.DbMigrator/RealtimeMessageDbMigratorHostedService.cs @@ -26,6 +26,10 @@ public async Task StartAsync(CancellationToken cancellationToken) using var application = await AbpApplicationFactory .CreateAsync(options => { + // 从环境变量取用户机密配置, 适用于容器测试 + options.Configuration.UserSecretsId = Environment.GetEnvironmentVariable("APPLICATION_USER_SECRETS_ID"); + // 如果容器没有指定用户机密, 从项目读取 + options.Configuration.UserSecretsAssembly = typeof(RealtimeMessageDbMigratorHostedService).Assembly; options.Services.ReplaceConfiguration(_configuration); options.UseAutofac(); options.Services.AddLogging(c => c.AddSerilog()); diff --git a/aspnet-core/migrations/LY.MicroService.RealtimeMessage.EntityFrameworkCore/LY.MicroService.RealtimeMessage.EntityFrameworkCore.csproj b/aspnet-core/migrations/LY.MicroService.RealtimeMessage.EntityFrameworkCore/LY.MicroService.RealtimeMessage.EntityFrameworkCore.csproj index 8a1d93b5a..81b1d705f 100644 --- a/aspnet-core/migrations/LY.MicroService.RealtimeMessage.EntityFrameworkCore/LY.MicroService.RealtimeMessage.EntityFrameworkCore.csproj +++ b/aspnet-core/migrations/LY.MicroService.RealtimeMessage.EntityFrameworkCore/LY.MicroService.RealtimeMessage.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,14 +9,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/aspnet-core/migrations/LY.MicroService.TaskManagement.DbMigrator/LY.MicroService.TaskManagement.DbMigrator.csproj b/aspnet-core/migrations/LY.MicroService.TaskManagement.DbMigrator/LY.MicroService.TaskManagement.DbMigrator.csproj index df6f6cf88..ace2e31c3 100644 --- a/aspnet-core/migrations/LY.MicroService.TaskManagement.DbMigrator/LY.MicroService.TaskManagement.DbMigrator.csproj +++ b/aspnet-core/migrations/LY.MicroService.TaskManagement.DbMigrator/LY.MicroService.TaskManagement.DbMigrator.csproj @@ -1,4 +1,6 @@  + + Exe @@ -8,19 +10,19 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + @@ -30,18 +32,6 @@ - - - - - - - PreserveNewest - true - PreserveNewest - - - diff --git a/aspnet-core/migrations/LY.MicroService.TaskManagement.EntityFrameworkCore/LY.MicroService.TaskManagement.EntityFrameworkCore.csproj b/aspnet-core/migrations/LY.MicroService.TaskManagement.EntityFrameworkCore/LY.MicroService.TaskManagement.EntityFrameworkCore.csproj index 89f0794f4..977ed21c1 100644 --- a/aspnet-core/migrations/LY.MicroService.TaskManagement.EntityFrameworkCore/LY.MicroService.TaskManagement.EntityFrameworkCore.csproj +++ b/aspnet-core/migrations/LY.MicroService.TaskManagement.EntityFrameworkCore/LY.MicroService.TaskManagement.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,14 +9,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/aspnet-core/migrations/LY.MicroService.WebhooksManagement.DbMigrator/LY.MicroService.WebhooksManagement.DbMigrator.csproj b/aspnet-core/migrations/LY.MicroService.WebhooksManagement.DbMigrator/LY.MicroService.WebhooksManagement.DbMigrator.csproj index 6c5316f46..2c4040e7f 100644 --- a/aspnet-core/migrations/LY.MicroService.WebhooksManagement.DbMigrator/LY.MicroService.WebhooksManagement.DbMigrator.csproj +++ b/aspnet-core/migrations/LY.MicroService.WebhooksManagement.DbMigrator/LY.MicroService.WebhooksManagement.DbMigrator.csproj @@ -1,4 +1,6 @@  + + Exe @@ -8,19 +10,19 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - + + + + + @@ -30,18 +32,6 @@ - - - - - - - PreserveNewest - true - PreserveNewest - - - diff --git a/aspnet-core/migrations/LY.MicroService.WebhooksManagement.EntityFrameworkCore/LY.MicroService.WebhooksManagement.EntityFrameworkCore.csproj b/aspnet-core/migrations/LY.MicroService.WebhooksManagement.EntityFrameworkCore/LY.MicroService.WebhooksManagement.EntityFrameworkCore.csproj index 2ae2fc486..2151aa24d 100644 --- a/aspnet-core/migrations/LY.MicroService.WebhooksManagement.EntityFrameworkCore/LY.MicroService.WebhooksManagement.EntityFrameworkCore.csproj +++ b/aspnet-core/migrations/LY.MicroService.WebhooksManagement.EntityFrameworkCore/LY.MicroService.WebhooksManagement.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,14 +9,14 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Application.Contracts/LINGYUN.Abp.Account.Application.Contracts.csproj b/aspnet-core/modules/account/LINGYUN.Abp.Account.Application.Contracts/LINGYUN.Abp.Account.Application.Contracts.csproj index 219323cd0..96086e976 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Application.Contracts/LINGYUN.Abp.Account.Application.Contracts.csproj +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Application.Contracts/LINGYUN.Abp.Account.Application.Contracts.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -17,7 +17,7 @@ - + diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN.Abp.Account.Application.csproj b/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN.Abp.Account.Application.csproj index 9844949a2..3017cd955 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN.Abp.Account.Application.csproj +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Application/LINGYUN.Abp.Account.Application.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.HttpApi/LINGYUN.Abp.Account.HttpApi.csproj b/aspnet-core/modules/account/LINGYUN.Abp.Account.HttpApi/LINGYUN.Abp.Account.HttpApi.csproj index 237d3eded..b78757b8e 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.HttpApi/LINGYUN.Abp.Account.HttpApi.csproj +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.HttpApi/LINGYUN.Abp.Account.HttpApi.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Templates/LINGYUN.Abp.Account.Templates.csproj b/aspnet-core/modules/account/LINGYUN.Abp.Account.Templates/LINGYUN.Abp.Account.Templates.csproj index 756b911bc..dc5e8a399 100644 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Templates/LINGYUN.Abp.Account.Templates.csproj +++ b/aspnet-core/modules/account/LINGYUN.Abp.Account.Templates/LINGYUN.Abp.Account.Templates.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -19,7 +19,7 @@ - + diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/AbpAccountWebModule.cs b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/AbpAccountWebModule.cs deleted file mode 100644 index f0e28edcf..000000000 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/AbpAccountWebModule.cs +++ /dev/null @@ -1,32 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.Emailing; -using Volo.Abp.Modularity; -using Volo.Abp.Sms; -using Volo.Abp.VirtualFileSystem; - -namespace LINGYUN.Abp.Account.Web -{ - [DependsOn( - typeof(AbpSmsModule), - typeof(AbpEmailingModule), - typeof(Volo.Abp.Account.Web.AbpAccountWebModule))] - public class AbpAccountWebModule : AbpModule - { - public override void ConfigureServices(ServiceConfigurationContext context) - { - Configure(options => - { - options.FileSets.AddEmbedded(); - }); - - context.Services - .AddAuthorization(options => - { - options.AddPolicy("TwoFactorEnabled", policy => - { - policy.RequireClaim("amr", "mfa"); - }); - }); - } - } -} diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/FodyWeavers.xml b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/FodyWeavers.xml deleted file mode 100644 index 1715698cc..000000000 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/LINGYUN.Abp.Account.Web.csproj b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/LINGYUN.Abp.Account.Web.csproj deleted file mode 100644 index 2c972a76d..000000000 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/LINGYUN.Abp.Account.Web.csproj +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - net8.0 - LINGYUN.Abp.Account.Web - LINGYUN.Abp.Account.Web - true - $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - false - false - false - true - LINGYUN.Abp.Account.Web - Library - - - - - - - - - - - - - - - - - - - - - - diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/LINGYUN.Abp.Account.Web.csproj.user b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/LINGYUN.Abp.Account.Web.csproj.user deleted file mode 100644 index 1607fbca0..000000000 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/LINGYUN.Abp.Account.Web.csproj.user +++ /dev/null @@ -1,7 +0,0 @@ - - - - RazorPageScaffolder - root/Common/RazorPage - - \ No newline at end of file diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/SendCode.cshtml b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/SendCode.cshtml deleted file mode 100644 index 1aca7fe13..000000000 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/SendCode.cshtml +++ /dev/null @@ -1,22 +0,0 @@ -@page -@using Microsoft.AspNetCore.Mvc.Localization -@using Volo.Abp.Account.Localization -@model LINGYUN.Abp.Account.Web.Pages.Account.SendCodeModel -@inject IHtmlLocalizer L - -
-
-

@L["SendTwoFactor"]

-
- - -
- - -
- @L["SendTwoFactorCode"] -
- -
-
- diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/SendCode.cshtml.cs b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/SendCode.cshtml.cs deleted file mode 100644 index 40c3f9ad7..000000000 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/SendCode.cshtml.cs +++ /dev/null @@ -1,94 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.Rendering; -using System.Collections.Generic; -using System.Threading.Tasks; -using Volo.Abp.Account.Web.Pages.Account; -using Volo.Abp.Emailing; -using Volo.Abp.Sms; - -namespace LINGYUN.Abp.Account.Web.Pages.Account -{ - public class SendCodeModel : AccountPageModel - { - [BindProperty] - public SendCodeInputModel SendCodeInput { get; set; } - - protected ISmsSender SmsSender { get; } - protected IEmailSender EmailSender { get; } - - public virtual IActionResult OnGet() - { - SendCodeInput = new SendCodeInputModel(); - - return Page(); - } - - public async virtual Task OnPostAsync() - { - var user = await SignInManager.GetTwoFactorAuthenticationUserAsync(); - if (user == null) - { - Alerts.Warning("˫������֤ʧ��,�û�δ��¼!"); - return Page(); - } - - if (SendCodeInput.SelectedProvider == "Authenticator") - { - var verifyAuthenticatorCodeInput = new VerifyAuthenticatorCodeInputModel - { - ReturnUrl = SendCodeInput.ReturnUrl, - RememberMe = SendCodeInput.RememberMe - }; - return RedirectToPage("VerifyAuthenticatorCode", verifyAuthenticatorCodeInput); - } - - var code = await UserManager.GenerateTwoFactorTokenAsync(user, SendCodeInput.SelectedProvider); - if (string.IsNullOrWhiteSpace(code)) - { - Alerts.Warning("��֤������ʧ��,����ϵϵͳ����Ա!"); - return Page(); - } - - var message = "Your security code is: " + code; - if (SendCodeInput.SelectedProvider == "Email") - { - await EmailSender.SendAsync(await UserManager.GetEmailAsync(user), "Security Code", message); - } - else if (SendCodeInput.SelectedProvider == "Phone") - { - await SmsSender.SendAsync(await UserManager.GetPhoneNumberAsync(user), message); - } - - var verifyCodeInput = new VerifyCodeInputModel - { - Provider = SendCodeInput.SelectedProvider, - ReturnUrl = SendCodeInput.ReturnUrl, - RememberMe = SendCodeInput.RememberMe - }; - - return RedirectToPage("VerifyCode", verifyCodeInput); - } - } - - public class SendCodeInputModel - { - public string SelectedProvider { get; set; } - - public ICollection Providers { get; set; } - - public string ReturnUrl { get; set; } - - public bool RememberMe { get; set; } - } - - public class TwoFactorInputModel - { - public string SelectedProvider { get; set; } - - public ICollection Providers { get; set; } - - public string ReturnUrl { get; set; } - - public bool RememberMe { get; set; } - } -} diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/UseRecoveryCode.cshtml b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/UseRecoveryCode.cshtml deleted file mode 100644 index 1e86bdc0e..000000000 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/UseRecoveryCode.cshtml +++ /dev/null @@ -1,4 +0,0 @@ -@page -@model LINGYUN.Abp.Account.Web.Pages.Account.UseRecoveryCodeModel -@{ -} diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/UseRecoveryCode.cshtml.cs b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/UseRecoveryCode.cshtml.cs deleted file mode 100644 index b076310f0..000000000 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/UseRecoveryCode.cshtml.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.RazorPages; - -namespace LINGYUN.Abp.Account.Web.Pages.Account -{ - public class UseRecoveryCodeModel : PageModel - { - public void OnGet() - { - } - } -} diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/VerifyAuthenticatorCode.cshtml b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/VerifyAuthenticatorCode.cshtml deleted file mode 100644 index 7795b4ce2..000000000 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/VerifyAuthenticatorCode.cshtml +++ /dev/null @@ -1,20 +0,0 @@ -@page -@using Microsoft.AspNetCore.Mvc.Localization -@using Volo.Abp.Account.Localization -@model LINGYUN.Abp.Account.Web.Pages.Account.VerifyAuthenticatorCodeModel -@inject IHtmlLocalizer L - -
- -
- - - -
-
- - -
- @L["VerifyAuthenticatorCode"] -
- diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/VerifyAuthenticatorCode.cshtml.cs b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/VerifyAuthenticatorCode.cshtml.cs deleted file mode 100644 index 2be58bf5d..000000000 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/VerifyAuthenticatorCode.cshtml.cs +++ /dev/null @@ -1,55 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Logging; -using System.ComponentModel.DataAnnotations; -using System.Threading.Tasks; -using Volo.Abp.Account.Web.Pages.Account; - -namespace LINGYUN.Abp.Account.Web.Pages.Account -{ - public class VerifyAuthenticatorCodeModel : AccountPageModel - { - [BindProperty] - public VerifyAuthenticatorCodeInputModel Input { get; set; } - - public virtual IActionResult OnGet() - { - Input = new VerifyAuthenticatorCodeInputModel(); - - return Page(); - } - - public async virtual Task OnPostAsync() - { - var result = await SignInManager.TwoFactorAuthenticatorSignInAsync(Input.Code, Input.RememberMe, Input.RememberBrowser); - if (result.Succeeded) - { - return RedirectSafely(Input.ReturnUrl); - } - if (result.IsLockedOut) - { - Logger.LogWarning(7, "User account locked out."); - Alerts.Warning(L["UserLockedOutMessage"]); - return Page(); - } - else - { - Alerts.Danger("��Ȩ����֤��Ч!"); - return Page(); - } - } - } - - public class VerifyAuthenticatorCodeInputModel - { - [Required] - public string Code { get; set; } - - public string ReturnUrl { get; set; } - - [Display(Name = "Remember this browser?")] - public bool RememberBrowser { get; set; } - - [Display(Name = "Remember me?")] - public bool RememberMe { get; set; } - } -} diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/VerifyCode.cshtml b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/VerifyCode.cshtml deleted file mode 100644 index b418d86e9..000000000 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/VerifyCode.cshtml +++ /dev/null @@ -1,20 +0,0 @@ -@page -@using Microsoft.AspNetCore.Mvc.Localization -@using Volo.Abp.Account.Localization -@model LINGYUN.Abp.Account.Web.Pages.Account.VerifyCodeModel -@inject IHtmlLocalizer L - -
- - -
- - - -
-
- - -
- @L["VerifyCode"] -
diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/VerifyCode.cshtml.cs b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/VerifyCode.cshtml.cs deleted file mode 100644 index 25e8ba1ae..000000000 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/Account/VerifyCode.cshtml.cs +++ /dev/null @@ -1,65 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Logging; -using System.ComponentModel.DataAnnotations; -using System.Threading.Tasks; -using Volo.Abp.Account.Web.Pages.Account; - -namespace LINGYUN.Abp.Account.Web.Pages.Account -{ - public class VerifyCodeModel : AccountPageModel - { - [BindProperty] - public VerifyCodeInputModel Input { get; set; } - - public virtual IActionResult OnGet() - { - Input = new VerifyCodeInputModel(); - - return Page(); - } - - public async virtual Task OnPostAsync() - { - var user = await SignInManager.GetTwoFactorAuthenticationUserAsync(); - if (user == null) - { - Alerts.Warning("˫������֤ʧ��,�û�δ��¼����ʧЧ!"); - return Page(); - } - - var result = await SignInManager.TwoFactorSignInAsync(Input.Provider, Input.Code, Input.RememberMe, Input.RememberBrowser); - if (result.Succeeded) - { - return RedirectSafely(Input.ReturnUrl); - } - if (result.IsLockedOut) - { - Logger.LogWarning(7, "User account locked out."); - Alerts.Warning(L["UserLockedOutMessage"]); - return Page(); - } - else - { - Alerts.Danger("��Ȩ����֤��Ч!"); - return Page(); - } - } - } - - public class VerifyCodeInputModel - { - [Required] - public string Provider { get; set; } - - [Required] - public string Code { get; set; } - - public string ReturnUrl { get; set; } - - [Display(Name = "Remember this browser?")] - public bool RememberBrowser { get; set; } - - [Display(Name = "Remember me?")] - public bool RememberMe { get; set; } - } -} diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/_ViewImports.cshtml b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/_ViewImports.cshtml deleted file mode 100644 index eccbe49d6..000000000 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Pages/_ViewImports.cshtml +++ /dev/null @@ -1,4 +0,0 @@ -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers -@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI -@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap -@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bundling \ No newline at end of file diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Properties/launchSettings.json b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Properties/launchSettings.json deleted file mode 100644 index 547502160..000000000 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/Properties/launchSettings.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:63675", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "LINGYUN.Abp.Account.Web": { - "commandName": "Project", - "launchBrowser": true, - "applicationUrl": "http://localhost:5000", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} diff --git a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/README.md b/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/README.md deleted file mode 100644 index 00062094f..000000000 --- a/aspnet-core/modules/account/LINGYUN.Abp.Account.Web/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# LINGYUN.Abp.Account.Web - -重写用户账户相关页面 - -暂时不启用 - -## 配置使用 - - -```csharp -[DependsOn(typeof(LINGYUN.Abp.Account.Web.AbpAccountWebModule))] -public class YouProjectModule : AbpModule -{ - // other -} -``` diff --git a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN.Abp.Auditing.Application.Contracts.csproj b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN.Abp.Auditing.Application.Contracts.csproj index 37b0084fc..3f0ca2163 100644 --- a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN.Abp.Auditing.Application.Contracts.csproj +++ b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN.Abp.Auditing.Application.Contracts.csproj @@ -1,23 +1,23 @@  - - + + - - netstandard2.0 - - + + netstandard2.0 + + - - - - + + + + - - - - - - + + + + + + diff --git a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN.Abp.Auditing.Application.csproj b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN.Abp.Auditing.Application.csproj index 9103c4996..183ad3ba8 100644 --- a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN.Abp.Auditing.Application.csproj +++ b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application/LINGYUN.Abp.Auditing.Application.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.HttpApi/LINGYUN.Abp.Auditing.HttpApi.csproj b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.HttpApi/LINGYUN.Abp.Auditing.HttpApi.csproj index ffeed91cc..9c8291708 100644 --- a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.HttpApi/LINGYUN.Abp.Auditing.HttpApi.csproj +++ b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.HttpApi/LINGYUN.Abp.Auditing.HttpApi.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.Application.Contracts/LINGYUN.Abp.CachingManagement.Application.Contracts.csproj b/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.Application.Contracts/LINGYUN.Abp.CachingManagement.Application.Contracts.csproj index c9f78df80..6181fd6b3 100644 --- a/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.Application.Contracts/LINGYUN.Abp.CachingManagement.Application.Contracts.csproj +++ b/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.Application.Contracts/LINGYUN.Abp.CachingManagement.Application.Contracts.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -17,8 +17,8 @@ - - + + diff --git a/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.Application/LINGYUN.Abp.CachingManagement.Application.csproj b/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.Application/LINGYUN.Abp.CachingManagement.Application.csproj index 4973feaf6..8f50fd6a0 100644 --- a/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.Application/LINGYUN.Abp.CachingManagement.Application.csproj +++ b/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.Application/LINGYUN.Abp.CachingManagement.Application.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.Domain/LINGYUN.Abp.CachingManagement.Domain.csproj b/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.Domain/LINGYUN.Abp.CachingManagement.Domain.csproj index 0145c1b1a..202302bd9 100644 --- a/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.Domain/LINGYUN.Abp.CachingManagement.Domain.csproj +++ b/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.Domain/LINGYUN.Abp.CachingManagement.Domain.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.HttpApi/LINGYUN.Abp.CachingManagement.HttpApi.csproj b/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.HttpApi/LINGYUN.Abp.CachingManagement.HttpApi.csproj index 88f5acd7b..0b5678345 100644 --- a/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.HttpApi/LINGYUN.Abp.CachingManagement.HttpApi.csproj +++ b/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.HttpApi/LINGYUN.Abp.CachingManagement.HttpApi.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.StackExchangeRedis/LINGYUN.Abp.CachingManagement.StackExchangeRedis.csproj b/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.StackExchangeRedis/LINGYUN.Abp.CachingManagement.StackExchangeRedis.csproj index 18df19325..c20f0d27b 100644 --- a/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.StackExchangeRedis/LINGYUN.Abp.CachingManagement.StackExchangeRedis.csproj +++ b/aspnet-core/modules/caching-management/LINGYUN.Abp.CachingManagement.StackExchangeRedis/LINGYUN.Abp.CachingManagement.StackExchangeRedis.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities.BlobStoring/LINGYUN.Abp.Elsa.Activities.BlobStoring.csproj b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities.BlobStoring/LINGYUN.Abp.Elsa.Activities.BlobStoring.csproj index 50596bc1a..961c17cb4 100644 --- a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities.BlobStoring/LINGYUN.Abp.Elsa.Activities.BlobStoring.csproj +++ b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities.BlobStoring/LINGYUN.Abp.Elsa.Activities.BlobStoring.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.1 @@ -10,8 +10,8 @@ - - + + diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities.Emailing/LINGYUN.Abp.Elsa.Activities.Emailing.csproj b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities.Emailing/LINGYUN.Abp.Elsa.Activities.Emailing.csproj index 917fb0f23..1a9a174fa 100644 --- a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities.Emailing/LINGYUN.Abp.Elsa.Activities.Emailing.csproj +++ b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities.Emailing/LINGYUN.Abp.Elsa.Activities.Emailing.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.1 @@ -10,7 +10,7 @@ - + diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities.IM/LINGYUN.Abp.Elsa.Activities.IM.csproj b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities.IM/LINGYUN.Abp.Elsa.Activities.IM.csproj index 21c87e679..3b1f099e2 100644 --- a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities.IM/LINGYUN.Abp.Elsa.Activities.IM.csproj +++ b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities.IM/LINGYUN.Abp.Elsa.Activities.IM.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.1 diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities.Notifications/LINGYUN.Abp.Elsa.Activities.Notifications.csproj b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities.Notifications/LINGYUN.Abp.Elsa.Activities.Notifications.csproj index 179afc976..4184b0a1e 100644 --- a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities.Notifications/LINGYUN.Abp.Elsa.Activities.Notifications.csproj +++ b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities.Notifications/LINGYUN.Abp.Elsa.Activities.Notifications.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.1 diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities.Sms/LINGYUN.Abp.Elsa.Activities.Sms.csproj b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities.Sms/LINGYUN.Abp.Elsa.Activities.Sms.csproj index 73b91cc43..7563d5866 100644 --- a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities.Sms/LINGYUN.Abp.Elsa.Activities.Sms.csproj +++ b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities.Sms/LINGYUN.Abp.Elsa.Activities.Sms.csproj @@ -1,7 +1,7 @@ - + - - + + netstandard2.1 @@ -10,7 +10,7 @@ - + diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities.Webhooks/LINGYUN.Abp.Elsa.Activities.Webhooks.csproj b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities.Webhooks/LINGYUN.Abp.Elsa.Activities.Webhooks.csproj index a45d3bae0..cafafa357 100644 --- a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities.Webhooks/LINGYUN.Abp.Elsa.Activities.Webhooks.csproj +++ b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities.Webhooks/LINGYUN.Abp.Elsa.Activities.Webhooks.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.1 diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities/LINGYUN.Abp.Elsa.Activities.csproj b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities/LINGYUN.Abp.Elsa.Activities.csproj index e65f01489..2b438913d 100644 --- a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities/LINGYUN.Abp.Elsa.Activities.csproj +++ b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Activities/LINGYUN.Abp.Elsa.Activities.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.1 @@ -10,7 +10,7 @@ - + diff --git a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/FodyWeavers.xsd b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore.MySql/FodyWeavers.xsd similarity index 97% rename from aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/FodyWeavers.xsd rename to aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore.MySql/FodyWeavers.xsd index 11da52550..3f3946e28 100644 --- a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/FodyWeavers.xsd +++ b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore.MySql/FodyWeavers.xsd @@ -1,30 +1,30 @@ - - - - - - - - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + \ No newline at end of file diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore.MySql/LINGYUN.Abp.Elsa.EntityFrameworkCore.MySql.csproj b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore.MySql/LINGYUN.Abp.Elsa.EntityFrameworkCore.MySql.csproj index 94abd9f7c..a6b77f8ba 100644 --- a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore.MySql/LINGYUN.Abp.Elsa.EntityFrameworkCore.MySql.csproj +++ b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore.MySql/LINGYUN.Abp.Elsa.EntityFrameworkCore.MySql.csproj @@ -1,14 +1,17 @@ + + + net8.0 - - - + + + diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore/FodyWeavers.xsd b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore/FodyWeavers.xsd new file mode 100644 index 000000000..3f3946e28 --- /dev/null +++ b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore/LINGYUN.Abp.Elsa.EntityFrameworkCore.csproj b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore/LINGYUN.Abp.Elsa.EntityFrameworkCore.csproj index 1566b8c7c..7f45402a7 100644 --- a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore/LINGYUN.Abp.Elsa.EntityFrameworkCore.csproj +++ b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.EntityFrameworkCore/LINGYUN.Abp.Elsa.EntityFrameworkCore.csproj @@ -1,14 +1,17 @@  + + + net8.0 - - - + + + diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Notifications/LINGYUN.Abp.Elsa.Notifications.csproj b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Notifications/LINGYUN.Abp.Elsa.Notifications.csproj index 3ed81a6d4..b818ac93a 100644 --- a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Notifications/LINGYUN.Abp.Elsa.Notifications.csproj +++ b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Notifications/LINGYUN.Abp.Elsa.Notifications.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.1 diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Server/LINGYUN.Abp.Elsa.Server.csproj b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Server/LINGYUN.Abp.Elsa.Server.csproj index c4b2d7c77..bcb1f05ca 100644 --- a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Server/LINGYUN.Abp.Elsa.Server.csproj +++ b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa.Server/LINGYUN.Abp.Elsa.Server.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa/LINGYUN.Abp.Elsa.csproj b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa/LINGYUN.Abp.Elsa.csproj index 7b68e65a3..c54f54b37 100644 --- a/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa/LINGYUN.Abp.Elsa.csproj +++ b/aspnet-core/modules/elsa/LINGYUN.Abp.Elsa/LINGYUN.Abp.Elsa.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.1 @@ -10,13 +10,13 @@ - - - - - - - + + + + + + + diff --git a/aspnet-core/modules/feature-management/LINGYUN.Abp.FeatureManagement.Application.Contracts/LINGYUN.Abp.FeatureManagement.Application.Contracts.csproj b/aspnet-core/modules/feature-management/LINGYUN.Abp.FeatureManagement.Application.Contracts/LINGYUN.Abp.FeatureManagement.Application.Contracts.csproj index 415515fbf..190c317d1 100644 --- a/aspnet-core/modules/feature-management/LINGYUN.Abp.FeatureManagement.Application.Contracts/LINGYUN.Abp.FeatureManagement.Application.Contracts.csproj +++ b/aspnet-core/modules/feature-management/LINGYUN.Abp.FeatureManagement.Application.Contracts/LINGYUN.Abp.FeatureManagement.Application.Contracts.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -17,7 +17,7 @@ - + diff --git a/aspnet-core/modules/feature-management/LINGYUN.Abp.FeatureManagement.Application/LINGYUN.Abp.FeatureManagement.Application.csproj b/aspnet-core/modules/feature-management/LINGYUN.Abp.FeatureManagement.Application/LINGYUN.Abp.FeatureManagement.Application.csproj index a8a27bc17..8e0dc6ad2 100644 --- a/aspnet-core/modules/feature-management/LINGYUN.Abp.FeatureManagement.Application/LINGYUN.Abp.FeatureManagement.Application.csproj +++ b/aspnet-core/modules/feature-management/LINGYUN.Abp.FeatureManagement.Application/LINGYUN.Abp.FeatureManagement.Application.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/feature-management/LINGYUN.Abp.FeatureManagement.HttpApi/LINGYUN.Abp.FeatureManagement.HttpApi.csproj b/aspnet-core/modules/feature-management/LINGYUN.Abp.FeatureManagement.HttpApi/LINGYUN.Abp.FeatureManagement.HttpApi.csproj index 0118ae396..137a245eb 100644 --- a/aspnet-core/modules/feature-management/LINGYUN.Abp.FeatureManagement.HttpApi/LINGYUN.Abp.FeatureManagement.HttpApi.csproj +++ b/aspnet-core/modules/feature-management/LINGYUN.Abp.FeatureManagement.HttpApi/LINGYUN.Abp.FeatureManagement.HttpApi.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application.Contracts/LINGYUN.Abp.Identity.Application.Contracts.csproj b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application.Contracts/LINGYUN.Abp.Identity.Application.Contracts.csproj index 4ea9a74e8..df9f404a4 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application.Contracts/LINGYUN.Abp.Identity.Application.Contracts.csproj +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application.Contracts/LINGYUN.Abp.Identity.Application.Contracts.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application/LINGYUN.Abp.Identity.Application.csproj b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application/LINGYUN.Abp.Identity.Application.csproj index f25ffb6ba..320c73e11 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application/LINGYUN.Abp.Identity.Application.csproj +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Application/LINGYUN.Abp.Identity.Application.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain.Shared/LINGYUN.Abp.Identity.Domain.Shared.csproj b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain.Shared/LINGYUN.Abp.Identity.Domain.Shared.csproj index 74a8efec3..bdbbeef93 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain.Shared/LINGYUN.Abp.Identity.Domain.Shared.csproj +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain.Shared/LINGYUN.Abp.Identity.Domain.Shared.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -19,7 +19,7 @@ - + diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN.Abp.Identity.Domain.csproj b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN.Abp.Identity.Domain.csproj index 81b12110d..5b6f13fc7 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN.Abp.Identity.Domain.csproj +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.Domain/LINGYUN.Abp.Identity.Domain.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.1 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.EntityFrameworkCore/LINGYUN.Abp.Identity.EntityFrameworkCore.csproj b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.EntityFrameworkCore/LINGYUN.Abp.Identity.EntityFrameworkCore.csproj index 14a30916b..28bc68d96 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.EntityFrameworkCore/LINGYUN.Abp.Identity.EntityFrameworkCore.csproj +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.EntityFrameworkCore/LINGYUN.Abp.Identity.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi.Client/LINGYUN.Abp.Identity.HttpApi.Client.csproj b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi.Client/LINGYUN.Abp.Identity.HttpApi.Client.csproj index 0d6002893..42d581c4b 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi.Client/LINGYUN.Abp.Identity.HttpApi.Client.csproj +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi.Client/LINGYUN.Abp.Identity.HttpApi.Client.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi/LINGYUN.Abp.Identity.HttpApi.csproj b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi/LINGYUN.Abp.Identity.HttpApi.csproj index 3d2d19080..9a1048682 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi/LINGYUN.Abp.Identity.HttpApi.csproj +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.HttpApi/LINGYUN.Abp.Identity.HttpApi.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.OrganizaztionUnits/LINGYUN.Abp.Identity.OrganizaztionUnits.csproj b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.OrganizaztionUnits/LINGYUN.Abp.Identity.OrganizaztionUnits.csproj index 2d461e321..e8dd596d2 100644 --- a/aspnet-core/modules/identity/LINGYUN.Abp.Identity.OrganizaztionUnits/LINGYUN.Abp.Identity.OrganizaztionUnits.csproj +++ b/aspnet-core/modules/identity/LINGYUN.Abp.Identity.OrganizaztionUnits/LINGYUN.Abp.Identity.OrganizaztionUnits.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.1 diff --git a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application.Contracts/LINGYUN.Abp.IdentityServer.Application.Contracts.csproj b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application.Contracts/LINGYUN.Abp.IdentityServer.Application.Contracts.csproj index bc3ea703d..2068fdcb6 100644 --- a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application.Contracts/LINGYUN.Abp.IdentityServer.Application.Contracts.csproj +++ b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application.Contracts/LINGYUN.Abp.IdentityServer.Application.Contracts.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -19,9 +19,9 @@ - - - + + + diff --git a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application/LINGYUN.Abp.IdentityServer.Application.csproj b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application/LINGYUN.Abp.IdentityServer.Application.csproj index b28219c8e..778b7845e 100644 --- a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application/LINGYUN.Abp.IdentityServer.Application.csproj +++ b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Application/LINGYUN.Abp.IdentityServer.Application.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Domain/LINGYUN.Abp.IdentityServer.Domain.csproj b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Domain/LINGYUN.Abp.IdentityServer.Domain.csproj index df1ae85d6..34e30b856 100644 --- a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Domain/LINGYUN.Abp.IdentityServer.Domain.csproj +++ b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Domain/LINGYUN.Abp.IdentityServer.Domain.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.EntityFrameworkCore/LINGYUN.Abp.IdentityServer.EntityFrameworkCore.csproj b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.EntityFrameworkCore/LINGYUN.Abp.IdentityServer.EntityFrameworkCore.csproj index ec0496916..0187d6358 100644 --- a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.EntityFrameworkCore/LINGYUN.Abp.IdentityServer.EntityFrameworkCore.csproj +++ b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.EntityFrameworkCore/LINGYUN.Abp.IdentityServer.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN.Abp.IdentityServer.HttpApi.csproj b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN.Abp.IdentityServer.HttpApi.csproj index b70177857..cf9f68dee 100644 --- a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN.Abp.IdentityServer.HttpApi.csproj +++ b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.HttpApi/LINGYUN.Abp.IdentityServer.HttpApi.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.LinkUser/LINGYUN.Abp.IdentityServer.LinkUser.csproj b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.LinkUser/LINGYUN.Abp.IdentityServer.LinkUser.csproj index 220a41a1f..bdd33732f 100644 --- a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.LinkUser/LINGYUN.Abp.IdentityServer.LinkUser.csproj +++ b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.LinkUser/LINGYUN.Abp.IdentityServer.LinkUser.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -17,7 +17,7 @@ - + diff --git a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Portal/LINGYUN.Abp.IdentityServer.Portal.csproj b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Portal/LINGYUN.Abp.IdentityServer.Portal.csproj index b46f94efd..5d7f72177 100644 --- a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Portal/LINGYUN.Abp.IdentityServer.Portal.csproj +++ b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.Portal/LINGYUN.Abp.IdentityServer.Portal.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.SmsValidator/LINGYUN.Abp.IdentityServer.SmsValidator.csproj b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.SmsValidator/LINGYUN.Abp.IdentityServer.SmsValidator.csproj index 1d60139ba..8fd12910f 100644 --- a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.SmsValidator/LINGYUN.Abp.IdentityServer.SmsValidator.csproj +++ b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.SmsValidator/LINGYUN.Abp.IdentityServer.SmsValidator.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -19,7 +19,7 @@ - + diff --git a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChat.Work/LINGYUN.Abp.IdentityServer.WeChat.Work.csproj b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChat.Work/LINGYUN.Abp.IdentityServer.WeChat.Work.csproj index ccc234bff..fd48ca042 100644 --- a/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChat.Work/LINGYUN.Abp.IdentityServer.WeChat.Work.csproj +++ b/aspnet-core/modules/identityServer/LINGYUN.Abp.IdentityServer.WeChat.Work/LINGYUN.Abp.IdentityServer.WeChat.Work.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -14,7 +14,7 @@ - + diff --git a/aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.Application.Contracts/LINGYUN.Abp.LocalizationManagement.Application.Contracts.csproj b/aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.Application.Contracts/LINGYUN.Abp.LocalizationManagement.Application.Contracts.csproj index 8d432b226..b386c1bec 100644 --- a/aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.Application.Contracts/LINGYUN.Abp.LocalizationManagement.Application.Contracts.csproj +++ b/aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.Application.Contracts/LINGYUN.Abp.LocalizationManagement.Application.Contracts.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.Application/LINGYUN.Abp.LocalizationManagement.Application.csproj b/aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.Application/LINGYUN.Abp.LocalizationManagement.Application.csproj index 8fa3351db..a5dd3fcdb 100644 --- a/aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.Application/LINGYUN.Abp.LocalizationManagement.Application.csproj +++ b/aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.Application/LINGYUN.Abp.LocalizationManagement.Application.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.1 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN.Abp.LocalizationManagement.Domain.Shared.csproj b/aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN.Abp.LocalizationManagement.Domain.Shared.csproj index 652a7152e..3c1e35f5c 100644 --- a/aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN.Abp.LocalizationManagement.Domain.Shared.csproj +++ b/aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.Domain.Shared/LINGYUN.Abp.LocalizationManagement.Domain.Shared.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -19,8 +19,8 @@ - - + + diff --git a/aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.Domain/LINGYUN.Abp.LocalizationManagement.Domain.csproj b/aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.Domain/LINGYUN.Abp.LocalizationManagement.Domain.csproj index b2b34b580..406387e18 100644 --- a/aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.Domain/LINGYUN.Abp.LocalizationManagement.Domain.csproj +++ b/aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.Domain/LINGYUN.Abp.LocalizationManagement.Domain.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.1 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore/LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore.csproj b/aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore/LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore.csproj index 75e11206d..9236c4b8c 100644 --- a/aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore/LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore.csproj +++ b/aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore/LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.HttpApi/LINGYUN.Abp.LocalizationManagement.HttpApi.csproj b/aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.HttpApi/LINGYUN.Abp.LocalizationManagement.HttpApi.csproj index 501d8cef8..70c03174f 100644 --- a/aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.HttpApi/LINGYUN.Abp.LocalizationManagement.HttpApi.csproj +++ b/aspnet-core/modules/localization-management/LINGYUN.Abp.LocalizationManagement.HttpApi/LINGYUN.Abp.LocalizationManagement.HttpApi.csproj @@ -1,7 +1,7 @@ - - + + net8.0 diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Application.Contracts/LINGYUN.Abp.OpenIddict.Application.Contracts.csproj b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Application.Contracts/LINGYUN.Abp.OpenIddict.Application.Contracts.csproj index 67aee1f79..bca0b55e8 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Application.Contracts/LINGYUN.Abp.OpenIddict.Application.Contracts.csproj +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Application.Contracts/LINGYUN.Abp.OpenIddict.Application.Contracts.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -17,9 +17,9 @@ - - - + + + diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Application/LINGYUN.Abp.OpenIddict.Application.csproj b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Application/LINGYUN.Abp.OpenIddict.Application.csproj index f7cea2b64..40e1eeaa6 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Application/LINGYUN.Abp.OpenIddict.Application.csproj +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Application/LINGYUN.Abp.OpenIddict.Application.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.1 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore/LINGYUN.Abp.OpenIddict.AspNetCore.csproj b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore/LINGYUN.Abp.OpenIddict.AspNetCore.csproj index 59bc0d431..0c6a2b1bf 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore/LINGYUN.Abp.OpenIddict.AspNetCore.csproj +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.AspNetCore/LINGYUN.Abp.OpenIddict.AspNetCore.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Dapr.Client/LINGYUN.Abp.OpenIddict.Dapr.Client.csproj b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Dapr.Client/LINGYUN.Abp.OpenIddict.Dapr.Client.csproj index 87fc2a0b4..15a30ebbf 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Dapr.Client/LINGYUN.Abp.OpenIddict.Dapr.Client.csproj +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Dapr.Client/LINGYUN.Abp.OpenIddict.Dapr.Client.csproj @@ -1,7 +1,7 @@  - - + + net8.0 diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.HttpApi.Client/LINGYUN.Abp.OpenIddict.HttpApi.Client.csproj b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.HttpApi.Client/LINGYUN.Abp.OpenIddict.HttpApi.Client.csproj index d20a0db72..ba8d08ce6 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.HttpApi.Client/LINGYUN.Abp.OpenIddict.HttpApi.Client.csproj +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.HttpApi.Client/LINGYUN.Abp.OpenIddict.HttpApi.Client.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.HttpApi/LINGYUN.Abp.OpenIddict.HttpApi.csproj b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.HttpApi/LINGYUN.Abp.OpenIddict.HttpApi.csproj index 289359364..9089b0fa7 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.HttpApi/LINGYUN.Abp.OpenIddict.HttpApi.csproj +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.HttpApi/LINGYUN.Abp.OpenIddict.HttpApi.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.LinkUser/LINGYUN.Abp.OpenIddict.LinkUser.csproj b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.LinkUser/LINGYUN.Abp.OpenIddict.LinkUser.csproj index f2cc442b5..0760a375e 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.LinkUser/LINGYUN.Abp.OpenIddict.LinkUser.csproj +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.LinkUser/LINGYUN.Abp.OpenIddict.LinkUser.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -17,7 +17,7 @@ - + diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Portal/LINGYUN.Abp.OpenIddict.Portal.csproj b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Portal/LINGYUN.Abp.OpenIddict.Portal.csproj index 9265eec3b..235ff63ed 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Portal/LINGYUN.Abp.OpenIddict.Portal.csproj +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Portal/LINGYUN.Abp.OpenIddict.Portal.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Sms/LINGYUN.Abp.OpenIddict.Sms.csproj b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Sms/LINGYUN.Abp.OpenIddict.Sms.csproj index b9bd39eae..1f7e59a6c 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Sms/LINGYUN.Abp.OpenIddict.Sms.csproj +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.Sms/LINGYUN.Abp.OpenIddict.Sms.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -17,8 +17,8 @@ - - + + diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.WeChat.Work/LINGYUN.Abp.OpenIddict.WeChat.Work.csproj b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.WeChat.Work/LINGYUN.Abp.OpenIddict.WeChat.Work.csproj index 71f8e9beb..abc60b00e 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.WeChat.Work/LINGYUN.Abp.OpenIddict.WeChat.Work.csproj +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.WeChat.Work/LINGYUN.Abp.OpenIddict.WeChat.Work.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -14,7 +14,7 @@ - + diff --git a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.WeChat/LINGYUN.Abp.OpenIddict.WeChat.csproj b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.WeChat/LINGYUN.Abp.OpenIddict.WeChat.csproj index bf2310649..12fd4e41e 100644 --- a/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.WeChat/LINGYUN.Abp.OpenIddict.WeChat.csproj +++ b/aspnet-core/modules/openIddict/LINGYUN.Abp.OpenIddict.WeChat/LINGYUN.Abp.OpenIddict.WeChat.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -17,7 +17,7 @@ - + diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN.Abp.BlobStoring.OssManagement.csproj b/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN.Abp.BlobStoring.OssManagement.csproj index 05a77d6d7..a2c194cce 100644 --- a/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN.Abp.BlobStoring.OssManagement.csproj +++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN.Abp.BlobStoring.OssManagement.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Aliyun/LINGYUN.Abp.OssManagement.Aliyun.csproj b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Aliyun/LINGYUN.Abp.OssManagement.Aliyun.csproj index d0f43a6c4..21d881f75 100644 --- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Aliyun/LINGYUN.Abp.OssManagement.Aliyun.csproj +++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Aliyun/LINGYUN.Abp.OssManagement.Aliyun.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application.Contracts/LINGYUN.Abp.OssManagement.Application.Contracts.csproj b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application.Contracts/LINGYUN.Abp.OssManagement.Application.Contracts.csproj index 43cb52851..7f531dc83 100644 --- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application.Contracts/LINGYUN.Abp.OssManagement.Application.Contracts.csproj +++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application.Contracts/LINGYUN.Abp.OssManagement.Application.Contracts.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN.Abp.OssManagement.Application.csproj b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN.Abp.OssManagement.Application.csproj index f81f0dc5a..1c62d5ae4 100644 --- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN.Abp.OssManagement.Application.csproj +++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN.Abp.OssManagement.Application.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,9 +9,9 @@ - - - + + + diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Domain.Shared/LINGYUN.Abp.OssManagement.Domain.Shared.csproj b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Domain.Shared/LINGYUN.Abp.OssManagement.Domain.Shared.csproj index c6b9df02e..df88d2c4c 100644 --- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Domain.Shared/LINGYUN.Abp.OssManagement.Domain.Shared.csproj +++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Domain.Shared/LINGYUN.Abp.OssManagement.Domain.Shared.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -17,8 +17,8 @@ - - + + diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Domain/LINGYUN.Abp.OssManagement.Domain.csproj b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Domain/LINGYUN.Abp.OssManagement.Domain.csproj index c8484995f..5eb951b80 100644 --- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Domain/LINGYUN.Abp.OssManagement.Domain.csproj +++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Domain/LINGYUN.Abp.OssManagement.Domain.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem.ImageSharp/LINGYUN.Abp.OssManagement.FileSystem.ImageSharp.csproj b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem.ImageSharp/LINGYUN.Abp.OssManagement.FileSystem.ImageSharp.csproj index 031fdeaf6..c19956339 100644 --- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem.ImageSharp/LINGYUN.Abp.OssManagement.FileSystem.ImageSharp.csproj +++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem.ImageSharp/LINGYUN.Abp.OssManagement.FileSystem.ImageSharp.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem.Imaging.ImageSharp/LINGYUN.Abp.OssManagement.FileSystem.Imaging.ImageSharp.csproj b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem.Imaging.ImageSharp/LINGYUN.Abp.OssManagement.FileSystem.Imaging.ImageSharp.csproj index 3b7026c02..4dcbb3685 100644 --- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem.Imaging.ImageSharp/LINGYUN.Abp.OssManagement.FileSystem.Imaging.ImageSharp.csproj +++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem.Imaging.ImageSharp/LINGYUN.Abp.OssManagement.FileSystem.Imaging.ImageSharp.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem.Imaging/LINGYUN.Abp.OssManagement.FileSystem.Imaging.csproj b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem.Imaging/LINGYUN.Abp.OssManagement.FileSystem.Imaging.csproj index b1199ba14..75f65f51c 100644 --- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem.Imaging/LINGYUN.Abp.OssManagement.FileSystem.Imaging.csproj +++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem.Imaging/LINGYUN.Abp.OssManagement.FileSystem.Imaging.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.1 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem/LINGYUN.Abp.OssManagement.FileSystem.csproj b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem/LINGYUN.Abp.OssManagement.FileSystem.csproj index ee3311da7..50ccc853c 100644 --- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem/LINGYUN.Abp.OssManagement.FileSystem.csproj +++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.FileSystem/LINGYUN.Abp.OssManagement.FileSystem.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.1 @@ -10,7 +10,7 @@ - + diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi.Client/LINGYUN.Abp.OssManagement.HttpApi.Client.csproj b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi.Client/LINGYUN.Abp.OssManagement.HttpApi.Client.csproj index fb415f1bb..39e7ce18d 100644 --- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi.Client/LINGYUN.Abp.OssManagement.HttpApi.Client.csproj +++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi.Client/LINGYUN.Abp.OssManagement.HttpApi.Client.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN.Abp.OssManagement.HttpApi.csproj b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN.Abp.OssManagement.HttpApi.csproj index cd6a42495..5a355f5e4 100644 --- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN.Abp.OssManagement.HttpApi.csproj +++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN.Abp.OssManagement.HttpApi.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Nexus/LINGYUN.Abp.OssManagement.Nexus.csproj b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Nexus/LINGYUN.Abp.OssManagement.Nexus.csproj index 50e20edec..0d9f70268 100644 --- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Nexus/LINGYUN.Abp.OssManagement.Nexus.csproj +++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Nexus/LINGYUN.Abp.OssManagement.Nexus.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.SettingManagement/LINGYUN.Abp.OssManagement.SettingManagement.csproj b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.SettingManagement/LINGYUN.Abp.OssManagement.SettingManagement.csproj index e5dd0ef72..89f931819 100644 --- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.SettingManagement/LINGYUN.Abp.OssManagement.SettingManagement.csproj +++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.SettingManagement/LINGYUN.Abp.OssManagement.SettingManagement.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Tencent/LINGYUN.Abp.OssManagement.Tencent.csproj b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Tencent/LINGYUN.Abp.OssManagement.Tencent.csproj index f4b6c14d5..4753b066f 100644 --- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Tencent/LINGYUN.Abp.OssManagement.Tencent.csproj +++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Tencent/LINGYUN.Abp.OssManagement.Tencent.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 diff --git a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Application.Contracts/LINGYUN.Abp.PermissionManagement.Application.Contracts.csproj b/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Application.Contracts/LINGYUN.Abp.PermissionManagement.Application.Contracts.csproj index 9d4293ad2..8882026ca 100644 --- a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Application.Contracts/LINGYUN.Abp.PermissionManagement.Application.Contracts.csproj +++ b/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Application.Contracts/LINGYUN.Abp.PermissionManagement.Application.Contracts.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -14,7 +14,7 @@ - + diff --git a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Application/LINGYUN.Abp.PermissionManagement.Application.csproj b/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Application/LINGYUN.Abp.PermissionManagement.Application.csproj index 112c54b83..75f158c9f 100644 --- a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Application/LINGYUN.Abp.PermissionManagement.Application.csproj +++ b/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Application/LINGYUN.Abp.PermissionManagement.Application.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain.OrganizationUnits/LINGYUN.Abp.PermissionManagement.Domain.OrganizationUnits.csproj b/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain.OrganizationUnits/LINGYUN.Abp.PermissionManagement.Domain.OrganizationUnits.csproj index ca1eeb6dc..1fb528e8a 100644 --- a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain.OrganizationUnits/LINGYUN.Abp.PermissionManagement.Domain.OrganizationUnits.csproj +++ b/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain.OrganizationUnits/LINGYUN.Abp.PermissionManagement.Domain.OrganizationUnits.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.1 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/.gitignore b/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/.gitignore deleted file mode 100644 index 79774a567..000000000 --- a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -bin -obj -Logs -appsettings.*.json -node_modules -yarn.lock -package-lock.json \ No newline at end of file diff --git a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/FodyWeavers.xml b/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/FodyWeavers.xml deleted file mode 100644 index 1715698cc..000000000 --- a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/LINGYUN.Abp.PermissionManagement.Domain.csproj b/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/LINGYUN.Abp.PermissionManagement.Domain.csproj deleted file mode 100644 index c9d05ee38..000000000 --- a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/LINGYUN.Abp.PermissionManagement.Domain.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - netstandard2.0 - - - - - - - - diff --git a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/LINGYUN/Abp/PermissionManagement/AbpPermissionManagementDomainModule.cs b/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/LINGYUN/Abp/PermissionManagement/AbpPermissionManagementDomainModule.cs deleted file mode 100644 index 834100246..000000000 --- a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/LINGYUN/Abp/PermissionManagement/AbpPermissionManagementDomainModule.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Volo.Abp.Modularity; - -namespace LINGYUN.Abp.PermissionManagement -{ - [DependsOn( - typeof(Volo.Abp.PermissionManagement.AbpPermissionManagementDomainModule))] - public class AbpPermissionManagementDomainModule : AbpModule - { - - } -} diff --git a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/LINGYUN/Abp/PermissionManagement/DefaultPermissionManager.cs b/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/LINGYUN/Abp/PermissionManagement/DefaultPermissionManager.cs deleted file mode 100644 index 106a677b7..000000000 --- a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/LINGYUN/Abp/PermissionManagement/DefaultPermissionManager.cs +++ /dev/null @@ -1,118 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Options; -using System; -using System.Linq; -using System.Threading.Tasks; -using Volo.Abp.Authorization.Permissions; -using Volo.Abp.Caching; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Guids; -using Volo.Abp.MultiTenancy; -using Volo.Abp.PermissionManagement; -using Volo.Abp.SimpleStateChecking; - -namespace LINGYUN.Abp.PermissionManagement -{ - [Dependency(ServiceLifetime.Singleton, ReplaceServices = true)] - [ExposeServices(typeof(IPermissionManager), typeof(PermissionManager))] - public class DefaultPermissionManager : PermissionManager - { - #region DependencyInjection - - protected readonly object ServiceProviderLock = new object(); - - protected TService LazyGetRequiredService(ref TService reference) - => LazyGetRequiredService(typeof(TService), ref reference); - - protected TRef LazyGetRequiredService(Type serviceType, ref TRef reference) - { - if (reference == null) - { - lock (ServiceProviderLock) - { - if (reference == null) - { - reference = (TRef)ServiceProvider.GetRequiredService(serviceType); - } - } - } - - return reference; - } - protected IServiceProvider ServiceProvider { get; } - - #endregion - - protected IPermissionStore PermissionStore { get; } - public DefaultPermissionManager( - IPermissionDefinitionManager permissionDefinitionManager, - ISimpleStateCheckerManager simpleStateCheckerManager, - IPermissionGrantRepository permissionGrantRepository, - IPermissionStore permissionStore, - IServiceProvider serviceProvider, - IGuidGenerator guidGenerator, - IOptions options, - ICurrentTenant currentTenant, - IDistributedCache cache) - : base( - permissionDefinitionManager, - simpleStateCheckerManager, - permissionGrantRepository, - serviceProvider, - guidGenerator, - options, - currentTenant, - cache) - { - ServiceProvider = serviceProvider; - PermissionStore = permissionStore; - } - - public override async Task SetAsync(string permissionName, string providerName, string providerKey, bool isGranted) - { - await base.SetAsync(permissionName, providerName, providerKey, isGranted); - - // 不需要改缓存,因为权限实体变更会自动清理缓存 - //var cacheKey = PermissionGrantCacheItem.CalculateCacheKey(permissionName, providerName, providerKey); - //var cacheItem = new PermissionGrantCacheItem(isGranted); - //await PermissionGrantChche.SetAsync(cacheKey, cacheItem); - } - - protected override async Task GetInternalAsync(PermissionDefinition permission, string providerName, string providerKey) - { - var result = new PermissionWithGrantedProviders(permission.Name, false); - - if (!permission.IsEnabled) - { - return result; - } - - if (!await SimpleStateCheckerManager.IsEnabledAsync(permission)) - { - return result; - } - - if (!permission.MultiTenancySide.HasFlag(CurrentTenant.GetMultiTenancySide())) - { - return result; - } - - if (permission.Providers.Any() && !permission.Providers.Contains(providerName)) - { - return result; - } - - // 这么做的坏处就是没法给特定的Provider设定是否授权字段 - // result.Providers 会出现假数据 UserPermissionProvider未授权, 而所属的 - - result.IsGranted = await IsGrantedAsync(permission.Name, providerName, providerKey); - - return result; - } - - protected async virtual Task IsGrantedAsync(string permissionName, string providerName, string providerKey) - { - return await PermissionStore.IsGrantedAsync(permissionName, providerName, providerKey); - } - } -} diff --git a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/README.md b/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/README.md deleted file mode 100644 index 4c0e7846b..000000000 --- a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.Domain/README.md +++ /dev/null @@ -1,22 +0,0 @@ -# LINGYUN.Abp.PermissionManagement.Domain - -重写 **Volo.Abp.PermissionManagement.PermissionManager**, 在查询权限的时候优先检查缓存 - -大部分重写的模块都和官方模块名称保持一致,通过命名空间区分,主要是只改写了一小部分或者增加额外的功能 -如果大部分模块代码都重写,或者完全就是扩展模块,才会定义自己的名字 - -#### 注意 - -当使用了此模块,可能会出现您不愿意见到的场景,因为当您只需要查看某个实体拥有的权限,然后却为此建立了它的全部缓存项 - -在一些特定场景下(**比如云缓存**),请避免引用此模块,以免产生额外的费用 - -## 配置使用 - - -```csharp -[DependsOn(typeof(LINGYUN.Abp.PermissionManagement.AbpPermissionManagementDomainModule))] -public class YouProjectModule : AbpModule -{ - // other -} diff --git a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.HttpApi/LINGYUN.Abp.PermissionManagement.HttpApi.csproj b/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.HttpApi/LINGYUN.Abp.PermissionManagement.HttpApi.csproj index ffdd10794..c4084e198 100644 --- a/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.HttpApi/LINGYUN.Abp.PermissionManagement.HttpApi.csproj +++ b/aspnet-core/modules/permissions-management/LINGYUN.Abp.PermissionManagement.HttpApi/LINGYUN.Abp.PermissionManagement.HttpApi.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/platform/LINGYUN.Abp.UI.Navigation.VueVbenAdmin/LINGYUN.Abp.UI.Navigation.VueVbenAdmin.csproj b/aspnet-core/modules/platform/LINGYUN.Abp.UI.Navigation.VueVbenAdmin/LINGYUN.Abp.UI.Navigation.VueVbenAdmin.csproj index 796810147..1ea66ae69 100644 --- a/aspnet-core/modules/platform/LINGYUN.Abp.UI.Navigation.VueVbenAdmin/LINGYUN.Abp.UI.Navigation.VueVbenAdmin.csproj +++ b/aspnet-core/modules/platform/LINGYUN.Abp.UI.Navigation.VueVbenAdmin/LINGYUN.Abp.UI.Navigation.VueVbenAdmin.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.1 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.Application.Contracts/LINGYUN.Platform.Application.Contracts.csproj b/aspnet-core/modules/platform/LINGYUN.Platform.Application.Contracts/LINGYUN.Platform.Application.Contracts.csproj index f093937dd..f175ccc03 100644 --- a/aspnet-core/modules/platform/LINGYUN.Platform.Application.Contracts/LINGYUN.Platform.Application.Contracts.csproj +++ b/aspnet-core/modules/platform/LINGYUN.Platform.Application.Contracts/LINGYUN.Platform.Application.Contracts.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -17,7 +17,7 @@ - + diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.Application/LINGYUN.Platform.Application.csproj b/aspnet-core/modules/platform/LINGYUN.Platform.Application/LINGYUN.Platform.Application.csproj index 16373d1c9..272a84906 100644 --- a/aspnet-core/modules/platform/LINGYUN.Platform.Application/LINGYUN.Platform.Application.csproj +++ b/aspnet-core/modules/platform/LINGYUN.Platform.Application/LINGYUN.Platform.Application.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.1 diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.Domain.Shared/LINGYUN.Platform.Domain.Shared.csproj b/aspnet-core/modules/platform/LINGYUN.Platform.Domain.Shared/LINGYUN.Platform.Domain.Shared.csproj index cca23a760..f1e10b645 100644 --- a/aspnet-core/modules/platform/LINGYUN.Platform.Domain.Shared/LINGYUN.Platform.Domain.Shared.csproj +++ b/aspnet-core/modules/platform/LINGYUN.Platform.Domain.Shared/LINGYUN.Platform.Domain.Shared.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -17,8 +17,8 @@ - - + + diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN.Platform.Domain.csproj b/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN.Platform.Domain.csproj index 597e146df..a7e0854be 100644 --- a/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN.Platform.Domain.csproj +++ b/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN.Platform.Domain.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.1 @@ -9,11 +9,11 @@ - - - - - + + + + + diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.EntityFrameworkCore/LINGYUN.Platform.EntityFrameworkCore.csproj b/aspnet-core/modules/platform/LINGYUN.Platform.EntityFrameworkCore/LINGYUN.Platform.EntityFrameworkCore.csproj index 8a9c733d8..48ddc1ecc 100644 --- a/aspnet-core/modules/platform/LINGYUN.Platform.EntityFrameworkCore/LINGYUN.Platform.EntityFrameworkCore.csproj +++ b/aspnet-core/modules/platform/LINGYUN.Platform.EntityFrameworkCore/LINGYUN.Platform.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.HttpApi/LINGYUN.Platform.HttpApi.csproj b/aspnet-core/modules/platform/LINGYUN.Platform.HttpApi/LINGYUN.Platform.HttpApi.csproj index 400b3730e..bbb371a0b 100644 --- a/aspnet-core/modules/platform/LINGYUN.Platform.HttpApi/LINGYUN.Platform.HttpApi.csproj +++ b/aspnet-core/modules/platform/LINGYUN.Platform.HttpApi/LINGYUN.Platform.HttpApi.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.Settings.VueVbenAdmin/LINGYUN.Platform.Settings.VueVbenAdmin.csproj b/aspnet-core/modules/platform/LINGYUN.Platform.Settings.VueVbenAdmin/LINGYUN.Platform.Settings.VueVbenAdmin.csproj index 92fb11eef..7dd9f6654 100644 --- a/aspnet-core/modules/platform/LINGYUN.Platform.Settings.VueVbenAdmin/LINGYUN.Platform.Settings.VueVbenAdmin.csproj +++ b/aspnet-core/modules/platform/LINGYUN.Platform.Settings.VueVbenAdmin/LINGYUN.Platform.Settings.VueVbenAdmin.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -17,8 +17,8 @@ - - + + diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.Theme.VueVbenAdmin/LINGYUN.Platform.Theme.VueVbenAdmin.csproj b/aspnet-core/modules/platform/LINGYUN.Platform.Theme.VueVbenAdmin/LINGYUN.Platform.Theme.VueVbenAdmin.csproj index edfc1dd64..f4255313e 100644 --- a/aspnet-core/modules/platform/LINGYUN.Platform.Theme.VueVbenAdmin/LINGYUN.Platform.Theme.VueVbenAdmin.csproj +++ b/aspnet-core/modules/platform/LINGYUN.Platform.Theme.VueVbenAdmin/LINGYUN.Platform.Theme.VueVbenAdmin.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/modules/project/LINGYUN.Abp.ProjectManagement.Application.Contracts/LINGYUN.Abp.ProjectManagement.Application.Contracts.csproj b/aspnet-core/modules/project/LINGYUN.Abp.ProjectManagement.Application.Contracts/LINGYUN.Abp.ProjectManagement.Application.Contracts.csproj index 6f43a95a8..b64a4d28a 100644 --- a/aspnet-core/modules/project/LINGYUN.Abp.ProjectManagement.Application.Contracts/LINGYUN.Abp.ProjectManagement.Application.Contracts.csproj +++ b/aspnet-core/modules/project/LINGYUN.Abp.ProjectManagement.Application.Contracts/LINGYUN.Abp.ProjectManagement.Application.Contracts.csproj @@ -1,6 +1,7 @@ - + + netstandard2.0 @@ -13,8 +14,8 @@ - - + + diff --git a/aspnet-core/modules/project/LINGYUN.Abp.ProjectManagement.Application/LINGYUN.Abp.ProjectManagement.Application.csproj b/aspnet-core/modules/project/LINGYUN.Abp.ProjectManagement.Application/LINGYUN.Abp.ProjectManagement.Application.csproj index bde7f3724..fecf1c653 100644 --- a/aspnet-core/modules/project/LINGYUN.Abp.ProjectManagement.Application/LINGYUN.Abp.ProjectManagement.Application.csproj +++ b/aspnet-core/modules/project/LINGYUN.Abp.ProjectManagement.Application/LINGYUN.Abp.ProjectManagement.Application.csproj @@ -1,14 +1,15 @@ - + + - netstandard2.0 + netstandard2.1 - + diff --git a/aspnet-core/modules/project/LINGYUN.Abp.ProjectManagement.Domain.Shared/LINGYUN.Abp.ProjectManagement.Domain.Shared.csproj b/aspnet-core/modules/project/LINGYUN.Abp.ProjectManagement.Domain.Shared/LINGYUN.Abp.ProjectManagement.Domain.Shared.csproj index 11adf67a7..783e760a5 100644 --- a/aspnet-core/modules/project/LINGYUN.Abp.ProjectManagement.Domain.Shared/LINGYUN.Abp.ProjectManagement.Domain.Shared.csproj +++ b/aspnet-core/modules/project/LINGYUN.Abp.ProjectManagement.Domain.Shared/LINGYUN.Abp.ProjectManagement.Domain.Shared.csproj @@ -1,6 +1,7 @@ - + + netstandard2.0 @@ -13,7 +14,7 @@ - + diff --git a/aspnet-core/modules/project/LINGYUN.Abp.ProjectManagement.Domain/LINGYUN.Abp.ProjectManagement.Domain.csproj b/aspnet-core/modules/project/LINGYUN.Abp.ProjectManagement.Domain/LINGYUN.Abp.ProjectManagement.Domain.csproj index f62156120..63d98c5a8 100644 --- a/aspnet-core/modules/project/LINGYUN.Abp.ProjectManagement.Domain/LINGYUN.Abp.ProjectManagement.Domain.csproj +++ b/aspnet-core/modules/project/LINGYUN.Abp.ProjectManagement.Domain/LINGYUN.Abp.ProjectManagement.Domain.csproj @@ -1,16 +1,17 @@ - + + - netstandard2.0 + netstandard2.1 - - - + + + diff --git a/aspnet-core/modules/project/LINGYUN.Abp.ProjectManagement.EntityFrameworkCore/LINGYUN.Abp.ProjectManagement.EntityFrameworkCore.csproj b/aspnet-core/modules/project/LINGYUN.Abp.ProjectManagement.EntityFrameworkCore/LINGYUN.Abp.ProjectManagement.EntityFrameworkCore.csproj index 59d6f6c13..1d0728bfb 100644 --- a/aspnet-core/modules/project/LINGYUN.Abp.ProjectManagement.EntityFrameworkCore/LINGYUN.Abp.ProjectManagement.EntityFrameworkCore.csproj +++ b/aspnet-core/modules/project/LINGYUN.Abp.ProjectManagement.EntityFrameworkCore/LINGYUN.Abp.ProjectManagement.EntityFrameworkCore.csproj @@ -1,14 +1,15 @@ - + + - netstandard2.1 + net8.0 - + diff --git a/aspnet-core/modules/project/LINGYUN.Abp.ProjectManagement.HttpApi/LINGYUN.Abp.ProjectManagement.HttpApi.csproj b/aspnet-core/modules/project/LINGYUN.Abp.ProjectManagement.HttpApi/LINGYUN.Abp.ProjectManagement.HttpApi.csproj index 4098a74a3..2ac4424b5 100644 --- a/aspnet-core/modules/project/LINGYUN.Abp.ProjectManagement.HttpApi/LINGYUN.Abp.ProjectManagement.HttpApi.csproj +++ b/aspnet-core/modules/project/LINGYUN.Abp.ProjectManagement.HttpApi/LINGYUN.Abp.ProjectManagement.HttpApi.csproj @@ -1,14 +1,15 @@ - + + - net5.0 + net8.0 - + diff --git a/aspnet-core/modules/realtime-message/LINGYUN.Abp.IM.SignalR/LINGYUN.Abp.IM.SignalR.csproj b/aspnet-core/modules/realtime-message/LINGYUN.Abp.IM.SignalR/LINGYUN.Abp.IM.SignalR.csproj index ec33e5b14..652137cba 100644 --- a/aspnet-core/modules/realtime-message/LINGYUN.Abp.IM.SignalR/LINGYUN.Abp.IM.SignalR.csproj +++ b/aspnet-core/modules/realtime-message/LINGYUN.Abp.IM.SignalR/LINGYUN.Abp.IM.SignalR.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -17,8 +17,8 @@ - - + + diff --git a/aspnet-core/modules/realtime-message/LINGYUN.Abp.IM/LINGYUN.Abp.IM.csproj b/aspnet-core/modules/realtime-message/LINGYUN.Abp.IM/LINGYUN.Abp.IM.csproj index 4b6443606..bfa7b0950 100644 --- a/aspnet-core/modules/realtime-message/LINGYUN.Abp.IM/LINGYUN.Abp.IM.csproj +++ b/aspnet-core/modules/realtime-message/LINGYUN.Abp.IM/LINGYUN.Abp.IM.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -17,8 +17,8 @@ - - + + diff --git a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN.Abp.MessageService.Application.Contracts.csproj b/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN.Abp.MessageService.Application.Contracts.csproj index 32b02d3d3..72ebb1e21 100644 --- a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN.Abp.MessageService.Application.Contracts.csproj +++ b/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN.Abp.MessageService.Application.Contracts.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Application/LINGYUN.Abp.MessageService.Application.csproj b/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Application/LINGYUN.Abp.MessageService.Application.csproj index e2fe9cd08..28f790be5 100644 --- a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Application/LINGYUN.Abp.MessageService.Application.csproj +++ b/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Application/LINGYUN.Abp.MessageService.Application.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.1 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Domain.Shared/LINGYUN.Abp.MessageService.Domain.Shared.csproj b/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Domain.Shared/LINGYUN.Abp.MessageService.Domain.Shared.csproj index 1a3c6a7e7..664151d5a 100644 --- a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Domain.Shared/LINGYUN.Abp.MessageService.Domain.Shared.csproj +++ b/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Domain.Shared/LINGYUN.Abp.MessageService.Domain.Shared.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -14,8 +14,8 @@ - - + + diff --git a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Domain/LINGYUN.Abp.MessageService.Domain.csproj b/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Domain/LINGYUN.Abp.MessageService.Domain.csproj index b3df30d28..54c23c27c 100644 --- a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Domain/LINGYUN.Abp.MessageService.Domain.csproj +++ b/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.Domain/LINGYUN.Abp.MessageService.Domain.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.1 @@ -9,11 +9,11 @@ - - - - - + + + + + diff --git a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.EntityFrameworkCore/LINGYUN.Abp.MessageService.EntityFrameworkCore.csproj b/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.EntityFrameworkCore/LINGYUN.Abp.MessageService.EntityFrameworkCore.csproj index 0f6b4be33..ffda8651e 100644 --- a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.EntityFrameworkCore/LINGYUN.Abp.MessageService.EntityFrameworkCore.csproj +++ b/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.EntityFrameworkCore/LINGYUN.Abp.MessageService.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.HttpApi.Client/LINGYUN.Abp.MessageService.HttpApi.Client.csproj b/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.HttpApi.Client/LINGYUN.Abp.MessageService.HttpApi.Client.csproj index 084345d99..f23cd3594 100644 --- a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.HttpApi.Client/LINGYUN.Abp.MessageService.HttpApi.Client.csproj +++ b/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.HttpApi.Client/LINGYUN.Abp.MessageService.HttpApi.Client.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN.Abp.MessageService.HttpApi.csproj b/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN.Abp.MessageService.HttpApi.csproj index 1454ee822..760d006c2 100644 --- a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN.Abp.MessageService.HttpApi.csproj +++ b/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.HttpApi/LINGYUN.Abp.MessageService.HttpApi.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.SignalR/FodyWeavers.xml b/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.SignalR/FodyWeavers.xml deleted file mode 100644 index 1715698cc..000000000 --- a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.SignalR/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.SignalR/LINGYUN.Abp.MessageService.SignalR.csproj b/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.SignalR/LINGYUN.Abp.MessageService.SignalR.csproj deleted file mode 100644 index 681c031c4..000000000 --- a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.SignalR/LINGYUN.Abp.MessageService.SignalR.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - netcoreapp3.1 - - - - - - - - - - - - - diff --git a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.SignalR/LINGYUN/Abp/MessageService/SignalR/AbpMessageServiceSignalRModule.cs b/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.SignalR/LINGYUN/Abp/MessageService/SignalR/AbpMessageServiceSignalRModule.cs deleted file mode 100644 index 5f4372d1d..000000000 --- a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.SignalR/LINGYUN/Abp/MessageService/SignalR/AbpMessageServiceSignalRModule.cs +++ /dev/null @@ -1,11 +0,0 @@ -using LINGYUN.Abp.IM.SignalR; -using Volo.Abp.Modularity; - -namespace LINGYUN.Abp.MessageService.SignalR -{ - [DependsOn(typeof(AbpIMSignalRModule))] - public class AbpMessageServiceSignalRModule : AbpModule - { - - } -} diff --git a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.SignalR/LINGYUN/Abp/MessageService/SignalR/Hubs/AbpMessageHub.cs b/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.SignalR/LINGYUN/Abp/MessageService/SignalR/Hubs/AbpMessageHub.cs deleted file mode 100644 index d4d01ec12..000000000 --- a/aspnet-core/modules/realtime-message/LINGYUN.Abp.MessageService.SignalR/LINGYUN/Abp/MessageService/SignalR/Hubs/AbpMessageHub.cs +++ /dev/null @@ -1,8 +0,0 @@ -using LINGYUN.Abp.IM.SignalR; - -namespace LINGYUN.Abp.MessageService.SignalR.Hubs -{ - public class AbpMessageHub : OnlineClientHubBase - { - } -} diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.ExceptionHandling.Notifications/LINGYUN.Abp.ExceptionHandling.Notifications.csproj b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.ExceptionHandling.Notifications/LINGYUN.Abp.ExceptionHandling.Notifications.csproj index 11b64fed3..47dc6b26c 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.ExceptionHandling.Notifications/LINGYUN.Abp.ExceptionHandling.Notifications.csproj +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.ExceptionHandling.Notifications/LINGYUN.Abp.ExceptionHandling.Notifications.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Application.Contracts/LINGYUN.Abp.Notifications.Application.Contracts.csproj b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Application.Contracts/LINGYUN.Abp.Notifications.Application.Contracts.csproj index 5b4297f9d..ac5dee7c1 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Application.Contracts/LINGYUN.Abp.Notifications.Application.Contracts.csproj +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Application.Contracts/LINGYUN.Abp.Notifications.Application.Contracts.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Application/LINGYUN.Abp.Notifications.Application.csproj b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Application/LINGYUN.Abp.Notifications.Application.csproj index 333ac1d61..fa3b7c7b6 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Application/LINGYUN.Abp.Notifications.Application.csproj +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Application/LINGYUN.Abp.Notifications.Application.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.1 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Common/LINGYUN.Abp.Notifications.Common.csproj b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Common/LINGYUN.Abp.Notifications.Common.csproj index 43012f2f3..44216f277 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Common/LINGYUN.Abp.Notifications.Common.csproj +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Common/LINGYUN.Abp.Notifications.Common.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Core/LINGYUN.Abp.Notifications.Core.csproj b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Core/LINGYUN.Abp.Notifications.Core.csproj index 4d770a791..757c02949 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Core/LINGYUN.Abp.Notifications.Core.csproj +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Core/LINGYUN.Abp.Notifications.Core.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,10 +9,10 @@ - - - - + + + + diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Domain.Shared/LINGYUN.Abp.Notifications.Domain.Shared.csproj b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Domain.Shared/LINGYUN.Abp.Notifications.Domain.Shared.csproj index 98cc209dd..1d1c3e4b9 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Domain.Shared/LINGYUN.Abp.Notifications.Domain.Shared.csproj +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Domain.Shared/LINGYUN.Abp.Notifications.Domain.Shared.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -14,7 +14,7 @@ - + diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Domain/LINGYUN.Abp.Notifications.Domain.csproj b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Domain/LINGYUN.Abp.Notifications.Domain.csproj index 601946c95..7cdff4896 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Domain/LINGYUN.Abp.Notifications.Domain.csproj +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Domain/LINGYUN.Abp.Notifications.Domain.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.1 @@ -9,12 +9,12 @@ - - - - - - + + + + + + diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Emailing/LINGYUN.Abp.Notifications.Emailing.csproj b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Emailing/LINGYUN.Abp.Notifications.Emailing.csproj index 032f735dc..a428cd2d7 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Emailing/LINGYUN.Abp.Notifications.Emailing.csproj +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Emailing/LINGYUN.Abp.Notifications.Emailing.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.1 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.EntityFrameworkCore/LINGYUN.Abp.Notifications.EntityFrameworkCore.csproj b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.EntityFrameworkCore/LINGYUN.Abp.Notifications.EntityFrameworkCore.csproj index 7ee11c0e6..4eba141ca 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.EntityFrameworkCore/LINGYUN.Abp.Notifications.EntityFrameworkCore.csproj +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.EntityFrameworkCore/LINGYUN.Abp.Notifications.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.HttpApi/LINGYUN.Abp.Notifications.HttpApi.csproj b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.HttpApi/LINGYUN.Abp.Notifications.HttpApi.csproj index 89da2263f..ed71bed58 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.HttpApi/LINGYUN.Abp.Notifications.HttpApi.csproj +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.HttpApi/LINGYUN.Abp.Notifications.HttpApi.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.PushPlus/LINGYUN.Abp.Notifications.PushPlus.csproj b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.PushPlus/LINGYUN.Abp.Notifications.PushPlus.csproj index 4f1dff74e..abd4fe5fa 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.PushPlus/LINGYUN.Abp.Notifications.PushPlus.csproj +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.PushPlus/LINGYUN.Abp.Notifications.PushPlus.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.SignalR/LINGYUN.Abp.Notifications.SignalR.csproj b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.SignalR/LINGYUN.Abp.Notifications.SignalR.csproj index 577c36af7..fa1afbac0 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.SignalR/LINGYUN.Abp.Notifications.SignalR.csproj +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.SignalR/LINGYUN.Abp.Notifications.SignalR.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Sms/LINGYUN.Abp.Notifications.Sms.csproj b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Sms/LINGYUN.Abp.Notifications.Sms.csproj index 672b216eb..c3b19acfe 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Sms/LINGYUN.Abp.Notifications.Sms.csproj +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.Sms/LINGYUN.Abp.Notifications.Sms.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.TuiJuhe/LINGYUN.Abp.Notifications.TuiJuhe.csproj b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.TuiJuhe/LINGYUN.Abp.Notifications.TuiJuhe.csproj index 41bda12a3..c3c138517 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.TuiJuhe/LINGYUN.Abp.Notifications.TuiJuhe.csproj +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.TuiJuhe/LINGYUN.Abp.Notifications.TuiJuhe.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.WeChat.MiniProgram/LINGYUN.Abp.Notifications.WeChat.MiniProgram.csproj b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.WeChat.MiniProgram/LINGYUN.Abp.Notifications.WeChat.MiniProgram.csproj index 8b0624e9e..2071c29f8 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.WeChat.MiniProgram/LINGYUN.Abp.Notifications.WeChat.MiniProgram.csproj +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.WeChat.MiniProgram/LINGYUN.Abp.Notifications.WeChat.MiniProgram.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.WeChat.Work/LINGYUN.Abp.Notifications.WeChat.Work.csproj b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.WeChat.Work/LINGYUN.Abp.Notifications.WeChat.Work.csproj index d3024f8ff..77c9c19a9 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.WeChat.Work/LINGYUN.Abp.Notifications.WeChat.Work.csproj +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.WeChat.Work/LINGYUN.Abp.Notifications.WeChat.Work.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.WxPusher/LINGYUN.Abp.Notifications.WxPusher.csproj b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.WxPusher/LINGYUN.Abp.Notifications.WxPusher.csproj index 34cdb42b7..12474988c 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.WxPusher/LINGYUN.Abp.Notifications.WxPusher.csproj +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications.WxPusher/LINGYUN.Abp.Notifications.WxPusher.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 diff --git a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications/LINGYUN.Abp.Notifications.csproj b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications/LINGYUN.Abp.Notifications.csproj index 2e5cfd2eb..9eaf01f30 100644 --- a/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications/LINGYUN.Abp.Notifications.csproj +++ b/aspnet-core/modules/realtime-notifications/LINGYUN.Abp.Notifications/LINGYUN.Abp.Notifications.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -17,10 +17,10 @@ - - - - + + + + diff --git a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Application.Contracts/LINGYUN.Abp.RulesEngineManagement.Application.Contracts.csproj b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Application.Contracts/LINGYUN.Abp.RulesEngineManagement.Application.Contracts.csproj index 270c2a5c5..1070af714 100644 --- a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Application.Contracts/LINGYUN.Abp.RulesEngineManagement.Application.Contracts.csproj +++ b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Application.Contracts/LINGYUN.Abp.RulesEngineManagement.Application.Contracts.csproj @@ -1,7 +1,7 @@ - + - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Application/LINGYUN.Abp.RulesEngineManagement.Application.csproj b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Application/LINGYUN.Abp.RulesEngineManagement.Application.csproj index dbd56dfe2..f5d3a5bfd 100644 --- a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Application/LINGYUN.Abp.RulesEngineManagement.Application.csproj +++ b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Application/LINGYUN.Abp.RulesEngineManagement.Application.csproj @@ -1,7 +1,7 @@ - + - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain.Shared/LINGYUN.Abp.RulesEngineManagement.Domain.Shared.csproj b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain.Shared/LINGYUN.Abp.RulesEngineManagement.Domain.Shared.csproj index 64b68f451..e0e168782 100644 --- a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain.Shared/LINGYUN.Abp.RulesEngineManagement.Domain.Shared.csproj +++ b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain.Shared/LINGYUN.Abp.RulesEngineManagement.Domain.Shared.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN.Abp.RulesEngineManagement.Domain.csproj b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN.Abp.RulesEngineManagement.Domain.csproj index 266c3372a..66093b482 100644 --- a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN.Abp.RulesEngineManagement.Domain.csproj +++ b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.Domain/LINGYUN.Abp.RulesEngineManagement.Domain.csproj @@ -1,7 +1,7 @@ - + - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.EntityFrameworkCore/LINGYUN.Abp.RulesEngineManagement.EntityFrameworkCore.csproj b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.EntityFrameworkCore/LINGYUN.Abp.RulesEngineManagement.EntityFrameworkCore.csproj index 0a7e26546..260ecca15 100644 --- a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.EntityFrameworkCore/LINGYUN.Abp.RulesEngineManagement.EntityFrameworkCore.csproj +++ b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.EntityFrameworkCore/LINGYUN.Abp.RulesEngineManagement.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@ - + - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.HttpApi/LINGYUN.Abp.RulesEngineManagement.HttpApi.csproj b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.HttpApi/LINGYUN.Abp.RulesEngineManagement.HttpApi.csproj index ff1aa8caf..333ae63ea 100644 --- a/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.HttpApi/LINGYUN.Abp.RulesEngineManagement.HttpApi.csproj +++ b/aspnet-core/modules/rules-management/rules-engine/LINGYUN.Abp.RulesEngineManagement.HttpApi/LINGYUN.Abp.RulesEngineManagement.HttpApi.csproj @@ -1,7 +1,7 @@ - + - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.RemoteService/FodyWeavers.xml b/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.RemoteService/FodyWeavers.xml deleted file mode 100644 index 1715698cc..000000000 --- a/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.RemoteService/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.RemoteService/LINGYUN.Abp.MultiTenancy.RemoteService.csproj b/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.RemoteService/LINGYUN.Abp.MultiTenancy.RemoteService.csproj deleted file mode 100644 index 042f0fa80..000000000 --- a/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.RemoteService/LINGYUN.Abp.MultiTenancy.RemoteService.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - netstandard2.0 - - - - - - - - - - - - diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.RemoteService/LINGYUN/Abp/MultiTenancy/RemoteService/AbpRemoteServiceMultiTenancyModule.cs b/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.RemoteService/LINGYUN/Abp/MultiTenancy/RemoteService/AbpRemoteServiceMultiTenancyModule.cs deleted file mode 100644 index ee4819e5c..000000000 --- a/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.RemoteService/LINGYUN/Abp/MultiTenancy/RemoteService/AbpRemoteServiceMultiTenancyModule.cs +++ /dev/null @@ -1,13 +0,0 @@ -using LINGYUN.Abp.TenantManagement; -using Volo.Abp.Caching; -using Volo.Abp.Modularity; - -namespace LINGYUN.Abp.MultiTenancy.RemoteService -{ - [DependsOn( - typeof(AbpCachingModule), - typeof(AbpTenantManagementHttpApiClientModule))] - public class AbpRemoteServiceMultiTenancyModule : AbpModule - { - } -} diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.RemoteService/LINGYUN/Abp/MultiTenancy/RemoteService/EventBus/Distributed/TenantSynchronizer.cs b/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.RemoteService/LINGYUN/Abp/MultiTenancy/RemoteService/EventBus/Distributed/TenantSynchronizer.cs deleted file mode 100644 index 83d3bd2dc..000000000 --- a/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.RemoteService/LINGYUN/Abp/MultiTenancy/RemoteService/EventBus/Distributed/TenantSynchronizer.cs +++ /dev/null @@ -1,95 +0,0 @@ -using LINGYUN.Abp.TenantManagement; -using System; -using System.Threading.Tasks; -using Volo.Abp.Caching; -using Volo.Abp.Data; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Domain.Entities.Events.Distributed; -using Volo.Abp.EventBus.Distributed; -using Volo.Abp.MultiTenancy; -using Volo.Abp.TenantManagement; - -namespace LINGYUN.Abp.MultiTenancy.RemoteService.EventBus.Distributed; - -public class TenantSynchronizer : - IDistributedEventHandler>, - IDistributedEventHandler>, - IDistributedEventHandler>, - IDistributedEventHandler, - IDistributedEventHandler, - ITransientDependency -{ - private readonly ICurrentTenant _currentTenant; - private readonly ITenantAppService _tenantAppService; - private readonly IDistributedCache _cache; - - public TenantSynchronizer( - ICurrentTenant currentTenant, - ITenantAppService tenantAppService, - IDistributedCache cache) - { - _cache = cache; - _currentTenant = currentTenant; - _tenantAppService = tenantAppService; - } - - public async virtual Task HandleEventAsync(EntityUpdatedEto eventData) - { - await UpdateCacheItemAsync(eventData.Entity.Id, eventData.Entity.Name); - } - - public async virtual Task HandleEventAsync(EntityCreatedEto eventData) - { - await UpdateCacheItemAsync(eventData.Entity.Id, eventData.Entity.Name); - } - - public async virtual Task HandleEventAsync(EntityDeletedEto eventData) - { - await RemoveCacheItemAsync(eventData.Entity.Id, eventData.Entity.Name); - } - - public async virtual Task HandleEventAsync(ConnectionStringCreatedEventData eventData) - { - await UpdateCacheItemAsync(eventData.TenantId, eventData.TenantName); - } - - public async virtual Task HandleEventAsync(ConnectionStringDeletedEventData eventData) - { - await RemoveCacheItemAsync(eventData.TenantId, eventData.TenantName); - } - - protected async virtual Task UpdateCacheItemAsync(Guid tenantId, string tenantName = null) - { - using (_currentTenant.Change(null)) - { - var tenantDto = await _tenantAppService.GetAsync(tenantId); - var tenantConnectionStringsDto = await _tenantAppService.GetConnectionStringAsync(tenantId); - var connectionStrings = new ConnectionStrings(); - foreach (var tenantConnectionString in tenantConnectionStringsDto.Items) - { - connectionStrings[tenantConnectionString.Name] = tenantConnectionString.Value; - } - var cacheItem = new TenantConfigurationCacheItem(tenantDto.Id, tenantDto.Name, connectionStrings); - - await _cache.SetAsync( - TenantConfigurationCacheItem.CalculateCacheKey(tenantDto.Id.ToString()), - cacheItem); - - await _cache.SetAsync( - TenantConfigurationCacheItem.CalculateCacheKey(tenantDto.Name), - cacheItem); - } - } - - protected async virtual Task RemoveCacheItemAsync(Guid tenantId, string tenantName = null) - { - using (_currentTenant.Change(null)) - { - await _cache.RemoveAsync(TenantConfigurationCacheItem.CalculateCacheKey(tenantId.ToString())); - if (!tenantName.IsNullOrWhiteSpace()) - { - await _cache.RemoveAsync(TenantConfigurationCacheItem.CalculateCacheKey(tenantName)); - } - } - } -} diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.RemoteService/LINGYUN/Abp/MultiTenancy/RemoteService/TenantConfigurationCacheItem.cs b/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.RemoteService/LINGYUN/Abp/MultiTenancy/RemoteService/TenantConfigurationCacheItem.cs deleted file mode 100644 index e564c6ff0..000000000 --- a/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.RemoteService/LINGYUN/Abp/MultiTenancy/RemoteService/TenantConfigurationCacheItem.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using Volo.Abp.Data; -using Volo.Abp.MultiTenancy; - -namespace LINGYUN.Abp.MultiTenancy.RemoteService -{ - [Serializable] - [IgnoreMultiTenancy] - public class TenantConfigurationCacheItem - { - protected const string FormatKey = "pn:{0},k:{1}"; - public Guid Id { get; set; } - public string Name { get; set; } - // TODO: 是否需要加密存储? - public ConnectionStrings ConnectionStrings { get; set; } = new ConnectionStrings(); - - public TenantConfigurationCacheItem() { } - - public TenantConfigurationCacheItem(Guid id, string name, ConnectionStrings connectionStrings) - { - Id = id; - Name = name; - ConnectionStrings = connectionStrings ?? ConnectionStrings; - } - public static string CalculateCacheKey(string key) - { - return string.Format(FormatKey, "tenant", key); - } - } -} diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.RemoteService/LINGYUN/Abp/MultiTenancy/RemoteService/TenantStore.cs b/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.RemoteService/LINGYUN/Abp/MultiTenancy/RemoteService/TenantStore.cs deleted file mode 100644 index 114e1e322..000000000 --- a/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.RemoteService/LINGYUN/Abp/MultiTenancy/RemoteService/TenantStore.cs +++ /dev/null @@ -1,148 +0,0 @@ -using LINGYUN.Abp.TenantManagement; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Logging.Abstractions; -using System; -using System.Threading.Tasks; -using Volo.Abp.Caching; -using Volo.Abp.Data; -using Volo.Abp.DependencyInjection; -using Volo.Abp.MultiTenancy; -using Volo.Abp.Threading; - -namespace LINGYUN.Abp.MultiTenancy.RemoteService -{ - [Dependency(ServiceLifetime.Transient, ReplaceServices = true)] - [ExposeServices(typeof(ITenantStore))] - public class TenantStore : ITenantStore - { - public ILogger Logger { protected get; set; } - private readonly IDistributedCache _cache; - private readonly ICurrentTenant _currentTenant; - private readonly ITenantAppService _tenantAppService; - public TenantStore( - ICurrentTenant currentTenant, - ITenantAppService tenantAppService, - IDistributedCache cache) - { - _cache = cache; - _currentTenant = currentTenant; - _tenantAppService = tenantAppService; - - Logger = NullLogger.Instance; - } - public virtual TenantConfiguration Find(string name) - { - var tenantCacheItem = AsyncHelper.RunSync(async () => await - GetCacheItemByNameAsync(name)); - - return new TenantConfiguration(tenantCacheItem.Id, tenantCacheItem.Name) - { - ConnectionStrings = tenantCacheItem.ConnectionStrings - }; - } - - public virtual TenantConfiguration Find(Guid id) - { - var tenantCacheItem = AsyncHelper.RunSync(async () => await - GetCacheItemByIdAsync(id)); - - return new TenantConfiguration(tenantCacheItem.Id, tenantCacheItem.Name) - { - ConnectionStrings = tenantCacheItem.ConnectionStrings - }; - } - - public async virtual Task FindAsync(string name) - { - var tenantCacheItem = await GetCacheItemByNameAsync(name); - return new TenantConfiguration(tenantCacheItem.Id, tenantCacheItem.Name) - { - ConnectionStrings = tenantCacheItem.ConnectionStrings - }; - } - - public async virtual Task FindAsync(Guid id) - { - var tenantCacheItem = await GetCacheItemByIdAsync(id); - return new TenantConfiguration(tenantCacheItem.Id, tenantCacheItem.Name) - { - ConnectionStrings = tenantCacheItem.ConnectionStrings - }; - } - - protected async virtual Task GetCacheItemByIdAsync(Guid id) - { - using (_currentTenant.Change(null)) - { - var cacheKey = TenantConfigurationCacheItem.CalculateCacheKey(id.ToString()); - - Logger.LogDebug($"TenantStore.GetCacheItemByIdAsync: {cacheKey}"); - - var cacheItem = await _cache.GetAsync(cacheKey); - - if (cacheItem != null) - { - Logger.LogDebug($"Found in the cache: {cacheKey}"); - return cacheItem; - } - Logger.LogDebug($"Not found in the cache, getting from the remote service: {cacheKey}"); - - var tenantDto = await _tenantAppService.GetAsync(id); - var tenantConnectionStringsDto = await _tenantAppService.GetConnectionStringAsync(id); - var connectionStrings = new ConnectionStrings(); - foreach (var tenantConnectionString in tenantConnectionStringsDto.Items) - { - connectionStrings[tenantConnectionString.Name] = tenantConnectionString.Value; - } - cacheItem = new TenantConfigurationCacheItem(tenantDto.Id, tenantDto.Name, connectionStrings); - - Logger.LogDebug($"Setting the cache item: {cacheKey}"); - await _cache.SetAsync(cacheKey, cacheItem); - - // 通过租户名称再次缓存,以便通过租户名称查询的api能命中缓存 - await _cache.SetAsync(TenantConfigurationCacheItem.CalculateCacheKey(tenantDto.Name), cacheItem); - Logger.LogDebug($"Finished setting the cache item: {cacheKey}"); - - return cacheItem; - } - } - protected async virtual Task GetCacheItemByNameAsync(string name) - { - using (_currentTenant.Change(null)) - { - var cacheKey = TenantConfigurationCacheItem.CalculateCacheKey(name); - - Logger.LogDebug($"TenantStore.GetCacheItemByNameAsync: {cacheKey}"); - - var cacheItem = await _cache.GetAsync(cacheKey); - - if (cacheItem != null) - { - Logger.LogDebug($"Found in the cache: {cacheKey}"); - return cacheItem; - } - Logger.LogDebug($"Not found in the cache, getting from the remote service: {cacheKey}"); - - var tenantDto = await _tenantAppService.GetAsync(name); - var tenantConnectionStringsDto = await _tenantAppService.GetConnectionStringAsync(tenantDto.Id); - var connectionStrings = new ConnectionStrings(); - foreach (var tenantConnectionString in tenantConnectionStringsDto.Items) - { - connectionStrings[tenantConnectionString.Name] = tenantConnectionString.Value; - } - cacheItem = new TenantConfigurationCacheItem(tenantDto.Id, tenantDto.Name, connectionStrings); - - Logger.LogDebug($"Setting the cache item: {cacheKey}"); - await _cache.SetAsync(cacheKey, cacheItem); - - // 通过租户标识再次缓存,以便通过租户名称查询的api能命中缓存 - await _cache.SetAsync(TenantConfigurationCacheItem.CalculateCacheKey(tenantDto.Id.ToString()), cacheItem); - - Logger.LogDebug($"Finished setting the cache item: {cacheKey}"); - - return cacheItem; - } - } - } -} diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.RemoteService/README.md b/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.RemoteService/README.md deleted file mode 100644 index d1b97cb12..000000000 --- a/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.RemoteService/README.md +++ /dev/null @@ -1,58 +0,0 @@ -# LINGYUN.Abp.MultiTenancy.RemoteService - -abp 多租户远程服务组件,引用此模块将首先从分布式缓存查询当前租户配置 - -如果缓存不存在,则调用远程租户服务接口获取租户数据,并存储到分布式缓存中 - -## 配置使用 - -模块按需引用 - -如果远程服务接口定义了授权策略，需要配置接口客户端授权，并且启动项目需要引用**Volo.Abp.Http.Client.IdentityModel**模块 - -``` shell - // .NET CLI - dotnet add package Volo.Abp.Http.Client.IdentityModel - - // Package Manager -Install-Package Volo.Abp.Http.Client.IdentityModel - -``` - -具体**RemoteServices**与**IdentityClients**配置请阅读abp文档 - -[RemoteServices配置参阅](https://docs.abp.io/en/abp/latest/API/Dynamic-CSharp-API-Clients) - -[IdentityClients配置参阅](https://github.com/abpframework/abp/blob/dev/framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityClientConfiguration.cs) - -事先定义**appsettings.json**文件 - -```json -{ - "RemoteServices": { - "AbpTenantManagement": { - "BaseUrl": "http://127.0.0.1:30000/", - "IdentityClient": "InternalServiceClient" - } - }, - "IdentityClients": { - "InternalServiceClient": { - "Authority": "http://127.0.0.1:44385", - "RequireHttps": false, - "GrantType": "client_credentials", - "ClientId": "tenant-finder-client", - "Scope": "tenant-service", - "ClientSecret": "1q2w3e*" - } - } -} - -``` - -```csharp -[DependsOn(typeof(AbpRemoteServiceMultiTenancyModule))] -public class YouProjectModule : AbpModule -{ - // other -} -``` \ No newline at end of file diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.Saas/LINGYUN.Abp.MultiTenancy.Saas.csproj b/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.Saas/LINGYUN.Abp.MultiTenancy.Saas.csproj index 6d7edf591..313956067 100644 --- a/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.Saas/LINGYUN.Abp.MultiTenancy.Saas.csproj +++ b/aspnet-core/modules/saas/LINGYUN.Abp.MultiTenancy.Saas/LINGYUN.Abp.MultiTenancy.Saas.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,9 +9,9 @@ - - - + + + diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application.Contracts/LINGYUN.Abp.Saas.Application.Contracts.csproj b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application.Contracts/LINGYUN.Abp.Saas.Application.Contracts.csproj index dfb278ff8..ba8a63ff8 100644 --- a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application.Contracts/LINGYUN.Abp.Saas.Application.Contracts.csproj +++ b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application.Contracts/LINGYUN.Abp.Saas.Application.Contracts.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application/LINGYUN.Abp.Saas.Application.csproj b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application/LINGYUN.Abp.Saas.Application.csproj index 389353442..388c733c1 100644 --- a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application/LINGYUN.Abp.Saas.Application.csproj +++ b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Application/LINGYUN.Abp.Saas.Application.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain.Shared/LINGYUN.Abp.Saas.Domain.Shared.csproj b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain.Shared/LINGYUN.Abp.Saas.Domain.Shared.csproj index e929c7a72..d09d6dc14 100644 --- a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain.Shared/LINGYUN.Abp.Saas.Domain.Shared.csproj +++ b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain.Shared/LINGYUN.Abp.Saas.Domain.Shared.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -17,8 +17,8 @@ - - + + diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain/LINGYUN.Abp.Saas.Domain.csproj b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain/LINGYUN.Abp.Saas.Domain.csproj index 199fa1f4c..42884f0f8 100644 --- a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain/LINGYUN.Abp.Saas.Domain.csproj +++ b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Domain/LINGYUN.Abp.Saas.Domain.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.1 @@ -9,10 +9,10 @@ - - - - + + + + diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.EntityFrameworkCore/LINGYUN.Abp.Saas.EntityFrameworkCore.csproj b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.EntityFrameworkCore/LINGYUN.Abp.Saas.EntityFrameworkCore.csproj index 41fb2ab9f..cca9e04d1 100644 --- a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.EntityFrameworkCore/LINGYUN.Abp.Saas.EntityFrameworkCore.csproj +++ b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.EntityFrameworkCore/LINGYUN.Abp.Saas.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.HttpApi.Client/LINGYUN.Abp.Saas.HttpApi.Client.csproj b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.HttpApi.Client/LINGYUN.Abp.Saas.HttpApi.Client.csproj index 87090af6c..8b45c78a8 100644 --- a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.HttpApi.Client/LINGYUN.Abp.Saas.HttpApi.Client.csproj +++ b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.HttpApi.Client/LINGYUN.Abp.Saas.HttpApi.Client.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.HttpApi/LINGYUN.Abp.Saas.HttpApi.csproj b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.HttpApi/LINGYUN.Abp.Saas.HttpApi.csproj index 8b4231c40..bfe1cb194 100644 --- a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.HttpApi/LINGYUN.Abp.Saas.HttpApi.csproj +++ b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.HttpApi/LINGYUN.Abp.Saas.HttpApi.csproj @@ -1,7 +1,7 @@ - - - + + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Jobs/FodyWeavers.xsd b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Jobs/FodyWeavers.xsd new file mode 100644 index 000000000..3f3946e28 --- /dev/null +++ b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Jobs/FodyWeavers.xsd @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Jobs/LINGYUN.Abp.Saas.Jobs.csproj b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Jobs/LINGYUN.Abp.Saas.Jobs.csproj index 85089bfaf..bdfa25ae8 100644 --- a/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Jobs/LINGYUN.Abp.Saas.Jobs.csproj +++ b/aspnet-core/modules/saas/LINGYUN.Abp.Saas.Jobs/LINGYUN.Abp.Saas.Jobs.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.1 @@ -19,7 +19,7 @@ - + diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN.Abp.SettingManagement.Application.csproj b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN.Abp.SettingManagement.Application.csproj index cfad8f13d..be43b33a2 100644 --- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN.Abp.SettingManagement.Application.csproj +++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN.Abp.SettingManagement.Application.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -14,11 +14,11 @@ - - - - - + + + + + diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.HttpApi/LINGYUN.Abp.SettingManagement.HttpApi.csproj b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.HttpApi/LINGYUN.Abp.SettingManagement.HttpApi.csproj index de459d83d..c94da9630 100644 --- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.HttpApi/LINGYUN.Abp.SettingManagement.HttpApi.csproj +++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.HttpApi/LINGYUN.Abp.SettingManagement.HttpApi.csproj @@ -1,7 +1,7 @@ - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Abstractions/LINGYUN.Abp.BackgroundTasks.Abstractions.csproj b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Abstractions/LINGYUN.Abp.BackgroundTasks.Abstractions.csproj index c5a69a24d..1a3213a64 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Abstractions/LINGYUN.Abp.BackgroundTasks.Abstractions.csproj +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Abstractions/LINGYUN.Abp.BackgroundTasks.Abstractions.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Activities/LINGYUN.Abp.BackgroundTasks.Activities.csproj b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Activities/LINGYUN.Abp.BackgroundTasks.Activities.csproj index ddb17427a..20e84f53e 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Activities/LINGYUN.Abp.BackgroundTasks.Activities.csproj +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Activities/LINGYUN.Abp.BackgroundTasks.Activities.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -17,7 +17,7 @@ - + diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.DistributedLocking/LINGYUN.Abp.BackgroundTasks.DistributedLocking.csproj b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.DistributedLocking/LINGYUN.Abp.BackgroundTasks.DistributedLocking.csproj index 2fdf392db..8bcc55f07 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.DistributedLocking/LINGYUN.Abp.BackgroundTasks.DistributedLocking.csproj +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.DistributedLocking/LINGYUN.Abp.BackgroundTasks.DistributedLocking.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.EventBus/LINGYUN.Abp.BackgroundTasks.EventBus.csproj b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.EventBus/LINGYUN.Abp.BackgroundTasks.EventBus.csproj index f88036b73..cc8a56baa 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.EventBus/LINGYUN.Abp.BackgroundTasks.EventBus.csproj +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.EventBus/LINGYUN.Abp.BackgroundTasks.EventBus.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.ExceptionHandling/LINGYUN.Abp.BackgroundTasks.ExceptionHandling.csproj b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.ExceptionHandling/LINGYUN.Abp.BackgroundTasks.ExceptionHandling.csproj index 876e7ca0d..0556b7575 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.ExceptionHandling/LINGYUN.Abp.BackgroundTasks.ExceptionHandling.csproj +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.ExceptionHandling/LINGYUN.Abp.BackgroundTasks.ExceptionHandling.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -19,8 +19,8 @@ - - + + diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Hangfire/LINGYUN.Abp.BackgroundTasks.Hangfire.csproj b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Hangfire/LINGYUN.Abp.BackgroundTasks.Hangfire.csproj index eed77d7fa..7d76c0188 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Hangfire/LINGYUN.Abp.BackgroundTasks.Hangfire.csproj +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Hangfire/LINGYUN.Abp.BackgroundTasks.Hangfire.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Jobs/LINGYUN.Abp.BackgroundTasks.Jobs.csproj b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Jobs/LINGYUN.Abp.BackgroundTasks.Jobs.csproj index 5944a10ff..6e6561c9a 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Jobs/LINGYUN.Abp.BackgroundTasks.Jobs.csproj +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Jobs/LINGYUN.Abp.BackgroundTasks.Jobs.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -17,9 +17,9 @@ - - - + + + diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Notifications/LINGYUN.Abp.BackgroundTasks.Notifications.csproj b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Notifications/LINGYUN.Abp.BackgroundTasks.Notifications.csproj index 335367db6..f91a36243 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Notifications/LINGYUN.Abp.BackgroundTasks.Notifications.csproj +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Notifications/LINGYUN.Abp.BackgroundTasks.Notifications.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Quartz/LINGYUN.Abp.BackgroundTasks.Quartz.csproj b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Quartz/LINGYUN.Abp.BackgroundTasks.Quartz.csproj index 386fea967..89ad07e79 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Quartz/LINGYUN.Abp.BackgroundTasks.Quartz.csproj +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Quartz/LINGYUN.Abp.BackgroundTasks.Quartz.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.TaskManagement/LINGYUN.Abp.BackgroundTasks.TaskManagement.csproj b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.TaskManagement/LINGYUN.Abp.BackgroundTasks.TaskManagement.csproj index 489936699..49331bbd6 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.TaskManagement/LINGYUN.Abp.BackgroundTasks.TaskManagement.csproj +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.TaskManagement/LINGYUN.Abp.BackgroundTasks.TaskManagement.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks/LINGYUN.Abp.BackgroundTasks.csproj b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks/LINGYUN.Abp.BackgroundTasks.csproj index 77983f410..553623e2c 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks/LINGYUN.Abp.BackgroundTasks.csproj +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks/LINGYUN.Abp.BackgroundTasks.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -17,11 +17,11 @@ - - - - - + + + + + diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.Elasticsearch.Jobs/LINGYUN.Abp.Elasticsearch.Jobs.csproj b/aspnet-core/modules/task-management/LINGYUN.Abp.Elasticsearch.Jobs/LINGYUN.Abp.Elasticsearch.Jobs.csproj index 8e04b824f..92f234e26 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.Elasticsearch.Jobs/LINGYUN.Abp.Elasticsearch.Jobs.csproj +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.Elasticsearch.Jobs/LINGYUN.Abp.Elasticsearch.Jobs.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -17,7 +17,7 @@ - + diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.Notifications.Jobs/LINGYUN.Abp.Notifications.Jobs.csproj b/aspnet-core/modules/task-management/LINGYUN.Abp.Notifications.Jobs/LINGYUN.Abp.Notifications.Jobs.csproj index 21bb9cc46..091158cc2 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.Notifications.Jobs/LINGYUN.Abp.Notifications.Jobs.csproj +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.Notifications.Jobs/LINGYUN.Abp.Notifications.Jobs.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Application.Contracts/LINGYUN.Abp.TaskManagement.Application.Contracts.csproj b/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Application.Contracts/LINGYUN.Abp.TaskManagement.Application.Contracts.csproj index d3e9d8448..f1b371a62 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Application.Contracts/LINGYUN.Abp.TaskManagement.Application.Contracts.csproj +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Application.Contracts/LINGYUN.Abp.TaskManagement.Application.Contracts.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Application/LINGYUN.Abp.TaskManagement.Application.csproj b/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Application/LINGYUN.Abp.TaskManagement.Application.csproj index cdd8fb2d4..230e97321 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Application/LINGYUN.Abp.TaskManagement.Application.csproj +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Application/LINGYUN.Abp.TaskManagement.Application.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.1 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Domain.Shared/LINGYUN.Abp.TaskManagement.Domain.Shared.csproj b/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Domain.Shared/LINGYUN.Abp.TaskManagement.Domain.Shared.csproj index a268776f7..2ff9ae157 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Domain.Shared/LINGYUN.Abp.TaskManagement.Domain.Shared.csproj +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Domain.Shared/LINGYUN.Abp.TaskManagement.Domain.Shared.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -17,7 +17,7 @@ - + diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Domain/LINGYUN.Abp.TaskManagement.Domain.csproj b/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Domain/LINGYUN.Abp.TaskManagement.Domain.csproj index a850d09e0..146d5e03c 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Domain/LINGYUN.Abp.TaskManagement.Domain.csproj +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.Domain/LINGYUN.Abp.TaskManagement.Domain.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.1 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.EntityFrameworkCore/LINGYUN.Abp.TaskManagement.EntityFrameworkCore.csproj b/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.EntityFrameworkCore/LINGYUN.Abp.TaskManagement.EntityFrameworkCore.csproj index 49fa59f70..4e47e29ce 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.EntityFrameworkCore/LINGYUN.Abp.TaskManagement.EntityFrameworkCore.csproj +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.EntityFrameworkCore/LINGYUN.Abp.TaskManagement.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.HttpApi.Client/LINGYUN.Abp.TaskManagement.HttpApi.Client.csproj b/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.HttpApi.Client/LINGYUN.Abp.TaskManagement.HttpApi.Client.csproj index 35c510af2..20e814f32 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.HttpApi.Client/LINGYUN.Abp.TaskManagement.HttpApi.Client.csproj +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.HttpApi.Client/LINGYUN.Abp.TaskManagement.HttpApi.Client.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.HttpApi/LINGYUN.Abp.TaskManagement.HttpApi.csproj b/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.HttpApi/LINGYUN.Abp.TaskManagement.HttpApi.csproj index ed86a96b4..b556e4786 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.HttpApi/LINGYUN.Abp.TaskManagement.HttpApi.csproj +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.TaskManagement.HttpApi/LINGYUN.Abp.TaskManagement.HttpApi.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Application.Contracts/LINGYUN.Abp.TextTemplating.Application.Contracts.csproj b/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Application.Contracts/LINGYUN.Abp.TextTemplating.Application.Contracts.csproj index 45b2cf3c7..5ec7a31f2 100644 --- a/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Application.Contracts/LINGYUN.Abp.TextTemplating.Application.Contracts.csproj +++ b/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Application.Contracts/LINGYUN.Abp.TextTemplating.Application.Contracts.csproj @@ -1,11 +1,7 @@  - - netstandard2.0 - - - - + + netstandard2.0 @@ -13,8 +9,8 @@ - - + + diff --git a/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Application/LINGYUN.Abp.TextTemplating.Application.csproj b/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Application/LINGYUN.Abp.TextTemplating.Application.csproj index 7a8d8a78f..b9458b7e2 100644 --- a/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Application/LINGYUN.Abp.TextTemplating.Application.csproj +++ b/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Application/LINGYUN.Abp.TextTemplating.Application.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.1 @@ -9,8 +9,8 @@ - - + + diff --git a/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain.Shared/LINGYUN.Abp.TextTemplating.Domain.Shared.csproj b/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain.Shared/LINGYUN.Abp.TextTemplating.Domain.Shared.csproj index 27de4fced..9dc2f23d0 100644 --- a/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain.Shared/LINGYUN.Abp.TextTemplating.Domain.Shared.csproj +++ b/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain.Shared/LINGYUN.Abp.TextTemplating.Domain.Shared.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -14,8 +14,8 @@ - - + + diff --git a/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain/LINGYUN.Abp.TextTemplating.Domain.csproj b/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain/LINGYUN.Abp.TextTemplating.Domain.csproj index c0a5e0a4b..464f7a617 100644 --- a/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain/LINGYUN.Abp.TextTemplating.Domain.csproj +++ b/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain/LINGYUN.Abp.TextTemplating.Domain.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.1 @@ -9,11 +9,11 @@ - - - - - + + + + + diff --git a/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.EntityFrameworkCore/LINGYUN.Abp.TextTemplating.EntityFrameworkCore.csproj b/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.EntityFrameworkCore/LINGYUN.Abp.TextTemplating.EntityFrameworkCore.csproj index 6ede21f57..e8a534552 100644 --- a/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.EntityFrameworkCore/LINGYUN.Abp.TextTemplating.EntityFrameworkCore.csproj +++ b/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.EntityFrameworkCore/LINGYUN.Abp.TextTemplating.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.HttpApi.Client/LINGYUN.Abp.TextTemplating.HttpApi.Client.csproj b/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.HttpApi.Client/LINGYUN.Abp.TextTemplating.HttpApi.Client.csproj index 985b97d4c..590a9686e 100644 --- a/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.HttpApi.Client/LINGYUN.Abp.TextTemplating.HttpApi.Client.csproj +++ b/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.HttpApi.Client/LINGYUN.Abp.TextTemplating.HttpApi.Client.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.HttpApi/LINGYUN.Abp.TextTemplating.HttpApi.csproj b/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.HttpApi/LINGYUN.Abp.TextTemplating.HttpApi.csproj index 132ec32aa..2c0b414d9 100644 --- a/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.HttpApi/LINGYUN.Abp.TextTemplating.HttpApi.csproj +++ b/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.HttpApi/LINGYUN.Abp.TextTemplating.HttpApi.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.ClientProxies/LINGYUN.Abp.Webhooks.ClientProxies.csproj b/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.ClientProxies/LINGYUN.Abp.Webhooks.ClientProxies.csproj index 251dd53d3..4ca431fbf 100644 --- a/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.ClientProxies/LINGYUN.Abp.Webhooks.ClientProxies.csproj +++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.ClientProxies/LINGYUN.Abp.Webhooks.ClientProxies.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.Core/LINGYUN.Abp.Webhooks.Core.csproj b/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.Core/LINGYUN.Abp.Webhooks.Core.csproj index 5c9a04532..79b8d6468 100644 --- a/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.Core/LINGYUN.Abp.Webhooks.Core.csproj +++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.Core/LINGYUN.Abp.Webhooks.Core.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.EventBus/LINGYUN.Abp.Webhooks.EventBus.csproj b/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.EventBus/LINGYUN.Abp.Webhooks.EventBus.csproj index 88b934982..359bef37a 100644 --- a/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.EventBus/LINGYUN.Abp.Webhooks.EventBus.csproj +++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.EventBus/LINGYUN.Abp.Webhooks.EventBus.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.Identity/LINGYUN.Abp.Webhooks.Identity.csproj b/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.Identity/LINGYUN.Abp.Webhooks.Identity.csproj index 32c987515..170732b2a 100644 --- a/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.Identity/LINGYUN.Abp.Webhooks.Identity.csproj +++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.Identity/LINGYUN.Abp.Webhooks.Identity.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -17,10 +17,10 @@ - - - - + + + + diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.Saas/LINGYUN.Abp.Webhooks.Saas.csproj b/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.Saas/LINGYUN.Abp.Webhooks.Saas.csproj index 66d9fa1b8..d79e68a12 100644 --- a/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.Saas/LINGYUN.Abp.Webhooks.Saas.csproj +++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.Saas/LINGYUN.Abp.Webhooks.Saas.csproj @@ -1,7 +1,7 @@ - - + + netstandard2.0 @@ -18,8 +18,8 @@ - - + + diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks/LINGYUN.Abp.Webhooks.csproj b/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks/LINGYUN.Abp.Webhooks.csproj index c984760d4..d07f98d2f 100644 --- a/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks/LINGYUN.Abp.Webhooks.csproj +++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks/LINGYUN.Abp.Webhooks.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,11 +9,11 @@ - - - - - + + + + + diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application.Contracts/LINGYUN.Abp.WebhooksManagement.Application.Contracts.csproj b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application.Contracts/LINGYUN.Abp.WebhooksManagement.Application.Contracts.csproj index 70d317b54..9a9ba5d9b 100644 --- a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application.Contracts/LINGYUN.Abp.WebhooksManagement.Application.Contracts.csproj +++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application.Contracts/LINGYUN.Abp.WebhooksManagement.Application.Contracts.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,9 +9,9 @@ - - - + + + diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application/LINGYUN.Abp.WebhooksManagement.Application.csproj b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application/LINGYUN.Abp.WebhooksManagement.Application.csproj index 832d7b91f..20d6ce00d 100644 --- a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application/LINGYUN.Abp.WebhooksManagement.Application.csproj +++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Application/LINGYUN.Abp.WebhooksManagement.Application.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.1 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Dapr.Client/LINGYUN.Abp.WebhooksManagement.Dapr.Client.csproj b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Dapr.Client/LINGYUN.Abp.WebhooksManagement.Dapr.Client.csproj index befc1ea07..af2e28d17 100644 --- a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Dapr.Client/LINGYUN.Abp.WebhooksManagement.Dapr.Client.csproj +++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Dapr.Client/LINGYUN.Abp.WebhooksManagement.Dapr.Client.csproj @@ -1,7 +1,7 @@  - - + + net8.0 diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain.Shared/LINGYUN.Abp.WebhooksManagement.Domain.Shared.csproj b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain.Shared/LINGYUN.Abp.WebhooksManagement.Domain.Shared.csproj index 682b8eff5..bca488b5f 100644 --- a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain.Shared/LINGYUN.Abp.WebhooksManagement.Domain.Shared.csproj +++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain.Shared/LINGYUN.Abp.WebhooksManagement.Domain.Shared.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -17,9 +17,9 @@ - - - + + + diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain/LINGYUN.Abp.WebhooksManagement.Domain.csproj b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain/LINGYUN.Abp.WebhooksManagement.Domain.csproj index 0f23dd8fb..35a8bd86b 100644 --- a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain/LINGYUN.Abp.WebhooksManagement.Domain.csproj +++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.Domain/LINGYUN.Abp.WebhooksManagement.Domain.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.1 @@ -9,10 +9,10 @@ - - - - + + + + diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.EntityFrameworkCore/LINGYUN.Abp.WebhooksManagement.EntityFrameworkCore.csproj b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.EntityFrameworkCore/LINGYUN.Abp.WebhooksManagement.EntityFrameworkCore.csproj index 7207e2030..761338817 100644 --- a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.EntityFrameworkCore/LINGYUN.Abp.WebhooksManagement.EntityFrameworkCore.csproj +++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.EntityFrameworkCore/LINGYUN.Abp.WebhooksManagement.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.HttpApi.Client/LINGYUN.Abp.WebhooksManagement.HttpApi.Client.csproj b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.HttpApi.Client/LINGYUN.Abp.WebhooksManagement.HttpApi.Client.csproj index 5cee3e037..3b5112138 100644 --- a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.HttpApi.Client/LINGYUN.Abp.WebhooksManagement.HttpApi.Client.csproj +++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.HttpApi.Client/LINGYUN.Abp.WebhooksManagement.HttpApi.Client.csproj @@ -1,7 +1,7 @@  - - + + netstandard2.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.HttpApi/LINGYUN.Abp.WebhooksManagement.HttpApi.csproj b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.HttpApi/LINGYUN.Abp.WebhooksManagement.HttpApi.csproj index 56dfcd536..c5795af97 100644 --- a/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.HttpApi/LINGYUN.Abp.WebhooksManagement.HttpApi.csproj +++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.WebhooksManagement.HttpApi/LINGYUN.Abp.WebhooksManagement.HttpApi.csproj @@ -1,7 +1,7 @@  - - + + net8.0 @@ -9,7 +9,7 @@ - + diff --git a/aspnet-core/services/LY.MicroService.Applications.Single/LY.MicroService.Applications.Single.csproj b/aspnet-core/services/LY.MicroService.Applications.Single/LY.MicroService.Applications.Single.csproj index 7e1eb527a..214e3e960 100644 --- a/aspnet-core/services/LY.MicroService.Applications.Single/LY.MicroService.Applications.Single.csproj +++ b/aspnet-core/services/LY.MicroService.Applications.Single/LY.MicroService.Applications.Single.csproj @@ -1,4 +1,6 @@  + + net8.0 @@ -7,44 +9,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/aspnet-core/services/LY.MicroService.Applications.Single/Program.cs b/aspnet-core/services/LY.MicroService.Applications.Single/Program.cs index 4f6dc630e..8b7ee6cdb 100644 --- a/aspnet-core/services/LY.MicroService.Applications.Single/Program.cs +++ b/aspnet-core/services/LY.MicroService.Applications.Single/Program.cs @@ -33,6 +33,10 @@ await builder.AddApplicationAsync(options => { + // ӻȡû, + options.Configuration.UserSecretsId = Environment.GetEnvironmentVariable("APPLICATION_USER_SECRETS_ID"); + // ûָû, Ŀȡ + options.Configuration.UserSecretsAssembly = typeof(MicroServiceApplicationsSingleModule).Assembly; // Modules Ŀ¼ļΪ // ȡʾĿģ飬Ϊͨʽ var pluginFolder = Path.Combine( diff --git a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/LY.MicroService.AuthServer.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/LY.MicroService.AuthServer.HttpApi.Host.csproj index fc9e83f0f..e59ad1204 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/LY.MicroService.AuthServer.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/LY.MicroService.AuthServer.HttpApi.Host.csproj @@ -1,44 +1,46 @@  + + net8.0 LY.MicroService.AuthServer - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/Program.cs b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/Program.cs index 2fe0bca06..b67091509 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/Program.cs +++ b/aspnet-core/services/LY.MicroService.AuthServer.HttpApi.Host/Program.cs @@ -39,6 +39,10 @@ public async static Task Main(string[] args) }); await builder.AddApplicationAsync(options => { + // ӻȡû, + options.Configuration.UserSecretsId = Environment.GetEnvironmentVariable("APPLICATION_USER_SECRETS_ID"); + // ûָû, Ŀȡ + options.Configuration.UserSecretsAssembly = typeof(AuthServerHttpApiHostModule).Assembly; // Modules Ŀ¼ļΪ // ȡʾĿģ飬Ϊͨʽ var pluginFolder = Path.Combine( diff --git a/aspnet-core/services/LY.MicroService.AuthServer/LY.MicroService.AuthServer.csproj b/aspnet-core/services/LY.MicroService.AuthServer/LY.MicroService.AuthServer.csproj index 83f08799c..df060eb83 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/LY.MicroService.AuthServer.csproj +++ b/aspnet-core/services/LY.MicroService.AuthServer/LY.MicroService.AuthServer.csproj @@ -1,8 +1,9 @@  + + net8.0 - InProcess LY.MicroService.AuthServer @@ -11,39 +12,39 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/aspnet-core/services/LY.MicroService.AuthServer/Program.cs b/aspnet-core/services/LY.MicroService.AuthServer/Program.cs index e3de2e687..93d996522 100644 --- a/aspnet-core/services/LY.MicroService.AuthServer/Program.cs +++ b/aspnet-core/services/LY.MicroService.AuthServer/Program.cs @@ -39,6 +39,10 @@ public async static Task Main(string[] args) }); await builder.AddApplicationAsync(options => { + // 从环境变量取用户机密配置, 适用于容器测试 + options.Configuration.UserSecretsId = Environment.GetEnvironmentVariable("APPLICATION_USER_SECRETS_ID"); + // 如果容器没有指定用户机密, 从项目读取 + options.Configuration.UserSecretsAssembly = typeof(AuthServerModule).Assembly; // 搜索 Modules 目录下所有文件作为插件 // 取消显示引用所有其他项目的模块，改为通过插件的形式引用 var pluginFolder = Path.Combine( diff --git a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Dockerfile b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Dockerfile index 09444f694..22cbff502 100644 --- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Dockerfile +++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Dockerfile @@ -10,5 +10,6 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo '$TZ' > /etc/timezone EXPOSE 80/tcp VOLUME [ "./app/Logs" ] VOLUME [ "./app/Modules" ] +VOLUME [ "~/.microsoft/usersecrets/" ] ENTRYPOINT ["dotnet", "LY.MicroService.BackendAdmin.HttpApi.Host.dll"] diff --git a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/LY.MicroService.BackendAdmin.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/LY.MicroService.BackendAdmin.HttpApi.Host.csproj index 9e8078974..74609db46 100644 --- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/LY.MicroService.BackendAdmin.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/LY.MicroService.BackendAdmin.HttpApi.Host.csproj @@ -1,5 +1,7 @@  + + net8.0 LY.MicroService.BackendAdmin @@ -10,41 +12,41 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -89,10 +91,4 @@ - - - - Always - - diff --git a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Program.cs b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Program.cs index 43d5fd564..aa5c731b9 100644 --- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Program.cs +++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Program.cs @@ -40,6 +40,10 @@ public async static Task Main(string[] args) }); await builder.AddApplicationAsync(options => { + // 从环境变量取用户机密配置, 适用于容器测试 + options.Configuration.UserSecretsId = Environment.GetEnvironmentVariable("APPLICATION_USER_SECRETS_ID"); + // 如果容器没有指定用户机密, 从项目读取 + options.Configuration.UserSecretsAssembly = typeof(BackendAdminHttpApiHostModule).Assembly; // 搜索 Modules 目录下所有文件作为插件 // 取消显示引用所有其他项目的模块，改为通过插件的形式引用 var pluginFolder = Path.Combine( diff --git a/aspnet-core/services/LY.MicroService.IdentityServer.HttpApi.Host/LY.MicroService.identityServer.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.IdentityServer.HttpApi.Host/LY.MicroService.identityServer.HttpApi.Host.csproj index 14004624c..dd9a64828 100644 --- a/aspnet-core/services/LY.MicroService.IdentityServer.HttpApi.Host/LY.MicroService.identityServer.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.IdentityServer.HttpApi.Host/LY.MicroService.identityServer.HttpApi.Host.csproj @@ -1,5 +1,7 @@  + + net8.0 LY.MicroService.IdentityServer @@ -14,38 +16,38 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/aspnet-core/services/LY.MicroService.IdentityServer.HttpApi.Host/Program.cs b/aspnet-core/services/LY.MicroService.IdentityServer.HttpApi.Host/Program.cs index 7d0f79299..86f63cd22 100644 --- a/aspnet-core/services/LY.MicroService.IdentityServer.HttpApi.Host/Program.cs +++ b/aspnet-core/services/LY.MicroService.IdentityServer.HttpApi.Host/Program.cs @@ -41,6 +41,10 @@ public async static Task Main(string[] args) }); await builder.AddApplicationAsync(options => { + // ӻȡû, + options.Configuration.UserSecretsId = Environment.GetEnvironmentVariable("APPLICATION_USER_SECRETS_ID"); + // ûָû, Ŀȡ + options.Configuration.UserSecretsAssembly = typeof(IdentityServerHttpApiHostModule).Assembly; // Modules Ŀ¼ļΪ // ȡʾĿģ飬Ϊͨʽ var pluginFolder = Path.Combine( diff --git a/aspnet-core/services/LY.MicroService.IdentityServer/LY.MicroService.IdentityServer.csproj b/aspnet-core/services/LY.MicroService.IdentityServer/LY.MicroService.IdentityServer.csproj index 2049211b2..aae139df8 100644 --- a/aspnet-core/services/LY.MicroService.IdentityServer/LY.MicroService.IdentityServer.csproj +++ b/aspnet-core/services/LY.MicroService.IdentityServer/LY.MicroService.IdentityServer.csproj @@ -1,8 +1,9 @@  + + net8.0 - InProcess LY.MicroService.IdentityServer @@ -11,38 +12,38 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/aspnet-core/services/LY.MicroService.IdentityServer/Program.cs b/aspnet-core/services/LY.MicroService.IdentityServer/Program.cs index 445b3475a..fc4ef5839 100644 --- a/aspnet-core/services/LY.MicroService.IdentityServer/Program.cs +++ b/aspnet-core/services/LY.MicroService.IdentityServer/Program.cs @@ -39,6 +39,10 @@ public async static Task Main(string[] args) }); await builder.AddApplicationAsync(options => { + // 从环境变量取用户机密配置, 适用于容器测试 + options.Configuration.UserSecretsId = Environment.GetEnvironmentVariable("APPLICATION_USER_SECRETS_ID"); + // 如果容器没有指定用户机密, 从项目读取 + options.Configuration.UserSecretsAssembly = typeof(IdentityServerModule).Assembly; // 搜索 Modules 目录下所有文件作为插件 // 取消显示引用所有其他项目的模块，改为通过插件的形式引用 var pluginFolder = Path.Combine( diff --git a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LY.MicroService.LocalizationManagement.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LY.MicroService.LocalizationManagement.HttpApi.Host.csproj index 46699574d..26403de67 100644 --- a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LY.MicroService.LocalizationManagement.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/LY.MicroService.LocalizationManagement.HttpApi.Host.csproj @@ -1,39 +1,41 @@  + + net8.0 LY.MicroService.LocalizationManagement - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/Program.cs b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/Program.cs index 7353577ec..d5f766d12 100644 --- a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/Program.cs +++ b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/Program.cs @@ -39,6 +39,10 @@ public async static Task Main(string[] args) }); await builder.AddApplicationAsync(options => { + // ӻȡû, + options.Configuration.UserSecretsId = Environment.GetEnvironmentVariable("APPLICATION_USER_SECRETS_ID"); + // ûָû, Ŀȡ + options.Configuration.UserSecretsAssembly = typeof(LocalizationManagementHttpApiHostModule).Assembly; // Modules Ŀ¼ļΪ // ȡʾĿģ飬Ϊͨʽ var pluginFolder = Path.Combine( diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/LY.MicroService.PlatformManagement.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/LY.MicroService.PlatformManagement.HttpApi.Host.csproj index 2653dd4ce..adbabe107 100644 --- a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/LY.MicroService.PlatformManagement.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/LY.MicroService.PlatformManagement.HttpApi.Host.csproj @@ -1,42 +1,44 @@  + + net8.0 LY.MicroService.PlatformManagement - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -77,13 +79,4 @@ - - - Always - - - Always - - - diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Program.cs b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Program.cs index 9db30c68d..02b7f2f9d 100644 --- a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Program.cs +++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/Program.cs @@ -39,6 +39,10 @@ public async static Task Main(string[] args) }); await builder.AddApplicationAsync(options => { + // ӻȡû, + options.Configuration.UserSecretsId = Environment.GetEnvironmentVariable("APPLICATION_USER_SECRETS_ID"); + // ûָû, Ŀȡ + options.Configuration.UserSecretsAssembly = typeof(PlatformManagementHttpApiHostModule).Assembly; // Modules Ŀ¼ļΪ // ȡʾĿģ飬Ϊͨʽ var pluginFolder = Path.Combine( diff --git a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/LY.MicroService.RealtimeMessage.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/LY.MicroService.RealtimeMessage.HttpApi.Host.csproj index 4bf02e7ea..6f5bc4e4d 100644 --- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/LY.MicroService.RealtimeMessage.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/LY.MicroService.RealtimeMessage.HttpApi.Host.csproj @@ -1,5 +1,7 @@  + + net8.0 LY.MicroService.RealtimeMessage @@ -10,37 +12,37 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -86,8 +88,6 @@ - - diff --git a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/Program.cs b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/Program.cs index 18b35fdf4..ab92ca63d 100644 --- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/Program.cs +++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/Program.cs @@ -38,6 +38,10 @@ public async static Task Main(string[] args) }); await builder.AddApplicationAsync(options => { + // ӻȡû, + options.Configuration.UserSecretsId = Environment.GetEnvironmentVariable("APPLICATION_USER_SECRETS_ID"); + // ûָû, Ŀȡ + options.Configuration.UserSecretsAssembly = typeof(RealtimeMessageHttpApiHostModule).Assembly; // Modules Ŀ¼ļΪ // ȡʾĿģ飬Ϊͨʽ var pluginFolder = Path.Combine( diff --git a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/LY.MicroService.TaskManagement.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/LY.MicroService.TaskManagement.HttpApi.Host.csproj index 1a6a385bb..9ff4b753f 100644 --- a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/LY.MicroService.TaskManagement.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/LY.MicroService.TaskManagement.HttpApi.Host.csproj @@ -1,16 +1,6 @@  - - False - False - False - - - - False - False - False - + net8.0 @@ -18,35 +8,35 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + diff --git a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/Program.cs b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/Program.cs index f4035c672..967688aec 100644 --- a/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/Program.cs +++ b/aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/Program.cs @@ -39,6 +39,10 @@ public async static Task Main(string[] args) }); await builder.AddApplicationAsync(options => { + // 从环境变量取用户机密配置, 适用于容器测试 + options.Configuration.UserSecretsId = Environment.GetEnvironmentVariable("APPLICATION_USER_SECRETS_ID"); + // 如果容器没有指定用户机密, 从项目读取 + options.Configuration.UserSecretsAssembly = typeof(TaskManagementHttpApiHostModule).Assembly; // 搜索 Modules 目录下所有文件作为插件 // 取消显示引用所有其他项目的模块，改为通过插件的形式引用 var pluginFolder = Path.Combine( diff --git a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/LY.MicroService.WebhooksManagement.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/LY.MicroService.WebhooksManagement.HttpApi.Host.csproj index 71f6ce4a6..d77f04f07 100644 --- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/LY.MicroService.WebhooksManagement.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/LY.MicroService.WebhooksManagement.HttpApi.Host.csproj @@ -1,44 +1,46 @@  + + net8.0 LY.MicroService.WebhooksManagement - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/Program.cs b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/Program.cs index b895ee5d0..08bcc7a13 100644 --- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/Program.cs +++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/Program.cs @@ -39,6 +39,10 @@ public async static Task Main(string[] args) }); await builder.AddApplicationAsync(options => { + // 从环境变量取用户机密配置, 适用于容器测试 + options.Configuration.UserSecretsId = Environment.GetEnvironmentVariable("APPLICATION_USER_SECRETS_ID"); + // 如果容器没有指定用户机密, 从项目读取 + options.Configuration.UserSecretsAssembly = typeof(WebhooksManagementHttpApiHostModule).Assembly; // 搜索 Modules 目录下所有文件作为插件 // 取消显示引用所有其他项目的模块，改为通过插件的形式引用 var pluginFolder = Path.Combine( diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/LY.MicroService.WorkflowManagement.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/LY.MicroService.WorkflowManagement.HttpApi.Host.csproj index 89c1ab674..9a08e6402 100644 --- a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/LY.MicroService.WorkflowManagement.HttpApi.Host.csproj +++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/LY.MicroService.WorkflowManagement.HttpApi.Host.csproj @@ -1,47 +1,49 @@  + + net8.0 LY.MicroService.WorkflowManagement - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Program.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Program.cs index 566634709..e37f93214 100644 --- a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Program.cs +++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Program.cs @@ -39,6 +39,10 @@ public async static Task Main(string[] args) }); await builder.AddApplicationAsync(options => { + // 从环境变量取用户机密配置, 适用于容器测试 + options.Configuration.UserSecretsId = Environment.GetEnvironmentVariable("APPLICATION_USER_SECRETS_ID"); + // 如果容器没有指定用户机密, 从项目读取 + options.Configuration.UserSecretsAssembly = typeof(WorkflowManagementHttpApiHostModule).Assembly; // 搜索 Modules 目录下所有文件作为插件 // 取消显示引用所有其他项目的模块，改为通过插件的形式引用 var pluginFolder = Path.Combine( diff --git a/aspnet-core/tests/LINGYUN.Abp.Aliyun.Tests/LINGYUN.Abp.Aliyun.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.Aliyun.Tests/LINGYUN.Abp.Aliyun.Tests.csproj index 4b2cb7a2a..c150eab79 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Aliyun.Tests/LINGYUN.Abp.Aliyun.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.Aliyun.Tests/LINGYUN.Abp.Aliyun.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/aspnet-core/tests/LINGYUN.Abp.Aliyun.Tests/LINGYUN/Abp/Aliyun/AbpAliyunTestModule.cs b/aspnet-core/tests/LINGYUN.Abp.Aliyun.Tests/LINGYUN/Abp/Aliyun/AbpAliyunTestModule.cs index 9dfae1732..19ea7986a 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Aliyun.Tests/LINGYUN/Abp/Aliyun/AbpAliyunTestModule.cs +++ b/aspnet-core/tests/LINGYUN.Abp.Aliyun.Tests/LINGYUN/Abp/Aliyun/AbpAliyunTestModule.cs @@ -1,6 +1,4 @@ using LINGYUN.Abp.Tests; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Modularity; namespace LINGYUN.Abp.Aliyun @@ -10,15 +8,5 @@ namespace LINGYUN.Abp.Aliyun typeof(AbpTestsBaseModule))] public class AbpAliyunTestModule : AbpModule { - public override void PreConfigureServices(ServiceConfigurationContext context) - { - var configurationOptions = new AbpConfigurationBuilderOptions - { - BasePath = @"D:\Projects\Development\Abp\Aliyun", - EnvironmentName = "Development" - }; - - context.Services.ReplaceConfiguration(ConfigurationHelper.BuildConfiguration(configurationOptions)); - } } } diff --git a/aspnet-core/tests/LINGYUN.Abp.AspNetCore.Mvc.Tests/LINGYUN.Abp.AspNetCore.Mvc.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.AspNetCore.Mvc.Tests/LINGYUN.Abp.AspNetCore.Mvc.Tests.csproj index 7e2dbaa5e..eaf107250 100644 --- a/aspnet-core/tests/LINGYUN.Abp.AspNetCore.Mvc.Tests/LINGYUN.Abp.AspNetCore.Mvc.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.AspNetCore.Mvc.Tests/LINGYUN.Abp.AspNetCore.Mvc.Tests.csproj @@ -1,39 +1,39 @@  - - net8.0 - - false - + + net8.0 + + false + - - - - + + + + - - - - + + + + - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + - - - - + + + + diff --git a/aspnet-core/tests/LINGYUN.Abp.AspNetCore.Tests/LINGYUN.Abp.AspNetCore.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.AspNetCore.Tests/LINGYUN.Abp.AspNetCore.Tests.csproj index bb3fa4e0c..593ce6f2f 100644 --- a/aspnet-core/tests/LINGYUN.Abp.AspNetCore.Tests/LINGYUN.Abp.AspNetCore.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.AspNetCore.Tests/LINGYUN.Abp.AspNetCore.Tests.csproj @@ -1,25 +1,25 @@  - - net8.0 - - false - + + net8.0 + + false + - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + diff --git a/aspnet-core/tests/LINGYUN.Abp.AuditLogging.Elasticsearch.Tests/LINGYUN.Abp.AuditLogging.Elasticsearch.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.AuditLogging.Elasticsearch.Tests/LINGYUN.Abp.AuditLogging.Elasticsearch.Tests.csproj index a072ba550..171a2061d 100644 --- a/aspnet-core/tests/LINGYUN.Abp.AuditLogging.Elasticsearch.Tests/LINGYUN.Abp.AuditLogging.Elasticsearch.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.AuditLogging.Elasticsearch.Tests/LINGYUN.Abp.AuditLogging.Elasticsearch.Tests.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/aspnet-core/tests/LINGYUN.Abp.BlobStoring.Aliyun.Tests/LINGYUN.Abp.BlobStoring.Aliyun.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.BlobStoring.Aliyun.Tests/LINGYUN.Abp.BlobStoring.Aliyun.Tests.csproj index d95de5a95..df3e530e1 100644 --- a/aspnet-core/tests/LINGYUN.Abp.BlobStoring.Aliyun.Tests/LINGYUN.Abp.BlobStoring.Aliyun.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.BlobStoring.Aliyun.Tests/LINGYUN.Abp.BlobStoring.Aliyun.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/aspnet-core/tests/LINGYUN.Abp.BlobStoring.Nexus.Tests/LINGYUN.Abp.BlobStoring.Nexus.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.BlobStoring.Nexus.Tests/LINGYUN.Abp.BlobStoring.Nexus.Tests.csproj index 42ec0dca3..6ef3e1129 100644 --- a/aspnet-core/tests/LINGYUN.Abp.BlobStoring.Nexus.Tests/LINGYUN.Abp.BlobStoring.Nexus.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.BlobStoring.Nexus.Tests/LINGYUN.Abp.BlobStoring.Nexus.Tests.csproj @@ -7,13 +7,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/aspnet-core/tests/LINGYUN.Abp.Dapr.Actors.Tests/LINGYUN.Abp.Dapr.Actors.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.Dapr.Actors.Tests/LINGYUN.Abp.Dapr.Actors.Tests.csproj index 722cb7e59..63152a609 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Dapr.Actors.Tests/LINGYUN.Abp.Dapr.Actors.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.Dapr.Actors.Tests/LINGYUN.Abp.Dapr.Actors.Tests.csproj @@ -1,37 +1,37 @@ - - net8.0 - - false - + + net8.0 + + false + - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - - - - - + + + + + - - - PreserveNewest - - - PreserveNewest - - + + + PreserveNewest + + + PreserveNewest + + diff --git a/aspnet-core/tests/LINGYUN.Abp.Dapr.AspNetCore.TestHost/LINGYUN.Abp.Dapr.AspNetCore.TestHost.csproj b/aspnet-core/tests/LINGYUN.Abp.Dapr.AspNetCore.TestHost/LINGYUN.Abp.Dapr.AspNetCore.TestHost.csproj index a03713185..548230aa5 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Dapr.AspNetCore.TestHost/LINGYUN.Abp.Dapr.AspNetCore.TestHost.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.Dapr.AspNetCore.TestHost/LINGYUN.Abp.Dapr.AspNetCore.TestHost.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/aspnet-core/tests/LINGYUN.Abp.Dapr.Client.Tests/LINGYUN.Abp.Dapr.Client.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.Dapr.Client.Tests/LINGYUN.Abp.Dapr.Client.Tests.csproj index 824c7011e..f3b4d4dfa 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Dapr.Client.Tests/LINGYUN.Abp.Dapr.Client.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.Dapr.Client.Tests/LINGYUN.Abp.Dapr.Client.Tests.csproj @@ -1,43 +1,43 @@  - - net8.0 - - false - + + net8.0 + + false + - - - + + + - - - + + + - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - - - - - - + + + + + + - - - PreserveNewest - - + + + PreserveNewest + + diff --git a/aspnet-core/tests/LINGYUN.Abp.Dapr.Tests/LINGYUN.Abp.Dapr.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.Dapr.Tests/LINGYUN.Abp.Dapr.Tests.csproj index fa663dcee..2d7126346 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Dapr.Tests/LINGYUN.Abp.Dapr.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.Dapr.Tests/LINGYUN.Abp.Dapr.Tests.csproj @@ -7,7 +7,7 @@ - - + + diff --git a/aspnet-core/tests/LINGYUN.Abp.DataProtection.Tests/LINGYUN.Abp.DataProtection.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.DataProtection.Tests/LINGYUN.Abp.DataProtection.Tests.csproj index ae57ea68a..6e99e4636 100644 --- a/aspnet-core/tests/LINGYUN.Abp.DataProtection.Tests/LINGYUN.Abp.DataProtection.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.DataProtection.Tests/LINGYUN.Abp.DataProtection.Tests.csproj @@ -7,13 +7,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/aspnet-core/tests/LINGYUN.Abp.DynamicQueryable.EntityFrameworkCore.Tests/LINGYUN.Abp.DynamicQueryable.EntityFrameworkCore.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.DynamicQueryable.EntityFrameworkCore.Tests/LINGYUN.Abp.DynamicQueryable.EntityFrameworkCore.Tests.csproj index c0ab7228c..7958e6fea 100644 --- a/aspnet-core/tests/LINGYUN.Abp.DynamicQueryable.EntityFrameworkCore.Tests/LINGYUN.Abp.DynamicQueryable.EntityFrameworkCore.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.DynamicQueryable.EntityFrameworkCore.Tests/LINGYUN.Abp.DynamicQueryable.EntityFrameworkCore.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/aspnet-core/tests/LINGYUN.Abp.Elsa.Activities.Webhooks.Tests/LINGYUN.Abp.Elsa.Activities.Webhooks.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.Elsa.Activities.Webhooks.Tests/LINGYUN.Abp.Elsa.Activities.Webhooks.Tests.csproj index 8d4771bce..25fd83291 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Elsa.Activities.Webhooks.Tests/LINGYUN.Abp.Elsa.Activities.Webhooks.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.Elsa.Activities.Webhooks.Tests/LINGYUN.Abp.Elsa.Activities.Webhooks.Tests.csproj @@ -1,29 +1,29 @@ - - net8.0 - enable - enable + + net8.0 + enable + enable - false - + false + - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - - - - + + + + diff --git a/aspnet-core/tests/LINGYUN.Abp.Elsa.Tests/LINGYUN.Abp.Elsa.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.Elsa.Tests/LINGYUN.Abp.Elsa.Tests.csproj index a2f684fd1..bb4199176 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Elsa.Tests/LINGYUN.Abp.Elsa.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.Elsa.Tests/LINGYUN.Abp.Elsa.Tests.csproj @@ -1,30 +1,30 @@ - - net8.0 - enable - enable + + net8.0 + enable + enable - false - + false + - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - - - - - + + + + + diff --git a/aspnet-core/tests/LINGYUN.Abp.EntityFrameworkCore.Tests/LINGYUN.Abp.EntityFrameworkCore.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.EntityFrameworkCore.Tests/LINGYUN.Abp.EntityFrameworkCore.Tests.csproj index 89da7975b..ef90cf325 100644 --- a/aspnet-core/tests/LINGYUN.Abp.EntityFrameworkCore.Tests/LINGYUN.Abp.EntityFrameworkCore.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.EntityFrameworkCore.Tests/LINGYUN.Abp.EntityFrameworkCore.Tests.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/aspnet-core/tests/LINGYUN.Abp.ExceptionHandling.Emailing.Tests/LINGYUN.Abp.ExceptionHandling.Emailing.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.ExceptionHandling.Emailing.Tests/LINGYUN.Abp.ExceptionHandling.Emailing.Tests.csproj index 25fcbf525..92296a848 100644 --- a/aspnet-core/tests/LINGYUN.Abp.ExceptionHandling.Emailing.Tests/LINGYUN.Abp.ExceptionHandling.Emailing.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.ExceptionHandling.Emailing.Tests/LINGYUN.Abp.ExceptionHandling.Emailing.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/aspnet-core/tests/LINGYUN.Abp.Features.LimitValidation.Redis.Tests/LINGYUN.Abp.Features.LimitValidation.Redis.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.Features.LimitValidation.Redis.Tests/LINGYUN.Abp.Features.LimitValidation.Redis.Tests.csproj index c0391ee19..d20964626 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Features.LimitValidation.Redis.Tests/LINGYUN.Abp.Features.LimitValidation.Redis.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.Features.LimitValidation.Redis.Tests/LINGYUN.Abp.Features.LimitValidation.Redis.Tests.csproj @@ -1,29 +1,29 @@ - - net8.0 - + + net8.0 + - false - + false + - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - - - - - + + + + + diff --git a/aspnet-core/tests/LINGYUN.Abp.Features.LimitValidation.Tests/LINGYUN.Abp.Features.LimitValidation.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.Features.LimitValidation.Tests/LINGYUN.Abp.Features.LimitValidation.Tests.csproj index 303d877b2..4706f4362 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Features.LimitValidation.Tests/LINGYUN.Abp.Features.LimitValidation.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.Features.LimitValidation.Tests/LINGYUN.Abp.Features.LimitValidation.Tests.csproj @@ -1,27 +1,27 @@ - - net8.0 - - false - + + net8.0 + + false + - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - - - - + + + + diff --git a/aspnet-core/tests/LINGYUN.Abp.IdGenerator.Tests/LINGYUN.Abp.IdGenerator.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.IdGenerator.Tests/LINGYUN.Abp.IdGenerator.Tests.csproj index fe3b7dafd..0ffd9ec36 100644 --- a/aspnet-core/tests/LINGYUN.Abp.IdGenerator.Tests/LINGYUN.Abp.IdGenerator.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.IdGenerator.Tests/LINGYUN.Abp.IdGenerator.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/aspnet-core/tests/LINGYUN.Abp.Localization.Json.Tests/LINGYUN.Abp.Localization.Json.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.Localization.Json.Tests/LINGYUN.Abp.Localization.Json.Tests.csproj index 3c829f51d..5d5a13892 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Localization.Json.Tests/LINGYUN.Abp.Localization.Json.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.Localization.Json.Tests/LINGYUN.Abp.Localization.Json.Tests.csproj @@ -1,22 +1,22 @@ - net5.0 + net8.0 false - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + diff --git a/aspnet-core/tests/LINGYUN.Abp.Localization.Xml.Tests/LINGYUN.Abp.Localization.Xml.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.Localization.Xml.Tests/LINGYUN.Abp.Localization.Xml.Tests.csproj index 9e1bde11f..e7c5172c7 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Localization.Xml.Tests/LINGYUN.Abp.Localization.Xml.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.Localization.Xml.Tests/LINGYUN.Abp.Localization.Xml.Tests.csproj @@ -1,37 +1,37 @@ - - net8.0 - - false - + + net8.0 + + false + - - - - + + + + - - - - + + + + - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - - - - + + + + diff --git a/aspnet-core/tests/LINGYUN.Abp.Location.Baidu.Tests/LINGYUN.Abp.Location.Baidu.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.Location.Baidu.Tests/LINGYUN.Abp.Location.Baidu.Tests.csproj index 0382ee06b..ab2e09527 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Location.Baidu.Tests/LINGYUN.Abp.Location.Baidu.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.Location.Baidu.Tests/LINGYUN.Abp.Location.Baidu.Tests.csproj @@ -1,27 +1,27 @@ - - net8.0 - - false - + + net8.0 + + false + - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - - - - + + + + diff --git a/aspnet-core/tests/LINGYUN.Abp.Location.Tencent.Tests/LINGYUN.Abp.Location.Tencent.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.Location.Tencent.Tests/LINGYUN.Abp.Location.Tencent.Tests.csproj index 17538c85c..4ddb2101d 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Location.Tencent.Tests/LINGYUN.Abp.Location.Tencent.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.Location.Tencent.Tests/LINGYUN.Abp.Location.Tencent.Tests.csproj @@ -1,27 +1,27 @@ - - net8.0 - - false - + + net8.0 + + false + - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - - - - + + + + diff --git a/aspnet-core/tests/LINGYUN.Abp.MessageService.Domain.Tests/LINGYUN.Abp.MessageService.Domain.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.MessageService.Domain.Tests/LINGYUN.Abp.MessageService.Domain.Tests.csproj index 168e91d5b..6e31e67a7 100644 --- a/aspnet-core/tests/LINGYUN.Abp.MessageService.Domain.Tests/LINGYUN.Abp.MessageService.Domain.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.MessageService.Domain.Tests/LINGYUN.Abp.MessageService.Domain.Tests.csproj @@ -7,12 +7,18 @@ - - - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + diff --git a/aspnet-core/tests/LINGYUN.Abp.MessageService.EntityFrameworkCore.Tests/LINGYUN.Abp.MessageService.EntityFrameworkCore.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.MessageService.EntityFrameworkCore.Tests/LINGYUN.Abp.MessageService.EntityFrameworkCore.Tests.csproj index 564750164..1be577bc0 100644 --- a/aspnet-core/tests/LINGYUN.Abp.MessageService.EntityFrameworkCore.Tests/LINGYUN.Abp.MessageService.EntityFrameworkCore.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.MessageService.EntityFrameworkCore.Tests/LINGYUN.Abp.MessageService.EntityFrameworkCore.Tests.csproj @@ -7,12 +7,18 @@ - - - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + diff --git a/aspnet-core/tests/LINGYUN.Abp.Notifications.Sms.Tests/LINGYUN.Abp.Notifications.Sms.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.Notifications.Sms.Tests/LINGYUN.Abp.Notifications.Sms.Tests.csproj index 671ec10a5..18398dce0 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Notifications.Sms.Tests/LINGYUN.Abp.Notifications.Sms.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.Notifications.Sms.Tests/LINGYUN.Abp.Notifications.Sms.Tests.csproj @@ -7,12 +7,18 @@ - - - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + diff --git a/aspnet-core/tests/LINGYUN.Abp.Notifications.Tests/LINGYUN.Abp.Notifications.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.Notifications.Tests/LINGYUN.Abp.Notifications.Tests.csproj index ede86bd97..10c8cbe14 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Notifications.Tests/LINGYUN.Abp.Notifications.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.Notifications.Tests/LINGYUN.Abp.Notifications.Tests.csproj @@ -7,15 +7,18 @@ - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + diff --git a/aspnet-core/tests/LINGYUN.Abp.Notifications.TuiJuhe.Tests/LINGYUN.Abp.Notifications.TuiJuhe.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.Notifications.TuiJuhe.Tests/LINGYUN.Abp.Notifications.TuiJuhe.Tests.csproj index 3c6bc710e..94a912183 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Notifications.TuiJuhe.Tests/LINGYUN.Abp.Notifications.TuiJuhe.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.Notifications.TuiJuhe.Tests/LINGYUN.Abp.Notifications.TuiJuhe.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/aspnet-core/tests/LINGYUN.Abp.Notifications.WeChat.MiniProgram.Tests/LINGYUN.Abp.Notifications.WeChat.MiniProgram.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.Notifications.WeChat.MiniProgram.Tests/LINGYUN.Abp.Notifications.WeChat.MiniProgram.Tests.csproj index a34bbba40..4a2368b36 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Notifications.WeChat.MiniProgram.Tests/LINGYUN.Abp.Notifications.WeChat.MiniProgram.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.Notifications.WeChat.MiniProgram.Tests/LINGYUN.Abp.Notifications.WeChat.MiniProgram.Tests.csproj @@ -7,15 +7,18 @@ - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + diff --git a/aspnet-core/tests/LINGYUN.Abp.Notifications.WxPusher.Tests/LINGYUN.Abp.Notifications.WxPusher.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.Notifications.WxPusher.Tests/LINGYUN.Abp.Notifications.WxPusher.Tests.csproj index a21020209..59cfb1b7e 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Notifications.WxPusher.Tests/LINGYUN.Abp.Notifications.WxPusher.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.Notifications.WxPusher.Tests/LINGYUN.Abp.Notifications.WxPusher.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/aspnet-core/tests/LINGYUN.Abp.OpenApi.Tests/LINGYUN.Abp.OpenApi.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.OpenApi.Tests/LINGYUN.Abp.OpenApi.Tests.csproj index eae5e12cc..dd0005fb5 100644 --- a/aspnet-core/tests/LINGYUN.Abp.OpenApi.Tests/LINGYUN.Abp.OpenApi.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.OpenApi.Tests/LINGYUN.Abp.OpenApi.Tests.csproj @@ -14,18 +14,20 @@ - - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + + + + diff --git a/aspnet-core/tests/LINGYUN.Abp.OssManagement.HttpApi.Client.Tests/LINGYUN.Abp.OssManagement.HttpApi.Client.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.OssManagement.HttpApi.Client.Tests/LINGYUN.Abp.OssManagement.HttpApi.Client.Tests.csproj index b7d73973a..4d1ab3da1 100644 --- a/aspnet-core/tests/LINGYUN.Abp.OssManagement.HttpApi.Client.Tests/LINGYUN.Abp.OssManagement.HttpApi.Client.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.OssManagement.HttpApi.Client.Tests/LINGYUN.Abp.OssManagement.HttpApi.Client.Tests.csproj @@ -7,16 +7,16 @@ - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + diff --git a/aspnet-core/tests/LINGYUN.Abp.OssManagement.Nexus.Tests/LINGYUN.Abp.OssManagement.Nexus.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.OssManagement.Nexus.Tests/LINGYUN.Abp.OssManagement.Nexus.Tests.csproj index 3d8e40898..16ad8c864 100644 --- a/aspnet-core/tests/LINGYUN.Abp.OssManagement.Nexus.Tests/LINGYUN.Abp.OssManagement.Nexus.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.OssManagement.Nexus.Tests/LINGYUN.Abp.OssManagement.Nexus.Tests.csproj @@ -7,13 +7,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/aspnet-core/tests/LINGYUN.Abp.PushPlus.Tests/LINGYUN.Abp.PushPlus.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.PushPlus.Tests/LINGYUN.Abp.PushPlus.Tests.csproj index bc0981809..b1c2cb69a 100644 --- a/aspnet-core/tests/LINGYUN.Abp.PushPlus.Tests/LINGYUN.Abp.PushPlus.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.PushPlus.Tests/LINGYUN.Abp.PushPlus.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/aspnet-core/tests/LINGYUN.Abp.Rules.NRules.Tests/LINGYUN.Abp.Rules.NRules.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.Rules.NRules.Tests/LINGYUN.Abp.Rules.NRules.Tests.csproj index f72081bbb..ec12babb3 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Rules.NRules.Tests/LINGYUN.Abp.Rules.NRules.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.Rules.NRules.Tests/LINGYUN.Abp.Rules.NRules.Tests.csproj @@ -1,27 +1,27 @@ - - net8.0 - - false - + + net8.0 + + false + - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - - - - + + + + diff --git a/aspnet-core/tests/LINGYUN.Abp.Rules.RulesEngine.Tests/LINGYUN.Abp.Rules.RulesEngine.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.Rules.RulesEngine.Tests/LINGYUN.Abp.Rules.RulesEngine.Tests.csproj index 6b9fad264..2d6a33797 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Rules.RulesEngine.Tests/LINGYUN.Abp.Rules.RulesEngine.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.Rules.RulesEngine.Tests/LINGYUN.Abp.Rules.RulesEngine.Tests.csproj @@ -1,36 +1,36 @@ - - net8.0 - - false - + + net8.0 + + false + - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - - - - + + + + - - - PreserveNewest - - - PreserveNewest - - + + + PreserveNewest + + + PreserveNewest + + diff --git a/aspnet-core/tests/LINGYUN.Abp.Sms.Aliyun.Tests/LINGYUN.Abp.Sms.Aliyun.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.Sms.Aliyun.Tests/LINGYUN.Abp.Sms.Aliyun.Tests.csproj index 3fd3d123f..7d77604a9 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Sms.Aliyun.Tests/LINGYUN.Abp.Sms.Aliyun.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.Sms.Aliyun.Tests/LINGYUN.Abp.Sms.Aliyun.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/aspnet-core/tests/LINGYUN.Abp.TestBase/LINGYUN.Abp.TestsBase.csproj b/aspnet-core/tests/LINGYUN.Abp.TestBase/LINGYUN.Abp.TestsBase.csproj index e567ad215..b926fe778 100644 --- a/aspnet-core/tests/LINGYUN.Abp.TestBase/LINGYUN.Abp.TestsBase.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.TestBase/LINGYUN.Abp.TestsBase.csproj @@ -1,26 +1,28 @@ - - net8.0 - - false - + - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - + + net8.0 + + false + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + diff --git a/aspnet-core/tests/LINGYUN.Abp.TestBase/LINGYUN/Abp/Tests/AbpTestsBaseModule.cs b/aspnet-core/tests/LINGYUN.Abp.TestBase/LINGYUN/Abp/Tests/AbpTestsBaseModule.cs index e9c19e6b1..f24b94717 100644 --- a/aspnet-core/tests/LINGYUN.Abp.TestBase/LINGYUN/Abp/Tests/AbpTestsBaseModule.cs +++ b/aspnet-core/tests/LINGYUN.Abp.TestBase/LINGYUN/Abp/Tests/AbpTestsBaseModule.cs @@ -1,6 +1,8 @@ using LINGYUN.Abp.Tests.Features; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; +using System; using Volo.Abp; using Volo.Abp.Authorization; using Volo.Abp.Autofac; @@ -17,6 +19,19 @@ namespace LINGYUN.Abp.Tests )] public class AbpTestsBaseModule : AbpModule { + public override void PreConfigureServices(ServiceConfigurationContext context) + { + var configurationOptions = new AbpConfigurationBuilderOptions + { + EnvironmentName = "Development", + // 测试环境机密配置 + UserSecretsId = Environment.GetEnvironmentVariable("APPLICATION_USER_SECRETS_ID"), + UserSecretsAssembly = typeof(AbpTestsBaseModule).Assembly + }; + + context.Services.ReplaceConfiguration(ConfigurationHelper.BuildConfiguration(configurationOptions)); + } + public override void ConfigureServices(ServiceConfigurationContext context) { context.Services.AddAlwaysAllowAuthorization(); diff --git a/aspnet-core/tests/LINGYUN.Abp.TuiJuhe.Tests/LINGYUN.Abp.TuiJuhe.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.TuiJuhe.Tests/LINGYUN.Abp.TuiJuhe.Tests.csproj index c42073948..7c2658c06 100644 --- a/aspnet-core/tests/LINGYUN.Abp.TuiJuhe.Tests/LINGYUN.Abp.TuiJuhe.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.TuiJuhe.Tests/LINGYUN.Abp.TuiJuhe.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/aspnet-core/tests/LINGYUN.Abp.WeChat.Work.Tests/LINGYUN.Abp.WeChat.Work.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.WeChat.Work.Tests/LINGYUN.Abp.WeChat.Work.Tests.csproj index 37c0102df..49111ca84 100644 --- a/aspnet-core/tests/LINGYUN.Abp.WeChat.Work.Tests/LINGYUN.Abp.WeChat.Work.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.WeChat.Work.Tests/LINGYUN.Abp.WeChat.Work.Tests.csproj @@ -7,17 +7,17 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/aspnet-core/tests/LINGYUN.Abp.WorkflowCore.Tests/LINGYUN.Abp.WorkflowCore.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.WorkflowCore.Tests/LINGYUN.Abp.WorkflowCore.Tests.csproj deleted file mode 100644 index 7a729e47c..000000000 --- a/aspnet-core/tests/LINGYUN.Abp.WorkflowCore.Tests/LINGYUN.Abp.WorkflowCore.Tests.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - net8.0 - - false - - - - - - - - - - - - - diff --git a/aspnet-core/tests/LINGYUN.Abp.WorkflowCore.Tests/LINGYUN/Abp/WorkflowCore/AbpWorkflowCoreTestBase.cs b/aspnet-core/tests/LINGYUN.Abp.WorkflowCore.Tests/LINGYUN/Abp/WorkflowCore/AbpWorkflowCoreTestBase.cs deleted file mode 100644 index eca19dafa..000000000 --- a/aspnet-core/tests/LINGYUN.Abp.WorkflowCore.Tests/LINGYUN/Abp/WorkflowCore/AbpWorkflowCoreTestBase.cs +++ /dev/null @@ -1,8 +0,0 @@ -using LINGYUN.Abp.Tests; - -namespace LINGYUN.Abp.WorkflowCore -{ - public abstract class AbpWorkflowCoreTestBase : AbpTestsBase - { - } -} diff --git a/aspnet-core/tests/LINGYUN.Abp.WorkflowCore.Tests/LINGYUN/Abp/WorkflowCore/AbpWorkflowCoreTestModule.cs b/aspnet-core/tests/LINGYUN.Abp.WorkflowCore.Tests/LINGYUN/Abp/WorkflowCore/AbpWorkflowCoreTestModule.cs deleted file mode 100644 index 5b1d58069..000000000 --- a/aspnet-core/tests/LINGYUN.Abp.WorkflowCore.Tests/LINGYUN/Abp/WorkflowCore/AbpWorkflowCoreTestModule.cs +++ /dev/null @@ -1,11 +0,0 @@ -using LINGYUN.Abp.Tests; -using Volo.Abp.Modularity; - -namespace LINGYUN.Abp.WorkflowCore -{ - [DependsOn(typeof(AbpTestsBaseModule))] - [DependsOn(typeof(AbpWorkflowCoreModule))] - public class AbpWorkflowCoreTestModule : AbpModule - { - } -} diff --git a/aspnet-core/tests/LINGYUN.Abp.WorkflowCore.Tests/LINGYUN/Abp/WorkflowCore/Middleware/MultiTenancyStepMiddleware_Tests.cs b/aspnet-core/tests/LINGYUN.Abp.WorkflowCore.Tests/LINGYUN/Abp/WorkflowCore/Middleware/MultiTenancyStepMiddleware_Tests.cs deleted file mode 100644 index e1dfad767..000000000 --- a/aspnet-core/tests/LINGYUN.Abp.WorkflowCore.Tests/LINGYUN/Abp/WorkflowCore/Middleware/MultiTenancyStepMiddleware_Tests.cs +++ /dev/null @@ -1,72 +0,0 @@ -using Shouldly; -using System; -using System.Threading.Tasks; -using Volo.Abp.MultiTenancy; -using WorkflowCore.Interface; -using WorkflowCore.Models; -using Xunit; - -namespace LINGYUN.Abp.WorkflowCore.Middleware -{ - public class MultiTenancyStepMiddleware_Tests : AbpWorkflowCoreTestBase - { - public static bool IsCompleted = false; - public static readonly Guid TenantId = Guid.NewGuid(); - private readonly IWorkflowController _controller; - public MultiTenancyStepMiddleware_Tests() - { - _controller = GetRequiredService(); - } - - [Fact] - public async Task Should_Be_Resolved_Multi_Tenant_Id_On_Step() - { - await _controller.StartWorkflow( - "MiddlewareWorkflow", - new MiddlewareWorkflowData - { - TenantId = TenantId - }); - - } - } - - public class MiddlewareWorkflowData : IMultiTenant - { - public Guid? TenantId { get; set; } - } - - public class MiddlewareWorkflow : IWorkflow - { - public string Id => "MiddlewareWorkflow"; - - public int Version => 1; - - public void Build(IWorkflowBuilder builder) - { - builder.StartWith((_) => Console.WriteLine("Start Workflow")) - .Then() - .Then((_) => MultiTenancyStepMiddleware_Tests.IsCompleted = true) - .EndWorkflow(); - } - } - - public class MessageStep : StepBodyBase - { - private readonly ICurrentTenant _currentTenant; - - public MessageStep(ICurrentTenant currentTenant) - { - _currentTenant = currentTenant; - } - - public override ExecutionResult Run(IStepExecutionContext context) - { - MultiTenancyStepMiddleware_Tests.TenantId.ShouldBe(_currentTenant.Id.Value); - - Console.WriteLine("Current Tenant Id: {0}", _currentTenant.Id?.ToString() ?? "Null"); - - return ExecutionResult.Next(); - } - } -} diff --git a/aspnet-core/tests/LINGYUN.Abp.Wrapper.Tests/LINGYUN.Abp.Wrapper.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.Wrapper.Tests/LINGYUN.Abp.Wrapper.Tests.csproj index 391ad2889..1d5342c7b 100644 --- a/aspnet-core/tests/LINGYUN.Abp.Wrapper.Tests/LINGYUN.Abp.Wrapper.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.Wrapper.Tests/LINGYUN.Abp.Wrapper.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/aspnet-core/tests/LINGYUN.Abp.WxPusher.Tests/LINGYUN.Abp.WxPusher.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.WxPusher.Tests/LINGYUN.Abp.WxPusher.Tests.csproj index cf5efdb3d..060ba1cfe 100644 --- a/aspnet-core/tests/LINGYUN.Abp.WxPusher.Tests/LINGYUN.Abp.WxPusher.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Abp.WxPusher.Tests/LINGYUN.Abp.WxPusher.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/aspnet-core/tests/LINGYUN.Linq.Dynamic.Queryable.Tests/LINGYUN.Linq.Dynamic.Queryable.Tests.csproj b/aspnet-core/tests/LINGYUN.Linq.Dynamic.Queryable.Tests/LINGYUN.Linq.Dynamic.Queryable.Tests.csproj index b49eec354..14eb9dabf 100644 --- a/aspnet-core/tests/LINGYUN.Linq.Dynamic.Queryable.Tests/LINGYUN.Linq.Dynamic.Queryable.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Linq.Dynamic.Queryable.Tests/LINGYUN.Linq.Dynamic.Queryable.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/aspnet-core/tests/LINGYUN.Platform.Domain.Tests/LINGYUN.Platform.Domain.Tests.csproj b/aspnet-core/tests/LINGYUN.Platform.Domain.Tests/LINGYUN.Platform.Domain.Tests.csproj index 632fd1929..2d0ab5bb8 100644 --- a/aspnet-core/tests/LINGYUN.Platform.Domain.Tests/LINGYUN.Platform.Domain.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Platform.Domain.Tests/LINGYUN.Platform.Domain.Tests.csproj @@ -7,12 +7,18 @@ - - - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + diff --git a/aspnet-core/tests/LINGYUN.Platform.EntityFrameworkCore.Tests/LINGYUN.Platform.EntityFrameworkCore.Tests.csproj b/aspnet-core/tests/LINGYUN.Platform.EntityFrameworkCore.Tests/LINGYUN.Platform.EntityFrameworkCore.Tests.csproj index 7a702105d..2b15fdd58 100644 --- a/aspnet-core/tests/LINGYUN.Platform.EntityFrameworkCore.Tests/LINGYUN.Platform.EntityFrameworkCore.Tests.csproj +++ b/aspnet-core/tests/LINGYUN.Platform.EntityFrameworkCore.Tests/LINGYUN.Platform.EntityFrameworkCore.Tests.csproj @@ -7,12 +7,18 @@ - - - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + diff --git a/common.props b/common.props index f95707894..9a5de77bd 100644 --- a/common.props +++ b/common.props @@ -1,30 +1,38 @@ - - latest - 8.0.4 - colin - $(NoWarn);CS1591;CS0436;CS8618;NU1803 - https://github.com/colinin/abp-next-admin - MIT - git - https://github.com/colinin/abp-next-admin - true - + + latest + 8.1.0 + colin + $(NoWarn);CS1591;CS0436;CS8618;NU1803 + https://github.com/colinin/abp-next-admin + $(SolutionDir)LocalNuget + 8.1.0 + MIT + git + https://github.com/colinin/abp-next-admin + true + - - - - + + + + - - - - + + + + - - $(SolutionDir)LocalNuget - + + + + + + + + $(SolutionDir)LocalNuget + \ No newline at end of file diff --git a/common.secrets.props b/common.secrets.props new file mode 100644 index 000000000..d724e3c7c --- /dev/null +++ b/common.secrets.props @@ -0,0 +1,5 @@ + + + d20383d5-03fe-43f9-9439-6866559f763a + + \ No newline at end of file diff --git a/gateways/configureawait.props b/configureawait.props similarity index 57% rename from gateways/configureawait.props rename to configureawait.props index 2e04405b2..3caa88c04 100644 --- a/gateways/configureawait.props +++ b/configureawait.props @@ -1,7 +1,7 @@ - - + + All runtime; build; native; contentfiles; analyzers diff --git a/gateways/Directory.Build.props b/gateways/Directory.Build.props deleted file mode 100644 index 868fcc510..000000000 --- a/gateways/Directory.Build.props +++ /dev/null @@ -1,32 +0,0 @@ - - - 8.1.0 - 8.1.0 - 1.12.0 - 8.1.0 - 1.5.10 - 2.13.0 - 1.6.9 - 2.0.3 - 1.8.6 - 7.15.1 - 20.0.0 - 2.0.593 - 3.1.1 - 8.0.0 - 2.3.0 - 2.0.0 - 2.0.1 - 3.1.0 - 8.0.0 - 8.0.0 - 5.0.0 - 9.0.3 - 5.0.0 - 6.5.0 - 8.0.* - 2.6.1 - 4.2.1 - 5.1.0 - - diff --git a/gateways/common.props b/gateways/common.props deleted file mode 100644 index 40cbfcc66..000000000 --- a/gateways/common.props +++ /dev/null @@ -1,26 +0,0 @@ - - - latest - 8.1.0 - colin - $(NoWarn);CS1591;CS0436;CS8618;NU1803 - https://github.com/colinin/abp-next-admin - MIT - git - https://github.com/colinin/abp-next-admin - false - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/LINGYUN.MicroService.Internal.ApiGateway.csproj b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/LINGYUN.MicroService.Internal.ApiGateway.csproj index e49bedf14..019935236 100644 --- a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/LINGYUN.MicroService.Internal.ApiGateway.csproj +++ b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/LINGYUN.MicroService.Internal.ApiGateway.csproj @@ -1,6 +1,7 @@  - + + Exe @@ -9,24 +10,24 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/gateways/web/LY.MicroService.ApiGateway/LY.MicroService.ApiGateway.csproj b/gateways/web/LY.MicroService.ApiGateway/LY.MicroService.ApiGateway.csproj index 69e18ce65..cf2e0f4e4 100644 --- a/gateways/web/LY.MicroService.ApiGateway/LY.MicroService.ApiGateway.csproj +++ b/gateways/web/LY.MicroService.ApiGateway/LY.MicroService.ApiGateway.csproj @@ -1,16 +1,19 @@  + + + net8.0 - - - - - - + + + + + +