Imported Upstream version 4.2.1.102

Former-commit-id: 2d1ae6ac7b9e9737da1189c7f5f700500550c9ea

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

@@ -93,7 +93,7 @@ namespace Microsoft.Build.BuildEngine {
 		{
 			this.binPath = binPath;
 			this.buildEnabled = true;
-			this.projects = new Dictionary <string, Project> (StringComparer.OrdinalIgnoreCase);
+			this.projects = new Dictionary <string, Project> ();
 			this.eventSource = new EventSource ();
 			this.loggers = new List <ILogger> ();
 			this.buildStarted = false;

mcs/class/System.Core/Test/System.Linq.Expressions/ExpressionTest_Call.cs

@@ -247,7 +247,7 @@ namespace MonoTests.System.Linq.Expressions {
 		public void CallMethodOnDateTime ()
 		{
 			var left = Expression.Call (Expression.Constant (DateTime.Now), typeof(DateTime).GetMethod ("AddDays"), Expression.Constant (-5.0));
-			var right = Expression.Constant (DateTime.Today);
+			var right = Expression.Constant (DateTime.Today.AddDays (1));
 			var expr = Expression.GreaterThan (left, right);
 
 			var eq = Expression.Lambda<Func<bool>> (expr).Compile ();

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

@@ -1 +1 @@
-59e3f322dd87722098b2661868ee3cd268f44676
+f8c2f4cb750d69cbda8d81e1312338786dae656f

mcs/class/corlib/System.Diagnostics/StackTrace.cs

@@ -170,21 +170,14 @@ namespace System.Diagnostics {
 			return frames;
 		}
 
-		bool AddFrames (StringBuilder sb, bool isException = false)
+		bool AddFrames (StringBuilder sb)
 		{
 			bool printOffset;
 			string debugInfo, indentation;
 			string unknown = Locale.GetText ("<unknown method>");
 
-			if (isException) {
-				printOffset = true;
-				indentation = "  ";
-				debugInfo = Locale.GetText (" in {0}:{1} ");
-			} else {
-				printOffset = false;
-				indentation = "   ";
-				debugInfo = Locale.GetText (" in {0}:line {1}");
-			}
+			indentation = "  ";
+			debugInfo = Locale.GetText (" in {0}:{1} ");
 
 			var newline = String.Format ("{0}{1}{2} ", Environment.NewLine, indentation,
 					Locale.GetText ("at"));
@@ -201,21 +194,17 @@ namespace System.Diagnostics {
 					string internal_name = frame.GetInternalMethodName ();
 					if (internal_name != null)
 						sb.Append (internal_name);
-					else if (printOffset)
-						sb.AppendFormat ("<0x{0:x5} + 0x{1:x5}> {2}", frame.GetMethodAddress (), frame.GetNativeOffset (), unknown);
 					else
-						sb.AppendFormat (unknown);
+						sb.AppendFormat ("<0x{0:x5} + 0x{1:x5}> {2}", frame.GetMethodAddress (), frame.GetNativeOffset (), unknown);
 				} else {
 					GetFullNameForStackTrace (sb, frame.GetMethod ());
 
-					if (printOffset) {
-						if (frame.GetILOffset () == -1) {
-							sb.AppendFormat (" <0x{0:x5} + 0x{1:x5}>", frame.GetMethodAddress (), frame.GetNativeOffset ());
-							if (frame.GetMethodIndex () != 0xffffff)
-								sb.AppendFormat (" {0}", frame.GetMethodIndex ());
-						} else {
-							sb.AppendFormat (" [0x{0:x5}]", frame.GetILOffset ());
-						}
+					if (frame.GetILOffset () == -1) {
+						sb.AppendFormat (" <0x{0:x5} + 0x{1:x5}>", frame.GetMethodAddress (), frame.GetNativeOffset ());
+						if (frame.GetMethodIndex () != 0xffffff)
+							sb.AppendFormat (" {0}", frame.GetMethodIndex ());
+					} else {
+						sb.AppendFormat (" [0x{0:x5}]", frame.GetILOffset ());
 					}
 
 					sb.AppendFormat (debugInfo, frame.GetSecureFileName (),
@@ -293,7 +282,7 @@ namespace System.Diagnostics {
 			//
 			if (captured_traces != null) {
 				foreach (var t in captured_traces) {
-					if (!t.AddFrames (sb, true))
+					if (!t.AddFrames (sb))
 						continue;
 
 					sb.Append (Environment.NewLine);

mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id

@@ -1 +1 @@
-7709d423804e0b435e60e7ca74f198f20d02a535
+f8f8e8e5ba7264993dba7738414a0123ab743cfe

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

@@ -1 +1 @@
-dda3cb77811a304fcb8a8c77455268e06b7080b9
+2f48219b5156199cf909adf76dc0097708cfd932

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

@@ -1 +1 @@
-1dcbcac9b7a00d7ca093ca63316c407012521308
+4e690a5fc430b0f2617d1e6ef0c3f48c60c2acf2

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

@@ -1 +1 @@
-c49c24eeb8abb839f5be49574e83c8ad4caaa8e3
+3d129032906541b033f18089e67b70c7bfa0a13a

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

@@ -1 +1 @@
-d6ee7490dcb9342db71705f7f6b807f6a85a6cf0
+32e21a2c8d84ae3b6a90e4eafcfb933ce24d0350

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

@@ -1 +1 @@
-37a62e86a907ce0337c9690758f816e78370f82f
+ff1a5fc565b24ddfc0c76f0f19d1271343f59208