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

[master] Update dependencies from dotnet/runtime dotnet/efcore #29492

Merged
merged 4 commits into from
Jan 23, 2021
Merged

[master] Update dependencies from dotnet/runtime dotnet/efcore #29492

merged 4 commits into from
Jan 23, 2021

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jan 21, 2021 •
edited
Loading

This pull request updates the following dependencies

From https://github.com/dotnet/runtime

  • Subscription: 68568747-40a2-4823-fae6-08d7f76e4602
  • Build: 20210120.16
  • Date Produced: 1/21/2021 7:55 AM
  • Commit: 3c2cdacbafead228eba8af28e91b3a6168ab1b8a
  • Branch: refs/heads/master

From https://github.com/dotnet/efcore

  • Subscription: ccafa991-4408-48df-d45d-08d76e1d3434
  • Build: 20210121.3
  • Date Produced: 1/22/2021 1:03 AM
  • Commit: e64624d549bd0db381801f1b30a38916fd766c3e
  • Branch: refs/heads/main

@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2021…
32977e2 
…0120.16

Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , Microsoft.Win32.Registry , Microsoft.Win32.SystemEvents , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Extensions.Logging , Microsoft.Extensions.Internal.Transport , Microsoft.Extensions.Http , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Configuration.Json , Microsoft.NETCore.App.Ref , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.WebSockets.WebSocketProtocol , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.CompilerServices.Unsafe , System.Security.AccessControl , System.Security.Cryptography.Cng , System.Security.Cryptography.Pkcs , System.Drawing.Common , System.DirectoryServices.Protocols , System.ComponentModel.Annotations , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Security.Permissions , System.Security.Cryptography.Xml , System.Security.Principal.Windows , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.Channels , System.Windows.Extensions
 From Version 6.0.0-alpha.1.21070.2 -> To Version 6.0.0-alpha.1.21070.16
@dotnet-maestro dotnet-maestro bot requested a review from dougbu as a code owner January 21, 2021 13:24
@ghost ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Dependency Update 🔼 labels Jan 21, 2021
ghost
ghost approved these changes Jan 21, 2021
View reviewed changes
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Auto-approving dependency update.

@dotnet-maestro
Update dependencies from https://github.com/dotnet/efcore build 20210…
bc0ca80 
…121.1

Microsoft.EntityFrameworkCore.Tools , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.Design
 From Version 6.0.0-alpha.1.21069.1 -> To Version 6.0.0-alpha.1.21071.1
@dotnet-maestro dotnet-maestro bot changed the title [master] Update dependencies from dotnet/runtime [master] Update dependencies from dotnet/runtime dotnet/efcore Jan 21, 2021
@dotnet-maestro
Update dependencies from https://github.com/dotnet/efcore build 20210…
739cb3d 
…121.3

Microsoft.EntityFrameworkCore.Tools , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.Design
 From Version 6.0.0-alpha.1.21069.1 -> To Version 6.0.0-alpha.1.21071.3
Base automatically changed from master to main January 22, 2021 01:33
@halter73
Copy link
Member 

                var typeMappingConvention = conventionSet.ModelFinalizingConventions.OfType<TypeMappingConvention>().FirstOrDefault();
                if (typeMappingConvention != null)
                {
                    typeMappingConvention.ProcessModelFinalizing(conventionModel.Builder, null);
 Check failure on line 57 in src/Middleware/Diagnostics.EntityFrameworkCore/src/HttpContextDatabaseContextDetailsExtensions.cs

Azure Pipelines
/ aspnetcore-quarantined-pr (Tests: macOS 10.14)
src/Middleware/Diagnostics.EntityFrameworkCore/src/HttpContextDatabaseContextDetailsExtensions.cs#L57
src/Middleware/Diagnostics.EntityFrameworkCore/src/HttpContextDatabaseContextDetailsExtensions.cs(57,91): error CS8625: (NETCORE_ENGINEERING_TELEMETRY=Build) Cannot convert null literal to non-nullable reference type.

@roji This looks to be caused by dotnet/efcore#23905. Should ProcessModelFinalizing's second parameter be nullable? It looks like it isn't used by the base class.

https://github.com/dotnet/efcore/blob/e64624d549bd0db381801f1b30a38916fd766c3e/src/EFCore/Metadata/Conventions/TypeMappingConvention.cs#L32-L41

@halter73
Copy link
Member

halter73 commented Jan 22, 2021 •
edited
Loading

+@smitpatel

@smitpatel
Copy link
Contributor

@AndriySvyryd - What do you suggest we change here?
In theory the convention context shouldn't be null so passing null is incorrect. But we ourselves had this hacky code in modelsnapshotprocessor & Migrator. Those classes are not nullable enabled so our build passed. Does that mean we should allow null for convention context in all conventions?
Side note about this particular hacky way to finalize the model is going away in dotnet/efcore#23929

@AndriySvyryd
Copy link
Member

Use bang to ignore this. This code will need to be changed after dotnet/efcore#23929 is merged anyway,

@dougbu
Copy link
Member

dougbu commented Jan 22, 2021

@mmitche it seems the master ➡️ main change confused the bot. What do you suggest to reconcile this PR with #29528❔ Can something be done to avoid this when renaming the default branch in the future❔

/fyi @tkapin @premun @jakubstilec

@dotnet-maestro dotnet-maestro bot requested a review from Tratcher as a code owner January 23, 2021 01:20
@halter73
Copy link
Member

Use bang to ignore this. This code will need to be changed after dotnet/efcore#23929 is merged anyway,

Done!

@dotnet-maestro dotnet-maestro bot merged commit 6ebdb03 into main Jan 23, 2021
@dotnet-maestro dotnet-maestro bot deleted the darc-master-dba83857-b4e7-4b06-80be-40e6ca456cbe branch January 23, 2021 02:53
@premun
Copy link
Member

premun commented Jan 25, 2021

@dougbu I don't follow what exactly happened here. What happened in which sequence?

@dougbu
Copy link
Member

dougbu commented Jan 25, 2021

What happened in which sequence?

  1. the bot opened [master] Update dependencies from dotnet/runtime dotnet/efcore #29492
  2. I renamed the default branch
  3. dotnet/runtime pushed new packages
  4. the bot opened [main] Update dependencies from dotnet/runtime #29528 instead of updating this PR (which was still open)

@dotnet dotnet deleted a comment Jan 25, 2021
@dotnet dotnet deleted a comment Jan 25, 2021
@premun
Copy link
Member

premun commented Jan 25, 2021

We might just have to add a step to close all dependency update PRs.

@dotnet dotnet deleted a comment Jan 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dougbu dougbu Awaiting requested review from dougbu

@Tratcher Tratcher Awaiting requested review from Tratcher

Assignees
No one assigned
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Dependency Update 🔼
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@halter73 @smitpatel @AndriySvyryd @dougbu @premun