Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/Makefile

@@ -6,73 +6,16 @@ SUBDIRS := build jay mcs class nunit24 ilasm tools tests errors docs
 
 basic_SUBDIRS := build jay mcs class
 build_SUBDIRS := build class mcs class/aot-compiler tools
-net_2_0_SUBDIRS := build class nunit24 ilasm tools tests errors docs
 monodroid_SUBDIRS := build class
 monotouch_SUBDIRS := build class
 monotouch_runtime_SUBDIRS := build class
 xammac_SUBDIRS := build class
 mobile_SUBDIRS := build class
 mobile_static_SUBDIRS := build class
-net_3_5_SUBDIRS := build class tools/xbuild
 net_4_0_SUBDIRS := build class
 net_4_5_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs
 xbuild_12_SUBDIRS := build class tools/xbuild
-
-# List of test subdirs that should pass 100%
-centum_tests := \
-	class/corlib						\
-	class/System						\
-	class/System.XML					\
-	class/Commons.Xml.Relaxng				\
-	class/Cscompmgd						\
-	class/Mono.Posix					\
-	class/Mono.Security					\
-	class/System.Design					\
-	class/System.DirectoryServices		\
-	class/System.Drawing				\
-	class/System.Runtime.Remoting				\
-	class/System.Runtime.Serialization.Formatters.Soap	\
-	class/System.Security					\
-	class/System.ServiceProcess				\
-	class/System.Web						\
-	class/System.Web.Services				\
-	tests							\
-	errors
-
-default_centum_tests := \
-	$(centum_tests) 	\
-	class/System.Data
-
-net_2_0_centum_tests := \
-	$(centum_tests)				\
-	class/System.Core			\
-	class/System.Configuration		\
-	class/System.Data.DataSetExtensions	\
-	class/System.Xml.Linq			\
-	class/System.Transactions		\
-	class/Microsoft.Build.Framework		\
-	class/Microsoft.Build.Utilities		\
-	class/Microsoft.Build.Engine		\
-	class/System.Runtime.Serialization	\
-	class/System.IdentityModel		\
-	class/System.ServiceModel		\
-	class/System.ServiceModel.Web		\
-	class/Mono.C5
-
-#	class/System.Web.Extensions
-#	class/Microsoft.Build.Tasks	
-
-# note that System.Xml.Linq is here to prevent this from being empty
-net_3_5_centum_tests := \
-	class/System.Xml.Linq
-
-ifdef ONLY_CENTUM_TESTS
-TEST_SUBDIRS := $($(PROFILE)_centum_tests)
-endif
-
-ifdef TEST_SUBDIRS
-$(PROFILE)_SUBDIRS := $(TEST_SUBDIRS)
-endif
+xbuild_14_SUBDIRS := build class tools/xbuild
 
 include build/rules.make
 
@@ -87,7 +30,7 @@ dir-check:
 
 # fun specialty targets
 
-PROFILES = net_2_0 net_3_5 net_4_0 net_4_5 xbuild_12
+PROFILES = net_4_5 net_4_0 xbuild_12 xbuild_14
 
 .PHONY: all-profiles $(STD_TARGETS:=-profiles)
 all-profiles $(STD_TARGETS:=-profiles): %-profiles: profiles-do--%
@@ -106,17 +49,16 @@ profiles-do--run-test:
 
 # Orchestrate the bootstrap here.
 _boot_ = all clean install
+$(_boot_:%=profile-do--xbuild_14--%):         profile-do--xbuild_14--%:         profile-do--net_4_5--%
 $(_boot_:%=profile-do--xbuild_12--%):         profile-do--xbuild_12--%:         profile-do--net_4_5--%
-$(_boot_:%=profile-do--net_4_5--%):           profile-do--net_4_5--%:           profile-do--build--%
 $(_boot_:%=profile-do--net_4_0--%):           profile-do--net_4_0--%:           profile-do--build--%
-$(_boot_:%=profile-do--net_3_5--%):           profile-do--net_3_5--%:           profile-do--net_2_0--%
+$(_boot_:%=profile-do--net_4_5--%):           profile-do--net_4_5--%:           profile-do--build--%
 $(_boot_:%=profile-do--monodroid--%):         profile-do--monodroid--%:         profile-do--build--%
 $(_boot_:%=profile-do--monotouch--%):         profile-do--monotouch--%:         profile-do--build--%
 $(_boot_:%=profile-do--monotouch_runtime--%):  profile-do--monotouch_runtime--%:  profile-do--build--%
 $(_boot_:%=profile-do--xammac--%):            profile-do--xammac--%:            profile-do--build--%
 $(_boot_:%=profile-do--mobile--%):            profile-do--mobile--%:         profile-do--build--%
 $(_boot_:%=profile-do--mobile_static--%):     profile-do--mobile_static--%:     profile-do--build--%
-$(_boot_:%=profile-do--net_2_0--%):           profile-do--net_2_0--%:           profile-do--build--%
 $(_boot_:%=profile-do--build--%):             profile-do--build--%:             profile-do--basic--%
 
 testcorlib:

mcs/build/Makefile

@@ -18,17 +18,17 @@ PLATFORMS = darwin linux win32
 PROFILES = \
 	basic \
 	build \
-	net_2_0 \
-	net_3_5	\
-	net_4_0	\
+	net_4_0 \
 	net_4_5 \
-	xbuild_12
+	xbuild_12 \
+	xbuild_14
 
 COMMON_SRCS = \
 	Consts.cs.in			\
 	Locale.cs			\
 	MonoTODOAttribute.cs \
-	basic-profile-check.cs
+	basic-profile-check.cs		\
+	SR.cs
 
 DISTFILES = \
 	README.makefiles		\

mcs/build/common/Consts.cs

@@ -34,7 +34,7 @@ static class Consts
 	// Use these assembly version constants to make code more maintainable.
 	//
 
-	public const string MonoVersion = "3.12.1.0";
+	public const string MonoVersion = "4.0.0.0";
 	public const string MonoCompany = "Mono development team";
 	public const string MonoProduct = "Mono Common Language Infrastructure";
 	public const string MonoCopyright = "(c) Various Mono authors";
@@ -52,28 +52,13 @@ static class Consts
 	public const string VsVersion = "0.0.0.0"; // Useless ?
 	public const string VsFileVersion = "11.0.0.0"; // TODO:
 #elif NET_4_0
-	public const string FxVersion = "4.0.0.0";
-	public const string FxFileVersion = "4.0.30319.1";
-	
-	public const string VsVersion = "0.0.0.0"; // Useless ?
-	public const string VsFileVersion = "10.0.0.0"; // TODO:
+	#error Profile NET_4_0 is not supported.
 #elif NET_3_5
-	// Versions of .NET Framework 3.5 RTM
-	public const string FxVersion = "3.5.0.0";
-	public const string FxFileVersion = "3.5.21022.8";
-	
-	public const string VsVersion = "0.0.0.0"; // Useless ?
+	#error Profile NET_3_5 is not supported.
 #elif NET_3_0
-	public const string FxVersion = "3.0.0.0";
-	public const string VsVersion = "8.0.0.0";
-	public const string FxFileVersion = "3.0.4506.648";
-	public const string VsFileVersion = "6.0.6001.17014";
+	#error Profile NET_3_0 is not supported.
 #elif NET_2_0
-	// Versions of .NET Framework 2.0 RTM
-	public const string FxVersion = "2.0.0.0";
-	public const string VsVersion = "8.0.0.0";
-	public const string FxFileVersion = "2.0.50727.1433";
-	public const string VsFileVersion = "8.0.50727.1433";
+	#error Profile NET_2_0 is not supported.
 #elif NET_1_1
 	#error Profile NET_1_1 is not supported.
 #elif NET_1_0
@@ -124,7 +109,5 @@ static class Consts
 	public const string AssemblySystemServiceModel_3_0 = "System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
 #elif NET_2_1
 	public const string AssemblySystem_Core = "System.Core, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b77a5c561934e089";
-#elif NET_2_0
-	public const string AssemblySystem_Core = "System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
 #endif
 }

mcs/build/common/Consts.cs.in

@@ -52,28 +52,13 @@ static class Consts
 	public const string VsVersion = "0.0.0.0"; // Useless ?
 	public const string VsFileVersion = "11.0.0.0"; // TODO:
 #elif NET_4_0
-	public const string FxVersion = "4.0.0.0";
-	public const string FxFileVersion = "4.0.30319.1";
-	
-	public const string VsVersion = "0.0.0.0"; // Useless ?
-	public const string VsFileVersion = "10.0.0.0"; // TODO:
+	#error Profile NET_4_0 is not supported.
 #elif NET_3_5
-	// Versions of .NET Framework 3.5 RTM
-	public const string FxVersion = "3.5.0.0";
-	public const string FxFileVersion = "3.5.21022.8";
-	
-	public const string VsVersion = "0.0.0.0"; // Useless ?
+	#error Profile NET_3_5 is not supported.
 #elif NET_3_0
-	public const string FxVersion = "3.0.0.0";
-	public const string VsVersion = "8.0.0.0";
-	public const string FxFileVersion = "3.0.4506.648";
-	public const string VsFileVersion = "6.0.6001.17014";
+	#error Profile NET_3_0 is not supported.
 #elif NET_2_0
-	// Versions of .NET Framework 2.0 RTM
-	public const string FxVersion = "2.0.0.0";
-	public const string VsVersion = "8.0.0.0";
-	public const string FxFileVersion = "2.0.50727.1433";
-	public const string VsFileVersion = "8.0.50727.1433";
+	#error Profile NET_2_0 is not supported.
 #elif NET_1_1
 	#error Profile NET_1_1 is not supported.
 #elif NET_1_0
@@ -124,7 +109,5 @@ static class Consts
 	public const string AssemblySystemServiceModel_3_0 = "System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
 #elif NET_2_1
 	public const string AssemblySystem_Core = "System.Core, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b77a5c561934e089";
-#elif NET_2_0
-	public const string AssemblySystem_Core = "System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
 #endif
 }

mcs/build/common/SR.cs

@@ -0,0 +1,47 @@
+using System.Globalization;
+
+static class AssemblyRef
+{
+	// FIXME
+	internal const string SystemConfiguration = "System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
+	internal const string System = "System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
+
+	public const string EcmaPublicKey = "b77a5c561934e089";
+	public const string MicrosoftPublicKey = "b03f5f7f11d50a3a";
+ 
+ 	public const string MicrosoftVSDesigner = Consts.AssemblyMicrosoft_VSDesigner;
+	public const string SystemDesign = Consts.AssemblySystem_Design;
+	public const string SystemDrawing = Consts.AssemblySystem_Drawing;
+	public const string SystemWeb = Consts.AssemblySystem_Web;
+	public const string SystemWebExtensions =  "System.Web.Extensions, Version=" + Consts.FxVersion + ", Culture=neutral, PublicKeyToken=31bf3856ad364e35";
+	public const string SystemWindowsForms = Consts.AssemblySystem_Windows_Forms;
+}
+
+static partial class SR
+{
+	internal static string GetString(string name, params object[] args)
+	{
+		return GetString (CultureInfo.InvariantCulture, name, args);
+	}
+
+	internal static string GetString(CultureInfo culture, string name, params object[] args)
+	{
+		return string.Format (culture, name, args);
+	}
+
+	internal static string GetString(string name)
+	{
+		return name;
+	}
+
+	internal static string GetString(CultureInfo culture, string name)
+	{
+		return name;
+	}
+}
+
+namespace System.Runtime.CompilerServices
+{
+	class FriendAccessAllowedAttribute : Attribute
+	{ }
+}

mcs/build/common/basic-profile-check.cs

@@ -1,3 +1,5 @@
+using System;
+
 class X {
 	// Check installed compiler
 	static void Generic<T> ()
@@ -20,6 +22,27 @@ class X {
 		if (o == null)
 			return 1;
 
+		var consts = o.GetType ().Assembly.GetType ("Consts");
+		if (consts == null) {
+			// We could be bootraping on cygwin using .net runtime
+			var assembly = o.GetType ().Assembly;
+			if (assembly.GetName ().Version >= new Version (4, 0) && assembly.Location.Contains ("Microsoft.NET"))
+				return 0;
+
+			return 2;
+		}
+
+		var field = consts.GetField ("MonoVersion");
+		if (field == null)
+			return 3;
+
+		Version version;
+		if (!Version.TryParse (field.GetValue (null) as string, out version))
+			return 4;
+
+		if (version < new Version (3, 8))
+			return 5;
+
 		return 0;
 	}
 }

mcs/build/library.make

@@ -66,6 +66,12 @@ else
 the_libdir_base = $(topdir)/class/$(lib_dir)/$(PROFILE)/
 endif
 
+ifdef RESOURCE_STRINGS
+ifdef BOOTSTRAP_PROFILE
+MCS_FLAGS_INTERNAL += $(RESOURCE_STRINGS:%=--getresourcestrings:%)
+endif
+endif
+
 #
 # The bare directory contains the plain versions of System and System.Xml
 #
@@ -79,15 +85,11 @@ secxml_libdir = $(the_libdir_base)secxml
 
 the_libdir = $(the_libdir_base)$(intermediate)
 
-ifdef LIBRARY_NEEDS_POSTPROCESSING
-build_libdir = fixup/$(PROFILE)/
-else
 ifdef LIBRARY_USE_INTERMEDIATE_FILE
 build_libdir = $(the_libdir)tmp/
 else
 build_libdir = $(the_libdir)
 endif
-endif
 
 the_lib   = $(the_libdir)$(LIBRARY_NAME)
 build_lib = $(build_libdir)$(LIBRARY_NAME)
@@ -243,13 +245,6 @@ dist-local: dist-default
 	for d in . $$subs ; do \
 	  case $$d in .) : ;; *) test ! -f $$d/ChangeLog || cp -p $$d/ChangeLog $(distdir)/$$d ;; esac ; done
 
-ifdef LIBRARY_NEEDS_POSTPROCESSING
-dist-local: dist-fixup
-FIXUP_PROFILES = default net_2_0
-dist-fixup:
-	$(MKINSTALLDIRS) $(distdir)/fixup $(FIXUP_PROFILES:%=$(distdir)/fixup/%)
-endif
-
 ifndef LIBRARY_COMPILE
 LIBRARY_COMPILE = $(CSCOMPILE)
 endif
@@ -340,9 +335,8 @@ $(makefrag) $(test_response) $(test_makefrag) $(btest_response) $(btest_makefrag
 ## Documentation stuff
 
 Q_MDOC_UP=$(if $(V),,@echo "MDOC-UP [$(PROFILE)] $(notdir $(@))";)
-# net_2_0 is needed because monodoc is only compiled in that profile
 MDOC_UP  =$(Q_MDOC_UP) \
-		MONO_PATH="$(topdir)/class/lib/$(DEFAULT_PROFILE)$(PLATFORM_PATH_SEPARATOR)$(topdir)/class/lib/net_2_0$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/$(DEFAULT_PROFILE)/mdoc.exe \
+		MONO_PATH="$(topdir)/class/lib/$(DEFAULT_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/$(DEFAULT_PROFILE)/mdoc.exe \
 		update --delete -o Documentation/en $(the_lib)
 
 doc-update-local: $(the_libdir)/.doc-stamp

mcs/build/platforms/darwin.make

@@ -9,7 +9,7 @@ PLATFORM_RUNTIME = $(RUNTIME)
 PLATFORM_CORLIB = mscorlib.dll
 PLATFORM_TEST_HARNESS_EXCLUDES = NotOnMac,
 
-EXTERNAL_MCS = gmcs
+EXTERNAL_MCS = mcs
 EXTERNAL_MBAS = mbas
 EXTERNAL_RUNTIME = mono
 #ILDISASM = monodis

mcs/build/platforms/linux.make

@@ -9,7 +9,7 @@ PLATFORM_RUNTIME = $(RUNTIME)
 PLATFORM_CORLIB = mscorlib.dll
 PLATFORM_TEST_HARNESS_EXCLUDES =
 
-EXTERNAL_MCS = gmcs
+EXTERNAL_MCS = mcs
 EXTERNAL_MBAS = mbas
 EXTERNAL_RUNTIME = mono
 #ILDISASM = monodis

mcs/build/platforms/win32.make

@@ -9,7 +9,7 @@ PLATFORM_RUNTIME =
 PLATFORM_CORLIB = mscorlib.dll
 PLATFORM_TEST_HARNESS_EXCLUDES =
 
-EXTERNAL_MCS = gmcs
+EXTERNAL_MCS = mcs
 EXTERNAL_MBAS = vbc.exe
 EXTERNAL_RUNTIME =
 

mcs/build/profiles/basic.make

@@ -18,11 +18,11 @@ endif
 
 MCS = $(with_mono_path) $(INTERNAL_GMCS)
 
-PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:BOOTSTRAP_BASIC -nowarn:1699
+PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:BOOTSTRAP_BASIC -nowarn:1699 -d:DISABLE_CAS_USE -lib:$(topdir)/class/lib/$(PROFILE)
 NO_SIGN_ASSEMBLY = yes
 NO_TEST = yes
 NO_INSTALL = yes
-FRAMEWORK_VERSION = 2.0
+FRAMEWORK_VERSION = 4.0
 
 # Compiler all using same bootstrap compiler
 LIBRARY_COMPILE = $(BOOT_COMPILE)
@@ -65,8 +65,9 @@ do-profile-check: $(depsdir)/.stamp
 		$(MAKE) -s do-profile-check-monolite ; \
 	    else \
 		echo "*** The compiler '$(BOOTSTRAP_MCS)' doesn't appear to be usable." 1>&2; \
-                echo "*** You need Mono version 2.10 or better installed to build MCS" 1>&2 ; \
+                echo "*** You need Mono version 3.8 or better installed to build MCS" 1>&2 ; \
                 echo "*** Check mono README for information on how to bootstrap a Mono installation." 1>&2 ; \
+		echo "*** The version of '$(BOOTSTRAP_MCS)' is: `$(BOOTSTRAP_MCS) --version`." 1>&2 ; \
 	        exit 1; fi; fi
 
 

mcs/build/profiles/build.make

@@ -13,10 +13,10 @@ profile-check:
 	@:
 
 DEFAULT_REFERENCES = -r:mscorlib.dll
-PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES)
+PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES)
 
 NO_SIGN_ASSEMBLY = yes
 NO_TEST = yes
 NO_INSTALL = yes
 
-FRAMEWORK_VERSION = 4.0
+FRAMEWORK_VERSION = 4.5

mcs/build/profiles/net_2_0.make

@@ -1,16 +0,0 @@
-# -*- makefile -*-
-
-BOOTSTRAP_PROFILE = build
-BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
-MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
-
-# nuttzing!
-
-profile-check:
-	@:
-
-DEFAULT_REFERENCES = -r:mscorlib.dll
-PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
-
-FRAMEWORK_VERSION = 2.0
-XBUILD_VERSION = 2.0

mcs/build/profiles/net_3_5.make

@@ -1,20 +0,0 @@
-# -*- makefile -*-
-
-BOOTSTRAP_PROFILE = build
-
-MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
-
-# nuttzing!
-
-profile-check:
-	@:
-
-DEFAULT_REFERENCES = -r:mscorlib.dll
-PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_5 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) -lib:$(topdir)/class/lib/net_2_0 $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
-
-FRAMEWORK_VERSION = 3.5
-XBUILD_VERSION = 3.5
-
-TEST_HARNESS = $(topdir)/class/lib/net_2_0/nunit-console.exe
-TEST_MONO_PATH = $(topdir)/class/lib/net_2_0
-

mcs/build/profiles/net_4_0.make

@@ -1,22 +1,12 @@
 # -*- makefile -*-
 
-BOOTSTRAP_PROFILE = build
-
-BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
-MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
-
-# nuttzing!
-
 profile-check:
 	@:
 
-DEFAULT_REFERENCES = -r:mscorlib.dll
-PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES)
-
 FRAMEWORK_VERSION = 4.0
 XBUILD_VERSION = 4.0
 
 LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
 
-# Ignore tests on net_4_0 as the 4.0 IL code is never used for running (just for metadata), so it doesn't make sense to execute tests there
+NO_BUILD = yes
 NO_TEST = yes

mcs/build/profiles/net_4_5.make

@@ -11,7 +11,7 @@ profile-check:
 	@:
 
 DEFAULT_REFERENCES = -r:mscorlib.dll
-PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
+PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE  -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
 
 FRAMEWORK_VERSION = 4.5
 XBUILD_VERSION = 4.0

mcs/build/profiles/xbuild_12.make

@@ -2,6 +2,6 @@
 
 include $(topdir)/build/profiles/net_4_5.make
 
-PROFILE_MCS_FLAGS := $(PROFILE_MCS_FLAGS) -d:XBUILD_12 -lib:$(topdir)/class/lib/net_4_5
+PROFILE_MCS_FLAGS := $(PROFILE_MCS_FLAGS) -d:XBUILD_12 -d:MONO -d:DISABLE_CAS_USE  -lib:$(topdir)/class/lib/net_4_5
 
 XBUILD_VERSION = 12.0

mcs/build/profiles/xbuild_14.make

@@ -0,0 +1,7 @@
+# -*- makefile -*-
+
+include $(topdir)/build/profiles/net_4_5.make
+
+PROFILE_MCS_FLAGS := $(PROFILE_MCS_FLAGS) -d:XBUILD_12 -d:XBUILD_14 -d:MONO -d:DISABLE_CAS_USE  -lib:$(topdir)/class/lib/net_4_5
+
+XBUILD_VERSION = 14.0

mcs/build/rules.make

@@ -28,7 +28,7 @@ ifndef BUILD_TOOLS_PROFILE
 BUILD_TOOLS_PROFILE = build
 endif
 
-USE_MCS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS)
+USE_MCS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS) $(MCS_FLAGS_INTERNAL)
 USE_MBAS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MBAS_FLAGS) $(PLATFORM_MBAS_FLAGS) $(PROFILE_MBAS_FLAGS) $(MBAS_FLAGS)
 USE_CFLAGS = $(LOCAL_CFLAGS) $(CFLAGS) $(CPPFLAGS)
 CSCOMPILE = $(Q_MCS) $(MCS) $(USE_MCS_FLAGS)
@@ -210,6 +210,5 @@ dist-default:
 ## Documentation stuff
 
 Q_MDOC =$(if $(V),,@echo "MDOC    [$(PROFILE)] $(notdir $(@))";)
-# net_2_0 is needed because monodoc is only compiled in that profile
-MDOC   =$(Q_MDOC) MONO_PATH="$(topdir)/class/lib/$(DEFAULT_PROFILE)$(PLATFORM_PATH_SEPARATOR)$(topdir)/class/lib/net_2_0$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/$(DEFAULT_PROFILE)/mdoc.exe
+MDOC   =$(Q_MDOC) MONO_PATH="$(topdir)/class/lib/$(DEFAULT_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/$(DEFAULT_PROFILE)/mdoc.exe
 

mcs/class/Commons.Xml.Relaxng/Commons.Xml.Nvdl/NvdlXsdSupport.cs

@@ -41,7 +41,6 @@ namespace Commons.Xml.Nvdl
 		public override XmlReader CreateValidator (XmlReader reader,
 			XmlResolver resolver)
 		{
-#if NET_2_0
 			XmlReaderSettings s = new XmlReaderSettings ();
 			s.ValidationType = ValidationType.Schema;
 			// do not allow inline schema and schemaLocation.
@@ -50,14 +49,6 @@ namespace Commons.Xml.Nvdl
 			foreach (XmlSchema schema in schemas)
 				s.Schemas.Add (schema);
 			return XmlReader.Create (reader, s);
-#else
-			XmlValidatingReader xvr =
-				new XmlValidatingReader (reader);
-			xvr.XmlResolver = resolver;
-			foreach (XmlSchema schema in schemas)
-				xvr.Schemas.Add (schema);
-			return xvr;
-#endif
 		}
 
 		public override bool AddOption (string name, string arg)