Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850

mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Makefile

@@ -14,8 +14,6 @@ SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
 LIB_REFS = System
 LIB_MCS_FLAGS = $(SIGN_FLAGS) 
 
-PLATFORM_DEBUG_FLAGS =
-
 NO_TEST = yes
 
 include $(MCS_BUILD_DIR)/library.make

mcs/class/Facades/System.Data.Common/Makefile

@@ -14,8 +14,6 @@ SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
 LIB_REFS = System System.Data System.Xml
 LIB_MCS_FLAGS = $(SIGN_FLAGS)
 
-PLATFORM_DEBUG_FLAGS =
-
 NO_TEST = yes
 
 include $(MCS_BUILD_DIR)/library.make

mcs/class/Facades/System.Diagnostics.StackTrace/Makefile

@@ -14,8 +14,6 @@ SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
 LIB_REFS = System
 LIB_MCS_FLAGS = $(SIGN_FLAGS) 
 
-PLATFORM_DEBUG_FLAGS =
-
 NO_TEST = yes
 
 include $(MCS_BUILD_DIR)/library.make

mcs/class/Facades/System.Diagnostics.Tracing/Makefile

@@ -13,8 +13,6 @@ KEY_FILE = ../../msfinal.pub
 SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
 LIB_MCS_FLAGS = $(SIGN_FLAGS) 
 
-PLATFORM_DEBUG_FLAGS =
-
 NO_TEST = yes
 
 include $(MCS_BUILD_DIR)/library.make

mcs/class/Facades/System.Diagnostics.Tracing/System.Diagnostics.Tracing.dll.sources

@@ -1,3 +1,2 @@
 TypeForwarders.cs
 AssemblyInfo.cs
-EventCounter.cs

mcs/class/Facades/System.Diagnostics.Tracing/TypeForwarders.cs

@@ -44,3 +44,7 @@
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventTask))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventWrittenEventArgs))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.NonEventAttribute))]
+
+#if NETSTANDARD
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Diagnostics.Tracing.EventCounter))]
+#endif

mcs/class/Facades/System.Globalization.Extensions/Makefile

@@ -14,8 +14,6 @@ SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
 LIB_REFS = System
 LIB_MCS_FLAGS = $(SIGN_FLAGS) 
 
-PLATFORM_DEBUG_FLAGS =
-
 NO_TEST = yes
 
 include $(MCS_BUILD_DIR)/library.make

mcs/class/Facades/System.IO.FileSystem.AccessControl/Makefile

@@ -14,8 +14,6 @@ SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
 LIB_REFS = System
 LIB_MCS_FLAGS = $(SIGN_FLAGS) 
 
-PLATFORM_DEBUG_FLAGS =
-
 NO_TEST = yes
 
 include $(MCS_BUILD_DIR)/library.make

mcs/class/Facades/System.Net.Sockets/Makefile

@@ -14,8 +14,6 @@ SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
 LIB_REFS = System
 LIB_MCS_FLAGS = $(SIGN_FLAGS)
 
-PLATFORM_DEBUG_FLAGS =
-
 NO_TEST = yes
 
 include $(MCS_BUILD_DIR)/library.make

mcs/class/Facades/System.Net.Sockets/System.Net.Sockets.dll.sources

@@ -1,5 +1,2 @@
 TypeForwarders.cs
 AssemblyInfo.cs
-SocketReceiveFromResult.cs
-SocketReceiveMessageFromResult.cs
-SocketTaskExtensions.cs

mcs/class/Facades/System.Net.Sockets/TypeForwarders.cs

@@ -46,4 +46,8 @@
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.UdpClient))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.UdpReceiveResult))]
 
-
+#if NETSTANDARD
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketReceiveFromResult))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketReceiveMessageFromResult))]
+[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Net.Sockets.SocketTaskExtensions))]
+#endif

mcs/class/Facades/System.Reflection.Emit.Lightweight/DynamicMethod.cs

@@ -0,0 +1,136 @@
+//
+// DynamicMethod.cs
+//
+// Authors:
+//   Marek Safar (marek.safar@gmail.com)
+//
+// Copyright (C) 2016 Xamarin Inc (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+#if FULL_AOT_RUNTIME
+
+namespace System.Reflection.Emit
+{
+	public abstract class DynamicMethod : MethodInfo, ICustomAttributeProvider
+	{
+		public DynamicMethod (string name, Type returnType, Type[] parameterTypes)
+		{
+			throw new PlatformNotSupportedException ();
+		}
+
+		public DynamicMethod (string name, Type returnType, Type[] parameterTypes, bool restrictedSkipVisibility)
+		{
+			throw new PlatformNotSupportedException ();
+		}
+
+		public DynamicMethod (string name, Type returnType, Type[] parameterTypes, Module m)
+		{
+			throw new PlatformNotSupportedException ();
+		}
+
+		public DynamicMethod (string name, Type returnType, Type[] parameterTypes, Type owner)
+		{
+			throw new PlatformNotSupportedException ();
+		}
+
+		public DynamicMethod (string name, Type returnType, Type[] parameterTypes, Module m, bool skipVisibility)
+		{
+			throw new PlatformNotSupportedException ();
+		}
+
+		public DynamicMethod (string name, Type returnType, Type[] parameterTypes, Type owner, bool skipVisibility)
+		{
+			throw new PlatformNotSupportedException ();
+		}
+
+		public DynamicMethod (string name, MethodAttributes attributes, CallingConventions callingConvention, Type returnType, Type[] parameterTypes, Module m, bool skipVisibility)
+		{
+			throw new PlatformNotSupportedException ();
+		}
+
+		public DynamicMethod (string name, MethodAttributes attributes, CallingConventions callingConvention, Type returnType, Type[] parameterTypes, Type owner, bool skipVisibility)
+		{
+			throw new PlatformNotSupportedException ();
+		}
+
+		public override MethodAttributes Attributes { 
+			get {
+				throw new PlatformNotSupportedException ();
+			}
+		}
+
+		public override CallingConventions CallingConvention {
+			get {
+				throw new PlatformNotSupportedException ();
+			}
+		}
+
+		public override Type DeclaringType {
+			get {
+				throw new PlatformNotSupportedException ();
+			}
+		}
+
+		public bool InitLocals { get; set; }
+
+		public override MethodImplAttributes MethodImplementationFlags {
+			get {
+				throw new PlatformNotSupportedException ();
+			}				
+		}
+
+		public override string Name {
+			get {
+				throw new PlatformNotSupportedException ();
+			}
+		}				
+
+		public override ParameterInfo ReturnParameter {
+			get {
+				throw new PlatformNotSupportedException ();
+			}
+		}
+
+		public override Type ReturnType {
+			get {
+				throw new PlatformNotSupportedException ();
+			}
+		}
+
+		public ILGenerator GetILGenerator ()
+		{
+			throw new PlatformNotSupportedException ();
+		}
+
+		public ILGenerator GetILGenerator (int streamSize)
+		{
+			throw new PlatformNotSupportedException ();
+		}
+
+		public override ParameterInfo[] GetParameters ()
+		{
+			throw new PlatformNotSupportedException ();
+		}
+	}
+}
+
+#endif

mcs/class/Facades/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.dll.sources

@@ -1,3 +1,3 @@
 TypeForwarders.cs
 AssemblyInfo.cs
-
+DynamicMethod.cs

mcs/class/Facades/System.Reflection.Emit.Lightweight/TypeForwarders.cs

@@ -20,5 +20,6 @@
 // THE SOFTWARE.
 // 
 
+#if !FULL_AOT_RUNTIME
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Reflection.Emit.DynamicMethod))]
-
+#endif

mcs/class/Facades/System.Reflection.TypeExtensions/Makefile

@@ -14,8 +14,6 @@ SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
 LIB_REFS = System
 LIB_MCS_FLAGS = $(SIGN_FLAGS) 
 
-PLATFORM_DEBUG_FLAGS =
-
 NO_TEST = yes
 
 include $(MCS_BUILD_DIR)/library.make

mcs/class/Facades/System.Runtime.Serialization.Primitives/Makefile

@@ -14,8 +14,6 @@ SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
 LIB_REFS = System.Runtime.Serialization
 LIB_MCS_FLAGS = $(SIGN_FLAGS) 
 
-PLATFORM_DEBUG_FLAGS =
-
 NO_TEST = yes
 
 include $(MCS_BUILD_DIR)/library.make

mcs/class/Facades/System.Runtime.Serialization.Xml/Makefile

@@ -18,8 +18,6 @@ ifeq (2.1, $(FRAMEWORK_VERSION))
 LIB_MCS_FLAGS += /d:NO_CODEDOM
 endif
 
-PLATFORM_DEBUG_FLAGS =
-
 NO_TEST = yes
 
 include $(MCS_BUILD_DIR)/library.make

mcs/class/Facades/System.Security.SecureString/Makefile

@@ -14,8 +14,6 @@ SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
 LIB_REFS = System
 LIB_MCS_FLAGS = $(SIGN_FLAGS) 
 
-PLATFORM_DEBUG_FLAGS =
-
 NO_TEST = yes
 
 include $(MCS_BUILD_DIR)/library.make

mcs/class/Facades/System.ServiceProcess.ServiceController/Makefile

@@ -21,8 +21,6 @@ endif
 
 LIB_MCS_FLAGS = $(SIGN_FLAGS)
 
-PLATFORM_DEBUG_FLAGS =
-
 NO_TEST = yes
 
 include $(MCS_BUILD_DIR)/library.make

mcs/class/Facades/System.Text.Encoding.CodePages/CodePagesEncodingProvider.cs

@@ -22,15 +22,15 @@
 
 namespace System.Text
 {
-	public sealed partial class CodePagesEncodingProvider : EncodingProvider
+	public sealed class CodePagesEncodingProvider : EncodingProvider
 	{
-		static CodePagesEncodingProvider instance = new CodePagesEncodingProvider ();
+		static readonly CodePagesEncodingProvider instance = new CodePagesEncodingProvider ();
 
 		private CodePagesEncodingProvider ()
 		{
 		}
 		
-		public static System.Text.EncodingProvider Instance { 
+		public static EncodingProvider Instance {
 			get {
 				return instance;
 			}