Merge branch 'develop'

Author: devlead

src/Devlead.Testing.MockHttp.Tests/Unit/HttpClientTests.cs

@@ -92,13 +92,8 @@ public async Task Send(params string[] methods)
             // When
             var result = await methods
                             .ToAsyncEnumerable()
-#if NET10_0_OR_GREATER
                             .Select(
                                 async (method, _, _)
-#else
-                            .SelectAwait(
-                                async method 
-#endif
                                     => await httpClient.SendAsync(
                                                     new HttpRequestMessage(
                                                         new HttpMethod(method),

src/Devlead.Testing.MockHttp/IServiceCollectionExtensions.cs

@@ -11,9 +11,11 @@ public static IServiceCollection AddMockHttpClient<T>(
         this IServiceCollection services
         )
     {
+        services.AddSingleton(Routes<T>.GetResponseBuilder);
+
         static MockHttpClient CreateClient(IServiceProvider provider)
         {
-            var client = new MockHttpClient(Routes<T>.GetResponseBuilder(provider));
+            var client = new MockHttpClient(provider.GetRequiredService<Func<HttpRequestMessage, HttpResponseMessage>>());
             foreach(var service in provider.GetServices<ConfigureHttpClient<T>>())
             {
                 service?.Invoke(client);
@@ -22,7 +24,7 @@ static MockHttpClient CreateClient(IServiceProvider provider)
         }
 
         static MockHttpMessageHandlerFactory CreateHttpMessageHandlerFactory(IServiceProvider provider)
-            => new(Routes<T>.GetResponseBuilder(provider));
+            => new(provider.GetRequiredService<Func<HttpRequestMessage, HttpResponseMessage>>());
 
         return services
             .AddTransient<HttpClient>(provider => provider.GetRequiredService<MockHttpClient>())

src/Directory.Packages.props

@@ -17,7 +17,7 @@
     <PackageVersion Include="NUnit" Version="4.4.0" />
     <PackageVersion Include="NUnit.Analyzers" Version="4.11.2" />
     <PackageVersion Include="NUnit3TestAdapter" Version="5.2.0" />
-    <PackageVersion Include="System.Linq.Async" Version="6.0.3" />
+    <PackageVersion Include="System.Linq.Async" Version="7.0.0" />
     <PackageVersion Include="Verify.NUnit" Version="31.7.2" />
     <PackageVersion Include="Verify.Http" Version="7.5.0" />
     <PackageVersion Include="System.Text.Json" Version="9.0.11" />