Imported Upstream version 3.10.0

Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions
--- a/mcs/class/corlib/System.Runtime.Serialization/FormatterServices.cs
+++ b/mcs/class/corlib/System.Runtime.Serialization/FormatterServices.cs
@ -40,16 +40,23 @@ using System.Globalization;
 namespace System.Runtime.Serialization
 {
 	[System.Runtime.InteropServices.ComVisibleAttribute (true)]
-	public sealed class FormatterServices
+#if NET_4_5
+	static
+#else
+	sealed
+#endif
+	public class FormatterServices
 	{
 		private const BindingFlags fieldFlags = BindingFlags.Public |
 							BindingFlags.Instance |
 							BindingFlags.NonPublic |
 							BindingFlags.DeclaredOnly;

+#if !NET_4_5
 		private FormatterServices ()
 		{
 		}
+#endif

 		public static object [] GetObjectData (object obj, MemberInfo [] members)
 		{