edit: $/Dev10/feature/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/Ruby/redist-libs/ruby/site_ruby/1.8/rubygems/platform.rb;C1651534
File: platform.rb
===================================================================
--- $/Dev10/feature/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/Ruby/redist-libs/ruby/site_ruby/1.8/rubygems/platform.rb;C1651534  (server)    3/11/2010 11:04 AM
+++ Shelved Change: $/Dev10/feature/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/Ruby/redist-libs/ruby/site_ruby/1.8/rubygems/platform.rb;config
@@ -70,8 +70,8 @@
                       when /hpux(\d+)/ then            [ 'hpux',      $1  ]
                       when /^java$/, /^jruby$/ then    [ 'java',      nil ]
                       when /^java([\d.]*)/ then        [ 'java',      $1  ]
-                      when /^\.net$/ then              [ '.net',      nil ]
-                      when /^\.net([\d.]*)/ then       [ '.net',      $1  ]
+                      when /^dotnet$/ then             [ 'dotnet',    nil ]
+                      when /^dotnet([\d.]*)/ then      [ 'dotnet',    $1  ]
                       when /linux/ then                [ 'linux',     $1  ]
                       when /mingw32/ then              [ 'mingw32',   nil ]
                       when /(mswin\d+)(\_(\d+))?/ then
@@ -150,6 +150,7 @@
               when /^i686-darwin(\d)/     then ['x86',       'darwin',  $1    ]
               when /^i\d86-linux/         then ['x86',       'linux',   nil   ]
               when 'java', 'jruby'        then [nil,         'java',    nil   ]
+              when /dotnet(\-(\d+\.\d+))?/ then ['universal','dotnet',  $2    ]
               when /mswin32(\_(\d+))?/    then ['x86',       'mswin32', $2    ]
               when 'powerpc-darwin'       then ['powerpc',   'darwin',  nil   ]
               when /powerpc-darwin(\d)/   then ['powerpc',   'darwin',  $1    ]
===================================================================
edit: $/Dev10/feature/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/Ruby/redist-libs/ruby/site_ruby/1.8/rubygems/specification.rb;C1666067
File: specification.rb
===================================================================
--- $/Dev10/feature/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/Ruby/redist-libs/ruby/site_ruby/1.8/rubygems/specification.rb;C1666067  (server)    3/11/2010 11:05 AM
+++ Shelved Change: $/Dev10/feature/vs_langs01_s/Merlin/External.LCA_RESTRICTED/Languages/Ruby/redist-libs/ruby/site_ruby/1.8/rubygems/specification.rb;config
@@ -305,13 +305,13 @@
       raise TypeError, "invalid Gem::Specification format #{array.inspect}"
     end
 
-    if array[8] == "universal-.net"
+    if array[8] == "universal-dotnet"
       # When installing gems from a remote server that is using MRI, the gem information that is
       # sent down to the local machine is incorrect since MRI is not able to parse the platform
       # string of "universal-.net" until a patch is applied to RubyGems in Gem::Platform#initialize,
       # similar to the way other platforms are handled in that method. IronRuby does include
       # this patch. For now, we work around the problem.
-      array[16] = Gem::Platform.new(["universal", ".net"]) if array[16] == Gem::Platform.new(["universal", "unknown"])
+      array[16] = Gem::Platform.new(["universal", "dotnet"]) if array[16] == Gem::Platform.new(["universal", "unknown"])
     end
     
     spec.instance_variable_set :@rubygems_version,          array[0]
===================================================================
edit: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Libs/rbconfig.rb;C1651534
File: rbconfig.rb
===================================================================
--- $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Libs/rbconfig.rb;C1651534  (server)    3/11/2010 11:14 AM
+++ Shelved Change: $/Dev10/feature/vs_langs01_s/Merlin/Main/Languages/Ruby/Libs/rbconfig.rb;config
@@ -63,22 +63,18 @@
   CONFIG["sitedir"] = "$(libdir)/ruby/site_ruby"
 
   CONFIG["oldincludedir"] = "/usr/include"
-  CONFIG["build"] = "i686-pc-mswin32"
-  CONFIG["build_alias"] = "i686-mswin32"
-  CONFIG["build_cpu"] = "i686"
-  CONFIG["build_vendor"] = "pc"
-  CONFIG["build_os"] = "mswin32"
-  CONFIG["host"] = "i686-pc-mswin32"
-  CONFIG["host_alias"] = "i686-mswin32"
-  CONFIG["host_cpu"] = "i686"
-  CONFIG["host_vendor"] = "pc"
-  CONFIG["host_os"] = "mswin32"
+  cpu_and_os = RUBY_PLATFORM.split('-')
+  abort("Could not parse RUBY_PLATFORM") if cpu_and_os.size != 2
+  CONFIG["host_cpu"] = (cpu_and_os[0] == "i386") ? "i686" : cpu_and_os[0]
+  CONFIG["host_os"] = cpu_and_os[1]
   clr_version = "#{System::Environment.Version.Major}.#{System::Environment.Version.Minor}"
-  CONFIG["target"] = ".net#{clr_version}"
+  CONFIG["target"] = "dotnet#{clr_version}"
+  CONFIG["arch"] = "universal-#{CONFIG["target"]}"
+  CONFIG["build"] = CONFIG["arch"]
   CONFIG["target_alias"] = CONFIG["target"]
-  CONFIG["target_cpu"] = "i386"
+  CONFIG["target_cpu"] = cpu_and_os[0]
   CONFIG["target_vendor"] = "pc"
-  CONFIG["target_os"] = "mswin32"
+  CONFIG["target_os"] = CONFIG["host_os"]
   CONFIG["CC"] = "cl -nologo"
   CONFIG["CPP"] = "cl -nologo -E"
   CONFIG["YACC"] = "byacc"
@@ -140,7 +136,6 @@
   CONFIG["COMMON_HEADERS"] = "winsock2.h windows.h"
   CONFIG["DISTCLEANFILES"] = "vc*.pdb"
   CONFIG["EXPORT_PREFIX"] = " "
-  CONFIG["arch"] = "universal-.net#{clr_version}"
   CONFIG["configure_args"] = "--with-make-prog=nmake --enable-shared --with-winsock2"
   CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
   CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
@@ -148,7 +143,7 @@
   CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
   CONFIG["topdir"] = File.dirname(__FILE__)
   MAKEFILE_CONFIG = {}
-  CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}
+  CONFIG.each{|k,v| puts k if v.nil?; MAKEFILE_CONFIG[k] = v.dup}
   def Config::expand(val, config = CONFIG)
     val.gsub!(/\$\$|\$\(([^()]+)\)|\$\{([^{}]+)\}/) do |var|
       if !(v = $1 || $2)
===================================================================