From ed5e135e392387d74ed0410edfc998a9c73b6ced Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 28 Jul 2023 12:01:54 +0000 Subject: [PATCH 1/7] Update dependencies from https://github.com/dotnet/runtime build 20230727.8 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.23376.11 -> To Version 8.0.0-rc.1.23377.8 --- eng/Version.Details.xml | 276 ++++++++++++++++++++-------------------- eng/Versions.props | 138 ++++++++++---------- 2 files changed, 207 insertions(+), 207 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8e26151b4005..0c6ecf7217ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,149 +41,149 @@ https://github.com/dotnet/efcore d0e0824f3e7997a80a2f6f3bc13234a0077ffb30 - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb https://github.com/dotnet/source-build-externals @@ -195,135 +195,135 @@ 27e584661980ee6d82c419a2a471ae505b7d122e - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb https://github.com/dotnet/xdt @@ -353,16 +353,16 @@ https://github.com/dotnet/roslyn 1aa759af23d2a29043ea44fcef5bd6823dafa5d0 - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb - + https://github.com/dotnet/runtime - bcb608e3d21344a0bb7c3399f060143504bbf475 + afed0a9f40d51e51c95dd0842913d7caaf5a9beb https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 8f292cce5f8e..e68f3ce9db95 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,77 +64,77 @@ --> - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 8.0.0-preview.7.23356.8 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 - 8.0.0-rc.1.23376.11 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23377.8 8.0.0-rc.1.23373.1 @@ -167,7 +167,7 @@ 2.0.0-beta-23228-03 - 8.0.0-rc.1.23376.11 + 8.0.0-rc.1.23377.8 7.0.0-preview.22423.2 From 88a54181594700d2c5d4ecfbe99a9c4f8c4664ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 28 Jul 2023 16:55:25 +0000 Subject: [PATCH 2/7] Update dependencies from https://github.com/dotnet/efcore build 20230728.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-rc.1.23376.2 -> To Version 8.0.0-rc.1.23378.1 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c6ecf7217ac..d205a318eaac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://github.com/dotnet/efcore - d0e0824f3e7997a80a2f6f3bc13234a0077ffb30 + 5fd594427cf8ec1a4436c3613eabd02782be3e86 - + https://github.com/dotnet/efcore - d0e0824f3e7997a80a2f6f3bc13234a0077ffb30 + 5fd594427cf8ec1a4436c3613eabd02782be3e86 - + https://github.com/dotnet/efcore - d0e0824f3e7997a80a2f6f3bc13234a0077ffb30 + 5fd594427cf8ec1a4436c3613eabd02782be3e86 - + https://github.com/dotnet/efcore - d0e0824f3e7997a80a2f6f3bc13234a0077ffb30 + 5fd594427cf8ec1a4436c3613eabd02782be3e86 - + https://github.com/dotnet/efcore - d0e0824f3e7997a80a2f6f3bc13234a0077ffb30 + 5fd594427cf8ec1a4436c3613eabd02782be3e86 - + https://github.com/dotnet/efcore - d0e0824f3e7997a80a2f6f3bc13234a0077ffb30 + 5fd594427cf8ec1a4436c3613eabd02782be3e86 - + https://github.com/dotnet/efcore - d0e0824f3e7997a80a2f6f3bc13234a0077ffb30 + 5fd594427cf8ec1a4436c3613eabd02782be3e86 - + https://github.com/dotnet/efcore - d0e0824f3e7997a80a2f6f3bc13234a0077ffb30 + 5fd594427cf8ec1a4436c3613eabd02782be3e86 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e68f3ce9db95..a844931db6d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -138,14 +138,14 @@ 8.0.0-rc.1.23373.1 - 8.0.0-rc.1.23376.2 - 8.0.0-rc.1.23376.2 - 8.0.0-rc.1.23376.2 - 8.0.0-rc.1.23376.2 - 8.0.0-rc.1.23376.2 - 8.0.0-rc.1.23376.2 - 8.0.0-rc.1.23376.2 - 8.0.0-rc.1.23376.2 + 8.0.0-rc.1.23378.1 + 8.0.0-rc.1.23378.1 + 8.0.0-rc.1.23378.1 + 8.0.0-rc.1.23378.1 + 8.0.0-rc.1.23378.1 + 8.0.0-rc.1.23378.1 + 8.0.0-rc.1.23378.1 + 8.0.0-rc.1.23378.1 4.7.0-3.23314.3 4.7.0-3.23314.3 From 526488b343aac7cbc29c34a878630fbf7666678b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 29 Jul 2023 12:01:27 +0000 Subject: [PATCH 3/7] Update dependencies from https://github.com/dotnet/runtime build 20230728.11 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.23376.11 -> To Version 8.0.0-rc.1.23378.11 --- eng/Version.Details.xml | 276 ++++++++++++++++++++-------------------- eng/Versions.props | 138 ++++++++++---------- 2 files changed, 207 insertions(+), 207 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d205a318eaac..17ddc361baa4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,149 +41,149 @@ https://github.com/dotnet/efcore 5fd594427cf8ec1a4436c3613eabd02782be3e86 - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed https://github.com/dotnet/source-build-externals @@ -195,135 +195,135 @@ 27e584661980ee6d82c419a2a471ae505b7d122e - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed https://github.com/dotnet/xdt @@ -353,16 +353,16 @@ https://github.com/dotnet/roslyn 1aa759af23d2a29043ea44fcef5bd6823dafa5d0 - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed - + https://github.com/dotnet/runtime - afed0a9f40d51e51c95dd0842913d7caaf5a9beb + d5c4a4e6b7e78d4dc9fc5ff560c802a4b901b2ed https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index a844931db6d7..53aa60d2233c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,77 +64,77 @@ --> - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 8.0.0-preview.7.23356.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 - 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 + 8.0.0-rc.1.23378.11 8.0.0-rc.1.23373.1 @@ -167,7 +167,7 @@ 2.0.0-beta-23228-03 - 8.0.0-rc.1.23377.8 + 8.0.0-rc.1.23378.11 7.0.0-preview.22423.2 From 184e13140641f9abc59a70a10466e86abc7a1154 Mon Sep 17 00:00:00 2001 From: Brennan Date: Wed, 26 Jul 2023 13:28:11 -0700 Subject: [PATCH 4/7] Add Keyed DI support to SignalR --- .../Core/src/Internal/DefaultHubDispatcher.cs | 2 +- .../Core/src/Internal/HubMethodDescriptor.cs | 63 ++++++++++++++++--- .../HubConnectionHandlerTestUtils/Hubs.cs | 4 ++ .../SignalR/test/HubConnectionHandlerTests.cs | 42 +++++++++++++ 4 files changed, 102 insertions(+), 9 deletions(-) diff --git a/src/SignalR/server/Core/src/Internal/DefaultHubDispatcher.cs b/src/SignalR/server/Core/src/Internal/DefaultHubDispatcher.cs index be324912a559..8facf60e4d9b 100644 --- a/src/SignalR/server/Core/src/Internal/DefaultHubDispatcher.cs +++ b/src/SignalR/server/Core/src/Internal/DefaultHubDispatcher.cs @@ -676,7 +676,7 @@ private void ReplaceArguments(HubMethodDescriptor descriptor, HubMethodInvocatio } else if (descriptor.IsServiceArgument(parameterPointer)) { - arguments[parameterPointer] = scope.ServiceProvider.GetRequiredService(descriptor.OriginalParameterTypes[parameterPointer]); + arguments[parameterPointer] = descriptor.GetService(scope.ServiceProvider, parameterPointer, descriptor.OriginalParameterTypes[parameterPointer]); } else if (isStreamCall && ReflectionHelper.IsStreamingType(descriptor.OriginalParameterTypes[parameterPointer], mustBeDirectType: true)) { diff --git a/src/SignalR/server/Core/src/Internal/HubMethodDescriptor.cs b/src/SignalR/server/Core/src/Internal/HubMethodDescriptor.cs index bf0d81cbdf9a..6a1586a6353e 100644 --- a/src/SignalR/server/Core/src/Internal/HubMethodDescriptor.cs +++ b/src/SignalR/server/Core/src/Internal/HubMethodDescriptor.cs @@ -79,18 +79,31 @@ public HubMethodDescriptor(ObjectMethodExecutor methodExecutor, IServiceProvider HasSyntheticArguments = true; return false; } - else if (p.CustomAttributes.Any(a => typeof(IFromServiceMetadata).IsAssignableFrom(a.AttributeType)) || - serviceProviderIsService?.IsService(GetServiceType(p.ParameterType)) == true) + else if (p.CustomAttributes.Any()) { - if (index >= 64) + foreach (var attribute in p.GetCustomAttributes(true)) { - throw new InvalidOperationException( - "Hub methods can't use services from DI in the parameters after the 64th parameter."); + if (attribute is IFromServiceMetadata) + { + return MarkServiceParameter(index); + } + else if (attribute is FromKeyedServicesAttribute keyedServicesAttribute) + { + if (serviceProviderIsService is IServiceProviderIsKeyedService keyedServiceProvider && + keyedServiceProvider.IsKeyedService(GetServiceType(p.ParameterType), keyedServicesAttribute.Key)) + { + KeyedServiceKeys ??= new List<(int, object)>(); + KeyedServiceKeys.Add((index, keyedServicesAttribute.Key)); + return MarkServiceParameter(index); + } + } } - _isServiceArgument |= (1UL << index); - HasSyntheticArguments = true; - return false; } + else if (serviceProviderIsService?.IsService(GetServiceType(p.ParameterType)) == true) + { + return MarkServiceParameter(index); + } + return true; }).Select(p => p.ParameterType).ToArray(); @@ -102,8 +115,22 @@ public HubMethodDescriptor(ObjectMethodExecutor methodExecutor, IServiceProvider Policies = policies.ToArray(); } + private bool MarkServiceParameter(int index) + { + if (index >= 64) + { + throw new InvalidOperationException( + "Hub methods can't use services from DI in the parameters after the 64th parameter."); + } + _isServiceArgument |= (1UL << index); + HasSyntheticArguments = true; + return false; + } + public List? StreamingParameters { get; private set; } + public List<(int, object)>? KeyedServiceKeys { get; private set; } + public ObjectMethodExecutor MethodExecutor { get; } public IReadOnlyList ParameterTypes { get; } @@ -125,6 +152,26 @@ public bool IsServiceArgument(int argumentIndex) return (_isServiceArgument & (1UL << argumentIndex)) != 0; } + public object GetService(IServiceProvider serviceProvider, int index, Type parameterType) + { + if (KeyedServiceKeys is not null) + { + foreach (var items in KeyedServiceKeys) + { + if (items.Item1 == index) + { + return serviceProvider.GetRequiredKeyedService(parameterType, items.Item2); + } + else if (items.Item1 > index) + { + break; + } + } + } + + return serviceProvider.GetRequiredService(parameterType); + } + public IAsyncEnumerator FromReturnedStream(object stream, CancellationToken cancellationToken) { // there is the potential for compile to be called times but this has no harmful effect other than perf diff --git a/src/SignalR/server/SignalR/test/HubConnectionHandlerTestUtils/Hubs.cs b/src/SignalR/server/SignalR/test/HubConnectionHandlerTestUtils/Hubs.cs index b5b1d9c701df..9fcfb0b79b28 100644 --- a/src/SignalR/server/SignalR/test/HubConnectionHandlerTestUtils/Hubs.cs +++ b/src/SignalR/server/SignalR/test/HubConnectionHandlerTestUtils/Hubs.cs @@ -7,6 +7,7 @@ using System.Threading.Channels; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http.Metadata; +using Microsoft.Extensions.DependencyInjection; using Newtonsoft.Json.Serialization; namespace Microsoft.AspNetCore.SignalR.Tests; @@ -1384,6 +1385,9 @@ public async Task Stream(ChannelReader channelReader) await channelReader.ReadAsync(); } } + + public void KeyedService([FromKeyedServices("service1")] Service1 service) + { } } public class TooManyParamsHub : Hub diff --git a/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs b/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs index 3051a0f2dd2f..d06e226fadf1 100644 --- a/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs +++ b/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs @@ -4915,6 +4915,48 @@ public async Task ServiceNotResolvedForIEnumerableParameterIfNotInDI() } } + [Fact] + public async Task KeyedServiceNotResolvedIfInDI() + { + var serviceProvider = HubConnectionHandlerTestUtils.CreateServiceProvider(provider => + { + provider.AddSignalR(options => + { + options.EnableDetailedErrors = true; + }); + + provider.AddKeyedScoped("service1"); + }); + var connectionHandler = serviceProvider.GetService>(); + + using (var client = new TestClient()) + { + var connectionHandlerTask = await client.ConnectAsync(connectionHandler).DefaultTimeout(); + var res = await client.InvokeAsync(nameof(ServicesHub.KeyedService)).DefaultTimeout(); + Assert.Equal("Failed to invoke 'KeyedService' due to an error on the server. InvalidDataException: Invocation provides 0 argument(s) but target expects 1.", res.Error); + } + } + + [Fact] + public async Task KeyedServiceNotResolvedIfNotInDI() + { + var serviceProvider = HubConnectionHandlerTestUtils.CreateServiceProvider(provider => + { + provider.AddSignalR(options => + { + options.EnableDetailedErrors = true; + }); + }); + var connectionHandler = serviceProvider.GetService>(); + + using (var client = new TestClient()) + { + var connectionHandlerTask = await client.ConnectAsync(connectionHandler).DefaultTimeout(); + var res = await client.InvokeAsync(nameof(ServicesHub.KeyedService)).DefaultTimeout(); + Assert.Equal("Failed to invoke 'KeyedService' due to an error on the server. InvalidDataException: Invocation provides 0 argument(s) but target expects 1.", res.Error); + } + } + [Fact] public void TooManyParametersWithServiceThrows() { From 1c8cc55341bea6ab0e09db98fba5d44097955ec4 Mon Sep 17 00:00:00 2001 From: Brennan Date: Sat, 29 Jul 2023 17:16:18 -0700 Subject: [PATCH 5/7] more test --- .../HubConnectionHandlerTestUtils/Hubs.cs | 22 +++++- .../SignalR/test/HubConnectionHandlerTests.cs | 72 ++++++++++++++++++- 2 files changed, 90 insertions(+), 4 deletions(-) diff --git a/src/SignalR/server/SignalR/test/HubConnectionHandlerTestUtils/Hubs.cs b/src/SignalR/server/SignalR/test/HubConnectionHandlerTestUtils/Hubs.cs index 9fcfb0b79b28..c2eac308bb02 100644 --- a/src/SignalR/server/SignalR/test/HubConnectionHandlerTestUtils/Hubs.cs +++ b/src/SignalR/server/SignalR/test/HubConnectionHandlerTestUtils/Hubs.cs @@ -1386,8 +1386,26 @@ public async Task Stream(ChannelReader channelReader) } } - public void KeyedService([FromKeyedServices("service1")] Service1 service) - { } + public int KeyedService([FromKeyedServices("service1")] Service1 service) + { + return 43; + } + + public int KeyedServiceWithParam(int input, [FromKeyedServices("service1")] Service1 service) + { + return 13 * input; + } + + public int KeyedServiceNonKeyedService(Service2 service2, [FromKeyedServices("service1")] Service1 service) + { + return 11; + } + + public int MultipleKeyedServices([FromKeyedServices("service1")] Service1 service, [FromKeyedServices("service2")] Service1 service2) + { + Assert.NotEqual(service, service2); + return 45; + } } public class TooManyParamsHub : Hub diff --git a/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs b/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs index d06e226fadf1..6ae2211cf74a 100644 --- a/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs +++ b/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs @@ -4916,7 +4916,7 @@ public async Task ServiceNotResolvedForIEnumerableParameterIfNotInDI() } [Fact] - public async Task KeyedServiceNotResolvedIfInDI() + public async Task KeyedServiceResolvedIfInDI() { var serviceProvider = HubConnectionHandlerTestUtils.CreateServiceProvider(provider => { @@ -4933,7 +4933,75 @@ public async Task KeyedServiceNotResolvedIfInDI() { var connectionHandlerTask = await client.ConnectAsync(connectionHandler).DefaultTimeout(); var res = await client.InvokeAsync(nameof(ServicesHub.KeyedService)).DefaultTimeout(); - Assert.Equal("Failed to invoke 'KeyedService' due to an error on the server. InvalidDataException: Invocation provides 0 argument(s) but target expects 1.", res.Error); + Assert.Equal(43L, res.Result); + } + } + + [Fact] + public async Task HubMethodCanInjectKeyedServiceWithOtherParameters() + { + var serviceProvider = HubConnectionHandlerTestUtils.CreateServiceProvider(provider => + { + provider.AddSignalR(options => + { + options.EnableDetailedErrors = true; + }); + + provider.AddKeyedScoped("service1"); + }); + var connectionHandler = serviceProvider.GetService>(); + + using (var client = new TestClient()) + { + var connectionHandlerTask = await client.ConnectAsync(connectionHandler).DefaultTimeout(); + var res = await client.InvokeAsync(nameof(ServicesHub.KeyedServiceWithParam), 91).DefaultTimeout(); + Assert.Equal(1183L, res.Result); + } + } + + [Fact] + public async Task HubMethodCanInjectKeyedServiceWithNonKeyedService() + { + var serviceProvider = HubConnectionHandlerTestUtils.CreateServiceProvider(provider => + { + provider.AddSignalR(options => + { + options.EnableDetailedErrors = true; + }); + + provider.AddKeyedScoped("service1"); + provider.AddScoped(); + }); + var connectionHandler = serviceProvider.GetService>(); + + using (var client = new TestClient()) + { + var connectionHandlerTask = await client.ConnectAsync(connectionHandler).DefaultTimeout(); + var res = await client.InvokeAsync(nameof(ServicesHub.KeyedServiceNonKeyedService)).DefaultTimeout(); + Assert.Equal(11L, res.Result); + } + } + + [Fact] + public async Task MultipleKeyedServicesResolved() + { + var serviceProvider = HubConnectionHandlerTestUtils.CreateServiceProvider(provider => + { + provider.AddSignalR(options => + { + options.EnableDetailedErrors = true; + }); + + provider.AddKeyedScoped("service1"); + provider.AddKeyedScoped("service2"); + }); + var connectionHandler = serviceProvider.GetService>(); + + using (var client = new TestClient()) + { + var connectionHandlerTask = await client.ConnectAsync(connectionHandler).DefaultTimeout(); + var res = await client.InvokeAsync(nameof(ServicesHub.MultipleKeyedServices)).DefaultTimeout(); + Assert.Equal(45L, res.Result); } } From afdb3bc0210a9c1d1e4c29fa4318d78f8a680008 Mon Sep 17 00:00:00 2001 From: Brennan Date: Sat, 29 Jul 2023 17:21:22 -0700 Subject: [PATCH 6/7] destruct --- .../server/Core/src/Internal/HubMethodDescriptor.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SignalR/server/Core/src/Internal/HubMethodDescriptor.cs b/src/SignalR/server/Core/src/Internal/HubMethodDescriptor.cs index 6a1586a6353e..b946fab9490f 100644 --- a/src/SignalR/server/Core/src/Internal/HubMethodDescriptor.cs +++ b/src/SignalR/server/Core/src/Internal/HubMethodDescriptor.cs @@ -156,13 +156,13 @@ public object GetService(IServiceProvider serviceProvider, int index, Type param { if (KeyedServiceKeys is not null) { - foreach (var items in KeyedServiceKeys) + foreach (var (paramIndex, key) in KeyedServiceKeys) { - if (items.Item1 == index) + if (paramIndex == index) { - return serviceProvider.GetRequiredKeyedService(parameterType, items.Item2); + return serviceProvider.GetRequiredKeyedService(parameterType, key); } - else if (items.Item1 > index) + else if (paramIndex > index) { break; } From 4bc545ad21aa84f5d7033fb90b831cef6e4fa32a Mon Sep 17 00:00:00 2001 From: Brennan Date: Wed, 2 Aug 2023 20:05:32 -0700 Subject: [PATCH 7/7] test --- .../HubConnectionHandlerTestUtils/Hubs.cs | 6 +++++ .../SignalR/test/HubConnectionHandlerTests.cs | 22 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/src/SignalR/server/SignalR/test/HubConnectionHandlerTestUtils/Hubs.cs b/src/SignalR/server/SignalR/test/HubConnectionHandlerTestUtils/Hubs.cs index c2eac308bb02..ca0c77daba92 100644 --- a/src/SignalR/server/SignalR/test/HubConnectionHandlerTestUtils/Hubs.cs +++ b/src/SignalR/server/SignalR/test/HubConnectionHandlerTestUtils/Hubs.cs @@ -1363,6 +1363,12 @@ public async Task ServicesAndParams(int value, [FromService] Service1 servi return total + value; } + public int MultipleSameKeyedServices([FromKeyedServices("service1")] Service1 service, [FromKeyedServices("service1")] Service1 service2) + { + Assert.Same(service, service2); + return 445; + } + public int ServiceWithoutAttribute(Service1 service) { return 1; diff --git a/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs b/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs index 6ae2211cf74a..d4c1af7d593f 100644 --- a/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs +++ b/src/SignalR/server/SignalR/test/HubConnectionHandlerTests.cs @@ -5005,6 +5005,28 @@ public async Task MultipleKeyedServicesResolved() } } + [Fact] + public async Task MultipleKeyedServicesWithSameNameResolved() + { + var serviceProvider = HubConnectionHandlerTestUtils.CreateServiceProvider(provider => + { + provider.AddSignalR(options => + { + options.EnableDetailedErrors = true; + }); + + provider.AddKeyedScoped("service1"); + }); + var connectionHandler = serviceProvider.GetService>(); + + using (var client = new TestClient()) + { + var connectionHandlerTask = await client.ConnectAsync(connectionHandler).DefaultTimeout(); + var res = await client.InvokeAsync(nameof(ServicesHub.MultipleSameKeyedServices)).DefaultTimeout(); + Assert.Equal(445L, res.Result); + } + } + [Fact] public async Task KeyedServiceNotResolvedIfNotInDI() {