Skip to content

[main] Update dependencies from dotnet/runtime#48407

Merged
eerhardt merged 11 commits into
mainfrom
darc-main-1557ab75-207a-4d19-8944-c01a01d880bc
May 25, 2023
Merged

[main] Update dependencies from dotnet/runtime#48407
eerhardt merged 11 commits into
mainfrom
darc-main-1557ab75-207a-4d19-8944-c01a01d880bc

Conversation

@dotnet-maestro
Copy link
Copy Markdown
Contributor

@dotnet-maestro dotnet-maestro Bot commented May 24, 2023 •
edited
Loading

This pull request updates the following dependencies

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

  • Subscription: 32db3699-5666-45da-a1b7-08d8b804cd75
  • Build: 20230524.13
  • Date Produced: May 25, 2023 9:20:40 AM UTC
  • Commit: 7cf329b773fa5ed544a9377587018713751c73e3
  • Branch: refs/heads/main

@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2023…
3c35717 
…0524.1

Microsoft.Bcl.AsyncInterfaces , 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.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.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Reflection.Metadata , System.Resources.Extensions , 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-preview.5.23273.1 -> To Version 8.0.0-preview.5.23274.1
@dotnet-maestro dotnet-maestro Bot requested review from a team and wtgodbe as code owners May 24, 2023 12:00
@ghost ghost added area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Type: Dependency Update 🔼 labels May 24, 2023
ghost
ghost approved these changes May 24, 2023
View reviewed changes
Copy link
Copy Markdown

@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.

@ghost
Copy link
Copy Markdown

ghost commented May 24, 2023

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

@wtgodbe
Copy link
Copy Markdown
Member

wtgodbe commented May 24, 2023 •
edited
Loading

Looks like failures are due to dotnet/runtime#86567

D:\a_work\1\s\src\Servers\Kestrel\Core\src\KestrelServer.cs(76,34): error CS0104: 'MeterOptions' is an ambiguous reference between 'System.Diagnostics.Metrics.MeterOptions' and 'Microsoft.Extensions.Metrics.MeterOptions' [D:\a_work\1\s\src\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj]
D:\a_work\1\s\src\Servers\Kestrel\Core\src\KestrelServer.cs(72,46): error CS0535: 'KestrelServer.DummyMeterFactory' does not implement interface member 'IMeterFactory.CreateMeter(MeterOptions)' [D:\a_work\1\s\src\Servers\Kestrel\Core\src\Microsoft.AspNetCore.Server.Kestrel.Core.csproj]

@tarekgh suggestions for an implementation of IMeterFactory.CreateMeter(MeterOptions) ?

aspnetcore/src/Servers/Kestrel/Core/src/KestrelServer.cs

Lines 72 to 77 in 91d702c

private sealed class DummyMeterFactory : IMeterFactory
{
public Meter CreateMeter(string name) => new Meter(name);
public Meter CreateMeter(MeterOptions options) => new Meter(options.Name, options.Version);
}

@tarekgh
Copy link
Copy Markdown
Member

tarekgh commented May 24, 2023

Looks like failures are due to dotnet/runtime#86567

@JamesNK has the PR #48403 for the integration with the latest changes from the runtime repo.

@eerhardt eerhardt force-pushed the darc-main-1557ab75-207a-4d19-8944-c01a01d880bc branch from 2a83d57 to edf1a13 Compare May 24, 2023 17:36
wtgodbe
wtgodbe reviewed May 24, 2023
View reviewed changes
Comment thread eng/Dependencies.props
@eerhardt
Remove InternalsVisibleTo workaround.
ec12b84 
Add some dispose logic to TestMeterFactory.
wtgodbe
wtgodbe reviewed May 24, 2023
View reviewed changes
Comment thread eng/Version.Details.xml Outdated
wtgodbe
wtgodbe reviewed May 24, 2023
View reviewed changes
Comment thread eng/Versions.props Outdated
wtgodbe
wtgodbe approved these changes May 24, 2023 •
edited
Loading
View reviewed changes
@eerhardt
Copy link
Copy Markdown
Member

eerhardt commented May 24, 2023

Let's see how that goes now. 🤞

@wtgodbe
Copy link
Copy Markdown
Member

wtgodbe commented May 24, 2023

I suspect the SharedFx tests will fail. You'll need to add Microsoft.Extensions.Diagnostics and Microsoft.Extensions.Diagnostics.Abstractions to

aspnetcore/src/Framework/test/TestData.cs

Line 18 in 90599c6

ListedSharedFxAssemblies = new List<string>()
and

aspnetcore/src/Framework/test/TestData.cs

Line 168 in 90599c6

ListedTargetingPackAssemblies = new List<string>

@wtgodbe
Copy link
Copy Markdown
Member

wtgodbe commented May 24, 2023

Assert.All() Failure: 2 out of 138 items in the collection did not pass.
[133]: Item: /datadisks/disk1/work/91BC084C/p/dotnet-cli/packs/Microsoft.AspNetCore.App.Ref/8.0.0-ci/ref/net8.0/Microsoft.Extensions.Diagnostics.dll
Xunit.Sdk.TrueException: /datadisks/disk1/work/91BC084C/p/dotnet-cli/packs/Microsoft.AspNetCore.App.Ref/8.0.0-ci/ref/net8.0/Microsoft.Extensions.Diagnostics.dll should have ReferenceAssemblyAttribute
Expected: True
Actual: False
at Xunit.Assert.True(Nullable1 condition, String userMessage) in //src/xunit.assert/Asserts/BooleanAsserts.cs:line 132 at Xunit.Assert.True(Boolean condition, String userMessage) in //src/xunit.assert/Asserts/BooleanAsserts.cs:line 116 at Microsoft.AspNetCore.TargetingPackTests.<>c.b__9_0(String path) in //src/Framework/test/TargetingPackTests.cs:line 213 at Xunit.Assert.<>c__DisplayClass11_01.b__0(T item, Int32 index) in //src/xunit.assert/Asserts/CollectionAsserts.cs:line 34
at Xunit.Assert.All[T](IEnumerable1 collection, Action2 action) in //src/xunit.assert/Asserts/CollectionAsserts.cs:line 61
[97]: Item: /datadisks/disk1/work/91BC084C/p/dotnet-cli/packs/Microsoft.AspNetCore.App.Ref/8.0.0-ci/ref/net8.0/Microsoft.Extensions.Diagnostics.Abstractions.dll
Xunit.Sdk.TrueException: /datadisks/disk1/work/91BC084C/p/dotnet-cli/packs/Microsoft.AspNetCore.App.Ref/8.0.0-ci/ref/net8.0/Microsoft.Extensions.Diagnostics.Abstractions.dll should have ReferenceAssemblyAttribute
Expected: True
Actual: False
at Xunit.Assert.True(Nullable1 condition, String userMessage) in //src/xunit.assert/Asserts/BooleanAsserts.cs:line 132 at Xunit.Assert.True(Boolean condition, String userMessage) in //src/xunit.assert/Asserts/BooleanAsserts.cs:line 116 at Microsoft.AspNetCore.TargetingPackTests.<>c.b__9_0(String path) in //src/Framework/test/TargetingPackTests.cs:line 213 at Xunit.Assert.<>c__DisplayClass11_01.b__0(T item, Int32 index) in //src/xunit.assert/Asserts/CollectionAsserts.cs:line 34
at Xunit.Assert.All[T](IEnumerable1 collection, Action2 action) in //src/xunit.assert/Asserts/CollectionAsserts.cs:line 61

I'm familiar with this, reminding myself of the root cause now

@wtgodbe
Copy link
Copy Markdown
Member

wtgodbe commented May 24, 2023

@ViktorHofer I think this means Microsoft.Extensions.Diagnostics and Microsoft.Extensions.Diagnostics.Abstractions need to be added to Microsoft.Internal.Runtime.AspNetCore.Transport so we can re-pack their ref assemblies into our targeting pack. Does that just entail adding them to https://github.com/dotnet/runtime/blob/43c30d8045703e89fafe60325c279f2e0c1c91a5/src/libraries/NetCoreAppLibrary.props#L193 ?

@wtgodbe wtgodbe mentioned this pull request May 24, 2023
Merged
@eerhardt eerhardt mentioned this pull request May 24, 2023
Closed
@eerhardt
Copy link
Copy Markdown
Member

eerhardt commented May 24, 2023

FYI - I put up a draft #48417 in case we need to unblock this dependency flow faster than waiting for a new runtime build.

@JamesNK
Copy link
Copy Markdown
Member

JamesNK commented May 25, 2023

/azp run

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines Bot commented May 25, 2023

Azure Pipelines successfully started running 3 pipeline(s).

dotnet-maestro Bot and others added 2 commits May 25, 2023 12:16
@dotnet-maestro
Update dependencies from https://github.com/dotnet/runtime build 2023…
471e06b 
…0524.13

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.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.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-preview.5.23273.1 -> To Version 8.0.0-preview.5.23274.13
@eerhardt
Update new dependencies to new runtime build
d4bcbb2
@eerhardt eerhardt enabled auto-merge (squash) May 25, 2023 13:48
@eerhardt eerhardt merged commit b9da6a0 into main May 25, 2023
@eerhardt eerhardt deleted the darc-main-1557ab75-207a-4d19-8944-c01a01d880bc branch May 25, 2023 15:08
@ghost ghost added this to the 8.0-preview6 milestone May 25, 2023
This was referenced May 25, 2023
Closed
Closed
mmitche pushed a commit that referenced this pull request May 26, 2023
@dotnet-maestro @JamesNK
@eerhardt @wtgodbe @mmitche
[main] Update dependencies from dotnet/runtime (#48407)
e674376 
* Update dependencies from https://github.com/dotnet/runtime build 20230524.1

Microsoft.Bcl.AsyncInterfaces , 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.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.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Reflection.Metadata , System.Resources.Extensions , 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-preview.5.23273.1 -> To Version 8.0.0-preview.5.23274.1

* Use Microsoft.Extensions.Diaganostics

* Add to shared framework

* Add Diagnostics.Abstractions to shared fx.

* Remove InternalsVisibleTo workaround.

Add some dispose logic to TestMeterFactory.

* Fix test build. Add new assemblies to shared fx

* Fix new deps

* Update dependencies from https://github.com/dotnet/runtime build 20230524.13

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.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.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-preview.5.23273.1 -> To Version 8.0.0-preview.5.23274.13

* Update new dependencies to new runtime build

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: James Newton-King <james@newtonking.com>
Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
Co-authored-by: wtgodbe <wigodbe@microsoft.com>
mmitche pushed a commit that referenced this pull request May 26, 2023
@dotnet-maestro @JamesNK
@eerhardt @wtgodbe @dkurepa
[release/8.0-preview5] Update dependencies from dotnet/runtime dotnet…
8db2fb7 
…/efcore (#48435)

* Update dependencies from https://github.com/dotnet/runtime build 20230525.9

Microsoft.Bcl.AsyncInterfaces , 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.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.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Reflection.Metadata , System.Resources.Extensions , 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-preview.5.23273.1 -> To Version 8.0.0-preview.5.23275.9

* [main] Update dependencies from dotnet/runtime (#48407)

* Update dependencies from https://github.com/dotnet/runtime build 20230524.1

Microsoft.Bcl.AsyncInterfaces , 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.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.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Reflection.Metadata , System.Resources.Extensions , 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-preview.5.23273.1 -> To Version 8.0.0-preview.5.23274.1

* Use Microsoft.Extensions.Diaganostics

* Add to shared framework

* Add Diagnostics.Abstractions to shared fx.

* Remove InternalsVisibleTo workaround.

Add some dispose logic to TestMeterFactory.

* Fix test build. Add new assemblies to shared fx

* Fix new deps

* Update dependencies from https://github.com/dotnet/runtime build 20230524.13

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.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.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-preview.5.23273.1 -> To Version 8.0.0-preview.5.23274.13

* Update new dependencies to new runtime build

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: James Newton-King <james@newtonking.com>
Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
Co-authored-by: wtgodbe <wigodbe@microsoft.com>

* Update dependencies from https://github.com/dotnet/efcore build 20230525.3

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-preview.5.23275.1 -> To Version 8.0.0-preview.5.23275.3

* Update dependencies from https://github.com/dotnet/runtime build 20230525.10

Microsoft.Bcl.AsyncInterfaces , 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.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.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Reflection.Metadata , System.Resources.Extensions , 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-preview.5.23273.1 -> To Version 8.0.0-preview.5.23275.10

* Update dependencies from https://github.com/dotnet/efcore build 20230526.1

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-preview.5.23275.1 -> To Version 8.0.0-preview.5.23276.1

* Add Microosft.Extensions.Diagnostics as a dependency

* Add MicrosoftExtensionsDiagnosticsVersion to Version.Props

* Add Diagnostics.Abstractions dependency

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: James Newton-King <james@newtonking.com>
Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
Co-authored-by: wtgodbe <wigodbe@microsoft.com>
Co-authored-by: Djuradj Kurepa <91743470+dkurepa@users.noreply.github.com>
Co-authored-by: dkurepa <dkurepa@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wtgodbe wtgodbe wtgodbe approved these changes

@BrennanConroy BrennanConroy Awaiting requested review from BrennanConroy BrennanConroy is a code owner

@halter73 halter73 Awaiting requested review from halter73 halter73 is a code owner

@Tratcher Tratcher Awaiting requested review from Tratcher

@JamesNK JamesNK Awaiting requested review from JamesNK

@mgravell mgravell Awaiting requested review from mgravell

@captainsafia captainsafia Awaiting requested review from captainsafia

+1 more reviewer
Reviewers whose approvals may not affect merge requirements

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

8.0-preview6

Development

Successfully merging this pull request may close these issues.

4 participants

@wtgodbe @tarekgh @eerhardt @JamesNK