Cache root application service provider.

dotnet · Dec 31, 2022 · f5b4966 · f5b4966
1 parent 13db9f1
commit f5b4966
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/EFCore/Infrastructure/CoreOptionsExtension.cs b/src/EFCore/Infrastructure/CoreOptionsExtension.cs
@@ -130,6 +130,9 @@ public virtual CoreOptionsExtension WithApplicationServiceProvider(IServiceProvi
         var clone = Clone();
 
         clone._applicationServiceProvider = applicationServiceProvider;
+        clone._rootApplicationServiceProvider ??= _autoResolveResolveRootProvider
+            ? applicationServiceProvider?.GetService<ServiceProviderAccessor>()?.RootServiceProvider
+            : null;
 
         return clone;
     }
@@ -160,6 +163,9 @@ public virtual CoreOptionsExtension WithAutoResolveRootApplicationServiceProvide
         var clone = Clone();
 
         clone._autoResolveResolveRootProvider = autoResolve;
+        clone._rootApplicationServiceProvider ??= autoResolve
+            ? _applicationServiceProvider?.GetService<ServiceProviderAccessor>()?.RootServiceProvider
+            : null;
 
         return clone;
     }
@@ -458,10 +464,7 @@ public virtual IServiceProvider? ApplicationServiceProvider
     ///     The option set from the <see cref="DbContextOptionsBuilder.UseRootApplicationServiceProvider" /> method.
     /// </summary>
     public virtual IServiceProvider? RootApplicationServiceProvider
-        => _rootApplicationServiceProvider
-            ?? (_autoResolveResolveRootProvider
-                ? _applicationServiceProvider?.GetService<ServiceProviderAccessor>()?.RootServiceProvider
-                : null);
+        => _rootApplicationServiceProvider;
 
     /// <summary>
     ///     The option set from the <see cref="DbContextOptionsBuilder.UseRootApplicationServiceProvider" /> method.