Skip to content

[main] Update dependencies from dotnet/runtime #25092

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

Merged
merged 1 commit into from
Jun 14, 2021
Merged

[main] Update dependencies from dotnet/runtime #25092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 22 additions & 20 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="6.0.0-preview.6.21276.2">
<!-- NB: Pinned for compatibility with Preview 4 -->
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="6.0.0-preview.6.21276.2" Pinned="True">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bricelam Are you planning to unpin this prior to shipping? This will create an incoherent build.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/cc @dougbu @ajcvickers

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Pilchie Can you get someone to take a look at this?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @bricelam

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Filed #25148 so it doesn't get forgotten. Also tagging @AndriySvyryd here.

Copy link
Contributor

@bricelam bricelam Jun 25, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we can unpin it in the preview6 branch then unpin in main once preview 6 ships

<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.0-preview.6.21276.2">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.0-preview.6.21314.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
<Sha>af5c238556e204583b129cc8f5c7338f84dc2c40</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-preview.6.21276.2">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0-preview.6.21314.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
<Sha>af5c238556e204583b129cc8f5c7338f84dc2c40</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="6.0.0-preview.6.21276.2">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="6.0.0-preview.6.21314.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
<Sha>af5c238556e204583b129cc8f5c7338f84dc2c40</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="6.0.0-preview.6.21276.2">
<Dependency Name="Microsoft.Extensions.Configuration" Version="6.0.0-preview.6.21314.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
<Sha>af5c238556e204583b129cc8f5c7338f84dc2c40</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="6.0.0-preview.6.21276.2">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="6.0.0-preview.6.21314.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
<Sha>af5c238556e204583b129cc8f5c7338f84dc2c40</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-preview.6.21276.2">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-preview.6.21314.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
<Sha>af5c238556e204583b129cc8f5c7338f84dc2c40</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="6.0.0-preview.6.21276.2">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="6.0.0-preview.6.21314.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
<Sha>af5c238556e204583b129cc8f5c7338f84dc2c40</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-preview.6.21276.2">
<!-- NB: Pinned for compatibility with Preview 4 -->
<Dependency Name="Microsoft.Extensions.Logging" Version="6.0.0-preview.6.21276.2" Pinned="True">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
</Dependency>
<Dependency Name="System.Collections.Immutable" Version="6.0.0-preview.6.21276.2">
<Dependency Name="System.Collections.Immutable" Version="6.0.0-preview.6.21314.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
<Sha>af5c238556e204583b129cc8f5c7338f84dc2c40</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0-preview.6.21276.2">
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.0-preview.6.21314.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>293d47286161827ecc0d6e96f9eb7b82dafe8307</Sha>
<Sha>af5c238556e204583b129cc8f5c7338f84dc2c40</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
18 changes: 9 additions & 9 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
<UsingToolXliff>False</UsingToolXliff>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/runtime">
<SystemCollectionsImmutableVersion>6.0.0-preview.6.21276.2</SystemCollectionsImmutableVersion>
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0-preview.6.21276.2</SystemDiagnosticsDiagnosticSourceVersion>
<SystemCollectionsImmutableVersion>6.0.0-preview.6.21314.1</SystemCollectionsImmutableVersion>
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0-preview.6.21314.1</SystemDiagnosticsDiagnosticSourceVersion>
<MicrosoftExtensionsCachingMemoryVersion>6.0.0-preview.6.21276.2</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>6.0.0-preview.6.21276.2</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0-preview.6.21276.2</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>6.0.0-preview.6.21276.2</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>6.0.0-preview.6.21276.2</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>6.0.0-preview.6.21276.2</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>6.0.0-preview.6.21276.2</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>6.0.0-preview.6.21276.2</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsConfigurationVersion>6.0.0-preview.6.21314.1</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0-preview.6.21314.1</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>6.0.0-preview.6.21314.1</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>6.0.0-preview.6.21314.1</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>6.0.0-preview.6.21314.1</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>6.0.0-preview.6.21314.1</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>6.0.0-preview.6.21314.1</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>6.0.0-preview.6.21276.2</MicrosoftExtensionsLoggingVersion>
</PropertyGroup>
<PropertyGroup Label="Other dependencies">
Expand Down
7 changes: 6 additions & 1 deletion test/EFCore.Design.Tests/DesignApiConsistencyTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using System.Collections.Generic;
using System.Reflection;
using Microsoft.EntityFrameworkCore.Design;
using Microsoft.EntityFrameworkCore.TestUtilities;
using Microsoft.Extensions.DependencyInjection;

namespace Microsoft.EntityFrameworkCore
Expand All @@ -27,6 +26,12 @@ protected override Assembly TargetAssembly
public class DesignApiConsistencyFixture : ApiConsistencyFixtureBase
{
public override HashSet<Type> FluentApiTypes { get; } = new() { typeof(DesignTimeServiceCollectionExtensions) };

public override HashSet<Type> NonSealedPrivateNestedTypes { get; } = new()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can fix this

{
Type.GetType("Microsoft.Extensions.Hosting.HostFactoryResolver+HostingListener, Microsoft.EntityFrameworkCore.Design", throwOnError: true),
Type.GetType("Microsoft.Extensions.Hosting.HostFactoryResolver+HostingListener+StopTheHostException, Microsoft.EntityFrameworkCore.Design", throwOnError: true)
};
}
}
}
3 changes: 3 additions & 0 deletions test/EFCore.Specification.Tests/ApiConsistencyTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,6 +773,7 @@ where type.IsNestedPrivate
&& !type.IsSealed
&& !type.IsAbstract
&& !type.DeclaringType.GetNestedTypes(BindingFlags.NonPublic).Any(t => t.BaseType == type)
&& !Fixture.NonSealedPrivateNestedTypes.Contains(type)
select type.FullName)
.ToList();

Expand Down Expand Up @@ -1055,6 +1056,8 @@ protected ApiConsistencyFixtureBase()
public Dictionary<Type, Type> MutableMetadataTypes { get; } = new();
public Dictionary<Type, Type> ConventionMetadataTypes { get; } = new();

public virtual HashSet<Type> NonSealedPrivateNestedTypes { get; } = new();

public virtual
List<(Type Type,
Type ReadonlyExtensions,
Expand Down