edit: $/DevDiv/Dev11/PU/MQPro/dlr/Languages/Ruby/Tests/Scripts/irtests.rb;C1866191
File: irtests.rb
===================================================================
--- $/DevDiv/Dev11/PU/MQPro/dlr/Languages/Ruby/Tests/Scripts/irtests.rb;C1866191  (server)    7/19/2010 10:46 AM
+++ Shelved Change: $/DevDiv/Dev11/PU/MQPro/dlr/Languages/Ruby/Tests/Scripts/irtests.rb;MonoFixes
@@ -21,27 +21,27 @@
     end
     
     @options = options
-    if options[:clr4]
+    if options[:clr2] or options[:mono]
       if options[:release]
-        @config = "v4Release"
-        @sl_config = "Silverlight4Release"
+        @config = "v2Release"
+        @sl_config = "Silverlight3Release"
       else
-        @config = "v4Debug"
-        @sl_config = "Silverlight4Debug"
+        @config = "v2Debug"
+        @sl_config = "Silverlight3Debug"
       end
     else
       if options[:release]
         @config = "Release"
-        @sl_config = "Silverlight3Release"
+        @sl_config = "Silverlight4Release"
       else
         @config = "Debug"
-        @sl_config = "Silverlight3Debug"
+        @sl_config = "Silverlight4Debug"
       end
     end
     
     @root = File.expand_path(ENV["DLR_ROOT"])
     
-    explicit_config = options[:clr4] or options[:release]
+    explicit_config = !options[:clr2] or options[:release]
     requires_compile = !options[:nocompile]
     abort "Using DLR_BIN requires using --nocompile" if ENV["DLR_BIN"] and requires_compile and not explicit_config
     
@@ -171,9 +171,8 @@
   end
   
   def build_cmd(solution, build_config = @config, options = "")
-    version = @options[:clr4] ? "4" : ""
     build_engine = @options[:mono] ? "xbuild" : "msbuild"
-    "#{build_engine} /verbosity:minimal #{dlr_path("Solutions/#{solution}#{version}.sln")} /p:Configuration=#{q build_config} #{options}"
+    "#{build_engine} /verbosity:minimal #{dlr_path("Solutions/#{solution}.sln")} /p:Configuration=#{q build_config} #{options}"
   end
   
   def silverlight_build_runner
@@ -357,7 +356,7 @@
   def build_options
     [
       @options[:mono] ? "-m" : nil,
-      @options[:clr4] ? "-4" : nil,
+      @options[:clr2] ? "-2" : nil,
       @options[:release] ? "-r" : nil,
       @options[:selftest] ? "-s" : nil,
     ]
@@ -384,8 +383,8 @@
       iroptions[:nocompile] = n
     end
     
-    opts.on("-4", "--clr4", "Use CLR4 configuration") do |n|
-      iroptions[:clr4] = n
+    opts.on("-2", "--clr2", "Use CLR2 configuration") do |n|
+      iroptions[:clr2] = n
     end
     
     opts.on("-m", "--mono", "Run tests on Mono") do |n|
===================================================================
edit: $/DevDiv/Dev11/PU/MQPro/dlr/Languages/Ruby/Tests/Scripts/unit_tests.rb;C1850725
File: unit_tests.rb
===================================================================
--- $/DevDiv/Dev11/PU/MQPro/dlr/Languages/Ruby/Tests/Scripts/unit_tests.rb;C1850725  (server)    7/19/2010 11:02 AM
+++ Shelved Change: $/DevDiv/Dev11/PU/MQPro/dlr/Languages/Ruby/Tests/Scripts/unit_tests.rb;MonoFixes
@@ -8,7 +8,7 @@
 if ENV['DLR_VM'] && ENV['DLR_VM'].include?("mono")
    exclude = "/exclude"
    # critical:
-   exclude += " ClrGenerics1 ClrToString1 ClrTypeVariance1 Backtrace7"
+   exclude += " ClrToString1 ClrTypeVariance1 Backtrace7"
    # failures:
    exclude += " Interpreter3 MutableString_Reverse Encoding_Host2 Dir1 RegexEncoding2 RegexEncoding2 ClrGenerics3 Scenario_RubyExceptions7 Backtrace1 Backtrace2 Backtrace3 Backtrace4 Backtrace6 Inspect1 RubyHosting5 ClrVisibility1"
 end
===================================================================
edit: $/devdiv/dev11/pu/mqpro/dlr/Scripts/Bat/Dev.bat;C1922665
File: Dev.bat
===================================================================
--- $/devdiv/dev11/pu/mqpro/dlr/Scripts/Bat/Dev.bat;C1922665  (server)    7/16/2010 6:00 PM
+++ Shelved Change: $/devdiv/dev11/pu/mqpro/dlr/Scripts/Bat/Dev.bat;MonoFixes
@@ -116,11 +116,19 @@
 set PATH=%PATH%;%DLR_ROOT%\Languages\Ruby\Scripts;%DLR_ROOT%\Languages\Ruby\Scripts\bin;%DLR_ROOT%\External.LCA_RESTRICTED\Languages\IronRuby\mspec\mspec\bin;%RUBY18_BIN%
 
 REM -- Mono
-if not DEFINED DLR_VM_PATH (
-  set DLR_VM_PATH=%DLR_ROOT%\External.LCA_RESTRICTED\Mono\bin\mono.exe
-)
-if "%1" == "mono" set DLR_VM=%DLR_VM_PATH%\mono.exe
-if "%1" == "mono" set PATH=%DLR_VM_PATH%;%PATH%
+if defined DLR_VM_PATH goto MonoInitEnd
+if not "%1" == "mono" goto MonoInitEnd
+set DLR_VM_PATH=%~f2
+if NOT EXIST %DLR_VM_PATH%\mono.exe goto MonoNotFound
+set DLR_VM=%DLR_VM_PATH%\mono.exe
+set PATH=%DLR_VM_PATH%;%PATH%
+goto MonoInitEnd
+
+:MonoNotFound
+echo Mono runtime not found at %2
+goto End
+
+:MonoInitEnd
 
 if not DEFINED HOME_FOR_MSPECRC (
   if DEFINED HOME (
===================================================================
edit: $/devdiv/dev11/pu/mqpro/dlr/Test/Scripts/ir.cmd;C1850725
File: ir.cmd
===================================================================
--- $/devdiv/dev11/pu/mqpro/dlr/Test/Scripts/ir.cmd;C1850725  (server)    7/19/2010 11:27 AM
+++ Shelved Change: $/devdiv/dev11/pu/mqpro/dlr/Test/Scripts/ir.cmd;MonoFixes
@@ -1,20 +1,26 @@
 @echo off
 setlocal
 
+if "%DLR_VM%" == "" (
+    set _DEFAULT_CONFIG=Debug
+) else (
+    set _DEFAULT_CONFIG=v2Debug
+)    
+
 if "%DLR_BIN%" == "" (
-    set TEMP_IR_PATH=%DLR_ROOT%\bin\debug
+    set RUBY_EXE=%DLR_ROOT%\bin\%_DEFAULT_CONFIG%\ir.exe
 ) else (
-    set TEMP_IR_PATH=%DLR_BIN%
+    set RUBY_EXE=%DLR_BIN%\ir.exe
 )
 
-set HOME=%USERPROFILE%
-set RUBY_EXE=%TEMP_IR_PATH%\ir.exe
-
 if "%DLR_VM%" == "" (
     set _EXE="%RUBY_EXE%"
 ) else (
-    set _EXE=%DLR_VM% "%RUBY_EXE%"
+    set _EXE="%DLR_VM%" "%RUBY_EXE%"
 )
+
+set HOME=%USERPROFILE%
+
 if "%THISISSNAP%" == "1" (
   if exist "%DLR_ROOT%\Languages\Ruby\Tests\interop\com\ComTest.exe" (
           call %~dp0elevate.bat "%DLR_ROOT%\Languages\Ruby\Tests\interop\com\ComTest.exe"  /unregserver > NUL 2>&1
===================================================================
