Index: Rakefile
===================================================================
--- Rakefile	(revision 179)
+++ Rakefile	(working copy)
@@ -27,8 +27,8 @@
 EXCLUDED_DIRECTORIES  = ['.svn', 'obj', '.', '..']
 
 
-import 'rake\test.rake'
-import 'rake\compile.rake'
-import 'rake\package.rake'
-import 'rake\misc.rake'
-import 'rake\git.rake'
+import 'rake/test.rake'
+import 'rake/compile.rake'
+import 'rake/package.rake'
+import 'rake/misc.rake'
+import 'rake/git.rake'
Index: rake/compile.rake
===================================================================
--- rake/compile.rake	(revision 179)
+++ rake/compile.rake	(working copy)
@@ -35,7 +35,7 @@
     compile :dlr_core, :references => ['!System.dll', '!System.Configuration.dll', 'Microsoft.Scripting.ExtensionAttribute.dll'], :switches => ['target:library', 'define:MICROSOFT_SCRIPTING_CORE'], :output => 'Microsoft.Scripting.Core.dll', :csproj => 'Microsoft.Scripting.Core.csproj'
     resources = { Pathname.new('math') + 'MathResources.resx' => Pathname.new('Microsoft.Scripting.Math.MathResources.resources') }
     compile :dlr_libs, :references => ['Microsoft.Scripting.Core.dll', '!System.Xml.dll', '!System.dll', '!System.Configuration.dll', 'Microsoft.Scripting.ExtensionAttribute.dll','!System.Runtime.Remoting.dll'], :switches => ['target:library'], :resources => resources, :output => 'Microsoft.Scripting.dll'
-    compile :dlr_com, :references => ['Microsoft.Scripting.Core.dll', '!System.Xml.dll', '!System.dll', 'Microsoft.Scripting.ExtensionAttribute.dll'], :switches => ['target:library', 'unsafe'], :output => 'Microsoft.Dynamic.ComInterop.dll'
+    #compile :dlr_com, :references => ['Microsoft.Scripting.Core.dll', '!System.Xml.dll', '!System.dll', 'Microsoft.Scripting.ExtensionAttribute.dll'], :switches => ['target:library', 'unsafe'], :output => 'Microsoft.Dynamic.ComInterop.dll'
   end
 end
 
@@ -64,7 +64,7 @@
 task :compile_console => [:compile_libraries] do
   IronRuby.source_context do
     compile :console, :references => ['Microsoft.Scripting.Core.dll', 'Microsoft.Scripting.dll', 'IronRuby.dll'], :output => IRONRUBY_COMPILER
-    transform_config_file IronRuby.is_merlin? ? 'Merlin' : 'Svn', get_source_dir(:lang_root) + 'app.config', "#{build_path}\\ir.exe.config"
+    transform_config_file IronRuby.is_merlin? ? 'Merlin' : 'Svn', get_source_dir(:lang_root) + 'app.config', "#{build_path + 'ir.exe.config'}"
   end
 end
 
Index: context.rb
===================================================================
--- context.rb	(revision 179)
+++ context.rb	(working copy)
@@ -218,7 +218,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 179)
+++ 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/generation/todiskrewriter.cs
===================================================================
--- src/microsoft.scripting/generation/todiskrewriter.cs	(revision 179)
+++ src/microsoft.scripting/generation/todiskrewriter.cs	(working copy)
@@ -53,7 +53,7 @@
 
                 // Visit the lambda first, so we walk the tree and find any
                 // constants we need to rewrite.
-                node = (Expression<T>)base.VisitLambda(node);
+                node = (Expression<T>)base.VisitLambda<T>(node);
 
                 if (_depth != 1) {
                     return node;
Index: src/microsoft.scripting/generation/globalarrayrewriter.cs
===================================================================
--- src/microsoft.scripting/generation/globalarrayrewriter.cs	(revision 179)
+++ src/microsoft.scripting/generation/globalarrayrewriter.cs	(working copy)
@@ -68,7 +68,7 @@
                 );
             }
 
-            return base.VisitLambda(node);
+            return base.VisitLambda<T>(node);
         }
 
         protected override Expression MakeWrapper(GlobalVariableExpression variable) {
Index: src/microsoft.scripting/generation/globalstaticfieldrewriter.cs
===================================================================
--- src/microsoft.scripting/generation/globalstaticfieldrewriter.cs	(revision 179)
+++ src/microsoft.scripting/generation/globalstaticfieldrewriter.cs	(working copy)
@@ -60,7 +60,7 @@
                 );
                 Context = Expression.Field(null, _contextField);
             }
-            return base.VisitLambda(node);
+            return base.VisitLambda<T>(node);
         }
 
         protected override Expression MakeWrapper(GlobalVariableExpression variable) {
Index: src/ironruby/Builtins/rubymethod.meta.cs
===================================================================
--- src/ironruby/Builtins/rubymethod.meta.cs	(revision 179)
+++ src/ironruby/Builtins/rubymethod.meta.cs	(working copy)
@@ -16,7 +16,6 @@
 using System;
 using System.Diagnostics;
 using System.Dynamic;
-using System.Dynamic.Utils;
 using System.Linq.Expressions;
 using Microsoft.Scripting.Utils;
 using Microsoft.Scripting.Runtime;
Index: src/microsoft.scripting.core/ast/LambdaExpression.cs
===================================================================
--- src/microsoft.scripting.core/ast/LambdaExpression.cs	(revision 179)
+++ src/microsoft.scripting.core/ast/LambdaExpression.cs	(working copy)
@@ -119,11 +119,11 @@
         }
 
         internal override Expression Accept(ExpressionVisitor visitor) {
-            return visitor.VisitLambda(this);
+            return visitor.VisitLambda<TDelegate>(this);
         }
 
         internal override LambdaExpression Accept(StackSpiller spiller) {
-            return spiller.Rewrite(this);
+            return spiller.Rewrite<TDelegate>(this);
         }
     }
 
Index: src/microsoft.scripting.core/ast/treecomparer.cs
===================================================================
--- src/microsoft.scripting.core/ast/treecomparer.cs	(revision 179)
+++ src/microsoft.scripting.core/ast/treecomparer.cs	(working copy)
@@ -103,7 +103,7 @@
 
             protected internal override Expression VisitLambda<T>(Expression<T> node) {
                 Expressions.Add(node);
-                return base.VisitLambda(node);
+                return base.VisitLambda<T>(node);
             }
 
             protected internal override Expression VisitLoop(LoopExpression node) {
Index: utils/ironruby.classinitgenerator/generator.cs
===================================================================
--- utils/ironruby.classinitgenerator/generator.cs	(revision 179)
+++ utils/ironruby.classinitgenerator/generator.cs	(working copy)
@@ -21,7 +21,6 @@
 using System.IO;
 using System.Reflection;
 using System.Dynamic;
-using System.Dynamic.Utils;
 using System.Text;
 using IronRuby;
 using IronRuby.Builtins;
Index: utils/ironruby.classinitgenerator/libraries/InitGenerator.cs
===================================================================
--- utils/ironruby.classinitgenerator/libraries/InitGenerator.cs	(revision 179)
+++ utils/ironruby.classinitgenerator/libraries/InitGenerator.cs	(working copy)
@@ -21,7 +21,6 @@
 using System.IO;
 using System.Reflection;
 using System.Dynamic;
-using System.Dynamic.Utils;
 using System.Text;
 using IronRuby;
 using IronRuby.Builtins;
Index: utils/IronRuby.Tests/runtime/HostingTests.cs
===================================================================
--- utils/IronRuby.Tests/runtime/HostingTests.cs	(revision 179)
+++ utils/IronRuby.Tests/runtime/HostingTests.cs	(working copy)
@@ -68,7 +68,7 @@
             // the library paths are incorrect (not combined with location of .exe file) in partial trust:
             if (_driver.PartialTrust) return;
 
-            bool result = Engine.RequireRubyFile("fcntl");
+            bool result = IronRuby.Ruby.RequireFile(Engine, "fcntl");
             Assert(result == true);
 
             var module = Runtime.Globals.GetVariable("Fcntl");