Index: Rakefile =================================================================== --- Rakefile (revision 128) +++ Rakefile (working copy) @@ -238,7 +238,7 @@ IronRuby.source_context do compile :dlr_core, :references => ['!System.dll', '!System.Configuration.dll'], :switches => ['target:library', 'define:MICROSOFT_SCRIPTING_CORE'], :output => 'Microsoft.Scripting.Core.dll' resources = { Pathname.new('math') + 'MathResources.resx' => Pathname.new('Microsoft.Scripting.Math.MathResources.resources') } - compile :dlr_libs, :references => ['Microsoft.Scripting.Core.dll', '!System.dll'], :switches => ['target:library'], :resources => resources, :output => 'Microsoft.Scripting.dll' + compile :dlr_libs, :references => ['Microsoft.Scripting.Core.dll', '!System.dll', '!System.Configuration.dll'], :switches => ['target:library'], :resources => resources, :output => 'Microsoft.Scripting.dll' end end @@ -252,7 +252,7 @@ desc "compile IronRuby.dll" task :compile_ruby => [:compile_dlr] do IronRuby.source_context do - compile :ironruby, :references => ['Microsoft.Scripting.Core.dll', 'Microsoft.Scripting.dll', '!System.dll'], :switches => ['target:library'], :output => 'IronRuby.dll' + compile :ironruby, :references => ['Microsoft.Scripting.Core.dll', 'Microsoft.Scripting.dll', '!System.dll', '!System.Configuration.dll'], :switches => ['target:library'], :output => 'IronRuby.dll' end end @@ -289,7 +289,7 @@ desc "compile Yaml" task :compile_yaml => [:compile_libraries] do IronRuby.source_context do - compile :yaml, :references => ['Microsoft.Scripting.Core.dll', 'Microsoft.Scripting.dll', 'IronRuby.dll', 'IronRuby.Libraries.dll'], :switches => ['target:library'], :output => 'IronRuby.Libraries.Yaml.dll' + compile :yaml, :references => ['Microsoft.Scripting.Core.dll', 'Microsoft.Scripting.dll', 'IronRuby.dll', 'IronRuby.Libraries.dll', '!System.dll'], :switches => ['target:library'], :output => 'IronRuby.Libraries.Yaml.dll' end end Index: context.rb =================================================================== --- context.rb (revision 128) +++ context.rb (working copy) @@ -484,9 +484,11 @@ args[:resources].each_value { |res| cs_args << "resource:\"#{build_path + res}\"" } end + cs_args << "recurse:*.cs" + switches = '' cs_args.each { |opt| switches << ' /' + opt } - cmd = CS_COMPILER + switches + ' ' + get_compile_path_list.join(" ") + cmd = CS_COMPILER + switches exec cmd end end Index: src/microsoft.scripting/hosting/shell/BasicConsole.cs =================================================================== --- src/microsoft.scripting/hosting/shell/BasicConsole.cs (revision 128) +++ src/microsoft.scripting/hosting/shell/BasicConsole.cs (working copy) @@ -105,16 +105,8 @@ } protected void WriteColor(TextWriter output, string str, ConsoleColor c) { -#if !SILVERLIGHT // Console.ForegroundColor - ConsoleColor origColor = Console.ForegroundColor; - Console.ForegroundColor = c; -#endif output.Write(str); output.Flush(); - -#if !SILVERLIGHT // Console.ForegroundColor - Console.ForegroundColor = origColor; -#endif } #region IConsole Members Index: src/microsoft.scripting.core/ast/Expression.cs =================================================================== --- src/microsoft.scripting.core/ast/Expression.cs (revision 128) +++ src/microsoft.scripting.core/ast/Expression.cs (working copy) @@ -20,19 +20,19 @@ using System.Diagnostics; namespace System.Linq.Expressions { + // TODO: expose this to derived classes, so ctor doesn't take three booleans? + [Flags] + public enum NodeFlags : byte { + None = 0, + Reducible = 1, + CanRead = 2, + CanWrite = 4, + } + /// /// Expression is the base type for all nodes in Expression Trees /// public abstract partial class Expression { - // TODO: expose this to derived classes, so ctor doesn't take three booleans? - [Flags] - private enum NodeFlags : byte { - None = 0, - Reducible = 1, - CanRead = 2, - CanWrite = 4, - } - // TODO: these two enums could be stored in one int32 private readonly ExpressionType _nodeType; private readonly NodeFlags _flags;