From fdba9c626a9e0d32dc02956d4369b2fbfa6f105a Mon Sep 17 00:00:00 2001 From: nivalxer Date: Fri, 29 Nov 2024 17:40:00 +0800 Subject: [PATCH] Add .net9 target. --- .../AspectCore.Core.Benchmark.csproj | 2 +- ...ore.Extensions.Reflection.Benchmark.csproj | 2 +- ...spectCore.Extensions.Autofac.Sample.csproj | 2 +- ...s.DependencyInjection.ConsoleSample.csproj | 2 +- .../AspectCore.Abstractions.csproj | 10 ++- src/AspectCore.Core/AspectCore.Core.csproj | 2 +- .../AspectCore.Extensions.AspNetCore.csproj | 2 +- .../AspectCore.Extensions.AspectScope.csproj | 2 +- .../AspectCore.Extensions.Autofac.csproj | 2 +- ...AspectCore.Extensions.Configuration.csproj | 7 +- ...pectCore.Extensions.DataAnnotations.csproj | 2 +- ...spectCore.Extensions.DataValidation.csproj | 2 +- ...Core.Extensions.DependencyInjection.csproj | 6 +- .../AspectCore.Extensions.Hosting.csproj | 72 ++++++++++--------- .../AspectCore.Extensions.LightInject.csproj | 2 +- .../AspectCore.Extensions.Reflection.csproj | 2 +- .../AspectCore.Extensions.Windsor.csproj | 2 +- .../AspectCore.Extensions.Autofac.Test.csproj | 7 +- ...Core.Extensions.Configuration.Tests.csproj | 7 +- ...Extensions.DependencyInjection.Test.csproj | 6 +- ...AspectCore.Extensions.Hosting.Tests.csproj | 2 +- ...ectCore.Extensions.LightInject.Test.csproj | 2 +- ...pectCore.Extensions.Reflection.Test.csproj | 8 +-- .../AspectCore.Extensions.Windsor.Test.csproj | 8 ++- .../AspectCore.Tests/AspectCore.Tests.csproj | 6 +- 25 files changed, 101 insertions(+), 66 deletions(-) diff --git a/benchmark/AspectCore.Core.Benchmark/AspectCore.Core.Benchmark.csproj b/benchmark/AspectCore.Core.Benchmark/AspectCore.Core.Benchmark.csproj index 1600daf5..a8fa4b4d 100644 --- a/benchmark/AspectCore.Core.Benchmark/AspectCore.Core.Benchmark.csproj +++ b/benchmark/AspectCore.Core.Benchmark/AspectCore.Core.Benchmark.csproj @@ -2,7 +2,7 @@ Exe - net8.0;net7.0;net6.0 + net9.0;net8.0;net7.0;net6.0 true true snupkg diff --git a/benchmark/AspectCore.Extensions.Reflection.Benchmark/AspectCore.Extensions.Reflection.Benchmark.csproj b/benchmark/AspectCore.Extensions.Reflection.Benchmark/AspectCore.Extensions.Reflection.Benchmark.csproj index 20997e4e..e6f53081 100644 --- a/benchmark/AspectCore.Extensions.Reflection.Benchmark/AspectCore.Extensions.Reflection.Benchmark.csproj +++ b/benchmark/AspectCore.Extensions.Reflection.Benchmark/AspectCore.Extensions.Reflection.Benchmark.csproj @@ -2,7 +2,7 @@ Exe - net8.0;net7.0;net6.0 + net9.0;net8.0;net7.0;net6.0 true true snupkg diff --git a/sample/AspectCore.Extensions.Autofac.Sample/AspectCore.Extensions.Autofac.Sample.csproj b/sample/AspectCore.Extensions.Autofac.Sample/AspectCore.Extensions.Autofac.Sample.csproj index 98f13817..400f077e 100644 --- a/sample/AspectCore.Extensions.Autofac.Sample/AspectCore.Extensions.Autofac.Sample.csproj +++ b/sample/AspectCore.Extensions.Autofac.Sample/AspectCore.Extensions.Autofac.Sample.csproj @@ -2,7 +2,7 @@ Exe - net8.0;net7.0;net6.0 + net9.0;net8.0;net7.0;net6.0 true true snupkg diff --git a/sample/AspectCore.Extensions.DependencyInjection.ConsoleSample/AspectCore.Extensions.DependencyInjection.ConsoleSample.csproj b/sample/AspectCore.Extensions.DependencyInjection.ConsoleSample/AspectCore.Extensions.DependencyInjection.ConsoleSample.csproj index 3116e2c4..a55d8e4a 100644 --- a/sample/AspectCore.Extensions.DependencyInjection.ConsoleSample/AspectCore.Extensions.DependencyInjection.ConsoleSample.csproj +++ b/sample/AspectCore.Extensions.DependencyInjection.ConsoleSample/AspectCore.Extensions.DependencyInjection.ConsoleSample.csproj @@ -1,7 +1,7 @@  Exe - net8.0;net7.0;net6.0 + net9.0;net8.0;net7.0;net6.0 true true snupkg diff --git a/src/AspectCore.Abstractions/AspectCore.Abstractions.csproj b/src/AspectCore.Abstractions/AspectCore.Abstractions.csproj index 51f4900a..02231705 100644 --- a/src/AspectCore.Abstractions/AspectCore.Abstractions.csproj +++ b/src/AspectCore.Abstractions/AspectCore.Abstractions.csproj @@ -9,12 +9,16 @@ AspectCore.Abstractions DynamicProxy;Aop;Aspect;AspectCore;Interceptor The abstract design of the AspectCore framework. - net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 + net9.0;net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 true true snupkg + + + + @@ -27,8 +31,8 @@ - - + + diff --git a/src/AspectCore.Core/AspectCore.Core.csproj b/src/AspectCore.Core/AspectCore.Core.csproj index c9c62f51..f9489a55 100644 --- a/src/AspectCore.Core/AspectCore.Core.csproj +++ b/src/AspectCore.Core/AspectCore.Core.csproj @@ -8,7 +8,7 @@ AspectCore.Core DynamicProxy;Aop;Aspect;AspectCore;Interceptor The implementation of the AspectCore framework. - net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 + .net9.0;net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 true true snupkg diff --git a/src/AspectCore.Extensions.AspNetCore/AspectCore.Extensions.AspNetCore.csproj b/src/AspectCore.Extensions.AspNetCore/AspectCore.Extensions.AspNetCore.csproj index 00409c2a..980ba6ab 100644 --- a/src/AspectCore.Extensions.AspNetCore/AspectCore.Extensions.AspNetCore.csproj +++ b/src/AspectCore.Extensions.AspNetCore/AspectCore.Extensions.AspNetCore.csproj @@ -3,7 +3,7 @@ - net8.0;net7.0;net6.0 + net9.0;net8.0;net7.0;net6.0 true true snupkg diff --git a/src/AspectCore.Extensions.AspectScope/AspectCore.Extensions.AspectScope.csproj b/src/AspectCore.Extensions.AspectScope/AspectCore.Extensions.AspectScope.csproj index a15cfb77..47ea9b77 100644 --- a/src/AspectCore.Extensions.AspectScope/AspectCore.Extensions.AspectScope.csproj +++ b/src/AspectCore.Extensions.AspectScope/AspectCore.Extensions.AspectScope.csproj @@ -10,7 +10,7 @@ AspectCore.Extensions.AspectScope DynamicProxy;Aop;Aspect;AspectCore;Intercepter ScopedContext extension system for AspectCore Framework. - net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 + net9.0;net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 true true snupkg diff --git a/src/AspectCore.Extensions.Autofac/AspectCore.Extensions.Autofac.csproj b/src/AspectCore.Extensions.Autofac/AspectCore.Extensions.Autofac.csproj index d904b8db..53826f5f 100644 --- a/src/AspectCore.Extensions.Autofac/AspectCore.Extensions.Autofac.csproj +++ b/src/AspectCore.Extensions.Autofac/AspectCore.Extensions.Autofac.csproj @@ -9,7 +9,7 @@ AspectCore.Extensions.Autofac DynamicProxy;Aop;Autofac;AspectCore Interceptor and dynamicProxy support for Autofac via AspectCore Framework. - net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 + net9.0;net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 true true snupkg diff --git a/src/AspectCore.Extensions.Configuration/AspectCore.Extensions.Configuration.csproj b/src/AspectCore.Extensions.Configuration/AspectCore.Extensions.Configuration.csproj index 6ba28395..030e5799 100644 --- a/src/AspectCore.Extensions.Configuration/AspectCore.Extensions.Configuration.csproj +++ b/src/AspectCore.Extensions.Configuration/AspectCore.Extensions.Configuration.csproj @@ -8,7 +8,7 @@ AspectCore.Extensions.Configuration Reflection;Aop;DynamicProxy;Configuration Configuration extension system for ASP.NET Core via AspectCore-Framework. - net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 + net9.0;net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 true true @@ -35,6 +35,11 @@ + + + + + diff --git a/src/AspectCore.Extensions.DataAnnotations/AspectCore.Extensions.DataAnnotations.csproj b/src/AspectCore.Extensions.DataAnnotations/AspectCore.Extensions.DataAnnotations.csproj index 6e4efe07..b4530727 100644 --- a/src/AspectCore.Extensions.DataAnnotations/AspectCore.Extensions.DataAnnotations.csproj +++ b/src/AspectCore.Extensions.DataAnnotations/AspectCore.Extensions.DataAnnotations.csproj @@ -9,7 +9,7 @@ AspectCore.Extensions.DataAnnotations DataValidation;DataAnnotations;AspectCore;AOP DataAnnotations extension system for AspectCore Framework. - net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 + net9.0;net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 true true snupkg diff --git a/src/AspectCore.Extensions.DataValidation/AspectCore.Extensions.DataValidation.csproj b/src/AspectCore.Extensions.DataValidation/AspectCore.Extensions.DataValidation.csproj index e1415a1b..60f3c366 100644 --- a/src/AspectCore.Extensions.DataValidation/AspectCore.Extensions.DataValidation.csproj +++ b/src/AspectCore.Extensions.DataValidation/AspectCore.Extensions.DataValidation.csproj @@ -9,7 +9,7 @@ AspectCore.Extensions.DataValidation DataValidation;AspectCore;AOP DataValidation extension system for AspectCore Framework. - net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 + net9.0;net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 true true snupkg diff --git a/src/AspectCore.Extensions.DependencyInjection/AspectCore.Extensions.DependencyInjection.csproj b/src/AspectCore.Extensions.DependencyInjection/AspectCore.Extensions.DependencyInjection.csproj index a365128d..56f17da2 100644 --- a/src/AspectCore.Extensions.DependencyInjection/AspectCore.Extensions.DependencyInjection.csproj +++ b/src/AspectCore.Extensions.DependencyInjection/AspectCore.Extensions.DependencyInjection.csproj @@ -10,7 +10,7 @@ DynamicProxy;Aop;DependencyInjection;AspectCore Interceptor and dynamicProxy support for Microsoft.Extensions.DependencyInjection via AspectCore Framework. false - net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 + net9.0;net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 true true snupkg @@ -36,6 +36,10 @@ + + + + diff --git a/src/AspectCore.Extensions.Hosting/AspectCore.Extensions.Hosting.csproj b/src/AspectCore.Extensions.Hosting/AspectCore.Extensions.Hosting.csproj index 45b2c278..61bc15b0 100644 --- a/src/AspectCore.Extensions.Hosting/AspectCore.Extensions.Hosting.csproj +++ b/src/AspectCore.Extensions.Hosting/AspectCore.Extensions.Hosting.csproj @@ -1,35 +1,41 @@  - - - net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 - true - true - snupkg - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + net9.0;net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 + true + true + snupkg + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/AspectCore.Extensions.LightInject/AspectCore.Extensions.LightInject.csproj b/src/AspectCore.Extensions.LightInject/AspectCore.Extensions.LightInject.csproj index 9b6f1f2f..58bd898a 100644 --- a/src/AspectCore.Extensions.LightInject/AspectCore.Extensions.LightInject.csproj +++ b/src/AspectCore.Extensions.LightInject/AspectCore.Extensions.LightInject.csproj @@ -7,7 +7,7 @@ DynamicProxy;Aop;LightInject;AspectCore Interceptor and dynamicProxy support for LightInject via AspectCore Framework. false - net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 + net9.0;net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 true true snupkg diff --git a/src/AspectCore.Extensions.Reflection/AspectCore.Extensions.Reflection.csproj b/src/AspectCore.Extensions.Reflection/AspectCore.Extensions.Reflection.csproj index 4a7d826c..b6cf4c8e 100644 --- a/src/AspectCore.Extensions.Reflection/AspectCore.Extensions.Reflection.csproj +++ b/src/AspectCore.Extensions.Reflection/AspectCore.Extensions.Reflection.csproj @@ -8,7 +8,7 @@ AspectCore.Extensions.Reflection Reflection;Aop;DynamicProxy Reflection extension system for AspectCore Framework. - net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 + net9.0;net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 true true snupkg diff --git a/src/AspectCore.Extensions.Windsor/AspectCore.Extensions.Windsor.csproj b/src/AspectCore.Extensions.Windsor/AspectCore.Extensions.Windsor.csproj index f555adef..c05a8902 100644 --- a/src/AspectCore.Extensions.Windsor/AspectCore.Extensions.Windsor.csproj +++ b/src/AspectCore.Extensions.Windsor/AspectCore.Extensions.Windsor.csproj @@ -9,7 +9,7 @@ AspectCore.Extensions.Windsor DynamicProxy;Aop;Windsor;AspectCore Interceptor and dynamicProxy support for Castle.Windsor via AspectCore Framework. - net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 + net9.0;net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 true true snupkg diff --git a/tests/AspectCore.Extensions.Autofac.Test/AspectCore.Extensions.Autofac.Test.csproj b/tests/AspectCore.Extensions.Autofac.Test/AspectCore.Extensions.Autofac.Test.csproj index 9abb1187..57fb4bfa 100644 --- a/tests/AspectCore.Extensions.Autofac.Test/AspectCore.Extensions.Autofac.Test.csproj +++ b/tests/AspectCore.Extensions.Autofac.Test/AspectCore.Extensions.Autofac.Test.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net6.0 + net9.0;net8.0;net7.0;net6.0 portable AspectCore.Extensions.Autofac.Test AspectCore.Extensions.Autofac.Test @@ -32,6 +32,11 @@ + + + + + diff --git a/tests/AspectCore.Extensions.Configuration.Tests/AspectCore.Extensions.Configuration.Tests.csproj b/tests/AspectCore.Extensions.Configuration.Tests/AspectCore.Extensions.Configuration.Tests.csproj index b087a8b3..7b2055ff 100644 --- a/tests/AspectCore.Extensions.Configuration.Tests/AspectCore.Extensions.Configuration.Tests.csproj +++ b/tests/AspectCore.Extensions.Configuration.Tests/AspectCore.Extensions.Configuration.Tests.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net6.0 + net9.0;net8.0;net7.0;net6.0 false @@ -20,6 +20,11 @@ + + + + + diff --git a/tests/AspectCore.Extensions.DependencyInjection.Test/AspectCore.Extensions.DependencyInjection.Test.csproj b/tests/AspectCore.Extensions.DependencyInjection.Test/AspectCore.Extensions.DependencyInjection.Test.csproj index e7504138..13f8b7ce 100644 --- a/tests/AspectCore.Extensions.DependencyInjection.Test/AspectCore.Extensions.DependencyInjection.Test.csproj +++ b/tests/AspectCore.Extensions.DependencyInjection.Test/AspectCore.Extensions.DependencyInjection.Test.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net6.0 + net9.0;net7.0;net6.0 portable AspectCore.Extensions.DependencyInjection.Test AspectCore.Extensions.DependencyInjection.Test @@ -27,6 +27,10 @@ + + + + diff --git a/tests/AspectCore.Extensions.Hosting.Tests/AspectCore.Extensions.Hosting.Tests.csproj b/tests/AspectCore.Extensions.Hosting.Tests/AspectCore.Extensions.Hosting.Tests.csproj index 795e5eac..45a5e998 100644 --- a/tests/AspectCore.Extensions.Hosting.Tests/AspectCore.Extensions.Hosting.Tests.csproj +++ b/tests/AspectCore.Extensions.Hosting.Tests/AspectCore.Extensions.Hosting.Tests.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net6.0 + net9.0;net8.0;net7.0;net6.0 false diff --git a/tests/AspectCore.Extensions.LightInject.Test/AspectCore.Extensions.LightInject.Test.csproj b/tests/AspectCore.Extensions.LightInject.Test/AspectCore.Extensions.LightInject.Test.csproj index 1bce79a0..8da36832 100644 --- a/tests/AspectCore.Extensions.LightInject.Test/AspectCore.Extensions.LightInject.Test.csproj +++ b/tests/AspectCore.Extensions.LightInject.Test/AspectCore.Extensions.LightInject.Test.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net6.0 + net9.0;net8.0;net7.0;net6.0 portable true false diff --git a/tests/AspectCore.Extensions.Reflection.Test/AspectCore.Extensions.Reflection.Test.csproj b/tests/AspectCore.Extensions.Reflection.Test/AspectCore.Extensions.Reflection.Test.csproj index 3439bb01..5a5c8d4a 100644 --- a/tests/AspectCore.Extensions.Reflection.Test/AspectCore.Extensions.Reflection.Test.csproj +++ b/tests/AspectCore.Extensions.Reflection.Test/AspectCore.Extensions.Reflection.Test.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net6.0 + net9.0;net8.0;net7.0;net6.0 portable AspectCore.Extensions.Reflection.Test AspectCore.Extensions.Reflection.Test @@ -15,12 +15,6 @@ - - - - - - diff --git a/tests/AspectCore.Extensions.Windsor.Test/AspectCore.Extensions.Windsor.Test.csproj b/tests/AspectCore.Extensions.Windsor.Test/AspectCore.Extensions.Windsor.Test.csproj index 81181572..27f73aaa 100644 --- a/tests/AspectCore.Extensions.Windsor.Test/AspectCore.Extensions.Windsor.Test.csproj +++ b/tests/AspectCore.Extensions.Windsor.Test/AspectCore.Extensions.Windsor.Test.csproj @@ -1,7 +1,7 @@  - net8.0;net7.0;net6.0 + net9.0;net8.0;net7.0;net6.0 false AspectCoreTest.Windsor @@ -18,7 +18,11 @@ - + + + + + diff --git a/tests/AspectCore.Tests/AspectCore.Tests.csproj b/tests/AspectCore.Tests/AspectCore.Tests.csproj index 15ffebf8..0debc9ad 100644 --- a/tests/AspectCore.Tests/AspectCore.Tests.csproj +++ b/tests/AspectCore.Tests/AspectCore.Tests.csproj @@ -1,6 +1,6 @@  - net8.0;net7.0;net6.0 + net9.0;net8.0;net7.0;net6.0 false @@ -16,6 +16,10 @@ + + + +