Revert http resilience upgrade (dotnet#2107)

* Revert "Update Microsoft.Extensions.Http.Resilience to 8.2 (dotnet#2094)" This reverts commit 2bf302b. There is a breaking change with Grpc clients in this version. See dotnet/extensions#4924 * Set the EndToEnd test HttpClient timeout to infinite This allows the Http.Resilience handlers to handle the timeout correctly.
radical · Feb 7, 2024 · 2374f76 · 2374f76
1 parent 2ff25d2
commit 2374f76
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -29,9 +29,9 @@
       <Uri>https://github.com/microsoft/usvc-apiserver</Uri>
       <Sha>f23c6b82666380446b0b78993b88df03d5f29925</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http.Resilience" Version="8.2.0-preview.24105.1">
+    <Dependency Name="Microsoft.Extensions.Http.Resilience" Version="8.1.0">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
-      <Sha>31f4d22bda2231ffa05d85e40208cc02170bf367</Sha>
+      <Sha>c63655a995fb1dfc8b8fd9cf149d5e6ad225a185</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -24,7 +24,7 @@
     <MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.24081.5</MicrosoftDotNetXUnitExtensionsPackageVersion>
     <MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.24081.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
     <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.24081.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
-    <MicrosoftExtensionsHttpResiliencePackageVersion>8.2.0-preview.24105.1</MicrosoftExtensionsHttpResiliencePackageVersion>
+    <MicrosoftExtensionsHttpResiliencePackageVersion>8.1.0</MicrosoftExtensionsHttpResiliencePackageVersion>
     <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>8.0.0</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
     <MicrosoftExtensionsConfigurationBinderPackageVersion>8.0.1</MicrosoftExtensionsConfigurationBinderPackageVersion>
     <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>8.0.0</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>

diff --git a/tests/Aspire.EndToEnd.Tests/IntegrationServicesFixture.cs b/tests/Aspire.EndToEnd.Tests/IntegrationServicesFixture.cs
@@ -144,6 +144,12 @@ private static HttpClient CreateHttpClient()
         services.AddHttpClient()
             .ConfigureHttpClientDefaults(b =>
             {
+                b.ConfigureHttpClient(client =>
+                {
+                    // Disable the HttpClient timeout to allow the timeout strategies to control the timeout.
+                    client.Timeout = Timeout.InfiniteTimeSpan;
+                });
+
                 b.UseSocketsHttpHandler((handler, sp) =>
                 {
                     handler.PooledConnectionLifetime = TimeSpan.FromSeconds(5);