Update to support new smart reflection api

usausa · Jan 25, 2018 · 6d31930 · 6d31930
1 parent 47551e7
commit 6d31930
Show file tree

Hide file tree

Showing 14 changed files with 111 additions and 95 deletions.
diff --git a/Smart.Resolver.AspNetCore.nuspec b/Smart.Resolver.AspNetCore.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Usa.Smart.Resolver.AspNetCore</id>
-    <version>1.7.0-beta1</version>
+    <version>1.7.0-beta2</version>
     <title>Smart.Resolver.AspNetCore .NET</title>
     <authors>machi_pon</authors>
     <owners>machi_pon</owners>
@@ -14,8 +14,8 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <dependencies>
       <dependency id="Microsoft.AspNetCore.Mvc" version="2.0.2" />
-      <dependency id="Usa.Smart.Core" version="1.3.0" />
-      <dependency id="Usa.Smart.Resolver" version="1.7.0-beta1" />
+      <dependency id="Usa.Smart.Core" version="1.4.0-beta1" />
+      <dependency id="Usa.Smart.Resolver" version="1.7.0-beta2" />
     </dependencies>
     <tags>smart ioc di dependencyinjection aspnet aspnetcore</tags>
   </metadata>

diff --git a/Smart.Resolver.AspNetCore/Resolver/SmartResolverServiceProvider.cs b/Smart.Resolver.AspNetCore/Resolver/SmartResolverServiceProvider.cs
@@ -2,6 +2,7 @@
 {
     using System;
     using System.Collections.Generic;
+    using System.Linq;
 
     public sealed class SmartResolverServiceProvider : IServiceProvider
     {
@@ -22,10 +23,20 @@ public object GetService(Type serviceType)
         {
             if (serviceType.IsGenericType && serviceType.GetGenericTypeDefinition() == EnumerableType)
             {
-                return resolver.GetAll(serviceType.GenericTypeArguments[0], null);
+                // TODO
+                var type = serviceType.GenericTypeArguments[0];
+                return ConvertArray(type, resolver.GetAll(type, null));
             }
 
             return resolver.Get(serviceType);
         }
+
+        public static Array ConvertArray(Type elementType, IEnumerable<object> source)
+        {
+            var sourceArray = source.ToArray();
+            var array = Array.CreateInstance(elementType, sourceArray.Length);
+            Array.Copy(sourceArray, 0, array, 0, sourceArray.Length);
+            return array;
+        }
     }
 }
diff --git a/Smart.Resolver.AspNetCore/Smart.Resolver.AspNetCore.csproj b/Smart.Resolver.AspNetCore/Smart.Resolver.AspNetCore.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.2" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
-    <PackageReference Include="Usa.Smart.Core" Version="1.3.0" />
+    <PackageReference Include="Usa.Smart.Core" Version="1.4.0-beta1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Smart.Resolver.Tests/Smart.Resolver.Tests.csproj b/Smart.Resolver.Tests/Smart.Resolver.Tests.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
-    <PackageReference Include="Usa.Smart.Core" Version="1.3.0" />
+    <PackageReference Include="Usa.Smart.Core" Version="1.4.0-beta1" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>

diff --git a/Smart.Resolver.Xamarin.nuspec b/Smart.Resolver.Xamarin.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Usa.Smart.Resolver.Xamarin</id>
-    <version>1.7.0-beta1</version>
+    <version>1.7.0-beta2</version>
     <title>Smart.Resolver.Xamarin .NET</title>
     <authors>machi_pon</authors>
     <owners>machi_pon</owners>
@@ -14,8 +14,8 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <dependencies>
       <dependency id="Xamarin.Forms" version="2.5.0.122203" />
-      <dependency id="Usa.Smart.Core" version="1.3.0" />
-      <dependency id="Usa.Smart.Resolver" version="1.7.0-beta1" />
+      <dependency id="Usa.Smart.Core" version="1.4.0-beta1" />
+      <dependency id="Usa.Smart.Resolver" version="1.7.0-beta2" />
     </dependencies>
     <tags>smart ioc di dependencyinjection xamarin</tags>
   </metadata>

diff --git a/Smart.Resolver.Xamarin/Smart.Resolver.Xamarin.csproj b/Smart.Resolver.Xamarin/Smart.Resolver.Xamarin.csproj
@@ -16,7 +16,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
-    <PackageReference Include="Usa.Smart.Core" Version="1.3.0" />
+    <PackageReference Include="Usa.Smart.Core" Version="1.4.0-beta1" />
     <PackageReference Include="Xamarin.Forms" Version="2.5.0.122203">
       <NoWarn>NU1701</NoWarn>
     </PackageReference>

diff --git a/Smart.Resolver.nuspec b/Smart.Resolver.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Usa.Smart.Resolver</id>
-    <version>1.7.0-beta1</version>
+    <version>1.7.0-beta2</version>
     <title>Smart.Resolver .NET</title>
     <authors>machi_pon</authors>
     <owners>machi_pon</owners>
@@ -14,7 +14,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <dependencies>
       <group>
-        <dependency id="Usa.Smart.Core" version="1.3.0" />
+        <dependency id="Usa.Smart.Core" version="1.4.0-beta1" />
       </group>
       <group targetFramework="netstandard2.0">
       </group>