Skip to content

Commit

Permalink
Merge changes from internal branch (#5158)
Browse files Browse the repository at this point in the history
  • Loading branch information
joperezr authored May 14, 2024
2 parents 8878477 + 231e807 commit 5752f1d
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 30 deletions.
40 changes: 20 additions & 20 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="8.0.0" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<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>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>087e15321bb712ef6fe8b0ba6f8bd12facf92629</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 @@ -132,41 +132,41 @@
<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.4">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>8486d31e24f30e3fa1809a95699a0adc16f448d7</Sha>
<Sha>c9e3996173cec136bc2e9f3b4ec45f2a323b1d63</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.4">
<Dependency Name="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>8486d31e24f30e3fa1809a95699a0adc16f448d7</Sha>
<Sha>c9e3996173cec136bc2e9f3b4ec45f2a323b1d63</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.4">
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>8486d31e24f30e3fa1809a95699a0adc16f448d7</Sha>
<Sha>c9e3996173cec136bc2e9f3b4ec45f2a323b1d63</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.4">
<Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>8486d31e24f30e3fa1809a95699a0adc16f448d7</Sha>
<Sha>c9e3996173cec136bc2e9f3b4ec45f2a323b1d63</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.4">
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="8.0.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>8486d31e24f30e3fa1809a95699a0adc16f448d7</Sha>
<Sha>c9e3996173cec136bc2e9f3b4ec45f2a323b1d63</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.4">
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>8486d31e24f30e3fa1809a95699a0adc16f448d7</Sha>
<Sha>c9e3996173cec136bc2e9f3b4ec45f2a323b1d63</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Features" Version="8.0.4">
<Dependency Name="Microsoft.Extensions.Features" Version="8.0.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>8486d31e24f30e3fa1809a95699a0adc16f448d7</Sha>
<Sha>c9e3996173cec136bc2e9f3b4ec45f2a323b1d63</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Http.Polly" Version="8.0.4">
<Dependency Name="Microsoft.Extensions.Http.Polly" Version="8.0.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>8486d31e24f30e3fa1809a95699a0adc16f448d7</Sha>
<Sha>c9e3996173cec136bc2e9f3b4ec45f2a323b1d63</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.4">
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="8.0.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>8486d31e24f30e3fa1809a95699a0adc16f448d7</Sha>
<Sha>c9e3996173cec136bc2e9f3b4ec45f2a323b1d63</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
20 changes: 10 additions & 10 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,20 @@
<SystemIOHashingVersion>8.0.0</SystemIOHashingVersion>
<SystemNetHttpJsonVersion>8.0.0</SystemNetHttpJsonVersion>
<SystemSecurityCryptographyPkcsVersion>8.0.0</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>8.0.0</SystemSecurityCryptographyXmlVersion>
<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.4</MicrosoftAspNetCoreAppRuntimewinx64Version>
<MicrosoftAspNetCoreMvcTestingVersion>8.0.4</MicrosoftAspNetCoreMvcTestingVersion>
<MicrosoftAspNetCoreTestHostVersion>8.0.4</MicrosoftAspNetCoreTestHostVersion>
<MicrosoftExtensionsCachingStackExchangeRedisVersion>8.0.4</MicrosoftExtensionsCachingStackExchangeRedisVersion>
<MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsVersion>8.0.4</MicrosoftExtensionsDiagnosticsHealthChecksAbstractionsVersion>
<MicrosoftExtensionsDiagnosticsHealthChecksVersion>8.0.4</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
<MicrosoftExtensionsFeaturesVersion>8.0.4</MicrosoftExtensionsFeaturesVersion>
<MicrosoftExtensionsHttpPollyVersion>8.0.4</MicrosoftExtensionsHttpPollyVersion>
<MicrosoftExtensionsObjectPoolVersion>8.0.4</MicrosoftExtensionsObjectPoolVersion>
<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

0 comments on commit 5752f1d

Please sign in to comment.