From 409099a00b32a50e4e469cceff97bc7134b7ee37 Mon Sep 17 00:00:00 2001 From: witskeeper Date: Tue, 11 Jun 2024 21:18:39 +0800 Subject: [PATCH 1/5] add .net9 preview support --- Directory.Build.targets | 7 +++++++ eng/versions.props | 2 +- global.json | 2 +- src/AspNetCore/NetCorePal.Extensions.AspNetCore.csproj | 2 +- src/Attributes/NetCorePal.Attributes.csproj | 2 +- .../NetCorePal.Context.Abstractions.csproj | 2 +- .../NetCorePal.Context.AspNetCore.csproj | 2 +- src/Context.CAP/NetCorePal.Context.CAP.csproj | 2 +- src/Context.Shared/NetCorePal.Context.Shared.csproj | 2 +- ...CorePal.Extensions.DistributedLocks.Abstractions.csproj | 2 +- .../NetCorePal.Extensions.DistributedLocks.Redis.csproj | 2 +- ....Extensions.DistributedTransactions.Abstractions.csproj | 2 +- ...Pal.Extensions.DistributedTransactions.CAP.MySql.csproj | 2 +- ...xtensions.DistributedTransactions.CAP.PostgreSql.csproj | 2 +- ...etCorePal.Extensions.DistributedTransactions.CAP.csproj | 2 +- .../NetCorePal.Extensions.Domain.Abstractions.csproj | 2 +- src/Hangfire/NetCorePal.Extensions.Hangfire.csproj | 2 +- src/Mappers/NetCorePal.Extensions.Mappers.csproj | 2 +- .../NetCorePal.Extensions.MultiEnv.CAP.RabbitMQ.csproj | 2 +- src/MultiEnv/NetCorePal.Extensions.MultiEnv.csproj | 2 +- .../NetCorePal.SkyApm.Diagnostics.csproj | 2 +- .../NetCorePal.Extensions.NewtonsoftJson.csproj | 2 +- src/Primitives/NetCorePal.Extensions.Primitives.csproj | 2 +- .../NetCorePal.Extensions.Repository.Abstractions.csproj | 2 +- ...tensions.Repository.EntityFrameworkCore.Identity.csproj | 2 +- ...ensions.Repository.EntityFrameworkCore.Snowflake.csproj | 2 +- ...orePal.Extensions.Repository.EntityFrameworkCore.csproj | 2 +- ...CorePal.Extensions.ServiceDiscovery.Abstractions.csproj | 2 +- .../NetCorePal.Extensions.ServiceDiscovery.K8s.csproj | 2 +- .../NetCorePal.Extensions.Snowflake.Consul.csproj | 2 +- .../NetCorePal.Extensions.Snowflake.Etcd.csproj | 2 +- .../NetCorePal.Extensions.Snowflake.Redis.csproj | 2 +- src/Snowflake/NetCorePal.Extensions.Snowflake.csproj | 2 +- test/ConsoleApp/NetCorePal.ConsoleApp.csproj | 2 +- .../NetCorePal.Context.AspNetCore.UnitTests.csproj | 2 +- .../NetCorePal.Extensions.AspNetCore.UnitTests.csproj | 2 +- ...Extensions.DistributedTransactions.CAP.UnitTests.csproj | 2 +- ...tensions.DistributedTransactions.Sagas.UnitTests.csproj | 2 +- ...Pal.Extensions.DistributedTransactions.UnitTests.csproj | 2 +- ...CorePal.Extensions.Domain.Abstractions.UnitTests.csproj | 2 +- .../NetCorePal.Extensions.Mappers.UnitTests.csproj | 2 +- .../NetCorePal.Extensions.MultiEnv.UnitTests.csproj | 2 +- ....Repository.EntityFrameworkCore.PostgreSql.Tests.csproj | 2 +- ...tensions.ServiceDiscovery.Abstractions.UnitTests.csproj | 2 +- ...orePal.Extensions.ServiceDiscovery.K8s.UnitTests.csproj | 2 +- ...NetCorePal.Extensions.Snowflake.Consul.UnitTests.csproj | 2 +- .../NetCorePal.Extensions.Snowflake.Redis.UnitTests.csproj | 2 +- .../NetCorePal.Web.UnitTests.csproj | 2 +- test/NetCorePal.Web/NetCorePal.Web.csproj | 2 +- 49 files changed, 55 insertions(+), 48 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 85bbdf8a..edd9ce4a 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -23,6 +23,13 @@ 8.0.0-rc.2 8.0.0-beta.2 + + 9.0.0-preview.1.24081.5 + 9.0.0-preview.1.24080.9 + 9.0.0-preview.1.24081.2 + 9.0.0-preview.1 + 9.0.0-preview.1 + diff --git a/eng/versions.props b/eng/versions.props index 58c86710..4383ceed 100644 --- a/eng/versions.props +++ b/eng/versions.props @@ -1,6 +1,6 @@ - 1.2.0 + 1.3.0 diff --git a/global.json b/global.json index 5ab784ab..27369ac3 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", + "version": "9.0.100-preview.4", "allowPrerelease": true, "rollForward": "latestMinor" } diff --git a/src/AspNetCore/NetCorePal.Extensions.AspNetCore.csproj b/src/AspNetCore/NetCorePal.Extensions.AspNetCore.csproj index d69e42d3..4972b925 100644 --- a/src/AspNetCore/NetCorePal.Extensions.AspNetCore.csproj +++ b/src/AspNetCore/NetCorePal.Extensions.AspNetCore.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/src/Attributes/NetCorePal.Attributes.csproj b/src/Attributes/NetCorePal.Attributes.csproj index e036ae80..231c9683 100644 --- a/src/Attributes/NetCorePal.Attributes.csproj +++ b/src/Attributes/NetCorePal.Attributes.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable false diff --git a/src/Context.Abstractions/NetCorePal.Context.Abstractions.csproj b/src/Context.Abstractions/NetCorePal.Context.Abstractions.csproj index 1edbc450..135ad96c 100644 --- a/src/Context.Abstractions/NetCorePal.Context.Abstractions.csproj +++ b/src/Context.Abstractions/NetCorePal.Context.Abstractions.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable NetCorePal.Context diff --git a/src/Context.AspNetCore/NetCorePal.Context.AspNetCore.csproj b/src/Context.AspNetCore/NetCorePal.Context.AspNetCore.csproj index a2d69113..e6f046cf 100644 --- a/src/Context.AspNetCore/NetCorePal.Context.AspNetCore.csproj +++ b/src/Context.AspNetCore/NetCorePal.Context.AspNetCore.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/src/Context.CAP/NetCorePal.Context.CAP.csproj b/src/Context.CAP/NetCorePal.Context.CAP.csproj index 021fbe05..16425e15 100644 --- a/src/Context.CAP/NetCorePal.Context.CAP.csproj +++ b/src/Context.CAP/NetCorePal.Context.CAP.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/src/Context.Shared/NetCorePal.Context.Shared.csproj b/src/Context.Shared/NetCorePal.Context.Shared.csproj index e9156dfc..5beea14e 100644 --- a/src/Context.Shared/NetCorePal.Context.Shared.csproj +++ b/src/Context.Shared/NetCorePal.Context.Shared.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable NetCorePal.Context diff --git a/src/DistributedLocks.Abstractions/NetCorePal.Extensions.DistributedLocks.Abstractions.csproj b/src/DistributedLocks.Abstractions/NetCorePal.Extensions.DistributedLocks.Abstractions.csproj index 3108aea7..3327941c 100644 --- a/src/DistributedLocks.Abstractions/NetCorePal.Extensions.DistributedLocks.Abstractions.csproj +++ b/src/DistributedLocks.Abstractions/NetCorePal.Extensions.DistributedLocks.Abstractions.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable NetCorePal.Extensions.DistributedLocks diff --git a/src/DistributedLocks.Redis/NetCorePal.Extensions.DistributedLocks.Redis.csproj b/src/DistributedLocks.Redis/NetCorePal.Extensions.DistributedLocks.Redis.csproj index 6d355282..7b4b7748 100644 --- a/src/DistributedLocks.Redis/NetCorePal.Extensions.DistributedLocks.Redis.csproj +++ b/src/DistributedLocks.Redis/NetCorePal.Extensions.DistributedLocks.Redis.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/src/DistributedTransactions.Abstractions/NetCorePal.Extensions.DistributedTransactions.Abstractions.csproj b/src/DistributedTransactions.Abstractions/NetCorePal.Extensions.DistributedTransactions.Abstractions.csproj index 9590f669..b4ec519a 100644 --- a/src/DistributedTransactions.Abstractions/NetCorePal.Extensions.DistributedTransactions.Abstractions.csproj +++ b/src/DistributedTransactions.Abstractions/NetCorePal.Extensions.DistributedTransactions.Abstractions.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable $(MSBuildProjectName.Replace(" ", "_").Replace(".Abstractions", "")) diff --git a/src/DistributedTransactions.CAP.MySql/NetCorePal.Extensions.DistributedTransactions.CAP.MySql.csproj b/src/DistributedTransactions.CAP.MySql/NetCorePal.Extensions.DistributedTransactions.CAP.MySql.csproj index 4b625607..0a8ff88d 100644 --- a/src/DistributedTransactions.CAP.MySql/NetCorePal.Extensions.DistributedTransactions.CAP.MySql.csproj +++ b/src/DistributedTransactions.CAP.MySql/NetCorePal.Extensions.DistributedTransactions.CAP.MySql.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/src/DistributedTransactions.CAP.PostgreSql/NetCorePal.Extensions.DistributedTransactions.CAP.PostgreSql.csproj b/src/DistributedTransactions.CAP.PostgreSql/NetCorePal.Extensions.DistributedTransactions.CAP.PostgreSql.csproj index 27284f08..d7f835b6 100644 --- a/src/DistributedTransactions.CAP.PostgreSql/NetCorePal.Extensions.DistributedTransactions.CAP.PostgreSql.csproj +++ b/src/DistributedTransactions.CAP.PostgreSql/NetCorePal.Extensions.DistributedTransactions.CAP.PostgreSql.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/src/DistributedTransactions.CAP/NetCorePal.Extensions.DistributedTransactions.CAP.csproj b/src/DistributedTransactions.CAP/NetCorePal.Extensions.DistributedTransactions.CAP.csproj index f96a9cdc..b208b4f8 100644 --- a/src/DistributedTransactions.CAP/NetCorePal.Extensions.DistributedTransactions.CAP.csproj +++ b/src/DistributedTransactions.CAP/NetCorePal.Extensions.DistributedTransactions.CAP.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/src/Domain.Abstractions/NetCorePal.Extensions.Domain.Abstractions.csproj b/src/Domain.Abstractions/NetCorePal.Extensions.Domain.Abstractions.csproj index 77abceaa..fe31e914 100644 --- a/src/Domain.Abstractions/NetCorePal.Extensions.Domain.Abstractions.csproj +++ b/src/Domain.Abstractions/NetCorePal.Extensions.Domain.Abstractions.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable NetCorePal.Extensions.Domain diff --git a/src/Hangfire/NetCorePal.Extensions.Hangfire.csproj b/src/Hangfire/NetCorePal.Extensions.Hangfire.csproj index e4539dc6..363cd24a 100644 --- a/src/Hangfire/NetCorePal.Extensions.Hangfire.csproj +++ b/src/Hangfire/NetCorePal.Extensions.Hangfire.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/src/Mappers/NetCorePal.Extensions.Mappers.csproj b/src/Mappers/NetCorePal.Extensions.Mappers.csproj index ce627e9a..b6fdbd2a 100644 --- a/src/Mappers/NetCorePal.Extensions.Mappers.csproj +++ b/src/Mappers/NetCorePal.Extensions.Mappers.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/src/MultiEnv.CAP.RabbitMQ/NetCorePal.Extensions.MultiEnv.CAP.RabbitMQ.csproj b/src/MultiEnv.CAP.RabbitMQ/NetCorePal.Extensions.MultiEnv.CAP.RabbitMQ.csproj index 08966def..8d091500 100644 --- a/src/MultiEnv.CAP.RabbitMQ/NetCorePal.Extensions.MultiEnv.CAP.RabbitMQ.csproj +++ b/src/MultiEnv.CAP.RabbitMQ/NetCorePal.Extensions.MultiEnv.CAP.RabbitMQ.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/src/MultiEnv/NetCorePal.Extensions.MultiEnv.csproj b/src/MultiEnv/NetCorePal.Extensions.MultiEnv.csproj index c4d6cc3b..14f2b0f7 100644 --- a/src/MultiEnv/NetCorePal.Extensions.MultiEnv.csproj +++ b/src/MultiEnv/NetCorePal.Extensions.MultiEnv.csproj @@ -1,6 +1,6 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/src/NetCorePal.SkyApm.Diagnostics/NetCorePal.SkyApm.Diagnostics.csproj b/src/NetCorePal.SkyApm.Diagnostics/NetCorePal.SkyApm.Diagnostics.csproj index ec87b1c8..97e05e7a 100644 --- a/src/NetCorePal.SkyApm.Diagnostics/NetCorePal.SkyApm.Diagnostics.csproj +++ b/src/NetCorePal.SkyApm.Diagnostics/NetCorePal.SkyApm.Diagnostics.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable NetCorePal.SkyApm.Diagnostics diff --git a/src/NewtonsoftJson/NetCorePal.Extensions.NewtonsoftJson.csproj b/src/NewtonsoftJson/NetCorePal.Extensions.NewtonsoftJson.csproj index a0655833..0550db43 100644 --- a/src/NewtonsoftJson/NetCorePal.Extensions.NewtonsoftJson.csproj +++ b/src/NewtonsoftJson/NetCorePal.Extensions.NewtonsoftJson.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/src/Primitives/NetCorePal.Extensions.Primitives.csproj b/src/Primitives/NetCorePal.Extensions.Primitives.csproj index f88a17a5..5aea9338 100644 --- a/src/Primitives/NetCorePal.Extensions.Primitives.csproj +++ b/src/Primitives/NetCorePal.Extensions.Primitives.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/src/Repository.Abstractions/NetCorePal.Extensions.Repository.Abstractions.csproj b/src/Repository.Abstractions/NetCorePal.Extensions.Repository.Abstractions.csproj index fb61675f..78274efd 100644 --- a/src/Repository.Abstractions/NetCorePal.Extensions.Repository.Abstractions.csproj +++ b/src/Repository.Abstractions/NetCorePal.Extensions.Repository.Abstractions.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/src/Repository.EntityFrameworkCore.Identity/NetCorePal.Extensions.Repository.EntityFrameworkCore.Identity.csproj b/src/Repository.EntityFrameworkCore.Identity/NetCorePal.Extensions.Repository.EntityFrameworkCore.Identity.csproj index fa89a237..3859ae29 100644 --- a/src/Repository.EntityFrameworkCore.Identity/NetCorePal.Extensions.Repository.EntityFrameworkCore.Identity.csproj +++ b/src/Repository.EntityFrameworkCore.Identity/NetCorePal.Extensions.Repository.EntityFrameworkCore.Identity.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/src/Repository.EntityFrameworkCore.Snowflake/NetCorePal.Extensions.Repository.EntityFrameworkCore.Snowflake.csproj b/src/Repository.EntityFrameworkCore.Snowflake/NetCorePal.Extensions.Repository.EntityFrameworkCore.Snowflake.csproj index dbe52bfc..74e7d411 100644 --- a/src/Repository.EntityFrameworkCore.Snowflake/NetCorePal.Extensions.Repository.EntityFrameworkCore.Snowflake.csproj +++ b/src/Repository.EntityFrameworkCore.Snowflake/NetCorePal.Extensions.Repository.EntityFrameworkCore.Snowflake.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/src/Repository.EntityFrameworkCore/NetCorePal.Extensions.Repository.EntityFrameworkCore.csproj b/src/Repository.EntityFrameworkCore/NetCorePal.Extensions.Repository.EntityFrameworkCore.csproj index d13a4add..bec5bce6 100644 --- a/src/Repository.EntityFrameworkCore/NetCorePal.Extensions.Repository.EntityFrameworkCore.csproj +++ b/src/Repository.EntityFrameworkCore/NetCorePal.Extensions.Repository.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/src/ServiceDiscovery.Abstractions/NetCorePal.Extensions.ServiceDiscovery.Abstractions.csproj b/src/ServiceDiscovery.Abstractions/NetCorePal.Extensions.ServiceDiscovery.Abstractions.csproj index d6c84da5..1da1f94a 100644 --- a/src/ServiceDiscovery.Abstractions/NetCorePal.Extensions.ServiceDiscovery.Abstractions.csproj +++ b/src/ServiceDiscovery.Abstractions/NetCorePal.Extensions.ServiceDiscovery.Abstractions.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable NetCorePal.Extensions.ServiceDiscovery diff --git a/src/ServiceDiscovery.K8s/NetCorePal.Extensions.ServiceDiscovery.K8s.csproj b/src/ServiceDiscovery.K8s/NetCorePal.Extensions.ServiceDiscovery.K8s.csproj index 6ece4fef..1d716f3e 100644 --- a/src/ServiceDiscovery.K8s/NetCorePal.Extensions.ServiceDiscovery.K8s.csproj +++ b/src/ServiceDiscovery.K8s/NetCorePal.Extensions.ServiceDiscovery.K8s.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/src/Snowflake.Consul/NetCorePal.Extensions.Snowflake.Consul.csproj b/src/Snowflake.Consul/NetCorePal.Extensions.Snowflake.Consul.csproj index aa5b16d0..0e2711ae 100644 --- a/src/Snowflake.Consul/NetCorePal.Extensions.Snowflake.Consul.csproj +++ b/src/Snowflake.Consul/NetCorePal.Extensions.Snowflake.Consul.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/src/Snowflake.Etcd/NetCorePal.Extensions.Snowflake.Etcd.csproj b/src/Snowflake.Etcd/NetCorePal.Extensions.Snowflake.Etcd.csproj index 0ff8096d..0365c332 100644 --- a/src/Snowflake.Etcd/NetCorePal.Extensions.Snowflake.Etcd.csproj +++ b/src/Snowflake.Etcd/NetCorePal.Extensions.Snowflake.Etcd.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/src/Snowflake.Redis/NetCorePal.Extensions.Snowflake.Redis.csproj b/src/Snowflake.Redis/NetCorePal.Extensions.Snowflake.Redis.csproj index b43bf058..690fd86a 100644 --- a/src/Snowflake.Redis/NetCorePal.Extensions.Snowflake.Redis.csproj +++ b/src/Snowflake.Redis/NetCorePal.Extensions.Snowflake.Redis.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/src/Snowflake/NetCorePal.Extensions.Snowflake.csproj b/src/Snowflake/NetCorePal.Extensions.Snowflake.csproj index 419e0683..e662989f 100644 --- a/src/Snowflake/NetCorePal.Extensions.Snowflake.csproj +++ b/src/Snowflake/NetCorePal.Extensions.Snowflake.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/test/ConsoleApp/NetCorePal.ConsoleApp.csproj b/test/ConsoleApp/NetCorePal.ConsoleApp.csproj index 0ea62492..87226a4a 100644 --- a/test/ConsoleApp/NetCorePal.ConsoleApp.csproj +++ b/test/ConsoleApp/NetCorePal.ConsoleApp.csproj @@ -2,7 +2,7 @@ Exe - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/test/NetCorePal.Context.AspNetCore.UnitTests/NetCorePal.Context.AspNetCore.UnitTests.csproj b/test/NetCorePal.Context.AspNetCore.UnitTests/NetCorePal.Context.AspNetCore.UnitTests.csproj index 0bdf6940..27a5d89e 100644 --- a/test/NetCorePal.Context.AspNetCore.UnitTests/NetCorePal.Context.AspNetCore.UnitTests.csproj +++ b/test/NetCorePal.Context.AspNetCore.UnitTests/NetCorePal.Context.AspNetCore.UnitTests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/test/NetCorePal.Extensions.AspNetCore.UnitTests/NetCorePal.Extensions.AspNetCore.UnitTests.csproj b/test/NetCorePal.Extensions.AspNetCore.UnitTests/NetCorePal.Extensions.AspNetCore.UnitTests.csproj index 21a35091..f39ecf26 100644 --- a/test/NetCorePal.Extensions.AspNetCore.UnitTests/NetCorePal.Extensions.AspNetCore.UnitTests.csproj +++ b/test/NetCorePal.Extensions.AspNetCore.UnitTests/NetCorePal.Extensions.AspNetCore.UnitTests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/test/NetCorePal.Extensions.DistributedTransactions.CAP.UnitTests/NetCorePal.Extensions.DistributedTransactions.CAP.UnitTests.csproj b/test/NetCorePal.Extensions.DistributedTransactions.CAP.UnitTests/NetCorePal.Extensions.DistributedTransactions.CAP.UnitTests.csproj index fab7406b..52c7c931 100644 --- a/test/NetCorePal.Extensions.DistributedTransactions.CAP.UnitTests/NetCorePal.Extensions.DistributedTransactions.CAP.UnitTests.csproj +++ b/test/NetCorePal.Extensions.DistributedTransactions.CAP.UnitTests/NetCorePal.Extensions.DistributedTransactions.CAP.UnitTests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/test/NetCorePal.Extensions.DistributedTransactions.Sagas.UnitTests/NetCorePal.Extensions.DistributedTransactions.Sagas.UnitTests.csproj b/test/NetCorePal.Extensions.DistributedTransactions.Sagas.UnitTests/NetCorePal.Extensions.DistributedTransactions.Sagas.UnitTests.csproj index 45dc545f..01194c81 100644 --- a/test/NetCorePal.Extensions.DistributedTransactions.Sagas.UnitTests/NetCorePal.Extensions.DistributedTransactions.Sagas.UnitTests.csproj +++ b/test/NetCorePal.Extensions.DistributedTransactions.Sagas.UnitTests/NetCorePal.Extensions.DistributedTransactions.Sagas.UnitTests.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/test/NetCorePal.Extensions.DistributedTransactions.UnitTests/NetCorePal.Extensions.DistributedTransactions.UnitTests.csproj b/test/NetCorePal.Extensions.DistributedTransactions.UnitTests/NetCorePal.Extensions.DistributedTransactions.UnitTests.csproj index b8db600a..2e9072c9 100644 --- a/test/NetCorePal.Extensions.DistributedTransactions.UnitTests/NetCorePal.Extensions.DistributedTransactions.UnitTests.csproj +++ b/test/NetCorePal.Extensions.DistributedTransactions.UnitTests/NetCorePal.Extensions.DistributedTransactions.UnitTests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/test/NetCorePal.Extensions.Domain.Abstractions.UnitTests/NetCorePal.Extensions.Domain.Abstractions.UnitTests.csproj b/test/NetCorePal.Extensions.Domain.Abstractions.UnitTests/NetCorePal.Extensions.Domain.Abstractions.UnitTests.csproj index 2e7b55e3..98fb608c 100644 --- a/test/NetCorePal.Extensions.Domain.Abstractions.UnitTests/NetCorePal.Extensions.Domain.Abstractions.UnitTests.csproj +++ b/test/NetCorePal.Extensions.Domain.Abstractions.UnitTests/NetCorePal.Extensions.Domain.Abstractions.UnitTests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/test/NetCorePal.Extensions.Mappers.UnitTests/NetCorePal.Extensions.Mappers.UnitTests.csproj b/test/NetCorePal.Extensions.Mappers.UnitTests/NetCorePal.Extensions.Mappers.UnitTests.csproj index 55776a5c..8e991450 100644 --- a/test/NetCorePal.Extensions.Mappers.UnitTests/NetCorePal.Extensions.Mappers.UnitTests.csproj +++ b/test/NetCorePal.Extensions.Mappers.UnitTests/NetCorePal.Extensions.Mappers.UnitTests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/test/NetCorePal.Extensions.MultiEnv.UnitTests/NetCorePal.Extensions.MultiEnv.UnitTests.csproj b/test/NetCorePal.Extensions.MultiEnv.UnitTests/NetCorePal.Extensions.MultiEnv.UnitTests.csproj index 152ea94a..336b800b 100644 --- a/test/NetCorePal.Extensions.MultiEnv.UnitTests/NetCorePal.Extensions.MultiEnv.UnitTests.csproj +++ b/test/NetCorePal.Extensions.MultiEnv.UnitTests/NetCorePal.Extensions.MultiEnv.UnitTests.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/test/NetCorePal.Extensions.Repository.EntityFrameworkCore.PostgreSql.Tests/NetCorePal.Extensions.Repository.EntityFrameworkCore.PostgreSql.Tests.csproj b/test/NetCorePal.Extensions.Repository.EntityFrameworkCore.PostgreSql.Tests/NetCorePal.Extensions.Repository.EntityFrameworkCore.PostgreSql.Tests.csproj index 6d40ab2f..a388887d 100644 --- a/test/NetCorePal.Extensions.Repository.EntityFrameworkCore.PostgreSql.Tests/NetCorePal.Extensions.Repository.EntityFrameworkCore.PostgreSql.Tests.csproj +++ b/test/NetCorePal.Extensions.Repository.EntityFrameworkCore.PostgreSql.Tests/NetCorePal.Extensions.Repository.EntityFrameworkCore.PostgreSql.Tests.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable false diff --git a/test/NetCorePal.Extensions.ServiceDiscovery.Abstractions.UnitTests/NetCorePal.Extensions.ServiceDiscovery.Abstractions.UnitTests.csproj b/test/NetCorePal.Extensions.ServiceDiscovery.Abstractions.UnitTests/NetCorePal.Extensions.ServiceDiscovery.Abstractions.UnitTests.csproj index 723f869c..c7fe2fb2 100644 --- a/test/NetCorePal.Extensions.ServiceDiscovery.Abstractions.UnitTests/NetCorePal.Extensions.ServiceDiscovery.Abstractions.UnitTests.csproj +++ b/test/NetCorePal.Extensions.ServiceDiscovery.Abstractions.UnitTests/NetCorePal.Extensions.ServiceDiscovery.Abstractions.UnitTests.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/test/NetCorePal.Extensions.ServiceDiscovery.K8s.UnitTests/NetCorePal.Extensions.ServiceDiscovery.K8s.UnitTests.csproj b/test/NetCorePal.Extensions.ServiceDiscovery.K8s.UnitTests/NetCorePal.Extensions.ServiceDiscovery.K8s.UnitTests.csproj index f8b52bd4..2db3ac43 100644 --- a/test/NetCorePal.Extensions.ServiceDiscovery.K8s.UnitTests/NetCorePal.Extensions.ServiceDiscovery.K8s.UnitTests.csproj +++ b/test/NetCorePal.Extensions.ServiceDiscovery.K8s.UnitTests/NetCorePal.Extensions.ServiceDiscovery.K8s.UnitTests.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/test/NetCorePal.Extensions.Snowflake.Consul.UnitTests/NetCorePal.Extensions.Snowflake.Consul.UnitTests.csproj b/test/NetCorePal.Extensions.Snowflake.Consul.UnitTests/NetCorePal.Extensions.Snowflake.Consul.UnitTests.csproj index 2696797e..c010dd1b 100644 --- a/test/NetCorePal.Extensions.Snowflake.Consul.UnitTests/NetCorePal.Extensions.Snowflake.Consul.UnitTests.csproj +++ b/test/NetCorePal.Extensions.Snowflake.Consul.UnitTests/NetCorePal.Extensions.Snowflake.Consul.UnitTests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/test/NetCorePal.Extensions.Snowflake.Redis.UnitTests/NetCorePal.Extensions.Snowflake.Redis.UnitTests.csproj b/test/NetCorePal.Extensions.Snowflake.Redis.UnitTests/NetCorePal.Extensions.Snowflake.Redis.UnitTests.csproj index 3f5bc4d0..470d48c5 100644 --- a/test/NetCorePal.Extensions.Snowflake.Redis.UnitTests/NetCorePal.Extensions.Snowflake.Redis.UnitTests.csproj +++ b/test/NetCorePal.Extensions.Snowflake.Redis.UnitTests/NetCorePal.Extensions.Snowflake.Redis.UnitTests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/test/NetCorePal.Web.UnitTests/NetCorePal.Web.UnitTests.csproj b/test/NetCorePal.Web.UnitTests/NetCorePal.Web.UnitTests.csproj index c70fd6f3..6fc395d4 100644 --- a/test/NetCorePal.Web.UnitTests/NetCorePal.Web.UnitTests.csproj +++ b/test/NetCorePal.Web.UnitTests/NetCorePal.Web.UnitTests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 enable enable diff --git a/test/NetCorePal.Web/NetCorePal.Web.csproj b/test/NetCorePal.Web/NetCorePal.Web.csproj index 5b972ab3..f0dce3b6 100644 --- a/test/NetCorePal.Web/NetCorePal.Web.csproj +++ b/test/NetCorePal.Web/NetCorePal.Web.csproj @@ -1,7 +1,7 @@  - net6.0;net7.0;net8.0 + net6.0;net7.0;net8.0;net9.0 false enable enable From 60bb61d18d81fcd0f9b283e276e7e90cfbf570e1 Mon Sep 17 00:00:00 2001 From: witskeeper Date: Tue, 11 Jun 2024 21:23:36 +0800 Subject: [PATCH 2/5] allow build preview package on dev branche --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 61087148..fe780374 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -2,7 +2,7 @@ name: preview build on: push: - branches: [ main ] + branches: [ main, dev ] jobs: build: runs-on: ubuntu-latest From d2890e5b08451efad3c1d549f82703b8de3b0d52 Mon Sep 17 00:00:00 2001 From: witskeeper Date: Tue, 11 Jun 2024 21:26:15 +0800 Subject: [PATCH 3/5] fix setup-dotnet --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index fe780374..4bfd7094 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -9,7 +9,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Setup .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4.0.0 with: global-json-file: global.json - name: Restore dependencies From ff766d2dd0c40005b82cb3013ca33e321ede5d73 Mon Sep 17 00:00:00 2001 From: witskeeper Date: Tue, 11 Jun 2024 21:30:51 +0800 Subject: [PATCH 4/5] fix sdk version --- eng/versions.props | 2 +- global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/versions.props b/eng/versions.props index 4383ceed..95b9aa1e 100644 --- a/eng/versions.props +++ b/eng/versions.props @@ -1,6 +1,6 @@ - 1.3.0 + 2.0.0 diff --git a/global.json b/global.json index 27369ac3..f4be4eac 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.100-preview.4", + "version": "9.0.100-preview.4.24267.66", "allowPrerelease": true, "rollForward": "latestMinor" } From 1d65ff3d25bc50ca47f4f166b7889cfa9d89451e Mon Sep 17 00:00:00 2001 From: witskeeper Date: Sat, 13 Jul 2024 08:48:59 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=A7=84=E5=88=92?= =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=8A=B6=E6=80=81=E3=80=81=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 7695f705..fa46deb4 100644 --- a/README.md +++ b/README.md @@ -65,15 +65,15 @@ dotnet new netcorepal-web -n My.Project.Name 规划提供的能力 -+ [ ] 支持灵活配置与部署的网关 -+ [ ] 基于 `ASP.NET Core`和开源组件的快速开发框架 -+ [ ] 提供领域驱动设计实现的代码模板工程脚手架 -+ [ ] 实现具备业务扩展性的整体灰度解决方案 -+ [ ] 实现具备业务扩展性的租户能力 -+ [ ] 提供带有可视化操作界面的微服务基础设施 -+ [ ] 模块化的设计，可按需使用、按需替换 ++ [x] 支持灵活配置与部署的网关 ++ [x] 基于 `ASP.NET Core`和开源组件的快速开发框架 ++ [x] 提供领域驱动设计实现的代码模板工程脚手架 ++ [x] 实现具备业务扩展性的整体灰度解决方案 ++ [x] 实现具备业务扩展性的租户能力 ++ [x] 基于领域驱动设计的微服务架构实践 ++ [x] 模块化的设计，可按需使用、按需替换 + [ ] 提供详实的文档 -+ [ ] 基于领域驱动设计的微服务架构实践 ++ [ ] 提供带有可视化操作界面的微服务基础设施 ## 组件说明 @@ -90,12 +90,13 @@ dotnet new netcorepal-web -n My.Project.Name + [x] Repository (Based On EntityFrameworkCore) + [x] Transaction + [x] UnitOfWork - + [x] Distributed Transaction(Based on DotNetCore.CAP) - + [x] Outbox - + [ ] Saga + + [x] Distributed Transaction + + [x] Outbox(Based on DotNetCore.CAP) + [x] IdGeneration + [x] Snowflake + [x] Snowflake with Etcd + + [x] Snowflake with Redis + + [x] Snowflake with Consul + [x] Mappers + [x] Primitives + [x] Exception Handling @@ -104,8 +105,9 @@ dotnet new netcorepal-web -n My.Project.Name + [x] Service Discovery Kubernetes + [ ] Service Discovery Consul + [ ] Service Discovery Nacos -+ [ ] Multi Tenant ++ [x] Multi Tenant + [x] Multi Environment + + [x] Gray Environment 更多信息请参阅[使用文档](docs/index.md)