scriptcs · glennblock · Jan 9, 2017 · Jan 9, 2017
diff --git a/src/ScriptCs.Contracts/ScriptPackSession.cs b/src/ScriptCs.Contracts/ScriptPackSession.cs
@@ -87,5 +87,6 @@ void IScriptPackSession.ImportNamespace(string @namespace)
         {
             _namespaces.Add(@namespace);
         }
+
     }
 }
diff --git a/src/ScriptCs.Core/AppDomainAssemblyResolver.cs b/src/ScriptCs.Core/AppDomainAssemblyResolver.cs
@@ -14,18 +14,6 @@ public class AppDomainAssemblyResolver : IAppDomainAssemblyResolver
         private readonly IAssemblyUtility _assemblyUtility;
         private readonly IDictionary<string, AssemblyInfo> _assemblyInfoMap;
 
-        [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")]
-        public AppDomainAssemblyResolver(
-            Common.Logging.ILog logger,
-            IFileSystem fileSystem,
-            IAssemblyResolver resolver,
-            IAssemblyUtility assemblyUtility,
-            IDictionary<string, AssemblyInfo> assemblyInfoMap = null,
-            Func<object, ResolveEventArgs, Assembly> resolveHandler = null)
-            : this(new CommonLoggingLogProvider(logger), fileSystem, resolver, assemblyUtility, assemblyInfoMap, resolveHandler)
-        {
-        }
-
         public AppDomainAssemblyResolver(
             ILogProvider logProvider,
             IFileSystem fileSystem,

diff --git a/src/ScriptCs.Core/AssemblyResolver.cs b/src/ScriptCs.Core/AssemblyResolver.cs
@@ -14,16 +14,6 @@ public class AssemblyResolver : IAssemblyResolver
         private readonly IAssemblyUtility _assemblyUtility;
         private readonly ILog _logger;
 
-        [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")]
-        public AssemblyResolver(
-            IFileSystem fileSystem,
-            IPackageAssemblyResolver packageAssemblyResolver,
-            IAssemblyUtility assemblyUtility,
-            Common.Logging.ILog logger)
-            :this(fileSystem,packageAssemblyResolver,assemblyUtility,new CommonLoggingLogProvider(logger))
-        {
-        }
-
         public AssemblyResolver(
             IFileSystem fileSystem,
             IPackageAssemblyResolver packageAssemblyResolver,

diff --git a/src/ScriptCs.Core/CommonLoggingLogProvider.cs b/src/ScriptCs.Core/CommonLoggingLogProvider.cs
diff --git a/src/ScriptCs.Core/DebugScriptExecutor.cs b/src/ScriptCs.Core/DebugScriptExecutor.cs
@@ -5,12 +5,6 @@ namespace ScriptCs
 {
     public class DebugScriptExecutor : ScriptExecutor
     {
-        [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")]
-        public DebugScriptExecutor(IFileSystem fileSystem, IFilePreProcessor filePreProcessor, IScriptEngine scriptEngine, Common.Logging.ILog logger, IScriptLibraryComposer composer)
-            : this(fileSystem, filePreProcessor, scriptEngine, new CommonLoggingLogProvider(logger), composer)
-        {
-        }
-
         public DebugScriptExecutor(IFileSystem fileSystem, IFilePreProcessor filePreProcessor, IScriptEngine scriptEngine, ILogProvider logProvider, IScriptLibraryComposer composer)
             : base(fileSystem, filePreProcessor, scriptEngine, logProvider, composer)
         {

diff --git a/src/ScriptCs.Core/FilePreProcessor.cs b/src/ScriptCs.Core/FilePreProcessor.cs
@@ -14,12 +14,6 @@ public class FilePreProcessor : IFilePreProcessor
 
         private readonly IFileSystem _fileSystem;
 
-        [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")]
-        public FilePreProcessor(IFileSystem fileSystem, Common.Logging.ILog logger, IEnumerable<ILineProcessor> lineProcessors)
-            : this(fileSystem, new CommonLoggingLogProvider(logger), lineProcessors)
-        {
-        }
-
         public FilePreProcessor(IFileSystem fileSystem, ILogProvider logProvider, IEnumerable<ILineProcessor> lineProcessors)
         {
             Guard.AgainstNullArgument("fileSystem", fileSystem);

diff --git a/src/ScriptCs.Core/FileSystemMigrator.cs b/src/ScriptCs.Core/FileSystemMigrator.cs
@@ -13,12 +13,6 @@ public class FileSystemMigrator : IFileSystemMigrator
         private readonly Dictionary<string, string> _directoryMoves;
         private readonly Dictionary<string, string> _directoryCopies;
 
-        [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")]
-        public FileSystemMigrator(IFileSystem fileSystem, Common.Logging.ILog logger)
-            : this(fileSystem, new CommonLoggingLogProvider(logger))
-        {
-        }
-
         public FileSystemMigrator(IFileSystem fileSystem, ILogProvider logProvider)
         {
             Guard.AgainstNullArgument("fileSystem", fileSystem);

diff --git a/src/ScriptCs.Core/ILoggerConfigurator.cs b/src/ScriptCs.Core/ILoggerConfigurator.cs
@@ -3,11 +3,8 @@
 
 namespace ScriptCs
 {
-    [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")]
     public interface ILoggerConfigurator
     {
         void Configure(IConsole console);
-
-        Common.Logging.ILog GetLogger();
     }
 }
diff --git a/src/ScriptCs.Core/PackageAssemblyResolver.cs b/src/ScriptCs.Core/PackageAssemblyResolver.cs
@@ -15,13 +15,6 @@ public class PackageAssemblyResolver : IPackageAssemblyResolver
 
         private List<IPackageReference> _topLevelPackages;
 
-        [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")]
-        public PackageAssemblyResolver(
-            IFileSystem fileSystem, IPackageContainer packageContainer, Common.Logging.ILog logger, IAssemblyUtility assemblyUtility)
-            : this(fileSystem, packageContainer, new CommonLoggingLogProvider(logger), assemblyUtility)
-        {
-        }
-
         public PackageAssemblyResolver(
             IFileSystem fileSystem, IPackageContainer packageContainer, ILogProvider logProvider, IAssemblyUtility assemblyUtility)
         {

diff --git a/src/ScriptCs.Core/Repl.cs b/src/ScriptCs.Core/Repl.cs
@@ -15,32 +15,6 @@ public class Repl : ScriptExecutor, IRepl
         private readonly Printers _printers;
         private readonly ILog _log;
 
-        [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")]
-        public Repl(
-            string[] scriptArgs,
-            IFileSystem fileSystem,
-            IScriptEngine scriptEngine,
-            IObjectSerializer serializer,
-            Common.Logging.ILog logger,
-            IScriptLibraryComposer composer,
-            IConsole console,
-            IFilePreProcessor filePreProcessor,
-            IEnumerable<IReplCommand> replCommands,
-            Printers printers)
-            : this(
-                scriptArgs,
-                fileSystem,
-                scriptEngine,
-                serializer,
-                new CommonLoggingLogProvider(logger),
-                composer,
-                console,
-                filePreProcessor,
-                replCommands,
-                printers)
-        {
-        }
-
         public Repl(
             string[] scriptArgs,
             IFileSystem fileSystem,

diff --git a/src/ScriptCs.Core/ReplCommands/InstallCommand.cs b/src/ScriptCs.Core/ReplCommands/InstallCommand.cs
@@ -12,16 +12,6 @@ public class InstallCommand : IReplCommand
         private readonly ILog _logger;
         private readonly IInstallationProvider _installationProvider;
 
-        [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")]
-        public InstallCommand(
-            IPackageInstaller packageInstaller,
-            IPackageAssemblyResolver packageAssemblyResolver,
-            Common.Logging.ILog logger,
-            IInstallationProvider installationProvider)
-            :this(packageInstaller, packageAssemblyResolver,new CommonLoggingLogProvider(logger), installationProvider)
-        {
-        }
-
         public InstallCommand(
             IPackageInstaller packageInstaller,
             IPackageAssemblyResolver packageAssemblyResolver,

diff --git a/src/ScriptCs.Core/ScriptCs.Core.csproj b/src/ScriptCs.Core/ScriptCs.Core.csproj
@@ -34,10 +34,6 @@
     <CodeAnalysisRuleSet>..\..\ScriptCs.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Common.Logging, Version=2.1.2.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Common.Logging.2.1.2\lib\net40\Common.Logging.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
@@ -52,15 +48,13 @@
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="AssemblyResolver.cs" />
     <Compile Include="AssemblyUtility.cs" />
-    <Compile Include="CommonLoggingLogProvider.cs" />
     <Compile Include="Extensions\EnumerableExtensions.cs" />
     <Compile Include="Extensions\MethodInfoExtensions.cs" />
     <Compile Include="FileSystemMigrator.cs" />
     <Compile Include="ILoggerConfigurator.cs" />
     <Compile Include="NullScriptLibraryComposer.cs" />
     <Compile Include="ReplCommands\ScriptPacksCommand.cs" />
     <Compile Include="Extensions\TypeExtensions.cs" />
-    <Compile Include="ScriptCsLogger.cs" />
     <Compile Include="ScriptLibraryComposer.cs" />
     <Compile Include="ScriptLibraryWrapper.cs" />
     <Compile Include="ReplCommands\AliasCommand.cs" />
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,5 +87,6 @@ void IScriptPackSession.ImportNamespace(string @namespace) @@
             {
                 _namespaces.Add(@namespace);
             }
         }
     }