From a55105bae70409dfc07378be55706de3255fdd11 Mon Sep 17 00:00:00 2001 From: Stuart Turner Date: Mon, 17 Aug 2026 18:11:34 -0500 Subject: [PATCH] Update dependencies --- .editorconfig | 2 + Directory.Packages.props | 60 +++++++++---------- .../Immediate.Apis.CodeFixes.csproj | 2 +- src/Immediate.Apis/Immediate.Apis.csproj | 3 +- ....ServiceCollectionExtensions.g.verified.cs | 8 --- ....ServiceCollectionExtensions.g.verified.cs | 8 --- ....ServiceCollectionExtensions.g.verified.cs | 8 --- ....ServiceCollectionExtensions.g.verified.cs | 8 --- ...10.0#IH.Dummy.GetUsersQuery1.g.verified.cs | 31 +++++++++- ...10.0#IH.Dummy.GetUsersQuery2.g.verified.cs | 31 +++++++++- ....ServiceCollectionExtensions.g.verified.cs | 8 --- ...11.0#IH.Dummy.GetUsersQuery1.g.verified.cs | 31 +++++++++- ...11.0#IH.Dummy.GetUsersQuery2.g.verified.cs | 31 +++++++++- ....ServiceCollectionExtensions.g.verified.cs | 8 --- ...t8.0#IH.Dummy.GetUsersQuery1.g.verified.cs | 31 +++++++++- ...t8.0#IH.Dummy.GetUsersQuery2.g.verified.cs | 31 +++++++++- ....ServiceCollectionExtensions.g.verified.cs | 8 --- ...t9.0#IH.Dummy.GetUsersQuery1.g.verified.cs | 31 +++++++++- ...t9.0#IH.Dummy.GetUsersQuery2.g.verified.cs | 31 +++++++++- ....ServiceCollectionExtensions.g.verified.cs | 8 --- ...t10.0#IH.Dummy.GetUsersQuery.g.verified.cs | 41 +++++++++++-- ....ServiceCollectionExtensions.g.verified.cs | 8 --- ...t11.0#IH.Dummy.GetUsersQuery.g.verified.cs | 41 +++++++++++-- ....ServiceCollectionExtensions.g.verified.cs | 8 --- ...et8.0#IH.Dummy.GetUsersQuery.g.verified.cs | 41 +++++++++++-- ....ServiceCollectionExtensions.g.verified.cs | 8 --- ...et9.0#IH.Dummy.GetUsersQuery.g.verified.cs | 41 +++++++++++-- ....ServiceCollectionExtensions.g.verified.cs | 8 --- .../Immediate.Apis.Tests.csproj | 2 + .../Immediate.Apis.Tests/ModuleInitializer.cs | 4 ++ tests/Immediate.Apis.Tests/Utility.cs | 2 +- 31 files changed, 414 insertions(+), 169 deletions(-) diff --git a/.editorconfig b/.editorconfig index 03b99f3..a843812 100644 --- a/.editorconfig +++ b/.editorconfig @@ -333,6 +333,8 @@ dotnet_diagnostic.CS1712.severity = error # CS1712: Type parameter dotnet_diagnostic.CA1822.severity = none # CA1822: Mark members as static +dotnet_diagnostic.MA0002.severity = none # MA0002: IEqualityComparer or IComparer is missing + [tests/*.g.verified.cs] # Mark code as excluded and generated diff --git a/Directory.Packages.props b/Directory.Packages.props index 84e4d00..853c47d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,46 +5,46 @@ - - + + - - - + + + - - + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - + + @@ -52,10 +52,10 @@ - - - - + + + + @@ -88,8 +88,8 @@ - - + + diff --git a/src/Immediate.Apis.CodeFixes/Immediate.Apis.CodeFixes.csproj b/src/Immediate.Apis.CodeFixes/Immediate.Apis.CodeFixes.csproj index 3bcf0ce..5a61a5d 100644 --- a/src/Immediate.Apis.CodeFixes/Immediate.Apis.CodeFixes.csproj +++ b/src/Immediate.Apis.CodeFixes/Immediate.Apis.CodeFixes.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net10.0 + netstandard2.0 true true diff --git a/src/Immediate.Apis/Immediate.Apis.csproj b/src/Immediate.Apis/Immediate.Apis.csproj index 7c0def0..e4fd5a7 100644 --- a/src/Immediate.Apis/Immediate.Apis.csproj +++ b/src/Immediate.Apis/Immediate.Apis.csproj @@ -68,8 +68,9 @@ Pack="true" PackagePath="analyzers/dotnet/roslyn5.0/cs" /> + diff --git a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/MapEndpointsTests.ValidAddServicesMethod_framework=net10.0#IH.ServiceCollectionExtensions.g.verified.cs b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/MapEndpointsTests.ValidAddServicesMethod_framework=net10.0#IH.ServiceCollectionExtensions.g.verified.cs index 0e41bc2..7df2c97 100644 --- a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/MapEndpointsTests.ValidAddServicesMethod_framework=net10.0#IH.ServiceCollectionExtensions.g.verified.cs +++ b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/MapEndpointsTests.ValidAddServicesMethod_framework=net10.0#IH.ServiceCollectionExtensions.g.verified.cs @@ -8,14 +8,6 @@ namespace Immediate.Apis.Testing; public static class HandlerServiceCollectionExtensions { - public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsBehaviors( - this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services - ) - { - - return services; - } - public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsHandlers( this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped, diff --git a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/MapEndpointsTests.ValidAddServicesMethod_framework=net11.0#IH.ServiceCollectionExtensions.g.verified.cs b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/MapEndpointsTests.ValidAddServicesMethod_framework=net11.0#IH.ServiceCollectionExtensions.g.verified.cs index 0e41bc2..7df2c97 100644 --- a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/MapEndpointsTests.ValidAddServicesMethod_framework=net11.0#IH.ServiceCollectionExtensions.g.verified.cs +++ b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/MapEndpointsTests.ValidAddServicesMethod_framework=net11.0#IH.ServiceCollectionExtensions.g.verified.cs @@ -8,14 +8,6 @@ namespace Immediate.Apis.Testing; public static class HandlerServiceCollectionExtensions { - public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsBehaviors( - this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services - ) - { - - return services; - } - public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsHandlers( this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped, diff --git a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/MapEndpointsTests.ValidAddServicesMethod_framework=net8.0#IH.ServiceCollectionExtensions.g.verified.cs b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/MapEndpointsTests.ValidAddServicesMethod_framework=net8.0#IH.ServiceCollectionExtensions.g.verified.cs index 4666de0..b54d0dc 100644 --- a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/MapEndpointsTests.ValidAddServicesMethod_framework=net8.0#IH.ServiceCollectionExtensions.g.verified.cs +++ b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/MapEndpointsTests.ValidAddServicesMethod_framework=net8.0#IH.ServiceCollectionExtensions.g.verified.cs @@ -8,14 +8,6 @@ namespace Immediate.Apis.Testing; public static class HandlerServiceCollectionExtensions { - public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsBehaviors( - this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services - ) - { - - return services; - } - public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsHandlers( this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped, diff --git a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/MapEndpointsTests.ValidAddServicesMethod_framework=net9.0#IH.ServiceCollectionExtensions.g.verified.cs b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/MapEndpointsTests.ValidAddServicesMethod_framework=net9.0#IH.ServiceCollectionExtensions.g.verified.cs index 0e41bc2..7df2c97 100644 --- a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/MapEndpointsTests.ValidAddServicesMethod_framework=net9.0#IH.ServiceCollectionExtensions.g.verified.cs +++ b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/MapEndpointsTests.ValidAddServicesMethod_framework=net9.0#IH.ServiceCollectionExtensions.g.verified.cs @@ -8,14 +8,6 @@ namespace Immediate.Apis.Testing; public static class HandlerServiceCollectionExtensions { - public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsBehaviors( - this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services - ) - { - - return services; - } - public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsHandlers( this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped, diff --git a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net10.0#IH.Dummy.GetUsersQuery1.g.verified.cs b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net10.0#IH.Dummy.GetUsersQuery1.g.verified.cs index 494bb33..65d0f21 100644 --- a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net10.0#IH.Dummy.GetUsersQuery1.g.verified.cs +++ b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net10.0#IH.Dummy.GetUsersQuery1.g.verified.cs @@ -62,9 +62,34 @@ public HandleBehavior( global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped ) { - services.Add(new(typeof(global::Dummy.GetUsersQuery1.Handler), typeof(global::Dummy.GetUsersQuery1.Handler), lifetime)); - services.Add(new(typeof(global::Immediate.Handlers.Shared.IHandler), typeof(global::Dummy.GetUsersQuery1.Handler), lifetime)); - services.Add(new(typeof(global::Dummy.GetUsersQuery1.HandleBehavior), typeof(global::Dummy.GetUsersQuery1.HandleBehavior), lifetime)); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery1.Handler), + typeof(global::Dummy.GetUsersQuery1.Handler), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Immediate.Handlers.Shared.IHandler), + typeof(global::Dummy.GetUsersQuery1.Handler), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery1.HandleBehavior), + typeof(global::Dummy.GetUsersQuery1.HandleBehavior), + lifetime + ) + ); + return services; } } diff --git a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net10.0#IH.Dummy.GetUsersQuery2.g.verified.cs b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net10.0#IH.Dummy.GetUsersQuery2.g.verified.cs index c3a4c3c..206f1ea 100644 --- a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net10.0#IH.Dummy.GetUsersQuery2.g.verified.cs +++ b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net10.0#IH.Dummy.GetUsersQuery2.g.verified.cs @@ -62,9 +62,34 @@ public HandleBehavior( global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped ) { - services.Add(new(typeof(global::Dummy.GetUsersQuery2.Handler), typeof(global::Dummy.GetUsersQuery2.Handler), lifetime)); - services.Add(new(typeof(global::Immediate.Handlers.Shared.IHandler), typeof(global::Dummy.GetUsersQuery2.Handler), lifetime)); - services.Add(new(typeof(global::Dummy.GetUsersQuery2.HandleBehavior), typeof(global::Dummy.GetUsersQuery2.HandleBehavior), lifetime)); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery2.Handler), + typeof(global::Dummy.GetUsersQuery2.Handler), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Immediate.Handlers.Shared.IHandler), + typeof(global::Dummy.GetUsersQuery2.Handler), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery2.HandleBehavior), + typeof(global::Dummy.GetUsersQuery2.HandleBehavior), + lifetime + ) + ); + return services; } } diff --git a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net10.0#IH.ServiceCollectionExtensions.g.verified.cs b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net10.0#IH.ServiceCollectionExtensions.g.verified.cs index a81509f..9dfd75c 100644 --- a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net10.0#IH.ServiceCollectionExtensions.g.verified.cs +++ b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net10.0#IH.ServiceCollectionExtensions.g.verified.cs @@ -8,14 +8,6 @@ namespace Immediate.Apis.Testing; public static class HandlerServiceCollectionExtensions { - public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsBehaviors( - this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services - ) - { - - return services; - } - public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsHandlers( this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped, diff --git a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net11.0#IH.Dummy.GetUsersQuery1.g.verified.cs b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net11.0#IH.Dummy.GetUsersQuery1.g.verified.cs index 494bb33..65d0f21 100644 --- a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net11.0#IH.Dummy.GetUsersQuery1.g.verified.cs +++ b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net11.0#IH.Dummy.GetUsersQuery1.g.verified.cs @@ -62,9 +62,34 @@ public HandleBehavior( global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped ) { - services.Add(new(typeof(global::Dummy.GetUsersQuery1.Handler), typeof(global::Dummy.GetUsersQuery1.Handler), lifetime)); - services.Add(new(typeof(global::Immediate.Handlers.Shared.IHandler), typeof(global::Dummy.GetUsersQuery1.Handler), lifetime)); - services.Add(new(typeof(global::Dummy.GetUsersQuery1.HandleBehavior), typeof(global::Dummy.GetUsersQuery1.HandleBehavior), lifetime)); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery1.Handler), + typeof(global::Dummy.GetUsersQuery1.Handler), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Immediate.Handlers.Shared.IHandler), + typeof(global::Dummy.GetUsersQuery1.Handler), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery1.HandleBehavior), + typeof(global::Dummy.GetUsersQuery1.HandleBehavior), + lifetime + ) + ); + return services; } } diff --git a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net11.0#IH.Dummy.GetUsersQuery2.g.verified.cs b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net11.0#IH.Dummy.GetUsersQuery2.g.verified.cs index c3a4c3c..206f1ea 100644 --- a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net11.0#IH.Dummy.GetUsersQuery2.g.verified.cs +++ b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net11.0#IH.Dummy.GetUsersQuery2.g.verified.cs @@ -62,9 +62,34 @@ public HandleBehavior( global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped ) { - services.Add(new(typeof(global::Dummy.GetUsersQuery2.Handler), typeof(global::Dummy.GetUsersQuery2.Handler), lifetime)); - services.Add(new(typeof(global::Immediate.Handlers.Shared.IHandler), typeof(global::Dummy.GetUsersQuery2.Handler), lifetime)); - services.Add(new(typeof(global::Dummy.GetUsersQuery2.HandleBehavior), typeof(global::Dummy.GetUsersQuery2.HandleBehavior), lifetime)); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery2.Handler), + typeof(global::Dummy.GetUsersQuery2.Handler), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Immediate.Handlers.Shared.IHandler), + typeof(global::Dummy.GetUsersQuery2.Handler), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery2.HandleBehavior), + typeof(global::Dummy.GetUsersQuery2.HandleBehavior), + lifetime + ) + ); + return services; } } diff --git a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net11.0#IH.ServiceCollectionExtensions.g.verified.cs b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net11.0#IH.ServiceCollectionExtensions.g.verified.cs index a81509f..9dfd75c 100644 --- a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net11.0#IH.ServiceCollectionExtensions.g.verified.cs +++ b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net11.0#IH.ServiceCollectionExtensions.g.verified.cs @@ -8,14 +8,6 @@ namespace Immediate.Apis.Testing; public static class HandlerServiceCollectionExtensions { - public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsBehaviors( - this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services - ) - { - - return services; - } - public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsHandlers( this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped, diff --git a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net8.0#IH.Dummy.GetUsersQuery1.g.verified.cs b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net8.0#IH.Dummy.GetUsersQuery1.g.verified.cs index 494bb33..65d0f21 100644 --- a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net8.0#IH.Dummy.GetUsersQuery1.g.verified.cs +++ b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net8.0#IH.Dummy.GetUsersQuery1.g.verified.cs @@ -62,9 +62,34 @@ public HandleBehavior( global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped ) { - services.Add(new(typeof(global::Dummy.GetUsersQuery1.Handler), typeof(global::Dummy.GetUsersQuery1.Handler), lifetime)); - services.Add(new(typeof(global::Immediate.Handlers.Shared.IHandler), typeof(global::Dummy.GetUsersQuery1.Handler), lifetime)); - services.Add(new(typeof(global::Dummy.GetUsersQuery1.HandleBehavior), typeof(global::Dummy.GetUsersQuery1.HandleBehavior), lifetime)); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery1.Handler), + typeof(global::Dummy.GetUsersQuery1.Handler), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Immediate.Handlers.Shared.IHandler), + typeof(global::Dummy.GetUsersQuery1.Handler), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery1.HandleBehavior), + typeof(global::Dummy.GetUsersQuery1.HandleBehavior), + lifetime + ) + ); + return services; } } diff --git a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net8.0#IH.Dummy.GetUsersQuery2.g.verified.cs b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net8.0#IH.Dummy.GetUsersQuery2.g.verified.cs index c3a4c3c..206f1ea 100644 --- a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net8.0#IH.Dummy.GetUsersQuery2.g.verified.cs +++ b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net8.0#IH.Dummy.GetUsersQuery2.g.verified.cs @@ -62,9 +62,34 @@ public HandleBehavior( global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped ) { - services.Add(new(typeof(global::Dummy.GetUsersQuery2.Handler), typeof(global::Dummy.GetUsersQuery2.Handler), lifetime)); - services.Add(new(typeof(global::Immediate.Handlers.Shared.IHandler), typeof(global::Dummy.GetUsersQuery2.Handler), lifetime)); - services.Add(new(typeof(global::Dummy.GetUsersQuery2.HandleBehavior), typeof(global::Dummy.GetUsersQuery2.HandleBehavior), lifetime)); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery2.Handler), + typeof(global::Dummy.GetUsersQuery2.Handler), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Immediate.Handlers.Shared.IHandler), + typeof(global::Dummy.GetUsersQuery2.Handler), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery2.HandleBehavior), + typeof(global::Dummy.GetUsersQuery2.HandleBehavior), + lifetime + ) + ); + return services; } } diff --git a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net8.0#IH.ServiceCollectionExtensions.g.verified.cs b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net8.0#IH.ServiceCollectionExtensions.g.verified.cs index ec3f758..2096eb2 100644 --- a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net8.0#IH.ServiceCollectionExtensions.g.verified.cs +++ b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net8.0#IH.ServiceCollectionExtensions.g.verified.cs @@ -8,14 +8,6 @@ namespace Immediate.Apis.Testing; public static class HandlerServiceCollectionExtensions { - public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsBehaviors( - this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services - ) - { - - return services; - } - public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsHandlers( this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped, diff --git a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net9.0#IH.Dummy.GetUsersQuery1.g.verified.cs b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net9.0#IH.Dummy.GetUsersQuery1.g.verified.cs index 494bb33..65d0f21 100644 --- a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net9.0#IH.Dummy.GetUsersQuery1.g.verified.cs +++ b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net9.0#IH.Dummy.GetUsersQuery1.g.verified.cs @@ -62,9 +62,34 @@ public HandleBehavior( global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped ) { - services.Add(new(typeof(global::Dummy.GetUsersQuery1.Handler), typeof(global::Dummy.GetUsersQuery1.Handler), lifetime)); - services.Add(new(typeof(global::Immediate.Handlers.Shared.IHandler), typeof(global::Dummy.GetUsersQuery1.Handler), lifetime)); - services.Add(new(typeof(global::Dummy.GetUsersQuery1.HandleBehavior), typeof(global::Dummy.GetUsersQuery1.HandleBehavior), lifetime)); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery1.Handler), + typeof(global::Dummy.GetUsersQuery1.Handler), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Immediate.Handlers.Shared.IHandler), + typeof(global::Dummy.GetUsersQuery1.Handler), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery1.HandleBehavior), + typeof(global::Dummy.GetUsersQuery1.HandleBehavior), + lifetime + ) + ); + return services; } } diff --git a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net9.0#IH.Dummy.GetUsersQuery2.g.verified.cs b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net9.0#IH.Dummy.GetUsersQuery2.g.verified.cs index c3a4c3c..206f1ea 100644 --- a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net9.0#IH.Dummy.GetUsersQuery2.g.verified.cs +++ b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net9.0#IH.Dummy.GetUsersQuery2.g.verified.cs @@ -62,9 +62,34 @@ public HandleBehavior( global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped ) { - services.Add(new(typeof(global::Dummy.GetUsersQuery2.Handler), typeof(global::Dummy.GetUsersQuery2.Handler), lifetime)); - services.Add(new(typeof(global::Immediate.Handlers.Shared.IHandler), typeof(global::Dummy.GetUsersQuery2.Handler), lifetime)); - services.Add(new(typeof(global::Dummy.GetUsersQuery2.HandleBehavior), typeof(global::Dummy.GetUsersQuery2.HandleBehavior), lifetime)); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery2.Handler), + typeof(global::Dummy.GetUsersQuery2.Handler), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Immediate.Handlers.Shared.IHandler), + typeof(global::Dummy.GetUsersQuery2.Handler), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery2.HandleBehavior), + typeof(global::Dummy.GetUsersQuery2.HandleBehavior), + lifetime + ) + ); + return services; } } diff --git a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net9.0#IH.ServiceCollectionExtensions.g.verified.cs b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net9.0#IH.ServiceCollectionExtensions.g.verified.cs index a81509f..9dfd75c 100644 --- a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net9.0#IH.ServiceCollectionExtensions.g.verified.cs +++ b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/RouteGroupTests.TaggedRouteGroupTest_framework=net9.0#IH.ServiceCollectionExtensions.g.verified.cs @@ -8,14 +8,6 @@ namespace Immediate.Apis.Testing; public static class HandlerServiceCollectionExtensions { - public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsBehaviors( - this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services - ) - { - - return services; - } - public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsHandlers( this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped, diff --git a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net10.0#IH.Dummy.GetUsersQuery.g.verified.cs b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net10.0#IH.Dummy.GetUsersQuery.g.verified.cs index 0aef8ca..7407b27 100644 --- a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net10.0#IH.Dummy.GetUsersQuery.g.verified.cs +++ b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net10.0#IH.Dummy.GetUsersQuery.g.verified.cs @@ -65,10 +65,43 @@ public HandleBehavior( global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped ) { - services.Add(new(typeof(global::Dummy.GetUsersQuery.Handler), typeof(global::Dummy.GetUsersQuery.Handler), lifetime)); - services.Add(new(typeof(global::Immediate.Handlers.Shared.IHandler), typeof(global::Dummy.GetUsersQuery.Handler), lifetime)); - services.Add(new(typeof(global::Dummy.GetUsersQuery.HandleBehavior), typeof(global::Dummy.GetUsersQuery.HandleBehavior), lifetime)); - services.Add(new(typeof(global::Dummy.GetUsersQuery), typeof(global::Dummy.GetUsersQuery), lifetime)); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery.Handler), + typeof(global::Dummy.GetUsersQuery.Handler), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Immediate.Handlers.Shared.IHandler), + typeof(global::Dummy.GetUsersQuery.Handler), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery.HandleBehavior), + typeof(global::Dummy.GetUsersQuery.HandleBehavior), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery), + typeof(global::Dummy.GetUsersQuery), + lifetime + ) + ); + return services; } } diff --git a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net10.0#IH.ServiceCollectionExtensions.g.verified.cs b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net10.0#IH.ServiceCollectionExtensions.g.verified.cs index f425dd4..f23c552 100644 --- a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net10.0#IH.ServiceCollectionExtensions.g.verified.cs +++ b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net10.0#IH.ServiceCollectionExtensions.g.verified.cs @@ -8,14 +8,6 @@ namespace Immediate.Apis.Testing; public static class HandlerServiceCollectionExtensions { - public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsBehaviors( - this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services - ) - { - - return services; - } - public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsHandlers( this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped, diff --git a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net11.0#IH.Dummy.GetUsersQuery.g.verified.cs b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net11.0#IH.Dummy.GetUsersQuery.g.verified.cs index 0aef8ca..7407b27 100644 --- a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net11.0#IH.Dummy.GetUsersQuery.g.verified.cs +++ b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net11.0#IH.Dummy.GetUsersQuery.g.verified.cs @@ -65,10 +65,43 @@ public HandleBehavior( global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped ) { - services.Add(new(typeof(global::Dummy.GetUsersQuery.Handler), typeof(global::Dummy.GetUsersQuery.Handler), lifetime)); - services.Add(new(typeof(global::Immediate.Handlers.Shared.IHandler), typeof(global::Dummy.GetUsersQuery.Handler), lifetime)); - services.Add(new(typeof(global::Dummy.GetUsersQuery.HandleBehavior), typeof(global::Dummy.GetUsersQuery.HandleBehavior), lifetime)); - services.Add(new(typeof(global::Dummy.GetUsersQuery), typeof(global::Dummy.GetUsersQuery), lifetime)); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery.Handler), + typeof(global::Dummy.GetUsersQuery.Handler), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Immediate.Handlers.Shared.IHandler), + typeof(global::Dummy.GetUsersQuery.Handler), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery.HandleBehavior), + typeof(global::Dummy.GetUsersQuery.HandleBehavior), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery), + typeof(global::Dummy.GetUsersQuery), + lifetime + ) + ); + return services; } } diff --git a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net11.0#IH.ServiceCollectionExtensions.g.verified.cs b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net11.0#IH.ServiceCollectionExtensions.g.verified.cs index f425dd4..f23c552 100644 --- a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net11.0#IH.ServiceCollectionExtensions.g.verified.cs +++ b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net11.0#IH.ServiceCollectionExtensions.g.verified.cs @@ -8,14 +8,6 @@ namespace Immediate.Apis.Testing; public static class HandlerServiceCollectionExtensions { - public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsBehaviors( - this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services - ) - { - - return services; - } - public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsHandlers( this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped, diff --git a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net8.0#IH.Dummy.GetUsersQuery.g.verified.cs b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net8.0#IH.Dummy.GetUsersQuery.g.verified.cs index 0aef8ca..7407b27 100644 --- a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net8.0#IH.Dummy.GetUsersQuery.g.verified.cs +++ b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net8.0#IH.Dummy.GetUsersQuery.g.verified.cs @@ -65,10 +65,43 @@ public HandleBehavior( global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped ) { - services.Add(new(typeof(global::Dummy.GetUsersQuery.Handler), typeof(global::Dummy.GetUsersQuery.Handler), lifetime)); - services.Add(new(typeof(global::Immediate.Handlers.Shared.IHandler), typeof(global::Dummy.GetUsersQuery.Handler), lifetime)); - services.Add(new(typeof(global::Dummy.GetUsersQuery.HandleBehavior), typeof(global::Dummy.GetUsersQuery.HandleBehavior), lifetime)); - services.Add(new(typeof(global::Dummy.GetUsersQuery), typeof(global::Dummy.GetUsersQuery), lifetime)); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery.Handler), + typeof(global::Dummy.GetUsersQuery.Handler), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Immediate.Handlers.Shared.IHandler), + typeof(global::Dummy.GetUsersQuery.Handler), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery.HandleBehavior), + typeof(global::Dummy.GetUsersQuery.HandleBehavior), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery), + typeof(global::Dummy.GetUsersQuery), + lifetime + ) + ); + return services; } } diff --git a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net8.0#IH.ServiceCollectionExtensions.g.verified.cs b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net8.0#IH.ServiceCollectionExtensions.g.verified.cs index 7a11cec..a1cc808 100644 --- a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net8.0#IH.ServiceCollectionExtensions.g.verified.cs +++ b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net8.0#IH.ServiceCollectionExtensions.g.verified.cs @@ -8,14 +8,6 @@ namespace Immediate.Apis.Testing; public static class HandlerServiceCollectionExtensions { - public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsBehaviors( - this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services - ) - { - - return services; - } - public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsHandlers( this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped, diff --git a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net9.0#IH.Dummy.GetUsersQuery.g.verified.cs b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net9.0#IH.Dummy.GetUsersQuery.g.verified.cs index 0aef8ca..7407b27 100644 --- a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net9.0#IH.Dummy.GetUsersQuery.g.verified.cs +++ b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net9.0#IH.Dummy.GetUsersQuery.g.verified.cs @@ -65,10 +65,43 @@ public HandleBehavior( global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped ) { - services.Add(new(typeof(global::Dummy.GetUsersQuery.Handler), typeof(global::Dummy.GetUsersQuery.Handler), lifetime)); - services.Add(new(typeof(global::Immediate.Handlers.Shared.IHandler), typeof(global::Dummy.GetUsersQuery.Handler), lifetime)); - services.Add(new(typeof(global::Dummy.GetUsersQuery.HandleBehavior), typeof(global::Dummy.GetUsersQuery.HandleBehavior), lifetime)); - services.Add(new(typeof(global::Dummy.GetUsersQuery), typeof(global::Dummy.GetUsersQuery), lifetime)); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery.Handler), + typeof(global::Dummy.GetUsersQuery.Handler), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Immediate.Handlers.Shared.IHandler), + typeof(global::Dummy.GetUsersQuery.Handler), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery.HandleBehavior), + typeof(global::Dummy.GetUsersQuery.HandleBehavior), + lifetime + ) + ); + + global::Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAdd( + services, + global::Microsoft.Extensions.DependencyInjection.ServiceDescriptor.Describe( + typeof(global::Dummy.GetUsersQuery), + typeof(global::Dummy.GetUsersQuery), + lifetime + ) + ); + return services; } } diff --git a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net9.0#IH.ServiceCollectionExtensions.g.verified.cs b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net9.0#IH.ServiceCollectionExtensions.g.verified.cs index f425dd4..f23c552 100644 --- a/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net9.0#IH.ServiceCollectionExtensions.g.verified.cs +++ b/tests/Immediate.Apis.Tests/GeneratorTests/Snapshots/SimpleApiTests.MapMethodTagsTest_framework=net9.0#IH.ServiceCollectionExtensions.g.verified.cs @@ -8,14 +8,6 @@ namespace Immediate.Apis.Testing; public static class HandlerServiceCollectionExtensions { - public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsBehaviors( - this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services - ) - { - - return services; - } - public static global::Microsoft.Extensions.DependencyInjection.IServiceCollection AddTestsHandlers( this global::Microsoft.Extensions.DependencyInjection.IServiceCollection services, global::Microsoft.Extensions.DependencyInjection.ServiceLifetime lifetime = global::Microsoft.Extensions.DependencyInjection.ServiceLifetime.Scoped, diff --git a/tests/Immediate.Apis.Tests/Immediate.Apis.Tests.csproj b/tests/Immediate.Apis.Tests/Immediate.Apis.Tests.csproj index 5cbf6bc..81dfdd2 100644 --- a/tests/Immediate.Apis.Tests/Immediate.Apis.Tests.csproj +++ b/tests/Immediate.Apis.Tests/Immediate.Apis.Tests.csproj @@ -2,6 +2,8 @@ Exe + + $(NoWarn);NU1603 diff --git a/tests/Immediate.Apis.Tests/ModuleInitializer.cs b/tests/Immediate.Apis.Tests/ModuleInitializer.cs index 6db425c..883ff27 100644 --- a/tests/Immediate.Apis.Tests/ModuleInitializer.cs +++ b/tests/Immediate.Apis.Tests/ModuleInitializer.cs @@ -1,4 +1,8 @@ using System.Runtime.CompilerServices; +using Xunit.Sdk; +using Xunit.v3; + +[assembly: Parallelization(Mode = ParallelMode.All)] namespace Immediate.Apis.Tests; diff --git a/tests/Immediate.Apis.Tests/Utility.cs b/tests/Immediate.Apis.Tests/Utility.cs index f4ed6f1..e642747 100644 --- a/tests/Immediate.Apis.Tests/Utility.cs +++ b/tests/Immediate.Apis.Tests/Utility.cs @@ -32,7 +32,7 @@ internal static partial class Utility "net11.0", new PackageIdentity( "Microsoft.NETCore.App.Ref", - "11.0.0-preview.6.26359.118" + "11.0.0-preview.7.26381.103" ), Path.Combine("ref", "net11.0") );