Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/runtime (#24583)
Browse files Browse the repository at this point in the history
* Update dependencies from https://github.com/dotnet/runtime build 20210405.1

Microsoft.Extensions.Logging , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyModel , System.Diagnostics.DiagnosticSource , System.Collections.Immutable , System.ComponentModel.Annotations
 From Version 6.0.0-preview.4.21178.6 -> To Version 6.0.0-preview.4.21205.1

* Skipped test Double_dispose_does_not_enter_pool_twice

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Tanay Parikh <[email protected]>
  • Loading branch information
3 people authored Apr 5, 2021
1 parent 42f1640 commit a130a2f
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 37 deletions.
48 changes: 24 additions & 24 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="6.0.0-preview.4.21178.6">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="6.0.0-preview.4.21205.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>102d1e856c7e0e553abeec937783da5debed73ad</Sha>
<Sha>95201492e7665c7f21faf42e9d544396ff714497</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.0-preview.4.21178.6">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.0-preview.4.21205.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>102d1e856c7e0e553abeec937783da5debed73ad</Sha>
<Sha>95201492e7665c7f21faf42e9d544396ff714497</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-preview.4.21178.6">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-preview.4.21205.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>102d1e856c7e0e553abeec937783da5debed73ad</Sha>
<Sha>95201492e7665c7f21faf42e9d544396ff714497</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="6.0.0-preview.4.21178.6">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="6.0.0-preview.4.21205.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>102d1e856c7e0e553abeec937783da5debed73ad</Sha>
<Sha>95201492e7665c7f21faf42e9d544396ff714497</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="6.0.0-preview.4.21178.6">
<Dependency Name="Microsoft.Extensions.Configuration" Version="6.0.0-preview.4.21205.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>102d1e856c7e0e553abeec937783da5debed73ad</Sha>
<Sha>95201492e7665c7f21faf42e9d544396ff714497</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="6.0.0-preview.4.21178.6">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="6.0.0-preview.4.21205.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>102d1e856c7e0e553abeec937783da5debed73ad</Sha>
<Sha>95201492e7665c7f21faf42e9d544396ff714497</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-preview.4.21178.6">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-preview.4.21205.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>102d1e856c7e0e553abeec937783da5debed73ad</Sha>
<Sha>95201492e7665c7f21faf42e9d544396ff714497</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="6.0.0-preview.4.21178.6">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="6.0.0-preview.4.21205.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>102d1e856c7e0e553abeec937783da5debed73ad</Sha>
<Sha>95201492e7665c7f21faf42e9d544396ff714497</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-preview.4.21178.6">
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-preview.4.21205.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>102d1e856c7e0e553abeec937783da5debed73ad</Sha>
<Sha>95201492e7665c7f21faf42e9d544396ff714497</Sha>
</Dependency>
<Dependency Name="System.Collections.Immutable" Version="6.0.0-preview.4.21178.6">
<Dependency Name="System.Collections.Immutable" Version="6.0.0-preview.4.21205.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>102d1e856c7e0e553abeec937783da5debed73ad</Sha>
<Sha>95201492e7665c7f21faf42e9d544396ff714497</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.Annotations" Version="6.0.0-preview.4.21178.6">
<Dependency Name="System.ComponentModel.Annotations" Version="6.0.0-preview.4.21205.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>102d1e856c7e0e553abeec937783da5debed73ad</Sha>
<Sha>95201492e7665c7f21faf42e9d544396ff714497</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0-preview.4.21178.6">
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0-preview.4.21205.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>102d1e856c7e0e553abeec937783da5debed73ad</Sha>
<Sha>95201492e7665c7f21faf42e9d544396ff714497</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
24 changes: 12 additions & 12 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@
<UsingToolXliff>False</UsingToolXliff>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/runtime">
<SystemCollectionsImmutableVersion>6.0.0-preview.4.21178.6</SystemCollectionsImmutableVersion>
<SystemComponentModelAnnotationsVersion>6.0.0-preview.4.21178.6</SystemComponentModelAnnotationsVersion>
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0-preview.4.21178.6</SystemDiagnosticsDiagnosticSourceVersion>
<MicrosoftExtensionsCachingMemoryVersion>6.0.0-preview.4.21178.6</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>6.0.0-preview.4.21178.6</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0-preview.4.21178.6</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>6.0.0-preview.4.21178.6</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>6.0.0-preview.4.21178.6</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>6.0.0-preview.4.21178.6</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>6.0.0-preview.4.21178.6</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>6.0.0-preview.4.21178.6</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>6.0.0-preview.4.21178.6</MicrosoftExtensionsLoggingVersion>
<SystemCollectionsImmutableVersion>6.0.0-preview.4.21205.1</SystemCollectionsImmutableVersion>
<SystemComponentModelAnnotationsVersion>6.0.0-preview.4.21205.1</SystemComponentModelAnnotationsVersion>
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0-preview.4.21205.1</SystemDiagnosticsDiagnosticSourceVersion>
<MicrosoftExtensionsCachingMemoryVersion>6.0.0-preview.4.21205.1</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>6.0.0-preview.4.21205.1</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0-preview.4.21205.1</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>6.0.0-preview.4.21205.1</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>6.0.0-preview.4.21205.1</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>6.0.0-preview.4.21205.1</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>6.0.0-preview.4.21205.1</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>6.0.0-preview.4.21205.1</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>6.0.0-preview.4.21205.1</MicrosoftExtensionsLoggingVersion>
</PropertyGroup>
<PropertyGroup Label="Other dependencies">
<MicrosoftCodeAnalysisVersion>3.7.0</MicrosoftCodeAnalysisVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1041,7 +1041,7 @@ public async Task Object_in_pool_is_disposed(bool useInterface, bool async)
Assert.Throws<ObjectDisposedException>(() => context.Customers.ToList());
}

[ConditionalTheory]
[ConditionalTheory(Skip = "Issue #24590")]
[InlineData(false, false)]
[InlineData(true, false)]
[InlineData(false, true)]
Expand Down

0 comments on commit a130a2f

Please sign in to comment.