Fixed #38

Author: scott-xu

appveyor.yml

@@ -25,16 +25,18 @@ cache:
   - '%LocalAppData%\NuGet\v3-cache -> **\*.csproj'
 
 before_build:
-  - nuget restore -Verbosity quiet
+  - dotnet restore --verbosity quiet
   - choco install opencover.portable
   - choco install codecov
 
 build:
+  parallel: true
   verbosity: minimal
 
 test_script:
-  - OpenCover.Console.exe -register:user -target:"%xunit20%\xunit.console.x86.exe" -targetargs:".\src\Ninject.Extensions.Factory.Test\bin\Release\net452\Ninject.Extensions.Factory.Test.dll -noshadow" -filter:"+[Ninject.Extensions.Factory]*" -output:".\Ninject.Extensions.Factory_coverage.xml"
-  - codecov -f "Ninject.Extensions.Factory_coverage.xml
+  - cd src\Ninject.Extensions.Factory.Test
+  - OpenCover.Console.exe -oldstyle -register:user -target:"C:\Program Files\dotnet\dotnet.exe" -targetargs:"xunit -configuration Release -nobuild" -filter:"+[Ninject.Extensions.Factory]*" -output:".\Ninject.Extensions.Factory_coverage.xml"
+  - codecov -f "Ninject.Extensions.Factory_coverage.xml"
 
 artifacts:
   - path: '**\*.nupkg'

src/Ninject.Extensions.Factory.Test/FactoryTests.cs

@@ -36,9 +36,6 @@ public class FactoryTests : IDisposable
         public FactoryTests()
         {
             this.kernel = new StandardKernel();
-#if NO_ASSEMBLY_SCANNING
-            this.kernel.Load(new FuncModule());
-#endif        
         }
 
         public void Dispose()

src/Ninject.Extensions.Factory.Test/FuncTests.cs

@@ -39,9 +39,6 @@ public class FuncTests : IDisposable
         public FuncTests()
         {
             this.kernel = new StandardKernel();
-#if NO_ASSEMBLY_SCANNING
-            this.kernel.Load(new FuncModule());
-#endif
         }
 
         public void Dispose()

src/Ninject.Extensions.Factory.Test/Ninject.Extensions.Factory.Test.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
+    <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
@@ -10,11 +10,11 @@
     <PackageReference Include="FluentAssertions" Version="4.19.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
     <PackageReference Include="Moq" Version="4.7.99" />
-    <PackageReference Include="xunit" Version="2.2.0" />
+    <PackageReference Include="xunit" Version="2.3.0-rc3-build3818" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-rc3-build3818" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
@@ -26,4 +26,8 @@
     <ProjectReference Include="..\Ninject.Extensions.Factory\Ninject.Extensions.Factory.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-rc3-build3818" />
+  </ItemGroup>
+
 </Project>

src/Ninject.Extensions.Factory/Func/LazyConstructorScorer.cs

@@ -0,0 +1,48 @@
+// -------------------------------------------------------------------------------------------------
+// <copyright file="LazyConstructorScorer.cs" company="Ninject Project Contributors">
+//   Copyright (c) 2009-2017 Ninject Project Contributors
+//   Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
+// </copyright>
+// -------------------------------------------------------------------------------------------------
+
+namespace Ninject.Extensions.Factory
+{
+    using System;
+    using Ninject.Activation;
+    using Ninject.Planning.Directives;
+    using Ninject.Selection.Heuristics;
+
+    /// <summary>
+    /// Scores constructors by either looking for the existence of an injection marker
+    /// attribute, or by counting the number of parameters.
+    /// </summary>
+    public class LazyConstructorScorer : StandardConstructorScorer
+    {
+        /// <summary>
+        /// Gets the score for the specified constructor.
+        /// </summary>
+        /// <param name="context">The injection context.</param>
+        /// <param name="directive">The constructor.</param>
+        /// <returns>The constructor's score.</returns>
+        public override int Score(IContext context, ConstructorInjectionDirective directive)
+        {
+            if (context.Request.Service.IsGenericType &&
+                context.Request.Service.GetGenericTypeDefinition() == typeof(Lazy<>))
+            {
+                if (directive.Constructor.GetParameters().Length == 1 &&
+                    directive.Constructor.GetParameters()[0].ParameterType.IsGenericType)
+                {
+                    return 1;
+                }
+                else
+                {
+                    return 0;
+                }
+            }
+            else
+            {
+                return base.Score(context, directive);
+            }
+        }
+    }
+}

src/Ninject.Extensions.Factory/FuncModule.cs

@@ -17,6 +17,7 @@ namespace Ninject.Extensions.Factory
 
     using Ninject.Activation;
     using Ninject.Modules;
+    using Ninject.Selection.Heuristics;
     using Ninject.Syntax;
 
     /// <summary>
@@ -42,6 +43,9 @@ public override void Load()
                 .When(request => typeof(IFactoryProxy).IsAssignableFrom(request.Target.Member.ReflectedType));
 #endif
 
+            this.Kernel.Components.Remove<IConstructorScorer, StandardConstructorScorer>();
+            this.Kernel.Components.Add<IConstructorScorer, LazyConstructorScorer>();
+
             this.Bind(typeof(Func<>)).ToProvider<FuncProvider>();
             this.Bind(typeof(Func<,>)).ToProvider<FuncProvider>();
             this.Bind(typeof(Func<,,>)).ToProvider<FuncProvider>();

src/Ninject.Extensions.Factory/Ninject.Extensions.Factory.csproj

@@ -37,7 +37,7 @@
 
   <ItemGroup>
     <PackageReference Include="Castle.Core" Version="4.1.1" />
-    <PackageReference Include="Ninject" Version="3.3.1" />
+    <PackageReference Include="Ninject" Version="3.3.2-beta1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>