rename net_2_1 to moonlight

svn path=/trunk/mcs/; revision=153638

46 files changed, 99 insertions, 48 deletions

diff --git a/mcs/ChangeLog b/mcs/ChangeLog
index e4e31b255d4..401517b94e5 100644
--- a/mcs/ChangeLog
+++ b/mcs/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-16  Jb Evain  <jbevain@novell.com>
+
+	* Makefile: rename the net_2_1 profile to moonlight.
+
 2010-03-03  Rolf Bjarne Kvinge  <RKvinge@novell.com>
 
 	* Makefile: Make basic the bootstrapping profile for net_2_1_bootstrap.
diff --git a/mcs/Makefile b/mcs/Makefile
index b30f44ec5df..311d477cedf 100644
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -5,9 +5,9 @@ SUBDIRS := build jay mcs class nunit24 ilasm tools tests errors docs
 basic_SUBDIRS := build jay mcs class tools
 net_2_0_bootstrap_SUBDIRS := build tools
 net_2_0_SUBDIRS := build mcs class nunit24 ilasm tools tests errors 
-net_2_1_bootstrap_SUBDIRS := build mcs class
-net_2_1_raw_SUBDIRS := build mcs class tools
-net_2_1_SUBDIRS := tools tests errors
+moonlight_bootstrap_SUBDIRS := build mcs class
+moonlight_raw_SUBDIRS := build mcs class tools
+moonlight_SUBDIRS := tools tests errors
 monotouch_SUBDIRS := build mcs class
 monotouch_bootstrap_SUBDIRS := build mcs class
 net_3_5_SUBDIRS := build class
@@ -106,11 +106,11 @@ _boot_ = all clean install
 $(_boot_:%=profile-do--net_4_0--%):           profile-do--net_4_0--%:           profile-do--net_4_0_bootstrap--%
 $(_boot_:%=profile-do--net_4_0_bootstrap--%): profile-do--net_4_0_bootstrap--%: profile-do--net_2_0--%
 $(_boot_:%=profile-do--net_3_5--%):           profile-do--net_3_5--%:           profile-do--net_2_0--%
-$(_boot_:%=profile-do--net_2_1--%):           profile-do--net_2_1--%:           profile-do--net_2_1_raw--%
+$(_boot_:%=profile-do--moonlight--%):           profile-do--moonlight--%:           profile-do--moonlight_raw--%
 $(_boot_:%=profile-do--monotouch--%):         profile-do--monotouch--%:         profile-do--monotouch_bootstrap--%
 $(_boot_:%=profile-do--monotouch_bootstrap--%): profile-do--monotouch_bootstrap--%: profile-do--net_2_0--%
-$(_boot_:%=profile-do--net_2_1_raw--%):       profile-do--net_2_1_raw--%:       profile-do--net_2_1_bootstrap--%
-$(_boot_:%=profile-do--net_2_1_bootstrap--%): profile-do--net_2_1_bootstrap--%: profile-do--basic--%
+$(_boot_:%=profile-do--moonlight_raw--%):       profile-do--moonlight_raw--%:       profile-do--moonlight_bootstrap--%
+$(_boot_:%=profile-do--moonlight_bootstrap--%): profile-do--moonlight_bootstrap--%: profile-do--basic--%
 $(_boot_:%=profile-do--net_2_0--%):           profile-do--net_2_0--%:           profile-do--net_2_0_bootstrap--%
 $(_boot_:%=profile-do--net_2_0_bootstrap--%): profile-do--net_2_0_bootstrap--%: profile-do--basic--%
 
diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index 2b6610dd975..89fa33c42e5 100644
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-16  Jb Evain  <jbevain@novell.com>
+
+	* profiles/net_2_1_*.make: rename to moonlight_*.make and
+	define the MOONLIGHT symbol.
+
 2010-03-03  Jonathan Pryor <jpryor@novell.com>
 
 	* library.make: Add the generated per-profile .source file to
diff --git a/mcs/build/Makefile b/mcs/build/Makefile
index 08640a9f4ac..af6ce7356b4 100644
--- a/mcs/build/Makefile
+++ b/mcs/build/Makefile
@@ -19,9 +19,9 @@ PROFILES = \
 	basic \
 	net_2_0_bootstrap \
 	net_2_0 \
-	net_2_1_bootstrap \
-	net_2_1_raw \
-	net_2_1 \
+	moonlight_bootstrap \
+	moonlight_raw \
+	moonlight \
 	net_3_5	\
 	net_4_0_bootstrap \
 	net_4_0	
diff --git a/mcs/build/profiles/net_2_1.make b/mcs/build/profiles/moonlight.make
index f6a58a5c348..f3aba438b8f 100644
--- a/mcs/build/profiles/net_2_1.make
+++ b/mcs/build/profiles/moonlight.make
@@ -3,7 +3,7 @@
 my_runtime = $(RUNTIME) $(RUNTIME_FLAGS) --security=temporary-smcs-hack
 INTERNAL_SMCS = $(my_runtime) $(topdir)/class/lib/$(PROFILE)/smcs.exe
 
-BOOTSTRAP_PROFILE = net_2_1_bootstrap
+BOOTSTRAP_PROFILE = moonlight_bootstrap
 
 BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(my_runtime) $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/smcs.exe
 MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_SMCS)
@@ -11,7 +11,7 @@ MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_
 profile-check:
 	@:
 
-PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1
+PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:MOONLIGHT
 FRAMEWORK_VERSION = 2.1
 NO_TEST = yes
 
diff --git a/mcs/build/profiles/net_2_1_bootstrap.make b/mcs/build/profiles/moonlight_bootstrap.make
index 230c3918983..b6bb5556819 100644
--- a/mcs/build/profiles/net_2_1_bootstrap.make
+++ b/mcs/build/profiles/moonlight_bootstrap.make
@@ -9,7 +9,7 @@ MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$(topdi
 profile-check:
 	@:
 
-PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1
+PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:MOONLIGHT
 FRAMEWORK_VERSION = 2.1
 NO_TEST = yes
 
diff --git a/mcs/build/profiles/net_2_1_raw.make b/mcs/build/profiles/moonlight_raw.make
index f6a58a5c348..f3aba438b8f 100644
--- a/mcs/build/profiles/net_2_1_raw.make
+++ b/mcs/build/profiles/moonlight_raw.make
@@ -3,7 +3,7 @@
 my_runtime = $(RUNTIME) $(RUNTIME_FLAGS) --security=temporary-smcs-hack
 INTERNAL_SMCS = $(my_runtime) $(topdir)/class/lib/$(PROFILE)/smcs.exe
 
-BOOTSTRAP_PROFILE = net_2_1_bootstrap
+BOOTSTRAP_PROFILE = moonlight_bootstrap
 
 BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(my_runtime) $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/smcs.exe
 MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_SMCS)
@@ -11,7 +11,7 @@ MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_
 profile-check:
 	@:
 
-PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1
+PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:MOONLIGHT
 FRAMEWORK_VERSION = 2.1
 NO_TEST = yes
 
diff --git a/mcs/class/ChangeLog b/mcs/class/ChangeLog
index 9c2b68f26c2..bceb2ec4601 100644
--- a/mcs/class/ChangeLog
+++ b/mcs/class/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-16  Jb Evain  <jbevain@novell.com>
+
+	* Makefile: rename the net_2_1 profile to moonlight.
+
 2010-03-15  Marek Habersack  <mhabersack@novell.com>
 
 	* Makefile (net_2_0_dirs): added System.Web.Mvc2
diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 330dea02ab7..6684a19ee35 100644
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -120,7 +120,7 @@ net_2_0_only_dirs := \
 	System.Web.Extensions_1.0	\
 	System.Web.Extensions.Design_1.0
 
-net_2_1_dirs := \
+moonlight_dirs := \
 	corlib			\
 	Mono.CompilerServices.SymbolWriter \
 	System.Core		\
@@ -170,8 +170,8 @@ net_4_0_dirs := \
 
 net_2_0_bootstrap_SUBDIRS := $(bootstrap_dirs)
 net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs)
-net_2_1_bootstrap_SUBDIRS := corlib System Mono.CompilerServices.SymbolWriter System.Core
-net_2_1_raw_SUBDIRS := $(net_2_1_dirs)
+moonlight_bootstrap_SUBDIRS := corlib System Mono.CompilerServices.SymbolWriter System.Core
+moonlight_raw_SUBDIRS := $(moonlight_dirs)
 monotouch_bootstrap_SUBDIRS := corlib System Mono.CompilerServices.SymbolWriter System.Core
 monotouch_SUBDIRS := $(monotouch_dirs)
 net_3_5_SUBDIRS := $(net_3_5_dirs)
@@ -180,7 +180,7 @@ net_4_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs)
 
 include ../build/rules.make
 
-SUBDIRS = $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(net_2_1_dirs) $(net_3_5_dirs) $(net_4_0_dirs)
+SUBDIRS = $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(moonlight_dirs) $(monotouch_dirs) $(net_3_5_dirs) $(net_4_0_dirs)
 
 DIST_ONLY_SUBDIRS = dlr
 
diff --git a/mcs/class/System.Core/ChangeLog b/mcs/class/System.Core/ChangeLog
index 5bddef0064e..d093c0ce646 100644
--- a/mcs/class/System.Core/ChangeLog
+++ b/mcs/class/System.Core/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-16  Jb Evain  <jbevain@novell.com>
+
+	* net_2_1_*.dll.sources: rename to moonlight_*.dll.sources.
+
 2009-12-17  Marek Safar  <marek.safar@gmail.com>
 
 	* Makefile: Compile itself using bootstrap System.Core.
diff --git a/mcs/class/System.Core/Makefile b/mcs/class/System.Core/Makefile
index dde17448c70..893de76b60b 100644
--- a/mcs/class/System.Core/Makefile
+++ b/mcs/class/System.Core/Makefile
@@ -14,7 +14,7 @@ ifeq (4.0, $(FRAMEWORK_VERSION))
 LIB_MCS_FLAGS += -d:CODEPLEX_40
 endif
 
-FULL_PROFILE := $(filter net_2_0 net_4_0 net_2_1_raw monotouch, $(PROFILE))
+FULL_PROFILE := $(filter net_2_0 net_4_0 moonlight_raw monotouch, $(PROFILE))
 ifdef FULL_PROFILE
 LIBRARY_COMPILE = $(BOOT_COMPILE)
 endif
diff --git a/mcs/class/System.Core/moonlight_bootstrap_System.Core.dll.sources b/mcs/class/System.Core/moonlight_bootstrap_System.Core.dll.sources
new file mode 100644
index 00000000000..82f86b00544
--- /dev/null
+++ b/mcs/class/System.Core/moonlight_bootstrap_System.Core.dll.sources
@@ -0,0 +1 @@
+#include moonlight_raw_System.Core.dll.sources
diff --git a/mcs/class/System.Core/net_2_1_raw_System.Core.dll.sources b/mcs/class/System.Core/moonlight_raw_System.Core.dll.sources
index 844e40b1a78..844e40b1a78 100644
--- a/mcs/class/System.Core/net_2_1_raw_System.Core.dll.sources
+++ b/mcs/class/System.Core/moonlight_raw_System.Core.dll.sources
diff --git a/mcs/class/System.Core/net_2_1_bootstrap_System.Core.dll.sources b/mcs/class/System.Core/net_2_1_bootstrap_System.Core.dll.sources
deleted file mode 100644
index 5e32150b429..00000000000
--- a/mcs/class/System.Core/net_2_1_bootstrap_System.Core.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include net_2_1_raw_System.Core.dll.sources
diff --git a/mcs/class/System.Net/ChangeLog b/mcs/class/System.Net/ChangeLog
index db2a5875fd9..7da7dd94bd6 100644
--- a/mcs/class/System.Net/ChangeLog
+++ b/mcs/class/System.Net/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-16  Jb Evain  <jbevain@novell.com>
+
+	* net_2_1_*.dll.sources: rename to moonlight_*.dll.sources.
+
 2010-03-10  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* net_2_1_raw_System.Net.dll.sources: Add types from (new internal)
diff --git a/mcs/class/System.Net/net_2_1_raw_System.Net.dll.sources b/mcs/class/System.Net/moonlight_raw_System.Net.dll.sources
index 85566a02931..85566a02931 100644
--- a/mcs/class/System.Net/net_2_1_raw_System.Net.dll.sources
+++ b/mcs/class/System.Net/moonlight_raw_System.Net.dll.sources
diff --git a/mcs/class/System.Runtime.Serialization/ChangeLog b/mcs/class/System.Runtime.Serialization/ChangeLog
index 701f3bbfe19..06bfd0b1de3 100644
--- a/mcs/class/System.Runtime.Serialization/ChangeLog
+++ b/mcs/class/System.Runtime.Serialization/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-16  Jb Evain  <jbevain@novell.com>
+
+	* net_2_1_*.dll.sources: rename to moonlight_*.dll.sources.
+
 2010-03-03  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* System.Runtime.Serialization.dll.sources:
diff --git a/mcs/class/System.Runtime.Serialization/monotouch_System.Runtime.Serialization.dll.sources b/mcs/class/System.Runtime.Serialization/monotouch_System.Runtime.Serialization.dll.sources
index 602d0d07a69..7885b804a7c 100644
--- a/mcs/class/System.Runtime.Serialization/monotouch_System.Runtime.Serialization.dll.sources
+++ b/mcs/class/System.Runtime.Serialization/monotouch_System.Runtime.Serialization.dll.sources
@@ -1,2 +1,2 @@
-#include net_2_1_raw_System.Runtime.Serialization.dll.sources
+#include moonlight_raw_System.Runtime.Serialization.dll.sources
 System.Xml/OnXmlDictionaryReaderClose.cs
diff --git a/mcs/class/System.Runtime.Serialization/net_2_1_raw_System.Runtime.Serialization.dll.sources b/mcs/class/System.Runtime.Serialization/moonlight_raw_System.Runtime.Serialization.dll.sources
index 59cd659ac4d..59cd659ac4d 100644
--- a/mcs/class/System.Runtime.Serialization/net_2_1_raw_System.Runtime.Serialization.dll.sources
+++ b/mcs/class/System.Runtime.Serialization/moonlight_raw_System.Runtime.Serialization.dll.sources
diff --git a/mcs/class/System.Security/ChangeLog b/mcs/class/System.Security/ChangeLog
index 770ffc3a8a1..82455b4257c 100644
--- a/mcs/class/System.Security/ChangeLog
+++ b/mcs/class/System.Security/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-16  Jb Evain  <jbevain@novell.com>
+
+	* Makefile: rename the net_2_1 profile to moonlight.
+
 2009-06-05  Marek Safar  <marek.safar@gmail.com>
 
 	* Makefile: Fixed NET_2_0 conditional to actually handle Mono.Security
diff --git a/mcs/class/System.Security/Makefile b/mcs/class/System.Security/Makefile
index 3d55d17cf2b..bf261067d24 100644
--- a/mcs/class/System.Security/Makefile
+++ b/mcs/class/System.Security/Makefile
@@ -13,7 +13,7 @@ LIB_MCS_FLAGS += -r:Mono.Security.dll -nowarn:414
 TEST_MCS_FLAGS += -nowarn:168,183,414
 endif
 
-VALID_PROFILE := $(filter net_1_1 net_2_0 net_2_1_raw net_4_0, $(PROFILE))
+VALID_PROFILE := $(filter net_1_1 net_2_0 moonlight_raw net_4_0, $(PROFILE))
 ifndef VALID_PROFILE
 # @echo "** Warning: System.Security.dll built without parts that depend on: Mono.Security.dll "
 else
diff --git a/mcs/class/System.ServiceModel.Web/net_2_1_raw_System.ServiceModel.Web.dll.sources b/mcs/class/System.ServiceModel.Web/moonlight_raw_System.ServiceModel.Web.dll.sources
index 07c6038f68e..07c6038f68e 100644
--- a/mcs/class/System.ServiceModel.Web/net_2_1_raw_System.ServiceModel.Web.dll.sources
+++ b/mcs/class/System.ServiceModel.Web/moonlight_raw_System.ServiceModel.Web.dll.sources
diff --git a/mcs/class/System.ServiceModel/ChangeLog b/mcs/class/System.ServiceModel/ChangeLog
index 5bdf95c25f7..b974f89c548 100755
--- a/mcs/class/System.ServiceModel/ChangeLog
+++ b/mcs/class/System.ServiceModel/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-16  Jb Evain  <jbevain@novell.com>
+
+	* net_2_1_*.dll.sources: rename to moonlight_*.dll.sources.
+
 2010-03-15  Astushi Enomoto  <atsushi@ximian.com>
 
 	* net_4_0_System.ServiceModel.dll.sources:
diff --git a/mcs/class/System.ServiceModel/Makefile b/mcs/class/System.ServiceModel/Makefile
index a090d8cc0da..6bb0e3c915b 100755
--- a/mcs/class/System.ServiceModel/Makefile
+++ b/mcs/class/System.ServiceModel/Makefile
@@ -31,7 +31,7 @@ LIB_MCS_FLAGS += /d:NET_3_0 	\
 			/r:Mono.Security.dll
 endif
 
-ifeq (net_2_1_raw, $(PROFILE))
+ifeq (moonlight_raw, $(PROFILE))
 LIB_MCS_FLAGS += /r:System.Net
 endif
 
diff --git a/mcs/class/System.ServiceModel/monotouch_System.ServiceModel.dll.sources b/mcs/class/System.ServiceModel/monotouch_System.ServiceModel.dll.sources
index 2870b466997..fbaa524eab3 100644
--- a/mcs/class/System.ServiceModel/monotouch_System.ServiceModel.dll.sources
+++ b/mcs/class/System.ServiceModel/monotouch_System.ServiceModel.dll.sources
@@ -1,3 +1,3 @@
 ../../build/common/Consts.cs
 ../../build/common/MonoTODOAttribute.cs
-#include net_2_1_raw_System.ServiceModel.dll.sources
+#include moonlight_raw_System.ServiceModel.dll.sources
diff --git a/mcs/class/System.ServiceModel/net_2_1_raw_System.ServiceModel.dll.sources b/mcs/class/System.ServiceModel/moonlight_raw_System.ServiceModel.dll.sources
index 010821335ea..010821335ea 100755
--- a/mcs/class/System.ServiceModel/net_2_1_raw_System.ServiceModel.dll.sources
+++ b/mcs/class/System.ServiceModel/moonlight_raw_System.ServiceModel.dll.sources
diff --git a/mcs/class/System.XML/ChangeLog b/mcs/class/System.XML/ChangeLog
index cc6b0faa22c..366c0dd5810 100644
--- a/mcs/class/System.XML/ChangeLog
+++ b/mcs/class/System.XML/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-16  Jb Evain  <jbevain@novell.com>
+
+	* Makefile: rename the net_2_1 profile to moonlight.
+	* net_2_1_*.dll.sources: rename to moonlight_*.dll.sources.
+
 2009-11-30  Jonathan Pryor  <jpryor@novell.com>
 
 	* monotouch_System.Xml.dll.sources: Add System.Xml/NamespaceHandling.cs 
diff --git a/mcs/class/System.XML/Makefile b/mcs/class/System.XML/Makefile
index 6dd6a391add..ff68bdcee1a 100644
--- a/mcs/class/System.XML/Makefile
+++ b/mcs/class/System.XML/Makefile
@@ -94,7 +94,7 @@ Mono.Xml.Xsl/PatternTokenizer.cs: System.Xml.XPath/Tokenizer.cs
 	echo "#define XSLT_PATTERN" > $@
 	cat $< >>$@
 
-ifneq (net_2_1_raw, $(PROFILE))
+ifneq (moonlight_raw, $(PROFILE))
 BUILT_SOURCES = System.Xml.XPath/Parser.cs \
 	Mono.Xml.Xsl/PatternParser.cs \
 	Mono.Xml.Xsl/PatternTokenizer.cs
diff --git a/mcs/class/System.XML/net_2_1_raw_System.Xml.dll.sources b/mcs/class/System.XML/moonlight_raw_System.Xml.dll.sources
index 867f13f1412..867f13f1412 100644
--- a/mcs/class/System.XML/net_2_1_raw_System.Xml.dll.sources
+++ b/mcs/class/System.XML/moonlight_raw_System.Xml.dll.sources
diff --git a/mcs/class/System/ChangeLog b/mcs/class/System/ChangeLog
index e3474f10dc6..e58101cd20e 100644
--- a/mcs/class/System/ChangeLog
+++ b/mcs/class/System/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-16  Jb Evain  <jbevain@novell.com>
+
+	* net_2_1_*.dll.sources: rename to moonlight_*.dll.sources.
+
 2010-03-11  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* net_2_1_raw_System.dll.sources: Add existing files that are 
diff --git a/mcs/class/System/monotouch_System.dll.sources b/mcs/class/System/monotouch_System.dll.sources
index 98d578110cc..354eca3153d 100644
--- a/mcs/class/System/monotouch_System.dll.sources
+++ b/mcs/class/System/monotouch_System.dll.sources
@@ -1,4 +1,4 @@
-#include net_2_1_raw_System.dll.sources
+#include moonlight_raw_System.dll.sources
 ../../build/common/Consts.cs
 ../../build/common/Locale.cs
 ../../build/common/MonoTODOAttribute.cs
diff --git a/mcs/class/System/net_2_1_bootstrap_System.dll.sources b/mcs/class/System/moonlight_bootstrap_System.dll.sources
index 5482dc9d092..4c12aa1dff0 100644
--- a/mcs/class/System/net_2_1_bootstrap_System.dll.sources
+++ b/mcs/class/System/moonlight_bootstrap_System.dll.sources
@@ -1,4 +1,4 @@
 ../../build/common/Consts.cs
 ../../build/common/Locale.cs
 ../../build/common/MonoTODOAttribute.cs
-#include net_2_1_raw_System.dll.sources
+#include moonlight_raw_System.dll.sources
diff --git a/mcs/class/System/net_2_1_raw_System.dll.sources b/mcs/class/System/moonlight_raw_System.dll.sources
index 8f6c217fc1c..8f6c217fc1c 100644
--- a/mcs/class/System/net_2_1_raw_System.dll.sources
+++ b/mcs/class/System/moonlight_raw_System.dll.sources
diff --git a/mcs/class/corlib/ChangeLog b/mcs/class/corlib/ChangeLog
index 57e212107bf..f3156b68907 100644
--- a/mcs/class/corlib/ChangeLog
+++ b/mcs/class/corlib/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-16  Jb Evain  <jbevain@novell.com>
+
+	* Makefile: rename the net_2_1 profile to moonlight.
+	* net_2_1_*.dll.sources: rename to moonlight_*.dll.sources.
+
 2010-03-11  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* net_2_1_raw_corlib.dll.sources: Add System.Diagnostics.Contracts
diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile
index 820468c9380..4206ae2742a 100644
--- a/mcs/class/corlib/Makefile
+++ b/mcs/class/corlib/Makefile
@@ -75,11 +75,3 @@ $(cmp_makefrag): $(cmp_response)
 
 $(cmp_response) $(cmp_makefrag): Makefile $(depsdir)/.stamp
 endif
-
-#
-# qh21 = Quick Hack for 2.1, to be used by impatient developers to get
-# test builds done quickly
-#
-qh21:
-	make PROFILE=net_2_1_raw
-	(cd ../../tools/tuner; rm tune.stamp; make tune.stamp && make PROFILE=net_2_1 install)
diff --git a/mcs/class/corlib/moonlight_bootstrap_corlib.dll.sources b/mcs/class/corlib/moonlight_bootstrap_corlib.dll.sources
new file mode 100644
index 00000000000..346a84216bb
--- /dev/null
+++ b/mcs/class/corlib/moonlight_bootstrap_corlib.dll.sources
@@ -0,0 +1,2 @@
+#include moonlight_raw_corlib.dll.sources
+
diff --git a/mcs/class/corlib/net_2_1_raw_corlib.dll.sources b/mcs/class/corlib/moonlight_raw_corlib.dll.sources
index 111cace8ad3..111cace8ad3 100644
--- a/mcs/class/corlib/net_2_1_raw_corlib.dll.sources
+++ b/mcs/class/corlib/moonlight_raw_corlib.dll.sources
diff --git a/mcs/class/corlib/net_2_1_bootstrap_corlib.dll.sources b/mcs/class/corlib/net_2_1_bootstrap_corlib.dll.sources
deleted file mode 100644
index c2216ab9f1e..00000000000
--- a/mcs/class/corlib/net_2_1_bootstrap_corlib.dll.sources
+++ /dev/null
@@ -1,2 +0,0 @@
-#include net_2_1_raw_corlib.dll.sources
-
diff --git a/mcs/errors/ChangeLog b/mcs/errors/ChangeLog
index 6362b225827..98c9c1e06c7 100644
--- a/mcs/errors/ChangeLog
+++ b/mcs/errors/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-16  Jb Evain  <jbevain@novell.com>
+
+	* Makefile: rename the net_2_1 profile to moonlight.
+
 2009-06-18  Raja R Harinath  <harinath@hurrynot.org>
 
 	* Makefile (run-test-local): Make parallel-make safe.
diff --git a/mcs/errors/Makefile b/mcs/errors/Makefile
index 605731dd506..105862568c6 100644
--- a/mcs/errors/Makefile
+++ b/mcs/errors/Makefile
@@ -35,7 +35,7 @@ TEST_SUPPORT_FILES = \
 # mention all targets
 all-local $(STD_TARGETS:=-local):
 
-VALID_PROFILE := $(filter net_2_0 net_2_1 net_4_0, $(PROFILE))
+VALID_PROFILE := $(filter net_2_0 moonlight net_4_0, $(PROFILE))
 ifdef VALID_PROFILE
 
 check: run-mcs-tests 
@@ -53,7 +53,7 @@ ifeq (net_4_0, $(PROFILE))
 COMPILER_NAME = dmcs
 TEST_PATTERN = 'v4'
 endif
-ifeq (net_2_1, $(PROFILE))
+ifeq (moonlight, $(PROFILE))
 COMPILER_NAME = smcs
 TEST_PATTERN = 'v2'
 LOCAL_RUNTIME_FLAGS = --security=temporary-smcs-hack
diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 32230c2096a..e3f2443dc42 100644
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-16  Jb Evain  <jbevain@novell.com>
+
+	* Makefile: rename the net_2_1 profile to moonlight.
+
 2010-03-11  Marek Safar  <marek.safar@gmail.com>
 
 	* statement.cs, cs-parser.jay: Use correct location for empty
diff --git a/mcs/mcs/Makefile b/mcs/mcs/Makefile
index 6d496c57f5e..43a2780851e 100644
--- a/mcs/mcs/Makefile
+++ b/mcs/mcs/Makefile
@@ -18,7 +18,7 @@ ifeq (net_2_0, $(PROFILE))
 INTERNAL_GMCS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/gmcs.exe
 endif
 
-ifeq (net_2_1_bootstrap, $(PROFILE))
+ifeq (moonlight_bootstrap, $(PROFILE))
 INTERNAL_GMCS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/gmcs.exe
 endif
 
diff --git a/mcs/tests/Makefile b/mcs/tests/Makefile
index 4ddeabc7ca8..956b930e7b3 100644
--- a/mcs/tests/Makefile
+++ b/mcs/tests/Makefile
@@ -19,7 +19,7 @@ USE_MCS_FLAGS :=
 # mention all targets
 all-local $(STD_TARGETS:=-local):
 
-VALID_PROFILE := $(filter net_2_0 net_2_1 net_4_0, $(PROFILE))
+VALID_PROFILE := $(filter net_2_0 moonlight net_4_0, $(PROFILE))
 ifdef VALID_PROFILE
 # casts
 bootstrap-cast.exe: gen-cast-test.cs
@@ -52,7 +52,7 @@ TEST_PATTERN = 'v4'
 LOCAL_RUNTIME_FLAGS = --verify-all
 #TOPTIONS += '-il:ver-il-dmcs.xml'
 endif
-ifeq (net_2_1, $(PROFILE))
+ifeq (moonlight, $(PROFILE))
 COMPILER_NAME = smcs
 TEST_PATTERN = 'v2'
 LOCAL_RUNTIME_FLAGS = --security=temporary-smcs-hack
diff --git a/mcs/tools/ChangeLog b/mcs/tools/ChangeLog
index c65885f6297..6906d62759a 100644
--- a/mcs/tools/ChangeLog
+++ b/mcs/tools/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-16  Jb Evain  <jbevain@novell.com>
+
+	* Makefile: rename the net_2_1 profile to moonlight.
+
 2010-03-15  Andrew Jorgensen  <ajorgensen@novell.com>
 
 	* Makefile: Add DIST_SUBDIRS with SUBDIRS and net_4_0_dirs so that all
diff --git a/mcs/tools/Makefile b/mcs/tools/Makefile
index 5be1a48c169..34abc62fc54 100644
--- a/mcs/tools/Makefile
+++ b/mcs/tools/Makefile
@@ -48,18 +48,18 @@ net_2_0_dirs := \
 	monodoc		\
 	compiler-tester
 
-net_2_1_dirs := \
+moonlight_dirs := \
 	compiler-tester
 
 basic_SUBDIRS = gacutil security
 net_2_0_bootstrap_SUBDIRS = resgen culevel
 net_2_0_SUBDIRS := $(basic_SUBDIRS) $(net_2_0_dirs)
-net_2_1_raw_SUBDIRS := $(net_2_1_dirs)
-net_2_1_SUBDIRS := $(net_2_1_dirs)
+moonlight_raw_SUBDIRS := $(moonlight_dirs)
+moonlight_SUBDIRS := $(moonlight_dirs)
 net_4_0_bootstrap_SUBDIRS = resgen culevel
 net_4_0_SUBDIRS := $(net_4_0_dirs) $(basic_SUBDIRS)
 
-SUBDIRS = $(basic_SUBDIRS) $(net_2_0_bootstrap_SUBDIRS) $(net_2_0_SUBDIRS) $(net_2_1_SUBDIRS)
+SUBDIRS = $(basic_SUBDIRS) $(net_2_0_bootstrap_SUBDIRS) $(net_2_0_SUBDIRS) $(moonlight_SUBDIRS)
 DIST_SUBDIRS = $(SUBDIRS) $(net_4_0_dirs)
 
 include ../build/rules.make
diff --git a/mcs/tools/compiler-tester/Makefile b/mcs/tools/compiler-tester/Makefile
index ac3dd5e358d..062bc5acaa6 100644
--- a/mcs/tools/compiler-tester/Makefile
+++ b/mcs/tools/compiler-tester/Makefile
@@ -5,14 +5,14 @@ include ../../build/rules.make
 PROGRAM = $(topdir)/class/lib/$(PROFILE)/compiler-tester.exe
 NO_INSTALL = yes
 
-ifeq (net_2_1, $(PROFILE))
+ifeq (moonlight, $(PROFILE))
 
 all-local: $(PROGRAM)
 clean-local:
 	rm -f $(PROGRAM)
 
 $(PROGRAM): $(dir $(PROGRAM))/.stamp
-$(PROGRAM): $(topdir)/class/lib/net_2_1_raw/compiler-tester.exe
+$(PROGRAM): $(topdir)/class/lib/moonlight_raw/compiler-tester.exe
 	cp $< $@
 
 dist-local: dist-default