scriptcs · adamralph · Mar 23, 2015 · Feb 5, 2015 · Feb 5, 2015 · Feb 5, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -1,21 +1,10 @@
-language: c
-
-before_install:
-  - sudo bash -c "echo deb http://badgerports.org precise main >> /etc/apt/sources.list"
-  - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0E1FAD0C
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq mono-devel
+sudo: false
+language: csharp
 
 install:
-  - mozroots --import --sync --quiet
-  - mono ./.nuget/NuGet.exe restore ./ScriptCs.sln
+  - nuget restore ./ScriptCs.sln
 
 script:
   - mkdir artifacts --parents
   - xbuild ./ScriptCs.sln /property:Configuration=Release /nologo /verbosity:normal
   - 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
-
-notifications:
-  email:
-    - adam@adamralph.com
-
diff --git a/ScriptCs.sln b/ScriptCs.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
+VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptCs", "src\ScriptCs\ScriptCs.csproj", "{25080671-1A80-4041-B9C7-260578FF4849}"
 EndProject
@@ -37,6 +37,9 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptCs.Engine.Mono.Tests", "test\ScriptCs.Engine.Mono.Tests\ScriptCs.Engine.Mono.Tests.csproj", "{D0723C2D-D3B4-40B7-8E5A-84FB3A6E5092}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptCs.Tests.Acceptance", "test\ScriptCs.Tests.Acceptance\ScriptCs.Tests.Acceptance.csproj", "{10684649-2922-41F5-AB9B-20B127CBF92C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{25080671-1A80-4041-B9C7-260578FF4849} = {25080671-1A80-4041-B9C7-260578FF4849}
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{B138045D-DC04-4A04-A2BA-F771173BCC32}"
 	ProjectSection(SolutionItems) = preProject

diff --git a/ScriptCs.sln.DotSettings b/ScriptCs.sln.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String></wpf:ResourceDictionary>
diff --git a/build.sh b/build.sh
@@ -8,7 +8,8 @@ mozroots --import --sync --quiet
 mono ./.nuget/NuGet.exe restore ./ScriptCs.sln
 
 # script
-mkdir -p artifacts
+mkdir -p artifacts/Release/bin
 xbuild ./ScriptCs.sln /property:Configuration=Release /nologo /verbosity:normal
+cp src/*/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/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>13</MinorVersion>
-    <PatchVersion>3</PatchVersion>
+    <MinorVersion>14</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. -->
@@ -17,9 +17,9 @@
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).0</AssemblyVersion>
     <AssemblyInformationalVersion>$(MajorVersion).$(MinorVersion).$(PatchVersion)</AssemblyInformationalVersion>
     <AssemblyInformationalVersion Condition=" '$(BuildQuality)' != '' ">$(AssemblyInformationalVersion)-$(BuildQuality)</AssemblyInformationalVersion>
+    <AssemblyInformationalVersion Condition=" '$(IsNightlyBuild)' != '' ">$(AssemblyInformationalVersion)-nightly-$([System.DateTime]::UtcNow.ToString("yyMMdd"))</AssemblyInformationalVersion>
 
     <PackageVersion>$(AssemblyInformationalVersion)</PackageVersion>
-    <PackageVersion Condition=" '$(IsNightlyBuild)' != '' ">$(PackageVersion)-nightly-$([System.DateTime]::UtcNow.ToString("yyMMdd"))</PackageVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ScriptCs.Contracts/AssemblyReferences.cs b/src/ScriptCs.Contracts/AssemblyReferences.cs
@@ -1,41 +1,116 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-
-namespace ScriptCs.Contracts
+namespace ScriptCs.Contracts
 {
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Reflection;
+    using System;
+    using System.IO;
+
     public class AssemblyReferences
     {
+        private readonly Dictionary<string, Assembly> _assemblies = new Dictionary<string, Assembly>();
+        private readonly Dictionary<string, string> _paths = new Dictionary<string, string>();
+
         public AssemblyReferences()
-            : this(Enumerable.Empty<string>(), Enumerable.Empty<Assembly>())
+            : this(Enumerable.Empty<string>())
+        {
+        }
+
+        public AssemblyReferences(IEnumerable<Assembly> assemblies)
+            : this(assemblies, Enumerable.Empty<string>())
+        {
+        }
+
+        public AssemblyReferences(IEnumerable<string> paths)
+            : this(Enumerable.Empty<Assembly>(), paths)
         {
         }
 
-        public AssemblyReferences(IEnumerable<string> pathReferences, IEnumerable<Assembly> assemblies)
+        public AssemblyReferences(IEnumerable<Assembly> assemblies, IEnumerable<string> paths)
         {
-            Guard.AgainstNullArgument("pathReferences", pathReferences);
+            Guard.AgainstNullArgument("paths", paths);
             Guard.AgainstNullArgument("assemblies", assemblies);
 
-            PathReferences = new HashSet<string>(pathReferences);
-            Assemblies = new HashSet<Assembly>(assemblies);
+            foreach (var assembly in assemblies.Where(assembly => assembly != null))
+            {
+                var name = assembly.GetName().Name;
+                if (!_assemblies.ContainsKey(name))
+                {
+                    _assemblies.Add(name, assembly);
+                }
+            }
+
+            foreach (var path in paths)
+            {
+                var name = Path.GetFileName(path);
+                if (name == null)
+                {
+                    continue;
+                }
+
+                if (name.EndsWith(".dll", StringComparison.OrdinalIgnoreCase) ||
+                    name.EndsWith(".exe", StringComparison.OrdinalIgnoreCase))
+                {
+                    name = Path.GetFileNameWithoutExtension(name);
+                }
+
+                if (!_paths.ContainsKey(name) && !_assemblies.ContainsKey(name))
+                {
+                    _paths.Add(name, path);
+                }
+            }
         }
 
-        public HashSet<string> PathReferences { get; private set; }
-        public HashSet<Assembly> Assemblies { get; private set; }
+        public IEnumerable<Assembly> Assemblies
+        {
+            get { return _assemblies.Values.ToArray(); }
+        }
 
-        public AssemblyReferences Except(AssemblyReferences obj)
+        public IEnumerable<string> Paths
         {
-            Guard.AgainstNullArgument("obj", obj);
+            get { return _paths.Values.ToArray(); }
+        }
+
+        public AssemblyReferences Union(AssemblyReferences references)
+        {
+            Guard.AgainstNullArgument("references", references);
+
+            return new AssemblyReferences(Assemblies.Union(references.Assemblies), Paths.Union(references.Paths));
+        }
+
+        public AssemblyReferences Union(IEnumerable<Assembly> assemblies)
+        {
+            Guard.AgainstNullArgument("assemblies", assemblies);
+
+            return new AssemblyReferences(Assemblies.Union(assemblies), Paths);
+        }
+
+        public AssemblyReferences Union(IEnumerable<string> paths)
+        {
+            Guard.AgainstNullArgument("paths", paths);
+
+            return new AssemblyReferences(Assemblies, Paths.Union(paths));
+        }
+
+        public AssemblyReferences Except(AssemblyReferences references)
+        {
+            Guard.AgainstNullArgument("references", references);
+
+            return new AssemblyReferences(Assemblies.Except(references.Assemblies), Paths.Except(references.Paths));
+        }
+
+        public AssemblyReferences Except(IEnumerable<Assembly> assemblies)
+        {
+            Guard.AgainstNullArgument("assemblies", assemblies);
 
-            return new AssemblyReferences(PathReferences.Except(obj.PathReferences), Assemblies.Except(obj.Assemblies));
+            return new AssemblyReferences(Assemblies.Except(assemblies), Paths);
         }
 
-        public void Union(AssemblyReferences obj)
+        public AssemblyReferences Except(IEnumerable<string> paths)
         {
-            Guard.AgainstNullArgument("obj", obj);
+            Guard.AgainstNullArgument("paths", paths);
 
-            PathReferences.UnionWith(obj.PathReferences);
-            Assemblies.UnionWith(obj.Assemblies);
+            return new AssemblyReferences(Assemblies, Paths.Except(paths));
         }
     }
 }
diff --git a/src/ScriptCs.Contracts/IAppDomainAssemblyResolver.cs b/src/ScriptCs.Contracts/IAppDomainAssemblyResolver.cs
@@ -4,7 +4,6 @@ namespace ScriptCs.Contracts
 {
     public interface IAppDomainAssemblyResolver
     {
-        void AddAssemblyPaths(IEnumerable<string> assemblyPaths);
         void Initialize();
     }
 }
diff --git a/src/ScriptCs.Contracts/IPackageObject.cs b/src/ScriptCs.Contracts/IPackageObject.cs
@@ -20,6 +20,8 @@ public interface IPackageObject
 
         IEnumerable<IPackageObject> Dependencies { get; }
 
-        IEnumerable<string> FrameworkAssemblies { get; } 
+        IEnumerable<string> FrameworkAssemblies { get; }
+
+        IEnumerable<string> GetContentFiles();
     }
 }
diff --git a/src/ScriptCs.Contracts/IScriptEnvironment.cs b/src/ScriptCs.Contracts/IScriptEnvironment.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ScriptCs.Contracts
+{
+    public interface IScriptEnvironment
+    {
+        IReadOnlyList<string> ScriptArgs { get; }
+    }
+}
diff --git a/src/ScriptCs.Contracts/IScriptHost.cs b/src/ScriptCs.Contracts/IScriptHost.cs
@@ -5,5 +5,6 @@ namespace ScriptCs.Contracts
     public interface IScriptHost 
     {
         T Require<T>() where T : IScriptPackContext;
+        IScriptEnvironment Env { get; }
     }
 }
diff --git a/src/ScriptCs.Contracts/IScriptLibraryComposer.cs b/src/ScriptCs.Contracts/IScriptLibraryComposer.cs
@@ -0,0 +1,11 @@
+using System.Text;
+
+namespace ScriptCs.Contracts
+{
+    public interface IScriptLibraryComposer
+    {
+        void Compose(string workingDirectory, StringBuilder builder = null);
+
+        string ScriptLibrariesFile { get; }
+    }
+}
diff --git a/src/ScriptCs.Contracts/ScriptCs.Contracts.csproj b/src/ScriptCs.Contracts/ScriptCs.Contracts.csproj
@@ -74,10 +74,12 @@
     <Compile Include="IPackageInstaller.cs" />
     <Compile Include="IPackageObject.cs" />
     <Compile Include="IPackageReference.cs" />
+    <Compile Include="IRepl.cs" />
+    <Compile Include="IScriptEnvironment.cs" />
+    <Compile Include="IScriptLibraryComposer.cs" />
     <Compile Include="IReplCommand.cs" />
     <Compile Include="IReplEngine.cs" />
     <Compile Include="IScriptEngine.cs" />
-    <Compile Include="IRepl.cs" />
     <Compile Include="IScriptExecutor.cs" />
     <Compile Include="IScriptHost.cs" />
     <Compile Include="IScriptHostFactory.cs" />

diff --git a/src/ScriptCs.Core/AppDomainAssemblyResolver.cs b/src/ScriptCs.Core/AppDomainAssemblyResolver.cs
@@ -13,7 +13,7 @@ public class AppDomainAssemblyResolver : IAppDomainAssemblyResolver
         private readonly IFileSystem _fileSystem;
         private readonly IAssemblyResolver _resolver;
         private readonly IAssemblyUtility _assemblyUtility;
-        private IDictionary<string, AssemblyInfo> _assemblyInfoMap;
+        private readonly IDictionary<string, AssemblyInfo> _assemblyInfoMap;
 
         public AppDomainAssemblyResolver(
             ILog logger,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
		<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue"><Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /></s:String></wpf:ResourceDictionary>