From d05bb6cd4cf11913a0b16e0c166b824fe6643cbb Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 9 Nov 2022 01:10:34 +0000 Subject: [PATCH 1/8] [internal/release/3.1] Update dependencies from dnceng/internal/dotnet-extensions --- NuGet.config | 8 +- eng/Version.Details.xml | 244 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +-- 3 files changed, 135 insertions(+), 135 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9362df8720d..187db3454c7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,11 +6,10 @@ - - + - + @@ -25,12 +24,13 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 785b0f03dd4..ea06a80d369 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 https://dev.azure.com/dnceng/internal/_git/dotnet-corefx @@ -33,85 +33,85 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup 3acd9b0cd16596bad450c82be08780875a73c05c - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 @@ -122,153 +122,153 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup 9165b88e05fc37585aa1c3fc9585b5a7d751bb21 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b + c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 0e404aa9b868b6ad67321cb3a0a6161c25b966d4 + fb59fb7ddd618892c6e750046269dd4497b5c9ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - 0e404aa9b868b6ad67321cb3a0a6161c25b966d4 + fb59fb7ddd618892c6e750046269dd4497b5c9ae https://dev.azure.com/dnceng/internal/_git/dotnet-corefx diff --git a/eng/Versions.props b/eng/Versions.props index 0ced939817c..2b312527fc7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,13 +32,13 @@ 1.1.3 - 3.1.31 - 3.1.31 - 3.1.31 - 3.1.31 - 3.1.31 - 3.1.31-servicing.22514.1 - 3.1.31 + 3.1.32 + 3.1.32 + 3.1.32 + 3.1.32 + 3.1.32 + 3.1.32-servicing.22558.4 + 3.1.32 1.1.1 @@ -55,8 +55,8 @@ 3.1.6 3.1.25 3.1.0 - 3.1.31 - 3.1.31-servicing.22513.7 + 3.1.32 + 3.1.32-servicing.22558.2 2.1.0 From e3d5ff0f801eb3eeb49b038e3d9817eefbefee6b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Nov 2022 19:52:53 +0000 Subject: [PATCH 2/8] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-extensions build 20221116.2 Internal.AspNetCore.Analyzers , Microsoft.AspNetCore.Analyzer.Testing , Microsoft.AspNetCore.BenchmarkRunner.Sources , Microsoft.AspNetCore.Testing , Microsoft.Extensions.ActivatorUtilities.Sources , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Caching.SqlServer , Microsoft.Extensions.Caching.StackExchangeRedis , Microsoft.Extensions.CommandLineUtils.Sources , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.AzureKeyVault , 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.KeyPerFile , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DiagnosticAdapter , Microsoft.Extensions.Diagnostics.HealthChecks , Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HashCodeCombiner.Sources , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Localization , Microsoft.Extensions.Localization.Abstractions , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.AzureAppServices , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.Testing , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.ObjectPool , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.ParameterDefaultValue.Sources , Microsoft.Extensions.Primitives , Microsoft.Extensions.TypeNameHelper.Sources , Microsoft.Extensions.ValueStopwatch.Sources , Microsoft.Extensions.WebEncoders , Microsoft.JSInterop From Version 3.1.32-servicing.22558.4 -> To Version 3.1.32-servicing.22566.2 Dependency coherency updates Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 3.1.32 -> To Version 3.1.32 (parent: Microsoft.Extensions.Logging --- NuGet.config | 7 +- eng/Version.Details.xml | 150 ++++++++++++++++++++-------------------- eng/Versions.props | 4 +- 3 files changed, 81 insertions(+), 80 deletions(-) diff --git a/NuGet.config b/NuGet.config index 187db3454c7..ceb0e079563 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,10 +6,10 @@ - + - + @@ -24,12 +24,13 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea06a80d369..d3a1aa147aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-corefx @@ -33,85 +33,85 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup 3acd9b0cd16596bad450c82be08780875a73c05c - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 @@ -124,151 +124,151 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 - + https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-extensions - c0f0ea0044c93a814a1561d66dc129bc11b8c5e0 + 86e38007b27f3a464223908075c57f1d7f5ee649 https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - fb59fb7ddd618892c6e750046269dd4497b5c9ae + f94bb2c3ff432dcc4a6229eca2f978197bf06150 - + https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup - fb59fb7ddd618892c6e750046269dd4497b5c9ae + f94bb2c3ff432dcc4a6229eca2f978197bf06150 https://dev.azure.com/dnceng/internal/_git/dotnet-corefx diff --git a/eng/Versions.props b/eng/Versions.props index 2b312527fc7..f85c363f715 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,7 +37,7 @@ 3.1.32 3.1.32 3.1.32 - 3.1.32-servicing.22558.4 + 3.1.32-servicing.22566.2 3.1.32 @@ -56,7 +56,7 @@ 3.1.25 3.1.0 3.1.32 - 3.1.32-servicing.22558.2 + 3.1.32-servicing.22565.20 2.1.0 From be8c0ef30cee3b78a6a9a48836a06c8d49aedff0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Jan 2023 20:54:22 +0000 Subject: [PATCH 3/8] Update dependencies from https://github.com/dotnet/arcade build 20230110.4 (#30034) [release/7.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/cross/toolchain.cmake | 7 +++++++ eng/common/sdk-task.ps1 | 2 +- eng/common/templates/steps/source-build.yml | 6 ++++++ eng/common/tools.ps1 | 4 ++-- eng/common/tools.sh | 2 +- global.json | 4 ++-- 8 files changed, 26 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 268f3eb25c2..04753d16022 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,17 +39,17 @@ - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + ac5977ebf05451c1adcf24a15d16263e4d25fd0c - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + ac5977ebf05451c1adcf24a15d16263e4d25fd0c - + https://github.com/dotnet/arcade - f36ea231c234560514ede4c2747897a737ced28f + ac5977ebf05451c1adcf24a15d16263e4d25fd0c diff --git a/eng/Versions.props b/eng/Versions.props index 2692d334ed5..2f736155baf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,7 +25,7 @@ 7.0.0 - 7.0.0-beta.22561.2 + 7.0.0-beta.23060.4 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 561576be97c..96461052476 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -1,5 +1,12 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR}) +# reset platform variables (e.g. cmake 3.25 sets LINUX=1) +unset(LINUX) +unset(FREEBSD) +unset(ILLUMOS) +unset(ANDROID) +unset(TIZEN) + set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH}) if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version) set(CMAKE_SYSTEM_NAME FreeBSD) diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 39be08d4b16..e10a5968797 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.3.1" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.4.1" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 12a8ff94d8e..4624885e3bf 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -63,6 +63,11 @@ steps: targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + publishArgs= if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then publishArgs='--publish' @@ -75,6 +80,7 @@ steps: $internalRuntimeDownloadArgs \ $internalRestoreArgs \ $targetRidArgs \ + $runtimeOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true displayName: Build diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 44912694329..021555cf338 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -365,8 +365,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.3.1view=overview - $defaultXCopyMSBuildVersion = '17.3.1' + # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.4.1&view=overview + $defaultXCopyMSBuildVersion = '17.4.1' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/eng/common/tools.sh b/eng/common/tools.sh index c110d0ed410..e9a7ed9af67 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -511,7 +511,7 @@ global_json_file="${repo_root}global.json" # determine if global.json contains a "runtimes" entry global_json_has_runtimes=false if command -v jq &> /dev/null; then - if jq -er '. | select(has("runtimes"))' "$global_json_file" &> /dev/null; then + if jq -e '.tools | has("runtimes")' "$global_json_file" &> /dev/null; then global_json_has_runtimes=true fi elif [[ "$(cat "$global_json_file")" =~ \"runtimes\"[[:space:]\:]*\{ ]]; then diff --git a/global.json b/global.json index 83d2ed7e29e..369c4a69a23 100644 --- a/global.json +++ b/global.json @@ -8,7 +8,7 @@ "rollForward": "latestMajor" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22561.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22561.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23060.4", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23060.4" } } From 7e01882299f0d9df961835de3910409d603b55a2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Jan 2023 21:04:47 +0000 Subject: [PATCH 4/8] Update dependencies from https://github.com/dotnet/arcade build 20230110.6 (#30035) [release/6.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 8 ++++---- eng/common/cross/toolchain.cmake | 7 +++++++ eng/common/sdl/packages.config | 2 +- eng/common/templates/steps/source-build.yml | 6 ++++++ global.json | 4 ++-- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01c437f806d..687eb0d753e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,13 +47,13 @@ - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 74b7648c106865057c78ca1e4b2ffcb5e9bce071 - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 74b7648c106865057c78ca1e4b2ffcb5e9bce071 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index ec8971eb019..51f30e53dd4 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -1,5 +1,12 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR}) +# reset platform variables (e.g. cmake 3.25 sets LINUX=1) +unset(LINUX) +unset(FREEBSD) +unset(ILLUMOS) +unset(ANDROID) +unset(TIZEN) + set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH}) if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version) set(CMAKE_SYSTEM_NAME FreeBSD) diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 2cb42e3e7ba..b7bcfe38caf 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ - + diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index abb1b2bcda4..b5b3e5aeb3b 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -63,6 +63,11 @@ steps: targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + publishArgs= if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then publishArgs='--publish' @@ -75,6 +80,7 @@ steps: $internalRuntimeDownloadArgs \ $internalRestoreArgs \ $targetRidArgs \ + $runtimeOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true displayName: Build diff --git a/global.json b/global.json index c43383c8f2d..de237164bc1 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "rollForward": "latestMajor" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22561.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22561.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23060.6", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23060.6" } } From d11e568d4d92e722838f7a26461a90c7f982e7c8 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 11 Jan 2023 13:40:11 -0800 Subject: [PATCH 5/8] Update global.json --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index ddecf98d465..4ec712e23bf 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.425", + "dotnet": "3.1.426", "runtimes": { "dotnet": [ "2.1.30", @@ -9,7 +9,7 @@ } }, "sdk": { - "version": "3.1.425" + "version": "3.1.426" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.22558.6" From 895be6cfda29f887e2756c2f84a9dfaede19201d Mon Sep 17 00:00:00 2001 From: Shay Rojansky Date: Thu, 12 Jan 2023 19:19:28 +0100 Subject: [PATCH 6/8] [release/7.0] Fix split query over GroupBy over parameter (#30024) (#30030) Fixes https://github.com/dotnet/efcore/issues/30022 --- .../Properties/RelationalStrings.Designer.cs | 8 +++++ .../Properties/RelationalStrings.resx | 3 ++ .../SqlExpressions/SelectExpression.Helper.cs | 7 ++++- ...plexNavigationsCollectionsQueryTestBase.cs | 20 +++++++++++++ ...avigationsCollectionsQuerySqlServerTest.cs | 22 ++++++++++++++ ...CollectionsSharedTypeQuerySqlServerTest.cs | 22 ++++++++++++++ ...tionsCollectionsSplitQuerySqlServerTest.cs | 30 +++++++++++++++++++ ...avigationsCollectionsQuerySqlServerTest.cs | 22 ++++++++++++++ ...CollectionsSharedTypeQuerySqlServerTest.cs | 22 ++++++++++++++ 9 files changed, 155 insertions(+), 1 deletion(-) diff --git a/src/EFCore.Relational/Properties/RelationalStrings.Designer.cs b/src/EFCore.Relational/Properties/RelationalStrings.Designer.cs index c412f98f98d..f6662a87a73 100644 --- a/src/EFCore.Relational/Properties/RelationalStrings.Designer.cs +++ b/src/EFCore.Relational/Properties/RelationalStrings.Designer.cs @@ -1279,6 +1279,14 @@ public static string NoActiveTransaction public static string NoDbCommand => GetString("NoDbCommand"); + /// + /// Expression of type '{type}' isn't supported as the Values of an InExpression; only constants and parameters are supported. + /// + public static string NonConstantOrParameterAsInExpressionValues(object? type) + => string.Format( + GetString("NonConstantOrParameterAsInExpressionValues", nameof(type)), + type); + /// /// 'FindMapping' was called on a 'RelationalTypeMappingSource' with a non-relational 'TypeMappingInfo'. /// diff --git a/src/EFCore.Relational/Properties/RelationalStrings.resx b/src/EFCore.Relational/Properties/RelationalStrings.resx index 2b06d916915..5f48d12a3a2 100644 --- a/src/EFCore.Relational/Properties/RelationalStrings.resx +++ b/src/EFCore.Relational/Properties/RelationalStrings.resx @@ -899,6 +899,9 @@ Cannot create a DbCommand for a non-relational query. + + Expression of type '{type}' isn't supported as the Values of an InExpression; only constants and parameters are supported. + 'FindMapping' was called on a 'RelationalTypeMappingSource' with a non-relational 'TypeMappingInfo'. diff --git a/src/EFCore.Relational/Query/SqlExpressions/SelectExpression.Helper.cs b/src/EFCore.Relational/Query/SqlExpressions/SelectExpression.Helper.cs index b1681821729..66b61f2ea77 100644 --- a/src/EFCore.Relational/Query/SqlExpressions/SelectExpression.Helper.cs +++ b/src/EFCore.Relational/Query/SqlExpressions/SelectExpression.Helper.cs @@ -162,6 +162,9 @@ private sealed class SqlRemappingVisitor : ExpressionVisitor private readonly HashSet _correlatedTerms; private bool _groupByDiscovery; + private static readonly bool QuirkEnabled30022 + = AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue30022", out var enabled) && enabled; + public SqlRemappingVisitor( Dictionary mappings, SelectExpression subquery, @@ -210,7 +213,9 @@ when _groupByDiscovery case SqlExpression sqlExpression when !_groupByDiscovery - && sqlExpression is not SqlConstantExpression or SqlParameterExpression + && (QuirkEnabled30022 + ? sqlExpression is not SqlConstantExpression or SqlParameterExpression + : sqlExpression is not SqlConstantExpression and not SqlParameterExpression) && _correlatedTerms.Contains(sqlExpression): var outerColumn = _subquery.GenerateOuterColumn(_tableReferenceExpression, sqlExpression); _mappings[sqlExpression] = outerColumn; diff --git a/test/EFCore.Specification.Tests/Query/ComplexNavigationsCollectionsQueryTestBase.cs b/test/EFCore.Specification.Tests/Query/ComplexNavigationsCollectionsQueryTestBase.cs index 629c767f928..a5e3683aa7e 100644 --- a/test/EFCore.Specification.Tests/Query/ComplexNavigationsCollectionsQueryTestBase.cs +++ b/test/EFCore.Specification.Tests/Query/ComplexNavigationsCollectionsQueryTestBase.cs @@ -2197,6 +2197,26 @@ public virtual Task Skip_Take_on_grouping_element_inside_collection_projection(b }); }); + [ConditionalTheory] + [MemberData(nameof(IsAsyncData))] + public virtual Task Collection_projection_over_GroupBy_over_parameter(bool async) + { + var validIds = new List { "L1 01", "L1 02" }; + + return AssertQuery( + async, + ss => ss.Set() + .Where(l1 => validIds.Contains(l1.Name)) + .GroupBy(l => l.Date) + .Select(g => new { g.Key, Ids = g.Select(e => e.Id) }), + elementSorter: e => e.Key, + elementAsserter: (e, a) => + { + AssertEqual(e.Key, a.Key); + AssertCollection(e.Ids, a.Ids); + }); + } + [ConditionalTheory] [MemberData(nameof(IsAsyncData))] public virtual Task SelectMany_over_conditional_null_source(bool async) diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsQuerySqlServerTest.cs index 1ca2aa4195e..db21098eb41 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsQuerySqlServerTest.cs @@ -2319,6 +2319,28 @@ FROM [LevelOne] AS [l1] """); } + public override async Task Collection_projection_over_GroupBy_over_parameter(bool async) + { + await base.Collection_projection_over_GroupBy_over_parameter(async); + + AssertSql( +""" +SELECT [t].[Date], [t0].[Id] +FROM ( + SELECT [l].[Date] + FROM [LevelOne] AS [l] + WHERE [l].[Name] IN (N'L1 01', N'L1 02') + GROUP BY [l].[Date] +) AS [t] +LEFT JOIN ( + SELECT [l0].[Id], [l0].[Date] + FROM [LevelOne] AS [l0] + WHERE [l0].[Name] IN (N'L1 01', N'L1 02') +) AS [t0] ON [t].[Date] = [t0].[Date] +ORDER BY [t].[Date] +"""); + } + public override async Task Include_partially_added_before_Where_and_then_build_upon(bool async) { await base.Include_partially_added_before_Where_and_then_build_upon(async); diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsSharedTypeQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsSharedTypeQuerySqlServerTest.cs index b8a98df5351..f71d71a4b21 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsSharedTypeQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsSharedTypeQuerySqlServerTest.cs @@ -3003,6 +3003,28 @@ FROM [Level1] AS [l1] """); } + public override async Task Collection_projection_over_GroupBy_over_parameter(bool async) + { + await base.Collection_projection_over_GroupBy_over_parameter(async); + + AssertSql( +""" +SELECT [t].[Date], [t0].[Id] +FROM ( + SELECT [l].[Date] + FROM [Level1] AS [l] + WHERE [l].[Name] IN (N'L1 01', N'L1 02') + GROUP BY [l].[Date] +) AS [t] +LEFT JOIN ( + SELECT [l0].[Id], [l0].[Date] + FROM [Level1] AS [l0] + WHERE [l0].[Name] IN (N'L1 01', N'L1 02') +) AS [t0] ON [t].[Date] = [t0].[Date] +ORDER BY [t].[Date] +"""); + } + public override async Task Filtered_include_is_considered_loaded(bool async) { await base.Filtered_include_is_considered_loaded(async); diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsSplitQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsSplitQuerySqlServerTest.cs index c6a3d7f220c..fe870979d66 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsSplitQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/ComplexNavigationsCollectionsSplitQuerySqlServerTest.cs @@ -3728,6 +3728,36 @@ FROM [LevelOne] AS [l1] """); } + public override async Task Collection_projection_over_GroupBy_over_parameter(bool async) + { + await base.Collection_projection_over_GroupBy_over_parameter(async); + + AssertSql( +""" +SELECT [l].[Date] +FROM [LevelOne] AS [l] +WHERE [l].[Name] IN (N'L1 01', N'L1 02') +GROUP BY [l].[Date] +ORDER BY [l].[Date] +""", + // +""" +SELECT [t0].[Id], [t].[Date] +FROM ( + SELECT [l].[Date] + FROM [LevelOne] AS [l] + WHERE [l].[Name] IN (N'L1 01', N'L1 02') + GROUP BY [l].[Date] +) AS [t] +INNER JOIN ( + SELECT [l0].[Id], [l0].[Date] + FROM [LevelOne] AS [l0] + WHERE [l0].[Name] IN (N'L1 01', N'L1 02') +) AS [t0] ON [t].[Date] = [t0].[Date] +ORDER BY [t].[Date] +"""); + } + public override async Task Include_partially_added_before_Where_and_then_build_upon(bool async) { await base.Include_partially_added_before_Where_and_then_build_upon(async); diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalComplexNavigationsCollectionsQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalComplexNavigationsCollectionsQuerySqlServerTest.cs index 23a82d8e294..6e0e6fb9897 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalComplexNavigationsCollectionsQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalComplexNavigationsCollectionsQuerySqlServerTest.cs @@ -2293,6 +2293,28 @@ LEFT JOIN ( """); } + public override async Task Collection_projection_over_GroupBy_over_parameter(bool async) + { + await base.Collection_projection_over_GroupBy_over_parameter(async); + + AssertSql( +""" +SELECT [t].[Date], [t0].[Id] +FROM ( + SELECT [l].[Date] + FROM [LevelOne] FOR SYSTEM_TIME AS OF '2010-01-01T00:00:00.0000000' AS [l] + WHERE [l].[Name] IN (N'L1 01', N'L1 02') + GROUP BY [l].[Date] +) AS [t] +LEFT JOIN ( + SELECT [l0].[Id], [l0].[Date] + FROM [LevelOne] FOR SYSTEM_TIME AS OF '2010-01-01T00:00:00.0000000' AS [l0] + WHERE [l0].[Name] IN (N'L1 01', N'L1 02') +) AS [t0] ON [t].[Date] = [t0].[Date] +ORDER BY [t].[Date] +"""); + } + public override async Task Multiple_SelectMany_navigation_property_followed_by_select_collection_navigation(bool async) { await base.Multiple_SelectMany_navigation_property_followed_by_select_collection_navigation(async); diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalComplexNavigationsCollectionsSharedTypeQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalComplexNavigationsCollectionsSharedTypeQuerySqlServerTest.cs index 530015ae98b..1483e73500a 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/TemporalComplexNavigationsCollectionsSharedTypeQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/TemporalComplexNavigationsCollectionsSharedTypeQuerySqlServerTest.cs @@ -3021,6 +3021,28 @@ LEFT JOIN ( """); } + public override async Task Collection_projection_over_GroupBy_over_parameter(bool async) + { + await base.Collection_projection_over_GroupBy_over_parameter(async); + + AssertSql( +""" +SELECT [t].[Date], [t0].[Id] +FROM ( + SELECT [l].[Date] + FROM [Level1] FOR SYSTEM_TIME AS OF '2010-01-01T00:00:00.0000000' AS [l] + WHERE [l].[Name] IN (N'L1 01', N'L1 02') + GROUP BY [l].[Date] +) AS [t] +LEFT JOIN ( + SELECT [l0].[Id], [l0].[Date] + FROM [Level1] FOR SYSTEM_TIME AS OF '2010-01-01T00:00:00.0000000' AS [l0] + WHERE [l0].[Name] IN (N'L1 01', N'L1 02') +) AS [t0] ON [t].[Date] = [t0].[Date] +ORDER BY [t].[Date] +"""); + } + public override async Task Skip_Take_on_grouping_element_into_non_entity(bool async) { await base.Skip_Take_on_grouping_element_into_non_entity(async); From 21c33ba631ec1a9368864da6d33d9f43b678aa2d Mon Sep 17 00:00:00 2001 From: Brice Lambson Date: Thu, 12 Jan 2023 10:19:40 -0800 Subject: [PATCH 7/8] [release/7.0] Update to SQLitePCLRaw 2.1.4 (#30036) Fixes https://github.com/dotnet/efcore/issues/29584 --- .../EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj | 2 +- src/EFCore.Sqlite/EFCore.Sqlite.csproj | 2 +- .../Microsoft.Data.Sqlite.Core.csproj | 2 +- src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj | 2 +- test/EFCore.Design.Tests/EFCore.Design.Tests.csproj | 2 +- .../EFCore.Sqlite.FunctionalTests.csproj | 2 +- .../Microsoft.Data.Sqlite.Tests.csproj | 2 +- .../Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj | 2 +- .../Microsoft.Data.Sqlite.sqlite3.Tests.csproj | 2 +- .../Microsoft.Data.Sqlite.winsqlite3.Tests.csproj | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj b/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj index 48d03de0c49..529babd50fa 100644 --- a/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj +++ b/benchmark/EFCore.Sqlite.Benchmarks/EFCore.Sqlite.Benchmarks.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/EFCore.Sqlite/EFCore.Sqlite.csproj b/src/EFCore.Sqlite/EFCore.Sqlite.csproj index cf434b475e8..a7189046232 100644 --- a/src/EFCore.Sqlite/EFCore.Sqlite.csproj +++ b/src/EFCore.Sqlite/EFCore.Sqlite.csproj @@ -47,7 +47,7 @@ - + diff --git a/src/Microsoft.Data.Sqlite.Core/Microsoft.Data.Sqlite.Core.csproj b/src/Microsoft.Data.Sqlite.Core/Microsoft.Data.Sqlite.Core.csproj index 9a4adce8145..bd090164db4 100644 --- a/src/Microsoft.Data.Sqlite.Core/Microsoft.Data.Sqlite.Core.csproj +++ b/src/Microsoft.Data.Sqlite.Core/Microsoft.Data.Sqlite.Core.csproj @@ -39,7 +39,7 @@ Microsoft.Data.Sqlite.SqliteTransaction - + diff --git a/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj b/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj index 68782e5b514..5b91103f1a2 100644 --- a/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj +++ b/src/Microsoft.Data.Sqlite/Microsoft.Data.Sqlite.csproj @@ -24,7 +24,7 @@ Microsoft.Data.Sqlite.SqliteTransaction - + diff --git a/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj b/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj index 4d4ff690a07..89d1431daa7 100644 --- a/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj +++ b/test/EFCore.Design.Tests/EFCore.Design.Tests.csproj @@ -57,7 +57,7 @@ - + diff --git a/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj b/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj index a59a6b8c572..93c5cd05c41 100644 --- a/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj +++ b/test/EFCore.Sqlite.FunctionalTests/EFCore.Sqlite.FunctionalTests.csproj @@ -53,7 +53,7 @@ - + diff --git a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj index 9f959b8712b..a680d75d821 100644 --- a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj +++ b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj index 5a2ef8bbed0..8219e6aca8f 100644 --- a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj +++ b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.e_sqlcipher.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3.Tests.csproj b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3.Tests.csproj index c513f8befbc..5ac34c0adc7 100644 --- a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3.Tests.csproj +++ b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.sqlite3.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.winsqlite3.Tests.csproj b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.winsqlite3.Tests.csproj index c51d7e22ebf..6c3a97e4b68 100644 --- a/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.winsqlite3.Tests.csproj +++ b/test/Microsoft.Data.Sqlite.Tests/Microsoft.Data.Sqlite.winsqlite3.Tests.csproj @@ -11,7 +11,7 @@ - + From 10f1d396d4669de55b1e46899e353f4914bf2c85 Mon Sep 17 00:00:00 2001 From: Shay Rojansky Date: Thu, 12 Jan 2023 19:20:01 +0100 Subject: [PATCH 8/8] [release/7.0] Correct [Obsolete] message for AutoTransactionBehavior (#30040) --- src/EFCore/Infrastructure/DatabaseFacade.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/EFCore/Infrastructure/DatabaseFacade.cs b/src/EFCore/Infrastructure/DatabaseFacade.cs index 7066e76e3ad..7288fc5b8e8 100644 --- a/src/EFCore/Infrastructure/DatabaseFacade.cs +++ b/src/EFCore/Infrastructure/DatabaseFacade.cs @@ -396,7 +396,7 @@ public virtual IDbContextTransaction? CurrentTransaction /// See Transactions in EF Core for more information and examples. /// /// - [Obsolete("Use EnableAutoTransactions instead")] + [Obsolete("Use " + nameof(AutoTransactionBehavior) + " instead")] public virtual bool AutoTransactionsEnabled { get => AutoTransactionBehavior is AutoTransactionBehavior.Always or AutoTransactionBehavior.WhenNeeded;