From cfa496d349b2a1e6d8b63fb0d4be83191abb3699 Mon Sep 17 00:00:00 2001
From: BrunoJuchli <bruno.juchli@gmail.com>
Date: Tue, 15 Apr 2014 15:11:45 +0200
Subject: [PATCH 1/4] added IBindSyntax.Bind<T>(); IBindSyntax.Bind(params
 Type[] types);

---
 .../ConventionSyntaxBindingTests.cs           |  71 +++-
 .../BindingGenerators/KernelMock.cs           |  53 +--
 .../SpecificTypesBindingGeneratorTests.cs     |  80 ++++
 ...inject.Extensions.Conventions.Tests.csproj | 371 +++++++++---------
 .../BindingBuilder/BindingGeneratorFactory.cs |  15 +-
 .../BindingBuilder/ConventionSyntax.Bind.cs   |  24 +-
 .../IBindingGeneratorFactory.cs               |  16 +-
 .../SpecificTypesBindingGenerator.cs          |  74 ++++
 .../Ninject.Extensions.Conventions.csproj     | 321 +++++++--------
 .../Syntax/IBindSyntax.cs                     |  16 +-
 10 files changed, 642 insertions(+), 399 deletions(-)
 create mode 100644 src/Ninject.Extensions.Conventions.Test/BindingGenerators/SpecificTypesBindingGeneratorTests.cs
 create mode 100644 src/Ninject.Extensions.Conventions/BindingGenerators/SpecificTypesBindingGenerator.cs

diff --git a/src/Ninject.Extensions.Conventions.Test/BindingBuilder/ConventionSyntaxBindingTests.cs b/src/Ninject.Extensions.Conventions.Test/BindingBuilder/ConventionSyntaxBindingTests.cs
index 60db9d2..946b668 100644
--- a/src/Ninject.Extensions.Conventions.Test/BindingBuilder/ConventionSyntaxBindingTests.cs
+++ b/src/Ninject.Extensions.Conventions.Test/BindingBuilder/ConventionSyntaxBindingTests.cs
@@ -21,7 +21,8 @@
 
 #if !NO_MOQ
 namespace Ninject.Extensions.Conventions.BindingBuilder
-{
+{
+    using System;
     using System.Text.RegularExpressions;
     using Moq;
     using Ninject.Extensions.Conventions.BindingGenerators;
@@ -64,12 +65,40 @@ public void BindWith()
             this.testee.BindWith(generator);
 
             this.conventionBindingBuilderMock.Verify(b => b.BindWith(generator));
+        }
+
+        [Fact]
+        public void BindGeneric()
+        {
+            Type serviceType = typeof(string);
+            var generator = Mock.Of<IBindingGenerator>();
+            this.bindingGeneratorFactoryMock
+                .Setup(g => g.CreateSpecificTypesBindingGenerator(serviceType))
+                .Returns(generator);
+
+            this.testee.Bind<string>();
+
+            this.conventionBindingBuilderMock.Verify(b => b.BindWith(generator));
+        }
+
+        [Fact]
+        public void Bind()
+        {
+            Type[] serviceTypes = { typeof(string), typeof(object) };
+            var generator = Mock.Of<IBindingGenerator>();
+            this.bindingGeneratorFactoryMock
+                .Setup(g => g.CreateSpecificTypesBindingGenerator(serviceTypes))
+                .Returns(generator);
+
+            this.testee.Bind(serviceTypes);
+
+            this.conventionBindingBuilderMock.Verify(b => b.BindWith(generator));
         }
 
         [Fact]
         public void BindToAllInterfaces()
-        {
-            var generator = new Mock<IBindingGenerator>().Object;
+        {
+            var generator = Mock.Of<IBindingGenerator>();
             this.bindingGeneratorFactoryMock.Setup(g => g.CreateAllInterfacesBindingGenerator()).Returns(generator);
 
             this.testee.BindAllInterfaces();
@@ -79,8 +108,8 @@ public void BindToAllInterfaces()
 
         [Fact]
         public void BindToAllBaseClasses()
-        {
-            var generator = new Mock<IBindingGenerator>().Object;
+        {
+            var generator = Mock.Of<IBindingGenerator>();
             this.bindingGeneratorFactoryMock.Setup(g => g.CreateAllBaseClassesBindingGenerator()).Returns(generator);
 
             this.testee.BindAllBaseClasses();
@@ -90,8 +119,8 @@ public void BindToAllBaseClasses()
 
         [Fact]
         public void BindToBase()
-        {
-            var generator = new Mock<IBindingGenerator>().Object;
+        {
+            var generator = Mock.Of<IBindingGenerator>();
             this.bindingGeneratorFactoryMock.Setup(g => g.CreateBaseBindingGenerator()).Returns(generator);
 
             this.testee.BindBase();
@@ -101,8 +130,8 @@ public void BindToBase()
 
         [Fact]
         public void BindToDefaultInterface()
-        {
-            var generator = new Mock<IBindingGenerator>().Object;
+        {
+            var generator = Mock.Of<IBindingGenerator>();
             this.bindingGeneratorFactoryMock.Setup(g => g.CreateDefaultInterfaceBindingGenerator()).Returns(generator);
 
             this.testee.BindDefaultInterface();
@@ -112,8 +141,8 @@ public void BindToDefaultInterface()
 
         [Fact]
         public void BindToDefaultInterfaces()
-        {
-            var generator = new Mock<IBindingGenerator>().Object;
+        {
+            var generator = Mock.Of<IBindingGenerator>();
             this.bindingGeneratorFactoryMock.Setup(g => g.CreateDefaultInterfacesBindingGenerator()).Returns(generator);
 
             this.testee.BindDefaultInterfaces();
@@ -123,8 +152,8 @@ public void BindToDefaultInterfaces()
         
         [Fact]
         public void BindToSelf()
-        {
-            var generator = new Mock<IBindingGenerator>().Object;
+        {
+            var generator = Mock.Of<IBindingGenerator>();
             this.bindingGeneratorFactoryMock.Setup(g => g.CreateSelfBindingGenerator()).Returns(generator);
 
             this.testee.BindToSelf();
@@ -134,8 +163,8 @@ public void BindToSelf()
 
         [Fact]
         public void BindToSingleInterface()
-        {
-            var generator = new Mock<IBindingGenerator>().Object;
+        {
+            var generator = Mock.Of<IBindingGenerator>();
             this.bindingGeneratorFactoryMock.Setup(g => g.CreateSingleInterfaceBindingGenerator()).Returns(generator);
 
             this.testee.BindSingleInterface();
@@ -146,8 +175,8 @@ public void BindToSingleInterface()
         [Fact]
         public void BindToSelection()
         {
-            ServiceSelector selector = (t1, t2) => t2;
-            var generator = new Mock<IBindingGenerator>().Object;
+            ServiceSelector selector = (t1, t2) => t2;
+            var generator = Mock.Of<IBindingGenerator>();
             this.bindingGeneratorFactoryMock.Setup(g => g.CreateSelectorBindingGenerator(selector)).Returns(generator);
 
             this.testee.BindSelection(selector);
@@ -158,8 +187,8 @@ public void BindToSelection()
         [Fact]
         public void BindToRegex()
         {
-            const string Pattern = "ThePattern";
-            var generator = new Mock<IBindingGenerator>().Object;
+            const string Pattern = "ThePattern";
+            var generator = Mock.Of<IBindingGenerator>();
             this.bindingGeneratorFactoryMock.Setup(g => g.CreateRegexBindingGenerator(Pattern)).Returns(generator);
 
             this.testee.BindUsingRegex(Pattern);
@@ -171,8 +200,8 @@ public void BindToRegex()
         public void BindToRegexWithOptions()
         {
             const string Pattern = "ThePattern";
-            const RegexOptions Options = RegexOptions.Multiline;
-            var generator = new Mock<IBindingGenerator>().Object;
+            const RegexOptions Options = RegexOptions.Multiline;
+            var generator = Mock.Of<IBindingGenerator>();
             this.bindingGeneratorFactoryMock.Setup(g => g.CreateRegexBindingGenerator(Pattern, Options)).Returns(generator);
 
             this.testee.BindUsingRegex(Pattern, Options);
diff --git a/src/Ninject.Extensions.Conventions.Test/BindingGenerators/KernelMock.cs b/src/Ninject.Extensions.Conventions.Test/BindingGenerators/KernelMock.cs
index 26003c8..5df8c60 100644
--- a/src/Ninject.Extensions.Conventions.Test/BindingGenerators/KernelMock.cs
+++ b/src/Ninject.Extensions.Conventions.Test/BindingGenerators/KernelMock.cs
@@ -57,51 +57,60 @@ public IKernel Object
         public List<IBindingWhenInNamedWithOrOnSyntax<object>> ReturnedSyntax { get; private set; }
 
         public void VerifyBindingCreated<TInterface, TImplementation>()
-        {
-            this.VerifyBindingCreated(typeof(TInterface), typeof(TImplementation));
+        {
+            this.VerifyBindingCreated(new[] { typeof(TInterface) }, typeof(TImplementation));
         }
 
-        public void VerifyBindingCreated(Type interfaceType, Type implementationType)
+        public void VerifyBindingCreated(Type[] interfaceTypes, Type implementationType)
         {
-            this.Bindings.Should().Contain(new Binding(interfaceType, implementationType));
+            this.Bindings.Should().Contain(new Binding(interfaceTypes, implementationType));
         }
 
         public void VerifyAllBindingsCreated(IEnumerable<Type> interfaceTypes, Type implementationType)
         {
             this.Bindings.Count.Should().Be(interfaceTypes.Count());
 
-            foreach (var interfaceType in interfaceTypes)
-            {
-                this.VerifyBindingCreated(interfaceType, implementationType);
+            foreach (Type interfaceType in interfaceTypes)
+            {
+                this.VerifyBindingCreated(new[] { interfaceType }, implementationType);
             }
         }
         
         private IBindingToSyntax<object> CreateBindToMock(Type[] interfaceTypes)
         {
-            var interfaceType = interfaceTypes.Single();
             var bindToMock = new Mock<IBindingToSyntax<object>>();
-            bindToMock.Setup(m => m.To(It.IsAny<Type>())).Returns<Type>(implementationType => this.CreateConfigSyntax(interfaceType, implementationType));
-            bindToMock.Setup(m => m.ToSelf()).Returns(() => this.CreateConfigSyntax(interfaceType, interfaceType));
-            return bindToMock.Object;
-        }
+            bindToMock.Setup(m => m.To(It.IsAny<Type>())).Returns<Type>(implementationType => this.CreateConfigSyntax(interfaceTypes, implementationType));
+
+            if (interfaceTypes.Length == 1)
+            {
+                bindToMock.Setup(m => m.ToSelf()).Returns(() => this.CreateConfigSyntax(interfaceTypes, interfaceTypes.Single()));
+            }
+            else
+            {
+                bindToMock.Setup(m => m.ToSelf())
+                    .Throws(new Exception(".Bind(type1, type2,..).ToSelf() is not supported. To self is only supported for .Bind(oneType).ToSelf()"));
+            }
 
-        private IBindingWhenInNamedWithOrOnSyntax<object> CreateConfigSyntax(Type interfaceType, Type implementationType)
+            return bindToMock.Object;
+        }
+
+        private IBindingWhenInNamedWithOrOnSyntax<object> CreateConfigSyntax(Type[] interfaceTypes, Type implementationType)
         {
             var configSyntax = new Mock<IBindingWhenInNamedWithOrOnSyntax<object>>().Object;
             this.ReturnedSyntax.Add(configSyntax);
-            this.Bindings.Add(new Binding(interfaceType, implementationType));
+            this.Bindings.Add(new Binding(interfaceTypes, implementationType));
             return configSyntax;
         }
 
         public class Binding
         {
-            public Binding(Type interfaceType, Type implementationType)
-            {
-                this.InterfaceType = interfaceType;
+            public Binding(Type[] interfaceTypes, Type implementationType)
+            {
+                this.InterfaceTypes = interfaceTypes;
                 this.ImplementationType = implementationType;
-            }
-
-            public Type InterfaceType { get; private set; }
+            }
+
+            public Type[] InterfaceTypes { get; private set; }
 
             public Type ImplementationType { get; private set; }
 
@@ -115,12 +124,12 @@ public override bool Equals(object obj)
 
                 return 
                     this.ImplementationType.Equals(other.ImplementationType) && 
-                    this.InterfaceType.Equals(other.InterfaceType);
+                    this.InterfaceTypes.SequenceEqual(other.InterfaceTypes);
             }
 
             public override int GetHashCode()
             {
-                return this.ImplementationType.GetHashCode() + (13 * this.InterfaceType.GetHashCode());
+                return this.ImplementationType.GetHashCode() + (13 * this.InterfaceTypes.GetHashCode());
             }
         }
     }
diff --git a/src/Ninject.Extensions.Conventions.Test/BindingGenerators/SpecificTypesBindingGeneratorTests.cs b/src/Ninject.Extensions.Conventions.Test/BindingGenerators/SpecificTypesBindingGeneratorTests.cs
new file mode 100644
index 0000000..3e9b4ed
--- /dev/null
+++ b/src/Ninject.Extensions.Conventions.Test/BindingGenerators/SpecificTypesBindingGeneratorTests.cs
@@ -0,0 +1,80 @@
+//-------------------------------------------------------------------------------
+// <copyright file="SingleInterfaceBindingGeneratorTests.cs" company="Ninject Project Contributors">
+//   Copyright (c) 2009-2011 Ninject Project Contributors
+//   Authors: Remo Gloor (remo.gloor@gmail.com)
+//           
+//   Dual-licensed under the Apache License, Version 2.0, and the Microsoft Public License (Ms-PL).
+//   you may not use this file except in compliance with one of the Licenses.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//   or
+//       http://www.microsoft.com/opensource/licenses.mspx
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+// </copyright>
+//-------------------------------------------------------------------------------
+
+#if !SILVERLIGHT_30 && !SILVERLIGHT_20 && !NO_MOQ && !NO_GENERIC_MOQ
+namespace Ninject.Extensions.Conventions.BindingGenerators
+{
+    using System;
+    using System.Linq;
+    using FluentAssertions;
+
+    using Ninject.Extensions.Conventions.BindingBuilder;
+    using Ninject.Extensions.Conventions.Fakes;
+    using Xunit;
+
+    public class SpecificTypesBindingGeneratorTests
+    {
+        private static readonly Type[] ServiceTypes = { typeof(IFoo), typeof(IBar), typeof(IService) };
+
+        private readonly IBindingGenerator testee;
+        private readonly KernelMock kernelMock;
+        
+        public SpecificTypesBindingGeneratorTests()
+        {
+            this.kernelMock = new KernelMock();
+            this.testee = new BindingGeneratorFactory(null).CreateSpecificTypesBindingGenerator(ServiceTypes);
+        }
+
+        [Fact]
+        public void ExceptionIsThrownWhenTypeDoesNotImplementServiceType()
+        {
+            var type = typeof(Foo);
+
+            var exception = Assert.Throws<InvalidOperationException>(() => this.testee.CreateBindings(type, this.kernelMock.Object).ToList());
+
+            exception.Message.Should()
+                .Contain(type.FullName)
+                .And.Contain(typeof(IBar).FullName)
+                .And.Contain(typeof(IService).FullName);
+        }
+
+        [Fact]
+        public void AllServiceTypesAreBound()
+        {
+            var type = typeof(MultipleInterfaceCrazyService);
+
+            this.testee.CreateBindings(type, this.kernelMock.Object).ToList();
+
+            this.kernelMock.VerifyBindingCreated(ServiceTypes, type);
+        }
+
+        [Fact]
+        public void SyntaxForBindingIsReturned()
+        {
+            var type = typeof(MultipleInterfaceCrazyService);
+
+            var syntax = this.testee.CreateBindings(type, this.kernelMock.Object).ToList();
+
+            syntax.Should().Contain(this.kernelMock.ReturnedSyntax);
+        }
+    }
+}
+#endif
\ No newline at end of file
diff --git a/src/Ninject.Extensions.Conventions.Test/Ninject.Extensions.Conventions.Tests.csproj b/src/Ninject.Extensions.Conventions.Test/Ninject.Extensions.Conventions.Tests.csproj
index 81ca42e..cd69757 100644
--- a/src/Ninject.Extensions.Conventions.Test/Ninject.Extensions.Conventions.Tests.csproj
+++ b/src/Ninject.Extensions.Conventions.Test/Ninject.Extensions.Conventions.Tests.csproj
@@ -1,192 +1,193 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{861737AD-F1E6-4D67-9A6C-26642BA9F267}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Ninject.Extensions.Conventions</RootNamespace>
-    <AssemblyName>Ninject.Extensions.Conventions.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\build\debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\build\release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Castle.Core">
-      <HintPath>..\..\lib\Ninject.Extensions.Factory\net-4.0\DynamicProxy\lib\Castle.Core.3.2.0\lib\net40-client\Castle.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="FluentAssertions">
-      <HintPath>..\..\tools\FluentAssertions\Net-3.5\FluentAssertions.dll</HintPath>
-    </Reference>
-    <Reference Include="Moq">
-      <HintPath>..\..\tools\moq\NET40\Moq.dll</HintPath>
-    </Reference>
-    <Reference Include="Ninject">
-      <HintPath>..\..\lib\Ninject\net-3.5\Ninject.dll</HintPath>
-    </Reference>
-    <Reference Include="Ninject.Extensions.Factory, Version=3.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
-      <HintPath>..\..\lib\Ninject.Extensions.Factory\net-4.0\Ninject.Extensions.Factory.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml" />
-    <Reference Include="xunit">
-      <HintPath>..\..\tools\xunit.net\xunit.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.extensions">
-      <HintPath>..\..\tools\xunit.net\xunit.extensions.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="BindingBuilder\AssemblyFinderTests.cs" />
-    <Compile Include="BindingBuilder\ConventionBindingBuilderTests.cs" />
-    <Compile Include="BindingBuilder\ConventionSyntaxBindingTests.cs" />
-    <Compile Include="BindingBuilder\ConventionSyntaxFilteringTests.cs" />
-    <Compile Include="BindingBuilder\ConventionSyntaxFromTests.cs" />
-    <Compile Include="BindingBuilder\ConventionSyntaxSelectTests.cs" />
-    <Compile Include="BindingBuilder\TypeSelectorTests.cs" />
-    <Compile Include="BindingBuilder\TypeFilterTests.cs" />
-    <Compile Include="BindingGenerators\AllBaseClassesBindingGeneratorTests.cs" />
-    <Compile Include="BindingGenerators\TestBindingGeneratorFactory.cs" />
-    <Compile Include="Fakes\AbstractInheritanceTree\BaseAbstractClass.cs" />
-    <Compile Include="Fakes\AbstractInheritanceTree\DerivedAbstractClassImpl.cs" />
-    <Compile Include="Fakes\AbstractInheritanceTree\DerivedAbstractClass.cs" />
-    <Compile Include="Fakes\AbstractInheritanceTree\LeafClass.cs" />
-    <Compile Include="Fakes\IBar{T1,T2}.cs" />
-    <Compile Include="Fakes\IBar{T}.cs" />
-    <Compile Include="Fakes\IFoo{T}.cs" />
-    <Compile Include="Fakes\IInternalInterface.cs" />
-    <Compile Include="Fakes\InternalType.cs" />
-    <Compile Include="Fakes\IService{T}.cs" />
-    <Compile Include="Fakes\NormalClasses\AbstractClassWithManyInterfaces.cs" />
-    <Compile Include="BindingGenerators\AllInterfacesBindingGeneratorTests.cs" />
-    <Compile Include="BindingGenerators\BaseBindingGeneratorTests.cs" />
-    <Compile Include="BindingGenerators\BindableTypeSelectorTest.cs" />
-    <Compile Include="Fakes\NormalClasses\ClassWithManyInterfaces.cs" />
-    <Compile Include="BindingGenerators\DefaultInterfacesBindingGeneratorTests.cs" />
-    <Compile Include="BindingGenerators\DefaultInterfaceBindingGeneratorTests.cs" />
-    <Compile Include="Fakes\OpenGenerics\GenericBaseClassWithManyInterfaces{T1,T2}.cs" />
-    <Compile Include="Fakes\OpenGenerics\GenericBaseClassWithManyInterfaces{T}.cs" />
-    <Compile Include="Fakes\OpenGenerics\OpenGenericClassWithManyInterfaces.cs" />
-    <Compile Include="Fakes\Interfaces\IBaseClosedGenericInterface.cs" />
-    <Compile Include="Fakes\Interfaces\IBaseNormalInterface.cs" />
-    <Compile Include="Fakes\Interfaces\IBaseOfDerivedGenericInterface.cs" />
-    <Compile Include="Fakes\Interfaces\IBaseOfDerivedInterface.cs" />
-    <Compile Include="Fakes\Interfaces\IBaseOpenGenericInterface.cs" />
-    <Compile Include="Fakes\Interfaces\IBaseOpenGenericInterface1.cs" />
-    <Compile Include="Fakes\Interfaces\IBaseOpenGenericInterface2.cs" />
-    <Compile Include="Fakes\Interfaces\IClosedGenericInterface.cs" />
-    <Compile Include="Fakes\Interfaces\IDerivedGenericInterface.cs" />
-    <Compile Include="Fakes\Interfaces\IDerivedInterface.cs" />
-    <Compile Include="Fakes\Interfaces\IOpenGenericInterface.cs" />
-    <Compile Include="Fakes\Interfaces\INormalInterface.cs" />
-    <Compile Include="BindingGenerators\KernelMock.cs" />
-    <Compile Include="BindingGenerators\SelectorBindingGeneratorTests.cs" />
-    <Compile Include="BindingGenerators\SelfBindingGeneratorTests.cs" />
-    <Compile Include="BindingGenerators\SingleInterfaceBindingGeneratorTests.cs" />
-    <Compile Include="Fakes\Bar.cs" />
-    <Compile Include="Fakes\BaseService.cs" />
-    <Compile Include="Fakes\Foo.cs" />
-    <Compile Include="Fakes\IBar.cs" />
-    <Compile Include="Fakes\ICrazyService.cs" />
-    <Compile Include="Fakes\IFoo.cs" />
-    <Compile Include="Fakes\IMultipleInterfaceCrazyService.cs" />
-    <Compile Include="Fakes\IService.cs" />
-    <Compile Include="Fakes\MultipleInterfaceCrazyService.cs" />
-    <Compile Include="Fakes\TestAttribute.cs" />
-    <Compile Include="IntegrationTests\AssemblyLoadingTests.cs" />
-    <Compile Include="IntegrationTests\ConfigurationTests.cs" />
-    <Compile Include="IntegrationTests\FactoryTests.cs" />
-    <Compile Include="IntegrationTests\InterfaceSegregationTests.cs" />
-    <Compile Include="IntegrationTests\ModuleLoadingTest.cs" />
-    <Compile Include="IntegrationTests\NonePublicTypesTests.cs" />
-    <Compile Include="IntegrationTests\NormalClassBindingTests.cs" />
-    <Compile Include="IntegrationTests\OpenGenericClassBindingTests.cs" />
-    <Compile Include="Fakes\NormalClasses\DefaultConvention.cs" />
-    <Compile Include="Fakes\Interfaces\IDefaultConvention.cs" />
-    <Compile Include="IntegrationTests\SpecialConfigurations.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Ninject.Extensions.Conventions\Ninject.Extensions.Conventions.csproj">
-      <Project>{c9016f7b-68ce-46a7-80a7-a4592b6f0eac}</Project>
-      <Name>Ninject.Extensions.Conventions</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{861737AD-F1E6-4D67-9A6C-26642BA9F267}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Ninject.Extensions.Conventions</RootNamespace>
+    <AssemblyName>Ninject.Extensions.Conventions.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\build\debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\build\release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Castle.Core">
+      <HintPath>..\..\lib\Ninject.Extensions.Factory\net-4.0\DynamicProxy\lib\Castle.Core.3.2.0\lib\net40-client\Castle.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="FluentAssertions">
+      <HintPath>..\..\tools\FluentAssertions\Net-3.5\FluentAssertions.dll</HintPath>
+    </Reference>
+    <Reference Include="Moq">
+      <HintPath>..\..\tools\moq\NET40\Moq.dll</HintPath>
+    </Reference>
+    <Reference Include="Ninject">
+      <HintPath>..\..\lib\Ninject\net-3.5\Ninject.dll</HintPath>
+    </Reference>
+    <Reference Include="Ninject.Extensions.Factory, Version=3.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
+      <HintPath>..\..\lib\Ninject.Extensions.Factory\net-4.0\Ninject.Extensions.Factory.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="xunit">
+      <HintPath>..\..\tools\xunit.net\xunit.dll</HintPath>
+    </Reference>
+    <Reference Include="xunit.extensions">
+      <HintPath>..\..\tools\xunit.net\xunit.extensions.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BindingBuilder\AssemblyFinderTests.cs" />
+    <Compile Include="BindingBuilder\ConventionBindingBuilderTests.cs" />
+    <Compile Include="BindingBuilder\ConventionSyntaxBindingTests.cs" />
+    <Compile Include="BindingBuilder\ConventionSyntaxFilteringTests.cs" />
+    <Compile Include="BindingBuilder\ConventionSyntaxFromTests.cs" />
+    <Compile Include="BindingBuilder\ConventionSyntaxSelectTests.cs" />
+    <Compile Include="BindingBuilder\TypeSelectorTests.cs" />
+    <Compile Include="BindingBuilder\TypeFilterTests.cs" />
+    <Compile Include="BindingGenerators\AllBaseClassesBindingGeneratorTests.cs" />
+    <Compile Include="BindingGenerators\SpecificTypesBindingGeneratorTests.cs" />
+    <Compile Include="BindingGenerators\TestBindingGeneratorFactory.cs" />
+    <Compile Include="Fakes\AbstractInheritanceTree\BaseAbstractClass.cs" />
+    <Compile Include="Fakes\AbstractInheritanceTree\DerivedAbstractClassImpl.cs" />
+    <Compile Include="Fakes\AbstractInheritanceTree\DerivedAbstractClass.cs" />
+    <Compile Include="Fakes\AbstractInheritanceTree\LeafClass.cs" />
+    <Compile Include="Fakes\IBar{T1,T2}.cs" />
+    <Compile Include="Fakes\IBar{T}.cs" />
+    <Compile Include="Fakes\IFoo{T}.cs" />
+    <Compile Include="Fakes\IInternalInterface.cs" />
+    <Compile Include="Fakes\InternalType.cs" />
+    <Compile Include="Fakes\IService{T}.cs" />
+    <Compile Include="Fakes\NormalClasses\AbstractClassWithManyInterfaces.cs" />
+    <Compile Include="BindingGenerators\AllInterfacesBindingGeneratorTests.cs" />
+    <Compile Include="BindingGenerators\BaseBindingGeneratorTests.cs" />
+    <Compile Include="BindingGenerators\BindableTypeSelectorTest.cs" />
+    <Compile Include="Fakes\NormalClasses\ClassWithManyInterfaces.cs" />
+    <Compile Include="BindingGenerators\DefaultInterfacesBindingGeneratorTests.cs" />
+    <Compile Include="BindingGenerators\DefaultInterfaceBindingGeneratorTests.cs" />
+    <Compile Include="Fakes\OpenGenerics\GenericBaseClassWithManyInterfaces{T1,T2}.cs" />
+    <Compile Include="Fakes\OpenGenerics\GenericBaseClassWithManyInterfaces{T}.cs" />
+    <Compile Include="Fakes\OpenGenerics\OpenGenericClassWithManyInterfaces.cs" />
+    <Compile Include="Fakes\Interfaces\IBaseClosedGenericInterface.cs" />
+    <Compile Include="Fakes\Interfaces\IBaseNormalInterface.cs" />
+    <Compile Include="Fakes\Interfaces\IBaseOfDerivedGenericInterface.cs" />
+    <Compile Include="Fakes\Interfaces\IBaseOfDerivedInterface.cs" />
+    <Compile Include="Fakes\Interfaces\IBaseOpenGenericInterface.cs" />
+    <Compile Include="Fakes\Interfaces\IBaseOpenGenericInterface1.cs" />
+    <Compile Include="Fakes\Interfaces\IBaseOpenGenericInterface2.cs" />
+    <Compile Include="Fakes\Interfaces\IClosedGenericInterface.cs" />
+    <Compile Include="Fakes\Interfaces\IDerivedGenericInterface.cs" />
+    <Compile Include="Fakes\Interfaces\IDerivedInterface.cs" />
+    <Compile Include="Fakes\Interfaces\IOpenGenericInterface.cs" />
+    <Compile Include="Fakes\Interfaces\INormalInterface.cs" />
+    <Compile Include="BindingGenerators\KernelMock.cs" />
+    <Compile Include="BindingGenerators\SelectorBindingGeneratorTests.cs" />
+    <Compile Include="BindingGenerators\SelfBindingGeneratorTests.cs" />
+    <Compile Include="BindingGenerators\SingleInterfaceBindingGeneratorTests.cs" />
+    <Compile Include="Fakes\Bar.cs" />
+    <Compile Include="Fakes\BaseService.cs" />
+    <Compile Include="Fakes\Foo.cs" />
+    <Compile Include="Fakes\IBar.cs" />
+    <Compile Include="Fakes\ICrazyService.cs" />
+    <Compile Include="Fakes\IFoo.cs" />
+    <Compile Include="Fakes\IMultipleInterfaceCrazyService.cs" />
+    <Compile Include="Fakes\IService.cs" />
+    <Compile Include="Fakes\MultipleInterfaceCrazyService.cs" />
+    <Compile Include="Fakes\TestAttribute.cs" />
+    <Compile Include="IntegrationTests\AssemblyLoadingTests.cs" />
+    <Compile Include="IntegrationTests\ConfigurationTests.cs" />
+    <Compile Include="IntegrationTests\FactoryTests.cs" />
+    <Compile Include="IntegrationTests\InterfaceSegregationTests.cs" />
+    <Compile Include="IntegrationTests\ModuleLoadingTest.cs" />
+    <Compile Include="IntegrationTests\NonePublicTypesTests.cs" />
+    <Compile Include="IntegrationTests\NormalClassBindingTests.cs" />
+    <Compile Include="IntegrationTests\OpenGenericClassBindingTests.cs" />
+    <Compile Include="Fakes\NormalClasses\DefaultConvention.cs" />
+    <Compile Include="Fakes\Interfaces\IDefaultConvention.cs" />
+    <Compile Include="IntegrationTests\SpecialConfigurations.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Ninject.Extensions.Conventions\Ninject.Extensions.Conventions.csproj">
+      <Project>{c9016f7b-68ce-46a7-80a7-a4592b6f0eac}</Project>
+      <Name>Ninject.Extensions.Conventions</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>
\ No newline at end of file
diff --git a/src/Ninject.Extensions.Conventions/BindingBuilder/BindingGeneratorFactory.cs b/src/Ninject.Extensions.Conventions/BindingBuilder/BindingGeneratorFactory.cs
index c06ff0e..07196b9 100644
--- a/src/Ninject.Extensions.Conventions/BindingBuilder/BindingGeneratorFactory.cs
+++ b/src/Ninject.Extensions.Conventions/BindingBuilder/BindingGeneratorFactory.cs
@@ -23,9 +23,8 @@ namespace Ninject.Extensions.Conventions.BindingBuilder
 {
     using System;
     using System.Linq;
-    using System.Text.RegularExpressions;
-
-    using Ninject.Components;
+    using System.Text.RegularExpressions;
+
     using Ninject.Extensions.Conventions.BindingGenerators;
     using Ninject.Extensions.Conventions.Syntax;
 #if !SILVERLIGHT_20 && !WINDOWS_PHONE && !NETCF_35
@@ -49,6 +48,16 @@ public class BindingGeneratorFactory : IBindingGeneratorFactory
         public BindingGeneratorFactory(IBindableTypeSelector bindableTypeSelector)
         {
             this.bindableTypeSelector = bindableTypeSelector;
+        }
+
+        /// <summary>
+        /// Creates a specific types binding generator.
+        /// </summary>
+        /// <param name="serviceTypes">The service types the generator should create bindings for.</param>
+        /// <returns>The newly created generator.</returns>
+        public IBindingGenerator CreateSpecificTypesBindingGenerator(params Type[] serviceTypes)
+        {
+            return new SpecificTypesBindingGenerator(serviceTypes);
         }
 
         /// <summary>
diff --git a/src/Ninject.Extensions.Conventions/BindingBuilder/ConventionSyntax.Bind.cs b/src/Ninject.Extensions.Conventions/BindingBuilder/ConventionSyntax.Bind.cs
index a1706f2..c4843a5 100644
--- a/src/Ninject.Extensions.Conventions/BindingBuilder/ConventionSyntax.Bind.cs
+++ b/src/Ninject.Extensions.Conventions/BindingBuilder/ConventionSyntax.Bind.cs
@@ -56,8 +56,28 @@ public IConfigureSyntax BindWith(IBindingGenerator generator)
         {
             this.bindingBuilder.BindWith(generator);
             return this;
-        }
-
+        }
+
+        /// <summary>
+        /// Binds <typeparamref name="T"/> to the type.
+        /// </summary>
+        /// <typeparam name="T">The type to bind.</typeparam>
+        /// <returns>The fluent syntax</returns>
+        public IConfigureSyntax Bind<T>()
+        {
+            return this.Bind(typeof(T));
+        }
+
+        /// <summary>
+        /// Binds <paramref name="types"/> to the type.
+        /// </summary>
+        /// <param name="types">The types to bind.</param>
+        /// <returns>The fluent syntax</returns>
+        public IConfigureSyntax Bind(params Type[] types)
+        {
+            return this.BindWith(this.bindingGeneratorFactory.CreateSpecificTypesBindingGenerator(types));
+        }
+
         /// <summary>
         /// Binds all interfaces of the given types to the type.
         /// </summary>
diff --git a/src/Ninject.Extensions.Conventions/BindingBuilder/IBindingGeneratorFactory.cs b/src/Ninject.Extensions.Conventions/BindingBuilder/IBindingGeneratorFactory.cs
index 48ca855..ed7b49e 100644
--- a/src/Ninject.Extensions.Conventions/BindingBuilder/IBindingGeneratorFactory.cs
+++ b/src/Ninject.Extensions.Conventions/BindingBuilder/IBindingGeneratorFactory.cs
@@ -22,9 +22,8 @@
 namespace Ninject.Extensions.Conventions.BindingBuilder
 {
     using System;
-    using System.Text.RegularExpressions;
-
-    using Ninject.Components;
+    using System.Text.RegularExpressions;
+
     using Ninject.Extensions.Conventions.BindingGenerators;
     using Ninject.Extensions.Conventions.Syntax;
 #if !SILVERLIGHT_20 && !WINDOWS_PHONE && !NETCF_35
@@ -34,8 +33,15 @@ namespace Ninject.Extensions.Conventions.BindingBuilder
     /// <summary>
     /// Factory for binding generators.
     /// </summary>
-    public interface IBindingGeneratorFactory
-    {
+    public interface IBindingGeneratorFactory
+    {
+        /// <summary>
+        /// Creates a specific types binding generator.
+        /// </summary>
+        /// <param name="serviceTypes">The service types the generator should create bindings for.</param>
+        /// <returns>The newly created generator.</returns>
+        IBindingGenerator CreateSpecificTypesBindingGenerator(params Type[] serviceTypes);
+
         /// <summary>
         /// Creates a regex binding generator.
         /// </summary>
diff --git a/src/Ninject.Extensions.Conventions/BindingGenerators/SpecificTypesBindingGenerator.cs b/src/Ninject.Extensions.Conventions/BindingGenerators/SpecificTypesBindingGenerator.cs
new file mode 100644
index 0000000..da9328f
--- /dev/null
+++ b/src/Ninject.Extensions.Conventions/BindingGenerators/SpecificTypesBindingGenerator.cs
@@ -0,0 +1,74 @@
+namespace Ninject.Extensions.Conventions.BindingGenerators
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Linq;
+    using System.Text;
+    using Ninject.Syntax;
+
+    /// <summary>
+    /// Binds the type to all specified service types.
+    /// </summary>
+    public class SpecificTypesBindingGenerator : IBindingGenerator
+    {
+        private readonly Type[] serviceTypes;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SpecificTypesBindingGenerator"/> class.
+        /// </summary>
+        /// <param name="serviceTypes">The service types the bindings should be created for.</param>
+        public SpecificTypesBindingGenerator(Type[] serviceTypes)
+        {
+            this.serviceTypes = serviceTypes;
+        }
+
+        /// <summary>
+        /// Creates the bindings for a type.
+        /// </summary>
+        /// <param name="type">The type for which the bindings are created.</param>
+        /// <param name="bindingRoot">The binding root that is used to create the bindings.</param>
+        /// <returns>
+        /// The syntaxes of the created bindings to configure more options.
+        /// </returns>
+        public IEnumerable<IBindingWhenInNamedWithOrOnSyntax<object>> CreateBindings(Type type, IBindingRoot bindingRoot)
+        {
+            if (bindingRoot == null)
+            {
+                throw new ArgumentNullException("bindingRoot");
+            }
+
+            this.AssertTypeImplementsServiceTypes(type);
+
+            return new[]
+            {
+                bindingRoot.Bind(this.serviceTypes).To(type)
+            };
+        }
+
+        private void AssertTypeImplementsServiceTypes(Type type)
+        {
+            var notImplementedServiceTypes = this.serviceTypes
+                .Where(serviceType => !serviceType.IsAssignableFrom(type))
+                .ToList();
+
+            if (notImplementedServiceTypes.Any())
+            {
+                var stringBuilder = new StringBuilder();
+                stringBuilder
+                    .AppendFormat(CultureInfo.InvariantCulture, "The type '{0}' does not implement the following service types: ", type.FullName)
+                    .AppendLine();
+
+                foreach (Type serviceType in notImplementedServiceTypes)
+                {
+                    stringBuilder
+                        .AppendFormat(CultureInfo.InvariantCulture, " - {0}", serviceType)
+                        .AppendLine();
+                }
+
+                stringBuilder.Append("Fix your binding to only bind service types which are implemented.");
+                throw new InvalidOperationException(stringBuilder.ToString());
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Ninject.Extensions.Conventions/Ninject.Extensions.Conventions.csproj b/src/Ninject.Extensions.Conventions/Ninject.Extensions.Conventions.csproj
index e3d5949..7643797 100644
--- a/src/Ninject.Extensions.Conventions/Ninject.Extensions.Conventions.csproj
+++ b/src/Ninject.Extensions.Conventions/Ninject.Extensions.Conventions.csproj
@@ -1,167 +1,168 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C9016F7B-68CE-46A7-80A7-A4592B6F0EAC}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Ninject.Extensions.Conventions</RootNamespace>
-    <AssemblyName>Ninject.Extensions.Conventions</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\build\debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>
-    </DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\build\release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>..\..\build\release\Ninject.Extensions.Conventions.XML</DocumentationFile>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>..\Ninject.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Ninject">
-      <HintPath>..\..\lib\Ninject\net-3.5\Ninject.dll</HintPath>
-    </Reference>
-    <Reference Include="Ninject.Extensions.Factory, Version=3.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
-      <HintPath>..\..\lib\Ninject.Extensions.Factory\net-4.0\Ninject.Extensions.Factory.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="BindingBuilder\ConventionBindingBuilder.cs" />
-    <Compile Include="BindingBuilder\ConventionSyntax.From.cs" />
-    <Compile Include="BindingBuilder\ConventionSyntax.Select.cs" />
-    <Compile Include="BindingBuilder\ConventionSyntax.Filter.cs" />
-    <Compile Include="BindingBuilder\ConventionSyntax.IncludeExclude.cs" />
-    <Compile Include="BindingBuilder\ConventionSyntax.Bind.cs" />
-    <Compile Include="BindingBuilder\ConventionSyntax.Configure.cs" />
-    <Compile Include="BindingBuilder\IAssemblyFinder.cs" />
-    <Compile Include="BindingBuilder\IConventionBindingBuilder.cs" />
-    <Compile Include="BindingBuilder\IBindingCreator.cs" />
-    <Compile Include="BindingBuilder\ITypeFilter.cs" />
-    <Compile Include="BindingBuilder\ITypeSelector.cs" />
-    <Compile Include="BindingBuilder\MultipleConfigurationBindingCreator.cs" />
-    <Compile Include="BindingBuilder\SingleConfigurationBindingCreator.cs" />
-    <Compile Include="BindingBuilder\TypeSelector.cs" />
-    <Compile Include="BindingGenerators\AbstractInterfaceBindingGenerator.cs" />
-    <Compile Include="BindingGenerators\AllBaseClassesBindingGenerator.cs" />
-    <Compile Include="BindingGenerators\BindableTypeSelector.cs" />
-    <Compile Include="BindingBuilder\BindingGeneratorFactory.cs" />
-    <Compile Include="BindingGenerators\FactoryBindingGenerator.cs" />
-    <Compile Include="BindingGenerators\IBindableTypeSelector.cs" />
-    <Compile Include="BindingBuilder\IBindingGeneratorFactory.cs" />
-    <Compile Include="BindingGenerators\AllInterfacesBindingGenerator.cs" />
-    <Compile Include="BindingGenerators\BaseBindingGenerator.cs" />
-    <Compile Include="BindingGenerators\DefaultInterfaceBindingGenerator.cs" />
-    <Compile Include="BindingGenerators\DefaultInterfacesBindingGenerator.cs" />
-    <Compile Include="BindingBuilder\AssemblyFinder.cs" />
-    <Compile Include="BindingBuilder\TypeFilter.cs" />
-    <Compile Include="BindingGenerators\IBindingGenerator.cs" />
-    <Compile Include="BindingGenerators\SelectorBindingGenerator.cs" />
-    <Compile Include="BindingGenerators\SelfBindingGenerator.cs" />
-    <Compile Include="BindingGenerators\SingleInterfaceBindingGenerator.cs" />
-    <Compile Include="Extensions\ExtensionsForIKernel.cs" />
-    <Compile Include="Extensions\ExtensionsForAssembly.cs" />
-    <Compile Include="BindingBuilder\ConventionSyntax.cs" />
-    <Compile Include="GlobalSuppressions.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Syntax\IJoinSyntax.cs" />
-    <Compile Include="Syntax\IBindSyntax.cs" />
-    <Compile Include="Syntax\IConfigureForSyntax.cs" />
-    <Compile Include="Syntax\IJoinFilterWhereExcludeIncludeBindSyntax.cs" />
-    <Compile Include="Syntax\IIncludingNonePublicTypesSelectSyntax.cs" />
-    <Compile Include="Syntax\IIncludingNonePublicTypesSyntax.cs" />
-    <Compile Include="Syntax\ISelectSyntax.cs" />
-    <Compile Include="Syntax\IWhereSyntax.cs" />
-    <Compile Include="Syntax\IConfigureSyntax.cs" />
-    <Compile Include="Syntax\IExcludeSyntax.cs" />
-    <Compile Include="Syntax\IJoinExcludeIncludeBindSyntax.cs" />
-    <Compile Include="Syntax\IFromSyntax.cs" />
-    <Compile Include="Syntax\IJoinWhereExcludeIncludeBindSyntax.cs" />
-    <Compile Include="Syntax\IExcludeIncludeBindSyntax.cs" />
-    <Compile Include="Syntax\IIncludeSyntax.cs" />
-    <Compile Include="Syntax\IFilterSyntax.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\Ninject.snk">
-      <Link>Ninject.snk</Link>
-    </None>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{C9016F7B-68CE-46A7-80A7-A4592B6F0EAC}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Ninject.Extensions.Conventions</RootNamespace>
+    <AssemblyName>Ninject.Extensions.Conventions</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\build\debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <DocumentationFile>
+    </DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\build\release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <DocumentationFile>..\..\build\release\Ninject.Extensions.Conventions.XML</DocumentationFile>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>..\Ninject.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Ninject">
+      <HintPath>..\..\lib\Ninject\net-3.5\Ninject.dll</HintPath>
+    </Reference>
+    <Reference Include="Ninject.Extensions.Factory, Version=3.0.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
+      <HintPath>..\..\lib\Ninject.Extensions.Factory\net-4.0\Ninject.Extensions.Factory.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\SharedAssemblyInfo.cs">
+      <Link>Properties\SharedAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="BindingBuilder\ConventionBindingBuilder.cs" />
+    <Compile Include="BindingBuilder\ConventionSyntax.From.cs" />
+    <Compile Include="BindingBuilder\ConventionSyntax.Select.cs" />
+    <Compile Include="BindingBuilder\ConventionSyntax.Filter.cs" />
+    <Compile Include="BindingBuilder\ConventionSyntax.IncludeExclude.cs" />
+    <Compile Include="BindingBuilder\ConventionSyntax.Bind.cs" />
+    <Compile Include="BindingBuilder\ConventionSyntax.Configure.cs" />
+    <Compile Include="BindingBuilder\IAssemblyFinder.cs" />
+    <Compile Include="BindingBuilder\IConventionBindingBuilder.cs" />
+    <Compile Include="BindingBuilder\IBindingCreator.cs" />
+    <Compile Include="BindingBuilder\ITypeFilter.cs" />
+    <Compile Include="BindingBuilder\ITypeSelector.cs" />
+    <Compile Include="BindingBuilder\MultipleConfigurationBindingCreator.cs" />
+    <Compile Include="BindingBuilder\SingleConfigurationBindingCreator.cs" />
+    <Compile Include="BindingBuilder\TypeSelector.cs" />
+    <Compile Include="BindingGenerators\AbstractInterfaceBindingGenerator.cs" />
+    <Compile Include="BindingGenerators\AllBaseClassesBindingGenerator.cs" />
+    <Compile Include="BindingGenerators\BindableTypeSelector.cs" />
+    <Compile Include="BindingBuilder\BindingGeneratorFactory.cs" />
+    <Compile Include="BindingGenerators\FactoryBindingGenerator.cs" />
+    <Compile Include="BindingGenerators\IBindableTypeSelector.cs" />
+    <Compile Include="BindingBuilder\IBindingGeneratorFactory.cs" />
+    <Compile Include="BindingGenerators\AllInterfacesBindingGenerator.cs" />
+    <Compile Include="BindingGenerators\BaseBindingGenerator.cs" />
+    <Compile Include="BindingGenerators\DefaultInterfaceBindingGenerator.cs" />
+    <Compile Include="BindingGenerators\DefaultInterfacesBindingGenerator.cs" />
+    <Compile Include="BindingBuilder\AssemblyFinder.cs" />
+    <Compile Include="BindingBuilder\TypeFilter.cs" />
+    <Compile Include="BindingGenerators\IBindingGenerator.cs" />
+    <Compile Include="BindingGenerators\SelectorBindingGenerator.cs" />
+    <Compile Include="BindingGenerators\SelfBindingGenerator.cs" />
+    <Compile Include="BindingGenerators\SingleInterfaceBindingGenerator.cs" />
+    <Compile Include="BindingGenerators\SpecificTypesBindingGenerator.cs" />
+    <Compile Include="Extensions\ExtensionsForIKernel.cs" />
+    <Compile Include="Extensions\ExtensionsForAssembly.cs" />
+    <Compile Include="BindingBuilder\ConventionSyntax.cs" />
+    <Compile Include="GlobalSuppressions.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Syntax\IJoinSyntax.cs" />
+    <Compile Include="Syntax\IBindSyntax.cs" />
+    <Compile Include="Syntax\IConfigureForSyntax.cs" />
+    <Compile Include="Syntax\IJoinFilterWhereExcludeIncludeBindSyntax.cs" />
+    <Compile Include="Syntax\IIncludingNonePublicTypesSelectSyntax.cs" />
+    <Compile Include="Syntax\IIncludingNonePublicTypesSyntax.cs" />
+    <Compile Include="Syntax\ISelectSyntax.cs" />
+    <Compile Include="Syntax\IWhereSyntax.cs" />
+    <Compile Include="Syntax\IConfigureSyntax.cs" />
+    <Compile Include="Syntax\IExcludeSyntax.cs" />
+    <Compile Include="Syntax\IJoinExcludeIncludeBindSyntax.cs" />
+    <Compile Include="Syntax\IFromSyntax.cs" />
+    <Compile Include="Syntax\IJoinWhereExcludeIncludeBindSyntax.cs" />
+    <Compile Include="Syntax\IExcludeIncludeBindSyntax.cs" />
+    <Compile Include="Syntax\IIncludeSyntax.cs" />
+    <Compile Include="Syntax\IFilterSyntax.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\Ninject.snk">
+      <Link>Ninject.snk</Link>
+    </None>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
-  -->
+  -->
 </Project>
\ No newline at end of file
diff --git a/src/Ninject.Extensions.Conventions/Syntax/IBindSyntax.cs b/src/Ninject.Extensions.Conventions/Syntax/IBindSyntax.cs
index 08e9896..08660d0 100644
--- a/src/Ninject.Extensions.Conventions/Syntax/IBindSyntax.cs
+++ b/src/Ninject.Extensions.Conventions/Syntax/IBindSyntax.cs
@@ -58,7 +58,21 @@ public interface IBindSyntax : IFluentSyntax
         /// </summary>
         /// <param name="generator">The generator used to create the bindings.</param>
         /// <returns>The fluent syntax</returns>
-        IConfigureSyntax BindWith(IBindingGenerator generator);
+        IConfigureSyntax BindWith(IBindingGenerator generator);
+
+        /// <summary>
+        /// Binds <typeparamref name="T"/> to the type.
+        /// </summary>
+        /// <typeparam name="T">The type to bind.</typeparam>
+        /// <returns>The fluent syntax</returns>
+        IConfigureSyntax Bind<T>();
+
+        /// <summary>
+        /// Binds <paramref name="types"/> to the type.
+        /// </summary>
+        /// <param name="types">The types to bind.</param>
+        /// <returns>The fluent syntax</returns>
+        IConfigureSyntax Bind(params Type[] types);
 
         /// <summary>
         /// Binds all interfaces of the given types to the type.

From 65f57710120e4fbf99ffb365c9e71f051a9dfd28 Mon Sep 17 00:00:00 2001
From: BrunoJuchli <bruno.juchli@gmail.com>
Date: Tue, 15 Apr 2014 15:26:14 +0200
Subject: [PATCH 2/4] improved test

---
 .../BindingGenerators/SpecificTypesBindingGeneratorTests.cs    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Ninject.Extensions.Conventions.Test/BindingGenerators/SpecificTypesBindingGeneratorTests.cs b/src/Ninject.Extensions.Conventions.Test/BindingGenerators/SpecificTypesBindingGeneratorTests.cs
index 3e9b4ed..39311a0 100644
--- a/src/Ninject.Extensions.Conventions.Test/BindingGenerators/SpecificTypesBindingGeneratorTests.cs
+++ b/src/Ninject.Extensions.Conventions.Test/BindingGenerators/SpecificTypesBindingGeneratorTests.cs
@@ -53,7 +53,8 @@ public void ExceptionIsThrownWhenTypeDoesNotImplementServiceType()
             exception.Message.Should()
                 .Contain(type.FullName)
                 .And.Contain(typeof(IBar).FullName)
-                .And.Contain(typeof(IService).FullName);
+                .And.Contain(typeof(IService).FullName)
+                .And.NotContain(typeof(IFoo).FullName);
         }
 
         [Fact]

From 85858070ae1942a29374eb85d666f359a167e5e0 Mon Sep 17 00:00:00 2001
From: BrunoJuchli <bruno.juchli@gmail.com>
Date: Tue, 15 Apr 2014 15:39:14 +0200
Subject: [PATCH 3/4] adapted mock instanciation since it seems the build
 server has got a problem with Mock.Of<T>()

---
 .../ConventionSyntaxBindingTests.cs           | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Ninject.Extensions.Conventions.Test/BindingBuilder/ConventionSyntaxBindingTests.cs b/src/Ninject.Extensions.Conventions.Test/BindingBuilder/ConventionSyntaxBindingTests.cs
index 946b668..17c7747 100644
--- a/src/Ninject.Extensions.Conventions.Test/BindingBuilder/ConventionSyntaxBindingTests.cs
+++ b/src/Ninject.Extensions.Conventions.Test/BindingBuilder/ConventionSyntaxBindingTests.cs
@@ -71,7 +71,7 @@ public void BindWith()
         public void BindGeneric()
         {
             Type serviceType = typeof(string);
-            var generator = Mock.Of<IBindingGenerator>();
+            var generator = new Mock<IBindingGenerator>().Object;
             this.bindingGeneratorFactoryMock
                 .Setup(g => g.CreateSpecificTypesBindingGenerator(serviceType))
                 .Returns(generator);
@@ -85,7 +85,7 @@ public void BindGeneric()
         public void Bind()
         {
             Type[] serviceTypes = { typeof(string), typeof(object) };
-            var generator = Mock.Of<IBindingGenerator>();
+            var generator = new Mock<IBindingGenerator>().Object;
             this.bindingGeneratorFactoryMock
                 .Setup(g => g.CreateSpecificTypesBindingGenerator(serviceTypes))
                 .Returns(generator);
@@ -98,7 +98,7 @@ public void Bind()
         [Fact]
         public void BindToAllInterfaces()
         {
-            var generator = Mock.Of<IBindingGenerator>();
+            var generator = new Mock<IBindingGenerator>().Object;
             this.bindingGeneratorFactoryMock.Setup(g => g.CreateAllInterfacesBindingGenerator()).Returns(generator);
 
             this.testee.BindAllInterfaces();
@@ -109,7 +109,7 @@ public void BindToAllInterfaces()
         [Fact]
         public void BindToAllBaseClasses()
         {
-            var generator = Mock.Of<IBindingGenerator>();
+            var generator = new Mock<IBindingGenerator>().Object;
             this.bindingGeneratorFactoryMock.Setup(g => g.CreateAllBaseClassesBindingGenerator()).Returns(generator);
 
             this.testee.BindAllBaseClasses();
@@ -120,7 +120,7 @@ public void BindToAllBaseClasses()
         [Fact]
         public void BindToBase()
         {
-            var generator = Mock.Of<IBindingGenerator>();
+            var generator = new Mock<IBindingGenerator>().Object;
             this.bindingGeneratorFactoryMock.Setup(g => g.CreateBaseBindingGenerator()).Returns(generator);
 
             this.testee.BindBase();
@@ -131,7 +131,7 @@ public void BindToBase()
         [Fact]
         public void BindToDefaultInterface()
         {
-            var generator = Mock.Of<IBindingGenerator>();
+            var generator = new Mock<IBindingGenerator>().Object;
             this.bindingGeneratorFactoryMock.Setup(g => g.CreateDefaultInterfaceBindingGenerator()).Returns(generator);
 
             this.testee.BindDefaultInterface();
@@ -142,7 +142,7 @@ public void BindToDefaultInterface()
         [Fact]
         public void BindToDefaultInterfaces()
         {
-            var generator = Mock.Of<IBindingGenerator>();
+            var generator = new Mock<IBindingGenerator>().Object;
             this.bindingGeneratorFactoryMock.Setup(g => g.CreateDefaultInterfacesBindingGenerator()).Returns(generator);
 
             this.testee.BindDefaultInterfaces();
@@ -153,7 +153,7 @@ public void BindToDefaultInterfaces()
         [Fact]
         public void BindToSelf()
         {
-            var generator = Mock.Of<IBindingGenerator>();
+            var generator = new Mock<IBindingGenerator>().Object;
             this.bindingGeneratorFactoryMock.Setup(g => g.CreateSelfBindingGenerator()).Returns(generator);
 
             this.testee.BindToSelf();
@@ -164,7 +164,7 @@ public void BindToSelf()
         [Fact]
         public void BindToSingleInterface()
         {
-            var generator = Mock.Of<IBindingGenerator>();
+            var generator = new Mock<IBindingGenerator>().Object;
             this.bindingGeneratorFactoryMock.Setup(g => g.CreateSingleInterfaceBindingGenerator()).Returns(generator);
 
             this.testee.BindSingleInterface();
@@ -176,7 +176,7 @@ public void BindToSingleInterface()
         public void BindToSelection()
         {
             ServiceSelector selector = (t1, t2) => t2;
-            var generator = Mock.Of<IBindingGenerator>();
+            var generator = new Mock<IBindingGenerator>().Object;
             this.bindingGeneratorFactoryMock.Setup(g => g.CreateSelectorBindingGenerator(selector)).Returns(generator);
 
             this.testee.BindSelection(selector);
@@ -188,7 +188,7 @@ public void BindToSelection()
         public void BindToRegex()
         {
             const string Pattern = "ThePattern";
-            var generator = Mock.Of<IBindingGenerator>();
+            var generator = new Mock<IBindingGenerator>().Object;
             this.bindingGeneratorFactoryMock.Setup(g => g.CreateRegexBindingGenerator(Pattern)).Returns(generator);
 
             this.testee.BindUsingRegex(Pattern);
@@ -201,7 +201,7 @@ public void BindToRegexWithOptions()
         {
             const string Pattern = "ThePattern";
             const RegexOptions Options = RegexOptions.Multiline;
-            var generator = Mock.Of<IBindingGenerator>();
+            var generator = new Mock<IBindingGenerator>().Object;
             this.bindingGeneratorFactoryMock.Setup(g => g.CreateRegexBindingGenerator(Pattern, Options)).Returns(generator);
 
             this.testee.BindUsingRegex(Pattern, Options);

From 2a49d793871b8847e205647d0ed6d77d8f183500 Mon Sep 17 00:00:00 2001
From: BrunoJuchli <bruno.juchli@gmail.com>
Date: Tue, 15 Apr 2014 15:57:22 +0200
Subject: [PATCH 4/4] updated release notes

---
 ReleaseNotes.txt | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 8e2265d..e647dd8 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,4 +1,14 @@
-Version 3.2.0
+Version 3.2.0.1
+-------------
+- Add: Support for specific service type binding IBindSyntax.Bind<
+  E.g.
+  kernel.Bind(x => x
+     .FromThisAssembly()
+	 .SelectAllClasses()
+	 .InheritedFrom<IFoo>()
+	 .Bind<IFoo>());
+
+Version 3.2.0.0
 -------------
 - Add: Support for multiple configurations in one BindWith
   E.g.