From 1cf47ea2783923ddf722bdb37c4d8ab8eea7b670 Mon Sep 17 00:00:00 2001 From: nivalxer Date: Fri, 29 Nov 2024 17:11:20 +0800 Subject: [PATCH 1/2] Update Build Target --- .../AspectCore.Core.Benchmark.csproj | 4 +- ...ore.Extensions.Reflection.Benchmark.csproj | 4 +- ...spectCore.Extensions.Autofac.Sample.csproj | 2 +- ...s.DependencyInjection.ConsoleSample.csproj | 2 +- .../AspectCore.Abstractions.csproj | 52 +++++++------ .../DependencyInjection/IServiceResolver.cs | 3 +- src/AspectCore.Core/AspectCore.Core.csproj | 8 +- .../AspectCore.Extensions.AspNetCore.csproj | 2 +- .../AspectCore.Extensions.AspectScope.csproj | 4 +- .../AspectCore.Extensions.Autofac.csproj | 4 +- ...AspectCore.Extensions.Configuration.csproj | 9 ++- ...pectCore.Extensions.DataAnnotations.csproj | 4 +- ...spectCore.Extensions.DataValidation.csproj | 4 +- ...Core.Extensions.DependencyInjection.csproj | 71 +++++++++--------- .../AspectCore.Extensions.Hosting.csproj | 8 +- .../AspectCore.Extensions.LightInject.csproj | 4 +- .../AspectCore.Extensions.Reflection.csproj | 43 ++++++----- .../Extensions/TypeExtensions.cs | 6 +- .../AspectCore.Extensions.Windsor.csproj | 4 +- .../AspectCore.Extensions.Autofac.Test.csproj | 6 +- ...Core.Extensions.Configuration.Tests.csproj | 6 +- ...Extensions.DependencyInjection.Test.csproj | 6 +- .../Issues/ConstructorSelectTests.cs | 73 +++++++++++++++++++ ...AspectCore.Extensions.Hosting.Tests.csproj | 6 +- ...ectCore.Extensions.LightInject.Test.csproj | 6 +- ...pectCore.Extensions.Reflection.Test.csproj | 8 +- .../AspectCore.Extensions.Windsor.Test.csproj | 6 +- .../AspectCore.Tests/AspectCore.Tests.csproj | 6 +- 28 files changed, 232 insertions(+), 129 deletions(-) create mode 100644 tests/AspectCore.Extensions.DependencyInjection.Test/Issues/ConstructorSelectTests.cs diff --git a/benchmark/AspectCore.Core.Benchmark/AspectCore.Core.Benchmark.csproj b/benchmark/AspectCore.Core.Benchmark/AspectCore.Core.Benchmark.csproj index 5880eb5c..1600daf5 100644 --- a/benchmark/AspectCore.Core.Benchmark/AspectCore.Core.Benchmark.csproj +++ b/benchmark/AspectCore.Core.Benchmark/AspectCore.Core.Benchmark.csproj @@ -14,12 +14,12 @@ - + - + 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 10321930..20997e4e 100644 --- a/benchmark/AspectCore.Extensions.Reflection.Benchmark/AspectCore.Extensions.Reflection.Benchmark.csproj +++ b/benchmark/AspectCore.Extensions.Reflection.Benchmark/AspectCore.Extensions.Reflection.Benchmark.csproj @@ -9,11 +9,11 @@ - + - + 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 df05ed8d..98f13817 100644 --- a/sample/AspectCore.Extensions.Autofac.Sample/AspectCore.Extensions.Autofac.Sample.csproj +++ b/sample/AspectCore.Extensions.Autofac.Sample/AspectCore.Extensions.Autofac.Sample.csproj @@ -9,7 +9,7 @@ - + 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 4d1f0ea0..3116e2c4 100644 --- a/sample/AspectCore.Extensions.DependencyInjection.ConsoleSample/AspectCore.Extensions.DependencyInjection.ConsoleSample.csproj +++ b/sample/AspectCore.Extensions.DependencyInjection.ConsoleSample/AspectCore.Extensions.DependencyInjection.ConsoleSample.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/AspectCore.Abstractions/AspectCore.Abstractions.csproj b/src/AspectCore.Abstractions/AspectCore.Abstractions.csproj index acfc42c4..51f4900a 100644 --- a/src/AspectCore.Abstractions/AspectCore.Abstractions.csproj +++ b/src/AspectCore.Abstractions/AspectCore.Abstractions.csproj @@ -1,19 +1,19 @@  - - - - The abstract design of the AspectCore framework. - AspectCore.Abstractions - AspectCore.Abstractions - AspectCore.Abstractions - DynamicProxy;Aop;Aspect;AspectCore;Interceptor - The abstract design of the AspectCore framework. - net8.0;net7.0;net6.0 - true - true - snupkg - + + + + The abstract design of the AspectCore framework. + AspectCore.Abstractions + AspectCore.Abstractions + AspectCore.Abstractions + DynamicProxy;Aop;Aspect;AspectCore;Interceptor + The abstract design of the AspectCore framework. + net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 + true + true + snupkg + @@ -26,13 +26,17 @@ - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/AspectCore.Abstractions/DependencyInjection/IServiceResolver.cs b/src/AspectCore.Abstractions/DependencyInjection/IServiceResolver.cs index 85ec0656..6e3847d4 100644 --- a/src/AspectCore.Abstractions/DependencyInjection/IServiceResolver.cs +++ b/src/AspectCore.Abstractions/DependencyInjection/IServiceResolver.cs @@ -1,13 +1,12 @@ using System; using AspectCore.DynamicProxy; -using Microsoft.Extensions.DependencyInjection; namespace AspectCore.DependencyInjection { [NonAspect] public interface IServiceResolver : IServiceProvider, IDisposable #if NET8_0_OR_GREATER - , IKeyedServiceProvider + , Microsoft.Extensions.DependencyInjection.IKeyedServiceProvider #endif { object Resolve(Type serviceType); diff --git a/src/AspectCore.Core/AspectCore.Core.csproj b/src/AspectCore.Core/AspectCore.Core.csproj index 92237024..c9c62f51 100644 --- a/src/AspectCore.Core/AspectCore.Core.csproj +++ b/src/AspectCore.Core/AspectCore.Core.csproj @@ -8,14 +8,14 @@ AspectCore.Core DynamicProxy;Aop;Aspect;AspectCore;Interceptor The implementation of the AspectCore framework. - net8.0;net7.0;net6.0 + net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 true true snupkg - + @@ -23,4 +23,8 @@ + + + + \ No newline at end of file diff --git a/src/AspectCore.Extensions.AspNetCore/AspectCore.Extensions.AspNetCore.csproj b/src/AspectCore.Extensions.AspNetCore/AspectCore.Extensions.AspNetCore.csproj index f0361490..00409c2a 100644 --- a/src/AspectCore.Extensions.AspNetCore/AspectCore.Extensions.AspNetCore.csproj +++ b/src/AspectCore.Extensions.AspNetCore/AspectCore.Extensions.AspNetCore.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/AspectCore.Extensions.AspectScope/AspectCore.Extensions.AspectScope.csproj b/src/AspectCore.Extensions.AspectScope/AspectCore.Extensions.AspectScope.csproj index 5e3cb901..a15cfb77 100644 --- a/src/AspectCore.Extensions.AspectScope/AspectCore.Extensions.AspectScope.csproj +++ b/src/AspectCore.Extensions.AspectScope/AspectCore.Extensions.AspectScope.csproj @@ -10,14 +10,14 @@ AspectCore.Extensions.AspectScope DynamicProxy;Aop;Aspect;AspectCore;Intercepter ScopedContext extension system for AspectCore Framework. - net8.0;net7.0;net6.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 30acc6e1..d904b8db 100644 --- a/src/AspectCore.Extensions.Autofac/AspectCore.Extensions.Autofac.csproj +++ b/src/AspectCore.Extensions.Autofac/AspectCore.Extensions.Autofac.csproj @@ -9,14 +9,14 @@ AspectCore.Extensions.Autofac DynamicProxy;Aop;Autofac;AspectCore Interceptor and dynamicProxy support for Autofac via AspectCore Framework. - net8.0;net7.0;net6.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 e565cdba..6ba28395 100644 --- a/src/AspectCore.Extensions.Configuration/AspectCore.Extensions.Configuration.csproj +++ b/src/AspectCore.Extensions.Configuration/AspectCore.Extensions.Configuration.csproj @@ -8,13 +8,18 @@ AspectCore.Extensions.Configuration Reflection;Aop;DynamicProxy;Configuration Configuration extension system for ASP.NET Core via AspectCore-Framework. - net8.0;net7.0;net6.0 + net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 true true snupkg + + + + + @@ -31,7 +36,7 @@ - + diff --git a/src/AspectCore.Extensions.DataAnnotations/AspectCore.Extensions.DataAnnotations.csproj b/src/AspectCore.Extensions.DataAnnotations/AspectCore.Extensions.DataAnnotations.csproj index 54f008c1..6e4efe07 100644 --- a/src/AspectCore.Extensions.DataAnnotations/AspectCore.Extensions.DataAnnotations.csproj +++ b/src/AspectCore.Extensions.DataAnnotations/AspectCore.Extensions.DataAnnotations.csproj @@ -9,14 +9,14 @@ AspectCore.Extensions.DataAnnotations DataValidation;DataAnnotations;AspectCore;AOP DataAnnotations extension system for AspectCore Framework. - net8.0;net7.0;net6.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 8fcccb17..e1415a1b 100644 --- a/src/AspectCore.Extensions.DataValidation/AspectCore.Extensions.DataValidation.csproj +++ b/src/AspectCore.Extensions.DataValidation/AspectCore.Extensions.DataValidation.csproj @@ -9,14 +9,14 @@ AspectCore.Extensions.DataValidation DataValidation;AspectCore;AOP DataValidation extension system for AspectCore Framework. - net8.0;net7.0;net6.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 dabb9643..a365128d 100644 --- a/src/AspectCore.Extensions.DependencyInjection/AspectCore.Extensions.DependencyInjection.csproj +++ b/src/AspectCore.Extensions.DependencyInjection/AspectCore.Extensions.DependencyInjection.csproj @@ -1,39 +1,42 @@  - - - - Interceptor and dynamicProxy support for Microsoft.Extensions.DependencyInjection via AspectCore Framework. - AspectCore.Extensions.DependencyInjection - AspectCore.Extensions.DependencyInjection - AspectCore.Extensions.DependencyInjection - DynamicProxy;Aop;DependencyInjection;AspectCore - Interceptor and dynamicProxy support for Microsoft.Extensions.DependencyInjection via AspectCore Framework. - false - net8.0;net7.0;net6.0 - true - true - snupkg - - - - - - - - - - - - - - - - - + + + Interceptor and dynamicProxy support for Microsoft.Extensions.DependencyInjection via AspectCore Framework. + AspectCore.Extensions.DependencyInjection + AspectCore.Extensions.DependencyInjection + AspectCore.Extensions.DependencyInjection + 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 + true + true + snupkg + - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/AspectCore.Extensions.Hosting/AspectCore.Extensions.Hosting.csproj b/src/AspectCore.Extensions.Hosting/AspectCore.Extensions.Hosting.csproj index cd6c1a92..45b2c278 100644 --- a/src/AspectCore.Extensions.Hosting/AspectCore.Extensions.Hosting.csproj +++ b/src/AspectCore.Extensions.Hosting/AspectCore.Extensions.Hosting.csproj @@ -1,14 +1,18 @@  - net8.0;net7.0;net6.0 + net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0 true true snupkg - + + + + + diff --git a/src/AspectCore.Extensions.LightInject/AspectCore.Extensions.LightInject.csproj b/src/AspectCore.Extensions.LightInject/AspectCore.Extensions.LightInject.csproj index e59351cb..9b6f1f2f 100644 --- a/src/AspectCore.Extensions.LightInject/AspectCore.Extensions.LightInject.csproj +++ b/src/AspectCore.Extensions.LightInject/AspectCore.Extensions.LightInject.csproj @@ -7,14 +7,14 @@ DynamicProxy;Aop;LightInject;AspectCore Interceptor and dynamicProxy support for LightInject via AspectCore Framework. false - net8.0;net7.0;net6.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 78e5d43d..4a7d826c 100644 --- a/src/AspectCore.Extensions.Reflection/AspectCore.Extensions.Reflection.csproj +++ b/src/AspectCore.Extensions.Reflection/AspectCore.Extensions.Reflection.csproj @@ -1,21 +1,28 @@  - - - Reflection extension system for AspectCore Framework. - AspectCore.Extensions.Reflection - False - AspectCore.Extensions.Reflection - AspectCore.Extensions.Reflection - Reflection;Aop;DynamicProxy - Reflection extension system for AspectCore Framework. - net8.0;net7.0;net6.0 - true - true - snupkg - + + + Reflection extension system for AspectCore Framework. + AspectCore.Extensions.Reflection + False + AspectCore.Extensions.Reflection + AspectCore.Extensions.Reflection + Reflection;Aop;DynamicProxy + Reflection extension system for AspectCore Framework. + 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.Reflection/Extensions/TypeExtensions.cs b/src/AspectCore.Extensions.Reflection/Extensions/TypeExtensions.cs index 887b3f78..67d4c947 100644 --- a/src/AspectCore.Extensions.Reflection/Extensions/TypeExtensions.cs +++ b/src/AspectCore.Extensions.Reflection/Extensions/TypeExtensions.cs @@ -189,8 +189,12 @@ public static bool IsTupleType(this Type type) { throw new ArgumentNullException(nameof(type)); } - return type.IsGenericType && typeof(ITuple).IsAssignableFrom(type.GetTypeInfo().GetGenericTypeDefinition()); +#if NETSTANDARD2_0 + return false; +#else + return type.IsGenericType && typeof(ITuple).IsAssignableFrom(type.GetTypeInfo().GetGenericTypeDefinition()); +#endif } } } \ No newline at end of file diff --git a/src/AspectCore.Extensions.Windsor/AspectCore.Extensions.Windsor.csproj b/src/AspectCore.Extensions.Windsor/AspectCore.Extensions.Windsor.csproj index ce89f6d5..f555adef 100644 --- a/src/AspectCore.Extensions.Windsor/AspectCore.Extensions.Windsor.csproj +++ b/src/AspectCore.Extensions.Windsor/AspectCore.Extensions.Windsor.csproj @@ -9,14 +9,14 @@ AspectCore.Extensions.Windsor DynamicProxy;Aop;Windsor;AspectCore Interceptor and dynamicProxy support for Castle.Windsor via AspectCore Framework. - net8.0;net7.0;net6.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 cb30fb92..9abb1187 100644 --- a/tests/AspectCore.Extensions.Autofac.Test/AspectCore.Extensions.Autofac.Test.csproj +++ b/tests/AspectCore.Extensions.Autofac.Test/AspectCore.Extensions.Autofac.Test.csproj @@ -33,13 +33,13 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + \ No newline at end of file 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 19a4e4b0..b087a8b3 100644 --- a/tests/AspectCore.Extensions.Configuration.Tests/AspectCore.Extensions.Configuration.Tests.csproj +++ b/tests/AspectCore.Extensions.Configuration.Tests/AspectCore.Extensions.Configuration.Tests.csproj @@ -21,9 +21,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive 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 b08c72d6..e7504138 100644 --- a/tests/AspectCore.Extensions.DependencyInjection.Test/AspectCore.Extensions.DependencyInjection.Test.csproj +++ b/tests/AspectCore.Extensions.DependencyInjection.Test/AspectCore.Extensions.DependencyInjection.Test.csproj @@ -28,13 +28,13 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/AspectCore.Extensions.DependencyInjection.Test/Issues/ConstructorSelectTests.cs b/tests/AspectCore.Extensions.DependencyInjection.Test/Issues/ConstructorSelectTests.cs new file mode 100644 index 00000000..5014a804 --- /dev/null +++ b/tests/AspectCore.Extensions.DependencyInjection.Test/Issues/ConstructorSelectTests.cs @@ -0,0 +1,73 @@ +using System; +using System.Text; +using System.Threading.Tasks; +using AspectCore.Configuration; +using AspectCore.DynamicProxy; +using Microsoft.Extensions.DependencyInjection; +using Xunit; + +namespace AspectCore.Extensions.DependencyInjection.Test.Issues +{ + //https://github.com/dotnetcore/AspectCore-Framework/issues/313 + public class ConstructorSelectTests + { + public interface IInteriorService + { + string SayHello(); + } + public interface IExternalService + { + string SayHello(); + } + + public class InteriorServiceImpl : IInteriorService + { + [CustomInterceptor] + public string SayHello() => "Hello Interior!"; + } + public class ExternalServiceImpl : IExternalService + { + private StringBuilder output = new StringBuilder(); + private readonly IInteriorService? _service1; + + public ExternalServiceImpl(IInteriorService service1) : this() + { + _service1 = service1; + output.AppendLine("ExternalServiceImpl(IParentService)"); + } + public ExternalServiceImpl() + { + output.AppendLine("ExternalServiceImpl()"); + } + + [CustomInterceptor] + public string SayHello() + { + output.AppendLine("Hello External!"); + output.AppendLine(_service1?.SayHello()); + return output.ToString(); + } + } + + public class CustomInterceptor : AbstractInterceptorAttribute + { + public override async Task Invoke(AspectContext context, AspectDelegate next) => await context.Invoke(next); + } + + [Fact] + public void ConstructorSelectWithInterceptor_Test() + { + IServiceCollection services = new ServiceCollection(); + services.AddTransient(); + services.AddTransient(); + services.ConfigureDynamicProxy(option => + { + option.Interceptors.AddTyped(); + }); + IServiceProvider serviceProvider = services.BuildDynamicProxyProvider(); + IExternalService service2 = serviceProvider.GetRequiredService(); + string output = service2.SayHello(); + + } + } +} \ No newline at end of file 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 0cddc8ab..795e5eac 100644 --- a/tests/AspectCore.Extensions.Hosting.Tests/AspectCore.Extensions.Hosting.Tests.csproj +++ b/tests/AspectCore.Extensions.Hosting.Tests/AspectCore.Extensions.Hosting.Tests.csproj @@ -6,9 +6,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive 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 b6c9c85f..1bce79a0 100644 --- a/tests/AspectCore.Extensions.LightInject.Test/AspectCore.Extensions.LightInject.Test.csproj +++ b/tests/AspectCore.Extensions.LightInject.Test/AspectCore.Extensions.LightInject.Test.csproj @@ -11,12 +11,12 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + 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 f11018b3..3439bb01 100644 --- a/tests/AspectCore.Extensions.Reflection.Test/AspectCore.Extensions.Reflection.Test.csproj +++ b/tests/AspectCore.Extensions.Reflection.Test/AspectCore.Extensions.Reflection.Test.csproj @@ -22,14 +22,14 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + 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 d7f71219..81181572 100644 --- a/tests/AspectCore.Extensions.Windsor.Test/AspectCore.Extensions.Windsor.Test.csproj +++ b/tests/AspectCore.Extensions.Windsor.Test/AspectCore.Extensions.Windsor.Test.csproj @@ -19,9 +19,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/AspectCore.Tests/AspectCore.Tests.csproj b/tests/AspectCore.Tests/AspectCore.Tests.csproj index c55d691f..15ffebf8 100644 --- a/tests/AspectCore.Tests/AspectCore.Tests.csproj +++ b/tests/AspectCore.Tests/AspectCore.Tests.csproj @@ -17,9 +17,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive From fdba9c626a9e0d32dc02956d4369b2fbfa6f105a Mon Sep 17 00:00:00 2001 From: nivalxer Date: Fri, 29 Nov 2024 17:40:00 +0800 Subject: [PATCH 2/2] 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 @@ + + + +