Imported Upstream version 4.8.0.344

Former-commit-id: 609085c14e6ad2a66429d180056034e93c0547d2

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

@@ -226,6 +226,14 @@ namespace Microsoft.Build.BuildEngine {
 		public void SetMetadata (string metadataName,
 					 string metadataValue,
 					 bool treatMetadataValueAsLiteral)
+		{
+			SetMetadata (metadataName, metadataValue, treatMetadataValueAsLiteral, false);
+		}
+
+		void SetMetadata (string metadataName,
+					 string metadataValue,
+					 bool treatMetadataValueAsLiteral,
+					 bool fromDynamicItem)
 		{
 			if (metadataName == null)
 				throw new ArgumentNullException ("metadataName");
@@ -251,9 +259,11 @@ namespace Microsoft.Build.BuildEngine {
 			} else if (HasParentItem) {
 				if (parent_item.child_items.Count > 1)
 					SplitParentItem ();
-				parent_item.SetMetadata (metadataName, metadataValue, treatMetadataValueAsLiteral);
+				parent_item.SetMetadata (metadataName, metadataValue, treatMetadataValueAsLiteral, fromDynamicItem);
 			}
-			if (FromXml || HasParentItem) {
+
+			// We don't want to reevalute the project for dynamic items
+			if (!fromDynamicItem && !IsDynamic && (FromXml || HasParentItem)) {
 				parent_item_group.ParentProject.MarkProjectAsDirty ();
 				parent_item_group.ParentProject.NeedToReevaluate ();
 			}
@@ -374,7 +384,7 @@ namespace Microsoft.Build.BuildEngine {
 					continue;
 				
 				foreach (string name in evaluatedMetadata.Keys) {
-					item.SetMetadata (name, (string)evaluatedMetadata [name]);
+					item.SetMetadata (name, (string)evaluatedMetadata [name], false, IsDynamic);
 				}
 
 				AddAndRemoveMetadata (project, item);

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

@@ -697,6 +697,33 @@ namespace MonoTests.Microsoft.Build.BuildEngine {
 				</Project>", "D");
 		}
 
+		[Test]
+		public void ItemGroupInsideTarget_UpdateMetadata ()
+		{
+			ItemGroupInsideTarget (
+				@"<Project ToolsVersion=""4.0"" xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
+					<ItemGroup>
+						<ProjectReference Include='xyz'/>
+					</ItemGroup>
+
+					<Target Name='Main' DependsOnTargets='CreateBar'>
+						<Message Text='Before: $(Bar)'/>
+						<ItemGroup>
+							<ProjectReference>
+								<AdditionalProperties>A=b</AdditionalProperties>
+							</ProjectReference>
+						</ItemGroup>
+						<Message Text='After: $(Bar)'/>
+					</Target>
+
+					<Target Name='CreateBar'>
+						<PropertyGroup>
+							<Bar>Bar01</Bar>
+						</PropertyGroup>
+					</Target>
+				</Project>", 2, "Before: Bar01", "After: Bar01");
+		}
+
 		[Test]
 		public void ItemGroupInsideTarget_Batching ()
 		{

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

@@ -430,6 +430,7 @@ public class Tests : TestsBase, ITest2
 		ss_recursive2 (1);
 		ss_recursive_chaotic ();
 		ss_fp_clobber ();
+		ss_no_frames ();
 	}
 
 	[MethodImplAttribute (MethodImplOptions.NoInlining)]
@@ -679,6 +680,25 @@ public class Tests : TestsBase, ITest2
 	public static void ss_fp_clobber_2 (double d) {
 	}
 
+	[MethodImplAttribute (MethodImplOptions.NoInlining)]
+	public static void ss_no_frames () {
+		Action a = ss_no_frames_2;
+		var ar = a.BeginInvoke (null, null);
+		ar.AsyncWaitHandle.WaitOne ();
+		// Avoid waiting every time this runs
+		if (static_i == 56)
+			Thread.Sleep (200);
+		ss_no_frames_3 ();
+	}
+
+	[MethodImplAttribute (MethodImplOptions.NoInlining)]
+	public static void ss_no_frames_2 () {
+	}
+
+	[MethodImplAttribute (MethodImplOptions.NoInlining)]
+	public static void ss_no_frames_3 () {
+	}
+
 	[MethodImplAttribute (MethodImplOptions.NoInlining)]
 	public static bool is_even (int i) {
 		return i % 2 == 0;

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

@@ -1 +1 @@
-1933fc5e827372129731655297986401622ff064
+8f929048d1b17809b27dc30940c81b379f1ec129

mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageFault.cs

@@ -53,7 +53,7 @@ namespace System.ServiceModel.Channels
 		{
 			FaultCode fc = null;
 			FaultReason fr = null;
-			object details = null;
+			string actor = null;
 			XmlDictionaryReader r = message.GetReaderAtBodyContents ();
 			r.ReadStartElement ("Fault", message.Version.Envelope.Namespace);
 			r.MoveToContent ();
@@ -66,11 +66,13 @@ namespace System.ServiceModel.Channels
 				case "faultstring":
 					fr = new FaultReason (r.ReadElementContentAsString());
 					break;
-				case "detail":
-					return new XmlReaderDetailMessageFault (message, r, fc, fr, null, null);
 				case "faultactor":
+					actor = r.ReadElementContentAsString();
+					break;
+				case "detail":
+					return new XmlReaderDetailMessageFault (message, r, fc, fr, actor, null);
 				default:
-					throw new NotImplementedException ();
+					throw new XmlException (String.Format ("Unexpected node {0} name {1}", r.NodeType, r.Name));
 				}
 				r.MoveToContent ();
 			}
@@ -79,9 +81,7 @@ namespace System.ServiceModel.Channels
 			if (fr == null)
 				throw new XmlException ("Reason is missing in the Fault message");
 
-			if (details == null)
+			return new SimpleMessageFault (fc, fr, false, null, null, actor, null);
-				return CreateFault (fc, fr);
-			return CreateFault (fc, fr, details);
 		}
 
 		static MessageFault CreateFault12 (Message message, int maxBufferSize)

mcs/class/System.ServiceModel/Test/System.ServiceModel.Channels/MessageFaultTest.cs

@@ -71,6 +71,7 @@ namespace MonoTests.System.ServiceModel.Channels
     <s:Fault>
       <faultcode>a:ActionNotSupported</faultcode>
       <faultstring xml:lang='en-US'>some error</faultstring>
+      <faultactor>Random</faultactor>
     </s:Fault>
   </s:Body>
 </s:Envelope>";

mcs/class/System.XML/System.Xml.Serialization/TypeData.cs

@@ -135,10 +135,16 @@ namespace System.Xml.Serialization
 
 		void LookupTypeConvertor ()
 		{
-			// We only need this for System.Xml.Linq.
+			// We only need this for System.Xml.Linq
-			var convertor = type.GetCustomAttribute<XmlTypeConvertorAttribute> ();
+			var t = type;
-			if (convertor != null)
+			// HACK: because interpreter array handling is so bad
-				typeConvertor = type.GetMethod (convertor.Method, BindingFlags.Static | BindingFlags.NonPublic);
+			if (t.IsArray)
+				t = t.GetElementType ();
+
+			var convertor = t.GetCustomAttribute<XmlTypeConvertorAttribute> ();
+			if (convertor != null) {
+				typeConvertor = t.GetMethod (convertor.Method, BindingFlags.Static | BindingFlags.NonPublic);
+			}
 		}
 
 		internal void ConvertForAssignment (ref object value)

mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReaderInterpreter.cs

@@ -738,6 +738,7 @@ namespace System.Xml.Serialization
 			if (type.IsArray)
 			{
 				list = EnsureArrayIndex ((Array)list, index, type.GetElementType ());
+				listType.ConvertForAssignment (ref value);
 				((Array)list).SetValue (value, index);
 			}
 			else	// Must be IEnumerable

mcs/class/System.Xml.Linq/Test/System.Xml.Linq/XElementTest.cs.REMOVED.git-id

@@ -1 +1 @@
-5415ff8e50a4beb760cc5825406fd6e49e7a3989
+f93bbabc3d88e21bca92fc48e741c150f261a945

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

@@ -135,7 +135,7 @@ namespace Mono.Btls
 			if (IsServer) {
 				SetPrivateCertificate (nativeServerCertificate);
 			} else {
-				ssl.SetServerName (TargetHost);
+				ssl.SetServerName (ServerName);
 			}
 		}
 
@@ -236,14 +236,7 @@ namespace Mono.Btls
 			if (!IsServer)
 				ctx.SetSelectCallback (SelectCallback);
 
-			var host = TargetHost;
+			ctx.SetVerifyParam (MonoBtlsProvider.GetVerifyParam (ServerName, IsServer));
-			if (!string.IsNullOrEmpty (host)) {
-				var pos = TargetHost.IndexOf (':');
-				if (pos > 0)
-					host = host.Substring (0, pos);
-			}
-
-			ctx.SetVerifyParam (MonoBtlsProvider.GetVerifyParam (host, IsServer));
 
 			TlsProtocolCode minProtocol, maxProtocol;
 			GetProtocolVersions (out minProtocol, out maxProtocol);

mcs/class/System/Mono.Net.Security/MobileTlsContext.cs

@@ -35,6 +35,7 @@ namespace Mono.Net.Security
 		MobileAuthenticatedStream parent;
 		bool serverMode;
 		string targetHost;
+		string serverName;
 		SslProtocols enabledProtocols;
 		X509Certificate serverCertificate;
 		X509CertificateCollection clientCertificates;
@@ -54,6 +55,13 @@ namespace Mono.Net.Security
 			this.clientCertificates = clientCertificates;
 			this.askForClientCert = askForClientCert;
 
+			serverName = targetHost;
+			if (!string.IsNullOrEmpty (serverName)) {
+				var pos = serverName.IndexOf (':');
+				if (pos > 0)
+					serverName = serverName.Substring (0, pos);
+			}
+
 			certificateValidator = CertificateValidationHelper.GetInternalValidator (
 				parent.Settings, parent.Provider);
 		}
@@ -92,6 +100,10 @@ namespace Mono.Net.Security
 			get { return targetHost; }
 		}
 
+		protected string ServerName {
+			get { return serverName; }
+		}
+
 		protected bool AskForClientCertificate {
 			get { return askForClientCert; }
 		}

mcs/class/System/System.Net.Sockets/TcpListener.platformnotsupported.cs

@@ -78,6 +78,16 @@ namespace System.Net.Sockets
 			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
 		}
 
+		public void AllowNatTraversal (bool allowed)
+		{
+			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
+		}
+
+		public static TcpListener Create (int port)
+		{
+			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
+		}
+
 		~TcpListener ()
 		{
 		}

mcs/class/System/System.Net.Sockets/UdpClient.platformnotsupported.cs

@@ -204,6 +204,11 @@ namespace System.Net.Sockets
 			set { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); }
 		}
 
+		public void AllowNatTraversal (bool allowed)
+		{
+			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
+		}
+
 		public void Dispose ()
 		{
 			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);

mcs/class/System/System.Net/HttpListener.platformnotsupported.cs

@@ -26,6 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+using System.Security.Authentication.ExtendedProtection;
 using System.Threading.Tasks;
 
 namespace System.Net {
@@ -33,6 +34,8 @@ namespace System.Net {
 	{
 		internal const string EXCEPTION_MESSAGE = "System.Net.HttpListener is not supported on the current platform.";
 
+		public delegate ExtendedProtectionPolicy ExtendedProtectionSelector (HttpListenerRequest request);
+
 		public HttpListener ()
 		{
 			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
@@ -75,6 +78,27 @@ namespace System.Net {
 			set { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); }
 		}
 
+		public HttpListenerTimeoutManager TimeoutManager {
+			get { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); }
+		}
+
+		public ExtendedProtectionPolicy ExtendedProtectionPolicy
+		{
+			get { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); }
+			set { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); }
+		}
+
+		public ExtendedProtectionSelector ExtendedProtectionSelectorDelegate
+		{
+			get { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); }
+			set { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); }
+		}
+
+		public ServiceNameCollection DefaultServiceNames
+		{
+			get { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); }
+		}
+
 		public void Abort ()
 		{
 			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);

mcs/class/System/System.Net/HttpListenerContext.platformnotsupported.cs

@@ -55,6 +55,11 @@ namespace System.Net {
 			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
 		}
 
+		public Task<HttpListenerWebSocketContext> AcceptWebSocketAsync (string subProtocol, TimeSpan keepAliveInterval)
+		{
+			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
+		}
+
 		public Task<HttpListenerWebSocketContext> AcceptWebSocketAsync (string subProtocol, int receiveBufferSize, TimeSpan keepAliveInterval)
 		{
 			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);

mcs/class/System/System.Net/HttpWebRequest.platformnotsupported.cs

@@ -67,12 +67,12 @@ namespace System.Net
 			get { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); }
 		}
 
-		public bool AllowAutoRedirect {
+		public virtual bool AllowAutoRedirect {
 			get { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); }
 			set { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); }
 		}
 
-		public bool AllowWriteStreamBuffering {
+		public virtual bool AllowWriteStreamBuffering {
 			get { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); }
 			set { throw new PlatformNotSupportedException (EXCEPTION_MESSAGE); }
 		}
@@ -360,6 +360,11 @@ namespace System.Net
 			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
 		}
 
+		public System.IO.Stream GetRequestStream (out TransportContext context)
+		{
+			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
+		}
+
 		public override IAsyncResult BeginGetResponse (AsyncCallback callback, object state)
 		{
 			throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);

mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs

@@ -74,6 +74,13 @@ namespace System.Runtime.InteropServices
 			return false;
 		}
 
+		[MonoTODO]
+		public static void CleanupUnusedObjectsInCurrentContext ()
+		{
+			if (Environment.IsRunningOnWindows)
+				throw new PlatformNotSupportedException ();
+		}
+
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
 		public extern static IntPtr AllocCoTaskMem (int cb);
 
@@ -769,15 +776,8 @@ namespace System.Runtime.InteropServices
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
 		public extern static string PtrToStringUni (IntPtr ptr, int len);
 
-#if !MOBILE
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
 		public extern static string PtrToStringBSTR (IntPtr ptr);
-#else
-		public static string PtrToStringBSTR (IntPtr ptr)
-		{
-			throw new NotImplementedException ();
-		}
-#endif
 		
 		[MethodImplAttribute(MethodImplOptions.InternalCall)]
 		[ComVisible (true)]

mcs/class/corlib/Test/System/TypeTest.cs.REMOVED.git-id

@@ -1 +1 @@
-d9eea5672d519baa2abbb431cd364b9620888b26
+e275634bc2c909abbe355a3fe2f75b1a08b25558

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

@@ -1 +1 @@
-4300ee601c5a3c592bf6808619b626189da4347f
+8fb76ec050d22e5bb67a5dab3635c1998608ec6a

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

@@ -1 +1 @@
-4a5d937cf3124b7461317b6d951a881da4f0a453
+1035eebc45f582696603f7c18625e71de46627a7