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 changes from internal branch #5219

Merged
merged 3 commits into from
Jun 12, 2024
Merged

Merge changes from internal branch #5219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad11dd7
Merged PR 40267: Preparing for 8.6 release
joperezr Jun 11, 2024
7843c7b
Merged PR 40274: Fix minor version
joperezr Jun 11, 2024
46bbfb6
Merge changes from internal branch
joperezr Jun 11, 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
34 changes: 17 additions & 17 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>bf5e279d9239bfef5bb1b8d6212f1b971c434606</Sha>
<Sha>63d80966a9f0d15e057d0d146702405b19c82533</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" 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 @@ -98,7 +98,7 @@
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="8.0.1" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>087e15321bb712ef6fe8b0ba6f8bd12facf92629</Sha>
<Sha>63d80966a9f0d15e057d0d146702405b19c82533</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand All @@ -108,33 +108,33 @@
<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.5">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>c9e3996173cec136bc2e9f3b4ec45f2a323b1d63</Sha>
<Sha>714a9761f995103a6cdf21a7c41041740293bae9</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.5">
<Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>c9e3996173cec136bc2e9f3b4ec45f2a323b1d63</Sha>
<Sha>714a9761f995103a6cdf21a7c41041740293bae9</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.5">
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>c9e3996173cec136bc2e9f3b4ec45f2a323b1d63</Sha>
<Sha>714a9761f995103a6cdf21a7c41041740293bae9</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.5">
<Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>c9e3996173cec136bc2e9f3b4ec45f2a323b1d63</Sha>
<Sha>714a9761f995103a6cdf21a7c41041740293bae9</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.5">
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>c9e3996173cec136bc2e9f3b4ec45f2a323b1d63</Sha>
<Sha>714a9761f995103a6cdf21a7c41041740293bae9</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Http.Polly" Version="8.0.5">
<Dependency Name="Microsoft.Extensions.Http.Polly" Version="8.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>c9e3996173cec136bc2e9f3b4ec45f2a323b1d63</Sha>
<Sha>714a9761f995103a6cdf21a7c41041740293bae9</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.5">
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>c9e3996173cec136bc2e9f3b4ec45f2a323b1d63</Sha>
<Sha>714a9761f995103a6cdf21a7c41041740293bae9</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
9 changes: 8 additions & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
<MicrosoftExtensionsCachingMemoryVersion>8.0.0</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>8.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationBinderVersion>8.0.1</MicrosoftExtensionsConfigurationBinderVersion>
<MicrosoftExtensionsConfigurationCommandLineVersion>8.0.0</MicrosoftExtensionsConfigurationCommandLineVersion>
<MicrosoftExtensionsConfigurationJsonVersion>8.0.0</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsConfigurationVersion>8.0.0</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>8.0.1</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
Expand All @@ -46,22 +47,28 @@
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingVersion>8.0.0</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>8.0.0</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
<MicrosoftExtensionsOptionsDataAnnotationsVersion>8.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>8.0.2</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>8.0.0</MicrosoftExtensionsPrimitivesVersion>
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
<SystemConfigurationConfigurationManagerVersion>8.0.0</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsDiagnosticSourceVersion>8.0.1</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsPerformanceCounterVersion>8.0.0</SystemDiagnosticsPerformanceCounterVersion>
<SystemIOHashingVersion>8.0.0</SystemIOHashingVersion>
<SystemRuntimeCachingVersion>8.0.0</SystemRuntimeCachingVersion>
<SystemNetHttpJsonVersion>8.0.0</SystemNetHttpJsonVersion>
<SystemSecurityCryptographyPkcsVersion>8.0.0</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>8.0.1</SystemSecurityCryptographyXmlVersion>
<SystemTextEncodingsWebVersion>8.0.0</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>8.0.3</SystemTextJsonVersion>
<SystemRuntimeCachingVersion>8.0.0</SystemRuntimeCachingVersion>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64Version>8.0.5</MicrosoftAspNetCoreAppRuntimewinx64Version>
<MicrosoftAspNetCoreMvcTestingVersion>8.0.5</MicrosoftAspNetCoreMvcTestingVersion>
<MicrosoftAspNetCoreTestHostVersion>8.0.5</MicrosoftAspNetCoreTestHostVersion>
<MicrosoftExtensionsCachingStackExchangeRedisVersion>8.0.5</MicrosoftExtensionsCachingStackExchangeRedisVersion>
<MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsVersion>8.0.5</MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsVersion>
<MicrosoftExtensionsDiagnosticsHealthChecksVersion>8.0.5</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
<MicrosoftExtensionsFeaturesVersion>8.0.5</MicrosoftExtensionsFeaturesVersion>
<MicrosoftExtensionsHttpPollyVersion>8.0.5</MicrosoftExtensionsHttpPollyVersion>
<MicrosoftExtensionsObjectPoolVersion>8.0.5</MicrosoftExtensionsObjectPoolVersion>
</PropertyGroup>
Expand Down