Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge internal changes #5037

Merged
merged 2 commits into from
Mar 13, 2024
Merged

Merge internal changes #5037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b7015c
Merged PR 37906: Flow 8.0.3 dependencies and prepare repo for 8.3 rel…
joperezr Mar 11, 2024
b25d0d3
Merge internal commits from 'internal/release/8.3'
joperezr Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand All @@ -56,9 +56,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand All @@ -82,7 +82,7 @@
</Dependency>
<Dependency Name="Microsoft.Extensions.Options" Version="8.0.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>1381d5ebd2ab1f292848d5b19b80cf71ac332508</Sha>
<Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Primitives" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down Expand Up @@ -124,49 +124,49 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="8.0.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="System.Text.Json" Version="8.0.3" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>1381d5ebd2ab1f292848d5b19b80cf71ac332508</Sha>
<Sha>9f4b1f5d664afdfc80e1508ab7ed099dff210fbd</Sha>
</Dependency>
<Dependency Name="System.Runtime.Caching" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.2">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644</Sha>
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.2">
<Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644</Sha>
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.2">
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644</Sha>
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.2">
<Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644</Sha>
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.2">
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644</Sha>
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.2">
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644</Sha>
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Features" Version="8.0.2">
<Dependency Name="Microsoft.Extensions.Features" Version="8.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644</Sha>
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Http.Polly" Version="8.0.2">
<Dependency Name="Microsoft.Extensions.Http.Polly" Version="8.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644</Sha>
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.2">
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644</Sha>
<Sha>88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
24 changes: 12 additions & 12 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
<MicrosoftExtensionsConfigurationCommandLineVersion>8.0.0</MicrosoftExtensionsConfigurationCommandLineVersion>
<MicrosoftExtensionsConfigurationJsonVersion>8.0.0</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsConfigurationVersion>8.0.0</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>8.0.0</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>8.0.1</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsDependencyInjectionVersion>8.0.0</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDiagnosticsVersion>8.0.0</MicrosoftExtensionsDiagnosticsVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>8.0.0</MicrosoftExtensionsHostingAbstractionsVersion>
<MicrosoftExtensionsHostingVersion>8.0.0</MicrosoftExtensionsHostingVersion>
<MicrosoftExtensionsHttpVersion>8.0.0</MicrosoftExtensionsHttpVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>8.0.0</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>8.0.1</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConfigurationVersion>8.0.0</MicrosoftExtensionsLoggingConfigurationVersion>
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingVersion>8.0.0</MicrosoftExtensionsLoggingVersion>
Expand All @@ -59,18 +59,18 @@
<SystemSecurityCryptographyPkcsVersion>8.0.0</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>8.0.0</SystemSecurityCryptographyXmlVersion>
<SystemTextEncodingsWebVersion>8.0.0</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>8.0.2</SystemTextJsonVersion>
<SystemTextJsonVersion>8.0.3</SystemTextJsonVersion>
<SystemRuntimeCachingVersion>8.0.0</SystemRuntimeCachingVersion>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64Version>8.0.2</MicrosoftAspNetCoreAppRuntimewinx64Version>
<MicrosoftAspNetCoreMvcTestingVersion>8.0.2</MicrosoftAspNetCoreMvcTestingVersion>
<MicrosoftAspNetCoreTestHostVersion>8.0.2</MicrosoftAspNetCoreTestHostVersion>
<MicrosoftExtensionsCachingStackExchangeRedisVersion>8.0.2</MicrosoftExtensionsCachingStackExchangeRedisVersion>
<MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsVersion>8.0.2</MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsVersion>
<MicrosoftExtensionsDiagnosticsHealthChecksVersion>8.0.2</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
<MicrosoftExtensionsFeaturesVersion>8.0.2</MicrosoftExtensionsFeaturesVersion>
<MicrosoftExtensionsHttpPollyVersion>8.0.2</MicrosoftExtensionsHttpPollyVersion>
<MicrosoftExtensionsObjectPoolVersion>8.0.2</MicrosoftExtensionsObjectPoolVersion>
<MicrosoftAspNetCoreAppRuntimewinx64Version>8.0.3</MicrosoftAspNetCoreAppRuntimewinx64Version>
<MicrosoftAspNetCoreMvcTestingVersion>8.0.3</MicrosoftAspNetCoreMvcTestingVersion>
<MicrosoftAspNetCoreTestHostVersion>8.0.3</MicrosoftAspNetCoreTestHostVersion>
<MicrosoftExtensionsCachingStackExchangeRedisVersion>8.0.3</MicrosoftExtensionsCachingStackExchangeRedisVersion>
<MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsVersion>8.0.3</MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsVersion>
<MicrosoftExtensionsDiagnosticsHealthChecksVersion>8.0.3</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
<MicrosoftExtensionsFeaturesVersion>8.0.3</MicrosoftExtensionsFeaturesVersion>
<MicrosoftExtensionsHttpPollyVersion>8.0.3</MicrosoftExtensionsHttpPollyVersion>
<MicrosoftExtensionsObjectPoolVersion>8.0.3</MicrosoftExtensionsObjectPoolVersion>
</PropertyGroup>
<!--

Expand Down
4 changes: 3 additions & 1 deletion ...xtensions.Http.Resilience.Tests/Resilience/HttpClientBuilderExtensionsTests.Resilience.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@ public void AddResilienceHandler_EnsureServicesNotAddedTwice()
// - Configuration of HTTP client options
// - Configuration of resilience pipeline
// - Registration of keyed service for resilience pipeline
builder.Services.Should().HaveCount(count + 3);
// UPDATE NOTE: Starting from .NET 8.0.2, the count of additional services is 2 instead of 3. This is due to the fact that the registration of the resilience
// pipeline is now done in the `AddResilienceHandler` method.
builder.Services.Should().HaveCount(count + 2);
}

[Fact]
Expand Down