diff --git a/src/ScriptCs.Contracts/ScriptPackSession.cs b/src/ScriptCs.Contracts/ScriptPackSession.cs index 5355a269..8cec6ac2 100644 --- 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 index 2d2b88ae..925420fc 100644 --- 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 _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 assemblyInfoMap = null, - Func 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 index 0bff67a2..d3a0f058 100644 --- 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 deleted file mode 100644 index 935aec5d..00000000 --- a/src/ScriptCs.Core/CommonLoggingLogProvider.cs +++ /dev/null @@ -1,200 +0,0 @@ -using System; -using System.Globalization; -using ScriptCs.Contracts; - -namespace ScriptCs -{ - [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")] - public class CommonLoggingLogProvider : ILogProvider - { - private readonly Common.Logging.ILog _logger; - - public CommonLoggingLogProvider(Common.Logging.ILog logger) - { - Guard.AgainstNullArgument("logger", logger); - - _logger = logger; - } - - public Logger GetLogger(string name) - { - return Log; - } - - public IDisposable OpenNestedContext(string message) - { - throw new NotImplementedException(); - } - - public IDisposable OpenMappedContext(string key, string value) - { - throw new NotImplementedException(); - } - - private bool Log(LogLevel logLevel, Func messageFunc, Exception exception, params object[] formatParameters) - { - if (messageFunc == null) - { - return IsEnabled(logLevel); - } - - messageFunc = Format(messageFunc, formatParameters); - - if (exception != null) - { - return LogException(logLevel, messageFunc, exception); - } - - switch (logLevel) - { - case LogLevel.Debug: - if (_logger.IsDebugEnabled) - { - _logger.Debug(messageFunc()); - return true; - } - - break; - case LogLevel.Info: - if (_logger.IsInfoEnabled) - { - _logger.Info(messageFunc()); - return true; - } - - break; - case LogLevel.Warn: - if (_logger.IsWarnEnabled) - { - _logger.Warn(messageFunc()); - return true; - } - - break; - case LogLevel.Error: - if (_logger.IsErrorEnabled) - { - _logger.Error(messageFunc()); - return true; - } - - break; - case LogLevel.Fatal: - if (_logger.IsFatalEnabled) - { - _logger.Fatal(messageFunc()); - return true; - } - break; - - default: - if (_logger.IsTraceEnabled) - { - _logger.Trace(messageFunc()); - return true; - } - - break; - } - - return false; - } - - private bool LogException(LogLevel logLevel, Func messageFunc, Exception exception) - { - switch (logLevel) - { - case LogLevel.Debug: - if (_logger.IsDebugEnabled) - { - _logger.Debug(messageFunc(), exception); - return true; - } - - break; - case LogLevel.Info: - if (_logger.IsInfoEnabled) - { - _logger.Info(messageFunc(), exception); - return true; - } - - break; - case LogLevel.Warn: - if (_logger.IsWarnEnabled) - { - _logger.Warn(messageFunc(), exception); - return true; - } - - break; - case LogLevel.Error: - if (_logger.IsErrorEnabled) - { - _logger.Error(messageFunc(), exception); - return true; - } - - break; - case LogLevel.Fatal: - if (_logger.IsFatalEnabled) - { - _logger.Fatal(messageFunc(), exception); - return true; - } - - break; - default: - if (_logger.IsTraceEnabled) - { - _logger.Trace(messageFunc(), exception); - return true; - } - - break; - } - - return false; - } - - private bool IsEnabled(LogLevel logLevel) - { - switch (logLevel) - { - case LogLevel.Debug: - return _logger.IsDebugEnabled; - case LogLevel.Info: - return _logger.IsInfoEnabled; - case LogLevel.Warn: - return _logger.IsWarnEnabled; - case LogLevel.Error: - return _logger.IsErrorEnabled; - case LogLevel.Fatal: - return _logger.IsFatalEnabled; - default: - return _logger.IsTraceEnabled; - } - } - - private static Func Format(Func messageFunc, object[] formatParameters) - { - if (formatParameters == null || formatParameters.Length == 0) - { - return messageFunc; - } - - return () => - { - var format = messageFunc(); - try - { - return string.Format(CultureInfo.InvariantCulture, format, formatParameters); - } - catch (FormatException ex) - { - throw new FormatException("The input string '" + format + "' could not be formatted using string.Format", ex); - } - }; - } - } -} diff --git a/src/ScriptCs.Core/DebugScriptExecutor.cs b/src/ScriptCs.Core/DebugScriptExecutor.cs index d64bb361..4c8097c9 100644 --- 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 index 1687c97d..4dd5cc17 100644 --- 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 lineProcessors) - : this(fileSystem, new CommonLoggingLogProvider(logger), lineProcessors) - { - } - public FilePreProcessor(IFileSystem fileSystem, ILogProvider logProvider, IEnumerable lineProcessors) { Guard.AgainstNullArgument("fileSystem", fileSystem); diff --git a/src/ScriptCs.Core/FileSystemMigrator.cs b/src/ScriptCs.Core/FileSystemMigrator.cs index 5e6dda5d..acac0825 100644 --- a/src/ScriptCs.Core/FileSystemMigrator.cs +++ b/src/ScriptCs.Core/FileSystemMigrator.cs @@ -13,12 +13,6 @@ public class FileSystemMigrator : IFileSystemMigrator private readonly Dictionary _directoryMoves; private readonly Dictionary _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 index 6099a34f..a10efab0 100644 --- 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 index 63de1e20..860344ce 100644 --- a/src/ScriptCs.Core/PackageAssemblyResolver.cs +++ b/src/ScriptCs.Core/PackageAssemblyResolver.cs @@ -15,13 +15,6 @@ public class PackageAssemblyResolver : IPackageAssemblyResolver private List _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 index aa99aa64..b315623f 100644 --- 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 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 index 1935ac53..ea5730cc 100644 --- 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 index 3f38d8a6..00e90167 100644 --- a/src/ScriptCs.Core/ScriptCs.Core.csproj +++ b/src/ScriptCs.Core/ScriptCs.Core.csproj @@ -34,10 +34,6 @@ ..\..\ScriptCs.ruleset - - ..\..\packages\Common.Logging.2.1.2\lib\net40\Common.Logging.dll - True - @@ -52,7 +48,6 @@ - @@ -60,7 +55,6 @@ - diff --git a/src/ScriptCs.Core/ScriptCsLogger.cs b/src/ScriptCs.Core/ScriptCsLogger.cs deleted file mode 100644 index 138e47cd..00000000 --- a/src/ScriptCs.Core/ScriptCsLogger.cs +++ /dev/null @@ -1,81 +0,0 @@ -using System; -using ScriptCs.Contracts; - -namespace ScriptCs -{ - [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")] - public class ScriptCsLogger : Common.Logging.Factory.AbstractLogger - { - private readonly ILog _log; - - public ScriptCsLogger(ILog log) - { - Guard.AgainstNullArgument("log", log); - - _log = log; - } - - protected override void WriteInternal(Common.Logging.LogLevel level, object message, Exception exception) - { - if (level == Common.Logging.LogLevel.Off) - { - return; - } - - _log.Log(Map(level), () => message == null ? null : message.ToString(), exception); - } - - public override bool IsTraceEnabled - { - get { return _log.IsTraceEnabled(); } - } - - public override bool IsDebugEnabled - { - get { return _log.IsDebugEnabled(); } - } - - public override bool IsErrorEnabled - { - get { return _log.IsErrorEnabled(); } - } - - public override bool IsFatalEnabled - { - get { return _log.IsFatalEnabled(); } - } - - public override bool IsInfoEnabled - { - get { return _log.IsInfoEnabled(); } - } - - public override bool IsWarnEnabled - { - get { return _log.IsWarnEnabled(); } - } - - private static LogLevel Map(Common.Logging.LogLevel level) - { - switch (level) - { - case Common.Logging.LogLevel.All: - return LogLevel.Trace; - case Common.Logging.LogLevel.Debug: - return LogLevel.Debug; - case Common.Logging.LogLevel.Error: - return LogLevel.Error; - case Common.Logging.LogLevel.Fatal: - return LogLevel.Fatal; - case Common.Logging.LogLevel.Info: - return LogLevel.Info; - case Common.Logging.LogLevel.Trace: - return LogLevel.Trace; - case Common.Logging.LogLevel.Warn: - return LogLevel.Warn; - } - - throw new NotSupportedException("Unknown log level."); - } - } -} diff --git a/src/ScriptCs.Core/ScriptExecutor.cs b/src/ScriptCs.Core/ScriptExecutor.cs index 3959e765..9a4ce802 100644 --- a/src/ScriptCs.Core/ScriptExecutor.cs +++ b/src/ScriptCs.Core/ScriptExecutor.cs @@ -46,9 +46,6 @@ public class ScriptExecutor : IScriptExecutor public IScriptEngine ScriptEngine { get; private set; } - [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")] - public Common.Logging.ILog Logger { get; private set; } - public AssemblyReferences References { get; private set; } public IReadOnlyCollection Namespaces { get; private set; } @@ -57,30 +54,12 @@ public class ScriptExecutor : IScriptExecutor public IScriptLibraryComposer ScriptLibraryComposer { get; protected set; } - [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")] - public ScriptExecutor( - IFileSystem fileSystem, IFilePreProcessor filePreProcessor, IScriptEngine scriptEngine, Common.Logging.ILog logger) - : this(fileSystem, filePreProcessor, scriptEngine, new CommonLoggingLogProvider(logger), new NullScriptLibraryComposer()) - { - } - public ScriptExecutor( IFileSystem fileSystem, IFilePreProcessor filePreProcessor, IScriptEngine scriptEngine, ILogProvider logProvider) : this(fileSystem, filePreProcessor, scriptEngine, logProvider, new NullScriptLibraryComposer()) { } - [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")] - public ScriptExecutor( - IFileSystem fileSystem, - IFilePreProcessor filePreProcessor, - IScriptEngine scriptEngine, - Common.Logging.ILog logger, - IScriptLibraryComposer composer) - : this(fileSystem, filePreProcessor, scriptEngine, new CommonLoggingLogProvider(logger), composer) - { - } - public ScriptExecutor( IFileSystem fileSystem, IFilePreProcessor filePreProcessor, @@ -102,9 +81,6 @@ public ScriptExecutor( FilePreProcessor = filePreProcessor; ScriptEngine = scriptEngine; _log = logProvider.ForCurrentType(); -#pragma warning disable 618 - Logger = new ScriptCsLogger(_log); -#pragma warning restore 618 ScriptLibraryComposer = composer; } @@ -181,7 +157,9 @@ public virtual ScriptResult Execute(string script, params string[] scriptArgs) { var path = Path.IsPathRooted(script) ? script : Path.Combine(FileSystem.CurrentDirectory, script); var result = FilePreProcessor.ProcessFile(path); + ScriptEngine.FileName = Path.GetFileName(path); + return EngineExecute(Path.GetDirectoryName(path), scriptArgs, result); } diff --git a/src/ScriptCs.Core/ScriptHostFactory.cs b/src/ScriptCs.Core/ScriptHostFactory.cs index f15aa939..5190d77d 100644 --- a/src/ScriptCs.Core/ScriptHostFactory.cs +++ b/src/ScriptCs.Core/ScriptHostFactory.cs @@ -6,7 +6,7 @@ public class ScriptHostFactory : IScriptHostFactory { private readonly IConsole _console; private readonly Printers _printers; - + public ScriptHostFactory(IConsole console, Printers printers) { _console = console; diff --git a/src/ScriptCs.Core/ScriptLibraryComposer.cs b/src/ScriptCs.Core/ScriptLibraryComposer.cs index de8631cf..f362df5c 100644 --- a/src/ScriptCs.Core/ScriptLibraryComposer.cs +++ b/src/ScriptCs.Core/ScriptLibraryComposer.cs @@ -15,12 +15,6 @@ public class ScriptLibraryComposer : IScriptLibraryComposer private readonly IPackageAssemblyResolver _packageAssemblyResolver; private readonly ILog _logger; - [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")] - public ScriptLibraryComposer(IFileSystem fileSystem, IFilePreProcessor preProcessor, IPackageContainer packageContainer, IPackageAssemblyResolver packageAssemblyResolver, Common.Logging.ILog logger) - : this(fileSystem, preProcessor, packageContainer, packageAssemblyResolver, new CommonLoggingLogProvider(logger)) - { - } - public ScriptLibraryComposer(IFileSystem fileSystem, IFilePreProcessor preProcessor, IPackageContainer packageContainer, IPackageAssemblyResolver packageAssemblyResolver, ILogProvider logProvider) { Guard.AgainstNullArgument("fileSystem", fileSystem); diff --git a/src/ScriptCs.Core/ScriptServices.cs b/src/ScriptCs.Core/ScriptServices.cs index 3acfd672..6d342529 100644 --- a/src/ScriptCs.Core/ScriptServices.cs +++ b/src/ScriptCs.Core/ScriptServices.cs @@ -6,46 +6,6 @@ namespace ScriptCs { public class ScriptServices { - [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")] - public ScriptServices( - IFileSystem fileSystem, - IPackageAssemblyResolver packageAssemblyResolver, - IScriptExecutor executor, - IRepl repl, - IScriptEngine engine, - IFilePreProcessor filePreProcessor, - IScriptPackResolver scriptPackResolver, - IPackageInstaller packageInstaller, - IObjectSerializer objectSerializer, - Common.Logging.ILog logger, - IAssemblyResolver assemblyResolver, - IEnumerable replCommands, - IFileSystemMigrator fileSystemMigrator, - IConsole console = null, - IInstallationProvider installationProvider = null, - IScriptLibraryComposer scriptLibraryComposer = null - ) - : this( - fileSystem, - packageAssemblyResolver, - executor, - repl, - engine, - filePreProcessor, - scriptPackResolver, - packageInstaller, - objectSerializer, - new CommonLoggingLogProvider(logger), - assemblyResolver, - replCommands, - fileSystemMigrator, - console, - installationProvider, - scriptLibraryComposer - ) - { - } - public ScriptServices( IFileSystem fileSystem, IPackageAssemblyResolver packageAssemblyResolver, @@ -75,9 +35,6 @@ public ScriptServices( PackageInstaller = packageInstaller; ObjectSerializer = objectSerializer; LogProvider = logProvider; -#pragma warning disable 618 - Logger = new ScriptCsLogger(logProvider.ForCurrentType()); -#pragma warning restore 618 Console = console; AssemblyResolver = assemblyResolver; InstallationProvider = installationProvider; @@ -95,9 +52,6 @@ public ScriptServices( public IObjectSerializer ObjectSerializer { get; private set; } public ILogProvider LogProvider { get; private set; } - [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")] - public Common.Logging.ILog Logger { get; private set; } - public IScriptEngine Engine { get; private set; } public IFilePreProcessor FilePreProcessor { get; private set; } public IConsole Console { get; private set; } diff --git a/src/ScriptCs.Core/packages.config b/src/ScriptCs.Core/packages.config index fc9381e2..f2e75d5c 100644 --- a/src/ScriptCs.Core/packages.config +++ b/src/ScriptCs.Core/packages.config @@ -1,6 +1,5 @@  - \ No newline at end of file diff --git a/src/ScriptCs.Engine.Mono/MonoScriptEngine.cs b/src/ScriptCs.Engine.Mono/MonoScriptEngine.cs index b82688bb..74014b0f 100644 --- a/src/ScriptCs.Engine.Mono/MonoScriptEngine.cs +++ b/src/ScriptCs.Engine.Mono/MonoScriptEngine.cs @@ -22,21 +22,12 @@ public class MonoScriptEngine : IReplEngine public string CacheDirectory { get; set; } public string FileName { get; set; } - [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")] - public MonoScriptEngine(IScriptHostFactory scriptHostFactory, Common.Logging.ILog logger) - : this(scriptHostFactory, new CommonLoggingLogProvider(logger)) - { - } - public MonoScriptEngine(IScriptHostFactory scriptHostFactory, ILogProvider logProvider) { Guard.AgainstNullArgument("logProvider", logProvider); _scriptHostFactory = scriptHostFactory; _log = logProvider.ForCurrentType(); -#pragma warning disable 618 - Logger = new ScriptCsLogger(_log); -#pragma warning restore 618 } [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")] diff --git a/src/ScriptCs.Engine.Roslyn/CommonScriptEngine.cs b/src/ScriptCs.Engine.Roslyn/CommonScriptEngine.cs index 2570372d..628c5360 100644 --- a/src/ScriptCs.Engine.Roslyn/CommonScriptEngine.cs +++ b/src/ScriptCs.Engine.Roslyn/CommonScriptEngine.cs @@ -34,6 +34,8 @@ public string BaseDirectory public string FileName { get; set; } + public string ScriptPath { get; set; } + public ScriptResult Execute(string code, string[] scriptArgs, AssemblyReferences references, IEnumerable namespaces, ScriptPackSession scriptPackSession) { if (scriptPackSession == null) diff --git a/src/ScriptCs.Hosting/IInitializationServices.cs b/src/ScriptCs.Hosting/IInitializationServices.cs index 276ce1a1..66ae6e88 100644 --- a/src/ScriptCs.Hosting/IInitializationServices.cs +++ b/src/ScriptCs.Hosting/IInitializationServices.cs @@ -17,9 +17,6 @@ public interface IInitializationServices IPackageInstaller GetPackageInstaller(); - [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")] - Common.Logging.ILog Logger { get; } - ILogProvider LogProvider { get; } IAppDomainAssemblyResolver GetAppDomainAssemblyResolver(); diff --git a/src/ScriptCs.Hosting/InitializationServices.cs b/src/ScriptCs.Hosting/InitializationServices.cs index d96d8123..8e0fa92c 100644 --- a/src/ScriptCs.Hosting/InitializationServices.cs +++ b/src/ScriptCs.Hosting/InitializationServices.cs @@ -10,12 +10,6 @@ public class InitializationServices : ScriptServicesRegistration, IInitializatio { private readonly ILog _log; - [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")] - public InitializationServices(Common.Logging.ILog logger, IDictionary overrides = null) - : this(new CommonLoggingLogProvider(logger), overrides) - { - } - public InitializationServices(ILogProvider logProvider, IDictionary overrides = null) : base(logProvider, overrides) { diff --git a/src/ScriptCs.Hosting/LoggerConfigurator.cs b/src/ScriptCs.Hosting/LoggerConfigurator.cs deleted file mode 100644 index 7ac14bf9..00000000 --- a/src/ScriptCs.Hosting/LoggerConfigurator.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using ScriptCs.Contracts; -using LogLevel = ScriptCs.Contracts.LogLevel; - -namespace ScriptCs.Hosting -{ - [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")] - public class LoggerConfigurator : ILoggerConfigurator - { - private const string LoggerName = "scriptcs"; - - private readonly LogLevel _logLevel; - - private Common.Logging.ILog _logger; - - public LoggerConfigurator(LogLevel logLevel) - { - _logLevel = logLevel; - } - - public void Configure(IConsole console) - { - _logger = new ScriptConsoleLogger(_logLevel, console, Common.Logging.LogManager.GetLogger(LoggerName)); - } - - public Common.Logging.ILog GetLogger() - { - return _logger; - } - } -} diff --git a/src/ScriptCs.Hosting/ModuleLoader.cs b/src/ScriptCs.Hosting/ModuleLoader.cs index 7e130c6d..de5874b1 100644 --- a/src/ScriptCs.Hosting/ModuleLoader.cs +++ b/src/ScriptCs.Hosting/ModuleLoader.cs @@ -26,19 +26,6 @@ public class ModuleLoader : IModuleLoader private readonly IFileSystem _fileSystem; private readonly IAssemblyUtility _assemblyUtility; - [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")] - [ImportingConstructor] - public ModuleLoader(IAssemblyResolver resolver, Common.Logging.ILog logger, IFileSystem fileSystem, IAssemblyUtility assemblyUtility) - : this(resolver, new CommonLoggingLogProvider(logger), fileSystem, assemblyUtility) - { - } - - [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")] - public ModuleLoader(IAssemblyResolver resolver, Common.Logging.ILog logger, Action addToCatalog, Func>> getLazyModules, IFileSystem fileSystem, IAssemblyUtility assemblyUtility) - : this(resolver, new CommonLoggingLogProvider(logger), addToCatalog, getLazyModules, fileSystem, assemblyUtility) - { - } - [ImportingConstructor] public ModuleLoader(IAssemblyResolver resolver, ILogProvider logProvider, IFileSystem fileSystem, IAssemblyUtility assemblyUtility) : this(resolver, logProvider, null, null, fileSystem, assemblyUtility) diff --git a/src/ScriptCs.Hosting/Package/NugetInstallationProvider.cs b/src/ScriptCs.Hosting/Package/NugetInstallationProvider.cs index 7d3ace6e..9a6b8a6f 100644 --- a/src/ScriptCs.Hosting/Package/NugetInstallationProvider.cs +++ b/src/ScriptCs.Hosting/Package/NugetInstallationProvider.cs @@ -17,12 +17,6 @@ public class NugetInstallationProvider : IInstallationProvider private static readonly Version EmptyVersion = new Version(); - [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")] - public NugetInstallationProvider(IFileSystem fileSystem, Common.Logging.ILog logger) - : this(fileSystem, new CommonLoggingLogProvider(logger)) - { - } - public NugetInstallationProvider(IFileSystem fileSystem, ILogProvider logProvider) { Guard.AgainstNullArgument("fileSystem", fileSystem); diff --git a/src/ScriptCs.Hosting/Package/PackageContainer.cs b/src/ScriptCs.Hosting/Package/PackageContainer.cs index 9cb2e15f..8b124751 100644 --- a/src/ScriptCs.Hosting/Package/PackageContainer.cs +++ b/src/ScriptCs.Hosting/Package/PackageContainer.cs @@ -19,12 +19,6 @@ public class PackageContainer : IPackageContainer private readonly ILog _logger; - [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")] - public PackageContainer(IFileSystem fileSystem, Common.Logging.ILog logger) - : this(fileSystem, new CommonLoggingLogProvider(logger)) - { - } - public PackageContainer(IFileSystem fileSystem, ILogProvider logProvider) { Guard.AgainstNullArgument("fileSystem", fileSystem); diff --git a/src/ScriptCs.Hosting/Package/PackageInstaller.cs b/src/ScriptCs.Hosting/Package/PackageInstaller.cs index 7c823e12..45c20d31 100644 --- a/src/ScriptCs.Hosting/Package/PackageInstaller.cs +++ b/src/ScriptCs.Hosting/Package/PackageInstaller.cs @@ -10,12 +10,6 @@ public class PackageInstaller : IPackageInstaller private readonly IInstallationProvider _installer; private readonly ILog _logger; - [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")] - public PackageInstaller(IInstallationProvider installer, Common.Logging.ILog logger) - : this(installer, new CommonLoggingLogProvider(logger)) - { - } - public PackageInstaller(IInstallationProvider installer, ILogProvider logProvider) { Guard.AgainstNullArgument("installer", installer); diff --git a/src/ScriptCs.Hosting/RuntimeServices.cs b/src/ScriptCs.Hosting/RuntimeServices.cs index a42f12ef..e83653bc 100644 --- a/src/ScriptCs.Hosting/RuntimeServices.cs +++ b/src/ScriptCs.Hosting/RuntimeServices.cs @@ -21,30 +21,6 @@ public class RuntimeServices : ScriptServicesRegistration, IRuntimeServices private readonly IInitializationServices _initializationServices; private readonly string _scriptName; - [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")] - public RuntimeServices( - Common.Logging.ILog logger, - IDictionary overrides, - IConsole console, - Type scriptEngineType, - Type scriptExecutorType, - Type replType, - bool initDirectoryCatalog, - IInitializationServices initializationServices, - string scriptName) - : this( - new CommonLoggingLogProvider(logger), - overrides, - console, - scriptEngineType, - scriptExecutorType, - replType, - initDirectoryCatalog, - initializationServices, - scriptName) - { - } - public RuntimeServices( ILogProvider logProvider, IDictionary overrides, diff --git a/src/ScriptCs.Hosting/ScriptConsoleLogger.cs b/src/ScriptCs.Hosting/ScriptConsoleLogger.cs deleted file mode 100644 index 3d953f53..00000000 --- a/src/ScriptCs.Hosting/ScriptConsoleLogger.cs +++ /dev/null @@ -1,147 +0,0 @@ -using System; -using System.Collections.Generic; -using ScriptCs.Contracts; -using LogLevel = ScriptCs.Contracts.LogLevel; - -namespace ScriptCs.Hosting -{ - [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")] - public class ScriptConsoleLogger : Common.Logging.Factory.AbstractLogger - { - private readonly LogLevel _consoleLogLevel; - private readonly IConsole _console; - private readonly Common.Logging.ILog _log; - private readonly Dictionary colors = - new Dictionary - { - { Common.Logging.LogLevel.Fatal, ConsoleColor.Red }, - { Common.Logging.LogLevel.Error, ConsoleColor.DarkRed }, - { Common.Logging.LogLevel.Warn, ConsoleColor.DarkYellow }, - { Common.Logging.LogLevel.Info, ConsoleColor.Gray }, - { Common.Logging.LogLevel.Debug, ConsoleColor.DarkGray }, - { Common.Logging.LogLevel.Trace, ConsoleColor.DarkMagenta }, - }; - - public ScriptConsoleLogger(LogLevel consoleLogLevel, IConsole console, Common.Logging.ILog log) - { - Guard.AgainstNullArgument("console", console); - Guard.AgainstNullArgument("log", log); - - _consoleLogLevel = consoleLogLevel; - _console = console; - _log = log; - } - - public override bool IsFatalEnabled - { - get { return true; } - } - - public override bool IsErrorEnabled - { - get { return true; } - } - - public override bool IsWarnEnabled - { - get { return true; } - } - - public override bool IsInfoEnabled - { - get { return _log.IsInfoEnabled || _consoleLogLevel != LogLevel.Error; } - } - - public override bool IsDebugEnabled - { - get { return _log.IsDebugEnabled || _consoleLogLevel == LogLevel.Debug || _consoleLogLevel == LogLevel.Trace; } - } - - public override bool IsTraceEnabled - { - get { return _log.IsTraceEnabled || _consoleLogLevel == LogLevel.Trace; } - } - - protected override void WriteInternal(Common.Logging.LogLevel level, object message, Exception exception) - { - Guard.AgainstNullArgument("message", message); - - var consoleLog = false; - switch (level) - { - case Common.Logging.LogLevel.Fatal: - consoleLog = true; - if (_log.IsFatalEnabled) - { - _log.Fatal(message, exception); - } - - break; - case Common.Logging.LogLevel.Error: - consoleLog = true; - if (_log.IsErrorEnabled) - { - _log.Error(message, exception); - } - - break; - case Common.Logging.LogLevel.Warn: - consoleLog = true; - if (_log.IsWarnEnabled) - { - _log.Warn(message, exception); - } - - break; - case Common.Logging.LogLevel.Info: - consoleLog = _consoleLogLevel != LogLevel.Error; - if (_log.IsInfoEnabled) - { - _log.Info(message, exception); - } - - break; - case Common.Logging.LogLevel.Debug: - consoleLog = _consoleLogLevel == LogLevel.Debug || _consoleLogLevel == LogLevel.Trace; - if (_log.IsDebugEnabled) - { - _log.Debug(message, exception); - } - - break; - case Common.Logging.LogLevel.Trace: - consoleLog = _consoleLogLevel == LogLevel.Trace; - if (_log.IsTraceEnabled) - { - _log.Trace(message, exception); - } - - break; - } - - if (consoleLog) - { - var prefix = level == Common.Logging.LogLevel.Info - ? null - : string.Concat(level.ToString().ToUpperInvariant(), ": "); - - ConsoleColor color; - if (!colors.TryGetValue(level, out color)) - { - color = ConsoleColor.White; - } - - var originalColor = _console.ForegroundColor; - _console.ForegroundColor = color; - try - { - _console.WriteLine(string.Concat(prefix, message.ToString())); - } - finally - { - _console.ForegroundColor = originalColor; - } - } - } - } -} diff --git a/src/ScriptCs.Hosting/ScriptCs.Hosting.csproj b/src/ScriptCs.Hosting/ScriptCs.Hosting.csproj index 08d411ae..5025cd42 100644 --- a/src/ScriptCs.Hosting/ScriptCs.Hosting.csproj +++ b/src/ScriptCs.Hosting/ScriptCs.Hosting.csproj @@ -59,10 +59,6 @@ False ..\..\packages\Autofac.Mef.3.0.3\lib\net40\Autofac.Integration.Mef.dll - - ..\..\packages\Common.Logging.2.1.2\lib\net40\Common.Logging.dll - True - @@ -85,7 +81,6 @@ - @@ -97,7 +92,6 @@ - diff --git a/src/ScriptCs.Hosting/ScriptServicesBuilder.cs b/src/ScriptCs.Hosting/ScriptServicesBuilder.cs index 7b5038c3..618ec684 100644 --- a/src/ScriptCs.Hosting/ScriptServicesBuilder.cs +++ b/src/ScriptCs.Hosting/ScriptServicesBuilder.cs @@ -21,22 +21,6 @@ public class ScriptServicesBuilder : ServiceOverrides, I private Type _scriptEngineType; private bool? _loadScriptPacks; - [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")] - public ScriptServicesBuilder( - IConsole console, - Common.Logging.ILog logger, - IRuntimeServices runtimeServices = null, - ITypeResolver typeResolver = null, - IInitializationServices initializationServices = null) - : this( - console, - new CommonLoggingLogProvider(logger), - runtimeServices, - typeResolver, - initializationServices) - { - } - public ScriptServicesBuilder( IConsole console, ILogProvider logProvider, diff --git a/src/ScriptCs.Hosting/ScriptServicesRegistration.cs b/src/ScriptCs.Hosting/ScriptServicesRegistration.cs index 850bfee2..395281b3 100644 --- a/src/ScriptCs.Hosting/ScriptServicesRegistration.cs +++ b/src/ScriptCs.Hosting/ScriptServicesRegistration.cs @@ -12,20 +12,11 @@ public abstract class ScriptServicesRegistration private readonly ILog _log; private readonly IDictionary _overrides; - [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")] - public Common.Logging.ILog Logger { get; private set; } - public ILogProvider LogProvider { get { return _logProvider; } } - [Obsolete("Support for Common.Logging types was deprecated in version 0.15.0 and will soon be removed.")] - protected ScriptServicesRegistration(Common.Logging.ILog logger, IDictionary overrides) - :this(new CommonLoggingLogProvider(logger), overrides) - { - } - protected ScriptServicesRegistration(ILogProvider logProvider, IDictionary overrides) { Guard.AgainstNullArgument("logProvider", logProvider); @@ -33,9 +24,6 @@ protected ScriptServicesRegistration(ILogProvider logProvider, IDictionary(); _logProvider = logProvider; _log = _logProvider.ForCurrentType(); -#pragma warning disable 618 - Logger = new ScriptCsLogger(_log); -#pragma warning restore 618 } protected void RegisterOverrideOrDefault(ContainerBuilder builder, Action registrationAction) diff --git a/src/ScriptCs.Hosting/packages.config b/src/ScriptCs.Hosting/packages.config index fc2a5bfc..2b11fb1b 100644 --- a/src/ScriptCs.Hosting/packages.config +++ b/src/ScriptCs.Hosting/packages.config @@ -2,7 +2,6 @@ - diff --git a/src/ScriptCs/ScriptCs.csproj b/src/ScriptCs/ScriptCs.csproj index ce665eb7..2716ef2e 100644 --- a/src/ScriptCs/ScriptCs.csproj +++ b/src/ScriptCs/ScriptCs.csproj @@ -55,10 +55,6 @@ ..\..\common\Icon.ico - - ..\..\packages\Common.Logging.2.1.2\lib\net40\Common.Logging.dll - True - ..\..\packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/src/ScriptCs/packages.config b/src/ScriptCs/packages.config index c7c1de45..473b1eea 100644 --- a/src/ScriptCs/packages.config +++ b/src/ScriptCs/packages.config @@ -1,6 +1,5 @@  - diff --git a/test/ScriptCs.Core.Tests/ScriptCs.Core.Tests.csproj b/test/ScriptCs.Core.Tests/ScriptCs.Core.Tests.csproj index a214313f..66797a40 100644 --- a/test/ScriptCs.Core.Tests/ScriptCs.Core.Tests.csproj +++ b/test/ScriptCs.Core.Tests/ScriptCs.Core.Tests.csproj @@ -84,10 +84,6 @@ - - ..\..\packages\Common.Logging.2.1.2\lib\net40\Common.Logging.dll - True - False ..\..\packages\Microsoft.Web.Xdt.2.1.0\lib\net40\Microsoft.Web.XmlTransform.dll diff --git a/test/ScriptCs.Core.Tests/packages.config b/test/ScriptCs.Core.Tests/packages.config index 17a1635b..d8f2d2e2 100644 --- a/test/ScriptCs.Core.Tests/packages.config +++ b/test/ScriptCs.Core.Tests/packages.config @@ -3,7 +3,6 @@ - diff --git a/test/ScriptCs.Engine.Mono.Tests/ScriptCs.Engine.Mono.Tests.csproj b/test/ScriptCs.Engine.Mono.Tests/ScriptCs.Engine.Mono.Tests.csproj index bacbd9c9..e36641b1 100644 --- a/test/ScriptCs.Engine.Mono.Tests/ScriptCs.Engine.Mono.Tests.csproj +++ b/test/ScriptCs.Engine.Mono.Tests/ScriptCs.Engine.Mono.Tests.csproj @@ -53,10 +53,6 @@ - - ..\..\packages\Common.Logging.2.1.2\lib\net40\Common.Logging.dll - True - False ..\..\packages\Mono.CSharp.4.0.0.143\lib\4.5\Mono.CSharp.dll diff --git a/test/ScriptCs.Engine.Mono.Tests/packages.config b/test/ScriptCs.Engine.Mono.Tests/packages.config index 92f09f7c..849ecb44 100644 --- a/test/ScriptCs.Engine.Mono.Tests/packages.config +++ b/test/ScriptCs.Engine.Mono.Tests/packages.config @@ -1,6 +1,5 @@  - diff --git a/test/ScriptCs.Engine.Roslyn.Tests/ScriptCs.Engine.Roslyn.Tests.csproj b/test/ScriptCs.Engine.Roslyn.Tests/ScriptCs.Engine.Roslyn.Tests.csproj index 57948e65..6972230f 100644 --- a/test/ScriptCs.Engine.Roslyn.Tests/ScriptCs.Engine.Roslyn.Tests.csproj +++ b/test/ScriptCs.Engine.Roslyn.Tests/ScriptCs.Engine.Roslyn.Tests.csproj @@ -57,10 +57,6 @@ - - ..\..\packages\Common.Logging.2.1.2\lib\net40\Common.Logging.dll - True - False ..\..\lib\Microsoft.CodeAnalysis.Scripting.dll diff --git a/test/ScriptCs.Engine.Roslyn.Tests/packages.config b/test/ScriptCs.Engine.Roslyn.Tests/packages.config index 35492533..f815c20c 100644 --- a/test/ScriptCs.Engine.Roslyn.Tests/packages.config +++ b/test/ScriptCs.Engine.Roslyn.Tests/packages.config @@ -3,7 +3,6 @@ - diff --git a/test/ScriptCs.Hosting.Tests/ScriptCs.Hosting.Tests.csproj b/test/ScriptCs.Hosting.Tests/ScriptCs.Hosting.Tests.csproj index 398639fe..24a085c4 100644 --- a/test/ScriptCs.Hosting.Tests/ScriptCs.Hosting.Tests.csproj +++ b/test/ScriptCs.Hosting.Tests/ScriptCs.Hosting.Tests.csproj @@ -66,10 +66,6 @@ ..\..\packages\Autofac.3.3.1\lib\net40\Autofac.dll - - ..\..\packages\Common.Logging.2.1.2\lib\net40\Common.Logging.dll - True - ..\..\packages\Microsoft.Web.Xdt.2.1.0\lib\net40\Microsoft.Web.XmlTransform.dll diff --git a/test/ScriptCs.Hosting.Tests/packages.config b/test/ScriptCs.Hosting.Tests/packages.config index a8690016..b966d469 100644 --- a/test/ScriptCs.Hosting.Tests/packages.config +++ b/test/ScriptCs.Hosting.Tests/packages.config @@ -4,7 +4,6 @@ - diff --git a/test/ScriptCs.Tests/ScriptCs.Tests.csproj b/test/ScriptCs.Tests/ScriptCs.Tests.csproj index 44c67022..f8a93041 100644 --- a/test/ScriptCs.Tests/ScriptCs.Tests.csproj +++ b/test/ScriptCs.Tests/ScriptCs.Tests.csproj @@ -61,10 +61,6 @@ - - ..\..\packages\Common.Logging.2.1.2\lib\net40\Common.Logging.dll - True - ..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll diff --git a/test/ScriptCs.Tests/packages.config b/test/ScriptCs.Tests/packages.config index 35492533..f815c20c 100644 --- a/test/ScriptCs.Tests/packages.config +++ b/test/ScriptCs.Tests/packages.config @@ -3,7 +3,6 @@ -