Don't store ApplicationServiceProvider in the service provider cache …

…key. Fixes #27169
dotnet · Jan 18, 2022 · e680870 · e680870
1 parent e7fa151
commit e680870
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/src/EFCore/Internal/ServiceProviderCache.cs b/src/EFCore/Internal/ServiceProviderCache.cs
@@ -62,16 +62,26 @@ public virtual IServiceProvider GetOrAdd(IDbContextOptions options, bool provide
 
             if (coreOptionsExtension?.ServiceProviderCachingEnabled == false)
             {
-                return BuildServiceProvider(options, _configurations).ServiceProvider;
+                return BuildServiceProvider(options, (_configurations, options)).ServiceProvider;
             }
 
-            return _configurations.GetOrAdd(options, BuildServiceProvider, _configurations).ServiceProvider;
+            var cacheKey = options;
+            var extension = options.FindExtension<CoreOptionsExtension>();
+            if (extension != null
+                && extension.ApplicationServiceProvider != null)
+            {
+                cacheKey = ((DbContextOptions)options).WithExtension(extension.WithApplicationServiceProvider(null));
+            }
+
+            return _configurations.GetOrAdd(cacheKey, BuildServiceProvider, (_configurations, options)).ServiceProvider;
 
             static (IServiceProvider ServiceProvider, IDictionary<string, string> DebugInfo) BuildServiceProvider(
-                IDbContextOptions options,
-                ConcurrentDictionary<IDbContextOptions, (IServiceProvider ServiceProvider, IDictionary<string, string> DebugInfo)>
-                    configurations)
+                IDbContextOptions _,
+                (ConcurrentDictionary<IDbContextOptions, (IServiceProvider ServiceProvider, IDictionary<string, string> DebugInfo)>,
+                IDbContextOptions) arguments)
             {
+                var (configurations, options) = arguments;
+
                 ValidateOptions(options);
 
                 var debugInfo = new Dictionary<string, string>();