edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/context.rb;C747775
File: context.rb
===================================================================
--- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/context.rb;C747775  (server)    2/20/2009 3:53 PM
+++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/context.rb;netinterop1
@@ -368,8 +368,8 @@
 
   def transform_config_file(configuration, source_path, target_build_path)
     # signing is on for IronRuby in Merlin, off for SVN and Binary
-    layout = {'Merlin' => { :signing => false, :LibraryPaths => '..\..\Languages\Ruby\libs;..\..\..\External\Languages\Ruby\Ruby-1.8.6\lib\ruby\site_ruby\1.8;..\..\..\External\Languages\Ruby\Ruby-1.8.6\lib\ruby\site_ruby;..\..\..\External\Languages\Ruby\Ruby-1.8.6\lib\ruby\1.8' }, 
-              'Binary' => { :signing => true,  :LibraryPaths => '..\lib\IronRuby;..\lib\ruby\site_ruby\1.8;..\lib\ruby\site_ruby;..\lib\ruby\1.8' } }
+    layout = {'Merlin' => { :LibraryPaths => '..\..\Languages\Ruby\libs;..\..\..\External\Languages\Ruby\Ruby-1.8.6\lib\ruby\site_ruby\1.8;..\..\..\External\Languages\Ruby\Ruby-1.8.6\lib\ruby\site_ruby;..\..\..\External\Languages\Ruby\Ruby-1.8.6\lib\ruby\1.8' }, 
+              'Binary' => { :LibraryPaths => '..\lib\IronRuby;..\lib\ruby\site_ruby\1.8;..\lib\ruby\site_ruby;..\lib\ruby\1.8' } }
     
     transform_config source_path, target_build_path, layout[configuration][:LibraryPaths]
   end
===================================================================
edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Interop/spec_helper.rb;C736874
File: spec_helper.rb
===================================================================
--- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Interop/spec_helper.rb;C736874  (server)    2/24/2009 3:36 PM
+++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Interop/spec_helper.rb;netinterop1
@@ -47,6 +47,5 @@
 end
 
 $VERBOSE = nil unless ENV['OUTPUT_WARNINGS']
-require 'matchers'
-
+require File.dirname(__FILE__) + '/matchers'
 $: << (ENV["MERLIN_ROOT"] + "\\Bin\\Debug")
===================================================================
add: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Interop/tags
edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Interop/derivation/class_spec.rb;C645339
File: class_spec.rb
===================================================================
--- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Interop/derivation/class_spec.rb;C645339  (server)    2/20/2009 4:21 PM
+++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Interop/derivation/class_spec.rb;netinterop1
@@ -4,6 +4,7 @@
 describe "Basic .NET classes" do
   it "map to Ruby classes" do
     Merlin::Testing::BaseClass::EmptyClass.class.should == Class
+    Merlin::Testing::BaseClass::Class41.class.should == Class
   end
 end
 
===================================================================
add: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Interop/tags/using
add: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Interop/tags/using/method_tags.txt
File: method_tags.txt
===================================================================
--- [no source file]
+++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Interop/tags/using/method_tags.txt;netinterop1
@@ -1,0 +1,2 @@
+fails:.NET methods are included in an objects method list
+fails:Overloaded .NET methods correctly report error message
===================================================================
add: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Interop/tags/using/typegroup_tags.txt
File: typegroup_tags.txt
===================================================================
--- [no source file]
+++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Interop/tags/using/typegroup_tags.txt;netinterop1
@@ -1,0 +1,2 @@
+fails:TypeGroups with non-generic member allow static methods to be called on the non-generic member
+fails:TypeGroups with non-generic member don't cache the class information
===================================================================
add: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/tests/Interop/using/method_spec.rb
File: method_spec.rb
===================================================================
--- [no source file]
+++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/tests/Interop/using/method_spec.rb;netinterop1
@@ -1,0 +1,149 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mscorlib'
+require 'rowantest.baseclasscs'
+require 'rowantest.delegatedefinitions'
+require 'rowantest.typesamples'
+
+include Merlin::Testing
+include Merlin::Testing::BaseClass
+include Merlin::Testing::Delegate
+
+describe ".NET methods" do
+  before(:each) do
+    @obj = Class41.new
+  end
+
+  it "are included in an objects method list" do
+    @obj.methods.grep(/m41/).should_not == []
+  end
+
+  it "can be called" do
+    @obj.m41.should == 41
+    @obj.send(:m41).should == 41
+    @obj.instance_eval("m41").should == 41
+  end
+
+  it "are able to be grabbed as an object" do
+    m41 = @obj.method(:m41)
+    m41.call.should == 41
+  end
+
+  it "are able to be aliased by IronRuby" do
+    class << @obj
+      alias _m41 m41
+    end
+    @obj._m41.should == 41
+    class << @obj
+      alias m41 _m41
+    end
+
+    @obj.m41.should == 41
+  end
+
+  it "are able to be overloaded by IronRuby" do
+    class << @obj
+      alias _m41 m41
+      def m41
+        :not_41
+      end
+    end
+
+    @obj.m41.should == :not_41
+
+    class << @obj
+      alias m41 _m41
+    end
+
+    @obj.m41.should == 41
+  end
+end
+
+describe "Abstract .NET methods" do
+  before(:each) do
+    @meth = Class200a.instance_method(:m200)
+  end
+  it "should be able to be grabbed as an object" do
+    @meth.should be_kind_of UnboundMethod
+  end
+
+  it "should not be callable" do
+    lambda {@meth.bind(Class200b).call}.should raise_error(TypeError)
+  end
+
+  #regression test for Rubyforge 24104
+  it "should be able to be grabbed as an object after call to #method" do
+    Class200a.method(:m200) rescue nil
+    Class200a.instance_method(:m200).should be_kind_of UnboundMethod
+  end
+end
+
+describe ".NET methods as Ruby objects" do
+  before(:each) do
+    @meth = Class41.new.method(:m41)
+  end
+
+  it "are Ruby Methods" do
+    @meth.should be_kind_of Method
+  end
+
+  it "contain a Group of CLR Methods" do
+    @meth.clr_members[0].should be_kind_of System::Reflection::MemberInfo
+  end
+
+  it "can be called" do
+    @meth.call.should == 41
+    @meth[].should == 41
+  end
+
+  it "can be unbound" do
+    m = @meth.unbind
+    m.should be_kind_of UnboundMethod
+    m = m.bind(Class41.new)
+    m.call.should == 41
+  end
+
+  it "call the correct method" do
+    m = Class210a.instance_method(:m210)
+    m.bind(Class210b.new).call.should == 210
+  end
+  it "call the correct method for overrides" do 
+    #override methods cannot be rebound
+    m = Class210a.instance_method(:m210)
+    m.bind(Class210c.new).call.should == 212
+  end
+end
+
+describe "Overloaded .NET methods" do
+  before(:each) do
+    @methods = ClassWithTargetMethods.new.method(:m_overload1)
+  end
+
+  it "act as a single Ruby method" do
+    @methods.should be_kind_of Method
+    @methods.call
+    Flag[].value.should == 100
+  end
+
+  it "contain .NET method objects" do 
+    @methods.clr_members.each do |meth|
+      meth.should be_kind_of System::Reflection::MemberInfo
+    end
+  end
+
+  it "perform overload resolution" do
+    @methods.call(100)
+    Flag[].value.should == 110
+    @methods.call(100, 100)
+    Flag[].value.should == 120
+  end
+
+  it "allow you to pick the overload" do
+    @methods.overloads(Fixnum, Fixnum).call(100,100)
+    Flag[].value.should == 120
+  end
+  
+  #regression test for RubyForge 24112
+  it "correctly report error message" do
+    lambda {@methods.overloads(Fixnum).call}.should raise_error(ArgumentError, /0 for 1/)
+  end
+end
===================================================================
add: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Interop/using/typegroup_spec.rb
File: typegroup_spec.rb
===================================================================
--- [no source file]
+++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Interop/using/typegroup_spec.rb;netinterop1
@@ -1,0 +1,20 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mscorlib'
+require 'rowantest.typesamples'
+require 'rowantest.baseclasscs'
+include Merlin::Testing
+
+describe "TypeGroups with non-generic member" do
+  #regression for RubyForge 24106
+  it "allow static methods to be called on the non-generic member" do
+    Flag.Set(100)
+    lambda { Flag.Check(100)}.should_not raise_error
+  end
+  
+  #regression for RubyForge 24108
+  it "don't cache the class information" do
+    c = BaseClass::EmptyTypeGroup2.new
+    c2 = BaseClass::EmptyTypeGroup1.new
+    c2.should_not be_kind_of BaseClass::EmptyTypeGroup2[]
+  end
+end
===================================================================
edit: $/Merlin_External/Languages/IronRuby/mspec/default.mspec;C740390
File: default.mspec
===================================================================
--- $/Merlin_External/Languages/IronRuby/mspec/default.mspec;C740390  (server)    2/24/2009 4:32 PM
+++ Shelved Change: $/Merlin_External/Languages/IronRuby/mspec/default.mspec;netinterop1
@@ -51,6 +51,9 @@
   set :lang, [
     "language"
     ]
+  set :cli, [
+    "command_line"
+    ]
   set :lib1, [
     "library\\abbrev",
     "library\\base64",
@@ -137,6 +140,7 @@
   # into a tag filename.
   set :tags_patterns, [
                         [%r(rubyspec/), 'ironruby-tags/'],
+                        [/interop\//i, 'interop/tags/'],
                         [/_spec.rb$/, '_tags.txt']
                       ]
   # The default implementation to run the specs.
===================================================================
