chore: update DryIoc

xumouzheng · Feb 8, 2023 · 4a021d8 · 4a021d8
1 parent 2ac97e2
commit 4a021d8
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 15 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,6 +1,6 @@
 <Project>
   <ItemGroup>
-    <PackageVersion Include="DryIoc.dll" Version="4.8.0" />
+    <PackageVersion Include="DryIoc.dll" Version="5.3.1" />
     <PackageVersion Include="Unity.Container" Version="5.11.11" />
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
     <PackageVersion Include="Xamarin.Forms" Version="5.0.0.2401" />

diff --git a/src/Containers/Prism.DryIoc.Shared/DryIocContainerExtension.cs b/src/Containers/Prism.DryIoc.Shared/DryIocContainerExtension.cs
@@ -1,20 +1,19 @@
-using System;
-using System.Linq;
 using DryIoc;
 using Prism.Ioc;
 using Prism.Ioc.Internals;
+using IContainer = DryIoc.IContainer;
 
 namespace Prism.DryIoc
 {
     /// <summary>
     /// The <see cref="IContainerExtension" /> Implementation to use with DryIoc
     /// </summary>
 #if ContainerExtensions
-    internal partial
+    internal
 #else
     public
 #endif
-    class DryIocContainerExtension : IContainerExtension<IContainer>, IContainerInfo
+    partial class DryIocContainerExtension : IContainerExtension<IContainer>, IContainerInfo
     {
         private DryIocScopedProvider _currentScope;
 
@@ -25,7 +24,7 @@ class DryIocContainerExtension : IContainerExtension<IContainer>, IContainerInfo
                                                          .With(Made.Of(FactoryMethod.ConstructorWithResolvableArguments))
                                                          .WithFuncAndLazyWithoutRegistration()
                                                          .WithTrackingDisposableTransients()
-                                                         .WithoutFastExpressionCompiler()
+                                                        // .WithoutFastExpressionCompiler()
                                                          .WithFactorySelector(Rules.SelectLastRegisteredFactory());
 
         /// <summary>
@@ -38,7 +37,12 @@ class DryIocContainerExtension : IContainerExtension<IContainer>, IContainerInfo
         /// Constructs a default instance of the <see cref="DryIocContainerExtension" />
         /// </summary>
         public DryIocContainerExtension()
-            : this(new Container(DefaultRules))
+            : this(DefaultRules)
+        {
+        }
+
+        public DryIocContainerExtension(Rules rules)
+            : this(new Container(rules))
         {
         }
 
@@ -291,7 +295,11 @@ public object Resolve(Type type, params (Type Type, object Instance)[] parameter
             try
             {
                 var container = _currentScope?.Resolver ?? Instance;
-                return container.Resolve(type, args: parameters.Select(p => p.Instance).ToArray());
+                var args = parameters.Where(x => x.Instance is not IContainerProvider)
+                    .Select(x => x.Instance)
+                    .ToList();
+                args.Add(this);
+                return container.Resolve(type, args: args.ToArray());
             }
             catch (Exception ex)
             {
@@ -311,7 +319,11 @@ public object Resolve(Type type, string name, params (Type Type, object Instance
             try
             {
                 var container = _currentScope?.Resolver ?? Instance;
-                return container.Resolve(type, name, args: parameters.Select(p => p.Instance).ToArray());
+                var args = parameters.Where(x => x.Instance is not IContainerProvider)
+                    .Select(x => x.Instance)
+                    .ToList();
+                args.Add(this);
+                return container.Resolve(type, name, args: args.ToArray());
             }
             catch (Exception ex)
             {
@@ -387,7 +399,7 @@ public DryIocScopedProvider(IResolverContext resolver)
             public IResolverContext Resolver { get; private set; }
             public IScopedProvider CurrentScope => this;
 
-            public IScopedProvider CreateScope() => this;
+            public IScopedProvider CreateScope() => new DryIocScopedProvider(Resolver.OpenScope());
 
             public void Dispose()
             {
@@ -405,7 +417,11 @@ public object Resolve(Type type, params (Type Type, object Instance)[] parameter
             {
                 try
                 {
-                    return Resolver.Resolve(type, args: parameters.Select(p => p.Instance).ToArray());
+                    var args = parameters.Where(x => x.Instance is not IContainerProvider)
+                        .Select(x => x.Instance)
+                        .ToList();
+                    args.Add(this);
+                    return Resolver.Resolve(type, args: args.ToArray());
                 }
                 catch (Exception ex)
                 {
@@ -417,7 +433,11 @@ public object Resolve(Type type, string name, params (Type Type, object Instance
             {
                 try
                 {
-                    return Resolver.Resolve(type, name, args: parameters.Select(p => p.Instance).ToArray());
+                    var args = parameters.Where(x => x.Instance is not IContainerProvider)
+                        .Select(x => x.Instance)
+                        .ToList();
+                    args.Add(this);
+                    return Resolver.Resolve(type, name, args: args.ToArray());
                 }
                 catch (Exception ex)
                 {

diff --git a/src/Containers/Prism.DryIoc.Shared/PrismIocExtensions.cs b/src/Containers/Prism.DryIoc.Shared/PrismIocExtensions.cs
@@ -1,5 +1,5 @@
-using DryIoc;
-using Prism.Ioc;
+using Prism.Ioc;
+using IContainer = DryIoc.IContainer;
 
 namespace Prism.DryIoc
 {

diff --git a/src/Maui/Prism.DryIoc.Maui/Prism.DryIoc.Maui.csproj b/src/Maui/Prism.DryIoc.Maui/Prism.DryIoc.Maui.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DryIoc.dll" Version="5.3.1" />
+    <PackageReference Include="DryIoc.dll" />
   </ItemGroup>
 
   <ItemGroup>