Imported Upstream version 5.10.0.47

Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0

mcs/class/System/Makefile

@@ -27,6 +27,7 @@ TEST_RESOURCES = \
 	Test/System/test-uri-props-manual.txt \
 	Test/System/test-uri-relative-props.txt
 
+XTEST_LIB_REFS = System System.Core Facades/System.Threading.Tasks Facades/System.Runtime.InteropServices.RuntimeInformation
 LIB_MCS_FLAGS = -d:CONFIGURATION_2_0 $(REFERENCE_SOURCES_FLAGS) -unsafe $(RESOURCE_FILES:%=-resource:%) -nowarn:436
 
 ifndef NO_MONO_SECURITY
@@ -95,6 +96,9 @@ endif
 
 TXT_RESOURCE_STRINGS = ../referencesource/System/System.txt
 
+
+API_BIN_REFS := System.Net.Http
+
 #
 # Flags used to build the secxml version of System.
 #
@@ -177,7 +181,7 @@ $(the_libdir_base)System.Configuration.dll:
 
 $(build_lib): $(CYCLIC_DEP_FILES)
 
-$(test_lib): $(TEST_RESOURCES)
+$(test_lib_output): $(TEST_RESOURCES) $(test_lib_dir)
 
 CLEAN_FILES = $(test_lib).config $(bare_libdir)/System.dll $(secxml_libdir)/System.dll $(bare_libdir)/System.dll.mdb $(secxml_libdir)/System.dll.mdb
 

mcs/class/System/System.CodeDom.Compiler/CodeDomConfigurationHandler.cs

@@ -0,0 +1,81 @@
+//
+// System.Configuration.CodeDomConfigurationHandler
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// Copyright (c) 2005 Novell, Inc (http://www.novell.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 CONFIGURATION_DEP
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Configuration;
+using System.IO;
+
+namespace System.CodeDom.Compiler
+{
+	internal sealed class CodeDomConfigurationHandler: ConfigurationSection
+	{
+		static ConfigurationPropertyCollection properties;
+		static ConfigurationProperty compilersProp;
+		static CompilerCollection default_compilers;
+
+		static CodeDomConfigurationHandler ()
+		{
+			default_compilers = new CompilerCollection ();
+			compilersProp = new ConfigurationProperty ("compilers", typeof (CompilerCollection), default_compilers);
+			properties = new ConfigurationPropertyCollection ();
+			properties.Add (compilersProp);
+		}
+
+		public CodeDomConfigurationHandler ()
+		{
+		}
+		
+		protected override void InitializeDefault ()
+		{
+			compilersProp = new ConfigurationProperty ("compilers", typeof (CompilerCollection), default_compilers);
+		}
+		
+		[MonoTODO]
+		protected override void PostDeserialize () => base.PostDeserialize ();
+
+		protected override object GetRuntimeObject () => this;
+
+		[ConfigurationProperty ("compilers")]
+		public CompilerCollection Compilers => (CompilerCollection) base [compilersProp];
+
+		public CompilerInfo[] CompilerInfos {
+			get {
+				var cc = (CompilerCollection) base [compilersProp];
+				return cc?.CompilerInfos;
+			}
+		}
+		
+		protected override ConfigurationPropertyCollection Properties => properties;
+	}
+}
+#endif

mcs/class/System/System.CodeDom.Compiler/Compiler.cs

@@ -0,0 +1,127 @@
+//
+// System.Web.Configuration.CompilerCollection
+//
+// Authors:
+//	Chris Toshok (toshok@ximian.com)
+//
+// (C) 2005 Novell, Inc (http://www.novell.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 CONFIGURATION_DEP
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Configuration;
+
+namespace System.CodeDom.Compiler
+{
+	internal sealed class Compiler : ConfigurationElement
+	{
+		static ConfigurationProperty compilerOptionsProp;
+		static ConfigurationProperty extensionProp;
+		static ConfigurationProperty languageProp;
+		static ConfigurationProperty typeProp;
+		static ConfigurationProperty warningLevelProp;
+		static ConfigurationProperty providerOptionsProp;
+		
+		static ConfigurationPropertyCollection properties;
+
+		static Compiler ()
+		{
+			compilerOptionsProp = new ConfigurationProperty("compilerOptions", typeof (string), "");
+			extensionProp = new ConfigurationProperty("extension", typeof (string), "");
+			languageProp = new ConfigurationProperty("language", typeof (string), "", ConfigurationPropertyOptions.IsRequired | ConfigurationPropertyOptions.IsKey);
+			typeProp = new ConfigurationProperty("type", typeof (string), "", ConfigurationPropertyOptions.IsRequired);
+			warningLevelProp = new ConfigurationProperty("warningLevel", typeof (int), 0,
+								     TypeDescriptor.GetConverter (typeof (int)),
+								     new IntegerValidator (0, 4),
+								     ConfigurationPropertyOptions.None);
+			providerOptionsProp = new ConfigurationProperty ("", typeof (CompilerProviderOptionsCollection), null, null, null,
+									 ConfigurationPropertyOptions.IsDefaultCollection);
+			
+			properties = new ConfigurationPropertyCollection ();
+			properties.Add (compilerOptionsProp);
+			properties.Add (extensionProp);
+			properties.Add (languageProp);
+			properties.Add (typeProp);
+			properties.Add (warningLevelProp);
+			properties.Add (providerOptionsProp);
+		}
+
+		internal Compiler ()
+		{
+		}
+
+		public Compiler (string compilerOptions, string extension, string language, string type, int warningLevel)
+		{
+			this.CompilerOptions = compilerOptions;
+			this.Extension = extension;
+			this.Language = language;
+			this.Type = type;
+			this.WarningLevel = warningLevel;
+		}
+
+		[ConfigurationProperty ("compilerOptions", DefaultValue = "")]
+		public string CompilerOptions {
+			get { return (string) base[compilerOptionsProp]; }
+			internal set { base[compilerOptionsProp] = value; }
+		}
+
+		[ConfigurationProperty ("extension", DefaultValue = "")]
+		public string Extension {
+			get { return (string) base[extensionProp]; }
+			internal set { base[extensionProp] = value; }
+		}
+
+		[ConfigurationProperty ("language", DefaultValue = "", Options = ConfigurationPropertyOptions.IsRequired | ConfigurationPropertyOptions.IsKey)]
+		public string Language {
+			get { return (string) base[languageProp]; }
+			internal set { base[languageProp] = value; }
+		}
+
+		[ConfigurationProperty ("type", DefaultValue = "", Options = ConfigurationPropertyOptions.IsRequired)]
+		public string Type {
+			get { return (string) base[typeProp]; }
+			internal set { base[typeProp] = value; }
+		}
+
+		[IntegerValidator (MinValue = 0, MaxValue = 4)]
+		[ConfigurationProperty ("warningLevel", DefaultValue = "0")]
+		public int WarningLevel {
+			get { return (int) base[warningLevelProp]; }
+			internal set { base[warningLevelProp] = value; }
+		}
+
+		[ConfigurationProperty ("", Options = ConfigurationPropertyOptions.IsDefaultCollection)]
+		public CompilerProviderOptionsCollection ProviderOptions {
+			get { return (CompilerProviderOptionsCollection) base [providerOptionsProp]; }
+			internal set { base [providerOptionsProp] = value; }
+		}
+
+		public Dictionary <string, string> ProviderOptionsDictionary => ProviderOptions.ProviderOptions;
+
+		protected override ConfigurationPropertyCollection Properties => properties;
+	}
+}
+#endif

mcs/class/System/System.CodeDom.Compiler/CompilerCollection.cs

@@ -0,0 +1,217 @@
+//
+// System.Web.Configuration.CompilerCollection
+//
+// Authors:
+//	Chris Toshok (toshok@ximian.com)
+//
+// (C) 2005 Novell, Inc (http://www.novell.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 CONFIGURATION_DEP
+
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace System.CodeDom.Compiler
+{
+	[ConfigurationCollection (typeof (Compiler), AddItemName = "compiler", CollectionType = ConfigurationElementCollectionType.BasicMap)]
+	internal sealed class CompilerCollection : ConfigurationElementCollection
+	{
+		static readonly string defaultCompilerVersion = "3.5";
+		static ConfigurationPropertyCollection properties;
+		static List <CompilerInfo> compiler_infos;
+		static Dictionary <string, CompilerInfo> compiler_languages;
+		static Dictionary <string, CompilerInfo> compiler_extensions;
+		
+		static CompilerCollection ()
+		{
+			properties = new ConfigurationPropertyCollection ();
+			compiler_infos = new List <CompilerInfo> ();
+			compiler_languages = new Dictionary <string, CompilerInfo> (16, StringComparer.OrdinalIgnoreCase);
+			compiler_extensions = new Dictionary <string, CompilerInfo> (6, StringComparer.OrdinalIgnoreCase);
+				
+			CompilerInfo compiler = new CompilerInfo (null, "Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", 
+				new [] { ".cs" }, new [] { "c#", "cs", "csharp" });
+			compiler.ProviderOptions ["CompilerVersion"] = defaultCompilerVersion;
+			AddCompilerInfo (compiler);
+
+			compiler = new CompilerInfo (null, "Microsoft.VisualBasic.VBCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", 
+				new [] { ".vb" }, new [] { "vb", "vbs", "visualbasic", "vbscript" });
+			compiler.ProviderOptions ["CompilerVersion"] = defaultCompilerVersion;
+			AddCompilerInfo (compiler);
+
+			compiler = new CompilerInfo (null, "Microsoft.JScript.JScriptCodeProvider, Microsoft.JScript, Version=8.0.1100.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", 
+				new [] { ".js" }, new [] { "js", "jscript", "javascript" });
+			compiler.ProviderOptions ["CompilerVersion"] = defaultCompilerVersion;
+			AddCompilerInfo (compiler);
+
+			compiler = new CompilerInfo (null, "Microsoft.VJSharp.VJSharpCodeProvider, VJSharpCodeProvider, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", 
+				new [] { ".jsl", ".java" }, new [] { "vj#", "vjs", "vjsharp" });
+			compiler.ProviderOptions ["CompilerVersion"] = defaultCompilerVersion;
+			AddCompilerInfo (compiler);
+
+			compiler = new CompilerInfo (null, "Microsoft.VisualC.CppCodeProvider, CppCodeProvider, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", 
+				new [] { ".h" }, new [] { "c++", "mc", "cpp" });
+			compiler.ProviderOptions ["CompilerVersion"] = defaultCompilerVersion;
+			AddCompilerInfo (compiler);
+		}
+
+		public CompilerCollection () { }
+
+		static void AddCompilerInfo (CompilerInfo ci)
+		{
+			ci.CreateProvider();
+			compiler_infos.Add (ci);
+
+			string[] languages = ci.GetLanguages ();
+			if (languages != null)
+				foreach (string language in languages)
+					compiler_languages [language] = ci;
+			
+			string[] extensions = ci.GetExtensions ();
+			if (extensions != null)
+				foreach (string extension in extensions)
+					compiler_extensions [extension] = ci;
+		}
+
+		static void AddCompilerInfo (Compiler compiler)
+		{
+			CompilerInfo ci = new CompilerInfo (null, compiler.Type, new [] { compiler.Extension }, new [] { compiler.Language });
+			ci.CompilerParams.CompilerOptions = compiler.CompilerOptions;
+			ci.CompilerParams.WarningLevel = compiler.WarningLevel;
+			AddCompilerInfo (ci);
+		}
+		
+		protected override void BaseAdd (ConfigurationElement element)
+		{
+			Compiler compiler = element as Compiler;
+			if (compiler != null)
+				AddCompilerInfo (compiler);
+			base.BaseAdd (element);
+		}
+		
+		protected override bool ThrowOnDuplicate {
+			get { return false; }
+		}
+		
+		protected override ConfigurationElement CreateNewElement ()
+		{
+			return new Compiler ();
+		}
+
+		public CompilerInfo GetCompilerInfoForLanguage (string language)
+		{
+			if (compiler_languages.Count == 0)
+				return null;
+			
+			CompilerInfo ci;
+			if (compiler_languages.TryGetValue (language, out ci))
+				return ci;
+			
+			return null;
+		}
+
+		public CompilerInfo GetCompilerInfoForExtension (string extension)
+		{
+			if (compiler_extensions.Count == 0)
+				return null;
+			
+			CompilerInfo ci;
+			if (compiler_extensions.TryGetValue (extension, out ci))
+				return ci;
+			
+			return null;
+		}
+
+		public string GetLanguageFromExtension (string extension)
+		{
+			CompilerInfo ci = GetCompilerInfoForExtension (extension);
+			if (ci == null)
+				return null;
+			string[] languages = ci.GetLanguages ();
+			if (languages != null && languages.Length > 0)
+				return languages [0];
+			return null;
+		}
+		
+		public Compiler Get (int index)
+		{
+			return (Compiler) BaseGet (index);
+		}
+
+		public Compiler Get (string language)
+		{
+			return (Compiler) BaseGet (language);
+		}
+
+		protected override object GetElementKey (ConfigurationElement element)
+		{
+			return ((Compiler)element).Language;
+		}
+
+		public string GetKey (int index)
+		{
+			return (string)BaseGetKey (index);
+		}
+
+		public string[] AllKeys {
+			get {
+				var keys = new string [compiler_infos.Count];
+				for (int i = 0; i < Count; i++)
+					keys[i] = string.Join(";", compiler_infos[i].GetLanguages ());
+				return keys;
+			}
+		}
+		
+		public override ConfigurationElementCollectionType CollectionType {
+			get { return ConfigurationElementCollectionType.BasicMap; }
+		}
+
+		protected override string ElementName {
+			get { return "compiler"; }
+		}
+
+		protected override ConfigurationPropertyCollection Properties {
+			get { return properties; }
+		}
+
+		public Compiler this[int index] {
+			get { return (Compiler) BaseGet (index); }
+		}
+
+		public new CompilerInfo this[string language] {
+			get {
+				return GetCompilerInfoForLanguage (language);
+			}
+		}
+
+		public CompilerInfo[] CompilerInfos {
+			get {
+				return compiler_infos.ToArray ();
+			}
+		}
+	}
+}
+#endif

mcs/class/System/System.CodeDom.Compiler/CompilerProviderOption.cs

@@ -0,0 +1,69 @@
+// System.Web.Configuration.CompilerProviderOptionsCollection.cs
+//
+// Authors:
+//	Marek Habersack (mhabersack@novell.com)
+//
+// (C) 2007 Novell, Inc (http://www.novell.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 CONFIGURATION_DEP
+using System;
+using System.Configuration;
+
+namespace System.CodeDom.Compiler
+{
+	internal sealed class CompilerProviderOption : ConfigurationElement
+	{
+		static ConfigurationProperty nameProp;
+		static ConfigurationProperty valueProp;
+		static ConfigurationPropertyCollection properties;
+		
+		static CompilerProviderOption ()
+		{
+			nameProp = new ConfigurationProperty ("name", typeof (string), "",
+							      ConfigurationPropertyOptions.IsRequired | ConfigurationPropertyOptions.IsKey);
+			valueProp = new ConfigurationProperty ("value", typeof (string), "",
+							       ConfigurationPropertyOptions.IsRequired);
+
+			properties = new ConfigurationPropertyCollection ();
+			properties.Add (nameProp);
+			properties.Add (valueProp);
+		}
+
+		[ConfigurationProperty ("name", DefaultValue = "", Options = ConfigurationPropertyOptions.IsRequired | ConfigurationPropertyOptions.IsKey)]
+		public string Name {
+			get { return (string) base [nameProp]; }
+			set { base [nameProp] = value; }
+		}
+
+		[ConfigurationProperty ("value", DefaultValue = "", Options = ConfigurationPropertyOptions.IsRequired)]
+		public string Value {
+			get { return (string) base [valueProp]; }
+			set { base [valueProp] = value; }
+		}
+
+		protected override ConfigurationPropertyCollection Properties => properties;
+	}
+}
+#endif

mcs/class/System/System.CodeDom.Compiler/CompilerProviderOptionsCollection.cs

@@ -0,0 +1,128 @@
+//
+// System.Web.Configuration.CompilerProviderOptionsCollection.cs
+//
+// Authors:
+//	Marek Habersack (mhabersack@novell.com)
+//
+// (C) 2007 Novell, Inc (http://www.novell.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 CONFIGURATION_DEP
+using System;
+using System.Configuration;
+using System.Collections.Generic;
+
+namespace System.CodeDom.Compiler
+{
+	[ConfigurationCollection (typeof (CompilerProviderOption), CollectionType = ConfigurationElementCollectionType.BasicMap, AddItemName = "providerOption")]
+	internal sealed class CompilerProviderOptionsCollection : ConfigurationElementCollection
+	{
+		static ConfigurationPropertyCollection properties;
+
+		static CompilerProviderOptionsCollection ()
+		{
+			properties = new ConfigurationPropertyCollection ();
+		}
+
+		public CompilerProviderOptionsCollection ()
+		{
+		}
+
+		protected override ConfigurationElement CreateNewElement ()
+		{
+			return new CompilerProviderOption ();
+		}
+
+		public CompilerProviderOption Get (int index)
+		{
+			return (CompilerProviderOption) BaseGet (index);
+		}
+
+		public CompilerProviderOption Get (string name)
+		{
+			return (CompilerProviderOption) BaseGet (name);
+		}
+
+		protected override object GetElementKey (ConfigurationElement element)
+		{
+			return ((CompilerProviderOption) element).Name;
+		}
+
+		public string GetKey (int index)
+		{
+			return (string) BaseGetKey (index);
+		}
+
+		public string[] AllKeys {
+			get {
+				int count = Count;
+				string[] keys = new string [count];
+				for (int i = 0; i < count; i++)
+					keys [i] = this [i].Name;
+
+				return keys;
+			}
+		}
+
+		protected override string ElementName {
+			get { return "providerOption"; }
+		}
+
+		protected override ConfigurationPropertyCollection Properties {
+			get { return properties; }
+		}
+
+		public Dictionary <string, string> ProviderOptions {
+			get {
+				int count = Count;
+
+				if (count == 0)
+					return null;
+
+				Dictionary <string, string> ret = new Dictionary <string, string> (count);
+				CompilerProviderOption opt;
+				
+				for (int i = 0; i < count; i++) {
+					opt = this [i];
+					ret.Add (opt.Name, opt.Value);
+				}
+
+				return ret;
+			}
+		}
+		
+		public CompilerProviderOption this [int index] => (CompilerProviderOption) BaseGet (index);
+
+		public new CompilerProviderOption this [string name] {
+			get {
+				foreach (CompilerProviderOption c in this) {
+					if (c.Name == name)
+						return c;
+				}
+				return null;
+			}
+		}
+	}
+}
+#endif

mcs/class/System/System.Diagnostics/Process.cs

@@ -60,9 +60,7 @@ namespace System.Diagnostics
 			 * the Start_internal icall in
 			 * mono/metadata/process.c
 			 */
-			public IntPtr thread_handle;
 			public int pid; // Contains -GetLastError () on failure.
-			public int tid;
 			public string[] envVariables;
 			public string UserName;
 			public string Domain;

mcs/class/System/System.Diagnostics/Win32EventLog.cs

@@ -734,6 +734,9 @@ namespace System.Diagnostics
 
 		private void NotifyEventThread (ManualResetEvent resetEvent)
 		{
+			if (resetEvent == null)
+				return;
+
 			while (true) {
 				try {
 					resetEvent.WaitOne ();

mcs/class/System/System.IO.Compression/DeflateStream.cs

@@ -34,6 +34,8 @@ using System;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Runtime.Remoting.Messaging;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace System.IO.Compression
 {
@@ -130,6 +132,16 @@ namespace System.IO.Compression
 			}
 		}
 
+		internal ValueTask<int> ReadAsyncMemory (Memory<byte> destination, CancellationToken cancellationToken)
+		{
+			throw new NotImplementedException ();
+		}
+
+		internal int ReadCore (Span<byte> destination)
+		{
+			throw new NotImplementedException ();
+		}
+
 		public override int Read (byte[] array, int offset, int count)
 		{
 			if (disposed)
@@ -160,6 +172,16 @@ namespace System.IO.Compression
 			}
 		}
 
+		internal Task WriteAsyncMemory (ReadOnlyMemory<byte> source, CancellationToken cancellationToken)
+		{
+			throw new NotImplementedException ();
+		}
+
+		internal void WriteCore (ReadOnlySpan<byte> source)
+		{
+			throw new NotImplementedException ();
+		}
+
 		public override void Write (byte[] array, int offset, int count)
 		{
 			if (disposed)

mcs/class/System/System.Net.Security/SslStream.cs

@@ -49,6 +49,7 @@ using System.Security.Cryptography.X509Certificates;
 using System.Security.Permissions;
 using System.Security.Principal;
 using System.Security.Cryptography;
+using System.Threading;
 using System.Threading.Tasks;
 
 using MNS = Mono.Net.Security;
@@ -335,6 +336,11 @@ namespace System.Net.Security
 			throw new NotSupportedException (SR.GetString (SR.net_noseek));
 		}
 
+		public override Task FlushAsync (CancellationToken cancellationToken)
+		{
+			return InnerStream.FlushAsync (cancellationToken);
+		}
+
 		public override void Flush ()
 		{
 			InnerStream.Flush ();

mcs/class/System/System.Net/EndPointListener.cs

@@ -112,7 +112,13 @@ namespace System.Net {
 				accepted.Close ();
 				return;
 			}
-			HttpConnection conn = new HttpConnection (accepted, epl, epl.secure, epl.cert);
+			HttpConnection conn;
+			try {
+				conn = new HttpConnection (accepted, epl, epl.secure, epl.cert);
+			} catch {
+				accepted.Close ();
+				return;
+			}
 			lock (epl.unregistered) {
 				epl.unregistered [conn] = conn;
 			}

mcs/class/System/Test/System.Diagnostics/ProcessTest.cs

@@ -207,12 +207,6 @@ namespace MonoTests.System.Diagnostics
 				Assert.AreEqual (2, ex.NativeErrorCode, "#B6");
 			}
 
-			if (RunningOnUnix)
-				Assert.Ignore ("On Unix and Mac OS X, we try " +
-					"to open any file (using xdg-open, ...)" +
-					" and we do not report an exception " +
-					"if this fails.");
-
 			// absolute path, shell
 			process.StartInfo.FileName = exe;
 			process.StartInfo.UseShellExecute = true;

mcs/class/System/Test/System.IO.Compression/DeflateStreamTest.cs

@@ -46,6 +46,7 @@ namespace MonoTests.System.IO.Compression
 
 		[Test]
 		[ExpectedException (typeof (ArgumentNullException))]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void Constructor_Null ()
 		{
 			DeflateStream ds = new DeflateStream (null, CompressionMode.Compress);
@@ -53,12 +54,14 @@ namespace MonoTests.System.IO.Compression
 
 		[Test]
 		[ExpectedException (typeof (ArgumentException))]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void Constructor_InvalidCompressionMode ()
 		{
 			DeflateStream ds = new DeflateStream (new MemoryStream (), (CompressionMode)Int32.MinValue);
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void CheckCompressDecompress ()
 		{
 			byte [] data = new byte[100000];
@@ -81,6 +84,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void CheckDecompress ()
 		{
 			MemoryStream backing = new MemoryStream (compressed_data);
@@ -92,6 +96,7 @@ namespace MonoTests.System.IO.Compression
 
 		// https://bugzilla.xamarin.com/show_bug.cgi?id=22346
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void CheckEmptyRead ()
 		{
 			byte [] dummy = new byte[1];
@@ -102,6 +107,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[ExpectedException (typeof (ArgumentNullException))]
 		public void CheckNullRead ()
 		{
@@ -111,6 +117,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[ExpectedException (typeof (InvalidOperationException))]
 		public void CheckCompressingRead ()
 		{
@@ -121,6 +128,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[ExpectedException (typeof (ArgumentException))]
 		public void CheckRangeRead ()
 		{
@@ -132,6 +140,7 @@ namespace MonoTests.System.IO.Compression
 
 #if !MOBILE
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[Category("NotWorking")]
 		[ExpectedException (typeof (InvalidDataException))]
 		public void CheckInvalidDataRead ()
@@ -145,6 +154,7 @@ namespace MonoTests.System.IO.Compression
 #endif
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[ExpectedException (typeof (ObjectDisposedException))]
 		public void CheckClosedRead ()
 		{
@@ -156,6 +166,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[ExpectedException (typeof (ObjectDisposedException))]
 		public void CheckClosedFlush ()
 		{
@@ -166,6 +177,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[ExpectedException (typeof (NotSupportedException))]
 		public void CheckSeek ()
 		{
@@ -175,6 +187,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[ExpectedException (typeof (NotSupportedException))]
 		public void CheckSetLength ()
 		{
@@ -184,6 +197,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void CheckGetCanSeekProp ()
 		{
 			MemoryStream backing = new MemoryStream (compressed_data);
@@ -204,6 +218,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void CheckGetCanReadProp ()
 		{
 			MemoryStream backing = new MemoryStream (compressed_data);
@@ -224,6 +239,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void CheckGetCanWriteProp ()
 		{
 			MemoryStream backing = new MemoryStream ();
@@ -244,6 +260,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[ExpectedException (typeof (NotSupportedException))]
 		public void CheckSetLengthProp ()
 		{
@@ -253,6 +270,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[ExpectedException (typeof (NotSupportedException))]
 		public void CheckGetLengthProp ()
 		{
@@ -262,6 +280,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[ExpectedException (typeof (NotSupportedException))]
 		public void CheckGetPositionProp ()
 		{
@@ -271,6 +290,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void DisposeTest ()
 		{
 			MemoryStream backing = new MemoryStream (compressed_data);
@@ -284,6 +304,7 @@ namespace MonoTests.System.IO.Compression
 
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void JunkAtTheEnd ()
 		{
 			// Write a deflated stream, then some additional data...
@@ -330,6 +351,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void Bug19313 ()
 		{
 			byte [] buffer  = new byte [512];
@@ -344,6 +366,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void CheckNet45Overloads () // Xambug #21982
 		{
 			MemoryStream dataStream = GenerateStreamFromString("Hello");
@@ -362,6 +385,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[ExpectedException (typeof (ArgumentException))]
 		public void CheckBufferOverrun ()
 		{
@@ -374,6 +398,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void Bug28777_EmptyFlush ()
 		{
 			MemoryStream backing = new MemoryStream ();
@@ -384,6 +409,7 @@ namespace MonoTests.System.IO.Compression
 		}
 		
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void Bug28777_DoubleFlush ()
 		{
 			byte[] buffer = new byte [4096];
@@ -397,6 +423,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void Bug34916_Inflate ()
 		{
 			var base64String = @"H4sIAAAAAAAAA6yVu27bQBBF/4VtZGHeD3ZJmhTp5C5IIUiEIcCWDEUugiD/nmEQwYRNURFAsuFwd2exZ++d+farud89davT+um5aRsC1DuEO+R7lJayRV9m5gegFqBZNB83m5fjevOzadGWUPHjaXd62XYVEy3Z04wiMTKIX0dfV0G/6FO3Pu72D/+iL916W9GbOV/X58SaS6zEKKyoGUA1eNg/nLfF2jUEBBNMtT4Wzeq567Z9HkZkE1Osf93msN/+WO32m+7zsavsh30/BUU8fy+uUCC+QIHpPQW1RAXkEGWUmSnUy2iUYSMYOGpARYViiIHcqY5kExS8rg2vY8gLGEjeYsClBVE4ORQHz3kxsEF4iS01xzBIZkgYQcYQQ7C54LQaIrxWn5+4ioT1BiRQN8Fh6MrOPjOS9Eh3M8YRJJQMZioJkUODFA8RNJ9AYuYBNyGJW5D0oi3/EpZ3dWYk5X5PN81RJGJgDATMQ5X02nFS1imVlMGvu0XwBg5/K1hY1U8tecxcNDy1/FAnG+OAQSi9PliHRaNUiuoxQYFB6T8oyAUKEu9LJ6oipbr1spyZArhWX6qbi7EOUrs7SCAoDNVgzKagMlUz+q6DQ4N8/yM=";
@@ -415,6 +442,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void Bug44994_Inflate()
 		{
 			var base64String = @"7cWxCQAgDACwpeBjgqsgXiHU0fd9QzBLErX1EQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADepcxcuU/atm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm3btm37zy8=";
@@ -434,6 +462,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[Category ("MobileNotWorking")]
 		public void Bug44994_InflateByteByByte()
 		{

mcs/class/System/Test/System.IO.Compression/GzipStreamTest.cs

@@ -44,6 +44,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[ExpectedException (typeof (ArgumentNullException))]
 		public void Constructor_Null ()
 		{
@@ -51,6 +52,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[ExpectedException (typeof (ArgumentException))]
 		public void Constructor_InvalidCompressionMode ()
 		{
@@ -58,6 +60,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void CheckCompressDecompress ()
 		{
 			byte [] data = new byte[100000];
@@ -80,6 +83,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void CheckDecompress ()
 		{
 			byte [] data = {0x1f, 0x8b, 0x08, 0x08, 0x70, 0xbb, 0x5d, 0x41, 0x00, 0x03, 0x74, 0x65, 0x73, 0x74, 0x00, 0xf3, 0x48, 0xcd, 0xc9, 0xc9, 0xe7, 0x02, 0x00, 0x16, 0x35, 0x96, 0x31, 0x06, 0x00, 0x00, 0x00 };
@@ -91,6 +95,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[ExpectedException (typeof (ArgumentNullException))]
 		public void CheckNullRead ()
 		{
@@ -101,6 +106,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[ExpectedException (typeof (InvalidOperationException))]
 		public void CheckCompressingRead ()
 		{
@@ -111,6 +117,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[ExpectedException (typeof (ArgumentException))]
 		public void CheckRangeRead ()
 		{
@@ -123,6 +130,7 @@ namespace MonoTests.System.IO.Compression
 
 #if !MOBILE
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[Category("NotWorking")]
 		public void CheckInvalidDataRead ()
 		{
@@ -139,6 +147,7 @@ namespace MonoTests.System.IO.Compression
 #endif
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void CheckClosedRead ()
 		{
 			byte [] dummy = new byte[20];
@@ -153,6 +162,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[ExpectedException (typeof (ObjectDisposedException))]
 		public void CheckClosedFlush ()
 		{
@@ -163,6 +173,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[ExpectedException (typeof (NotSupportedException))]
 		public void CheckSeek ()
 		{
@@ -172,6 +183,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[ExpectedException (typeof (NotSupportedException))]
 		public void CheckSetLength ()
 		{
@@ -181,6 +193,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void CheckGetCanSeekProp ()
 		{
 			MemoryStream backing = new MemoryStream (compressed_data);
@@ -201,6 +214,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void CheckGetCanReadProp ()
 		{
 			MemoryStream backing = new MemoryStream (compressed_data);
@@ -221,6 +235,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void CheckGetCanWriteProp ()
 		{
 			MemoryStream backing = new MemoryStream (compressed_data);
@@ -241,6 +256,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[ExpectedException (typeof (NotSupportedException))]
 		public void CheckSetLengthProp ()
 		{
@@ -250,6 +266,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[ExpectedException (typeof (NotSupportedException))]
 		public void CheckGetLengthProp ()
 		{
@@ -259,6 +276,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		[ExpectedException (typeof (NotSupportedException))]
 		public void CheckGetPositionProp ()
 		{
@@ -268,6 +286,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void DisposeTest ()
 		{
 			MemoryStream backing = new MemoryStream (compressed_data);
@@ -277,6 +296,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void DisposeOrderTest ()
 		{
 			var fs = new MemoryStream();
@@ -304,6 +324,7 @@ namespace MonoTests.System.IO.Compression
 		}
 
 		[Test]
+		[Category ("StaticLinkedAotNotWorking")] // Native MPH loading issues
 		public void CheckNet45Overloads () // Xambug #21982
 		{
 			MemoryStream dataStream = GenerateStreamFromString("Hello");

mcs/class/System/Test/System.Net.NetworkInformation/IPInterfacePropertiesTest.cs

@@ -74,6 +74,7 @@ namespace MonoTests.System.Net.NetworkInformation
 		}
 	
 		[Test]
+		[Category ("InetAccess")]
 		public void AtLeastOneGatewayAddress ()
 		{
 			int numGatewayAddresses = 0;

mcs/class/System/Test/System.Net.Sockets/NetworkStreamCas.cs

@@ -97,6 +97,7 @@ namespace MonoCasTests.System.Net.Sockets {
 
 		[Test]
 		[EnvironmentPermission (SecurityAction.Deny, Read = "USERNAME")]
+		[Category ("InetAccess")]
 		public void AsyncRead ()
 		{
 			message = "AsyncRead";
@@ -135,6 +136,7 @@ namespace MonoCasTests.System.Net.Sockets {
 
 		[Test]
 		[EnvironmentPermission (SecurityAction.Deny, Read = "USERNAME")]
+		[Category ("InetAccess")]
 		public void AsyncWrite ()
 		{
 			message = "AsyncWrite";

mcs/class/System/Test/System.Net.Sockets/NetworkStreamTest.cs

@@ -16,6 +16,7 @@ using NUnit.Framework;
 namespace MonoTests.System.Net.Sockets
 {
 	[TestFixture]
+	[Category ("InetAccess")]
 	public class NetworkStreamTest
 	{
 	        [Test]

mcs/class/System/Test/System.Net.Sockets/SocketCas.cs

@@ -78,6 +78,7 @@ namespace MonoCasTests.System.Net.Sockets {
 
 		[Test]
 		[EnvironmentPermission (SecurityAction.Deny, Read = "USERNAME")]
+		[Category ("InetAccess")]
 		public void AsyncAccept ()
 		{
 			IPEndPoint ep = new IPEndPoint (IPAddress.Loopback, 16279);
@@ -117,6 +118,7 @@ namespace MonoCasTests.System.Net.Sockets {
 
 		[Test]
 		[EnvironmentPermission (SecurityAction.Deny, Read = "USERNAME")]
+		[Category ("InetAccess")]
 		public void AsyncConnect ()
 		{
 			message = "AsyncConnect";
@@ -150,6 +152,7 @@ namespace MonoCasTests.System.Net.Sockets {
 
 		[Test]
 		[EnvironmentPermission (SecurityAction.Deny, Read = "USERNAME")]
+		[Category ("InetAccess")]
 		public void AsyncReceive ()
 		{
 			message = "AsyncReceive";
@@ -188,6 +191,7 @@ namespace MonoCasTests.System.Net.Sockets {
 
 		[Test]
 		[EnvironmentPermission (SecurityAction.Deny, Read = "USERNAME")]
+		[Category ("InetAccess")]
 		public void AsyncReceiveFrom ()
 		{
 			message = "AsyncReceiveFrom";
@@ -226,6 +230,7 @@ namespace MonoCasTests.System.Net.Sockets {
 
 		[Test]
 		[EnvironmentPermission (SecurityAction.Deny, Read = "USERNAME")]
+		[Category ("InetAccess")]
 		public void AsyncSend ()
 		{
 			message = "AsyncSend";
@@ -260,6 +265,7 @@ namespace MonoCasTests.System.Net.Sockets {
 
 		[Test]
 		[EnvironmentPermission (SecurityAction.Deny, Read = "USERNAME")]
+		[Category ("InetAccess")]
 		public void AsyncSendTo ()
 		{
 			message = "AsyncSendTo";

mcs/class/System/Test/System.Net.Sockets/SocketTest.cs.REMOVED.git-id

@@ -1 +1 @@
-a6abbf59745f6290abaafc8709701260843a2813
+a7fb500cd3e3e994306ab6d5b214aa8dd13a18ae

mcs/class/System/Test/System.Net.Sockets/TcpClientCas.cs

@@ -70,6 +70,7 @@ namespace MonoCasTests.System.Net.Sockets {
 
 		[Test]
 		[EnvironmentPermission (SecurityAction.Deny, Read = "USERNAME")]
+		[Category ("InetAccess")]
 		public void AsyncConnect_StringIntAsyncCallbackObject ()
 		{
 			TcpClient s = new TcpClient ();
@@ -84,6 +85,7 @@ namespace MonoCasTests.System.Net.Sockets {
 
 		[Test]
 		[EnvironmentPermission (SecurityAction.Deny, Read = "USERNAME")]
+		[Category ("InetAccess")]
 		public void AsyncConnect_IPAddressIntAsyncCallbackObject ()
 		{
 			IPHostEntry host = Dns.Resolve ("www.google.com");
@@ -99,6 +101,7 @@ namespace MonoCasTests.System.Net.Sockets {
 
 		[Test]
 		[EnvironmentPermission (SecurityAction.Deny, Read = "USERNAME")]
+		[Category ("InetAccess")]
 		public void AsyncConnect_IPAddressArrayIntAsyncCallbackObject ()
 		{
 			IPHostEntry host = Dns.Resolve ("www.google.com");