diff --git a/.gitignore b/.gitignore
index 4b444dc9..d4345d37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ obj
 bin
 *.csproj.user
 *.suo
+.vs
 TestResult.xml
 
 # Resharper
diff --git a/Extensions/src/Ncqrs.Config.StructureMap/Ncqrs.Config.StructureMap.csproj b/Extensions/src/Ncqrs.Config.StructureMap/Ncqrs.Config.StructureMap.csproj
index 6a22c818..6f672bcc 100644
--- a/Extensions/src/Ncqrs.Config.StructureMap/Ncqrs.Config.StructureMap.csproj
+++ b/Extensions/src/Ncqrs.Config.StructureMap/Ncqrs.Config.StructureMap.csproj
@@ -58,10 +58,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net">
-      <HintPath>..\..\..\lib\ThirdParty\log4net\log4net.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\..\..\lib\ThirdParty\json.net\Newtonsoft.Json.dll</HintPath>
       <Private>False</Private>
diff --git a/Extensions/src/Ncqrs.Config.Windsor/Ncqrs.Config.Windsor.csproj b/Extensions/src/Ncqrs.Config.Windsor/Ncqrs.Config.Windsor.csproj
index 4dc0433d..7bb936e0 100644
--- a/Extensions/src/Ncqrs.Config.Windsor/Ncqrs.Config.Windsor.csproj
+++ b/Extensions/src/Ncqrs.Config.Windsor/Ncqrs.Config.Windsor.csproj
@@ -41,6 +41,18 @@
       <HintPath>..\..\..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
diff --git a/Extensions/src/Ncqrs.Config.Windsor/WindsorInProcessEventBus.cs b/Extensions/src/Ncqrs.Config.Windsor/WindsorInProcessEventBus.cs
index 81af45f9..b7236189 100644
--- a/Extensions/src/Ncqrs.Config.Windsor/WindsorInProcessEventBus.cs
+++ b/Extensions/src/Ncqrs.Config.Windsor/WindsorInProcessEventBus.cs
@@ -7,12 +7,13 @@
 using Ncqrs.Eventing.ServiceModel.Bus;
 using Castle.Core;
 using Castle.Core.Internal;
+using Microsoft.Extensions.Logging;
 
 namespace Ncqrs.Config.Windsor
 {
     public class WindsorInProcessEventBus : IEventBus
     {
-        static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        static readonly ILogger Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         readonly IWindsorContainer _container;
 
         public WindsorInProcessEventBus(IWindsorContainer container)
@@ -25,7 +26,7 @@ public void Publish(IPublishableEvent eventMessage)
         {
             var eventMessageType = eventMessage.GetType();
 
-            Log.InfoFormat("Started publishing event {0}.", eventMessageType.FullName);
+            Log.LogDebug("Started publishing event {0}.", eventMessageType.FullName);
 
             var handlers = GetHandlersForEvent(eventMessage).ToList();
 
@@ -34,7 +35,7 @@ public void Publish(IPublishableEvent eventMessage)
 
             if (handlers.Count() == 0)
             {
-                Log.WarnFormat("Did not found any handlers for event {0}.", eventMessageType.FullName);
+                Log.LogWarning("Did not found any handlers for event {0}.", eventMessageType.FullName);
             }
             else
             {
@@ -46,26 +47,26 @@ public void Publish(IEnumerable<IPublishableEvent> eventMessages)
         {
             eventMessages.ForEach(Publish);
         }
-        
+
         static void PublishToHandlers(dynamic eventMessage, Type eventMessageType, IEnumerable<dynamic> handlers)
         {
-            Log.DebugFormat("Found {0} handlers for event {1}.", handlers.Count(), eventMessageType.FullName);
+            Log.LogDebug("Found {0} handlers for event {1}.", handlers.Count(), eventMessageType.FullName);
 
             foreach (var handler in handlers)
             {
-                Log.DebugFormat("Calling handler {0} for event {1}.", handler.GetType().FullName,
-                    eventMessageType.FullName);
+                Log.LogDebug("Calling handler {0} for event {1}.", new object[] { handler.GetType().FullName,
+                    eventMessageType.FullName});
 
                 handler.Handle(eventMessage);
 
-                Log.DebugFormat("Call finished.");
+                Log.LogDebug("Call finished.");
             }
         }
 
         protected virtual IEnumerable<dynamic> GetHandlersForEvent(IPublishableEvent eventMessage)
         {
             var type = eventMessage.Payload.GetType();
-            var handlerType = typeof (IEventHandler<>).MakeGenericType(type);
+            var handlerType = typeof(IEventHandler<>).MakeGenericType(type);
             var handlers = _container.ResolveAll(handlerType);
             return handlers.Cast<dynamic>();
         }
diff --git a/Extensions/src/Ncqrs.Config.Windsor/packages.config b/Extensions/src/Ncqrs.Config.Windsor/packages.config
index 60ef5a09..ab295b9f 100644
--- a/Extensions/src/Ncqrs.Config.Windsor/packages.config
+++ b/Extensions/src/Ncqrs.Config.Windsor/packages.config
@@ -2,4 +2,19 @@
 <packages>
   <package id="Castle.Core" version="3.3.0" targetFramework="net452" />
   <package id="Castle.Windsor" version="3.3.0" targetFramework="net452" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" targetFramework="net452" />
+  <package id="Microsoft.Extensions.Logging" version="1.0.0" targetFramework="net452" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.0" targetFramework="net452" />
+  <package id="System.Collections" version="4.0.11" targetFramework="net452" />
+  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net452" />
+  <package id="System.ComponentModel" version="4.0.1" targetFramework="net452" />
+  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net452" />
+  <package id="System.Globalization" version="4.0.11" targetFramework="net452" />
+  <package id="System.Linq" version="4.1.0" targetFramework="net452" />
+  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net452" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net452" />
+  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net452" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net452" />
+  <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net452" />
+  <package id="System.Threading" version="4.0.11" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/Extensions/src/Ncqrs.Eventing.Sourcing.Snapshotting.DynamicSnapshot/AggregateDynamicSnapshotter.cs b/Extensions/src/Ncqrs.Eventing.Sourcing.Snapshotting.DynamicSnapshot/AggregateDynamicSnapshotter.cs
index e08f8804..87bf3627 100644
--- a/Extensions/src/Ncqrs.Eventing.Sourcing.Snapshotting.DynamicSnapshot/AggregateDynamicSnapshotter.cs
+++ b/Extensions/src/Ncqrs.Eventing.Sourcing.Snapshotting.DynamicSnapshot/AggregateDynamicSnapshotter.cs
@@ -4,12 +4,13 @@
 using System.Text;
 using Ncqrs.Domain.Storage;
 using System.Reflection;
+using Microsoft.Extensions.Logging;
 
 namespace Ncqrs.Eventing.Sourcing.Snapshotting.DynamicSnapshot
 {
     public class AggregateDynamicSnapshotter : IAggregateSnapshotter
     {
-        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILogger Log = LogManager.GetLogger< AggregateDynamicSnapshotter>();
 
         private readonly IAggregateRootCreationStrategy _aggregateRootCreator;
 
@@ -38,19 +39,19 @@ public bool TryLoadFromSnapshot(Type aggregateRootType, Snapshot snapshot, Commi
             {
                 try
                 {
-                    Log.DebugFormat("Reconstructing aggregate root {0}[{1}] from snapshot", aggregateRootType.FullName,
+                    Log.LogDebug("Reconstructing aggregate root {0}[{1}] from snapshot", aggregateRootType.FullName,
                                     snapshot.EventSourceId.ToString("D"));
                     aggregateRoot = _aggregateRootCreator.CreateAggregateRoot(aggregateRootType);
                     aggregateRoot.InitializeFromSnapshot(snapshot);
                     aggregateRoot.RestoreFromSnapshot(snapshot.Payload);
 
-                    Log.DebugFormat("Applying remaining historic event to reconstructed aggregate root {0}[{1}]",
+                    Log.LogDebug("Applying remaining historic event to reconstructed aggregate root {0}[{1}]",
                         aggregateRootType.FullName, snapshot.EventSourceId.ToString("D"));
                     aggregateRoot.InitializeFromHistory(committedEventStream);
                 }
                 catch (Exception ex)
                 {
-                    Log.ErrorFormat("Cannot load snapshot for '{0}' aggregate. {1}",
+                    Log.LogError("Cannot load snapshot for '{0}' aggregate. {1}",
                         aggregateRoot.GetType().FullName, ex.Message);
                     aggregateRoot = null;
                     return false;
@@ -73,7 +74,7 @@ public bool TryTakeSnapshot(Domain.AggregateRoot aggregateRoot, out Snapshot sna
             }
             catch (Exception ex)
             {
-                Log.ErrorFormat("Cannot take snapshot for '{0}' aggregate. {1}",
+                Log.LogError("Cannot take snapshot for '{0}' aggregate. {1}",
                         aggregateRoot.GetType().FullName, ex.Message);
                 snapshot = null;
                 return false;
diff --git a/Extensions/src/Ncqrs.Eventing.Sourcing.Snapshotting.DynamicSnapshot/Ncqrs.Eventing.Sourcing.Snapshotting.DynamicSnapshot.csproj b/Extensions/src/Ncqrs.Eventing.Sourcing.Snapshotting.DynamicSnapshot/Ncqrs.Eventing.Sourcing.Snapshotting.DynamicSnapshot.csproj
index 2fed4d0e..fc1b2b15 100644
--- a/Extensions/src/Ncqrs.Eventing.Sourcing.Snapshotting.DynamicSnapshot/Ncqrs.Eventing.Sourcing.Snapshotting.DynamicSnapshot.csproj
+++ b/Extensions/src/Ncqrs.Eventing.Sourcing.Snapshotting.DynamicSnapshot/Ncqrs.Eventing.Sourcing.Snapshotting.DynamicSnapshot.csproj
@@ -42,6 +42,18 @@
       <HintPath>..\..\..\packages\Castle.Windsor.3.3.0\lib\net45\Castle.Windsor.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Microsoft.CSharp" />
diff --git a/Extensions/src/Ncqrs.Eventing.Sourcing.Snapshotting.DynamicSnapshot/packages.config b/Extensions/src/Ncqrs.Eventing.Sourcing.Snapshotting.DynamicSnapshot/packages.config
index 60ef5a09..ab295b9f 100644
--- a/Extensions/src/Ncqrs.Eventing.Sourcing.Snapshotting.DynamicSnapshot/packages.config
+++ b/Extensions/src/Ncqrs.Eventing.Sourcing.Snapshotting.DynamicSnapshot/packages.config
@@ -2,4 +2,19 @@
 <packages>
   <package id="Castle.Core" version="3.3.0" targetFramework="net452" />
   <package id="Castle.Windsor" version="3.3.0" targetFramework="net452" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" targetFramework="net452" />
+  <package id="Microsoft.Extensions.Logging" version="1.0.0" targetFramework="net452" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.0" targetFramework="net452" />
+  <package id="System.Collections" version="4.0.11" targetFramework="net452" />
+  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net452" />
+  <package id="System.ComponentModel" version="4.0.1" targetFramework="net452" />
+  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net452" />
+  <package id="System.Globalization" version="4.0.11" targetFramework="net452" />
+  <package id="System.Linq" version="4.1.0" targetFramework="net452" />
+  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net452" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net452" />
+  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net452" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net452" />
+  <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net452" />
+  <package id="System.Threading" version="4.0.11" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/Extensions/src/Ncqrs.Eventing.Storage.JOliver/JoesUnitOfWork.cs b/Extensions/src/Ncqrs.Eventing.Storage.JOliver/JoesUnitOfWork.cs
index 6be2ae36..f32cbe74 100644
--- a/Extensions/src/Ncqrs.Eventing.Storage.JOliver/JoesUnitOfWork.cs
+++ b/Extensions/src/Ncqrs.Eventing.Storage.JOliver/JoesUnitOfWork.cs
@@ -8,12 +8,13 @@
 using Ncqrs.Domain.Storage;
 using Ncqrs.Eventing.ServiceModel.Bus;
 using Ncqrs.Eventing.Sourcing.Snapshotting;
+using Microsoft.Extensions.Logging;
 
 namespace Ncqrs.Eventing.Storage.JOliver
 {
     public class JoesUnitOfWork : UnitOfWorkBase
     {
-        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILogger Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private readonly Guid _commitId;
         private readonly List<AggregateRoot> _dirtyInstances = new List<AggregateRoot>();
@@ -105,15 +106,15 @@ protected override void Dispose(bool disposing)
 
         public override void Accept()
         {
-            Log.DebugFormat("Accepting unit of work {0}", this);
+            Log.LogDebug("Accepting unit of work {0}", this);
             foreach (IEventStream trackedStream in _trackedStreams.Values)
             {
                 trackedStream.CommitChanges(_commitId);
                 trackedStream.Dispose();
             }
             _trackedStreams.Clear();
-            Log.DebugFormat("Storing the event stream for command {0} to event store", _commitId);
-            Log.DebugFormat("Publishing events for command {0} to event bus", _commitId);
+            Log.LogDebug("Storing the event stream for command {0} to event store", _commitId);
+            Log.LogDebug("Publishing events for command {0} to event bus", _commitId);
             _eventBus.Publish(_eventStream);
             CreateSnapshots();
         }
diff --git a/Extensions/src/Ncqrs.Eventing.Storage.JOliver/Ncqrs.Eventing.Storage.JOliver.csproj b/Extensions/src/Ncqrs.Eventing.Storage.JOliver/Ncqrs.Eventing.Storage.JOliver.csproj
index 775bb89d..2d2def6e 100644
--- a/Extensions/src/Ncqrs.Eventing.Storage.JOliver/Ncqrs.Eventing.Storage.JOliver.csproj
+++ b/Extensions/src/Ncqrs.Eventing.Storage.JOliver/Ncqrs.Eventing.Storage.JOliver.csproj
@@ -43,6 +43,18 @@
     <Reference Include="EventStore.Persistence.SqlPersistence">
       <HintPath>..\..\..\lib\ThirdParty\EventStore\EventStore.Persistence.SqlPersistence.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
@@ -112,6 +124,9 @@
       <Name>Ncqrs.EventBus</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </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.
diff --git a/Extensions/src/Ncqrs.Eventing.Storage.JOliver/packages.config b/Extensions/src/Ncqrs.Eventing.Storage.JOliver/packages.config
new file mode 100644
index 00000000..354ec5b3
--- /dev/null
+++ b/Extensions/src/Ncqrs.Eventing.Storage.JOliver/packages.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" targetFramework="net451" />
+  <package id="Microsoft.Extensions.Logging" version="1.0.0" targetFramework="net451" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.0" targetFramework="net451" />
+  <package id="System.Collections" version="4.0.11" targetFramework="net451" />
+  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net451" />
+  <package id="System.ComponentModel" version="4.0.1" targetFramework="net451" />
+  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net451" />
+  <package id="System.Globalization" version="4.0.11" targetFramework="net451" />
+  <package id="System.Linq" version="4.1.0" targetFramework="net451" />
+  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net451" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net451" />
+  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net451" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net451" />
+  <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net451" />
+  <package id="System.Threading" version="4.0.11" targetFramework="net451" />
+</packages>
\ No newline at end of file
diff --git a/Extensions/src/Ncqrs.Eventing.Storage.RavenDB.Tests/Ncqrs.Eventing.Storage.RavenDB.Tests.csproj b/Extensions/src/Ncqrs.Eventing.Storage.RavenDB.Tests/Ncqrs.Eventing.Storage.RavenDB.Tests.csproj
index 1fc0653c..655020d3 100644
--- a/Extensions/src/Ncqrs.Eventing.Storage.RavenDB.Tests/Ncqrs.Eventing.Storage.RavenDB.Tests.csproj
+++ b/Extensions/src/Ncqrs.Eventing.Storage.RavenDB.Tests/Ncqrs.Eventing.Storage.RavenDB.Tests.csproj
@@ -45,10 +45,6 @@
       <HintPath>..\..\..\lib\ThirdParty\RavenDB\ICSharpCode.NRefactory.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Lucene.Net, Version=2.9.1.2, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\ThirdParty\RavenDB\Lucene.Net.dll</HintPath>
diff --git a/Extensions/src/Ncqrs.Eventing.Storage.RavenDB.Tests/RavenDBTestBase.cs b/Extensions/src/Ncqrs.Eventing.Storage.RavenDB.Tests/RavenDBTestBase.cs
index 4f2108b8..f4958632 100644
--- a/Extensions/src/Ncqrs.Eventing.Storage.RavenDB.Tests/RavenDBTestBase.cs
+++ b/Extensions/src/Ncqrs.Eventing.Storage.RavenDB.Tests/RavenDBTestBase.cs
@@ -1,6 +1,5 @@
 using System.IO;
 using System.Reflection;
-using log4net.Config;
 using NUnit.Framework;
 using Raven.Client.Document;
 using Raven.Client.Embedded;
@@ -16,7 +15,6 @@ public abstract class RavenDBTestBase
         [SetUp]
         public void SetUpDocumentStore()
         {
-            XmlConfigurator.Configure();
             //_documentStore = ConnectToDocumentStore();
             _documentStore = NewDocumentStore();
         }
diff --git a/Extensions/src/Ncqrs.Eventing.Storage.RavenDB.Tests/app.config b/Extensions/src/Ncqrs.Eventing.Storage.RavenDB.Tests/app.config
index ea8797e4..b46aa6dc 100644
--- a/Extensions/src/Ncqrs.Eventing.Storage.RavenDB.Tests/app.config
+++ b/Extensions/src/Ncqrs.Eventing.Storage.RavenDB.Tests/app.config
@@ -1,23 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
-  </configSections>
   <connectionStrings>
     <add name="Raven" connectionString="DataDir = .\TestDb" />
   </connectionStrings>
-  <log4net>
-
-    <appender name="OutputDebugStringAppender" type="log4net.Appender.OutputDebugStringAppender">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date [%thread] %-5level %logger [%property{NDC}] - %message%newline" />
-      </layout>
-    </appender>
-
-    <root>
-      <appender-ref ref="OutputDebugStringAppender" level="All" />
-    </root>
-  </log4net>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" /></startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
diff --git a/Extensions/src/Ncqrs.Messaging.NServiceBus/Ncqrs.Messaging.NServiceBus.csproj b/Extensions/src/Ncqrs.Messaging.NServiceBus/Ncqrs.Messaging.NServiceBus.csproj
index c5d784e4..2bd9f35d 100644
--- a/Extensions/src/Ncqrs.Messaging.NServiceBus/Ncqrs.Messaging.NServiceBus.csproj
+++ b/Extensions/src/Ncqrs.Messaging.NServiceBus/Ncqrs.Messaging.NServiceBus.csproj
@@ -33,10 +33,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Ncqrs">
       <HintPath>..\..\..\lib\$(Configuration)\Ncqrs\Ncqrs.dll</HintPath>
       <Private>False</Private>
@@ -88,9 +84,6 @@
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </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.
diff --git a/Extensions/src/Ncqrs.Messaging.NServiceBus/packages.config b/Extensions/src/Ncqrs.Messaging.NServiceBus/packages.config
deleted file mode 100644
index adec12e2..00000000
--- a/Extensions/src/Ncqrs.Messaging.NServiceBus/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="log4net" version="2.0.5" targetFramework="net451" />
-</packages>
\ No newline at end of file
diff --git a/Extensions/src/Ncqrs.NServiceBus/Ncqrs.NServiceBus.csproj b/Extensions/src/Ncqrs.NServiceBus/Ncqrs.NServiceBus.csproj
index 72ecdffa..6874fb68 100644
--- a/Extensions/src/Ncqrs.NServiceBus/Ncqrs.NServiceBus.csproj
+++ b/Extensions/src/Ncqrs.NServiceBus/Ncqrs.NServiceBus.csproj
@@ -33,10 +33,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="NServiceBus">
       <HintPath>..\..\..\lib\ThirdParty\NServiceBus\NServiceBus.dll</HintPath>
     </Reference>
@@ -62,9 +58,6 @@
     <Compile Include="NsbEventBus.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Framework\src\Ncqrs\Ncqrs.csproj">
       <Project>{01f84441-80d3-49b4-ab18-96894acb2f90}</Project>
diff --git a/Extensions/src/Ncqrs.NServiceBus/packages.config b/Extensions/src/Ncqrs.NServiceBus/packages.config
deleted file mode 100644
index adec12e2..00000000
--- a/Extensions/src/Ncqrs.NServiceBus/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="log4net" version="2.0.5" targetFramework="net451" />
-</packages>
\ No newline at end of file
diff --git a/Framework/NcqrsFramework.sln b/Framework/NcqrsFramework.sln
index e7ffa7e6..4da17889 100644
--- a/Framework/NcqrsFramework.sln
+++ b/Framework/NcqrsFramework.sln
@@ -1,6 +1,8 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ncqrs", "src\Ncqrs\Ncqrs.csproj", "{01F84441-80D3-49B4-AB18-96894ACB2F90}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ncqrs.Tests", "src\Ncqrs.Tests\Ncqrs.Tests.csproj", "{50E98525-806C-41E3-9366-D36B1CD936D0}"
diff --git a/Framework/src/Ncqrs.Spec/Ncqrs.Spec.csproj b/Framework/src/Ncqrs.Spec/Ncqrs.Spec.csproj
index 7f71011f..2c2ee5aa 100644
--- a/Framework/src/Ncqrs.Spec/Ncqrs.Spec.csproj
+++ b/Framework/src/Ncqrs.Spec/Ncqrs.Spec.csproj
@@ -84,10 +84,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
diff --git a/Framework/src/Ncqrs.Spec/packages.config b/Framework/src/Ncqrs.Spec/packages.config
index a868b3da..bdf8bcf6 100644
--- a/Framework/src/Ncqrs.Spec/packages.config
+++ b/Framework/src/Ncqrs.Spec/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.5" targetFramework="net451" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net451" />
   <package id="Validation" version="2.2.8" targetFramework="net451" />
   <package id="xunit" version="2.1.0" targetFramework="net451" />
diff --git a/Framework/src/Ncqrs.Tests.Integration/Ncqrs.Tests.Integration.csproj b/Framework/src/Ncqrs.Tests.Integration/Ncqrs.Tests.Integration.csproj
index c22fdb9c..058958af 100644
--- a/Framework/src/Ncqrs.Tests.Integration/Ncqrs.Tests.Integration.csproj
+++ b/Framework/src/Ncqrs.Tests.Integration/Ncqrs.Tests.Integration.csproj
@@ -58,12 +58,6 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Ncqrs">
-      <HintPath>..\..\..\lib\Debug\Ncqrs\Ncqrs.dll</HintPath>
-    </Reference>
-    <Reference Include="Ncqrs.Eventing.Storage.JOliver">
-      <HintPath>..\..\..\lib\Debug\Ncqrs.Eventing.Storage.JOliver\Ncqrs.Eventing.Storage.JOliver.dll</HintPath>
-    </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
@@ -108,6 +102,16 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Extensions\src\Ncqrs.Eventing.Storage.JOliver\Ncqrs.Eventing.Storage.JOliver.csproj">
+      <Project>{dca6e39a-8d6b-4531-aca7-33d790d27878}</Project>
+      <Name>Ncqrs.Eventing.Storage.JOliver</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Ncqrs\Ncqrs.csproj">
+      <Project>{01f84441-80d3-49b4-ab18-96894acb2f90}</Project>
+      <Name>Ncqrs</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.
diff --git a/Framework/src/Ncqrs.Tests/Eventing/Storage/NoDB/Fakes/AccountTitleChangedEvent.cs b/Framework/src/Ncqrs.Tests/Eventing/Storage/NoDB/Fakes/AccountTitleChangedEvent.cs
index 91be9fe7..0a5fd371 100644
--- a/Framework/src/Ncqrs.Tests/Eventing/Storage/NoDB/Fakes/AccountTitleChangedEvent.cs
+++ b/Framework/src/Ncqrs.Tests/Eventing/Storage/NoDB/Fakes/AccountTitleChangedEvent.cs
@@ -30,4 +30,4 @@ public override bool Equals(object obj)
             return result;
         }
     }
-}
+}
diff --git a/Framework/src/Ncqrs/Commanding/CommandExecution/Mapping/Attributes/AttributeBasedCommandMapper.cs b/Framework/src/Ncqrs/Commanding/CommandExecution/Mapping/Attributes/AttributeBasedCommandMapper.cs
index 0bf6a18c..eace5c01 100644
--- a/Framework/src/Ncqrs/Commanding/CommandExecution/Mapping/Attributes/AttributeBasedCommandMapper.cs
+++ b/Framework/src/Ncqrs/Commanding/CommandExecution/Mapping/Attributes/AttributeBasedCommandMapper.cs
@@ -1,4 +1,5 @@
-using System;
+using Microsoft.Extensions.Logging;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -7,7 +8,7 @@ namespace Ncqrs.Commanding.CommandExecution.Mapping.Attributes
 {
     public class AttributeBasedCommandMapper : ICommandMapper
     {
-        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILogger Log = LogManager.GetLogger<AttributeBasedCommandMapper>();
         private readonly Dictionary<Type, object> _handlers = new Dictionary<Type, object>();
 
         public AttributeBasedCommandMapper()
diff --git a/Framework/src/Ncqrs/Commanding/CommandExecution/Mapping/Attributes/CommandServiceExtensions.cs b/Framework/src/Ncqrs/Commanding/CommandExecution/Mapping/Attributes/CommandServiceExtensions.cs
index d62881a7..0addb296 100644
--- a/Framework/src/Ncqrs/Commanding/CommandExecution/Mapping/Attributes/CommandServiceExtensions.cs
+++ b/Framework/src/Ncqrs/Commanding/CommandExecution/Mapping/Attributes/CommandServiceExtensions.cs
@@ -2,12 +2,13 @@
 using System.Linq;
 using System.Reflection;
 using Ncqrs.Commanding.ServiceModel;
+using Microsoft.Extensions.Logging;
 
 namespace Ncqrs.Commanding.CommandExecution.Mapping.Attributes
 {
     public static class RegisterExecutorForAllMappedCommandsInAssemblyExtension
     {
-        private static ILog _log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static ILogger _log = LogManager.GetLogger(typeof(RegisterExecutorForAllMappedCommandsInAssemblyExtension));
 
         public static void RegisterExecutorsInAssembly(this CommandService target, Assembly asm)
         {
@@ -28,6 +29,7 @@ public static void RegisterAllExplicitCommandExecutorsInAssembly(this CommandSer
             var targetType = typeof(ICommandExecutor<>);
             var types = asm.GetExportedTypes();
             var commandExecutorTypes = types
+                .Select(x => x.GetTypeInfo())
                 .Where(x =>
                     x.IsInterface == false &&
                     x.IsAbstract == false &&
diff --git a/Framework/src/Ncqrs/Commanding/CommandExecution/Mapping/PropertiesToMethodMapper.cs b/Framework/src/Ncqrs/Commanding/CommandExecution/Mapping/PropertiesToMethodMapper.cs
index 36620b34..aa945c46 100644
--- a/Framework/src/Ncqrs/Commanding/CommandExecution/Mapping/PropertiesToMethodMapper.cs
+++ b/Framework/src/Ncqrs/Commanding/CommandExecution/Mapping/PropertiesToMethodMapper.cs
@@ -4,12 +4,13 @@
 using System.Linq;
 using System.Reflection;
 using Ncqrs.Commanding.CommandExecution.Mapping.Attributes;
+using Microsoft.Extensions.Logging;
 
 namespace Ncqrs.Commanding.CommandExecution.Mapping
 {
     public class PropertiesToMethodMapper
     {
-        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILogger Log = LogManager.GetLogger<PropertiesToMethodMapper>();
         private static BindingFlags All = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
 
         public static Tuple<ConstructorInfo, PropertyInfo[]> GetConstructor(PropertyToParameterMappingInfo[] sources, Type targetType)
diff --git a/Framework/src/Ncqrs/Commanding/ServiceModel/CommandService.cs b/Framework/src/Ncqrs/Commanding/ServiceModel/CommandService.cs
index 5a2cc001..466caf99 100644
--- a/Framework/src/Ncqrs/Commanding/ServiceModel/CommandService.cs
+++ b/Framework/src/Ncqrs/Commanding/ServiceModel/CommandService.cs
@@ -3,12 +3,13 @@
 using System.Diagnostics.Contracts;
 using System.Reflection;
 using Ncqrs.Commanding.CommandExecution;
+using Microsoft.Extensions.Logging;
 
 namespace Ncqrs.Commanding.ServiceModel
 {
     public class CommandService : ICommandService
     {
-        protected readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        protected readonly ILogger Log = LogManager.GetLogger<CommandService>();
 
         private readonly Dictionary<Type, Action<ICommand>> _executors = new Dictionary<Type, Action<ICommand>>();
         private readonly List<ICommandServiceInterceptor> _interceptors = new List<ICommandServiceInterceptor>(0);
diff --git a/Framework/src/Ncqrs/Domain/AggregateExtensions.cs b/Framework/src/Ncqrs/Domain/AggregateExtensions.cs
index b51ab7ba..dadfc0a1 100644
--- a/Framework/src/Ncqrs/Domain/AggregateExtensions.cs
+++ b/Framework/src/Ncqrs/Domain/AggregateExtensions.cs
@@ -2,12 +2,13 @@
 using System.Linq;
 using System.Reflection;
 using Ncqrs.Eventing.Sourcing.Snapshotting;
+using Microsoft.Extensions.Logging;
 
 namespace Ncqrs.Domain
 {
     internal static class AggregateRootExtensions
     {
-        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILogger Log = LogManager.GetLogger(typeof(AggregateRootExtensions));
 
         public static Type GetSnapshotInterfaceType(this Type aggregateType)
         {
@@ -20,18 +21,18 @@ public static Type GetSnapshotInterfaceType(this Type aggregateType)
             // Aggregate does not implement any ISnapshotable interface.
             if (snapshotables.Count() == 0)
             {
-                Log.DebugFormat("No snapshot interface found on aggregate root {0}.", aggregateType.FullName);
+                Log.LogDebug("No snapshot interface found on aggregate root {0}.", aggregateType.FullName);
                 return null;
             }
             // Aggregate does implement multiple ISnapshotable interfaces.
             if (snapshotables.Count() > 1)
             {
-                Log.WarnFormat("Aggregate root {0} contains multiple snapshot interfaces while only one is allowed.", aggregateType.FullName);
+                Log.LogWarning("Aggregate root {0} contains multiple snapshot interfaces while only one is allowed.", aggregateType.FullName);
                 return null;
             }
 
             var snapshotableInterfaceType = snapshotables.Single();
-            Log.DebugFormat("Found snapshot interface {0} on aggregate root {1}.", snapshotableInterfaceType.FullName, aggregateType.FullName);
+            Log.LogDebug("Found snapshot interface {0} on aggregate root {1}.", snapshotableInterfaceType.FullName, aggregateType.FullName);
 
             return snapshotableInterfaceType;
         }
diff --git a/Framework/src/Ncqrs/Domain/AggregateRoot.cs b/Framework/src/Ncqrs/Domain/AggregateRoot.cs
index f6dd8a9f..6c57a9b5 100644
--- a/Framework/src/Ncqrs/Domain/AggregateRoot.cs
+++ b/Framework/src/Ncqrs/Domain/AggregateRoot.cs
@@ -4,6 +4,7 @@
 using Ncqrs.Eventing;
 using Ncqrs.Eventing.Sourcing;
 using Ncqrs.Eventing.Sourcing.Mapping;
+using Microsoft.Extensions.Logging;
 
 namespace Ncqrs.Domain
 {
@@ -12,7 +13,7 @@ namespace Ncqrs.Domain
     /// </summary>
     public abstract class AggregateRoot : EventSource
     {
-         private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+         private static readonly ILogger Log = LogManager.GetLogger<AggregateRoot>();
     
         // 628426 13 Feb 2011
         // Previous ThreadStatic was null referencing at random times under load 
@@ -21,13 +22,13 @@ public abstract class AggregateRoot : EventSource
 
         public static void RegisterThreadStaticEventAppliedCallback(Action<AggregateRoot, UncommittedEvent> callback)
         {
-            Log.DebugFormat("Registering event applied callback {0}", callback.GetHashCode());
+            Log.LogDebug("Registering event applied callback {0}", callback.GetHashCode());
             _eventAppliedCallbacks.Value.Add(callback);
         }
 
         public static void UnregisterThreadStaticEventAppliedCallback(Action<AggregateRoot, UncommittedEvent> callback)
         {
-            Log.DebugFormat("Deregistering event applied callback {0}", callback.GetHashCode());
+            Log.LogDebug("Deregistering event applied callback {0}", callback.GetHashCode());
             _eventAppliedCallbacks.Value.Remove(callback);
         }
 
@@ -45,7 +46,7 @@ protected override void OnEventApplied(UncommittedEvent appliedEvent)
 
             foreach(var callback in callbacks)
             {
-                Log.DebugFormat("Calling event applied callback {0} for event {1} in aggregate root {2}", callback.GetHashCode(), appliedEvent, this);
+                Log.LogDebug("Calling event applied callback {0} for event {1} in aggregate root {2}", callback.GetHashCode(), appliedEvent, this);
                 callback(this, appliedEvent);
             }
         }
diff --git a/Framework/src/Ncqrs/Domain/Storage/AggregateRootCreationStrategy.cs b/Framework/src/Ncqrs/Domain/Storage/AggregateRootCreationStrategy.cs
index 77007f01..1612cd7a 100644
--- a/Framework/src/Ncqrs/Domain/Storage/AggregateRootCreationStrategy.cs
+++ b/Framework/src/Ncqrs/Domain/Storage/AggregateRootCreationStrategy.cs
@@ -8,7 +8,7 @@ public abstract class AggregateRootCreationStrategy
     {
         public AggregateRoot CreateAggregateRoot(Type aggregateRootType)
         {
-            if (!aggregateRootType.IsSubclassOf(typeof(AggregateRoot)))
+            if (!aggregateRootType.GetTypeInfo().IsSubclassOf(typeof(AggregateRoot)))
             {
                 var msg = string.Format("Specified type {0} is not a subclass of AggregateRoot class.", aggregateRootType.FullName);
                 throw new ArgumentOutOfRangeException("aggregateRootType", msg);
diff --git a/Framework/src/Ncqrs/Domain/Storage/DefaultAggregateSnapshotter.cs b/Framework/src/Ncqrs/Domain/Storage/DefaultAggregateSnapshotter.cs
index 5d5ec6b5..eebbb103 100644
--- a/Framework/src/Ncqrs/Domain/Storage/DefaultAggregateSnapshotter.cs
+++ b/Framework/src/Ncqrs/Domain/Storage/DefaultAggregateSnapshotter.cs
@@ -4,12 +4,13 @@
 using System.Linq;
 using Ncqrs.Eventing;
 using Ncqrs.Eventing.Sourcing.Snapshotting;
+using Microsoft.Extensions.Logging;
 
 namespace Ncqrs.Domain.Storage
 {
     public class DefaultAggregateSnapshotter : IAggregateSnapshotter
     {
-        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILogger Log = LogManager.GetLogger<DefaultAggregateSnapshotter>();
 
         private readonly IAggregateRootCreationStrategy _aggregateRootCreator;
 
@@ -29,7 +30,7 @@ public bool TryLoadFromSnapshot(Type aggregateRootType, Snapshot snapshot, Commi
 
             if (AggregateSupportsSnapshot(aggregateRootType, snapshot.Payload.GetType()))
             {
-                Log.DebugFormat("Reconstructing aggregate root {0}[{1}] from snapshot", aggregateRootType.FullName,
+                Log.LogDebug("Reconstructing aggregate root {0}[{1}] from snapshot", aggregateRootType.FullName,
                                 snapshot.EventSourceId.ToString("D"));
                 aggregateRoot = _aggregateRootCreator.CreateAggregateRoot(aggregateRootType);
                 aggregateRoot.InitializeFromSnapshot(snapshot);
@@ -39,7 +40,7 @@ public bool TryLoadFromSnapshot(Type aggregateRootType, Snapshot snapshot, Commi
 
                 restoreMethod.Invoke(aggregateRoot, new[] { snapshot.Payload });
 
-                Log.DebugFormat("Applying remaining historic event to reconstructed aggregate root {0}[{1}]",
+                Log.LogDebug("Applying remaining historic event to reconstructed aggregate root {0}[{1}]",
                     aggregateRootType.FullName, snapshot.EventSourceId.ToString("D"));
                 aggregateRoot.InitializeFromHistory(committedEventStream);
 
@@ -69,5 +70,5 @@ private bool AggregateSupportsSnapshot(Type aggregateRootType, Type snapshotType
         }
 
     }
-    
+
 }
diff --git a/Framework/src/Ncqrs/Domain/Storage/DomainRepository.cs b/Framework/src/Ncqrs/Domain/Storage/DomainRepository.cs
index 038d0bf0..167c5a83 100644
--- a/Framework/src/Ncqrs/Domain/Storage/DomainRepository.cs
+++ b/Framework/src/Ncqrs/Domain/Storage/DomainRepository.cs
@@ -3,12 +3,13 @@
 using System.Reflection;
 using Ncqrs.Eventing;
 using Ncqrs.Eventing.Sourcing.Snapshotting;
+using Microsoft.Extensions.Logging;
 
 namespace Ncqrs.Domain.Storage
 {
     public class DomainRepository : IDomainRepository
     {
-        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILogger Log = LogManager.GetLogger<DomainRepository>();
 
         private readonly IAggregateRootCreationStrategy _aggregateRootCreator;
 
@@ -40,7 +41,7 @@ public Snapshot TryTakeSnapshot(AggregateRoot aggregateRoot)
         protected AggregateRoot GetByIdFromScratch(Type aggregateRootType, CommittedEventStream committedEventStream)
         {
             AggregateRoot aggregateRoot = null;
-            Log.DebugFormat("Reconstructing aggregate root {0}[{1}] directly from event stream", aggregateRootType.FullName,
+            Log.LogDebug("Reconstructing aggregate root {0}[{1}] directly from event stream", aggregateRootType.FullName,
                                committedEventStream.SourceId.ToString("D"));
 
             if (committedEventStream.Count() > 0)
diff --git a/Framework/src/Ncqrs/Domain/UnitOfWork.cs b/Framework/src/Ncqrs/Domain/UnitOfWork.cs
index 82f47336..4bc25319 100644
--- a/Framework/src/Ncqrs/Domain/UnitOfWork.cs
+++ b/Framework/src/Ncqrs/Domain/UnitOfWork.cs
@@ -10,12 +10,13 @@
 using Ncqrs.Eventing.Sourcing;
 using Ncqrs.Eventing.Sourcing.Snapshotting;
 using Ncqrs.Eventing.Storage;
+using Microsoft.Extensions.Logging;
 
 namespace Ncqrs.Domain
 {
     public class UnitOfWork : UnitOfWorkBase
     {
-        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILogger Log = LogManager.GetLogger<UnitOfWork>();
 
         /// <summary>A queue that holds a reference to all instances that have themselves registered as a dirty instance during the lifespan of this unit of work instance.</summary>
         private readonly Queue<AggregateRoot> _dirtyInstances;
@@ -45,7 +46,7 @@ public UnitOfWork(Guid commandId, IDomainRepository domainRepository, IEventStor
 
         protected override void AggregateRootEventAppliedHandler(AggregateRoot aggregateRoot, UncommittedEvent evnt)
         {
-            RegisterDirtyInstance(aggregateRoot);            
+            RegisterDirtyInstance(aggregateRoot);
             _eventStream.Append(evnt);
         }
 
@@ -80,10 +81,10 @@ public override AggregateRoot GetById(Type aggregateRootType, Guid eventSourceId
         public override void Accept()
         {
             Contract.Requires<ObjectDisposedException>(!IsDisposed);
-            Log.DebugFormat("Accepting unit of work {0}", this);
-            Log.DebugFormat("Storing the event stream for command {0} to event store", _eventStream.CommitId);
+            Log.LogDebug("Accepting unit of work {0}", this);
+            Log.LogDebug("Storing the event stream for command {0} to event store", _eventStream.CommitId);
             _eventStore.Store(_eventStream);
-            Log.DebugFormat("Publishing events for command {0} to event bus", _eventStream.CommitId);
+            Log.LogDebug("Publishing events for command {0} to event bus", _eventStream.CommitId);
             _eventBus.Publish(_eventStream);
             CreateSnapshots();
         }
@@ -113,7 +114,7 @@ private void RegisterDirtyInstance(AggregateRoot dirtyInstance)
 
             if (!_dirtyInstances.Contains(dirtyInstance))
             {
-                Log.DebugFormat("Registering aggregate root {0} as dirty in unit of work {1}",
+                Log.LogDebug("Registering aggregate root {0} as dirty in unit of work {1}",
                            dirtyInstance, this);
                 _dirtyInstances.Enqueue(dirtyInstance);
             }
diff --git a/Framework/src/Ncqrs/Domain/UnitOfWorkBase.cs b/Framework/src/Ncqrs/Domain/UnitOfWorkBase.cs
index 8c4f9c92..f4f126ed 100644
--- a/Framework/src/Ncqrs/Domain/UnitOfWorkBase.cs
+++ b/Framework/src/Ncqrs/Domain/UnitOfWorkBase.cs
@@ -3,13 +3,14 @@
 using System.Reflection;
 using System.Threading;
 using Ncqrs.Eventing;
+using Microsoft.Extensions.Logging;
 
 namespace Ncqrs.Domain
 {
     public abstract class UnitOfWorkBase : IUnitOfWorkContext
     {
         private readonly Guid _commandId;
-        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILogger Log = LogManager.GetLogger<UnitOfWorkBase>();
 
         private readonly Action<AggregateRoot, UncommittedEvent> _eventAppliedCallback;
 
@@ -42,7 +43,7 @@ protected UnitOfWorkBase(Guid commandId)
             _commandId = commandId;
             Contract.Ensures(IsDisposed == false);
 
-            Log.DebugFormat("Creating new unit of work for command {0} on thread {1}", commandId,
+            Log.LogDebug("Creating new unit of work for command {0} on thread {1}", commandId,
                             Thread.CurrentThread.ManagedThreadId);
 
             _eventAppliedCallback = new Action<AggregateRoot, UncommittedEvent>(AggregateRootEventAppliedHandler);
@@ -53,13 +54,13 @@ protected UnitOfWorkBase(Guid commandId)
 
         private void InitializeAppliedEventHandler()
         {
-            Log.DebugFormat("Registering event applied callback into AggregateRoot from unit of work {0}", this);
+            Log.LogDebug("Registering event applied callback into AggregateRoot from unit of work {0}", this);
             AggregateRoot.RegisterThreadStaticEventAppliedCallback(_eventAppliedCallback);
         }
 
         private void DestroyAppliedEventHandler()
         {
-            Log.DebugFormat("Deregistering event applied callback from AggregateRoot from unit of work {0}", this);
+            Log.LogDebug("Deregistering event applied callback from AggregateRoot from unit of work {0}", this);
             AggregateRoot.UnregisterThreadStaticEventAppliedCallback(_eventAppliedCallback);
         }
 
@@ -97,7 +98,7 @@ protected virtual void Dispose(bool disposing)
             {
                 if (disposing)
                 {
-                    Log.DebugFormat("Disposing unit of work {0}", this);
+                    Log.LogDebug("Disposing unit of work {0}", this);
                     DestroyAppliedEventHandler();
                     UnitOfWorkContext.Unbind();
                 }
diff --git a/Framework/src/Ncqrs/Eventing/ServiceModel/Bus/InProcessEventBus.cs b/Framework/src/Ncqrs/Eventing/ServiceModel/Bus/InProcessEventBus.cs
index c4909fc1..8c2b6e20 100644
--- a/Framework/src/Ncqrs/Eventing/ServiceModel/Bus/InProcessEventBus.cs
+++ b/Framework/src/Ncqrs/Eventing/ServiceModel/Bus/InProcessEventBus.cs
@@ -1,4 +1,5 @@
-using System;
+using Microsoft.Extensions.Logging;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
@@ -10,7 +11,7 @@ namespace Ncqrs.Eventing.ServiceModel.Bus
     public class InProcessEventBus : IEventBus
     {
         private readonly Dictionary<Type, List<Action<PublishedEvent>>> _handlerRegister = new Dictionary<Type, List<Action<PublishedEvent>>>();
-        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILogger Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private readonly bool _useTransactionScope;
 
         /// <summary>
@@ -35,13 +36,13 @@ public void Publish(IPublishableEvent eventMessage)
         {
             var eventMessageType = eventMessage.GetType();
 
-            Log.InfoFormat("Started publishing event {0}.", eventMessageType.FullName);
+            Log.LogInformation("Started publishing event {0}.", eventMessageType.FullName);
 
             IEnumerable<Action<PublishedEvent>> handlers = GetHandlersForEvent(eventMessage);
 
             if (handlers.Count() == 0)
             {
-                Log.WarnFormat("Did not found any handlers for event {0}.", eventMessageType.FullName);
+                Log.LogWarning("Did not found any handlers for event {0}.", eventMessageType.FullName);
             }
             else
             {
@@ -71,19 +72,19 @@ private static void PublishToHandlers(IPublishableEvent eventMessage, Type event
         {
             Contract.Requires<ArgumentNullException>(handlers != null);
 
-            Log.DebugFormat("Found {0} handlers for event {1}.", handlers.Count(), eventMessageType.FullName);
+            Log.LogDebug("Found {0} handlers for event {1}.", handlers.Count(), eventMessageType.FullName);
 
             var publishedEventClosedType = typeof (PublishedEvent<>).MakeGenericType(eventMessage.Payload.GetType());
             var publishedEvent = (PublishedEvent)Activator.CreateInstance(publishedEventClosedType, eventMessage);
 
             foreach (var handler in handlers)
             {
-                Log.DebugFormat("Calling handler {0} for event {1}.", handler.GetType().FullName,
+                Log.LogDebug("Calling handler {0} for event {1}.", handler.GetType().FullName,
                                 eventMessageType.FullName);
 
                 handler(publishedEvent);
 
-                Log.DebugFormat("Call finished.");
+                Log.LogDebug("Call finished.");
             }
         }
 
diff --git a/Framework/src/Ncqrs/Eventing/ServiceModel/Bus/RegisterAllHandlersInAssemblyExtension.cs b/Framework/src/Ncqrs/Eventing/ServiceModel/Bus/RegisterAllHandlersInAssemblyExtension.cs
index 6fd780f2..2b19e7ef 100644
--- a/Framework/src/Ncqrs/Eventing/ServiceModel/Bus/RegisterAllHandlersInAssemblyExtension.cs
+++ b/Framework/src/Ncqrs/Eventing/ServiceModel/Bus/RegisterAllHandlersInAssemblyExtension.cs
@@ -1,4 +1,5 @@
-using System;
+using Microsoft.Extensions.Logging;
+using System;
 using System.Diagnostics.Contracts;
 using System.Linq;
 using System.Reflection;
@@ -7,7 +8,7 @@ namespace Ncqrs.Eventing.ServiceModel.Bus
 {
     public static class RegisterAllHandlersInAssemblyExtension
     {
-        private static ILog _log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static ILogger _log = LogManager.GetLogger(typeof(RegisterAllHandlersInAssemblyExtension));
 
         public static void RegisterAllHandlersInAssembly(this InProcessEventBus target, Assembly asm)
         {
@@ -44,7 +45,7 @@ private static void RegisterHandler(object handler, Type eventDataType, InProces
             var targetMethod = registerHandlerMethod.MakeGenericMethod(new[] { eventDataType });
             targetMethod.Invoke(target, new object[] { handler });
 
-            _log.InfoFormat("Registered {0} as event handler for event {1}.", handler.GetType().FullName, eventDataType.FullName);
+            _log.LogInformation("Registered {0} as event handler for event {1}.", handler.GetType().FullName, eventDataType.FullName);
         }
 
         private static bool ImplementsAtLeastOneIEventHandlerInterface(Type type)
diff --git a/Framework/src/Ncqrs/Eventing/Sourcing/EventSource.cs b/Framework/src/Ncqrs/Eventing/Sourcing/EventSource.cs
index 125f0f95..e80d153d 100644
--- a/Framework/src/Ncqrs/Eventing/Sourcing/EventSource.cs
+++ b/Framework/src/Ncqrs/Eventing/Sourcing/EventSource.cs
@@ -4,16 +4,17 @@
 using System.Reflection;
 using Ncqrs.Domain;
 using Ncqrs.Eventing.Sourcing.Snapshotting;
+using Microsoft.Extensions.Logging;
 
 namespace Ncqrs.Eventing.Sourcing
 {
     public abstract class EventSource : IEventSource
     {
-        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILogger Log = LogManager.GetLogger<EventSource>();
 
         [NonSerialized]
         private Guid _eventSourceId;
-        
+
         /// <summary>
         /// Gets the globally unique identifier.
         /// </summary>
@@ -62,7 +63,7 @@ public long Version
         /// <value>The initial version.</value>
         public long InitialVersion
         {
-            get { return _initialVersion; }            
+            get { return _initialVersion; }
         }
 
         /// <summary>
@@ -82,7 +83,7 @@ protected EventSource()
             EventSourceId = _idGenerator.GenerateNewId();
         }
 
-        protected EventSource(Guid eventSourceId) 
+        protected EventSource(Guid eventSourceId)
             : this()
         {
             EventSourceId = eventSourceId;
@@ -91,7 +92,7 @@ protected EventSource(Guid eventSourceId)
         public virtual void InitializeFromSnapshot(Snapshot snapshot)
         {
             Contract.Requires<ArgumentNullException>(snapshot != null, "The snapshot cannot be null.");
-            Log.DebugFormat("Initializing event source {0} from snapshot (version {1}).", snapshot.EventSourceId, snapshot.Version);
+            Log.LogDebug("Initializing event source {0} from snapshot (version {1}).", snapshot.EventSourceId, snapshot.Version);
 
             _eventSourceId = snapshot.EventSourceId;
             _initialVersion = _currentVersion = snapshot.Version;
@@ -108,22 +109,22 @@ public virtual void InitializeFromHistory(CommittedEventStream history)
             {
                 throw new InvalidOperationException("Cannot apply history when instance has uncommitted changes.");
             }
-            Log.DebugFormat("Initializing event source {0} from history.", history.SourceId);
+            Log.LogDebug("Initializing event source {0} from history.", history.SourceId);
             if (history.IsEmpty)
             {
-                return;                
+                return;
             }
 
             _eventSourceId = history.SourceId;
 
             foreach (var historicalEvent in history)
             {
-                Log.DebugFormat("Appying historic event {0} to event source {1}", historicalEvent.EventIdentifier,
+                Log.LogDebug("Appying historic event {0} to event source {1}", historicalEvent.EventIdentifier,
                                 history.SourceId);
-                ApplyEventFromHistory(historicalEvent);                
+                ApplyEventFromHistory(historicalEvent);
             }
 
-            Log.DebugFormat("Finished initializing event source {0} from history. Current event source version is {1}",
+            Log.LogDebug("Finished initializing event source {0} from history. Current event source version is {1}",
                             history.SourceId, history.CurrentSourceVersion);
             _initialVersion = history.CurrentSourceVersion;
         }
@@ -158,7 +159,7 @@ protected virtual void HandleEvent(object evnt)
 
             foreach (var handler in handlers)
             {
-                Log.DebugFormat("Applying handler {0} of event source {1} to event {2}",
+                Log.LogDebug("Applying handler {0} of event source {1} to event {2}",
                                 handler, this, evnt);
                 handled |= handler.HandleEvent(evnt);
             }
@@ -169,7 +170,7 @@ protected virtual void HandleEvent(object evnt)
 
         internal protected void ApplyEvent(object evnt)
         {
-            Log.DebugFormat("Applying an event to event source {0}", evnt);
+            Log.LogDebug("Applying an event to event source {0}", evnt);
             var eventVersion = evnt.GetType().Assembly.GetName().Version;
             var eventSequence = GetNextSequence();
             var wrappedEvent = new UncommittedEvent(_idGenerator.GenerateNewId(), EventSourceId, eventSequence, _initialVersion, DateTime.UtcNow, evnt, eventVersion);
@@ -180,9 +181,9 @@ internal protected void ApplyEvent(object evnt)
             {
                 sourcedEvent.ClaimEvent(EventSourceId, eventSequence);
             }
-            Log.DebugFormat("Handling event {0} in event source {1}", wrappedEvent, this);
+            Log.LogDebug("Handling event {0} in event source {1}", wrappedEvent, this);
             HandleEvent(wrappedEvent.Payload);
-            Log.DebugFormat("Notifying about application of an event {0} to event source {1}", wrappedEvent, this);
+            Log.LogDebug("Notifying about application of an event {0} to event source {1}", wrappedEvent, this);
             OnEventApplied(wrappedEvent);
         }
 
@@ -195,7 +196,7 @@ private long GetNextSequence()
             {
                 _currentVersion = _initialVersion;
             }
-        
+
             _currentVersion++;
             return _currentVersion;
         }
@@ -203,7 +204,7 @@ private long GetNextSequence()
         private void ApplyEventFromHistory(CommittedEvent evnt)
         {
             ValidateHistoricalEvent(evnt);
-            Log.DebugFormat("Handling historical event {0} in event source {1}", evnt, this);
+            Log.LogDebug("Handling historical event {0} in event source {1}", evnt, this);
             HandleEvent(evnt.Payload);
             _currentVersion++;
         }
@@ -226,10 +227,10 @@ private void ValidateHistoricalEvent(CommittedEvent evnt)
                 throw new InvalidOperationException(message);
             }
         }
-        
+
         public void AcceptChanges()
         {
-            Log.DebugFormat("Accepting changes done to event source {0} up to version {1}", this, Version);
+            Log.LogDebug("Accepting changes done to event source {0} up to version {1}", this, Version);
             _initialVersion = Version;
         }
 
diff --git a/Framework/src/Ncqrs/Eventing/Sourcing/Mapping/ConventionBasedEventHandlerMappingStrategy.cs b/Framework/src/Ncqrs/Eventing/Sourcing/Mapping/ConventionBasedEventHandlerMappingStrategy.cs
index 1ab36131..027476c6 100644
--- a/Framework/src/Ncqrs/Eventing/Sourcing/Mapping/ConventionBasedEventHandlerMappingStrategy.cs
+++ b/Framework/src/Ncqrs/Eventing/Sourcing/Mapping/ConventionBasedEventHandlerMappingStrategy.cs
@@ -1,4 +1,5 @@
-using System;
+using Microsoft.Extensions.Logging;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.Linq;
@@ -32,7 +33,7 @@ namespace Ncqrs.Eventing.Sourcing.Mapping
     /// </summary>
     public class ConventionBasedEventHandlerMappingStrategy : IEventHandlerMappingStrategy
     {
-        private static readonly ILog Logger = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILogger Logger = LogManager.GetLogger<ConventionBasedEventHandlerMappingStrategy>();
 
         public Type EventBaseType { get; set; }
         public String MethodNameRegexPattern { get; set; }
@@ -40,7 +41,7 @@ public class ConventionBasedEventHandlerMappingStrategy : IEventHandlerMappingSt
         public ConventionBasedEventHandlerMappingStrategy()
         {
             MethodNameRegexPattern = "^(on|On|ON)+";
-            EventBaseType = typeof (Object);
+            EventBaseType = typeof(Object);
         }
 
         public IEnumerable<ISourcedEventHandler> GetEventHandlers(object target)
@@ -51,7 +52,7 @@ public IEnumerable<ISourcedEventHandler> GetEventHandlers(object target)
             var targetType = target.GetType();
             var handlers = new List<ISourcedEventHandler>();
 
-            Logger.DebugFormat("Trying to get all event handlers based by convention for {0}.", targetType);
+            Logger.LogDebug("Trying to get all event handlers based by convention for {0}.", targetType);
 
             var methodsToMatch = targetType.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
 
@@ -60,13 +61,13 @@ public IEnumerable<ISourcedEventHandler> GetEventHandlers(object target)
                                  let noEventHandlerAttributes =
                                      method.GetCustomAttributes(typeof(NoEventHandlerAttribute), true)
                                  where
-                                     // Get only methods where the name matches.
+                                    // Get only methods where the name matches.
                                     Regex.IsMatch(method.Name, MethodNameRegexPattern, RegexOptions.CultureInvariant) &&
-                                     // Get only methods that have 1 parameter.
+                                    // Get only methods that have 1 parameter.
                                     parameters.Length == 1 &&
-                                     // Get only methods where the first parameter is an event.
+                                    // Get only methods where the first parameter is an event.
                                     EventBaseType.IsAssignableFrom(parameters[0].ParameterType) &&
-                                     // Get only methods that are not marked with the no event handler attribute.
+                                    // Get only methods that are not marked with the no event handler attribute.
                                     noEventHandlerAttributes.Length == 0
                                  select
                                     new { MethodInfo = method, FirstParameter = method.GetParameters()[0] };
@@ -78,7 +79,7 @@ public IEnumerable<ISourcedEventHandler> GetEventHandlers(object target)
 
                 Action<object> invokeAction = (e) => methodCopy.Invoke(target, new[] { e });
 
-                Logger.DebugFormat("Created event handler for method {0} based on convention.", methodCopy.Name);
+                Logger.LogDebug("Created event handler for method {0} based on convention.", methodCopy.Name);
 
                 var handler = new TypeThresholdedActionBasedDomainEventHandler(invokeAction, firstParameterType, methodCopy.Name, true);
                 handlers.Add(handler);
diff --git a/Framework/src/Ncqrs/Eventing/Storage/PropertyBagConverter.cs b/Framework/src/Ncqrs/Eventing/Storage/PropertyBagConverter.cs
index 8e2f6566..e6c82e11 100644
--- a/Framework/src/Ncqrs/Eventing/Storage/PropertyBagConverter.cs
+++ b/Framework/src/Ncqrs/Eventing/Storage/PropertyBagConverter.cs
@@ -153,7 +153,7 @@ private static bool SetPropertyValue(object instance, PropertyInfo targetPropert
 
         private static bool RequiresConversion(PropertyInfo targetProperty, object value)
         {
-            return value == null ? !targetProperty.PropertyType.IsNullable() : targetProperty.PropertyType != value.GetType();
+            return value == null ? !targetProperty.PropertyType.GetTypeInfo().IsNullable() : targetProperty.PropertyType != value.GetType();
         }
 
         private bool InvokePostConverter(object instance, PropertyBag bag)
diff --git a/Framework/src/Ncqrs/InternalExtensions.cs b/Framework/src/Ncqrs/InternalExtensions.cs
index 765caea4..2c95edad 100644
--- a/Framework/src/Ncqrs/InternalExtensions.cs
+++ b/Framework/src/Ncqrs/InternalExtensions.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 
 namespace Ncqrs
 {
@@ -73,7 +74,7 @@ public static List<T> Clone<T>(this List<T> source)
         /// <returns>
         /// 	<c>true</c> if the specified type is nullable; otherwise, <c>false</c>.
         /// </returns>
-        public static bool IsNullable(this Type type)
+        public static bool IsNullable(this TypeInfo type)
         {
             return !type.IsValueType || (type.IsGenericType && (type.GetGenericTypeDefinition() == typeof(Nullable<>)));
         }
diff --git a/Framework/src/Ncqrs/Log4NetLogger.cs b/Framework/src/Ncqrs/Log4NetLogger.cs
deleted file mode 100644
index 854107b2..00000000
--- a/Framework/src/Ncqrs/Log4NetLogger.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using System;
-
-namespace Ncqrs
-{
-    internal class Log4NetLogger : Ncqrs.ILog
-    {
-        private readonly log4net.ILog _log;
-
-        public Log4NetLogger(Type type)
-        {
-            _log = log4net.LogManager.GetLogger(type);
-        }
-
-        public Log4NetLogger(log4net.ILog log)
-        {
-            if(log == null) throw new ArgumentNullException("log");
-
-            _log = log;
-        }
-
-        public void Debug(object message)
-        {
-            _log.Debug(message);  
-        }
-
-        public void Debug(object message, Exception exception)
-        {
-            _log.Debug(message, exception);
-        }
-
-        public void DebugFormat(string format, params object[] args)
-        {
-            _log.DebugFormat(format, args);
-        }
-
-        public void Info(object message)
-        {
-            _log.Info(message);
-        }
-
-        public void Info(object message, Exception exception)
-        {
-            _log.Info(message, exception);
-        }
-
-        public void InfoFormat(string format, params object[] args)
-        {
-            _log.InfoFormat(format, args);
-        }
-
-        public void Warn(object message)
-        {
-            _log.Warn(message);
-        }
-
-        public void Warn(object message, Exception exception)
-        {
-            _log.Warn(message, exception);
-        }
-
-        public void WarnFormat(string format, params object[] args)
-        {
-            _log.WarnFormat(format, args);
-        }
-
-        public void Error(object message)
-        {
-            _log.Error(message);
-        }
-
-        public void Error(object message, Exception exception)
-        {
-            _log.Error(message, exception);
-        }
-
-        public void ErrorFormat(string format, params object[] args)
-        {
-            _log.ErrorFormat(format, args);
-        }
-
-        public void Fatal(object message)
-        {
-            _log.Fatal(message);
-        }
-
-        public void Fatal(object message, Exception exception)
-        {
-            _log.Fatal(message,exception);
-        }
-
-        public void FatalFormat(string format, params object[] args)
-        {
-            _log.FatalFormat(format,args);
-        }
-
-        public bool IsDebugEnabled
-        {
-            get { return _log.IsDebugEnabled; }
-        }
-
-        public bool IsInfoEnabled
-        {
-            get { return _log.IsInfoEnabled; }
-        }
-
-        public bool IsWarnEnabled
-        {
-            get { return _log.IsWarnEnabled; }
-        }
-
-        public bool IsErrorEnabled
-        {
-            get { return _log.IsErrorEnabled; }
-        }
-
-        public bool IsFatalEnabled
-        {
-            get { return _log.IsFatalEnabled; }
-        }
-    }
-}
diff --git a/Framework/src/Ncqrs/LogManager.cs b/Framework/src/Ncqrs/LogManager.cs
index 881f121d..3f4f4740 100644
--- a/Framework/src/Ncqrs/LogManager.cs
+++ b/Framework/src/Ncqrs/LogManager.cs
@@ -3,6 +3,7 @@
 using System.Reflection;
 using System.Collections.Generic;
 using System.Threading;
+using Microsoft.Extensions.Logging;
 
 namespace Ncqrs
 {
@@ -11,70 +12,13 @@ namespace Ncqrs
     /// </summary>
     public static class LogManager
     {
-        private static readonly ReaderWriterLockSlim _cacheLocker = new ReaderWriterLockSlim();
+        public static ILoggerFactory LoggerFactory { get; } = new LoggerFactory();
 
-        private static bool _isLog4NetAvailable = false;
-        private static Dictionary<Type, ILog> _loggerCache = new Dictionary<Type, ILog>();
+        public static ILogger GetLogger<T>() => LoggerFactory.CreateLogger<T>();
 
-        static LogManager()
+        public static ILogger GetLogger(Type type)
         {
-            try
-            {
-                Assembly.Load("log4net");
-                _isLog4NetAvailable = true;
-            }
-            catch (FileNotFoundException)
-            {
-                _isLog4NetAvailable = false;
-            }
-        }
-
-        public static ILog GetLogger(Type type)
-        {
-            ILog logger;
-            _cacheLocker.EnterReadLock();
-
-            try
-            {
-                if (_loggerCache.TryGetValue(type, out logger))
-                {
-                    return logger;
-                }
-            }
-            finally
-            {
-                _cacheLocker.ExitReadLock();
-            }
-            
-            _cacheLocker.EnterWriteLock();
-            try
-            {
-                // double check, as while the read-lock was released, the dictionary could have been modified
-                if (_loggerCache.TryGetValue(type, out logger))
-                {
-                    return logger;
-                }
-
-                logger = CreateLoggerForType(type);
-                _loggerCache.Add(type, logger);
-                return logger;
-            }
-            finally
-            {
-                _cacheLocker.ExitWriteLock();
-            }
-        }
-
-        private static ILog CreateLoggerForType(Type type)
-        {
-            if (_isLog4NetAvailable)
-            {
-                return (ILog)Activator.CreateInstance(typeof(Log4NetLogger), new object[] { type });
-            }
-            else
-            {
-                return new TraceLogger();
-            }
+            return LoggerFactory.CreateLogger(type);
         }
     }
 }
\ No newline at end of file
diff --git a/Framework/src/Ncqrs/Ncqrs.csproj b/Framework/src/Ncqrs/Ncqrs.csproj
index 913a9204..a4a71b74 100644
--- a/Framework/src/Ncqrs/Ncqrs.csproj
+++ b/Framework/src/Ncqrs/Ncqrs.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Ncqrs</RootNamespace>
     <AssemblyName>Ncqrs</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <CodeContractsAssemblyMode>1</CodeContractsAssemblyMode>
     <TargetFrameworkProfile />
@@ -85,11 +85,19 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.1.0.0\lib\netstandard1.1\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
@@ -227,7 +235,6 @@
     <Compile Include="IClock.cs" />
     <Compile Include="ILog.cs" />
     <Compile Include="InternalExtensions.cs" />
-    <Compile Include="Log4NetLogger.cs" />
     <Compile Include="LogManager.cs" />
     <Compile Include="NamespaceDoc.cs" />
     <Compile Include="NcqrsEnvironment.cs" />
diff --git a/Framework/src/Ncqrs/NcqrsEnvironment.cs b/Framework/src/Ncqrs/NcqrsEnvironment.cs
index c468b415..3d1ab690 100644
--- a/Framework/src/Ncqrs/NcqrsEnvironment.cs
+++ b/Framework/src/Ncqrs/NcqrsEnvironment.cs
@@ -10,6 +10,7 @@
 using Ncqrs.Eventing.Sourcing.Snapshotting;
 using Ncqrs.Eventing.Storage;
 using Ncqrs.Domain.Storage;
+using Microsoft.Extensions.Logging;
 
 namespace Ncqrs
 {
@@ -19,7 +20,7 @@ namespace Ncqrs
     /// </remarks></summary>
     public static class NcqrsEnvironment
     {
-        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILogger Log = LogManager.GetLogger(typeof(NcqrsEnvironment));
 
         static NcqrsEnvironment()
         {
@@ -75,7 +76,7 @@ public static T Get<T>() where T : class
         {
             Contract.Ensures(Contract.Result<T>() != null, "The result cannot be null.");
 
-            Log.DebugFormat("Requesting instance {0} from the environment.", typeof(T).FullName);
+            Log.LogDebug("Requesting instance {0} from the environment.", typeof(T).FullName);
 
             T result = null;
 
@@ -136,7 +137,7 @@ public static void Configure(IEnvironmentConfiguration source)
 
             _instance = source;
 
-            Log.InfoFormat("Ncqrs environment configured with {0} configuration source.", source.GetType().FullName);
+            Log.LogInformation("Ncqrs environment configured with {0} configuration source.", source.GetType().FullName);
         }
 
         /// <summary>
diff --git a/Framework/src/Ncqrs/packages.config b/Framework/src/Ncqrs/packages.config
index c949bd71..a085ebb8 100644
--- a/Framework/src/Ncqrs/packages.config
+++ b/Framework/src/Ncqrs/packages.config
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.5" targetFramework="net45" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="1.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Logging" version="1.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="1.0.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
+  <package id="System.Collections" version="4.0.11" targetFramework="net461" />
+  <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net461" />
+  <package id="System.ComponentModel" version="4.0.1" targetFramework="net461" />
+  <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net461" />
+  <package id="System.Globalization" version="4.0.11" targetFramework="net461" />
+  <package id="System.Linq" version="4.1.0" targetFramework="net461" />
+  <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net461" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net461" />
+  <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net461" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net461" />
+  <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net461" />
+  <package id="System.Threading" version="4.0.11" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Samples/NSBSample/Client/Client.csproj b/Samples/NSBSample/Client/Client.csproj
index 6d888746..c4fb3c38 100644
--- a/Samples/NSBSample/Client/Client.csproj
+++ b/Samples/NSBSample/Client/Client.csproj
@@ -34,10 +34,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="NServiceBus">
       <HintPath>..\..\..\lib\ThirdParty\NServiceBus\NServiceBus.dll</HintPath>
     </Reference>
@@ -69,7 +65,6 @@
     <None Include="NServiceBus.Host.exe.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Extensions\src\Ncqrs.NServiceBus\Ncqrs.NServiceBus.csproj">
diff --git a/Samples/NSBSample/Client/packages.config b/Samples/NSBSample/Client/packages.config
deleted file mode 100644
index adec12e2..00000000
--- a/Samples/NSBSample/Client/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="log4net" version="2.0.5" targetFramework="net451" />
-</packages>
\ No newline at end of file
diff --git a/Samples/NSBSample/Domain/Domain.csproj b/Samples/NSBSample/Domain/Domain.csproj
index 1957d93f..04292119 100644
--- a/Samples/NSBSample/Domain/Domain.csproj
+++ b/Samples/NSBSample/Domain/Domain.csproj
@@ -34,10 +34,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Ncqrs">
       <HintPath>..\..\..\lib\$(Configuration)\Ncqrs\Ncqrs.dll</HintPath>
     </Reference>
@@ -59,9 +55,6 @@
       <Name>Events %28Samples\NSBSample\Events%29</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </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.
diff --git a/Samples/NSBSample/Domain/packages.config b/Samples/NSBSample/Domain/packages.config
deleted file mode 100644
index adec12e2..00000000
--- a/Samples/NSBSample/Domain/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="log4net" version="2.0.5" targetFramework="net451" />
-</packages>
\ No newline at end of file
diff --git a/Samples/NSBSample/Server/Server.csproj b/Samples/NSBSample/Server/Server.csproj
index 044f40f5..2616dfa1 100644
--- a/Samples/NSBSample/Server/Server.csproj
+++ b/Samples/NSBSample/Server/Server.csproj
@@ -34,10 +34,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\log4net.2.0.5\lib\net45-full\log4net.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Ncqrs">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\$(Configuration)\Ncqrs\Ncqrs.dll</HintPath>
@@ -69,7 +65,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Commands\Commands.csproj">
diff --git a/Samples/NSBSample/Server/packages.config b/Samples/NSBSample/Server/packages.config
deleted file mode 100644
index adec12e2..00000000
--- a/Samples/NSBSample/Server/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="log4net" version="2.0.5" targetFramework="net451" />
-</packages>
\ No newline at end of file