Merge branch 'upstream'

Former-commit-id: 2caddb978c71300760998ebb3c56f7a02970ae40

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/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}");
-			}
 
 			var newline = String.Format ("{0}{1}{2} ", Environment.NewLine, indentation,
 					Locale.GetText ("at"));
@@ -201,14 +194,11 @@ 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)
@@ -216,7 +206,6 @@ namespace System.Diagnostics {
 					} else {
 						sb.AppendFormat (" [0x{0:x5}]", frame.GetILOffset ());
 					}
-					}
 
 					sb.AppendFormat (debugInfo, frame.GetSecureFileName (),
 					                 frame.GetFileLineNumber ());
@@ -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

mono/mini/Makefile.am

@@ -749,7 +749,7 @@ EXTRA_DIST = TestDriver.cs \
 	Makefile.am.in
 
 version.h: Makefile
-	echo "#define FULL_VERSION \"Stable 4.2.1.91/8862921\"" > version.h
+	echo "#define FULL_VERSION \"Stable 4.2.1.102/6dd2d0d\"" > version.h
 
 # Utility target for patching libtool to speed up linking
 patch-libtool:

mono/mini/Makefile.am.in

@@ -749,7 +749,7 @@ EXTRA_DIST = TestDriver.cs \
 	Makefile.am.in
 
 version.h: Makefile
-	echo "#define FULL_VERSION \"Stable 4.2.1.91/8862921\"" > version.h
+	echo "#define FULL_VERSION \"Stable 4.2.1.102/6dd2d0d\"" > version.h
 
 # Utility target for patching libtool to speed up linking
 patch-libtool:

mono/mini/Makefile.in.REMOVED.git-id

@@ -1 +1 @@
-cc5a13de3ef26e6c31e86204057f98f071d1db3b
+93d782893e1caf2f8a1ed7b26a892c99955b11e1

mono/mini/version.h

@@ -1 +1 @@
-#define FULL_VERSION "Stable 4.2.1.91/8862921"
+#define FULL_VERSION "Stable 4.2.1.102/6dd2d0d"

mono/profiler/proflog.c.REMOVED.git-id

@@ -1 +1 @@
-dfcf6b34bb42b054c3aad0c16e51798401f02028
+f72a4476c3a46011d9e92c33d1ed3a6034ee3647

po/mcs/de.po.REMOVED.git-id

@@ -1 +1 @@
-5e0bd609c38f27a1470489ce576b6e907fdb6889
+e7b21acf1b731dab907fa74c866f3a9a00dff138

po/mcs/es.po.REMOVED.git-id

@@ -1 +1 @@
-31df00aa8d2e7d75a24bd99be34a9ea50ac8bd27
+ef9b981f4526138490b1d7175ccad48955f0ed45

po/mcs/ja.po.REMOVED.git-id

@@ -1 +1 @@
-c07f515acf23bce96687e1d3109cabfba01e06f5
+4e574e85c25d7f241b0ce797209cb93228f37b71

po/mcs/mcs.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mono 4.2.1\n"
 "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
-"POT-Creation-Date: 2015-10-30 12:23-0400\n"
+"POT-Creation-Date: 2015-11-12 04:10-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"