Upgrade to Cosmos SDK V4

Fixes #18753
dotnet · Jun 17, 2020 · 547b7b0 · 547b7b0
1 parent 0850830
commit 547b7b0
Show file tree

Hide file tree

Showing 19 changed files with 279 additions and 360 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,7 +8,7 @@ updates:
       - dependency-name: Castle.Core
       - dependency-name: Humanizer.Core
       - dependency-name: IdentityServer4.EntityFramework
-      - dependency-name: Microsoft.Azure.Cosmos
+      - dependency-name: Azure.Cosmos
       - dependency-name: Microsoft.CSharp
       - dependency-name: Microsoft.Data.SqlClient
       - dependency-name: Microsoft.DotNet.PlatformAbstractions

diff --git a/src/EFCore.Cosmos/EFCore.Cosmos.csproj b/src/EFCore.Cosmos/EFCore.Cosmos.csproj
@@ -21,7 +21,7 @@
 
   <ItemGroup>
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.9.1" />
+    <PackageReference Include="Azure.Cosmos" Version="4.0.0-preview3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/EFCore.Cosmos/Extensions/CosmosDatabaseFacadeExtensions.cs b/src/EFCore.Cosmos/Extensions/CosmosDatabaseFacadeExtensions.cs
@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Azure.Cosmos;
 using JetBrains.Annotations;
-using Microsoft.Azure.Cosmos;
 using Microsoft.EntityFrameworkCore.Cosmos.Infrastructure.Internal;
 using Microsoft.EntityFrameworkCore.Cosmos.Internal;
 using Microsoft.EntityFrameworkCore.Cosmos.Storage.Internal;

diff --git a/src/EFCore.Cosmos/Infrastructure/CosmosDbContextOptionsBuilder.cs b/src/EFCore.Cosmos/Infrastructure/CosmosDbContextOptionsBuilder.cs
@@ -4,8 +4,8 @@
 using System;
 using System.ComponentModel;
 using System.Net;
+using Azure.Cosmos;
 using JetBrains.Annotations;
-using Microsoft.Azure.Cosmos;
 using Microsoft.EntityFrameworkCore.Cosmos.Infrastructure.Internal;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.Utilities;
@@ -59,14 +59,6 @@ public virtual CosmosDbContextOptionsBuilder Region([NotNull] string region)
         public virtual CosmosDbContextOptionsBuilder LimitToEndpoint(bool enable = true)
             => WithOption(e => e.WithLimitToEndpoint(Check.NotNull(enable, nameof(enable))));
 
-        /// <summary>
-        ///     Allows optimistic batching of requests to service. Setting this option might impact the latency of the operations.
-        ///     Hence this option is recommended for non-latency sensitive scenarios only.
-        /// </summary>
-        /// <param name="enable"> <see langword="true"/> to allow optimistic batching of requests to service. </param>
-        public virtual CosmosDbContextOptionsBuilder AllowBulkExecution(bool enable = true)
-            => WithOption(e => e.WithAllowBulkExecution(Check.NotNull(enable, nameof(enable))));
-
         /// <summary>
         ///     Configures the context to use the provided connection mode.
         /// </summary>
@@ -103,20 +95,6 @@ public virtual CosmosDbContextOptionsBuilder OpenTcpConnectionTimeout(TimeSpan t
         public virtual CosmosDbContextOptionsBuilder IdleTcpConnectionTimeout(TimeSpan timeout)
             => WithOption(e => e.WithIdleTcpConnectionTimeout(Check.NotNull(timeout, nameof(timeout))));
 
-        /// <summary>
-        ///     Configures the client port reuse policy used by the transport stack.
-        /// </summary>
-        /// <param name="portReuseMode"> The client port reuse policy used by the transport stack. </param>
-        public virtual CosmosDbContextOptionsBuilder PortReuseMode(PortReuseMode portReuseMode)
-            => WithOption(e => e.WithPortReuseMode(Check.NotNull(portReuseMode, nameof(portReuseMode))));
-
-        /// <summary>
-        ///     Configures the context to enable address cache refresh on TCP connection reset notification.
-        /// </summary>
-        /// <param name="enabled"> <see langword="true"/> to enable address cache refresh on TCP connection reset notification. </param>
-        public virtual CosmosDbContextOptionsBuilder EnableTcpConnectionEndpointRediscovery(bool enabled = true)
-            => WithOption(e => e.WithTcpConnectionEndpointRediscovery(Check.NotNull(enabled, nameof(enabled))));
-
         /// <summary>
         ///     Configures the maximum number of concurrent connections allowed for the target service endpoint
         ///     in the Azure Cosmos DB service.

diff --git a/src/EFCore.Cosmos/Infrastructure/Internal/CosmosDbOptionExtension.cs b/src/EFCore.Cosmos/Infrastructure/Internal/CosmosDbOptionExtension.cs
@@ -6,8 +6,8 @@
 using System.Globalization;
 using System.Net;
 using System.Text;
+using Azure.Cosmos;
 using JetBrains.Annotations;
-using Microsoft.Azure.Cosmos;
 using Microsoft.EntityFrameworkCore.Cosmos.Internal;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage;
@@ -31,14 +31,11 @@ public class CosmosOptionsExtension : IDbContextOptionsExtension
         private string _region;
         private ConnectionMode? _connectionMode;
         private bool? _limitToEndpoint;
-        private bool? _allowBulkExecution;
         private Func<ExecutionStrategyDependencies, IExecutionStrategy> _executionStrategyFactory;
         private IWebProxy _webProxy;
         private TimeSpan? _requestTimeout;
         private TimeSpan? _openTcpConnectionTimeout;
         private TimeSpan? _idleTcpConnectionTimeout;
-        private PortReuseMode? _portReuseMode;
-        private bool? _enableTcpConnectionEndpointRediscovery;
         private int? _gatewayModeMaxConnectionLimit;
         private int? _maxTcpConnectionsPerEndpoint;
         private int? _maxRequestsPerTcpConnection;
@@ -69,14 +66,11 @@ protected CosmosOptionsExtension([NotNull] CosmosOptionsExtension copyFrom)
             _region = copyFrom._region;
             _connectionMode = copyFrom._connectionMode;
             _limitToEndpoint = copyFrom._limitToEndpoint;
-            _allowBulkExecution = copyFrom._allowBulkExecution;
             _executionStrategyFactory = copyFrom._executionStrategyFactory;
             _webProxy = copyFrom._webProxy;
             _requestTimeout = copyFrom._requestTimeout;
             _openTcpConnectionTimeout = copyFrom._openTcpConnectionTimeout;
             _idleTcpConnectionTimeout = copyFrom._idleTcpConnectionTimeout;
-            _portReuseMode = copyFrom._portReuseMode;
-            _enableTcpConnectionEndpointRediscovery = copyFrom._enableTcpConnectionEndpointRediscovery;
             _gatewayModeMaxConnectionLimit = copyFrom._gatewayModeMaxConnectionLimit;
             _maxTcpConnectionsPerEndpoint = copyFrom._maxTcpConnectionsPerEndpoint;
             _maxRequestsPerTcpConnection = copyFrom._maxRequestsPerTcpConnection;
@@ -244,29 +238,6 @@ public virtual CosmosOptionsExtension WithLimitToEndpoint(bool enable)
             return clone;
         }
 
-        /// <summary>
-        ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-        ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-        ///     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 bool? AllowBulkExecution => _allowBulkExecution;
-
-        /// <summary>
-        ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-        ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-        ///     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 CosmosOptionsExtension WithAllowBulkExecution(bool enable)
-        {
-            var clone = Clone();
-
-            clone._allowBulkExecution = enable;
-
-            return clone;
-        }
-
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
         ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
@@ -387,52 +358,6 @@ public virtual CosmosOptionsExtension WithIdleTcpConnectionTimeout(TimeSpan time
             return clone;
         }
 
-        /// <summary>
-        ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-        ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-        ///     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 PortReuseMode? PortReuseMode => _portReuseMode;
-
-        /// <summary>
-        ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-        ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-        ///     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 CosmosOptionsExtension WithPortReuseMode(PortReuseMode portReuseMode)
-        {
-            var clone = Clone();
-
-            clone._portReuseMode = portReuseMode;
-
-            return clone;
-        }
-
-        /// <summary>
-        ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-        ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-        ///     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 bool? TcpConnectionEndpointRediscoveryEnabled => _enableTcpConnectionEndpointRediscovery;
-
-        /// <summary>
-        ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-        ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-        ///     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 CosmosOptionsExtension WithTcpConnectionEndpointRediscovery(bool enable)
-        {
-            var clone = Clone();
-
-            clone._enableTcpConnectionEndpointRediscovery = enable;
-
-            return clone;
-        }
-
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
         ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
@@ -584,13 +509,10 @@ public override long GetServiceProviderHashCode()
                     hashCode = (hashCode * 397) ^ (Extension._region?.GetHashCode() ?? 0);
                     hashCode = (hashCode * 3) ^ (Extension._connectionMode?.GetHashCode() ?? 0);
                     hashCode = (hashCode * 3) ^ (Extension._limitToEndpoint?.GetHashCode() ?? 0);
-                    hashCode = (hashCode * 3) ^ (Extension._allowBulkExecution?.GetHashCode() ?? 0);
                     hashCode = (hashCode * 397) ^ (Extension._webProxy?.GetHashCode() ?? 0);
                     hashCode = (hashCode * 397) ^ (Extension._requestTimeout?.GetHashCode() ?? 0);
                     hashCode = (hashCode * 397) ^ (Extension._openTcpConnectionTimeout?.GetHashCode() ?? 0);
                     hashCode = (hashCode * 397) ^ (Extension._idleTcpConnectionTimeout?.GetHashCode() ?? 0);
-                    hashCode = (hashCode * 3) ^ (Extension._portReuseMode?.GetHashCode() ?? 0);
-                    hashCode = (hashCode * 3) ^ (Extension._enableTcpConnectionEndpointRediscovery?.GetHashCode() ?? 0);
                     hashCode = (hashCode * 131) ^ (Extension._gatewayModeMaxConnectionLimit?.GetHashCode() ?? 0);
                     hashCode = (hashCode * 397) ^ (Extension._maxTcpConnectionsPerEndpoint?.GetHashCode() ?? 0);
                     hashCode = (hashCode * 131) ^ (Extension._maxRequestsPerTcpConnection?.GetHashCode() ?? 0);

diff --git a/src/EFCore.Cosmos/Infrastructure/Internal/CosmosSingletonOptions.cs b/src/EFCore.Cosmos/Infrastructure/Internal/CosmosSingletonOptions.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Net;
+using Azure.Cosmos;
 using Microsoft.Azure.Cosmos;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -65,14 +66,6 @@ public class CosmosSingletonOptions : ICosmosSingletonOptions
         /// </summary>
         public virtual bool? LimitToEndpoint { get; private set; }
 
-        /// <summary>
-        ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-        ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-        ///     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 bool? AllowBulkExecution { get; private set; }
-
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
         ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
@@ -113,22 +106,6 @@ public class CosmosSingletonOptions : ICosmosSingletonOptions
         /// </summary>
         public virtual TimeSpan? IdleTcpConnectionTimeout { get; private set; }
 
-        /// <summary>
-        ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-        ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-        ///     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 PortReuseMode? PortReuseMode { get; private set; }
-
-        /// <summary>
-        ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-        ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-        ///     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 bool? TcpConnectionEndpointRediscoveryEnabled { get; private set; }
-
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
         ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
@@ -169,14 +146,11 @@ public virtual void Initialize(IDbContextOptions options)
                 ConnectionString = cosmosOptions.ConnectionString;
                 Region = cosmosOptions.Region;
                 LimitToEndpoint = cosmosOptions.LimitToEndpoint;
-                AllowBulkExecution = cosmosOptions.AllowBulkExecution;
                 ConnectionMode = cosmosOptions.ConnectionMode;
                 WebProxy = cosmosOptions.WebProxy;
                 RequestTimeout = cosmosOptions.RequestTimeout;
                 OpenTcpConnectionTimeout = cosmosOptions.OpenTcpConnectionTimeout;
                 IdleTcpConnectionTimeout = cosmosOptions.IdleTcpConnectionTimeout;
-                PortReuseMode = cosmosOptions.PortReuseMode;
-                TcpConnectionEndpointRediscoveryEnabled = cosmosOptions.TcpConnectionEndpointRediscoveryEnabled;
                 GatewayModeMaxConnectionLimit = cosmosOptions.GatewayModeMaxConnectionLimit;
                 MaxTcpConnectionsPerEndpoint = cosmosOptions.MaxTcpConnectionsPerEndpoint;
                 MaxRequestsPerTcpConnection = cosmosOptions.MaxRequestsPerTcpConnection;
@@ -199,14 +173,11 @@ public virtual void Validate(IDbContextOptions options)
                     || ConnectionString != cosmosOptions.ConnectionString
                     || Region != cosmosOptions.Region
                     || LimitToEndpoint != cosmosOptions.LimitToEndpoint
-                    || AllowBulkExecution != cosmosOptions.AllowBulkExecution
                     || ConnectionMode != cosmosOptions.ConnectionMode
                     || WebProxy != cosmosOptions.WebProxy
                     || RequestTimeout != cosmosOptions.RequestTimeout
                     || OpenTcpConnectionTimeout != cosmosOptions.OpenTcpConnectionTimeout
                     || IdleTcpConnectionTimeout != cosmosOptions.IdleTcpConnectionTimeout
-                    || PortReuseMode != cosmosOptions.PortReuseMode
-                    || TcpConnectionEndpointRediscoveryEnabled != cosmosOptions.TcpConnectionEndpointRediscoveryEnabled
                     || GatewayModeMaxConnectionLimit != cosmosOptions.GatewayModeMaxConnectionLimit
                     || MaxTcpConnectionsPerEndpoint != cosmosOptions.MaxTcpConnectionsPerEndpoint
                     || MaxRequestsPerTcpConnection != cosmosOptions.MaxRequestsPerTcpConnection))

diff --git a/src/EFCore.Cosmos/Infrastructure/Internal/ICosmosSingletonOptions.cs b/src/EFCore.Cosmos/Infrastructure/Internal/ICosmosSingletonOptions.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.Net;
-using Microsoft.Azure.Cosmos;
+using Azure.Cosmos;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -65,14 +65,6 @@ public interface ICosmosSingletonOptions : ISingletonOptions
         /// </summary>
         bool? LimitToEndpoint { get; }
 
-        /// <summary>
-        ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-        ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-        ///     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>
-        bool? AllowBulkExecution { get; }
-
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
         ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
@@ -113,22 +105,6 @@ public interface ICosmosSingletonOptions : ISingletonOptions
         /// </summary>
         TimeSpan? IdleTcpConnectionTimeout { get; }
 
-        /// <summary>
-        ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-        ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-        ///     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>
-        PortReuseMode? PortReuseMode { get; }
-
-        /// <summary>
-        ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
-        ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
-        ///     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>
-        bool? TcpConnectionEndpointRediscoveryEnabled { get; }
-
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
         ///     the same compatibility standards as public APIs. It may be changed or removed without notice in