[automated] Merge branch 'release/10.0' => 'main' (#36812)

* Update dependencies from https://github.com/dotnet/dotnet build 283422
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25464.104 -> 10.0.0-beta.25466.101)
Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Logging, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Formats.Asn1, System.Runtime.Caching, System.Text.Encodings.Web, System.Text.Json (Version 10.0.0-rc.2.25464.104 -> 10.0.0-rc.2.25466.101)

* [rc2] Fix race condition in SingletonCosmosClientWrapper.Client (#36767)

Fixes #36714

Co-authored-by: AndriySvyryd <[email protected]>

* Fix ExecuteUpdate parameters for multiple properties with same name (#36792)

And validate against null required properties in JSON serialization.

Fixes #36791

* Stop transforming complex property access to EF.Property (#36786)

Fixes #36761

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jiri Cincura ↹ <[email protected]>
Co-authored-by: Copilot <[email protected]>
Co-authored-by: AndriySvyryd <[email protected]>
Co-authored-by: Shay Rojansky <[email protected]>

Author: 6 people

src/EFCore.Cosmos/Metadata/Conventions/Internal/CosmosConventionSetBuilder.cs

@@ -82,7 +82,7 @@ private static IServiceScope CreateServiceScope()
         var serviceProvider = new ServiceCollection()
             .AddEntityFrameworkCosmos()
             .AddDbContext<DbContext>((p, o) =>
-                o.UseCosmos("localhost", "_", "_")
+                o.UseCosmos("https://localhost:8081", "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==", "_")
                     .UseInternalServiceProvider(p))
             .BuildServiceProvider();
 

src/EFCore.Cosmos/Query/Internal/CosmosQueryTranslationPostprocessorFactory.cs

@@ -25,6 +25,7 @@ public class CosmosQueryTranslationPostprocessorFactory(
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
+    [DebuggerStepThrough]
     public virtual QueryTranslationPostprocessor Create(QueryCompilationContext queryCompilationContext)
         => new CosmosQueryTranslationPostprocessor(
             Dependencies,

src/EFCore.Cosmos/Query/Internal/CosmosQueryTranslationPreprocessorFactory.cs

@@ -23,6 +23,7 @@ public class CosmosQueryTranslationPreprocessorFactory(QueryTranslationPreproces
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
+    [DebuggerStepThrough]
     public virtual QueryTranslationPreprocessor Create(QueryCompilationContext queryCompilationContext)
         => new CosmosQueryTranslationPreprocessor(Dependencies, (CosmosQueryCompilationContext)queryCompilationContext);
 }

src/EFCore.Cosmos/Query/Internal/CosmosQueryableMethodTranslatingExpressionVisitorFactory.cs

@@ -28,6 +28,7 @@ public class CosmosQueryableMethodTranslatingExpressionVisitorFactory(
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
+    [DebuggerStepThrough]
     public virtual QueryableMethodTranslatingExpressionVisitor Create(QueryCompilationContext queryCompilationContext)
         => new CosmosQueryableMethodTranslatingExpressionVisitor(
             Dependencies,

src/EFCore.Cosmos/Query/Internal/CosmosShapedQueryCompilingExpressionVisitorFactory.cs

@@ -28,6 +28,7 @@ public class CosmosShapedQueryCompilingExpressionVisitorFactory(
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
+    [DebuggerStepThrough]
     public virtual ShapedQueryCompilingExpressionVisitor Create(QueryCompilationContext queryCompilationContext)
         => new CosmosShapedQueryCompilingExpressionVisitor(
             Dependencies,

src/EFCore.Cosmos/Storage/Internal/SingletonCosmosClientWrapper.cs

@@ -16,12 +16,7 @@ namespace Microsoft.EntityFrameworkCore.Cosmos.Storage.Internal;
 public class SingletonCosmosClientWrapper : ISingletonCosmosClientWrapper
 {
     private static readonly string UserAgent = " Microsoft.EntityFrameworkCore.Cosmos/" + ProductInfo.GetVersion();
-    private readonly CosmosClientOptions _options;
-    private readonly string? _endpoint;
-    private readonly string? _key;
-    private readonly string? _connectionString;
-    private readonly TokenCredential? _tokenCredential;
-    private CosmosClient? _client;
+    private readonly CosmosClient _client;
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
@@ -31,10 +26,6 @@ public class SingletonCosmosClientWrapper : ISingletonCosmosClientWrapper
     /// </summary>
     public SingletonCosmosClientWrapper(ICosmosSingletonOptions options)
     {
-        _endpoint = options.AccountEndpoint;
-        _key = options.AccountKey;
-        _connectionString = options.ConnectionString;
-        _tokenCredential = options.TokenCredential;
         var configuration = new CosmosClientOptions { ApplicationName = UserAgent, Serializer = new JsonCosmosSerializer() };
 
         if (options.Region != null)
@@ -97,7 +88,13 @@ public SingletonCosmosClientWrapper(ICosmosSingletonOptions options)
             configuration.HttpClientFactory = options.HttpClientFactory;
         }
 
-        _options = configuration;
+        _client = options switch
+        {
+            { ConnectionString: not null and not "" } => new CosmosClient(options.ConnectionString, configuration),
+            { TokenCredential: not null } => new CosmosClient(options.AccountEndpoint, options.TokenCredential, configuration),
+            { AccountEndpoint: not null } => new CosmosClient(options.AccountEndpoint, options.AccountKey, configuration),
+            _ => throw new InvalidOperationException(CosmosStrings.ConnectionInfoMissing)
+        };
     }
 
     /// <summary>
@@ -106,14 +103,7 @@ public SingletonCosmosClientWrapper(ICosmosSingletonOptions options)
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public virtual CosmosClient Client
-        => _client ??= string.IsNullOrEmpty(_connectionString)
-            ? _tokenCredential == null
-                ? _endpoint == null
-                    ? throw new InvalidOperationException(CosmosStrings.ConnectionInfoMissing)
-                    : new CosmosClient(_endpoint, _key, _options)
-                : new CosmosClient(_endpoint, _tokenCredential, _options)
-            : new CosmosClient(_connectionString, _options);
+    public virtual CosmosClient Client => _client;
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
@@ -123,7 +113,6 @@ public virtual CosmosClient Client
     /// </summary>
     public virtual void Dispose()
     {
-        _client?.Dispose();
-        _client = null;
+        _client.Dispose();
     }
 }

src/EFCore.InMemory/Query/Internal/InMemoryQueryTranslationPreprocessorFactory.cs

@@ -32,6 +32,7 @@ public InMemoryQueryTranslationPreprocessorFactory(
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
+    [DebuggerStepThrough]
     public virtual QueryTranslationPreprocessor Create(QueryCompilationContext queryCompilationContext)
         => new InMemoryQueryTranslationPreprocessor(Dependencies, queryCompilationContext);
 }

src/EFCore.InMemory/Query/Internal/InMemoryQueryableMethodTranslatingExpressionVisitorFactory.cs

@@ -32,6 +32,7 @@ public InMemoryQueryableMethodTranslatingExpressionVisitorFactory(
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
+    [DebuggerStepThrough]
     public virtual QueryableMethodTranslatingExpressionVisitor Create(QueryCompilationContext queryCompilationContext)
         => new InMemoryQueryableMethodTranslatingExpressionVisitor(Dependencies, queryCompilationContext);
 }

src/EFCore.InMemory/Query/Internal/InMemoryShapedQueryExpressionVisitorFactory.cs

@@ -32,6 +32,7 @@ public InMemoryShapedQueryCompilingExpressionVisitorFactory(
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
+    [DebuggerStepThrough]
     public virtual ShapedQueryCompilingExpressionVisitor Create(QueryCompilationContext queryCompilationContext)
         => new InMemoryShapedQueryCompilingExpressionVisitor(Dependencies, queryCompilationContext);
 }