Skip to content

[main] Update dependencies from dotnet/runtime dotnet/efcore#50019

Merged
Tratcher merged 9 commits into
mainfrom
darc-main-21c790b1-404f-48f5-8aa7-748859d4c7eb
Aug 14, 2023
Merged

[main] Update dependencies from dotnet/runtime dotnet/efcore#50019
Tratcher merged 9 commits into
mainfrom
darc-main-21c790b1-404f-48f5-8aa7-748859d4c7eb

Conversation

@dotnet-maestro

@dotnet-maestro dotnet-maestro Bot commented Aug 11, 2023

Copy link
Copy Markdown
Contributor

This pull request updates the following dependencies

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

  • Subscription: 32db3699-5666-45da-a1b7-08d8b804cd75
  • Build: 20230814.1
  • Date Produced: August 14, 2023 10:35:21 AM UTC
  • Commit: 8986374ea73f1e5b1977dd0058fbdf591936408a
  • Branch: refs/heads/main

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

  • Subscription: 8ce5251e-8269-419d-3b2a-08d8b8050dda
  • Build: 20230814.4
  • Date Produced: August 14, 2023 1:39:35 PM UTC
  • Commit: 34af335132ac4fcb0c9ffa456111e920ae9db707
  • Branch: refs/heads/main

…0810.15

Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , 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.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , 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.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting
 From Version 8.0.0-rc.1.23409.17 -> To Version 8.0.0-rc.1.23410.15
@dotnet-maestro dotnet-maestro Bot requested review from a team and wtgodbe as code owners August 11, 2023 09:19
@ghost ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Dependency Update 🔼 labels Aug 11, 2023

@ghost ghost left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Auto-approving dependency update.

@ghost

ghost commented Aug 11, 2023

Copy link
Copy Markdown

Hey @dotnet/aspnet-build, looks like this PR is something you want to take a look at.

@mgravell

mgravell commented Aug 11, 2023

Copy link
Copy Markdown
Contributor

build-ops: investigating CI fail:

src\Tools\GetDocumentInsider\src\GetDocument.Insider.csproj(0,0): error NU1605: (NETCORE_ENGINEERING_TELEMETRY=Restore) Warning As Error: Detected package downgrade: System.Diagnostics.DiagnosticSource from 8.0.0-rc.1.23410.15 to 4.6.0. Reference the package directly from the project to select a different version. GetDocument.Insider -> Microsoft.Extensions.Hosting.Abstractions 8.0.0-rc.1.23410.15 -> Microsoft.Extensions.Diagnostics.Abstractions 8.0.0-rc.1.23410.15 -> System.Diagnostics.DiagnosticSource (>= 8.0.0-rc.1.23410.15) GetDocument.Insider -> System.Diagnostics.DiagnosticSource (>= 4.6.0)

from csproj, it isn't wrong; I'm just not sure why it is only failing now:

<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.6.0">

conflict is

  • GetDocument.Insider -> Microsoft.Extensions.Hosting.Abstractions 8.0.0-rc.1.23410.15 -> Microsoft.Extensions.Diagnostics.Abstractions 8.0.0-rc.1.23410.15 -> System.Diagnostics.DiagnosticSource (>= 8.0.0-rc.1.23410.15)
  • GetDocument.Insider -> System.Diagnostics.DiagnosticSource (>= 4.6.0)

checking blame on Microsoft.Extensions.Hosting.Abstractions and Microsoft.Extensions.Diagnostics.Abstractions

@mgravell

mgravell commented Aug 11, 2023

Copy link
Copy Markdown
Contributor

right; so it looks like Microsoft.Extensions.Diagnostics.Abstractions has been recently resurrected by @Tratcher, but that GetDocumentInsider does not use it yet - I'm going to put together a PR that tries changing GetDocumentInsider to use the new bits, and see if I can find any other uses (see #50020)

…0814.1

Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , 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.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , 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.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting
 From Version 8.0.0-rc.1.23409.17 -> To Version 8.0.0-rc.1.23414.1
…814.4

dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools
 From Version 8.0.0-rc.1.23410.3 -> To Version 8.0.0-rc.1.23414.4
@dotnet-maestro dotnet-maestro Bot changed the title [main] Update dependencies from dotnet/runtime [main] Update dependencies from dotnet/runtime dotnet/efcore Aug 14, 2023
@wtgodbe

wtgodbe commented Aug 14, 2023

Copy link
Copy Markdown
Member

@Tratcher did you anticipate this break?

@wtgodbe

wtgodbe commented Aug 14, 2023

Copy link
Copy Markdown
Member

This is now updated to add Diagnostics.Abstractions to the SharedFx, and to include the change from #50020

@Tratcher Tratcher enabled auto-merge (squash) August 14, 2023 18:35

@eerhardt eerhardt left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM. Needed to unblock repo flow.

@joperezr joperezr left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for fixing the ingestion @Tratcher

@Tratcher Tratcher merged commit 10bc40c into main Aug 14, 2023
@Tratcher Tratcher deleted the darc-main-21c790b1-404f-48f5-8aa7-748859d4c7eb branch August 14, 2023 21:58
@ghost ghost added this to the 8.0-rc1 milestone Aug 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Dependency Update 🔼

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants