scriptcs · jrusbatch · Feb 12, 2017 · May 7, 2015 · May 14, 2015 · May 15, 2015
diff --git a/build.sh b/build.sh
@@ -10,6 +10,6 @@ mono ./.nuget/NuGet.exe restore ./ScriptCs.sln
 # script
 mkdir -p artifacts/Release/bin
 xbuild ./ScriptCs.sln /property:Configuration=Release /nologo /verbosity:normal
-cp src/*/bin/Release/* artifacts/Release/bin/
+cp src/ScriptCs/bin/Release/* artifacts/Release/bin/
 mono ./packages/xunit.runners.1.9.2/tools/xunit.console.clr4.exe test/ScriptCs.Tests.Acceptance/bin/Release/ScriptCs.Tests.Acceptance.dll /xml artifacts/ScriptCs.Tests.Acceptance.dll.TestResult.xml /html artifacts/ScriptCs.Tests.Acceptance.dll.TestResult.html
 
diff --git a/build/Build.proj b/build/Build.proj
@@ -81,6 +81,7 @@
       <NuGetProjects Include="$(Root)src\ScriptCs.Hosting\ScriptCs.Hosting.csproj" />
       <NuGetProjects Include="$(Root)src\ScriptCs.Engine.Roslyn\ScriptCs.Engine.Roslyn.csproj" />
       <NuGetProjects Include="$(Root)src\ScriptCs.Engine.Mono\ScriptCs.Engine.Mono.csproj" />
+      <NuGetProjects Include="$(Root)src\ScriptCs\ScriptCs.csproj" />
     </ItemGroup>
     <Message Text="Building NuGet packages..." Importance="high" />
     <Exec Command="&quot;$(NuGetExePath)&quot; pack &quot;%(NuGetProjects.Identity)&quot; $(NuGetParameters)" />

diff --git a/build/ScriptCs.Version.props b/build/ScriptCs.Version.props
@@ -4,8 +4,8 @@
   <!-- Use the properties below to control the version of the assemblies created. -->
   <PropertyGroup>
     <MajorVersion>0</MajorVersion>
-    <MinorVersion>16</MinorVersion>
-    <PatchVersion>1</PatchVersion>
+    <MinorVersion>17</MinorVersion>
+    <PatchVersion>0</PatchVersion>
 
     <!-- Change this to set the build quality of the project. Use values like "alpha", "beta", "rc1", "rtm", etc. -->
     <!-- These values are used in SemVer, so make sure to always increase these alphabetically. -->

diff --git a/build_brew.sh b/build_brew.sh
diff --git a/src/ScriptCs.Contracts/FileParserContext.cs b/src/ScriptCs.Contracts/FileParserContext.cs
@@ -19,5 +19,7 @@ public FileParserContext()
         public List<string> LoadedScripts { get; private set; }
 
         public List<string> BodyLines { get; private set; }
+
+        public string ScriptPath { get; set; }
     }
 }
diff --git a/src/ScriptCs.Contracts/FilePreProcessorResult.cs b/src/ScriptCs.Contracts/FilePreProcessorResult.cs
@@ -17,6 +17,8 @@ public FilePreProcessorResult()
 
         public List<string> References { get; set; }
 
+        public string ScriptPath { get; set; }
+
         public string Code { get; set; }
     }
 }
diff --git a/src/ScriptCs.Contracts/IConsole.cs b/src/ScriptCs.Contracts/IConsole.cs
@@ -19,5 +19,7 @@ public interface IConsole
         void ResetColor();
 
         ConsoleColor ForegroundColor { get; set; }
+
+        int Width { get; }
     }
 }
diff --git a/src/ScriptCs.Contracts/IScriptEnvironment.cs b/src/ScriptCs.Contracts/IScriptEnvironment.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -9,5 +10,12 @@ namespace ScriptCs.Contracts
     public interface IScriptEnvironment
     {
         IReadOnlyList<string> ScriptArgs { get; }
+        void AddCustomPrinter<T>(Func<T, string> printer);
+        void Print<T>(T o);
+        void Print(object o);
+        string ScriptPath { get; }
+        string[] LoadedScripts { get; }
+        Assembly ScriptAssembly { get; }
+        void Initialize();
     }
-}
+}
diff --git a/src/ScriptCs.Contracts/IScriptExecutor.cs b/src/ScriptCs.Contracts/IScriptExecutor.cs
@@ -7,7 +7,7 @@ public interface IScriptExecutor
     {
         AssemblyReferences References { get; }
 
-        ICollection<string> Namespaces { get; }
+        IReadOnlyCollection<string> Namespaces { get; }
 
         IScriptEngine ScriptEngine { get; }
 

diff --git a/src/ScriptCs.Contracts/IScriptInfo.cs b/src/ScriptCs.Contracts/IScriptInfo.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ScriptCs.Contracts
+{
+    public interface IScriptInfo
+    {
+        string ScriptPath { get; set; }
+        IList<string> LoadedScripts { get; }
+    }
+}
diff --git a/src/ScriptCs.Contracts/Printers.cs b/src/ScriptCs.Contracts/Printers.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+
+namespace ScriptCs.Contracts
+{
+    public class Printers
+    {
+        private readonly IObjectSerializer _serializer;
+        private readonly Dictionary<Type, Func<object, string>> _dictionary = new Dictionary<Type, Func<object, string>>();
+        public Printers(IObjectSerializer serializer)
+        {
+            _serializer = serializer;
+        }
+
+        public void AddCustomPrinter<T>(Func<T, string> printer)
+        {
+            _dictionary[typeof(T)] = x => printer((T)x);
+        }
+
+        private string GetStringFor(Type t, object obj)
+        {
+            Func<object, string> printer;
+            if (_dictionary.TryGetValue(t, out printer))
+            {
+                return printer(obj);
+            }
+            else {
+                return _serializer.Serialize(obj);
+            }
+        }
+
+        public string GetStringFor(object obj)
+        {
+            return GetStringFor(obj.GetType(), obj);
+        }
+
+        public string GetStringFor<T>(T obj)
+        {
+            return GetStringFor(typeof(T), obj);
+        }
+    }
+}
diff --git a/src/ScriptCs.Contracts/ScriptCs.Contracts.csproj b/src/ScriptCs.Contracts/ScriptCs.Contracts.csproj
@@ -45,7 +45,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="App_Packages\LibLog.4.2\LibLog.cs" />
+    <Compile Include="App_Packages\LibLog.4.2\LibLog.cs">
+      <ExcludeFromStyleCop>true</ExcludeFromStyleCop>
+    </Compile>
     <Compile Include="AssemblyReferences.cs" />
     <Compile Include="BehaviorAfterCode.cs" />
     <Compile Include="..\ScriptCs.Core\Guard.cs">
@@ -79,6 +81,7 @@
     <Compile Include="IPackageReference.cs" />
     <Compile Include="IRepl.cs" />
     <Compile Include="IScriptEnvironment.cs" />
+    <Compile Include="IScriptInfo.cs" />
     <Compile Include="IScriptLibraryComposer.cs" />
     <Compile Include="IReplCommand.cs" />
     <Compile Include="IReplEngine.cs" />
@@ -105,6 +108,7 @@
     <Compile Include="LogLevel.cs" />
     <Compile Include="LogProviderExtensions.cs" />
     <Compile Include="ModuleAttribute.cs" />
+    <Compile Include="Printers.cs" />
     <Compile Include="ProjectItem.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ScriptPack.cs" />

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,
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,5 +87,6 @@ void IScriptPackSession.ImportNamespace(string @namespace) @@
             {
                 _namespaces.Add(@namespace);
             }
         }
     }