Merge branch 'upstream'

Former-commit-id: ba0b337dd348cfeedeaca027d70c3dcc24d58fb5

Makefile.in

@@ -85,7 +85,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(srcdir)/config.h.in mkinstalldirs \
 	$(srcdir)/mono-core.spec.in $(srcdir)/mono-uninstalled.pc.in \
 	AUTHORS COPYING.LIB ChangeLog NEWS compile config.guess \
-	config.rpath config.sub depcomp install-sh missing ltmain.sh
+	config.rpath config.sub install-sh missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \

configure.REMOVED.git-id

@@ -1 +1 @@
-0d2865058e8904b609431e735d1a6a58dd269476
+d8620aa82da0a0b38b32fce2756391f51b4f0e09

configure.ac.REMOVED.git-id

@@ -1 +1 @@
-e26c88521f1fb3392393ffb4a102d2f9441ab54f
+eb6b931cec597bff05367555adbfdfd531547514

docs/deploy/mono-api-codegen.html

@@ -122,7 +122,7 @@ mono_code_manager_invalidate (MonoCodeManager *cman)
     <div class="api-entry">mono_code_manager_new_dynamic</div>
 
     <div class="prototype">MonoCodeManager* 
-mono_code_manager_new_dynamic (int bind_size)
+mono_code_manager_new_dynamic (void)
 
 </div>
 <p />
@@ -134,8 +134,6 @@ mono_code_manager_new_dynamic (int bind_size)
 	 Creates a new code manager suitable for holding native code that can be
 	 used for single or small methods that need to be deallocated independently
 	 of other native code.
-	 BIND_SIZE is the amount of memory reserved for storing thunks. If its 0,
-	 the default size is used.
 	
 
 </div> <a name="api:mono_code_manager_new"></a>

docs/deploy/mono-api-internal.html

@@ -476,6 +476,33 @@ mono_loader_lock (void)
     <div class="prototype">Prototype: mono_gc_enable</div>
 <p />
 
+</div> <a name="api:mono_gc_is_finalizer_thread"></a>
+ <div class="api">
+    <div class="api-entry">mono_gc_is_finalizer_thread</div>
+
+    <div class="prototype">gboolean
+mono_gc_is_finalizer_thread (MonoThread *thread)
+
+</div>
+<p />
+<b>Parameters</b>
+<blockquote><dt><i>thread:</i></dt><dd> the thread to test.</dd></blockquote>
+<b>Remarks</b>
+<p />	 
+	 In Mono objects are finalized asynchronously on a separate thread.
+	 This routine tests whether the <i>thread</i> argument represents the
+	 finalization thread.
+	
+<p />
+	 Returns true if <i>thread</i> is the finalization thread.
+
+</div> <a name="api:mono_gc_out_of_memory"></a>
+ <div class="api">
+    <div class="api-entry">mono_gc_out_of_memory</div>
+
+    <div class="prototype">Prototype: mono_gc_out_of_memory</div>
+<p />
+
 </div> <a name="api:mono_gc_start_world"></a>
  <div class="api">
     <div class="api-entry">mono_gc_start_world</div>
@@ -497,6 +524,13 @@ mono_loader_lock (void)
     <div class="prototype">Prototype: mono_gc_alloc_fixed</div>
 <p />
 
+</div> <a name="api:mono_gc_enable_events"></a>
+ <div class="api">
+    <div class="api-entry">mono_gc_enable_events</div>
+
+    <div class="prototype">Prototype: mono_gc_enable_events</div>
+<p />
+
 </div> <a name="api:mono_gc_free_fixed"></a>
  <div class="api">
     <div class="api-entry">mono_gc_free_fixed</div>

docs/deploy/mono-api-object.html

@@ -108,6 +108,7 @@ MonoObject* <a href="#api:mono_object_isinst">mono_object_isinst</a>
 gpointer    <a href="#api:mono_object_unbox">mono_object_unbox</a>              (MonoObject *obj);
 MonoObject* <a href="#api:mono_object_castclass_mbyref">mono_object_castclass_mbyref</a>   (MonoObject *obj, 
                                             MonoClass *klass);
+            <a href="#api:mono_object_is_alive"></a>                               
 guint       <a href="#api:mono_object_get_size">mono_object_get_size</a>           (MonoObject* o);
 MonoObject* <a href="#api:mono_value_box">mono_value_box</a>                 (MonoDomain *domain, 
                                             MonoClass *class, 
@@ -422,6 +423,13 @@ mono_object_castclass_mbyref (MonoObject *obj, MonoClass *klass)
 <blockquote>	  <i>obj</i> if <i>obj</i> is derived from <i>klass</i>, throws an exception otherwise
 </blockquote>
 
+</div> <a name="api:mono_object_is_alive"></a>
+ <div class="api">
+    <div class="api-entry">mono_object_is_alive</div>
+
+    <div class="prototype">Prototype: mono_object_is_alive</div>
+<p />
+
 </div> <a name="api:mono_object_get_size"></a>
  <div class="api">
     <div class="api-entry">mono_object_get_size</div>

docs/deploy/mono-api-profiler.html

@@ -104,12 +104,12 @@
     <div class="api-entry">mono_profiler_install</div>
 
     <div class="prototype">void
-mono_profiler_install (MonoProfiler *prof, int version, MonoProfileFunc callback)
+mono_profiler_install (MonoProfiler *prof, MonoProfileFunc callback)
 
 </div>
 <p />
 <b>Parameters</b>
-<blockquote><dt><i>prof:</i></dt><dd> a MonoProfiler structure pointer, or a pointer to a derived structure.</dd><dt><i>version:</i></dt><dd> profiler API version (see profiler.h)</dd><dt><i>callback:</i></dt><dd> the function to invoke at shutdown</dd></blockquote>
+<blockquote><dt><i>prof:</i></dt><dd> a MonoProfiler structure pointer, or a pointer to a derived structure.</dd><dt><i>callback:</i></dt><dd> the function to invoke at shutdown</dd></blockquote>
 <b>Remarks</b>
 <p />	 
 	 Use mono_profiler_install to activate profiling in the Mono runtime.

mcs/Makefile

@@ -14,6 +14,7 @@ mobile_SUBDIRS := build class
 mobile_static_SUBDIRS := build class
 binary_reference_assemblies_SUBDIRS := build class
 net_4_5_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs
+xammac_net_4_5_SUBDIRS := build class
 xbuild_12_SUBDIRS := build class tools/xbuild
 xbuild_14_SUBDIRS := build class tools/xbuild
 
@@ -57,6 +58,7 @@ $(_boot_:%=profile-do--monodroid--%):         profile-do--monodroid--%:
 $(_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--xammac_net_4_5--%):    profile-do--xammac_net_4_5--%:           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--build--%):             profile-do--build--%:             profile-do--basic--%

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 = "4.0.2.0";
+	public const string MonoVersion = "4.0.3.0";
 	public const string MonoCompany = "Mono development team";
 	public const string MonoProduct = "Mono Common Language Infrastructure";
 	public const string MonoCopyright = "(c) Various Mono authors";

mcs/build/common/SR.cs

@@ -9,7 +9,6 @@ static class AssemblyRef
 	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;

mcs/class/Facades/Makefile

@@ -18,6 +18,7 @@ net_4_5_SUBDIRS = $(monotouch_SUBDIRS) System.Reflection.Emit.ILGeneration Syste
 monodroid_SUBDIRS = $(net_4_5_SUBDIRS)
 
 xammac_SUBDIRS = $(net_4_5_SUBDIRS)
+xammac_net_4_5_SUBDIRS = $(net_4_5_SUBDIRS)
 
 PROFILE_SUBDIRS = $(net_4_5_SUBDIRS)
 

mcs/class/Facades/System.ServiceModel.Security/TypeForwarders.cs

@@ -26,6 +26,7 @@
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.TransportSecurityBindingElement))]
 #if !MOBILE
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.DnsEndpointIdentity))]
+#if !XAMMAC_4_5
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.MessageSecurityVersion))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.BasicSecurityProfileVersion))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.SecureConversationVersion))]
@@ -36,6 +37,7 @@
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.Tokens.SupportingTokenParameters))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.Tokens.UserNameSecurityTokenParameters))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Security.TrustVersion))]
+#endif
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.SpnEndpointIdentity))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.UpnEndpointIdentity))]
 #endif

mcs/class/Makefile

@@ -75,6 +75,48 @@ monotouch_runtime_dirs := \
 	System.XML \
 	Mono.CSharp
 
+xammac_4_5_dirs := \
+	corlib	\
+	System	\
+	Mono.Posix			\
+	System.Core	\
+	System.XML	\
+	Mono.Security	\
+	System	\
+	I18N		\
+	System.Numerics	\
+	Mono.Data.Tds	\
+	System.Transactions	\
+	System.EnterpriseServices	\
+	System.Data	\
+	System.Runtime.Serialization	\
+	System.Xml.Linq	\
+	Mono.Data.Sqlite	\
+	System.Runtime.Serialization.Formatters.Soap \
+	System.ComponentModel.DataAnnotations \
+	System.IdentityModel		\
+	System.IdentityModel.Selectors	\
+	Mono.Messaging			\
+	System.Configuration.Install 	\
+	System.Messaging	        \
+	System.Web.Services \
+	System.Net \
+	System.ServiceModel	\
+	System.ServiceModel.Web	\
+	System.Json	\
+	System.Data.Services.Client \
+	System.IO.Compression \
+	System.IO.Compression.FileSystem \
+	System.ComponentModel.Composition.4.5 \
+	System.Windows \
+	System.Xml.Serialization \
+	Mono.CSharp	\
+	Microsoft.CSharp \
+	Mono.CompilerServices.SymbolWriter	\
+	System.Data.Linq		\
+	System.Net.Http \
+	$(pcl_facade_dirs)
+
 net_4_5_dirs := \
 	corlib				\
 	System				\
@@ -217,6 +259,7 @@ monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs)
 mobile_static_SUBDIRS := $(mobile_static_dirs)
 mobile_SUBDIRS := $(mobile_dynamic_dirs)
 xammac_SUBDIRS := $(xammac_dirs)
+xammac_net_4_5_SUBDIRS := $(xammac_4_5_dirs)
 binary_reference_assemblies_SUBDIRS := reference-assemblies
 net_4_5_SUBDIRS := $(net_4_5_dirs) $(xbuild_4_0_dirs) aot-compiler
 xbuild_12_SUBDIRS := $(xbuild_4_0_dirs)
@@ -224,7 +267,7 @@ xbuild_14_SUBDIRS := $(xbuild_4_0_dirs)
 
 include ../build/rules.make
 
-SUBDIRS = $(mobile_static_dirs) $(mobile_dynamic_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_5_dirs)
+SUBDIRS = $(mobile_static_dirs) $(mobile_dynamic_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_5_dirs) $(xammac_net_4_5_SUBDIRS)
 
 DIST_ONLY_SUBDIRS = dlr aot-compiler reference-assemblies $(xbuild_4_0_dirs)
 

mcs/class/System.ComponentModel.Composition.4.5/Makefile

@@ -12,7 +12,7 @@ CLEAN_FILES += $(STRING_MESSAGES)
 EXTRA_DISTFILES = \
 	src/ComponentModel/Strings.resx
 	
-VALID_PROFILE := $(filter net_4_5 monotouch monodroid xammac mobile mobile_static, $(PROFILE))
+VALID_PROFILE := $(filter net_4_5 monotouch monodroid xammac xammac_net_4_5 mobile mobile_static, $(PROFILE))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.ComponentModel.Composition.dll
 NO_INSTALL = yes

mcs/class/System.Core/xammac_net_4_5_System.Core.dll.sources

@@ -0,0 +1 @@
+#include net_4_5_System.Core.dll.sources

mcs/class/System.Data.Linq/Makefile

@@ -17,7 +17,7 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 EXTRA_DISTFILES = src/DbLinq/Schema/Dbml/DbmlSchema.xsd
 
 # This is a .NET 3.5+ assembly
-VALID_PROFILE := $(filter net_4_5, $(PROFILE))
+VALID_PROFILE := $(filter xammac_net_4_5 net_4_5, $(PROFILE))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Data.Linq.dll
 NO_INSTALL = yes

mcs/class/System.Data.Services.Client/Makefile

@@ -17,9 +17,11 @@ LIB_MCS_FLAGS = \
 	-resource:Client/System.Data.Services.Client.resources \
 	-warn:2
 
+ifndef NO_WINDOWS_BASE
 ifneq (2.1, $(FRAMEWORK_VERSION))
 LIB_MCS_FLAGS += -r:WindowsBase
 endif
+endif
 
 include ../../build/library.make
 

mcs/class/System.Data.Services.Client/xammac_net_4_5_System.Data.Services.Client.dll.sources

@@ -0,0 +1 @@
+#include net_4_5_System.Data.Services.Client.dll.sources

mcs/class/System.Data/Makefile

@@ -8,8 +8,8 @@ LIB_MCS_FLAGS = \
 	-nowarn:649 \
 	-unsafe \
 	-r:System			 	\
-	-r:System.Xml.dll \
+	-r:System.Xml.dll	\
-	-r:System.Core.dll
+	-d:NET_2_0
 
 MOBILE := $(filter monotouch monodroid xammac mobile mobile_static, $(PROFILE))
 ifdef MOBILE

mcs/class/System.Data/ReferenceSources/Bid.cs

@@ -11,11 +11,7 @@ static class Bid
 	internal static void TraceEx(uint flags, string fmtPrintfW, params object[] args)
 	{
 	}
-#if !MOBILE
+
-	internal static void TraceSqlReturn(string fmtPrintfW, System.Data.Odbc.ODBC32.RetCode a1, string a2)
-	{
-	}
-#endif
 	internal static void ScopeEnter(out IntPtr hScp, string fmt, params object[] args) {
 		hScp = NoData;
 	}