Merge pull request #21 from tmedanovic/dev

Replaced Common.Logging.ILog with ScriptCs.Contracts.ILogProvider

Author: glennblock

src/ScriptCs.WebApi/ControllerTypeManager.cs

@@ -3,9 +3,7 @@
 using System.ComponentModel.Composition;
 using System.Linq;
 using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using Common.Logging;
+using ScriptCs.Contracts;
 
 namespace ScriptCs.WebApi
 {
@@ -33,9 +31,9 @@ public class ControllerTypeManager : IControllerTypeManager
 
 
         [ImportingConstructor]
-        public ControllerTypeManager(ILog logger)
+        public ControllerTypeManager(ScriptCs.Contracts.ILogProvider loggerProvider)
         {
-            _logger = logger;
+            _logger = loggerProvider.ForCurrentType();
         }
 
         public IEnumerable<Type> GetLoadedTypes()

src/ScriptCs.WebApi/ScriptCs.WebApi.csproj

@@ -32,9 +32,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Common.Logging">
-      <HintPath>..\..\packages\Common.Logging.2.1.2\lib\net40\Common.Logging.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Owin">
       <HintPath>..\..\packages\Microsoft.Owin.2.0.2\lib\net45\Microsoft.Owin.dll</HintPath>
     </Reference>
@@ -51,9 +48,8 @@
     <Reference Include="Owin">
       <HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
     </Reference>
-    <Reference Include="ScriptCs.Contracts, Version=0.10.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\ScriptCs.Contracts.0.10.0\lib\net45\ScriptCs.Contracts.dll</HintPath>
+    <Reference Include="ScriptCs.Contracts">
+      <HintPath>..\..\packages\ScriptCs.Contracts.0.15.0\lib\net45\ScriptCs.Contracts.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />

src/ScriptCs.WebApi/ScriptPack.cs

@@ -1,11 +1,5 @@
-using System.Collections.Generic;
-using System.ComponentModel.Composition;
+using System.ComponentModel.Composition;
 using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using Common.Logging;
-using ScriptCs;
 using ScriptCs.Contracts;
 
 namespace ScriptCs.WebApi
@@ -16,9 +10,9 @@ public class ScriptPack : IScriptPack
         private readonly IControllerTypeManager _typeManager;
 
         [ImportingConstructor]
-        public ScriptPack(ILog logger, IControllerTypeManager typeManager)
+        public ScriptPack(ScriptCs.Contracts.ILogProvider loggerProvider, IControllerTypeManager typeManager)
         {
-            _logger = logger;
+            _logger = loggerProvider.ForCurrentType();
             _typeManager = typeManager;
         }
 

src/ScriptCs.WebApi/WebApi.cs

@@ -1,22 +1,14 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.Composition;
 using System.Diagnostics.Contracts;
 using System.Linq;
 using System.Net.Http.Formatting;
 using System.Reflection;
 using System.Web.Http;
 using System.Web.Http.Dispatcher;
-using System.Web.Http.Routing;
-using Common.Logging;
-using Microsoft.Owin.Builder;
-using Microsoft.SqlServer.Server;
-using Owin;
 using ScriptCs.Contracts;
-
+using Owin;
 using Microsoft.Owin.Hosting;
-using System;
-using System.Net.Http;
 
 namespace ScriptCs.WebApi
 {

src/ScriptCs.WebApi/packages.config

@@ -9,5 +9,5 @@
   <package id="Microsoft.Owin.Hosting" version="2.0.2" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net45" />
-  <package id="ScriptCs.Contracts" version="0.10.0" targetFramework="net45" />
+  <package id="ScriptCs.Contracts" version="0.15.0" targetFramework="net45" />
 </packages>