fixing scoped services for DryIoc

dansiegel · Nov 28, 2019 · 32bf5de · 32bf5de
1 parent 00239cc
commit 32bf5de
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/Prism.DryIoc.Extensions/PrismContainerExtension.cs b/src/Prism.DryIoc.Extensions/PrismContainerExtension.cs
@@ -82,7 +82,7 @@ private PrismContainerExtension(IContainer container)
             Instance.UseInstance<IServiceProvider>(this);
         }
 
-        private IDisposable _currentScope;
+        private IResolverContext _currentScope;
 
         public IContainer Instance { get; private set; }
 
@@ -222,20 +222,23 @@ public IContainerRegistry RegisterScopedFromDelegate(Type serviceType, Func<ISer
         void IScopeProvider.CreateScope()
         {
             _currentScope?.Dispose();
+            _currentScope = null;
+            GC.Collect();
             _currentScope = Instance.OpenScope();
         }
 
         public object Resolve(Type type) => 
-            Resolve(type, new (Type, object)[0]);
+            Resolve(type, Array.Empty<(Type, object)>());
 
         public object Resolve(Type type, string name) =>
-            Resolve(type, name, new (Type, object)[0]);
+            Resolve(type, name, Array.Empty<(Type, object)>());
 
         public object Resolve(Type type, params (Type Type, object Instance)[] parameters)
         {
             try
             {
-                return Instance.Resolve(type, args: parameters.Select(p => p.Instance).ToArray());
+                var container = _currentScope ?? Instance;
+                return container.Resolve(type, args: parameters.Select(p => p.Instance).ToArray());
             }
             catch (Exception ex)
             {
@@ -247,7 +250,8 @@ public object Resolve(Type type, string name, params (Type Type, object Instance
         {
             try
             {
-                return Instance.Resolve(type, name, args: parameters.Select(p => p.Instance).ToArray());
+                var container = _currentScope ?? Instance;
+                return container.Resolve(type, name, args: parameters.Select(p => p.Instance).ToArray());
             }
             catch(Exception ex)
             {