Imported Upstream version 4.8.0.371

Former-commit-id: 1cedda3b6a8e480191a7a40a8dc33eb078fba58b

data/net_1_1/machine.config

@@ -74,9 +74,6 @@
 			<add prefix="https" type="System.Net.HttpRequestCreator, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 			<add prefix="file" type="System.Net.FileWebRequestCreator, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 		</webRequestModules>
-		<settings>
-			<ipv6 enabled="false"/>
-		</settings>
 	</system.net>
 	<system.web>
 		<httpHandlers>

data/net_2_0/machine.config

@@ -118,9 +118,6 @@
 			<add prefix="file" type="System.Net.FileWebRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 			<add prefix="ftp" type="System.Net.FtpRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 		</webRequestModules>
-		<settings>
-			<ipv6 enabled="false"/>
-		</settings>
 	</system.net>
 	
 	<system.runtime.remoting>

data/net_4_0/machine.config

@@ -135,9 +135,6 @@
 			<add prefix="file" type="System.Net.FileWebRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 			<add prefix="ftp" type="System.Net.FtpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 		</webRequestModules>
-		<settings>
-			<ipv6 enabled="false"/>
-		</settings>
 	</system.net>
 	
 	<system.runtime.remoting>

data/net_4_5/machine.config

@@ -138,9 +138,6 @@
 			<add prefix="file" type="System.Net.FileWebRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 			<add prefix="ftp" type="System.Net.FtpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
 		</webRequestModules>
-		<settings>
-			<ipv6 enabled="false"/>
-		</settings>
 	</system.net>
 	
 	<system.runtime.remoting>

mcs/class/Facades/System.Drawing.Primitives/monotouch_watch_System.Drawing.Primitives.dll.sources

@@ -1 +0,0 @@
-#include embedded_System.Drawing.Primitives.dll.sources

mcs/class/Facades/subdirs.make

@@ -52,7 +52,7 @@ xammac_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
 xammac_net_4_5_SUBDIRS = $(net_4_x_SUBDIRS)
 xammac_net_4_5_PARALLEL_SUBDIRS = $(net_4_x_PARALLEL_SUBDIRS)
 
-monotouch_watch_SUBDIRS = $(monotouch_SUBDIRS) $(drawing_DEPS_SUBDIRS)
+monotouch_watch_SUBDIRS = $(monotouch_SUBDIRS)
 monotouch_watch_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
 
 monotouch_tv_SUBDIRS = $(monotouch_SUBDIRS)

mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs

@@ -374,10 +374,8 @@ namespace Microsoft.Build.BuildEngine {
 				return false;
 
 			ITaskItem[] outputs;
-			if (ParentEngine.BuiltTargetsOutputByName.TryGetValue (key, out outputs)) {
-				if (targetOutputs != null)
-					targetOutputs.Add (target_name, outputs);
-			}
+			if (targetOutputs != null && ParentEngine.BuiltTargetsOutputByName.TryGetValue (key, out outputs))
+				targetOutputs [target_name] = outputs;
 			return true;
 		}
 

mcs/class/Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/TargetTest.cs

@@ -284,6 +284,51 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
 			t [0].RemoveTask (null);
 		}
 
+		[Test]
+		public void TestRunTargetTwice ()
+		{
+			string documentString = @"<Project xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
+			<Target Name=""Foo"">
+				<Message Text=""Foo ran""/>
+			</Target>
+			<Target Name=""Main"">
+				<MSBuild Projects=""$(MSBuildProjectFile)"" Targets=""Foo;Foo"" />
+			</Target>
+
+		</Project>";
+
+			var filepath = Path.GetTempFileName ();
+			try {
+				File.WriteAllText (filepath, documentString);
+
+				var engine = new Engine (Consts.BinPath);
+				var project = engine.CreateNewProject ();
+				project.Load (filepath);
+
+				var logger = new TestMessageLogger ();
+				engine.RegisterLogger (logger);
+
+				var result = project.Build ("Main");
+				if (!result) {
+					logger.DumpMessages ();
+					Assert.Fail ("Build failed, see the logs");
+				}
+
+				Assert.AreEqual(1, logger.NormalMessageCount, "Expected number of messages");
+				logger.CheckLoggedMessageHead ("Foo ran", "A1");
+
+				Assert.AreEqual(0, logger.NormalMessageCount, "Extra messages found");
+				Assert.AreEqual(0, logger.WarningMessageCount, "Extra warning messages found");
+
+				Assert.AreEqual(2, logger.TargetStarted, "TargetStarted count");
+				Assert.AreEqual(2, logger.TargetFinished, "TargetFinished count");
+
+				Assert.IsTrue (result);
+			} finally {
+				File.Delete (filepath);
+			}
+		}
+
 		[Test]
 		public void TestTargetOutputs1 ()
 		{

mcs/class/Mono.Debugger.Soft/Test/dtest-app.cs

@@ -1322,6 +1322,8 @@ public class Tests : TestsBase, ITest2
 
 		o.invoke_2 ();
 
+		o.assembly_load ();
+
 		AppDomain.Unload (domain);
 
 		domains_3 ();
@@ -1353,6 +1355,11 @@ public class Tests : TestsBase, ITest2
 	public static void invoke_in_domain_2 () {
 	}
 
+	[MethodImplAttribute (MethodImplOptions.NoInlining)]
+	public static void assembly_load_in_domain () {
+		Assembly.Load ("System.Transactions");
+	}
+
 	[MethodImplAttribute (MethodImplOptions.NoInlining)]
 	public static void dynamic_methods () {
 		var m = new DynamicMethod ("dyn_method", typeof (void), new Type []  { typeof (int) }, typeof (object).Module);
@@ -1633,6 +1640,10 @@ public class CrossDomain : MarshalByRefObject
 	public int invoke_3 () {
 		return 42;
 	}
+
+	public void assembly_load () {
+		Tests.assembly_load_in_domain ();
+	}
 }	
 
 public class Foo

mcs/class/Mono.Debugger.Soft/Test/dtest.cs.REMOVED.git-id

@@ -1 +1 @@
-8f929048d1b17809b27dc30940c81b379f1ec129
+10f28bcfc8faf083f7bacd0efadc598a4bbba506

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

@@ -229,6 +229,8 @@ ReferenceSources/Strings.cs
 
 ../referencesource/System.Core/System/threading/Tasks/TaskExtensions.cs
 
+System.Runtime.InteropServices/ComAwareEventInfo.cs
+
 System.Security.Cryptography/ECCurve.cs
 System.Security.Cryptography/ECPoint.cs
 System.Security.Cryptography/ECParameters.cs

mcs/class/System/Mono.Btls/MonoBtlsContext.cs

@@ -273,11 +273,13 @@ namespace Mono.Btls
 
 			var cipher = (CipherSuiteCode)ssl.GetCipher ();
 			var protocol = (TlsProtocolCode)ssl.GetVersion ();
+			var serverName = ssl.GetServerName ();
 			Debug ("GET CONNECTION INFO: {0:x}:{0} {1:x}:{1} {2}", cipher, protocol, (TlsProtocolCode)protocol);
 
 			connectionInfo = new MonoTlsConnectionInfo {
 				CipherSuiteCode = cipher,
-				ProtocolVersion = GetProtocol (protocol)
+				ProtocolVersion = GetProtocol (protocol),
+				PeerDomainName = serverName
 			};
 		}
 
@@ -361,7 +363,23 @@ namespace Mono.Btls
 		public override void Close ()
 		{
 			Debug ("Close!");
-			ssl.Dispose ();
+
+			if (ssl != null) {
+				ssl.Dispose ();
+				ssl = null;
+			}
+			if (ctx != null) {
+				ctx.Dispose ();
+				ctx = null;
+			}
+			if (bio != null) {
+				bio.Dispose ();
+				bio = null;
+			}
+			if (errbio != null) {
+				errbio.Dispose ();
+				errbio = null;
+			}
 		}
 
 		void Dispose<T> (ref T disposable)

mcs/class/System/Mono.Btls/MonoBtlsSsl.cs

@@ -124,6 +124,9 @@ namespace Mono.Btls
 		[DllImport (BTLS_DYLIB)]
 		extern static int mono_btls_ssl_set_server_name (IntPtr handle, IntPtr name);
 
+		[DllImport (BTLS_DYLIB)]
+		extern static IntPtr mono_btls_ssl_get_server_name (IntPtr handle);
+
 		static BoringSslHandle Create_internal (MonoBtlsSslCtx ctx)
 		{
 			var handle = mono_btls_ssl_new (ctx.Handle.DangerousGetHandle ());
@@ -409,6 +412,16 @@ namespace Mono.Btls
 			}
 		}
 
+		public string GetServerName ()
+		{
+			CheckThrow ();
+			var namePtr = mono_btls_ssl_get_server_name (
+				Handle.DangerousGetHandle ());
+			if (namePtr == IntPtr.Zero)
+				return null;
+			return Marshal.PtrToStringAnsi (namePtr);
+		}
+
 		protected override void Close ()
 		{
 			mono_btls_ssl_close (Handle.DangerousGetHandle ());

mcs/class/corlib/System.Security.Cryptography/IncrementalHash.cs

@@ -32,7 +32,7 @@ namespace System.Security.Cryptography
 {
     public sealed class IncrementalHash : IDisposable
     {
-        public IncrementalHash () { }
+        private IncrementalHash () { }
         public HashAlgorithmName AlgorithmName { get { throw new NotImplementedException (); } }
         public void AppendData (byte[] data) { }
         public void AppendData (byte[] data, int offset, int count) { }

mcs/class/corlib/corlib.dll.sources

@@ -426,7 +426,6 @@ System.Runtime.InteropServices/UCOMITypeLib.cs
 System.Runtime.InteropServices/VARDESC.cs
 System.Runtime.InteropServices/VARFLAGS.cs
 System.Runtime.InteropServices/CustomQueryInterfaceMode.cs
-System.Runtime.InteropServices/ComAwareEventInfo.cs
 System.Runtime.InteropServices/ComEventsHelper.cs
 
 System.Runtime.InteropServices.WindowsRuntime/DefaultInterfaceAttribute.cs

mcs/class/lib/monolite/System.Core.dll.REMOVED.git-id

@@ -1 +1 @@
-b5880ee73621284b7237031d8d27fb8a5747a797
+14b978577f098a3656996d0d47ba8f4f5ad2282b

mcs/class/lib/monolite/System.dll.REMOVED.git-id

@@ -1 +1 @@
-8fb76ec050d22e5bb67a5dab3635c1998608ec6a
+230b2c651b79678ba74491306ffda95a019edf9b

mcs/class/lib/monolite/basic.exe.REMOVED.git-id

@@ -1 +1 @@
-e2b3d103722a7d6c1da86715c5858c14afefa8af
+9cb84f032c0698d23a029b0f4719f509ddf8080f

mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id

@@ -1 +1 @@
-1035eebc45f582696603f7c18625e71de46627a7
+ac6dbc56417da4b2adacbcc7012d2ddad9b7fe18