Index: Rakefile =================================================================== --- Rakefile (revision 112) +++ Rakefile (working copy) @@ -155,10 +155,10 @@ desc "compile DLR (Microsoft.Scripting.dll and Microsoft.Scripting.Core.dll)" task :compile_dlr => [:clean_build] do IronRuby.source_context do - resources = { Pathname.new('Microsoft.Scripting.txt') => Pathname.new('Microsoft.Scripting.Core.resources') } + resources = { Pathname.new('microsoft.scripting.txt') => Pathname.new('Microsoft.Scripting.Core.resources') } compile :dlr_core, :references => ['!System.dll', '!System.Configuration.dll'], :switches => ['target:library', 'define:DLR'], :resources => resources, :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 @@ -207,7 +207,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', '!System.Core.dll'], :switches => ['target:library'], :output => 'IronRuby.Libraries.Yaml.dll' end end Index: context.rb =================================================================== --- context.rb (revision 112) +++ context.rb (working copy) @@ -160,7 +160,7 @@ [Pathname.new(libdir) + 'mono' + '2.0'] } switches :all, 'noconfig' - remove_switches ['warnaserror+'] + switches :debug, 'debug+' } end end Index: src/microsoft.scripting/hosting/shell/BasicConsole.cs =================================================================== --- src/microsoft.scripting/hosting/shell/BasicConsole.cs (revision 112) +++ src/microsoft.scripting/hosting/shell/BasicConsole.cs (working copy) @@ -94,16 +94,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/ironruby/Builtins/RubyMethod.cs =================================================================== --- src/ironruby/Builtins/RubyMethod.cs (revision 112) +++ src/ironruby/Builtins/RubyMethod.cs (working copy) @@ -60,7 +60,7 @@ #region IDynamicObject Members - RuleBuilder IDynamicObject.GetRule(DynamicAction/*!*/ action, CodeContext/*!*/ callerContext, object[]/*!*/ argValues) { + public RuleBuilder GetRule(DynamicAction/*!*/ action, CodeContext/*!*/ callerContext, object[]/*!*/ argValues) where T : class { switch (action.Kind) { case DynamicActionKind.Call: RuleBuilder rule = new RuleBuilder(); Index: src/microsoft.scripting.core/runtime/ReflectionCache.cs =================================================================== --- src/microsoft.scripting.core/runtime/ReflectionCache.cs (revision 112) +++ src/microsoft.scripting.core/runtime/ReflectionCache.cs (working copy) @@ -48,11 +48,14 @@ ContractUtils.RequiresNotNull(type, "type"); ContractUtils.RequiresNotNull(name, "name"); + if (filter == null) + filter = delegate(MemberInfo mem, object filterCriteria) { + return mem.Name == name; + }; + MemberInfo[] mems = type.FindMembers(MemberTypes.Method, bindingFlags, - filter ?? delegate(MemberInfo mem, object filterCritera) { - return mem.Name == name; - }, + filter, null); MethodGroup res = null; Index: src/microsoft.scripting.core/actions/comdispatch/comtypelibdesc.cs =================================================================== --- src/microsoft.scripting.core/actions/comdispatch/comtypelibdesc.cs (revision 112) +++ src/microsoft.scripting.core/actions/comdispatch/comtypelibdesc.cs (working copy) @@ -133,7 +133,7 @@ #region IDynamicObject Members - RuleBuilder IDynamicObject.GetRule(DynamicAction action, CodeContext context, object[] args) { + public RuleBuilder GetRule(DynamicAction action, CodeContext context, object[] args) where T : class { switch (action.Kind) { case DynamicActionKind.GetMember: return MakeGetMemberRule((GetMemberAction)action, context); case DynamicActionKind.DoOperation: return MakeDoOperationRule((DoOperationAction)action, context); Index: src/microsoft.scripting.core/actions/comdispatch/DispCallable.cs =================================================================== --- src/microsoft.scripting.core/actions/comdispatch/DispCallable.cs (revision 112) +++ src/microsoft.scripting.core/actions/comdispatch/DispCallable.cs (working copy) @@ -126,7 +126,7 @@ #region IDynamicObject Members - RuleBuilder IDynamicObject.GetRule(DynamicAction action, CodeContext context, object[] args) { + public RuleBuilder GetRule(DynamicAction action, CodeContext context, object[] args) where T : class { switch (action.Kind) { case DynamicActionKind.Call: return MakeCallRule((CallAction)action, context, args); case DynamicActionKind.DoOperation: return MakeDoOperationRule((DoOperationAction)action, context, args);