Merge branch 'upstream'

Former-commit-id: 20d8d74b3b650171c1566610975e55a9807ed140

configure.REMOVED.git-id

@@ -1 +1 @@
-fd1935995451b6560c501b634243b7eee9978e57
+b660165686587e2ee7af7e3d4b43a4a3496583f6

configure.ac.REMOVED.git-id

@@ -1 +1 @@
-300e23db952f85ab3629e5ed0f438823d4a971fe
+36a5430724c0f07d6ed37fa4ac13547c963e203f

external/bdwgc/config.log

@@ -10,7 +10,7 @@ generated by GNU Autoconf 2.69.  Invocation command line was
 ## Platform. ##
 ## --------- ##
 
-hostname = az-ubuntu-general9ac500
+hostname = az-ubuntu-general94abc2
 uname -m = x86_64
 uname -r = 4.15.0-1096-azure
 uname -s = Linux
@@ -747,7 +747,7 @@ generated by GNU Autoconf 2.69.  Invocation command line was
   CONFIG_COMMANDS = 
   $ ./config.status 
 
-on az-ubuntu-general9ac500
+on az-ubuntu-general94abc2
 
 config.status:1238: creating Makefile
 config.status:1238: creating bdw-gc.pc

external/bdwgc/libtool.REMOVED.git-id

@@ -1 +1 @@
-fa804413d2d740d2c90a7f59cd0e5001a766c1e9
+d398774407bab88513b611f43f149ba63777c2f1

external/corert/src/System.Private.CoreLib/shared/System/Collections/Generic/ArraySortHelper.cs

@@ -14,6 +14,7 @@
 ===========================================================*/
 
 using System.Diagnostics;
+using System.Threading;
 using System.Runtime.CompilerServices;
 
 namespace System.Collections.Generic
@@ -68,6 +69,10 @@ namespace System.Collections.Generic
             {
                 IntrospectiveSortUtilities.ThrowOrIgnoreBadComparer(comparer);
             }
+            catch (ThreadAbortException)
+            {
+                    throw;
+            }
             catch (Exception e)
             {
                 throw new InvalidOperationException(SR.InvalidOperation_IComparerFailed, e);
@@ -85,6 +90,10 @@ namespace System.Collections.Generic
 
                 return InternalBinarySearch(array, index, length, value, comparer);
             }
+            catch (ThreadAbortException)
+            {
+                    throw;
+            }
             catch (Exception e)
             {
                 throw new InvalidOperationException(SR.InvalidOperation_IComparerFailed, e);
@@ -108,6 +117,10 @@ namespace System.Collections.Generic
             {
                 IntrospectiveSortUtilities.ThrowOrIgnoreBadComparer(comparer);
             }
+            catch (ThreadAbortException)
+            {
+                    throw;
+            }
             catch (Exception e)
             {
                 throw new InvalidOperationException(SR.InvalidOperation_IComparerFailed, e);
@@ -355,6 +368,10 @@ namespace System.Collections.Generic
             {
                 IntrospectiveSortUtilities.ThrowOrIgnoreBadComparer(comparer);
             }
+            catch (ThreadAbortException)
+            {
+                    throw;
+            }
             catch (Exception e)
             {
                 throw new InvalidOperationException(SR.InvalidOperation_IComparerFailed, e);
@@ -377,6 +394,10 @@ namespace System.Collections.Generic
                     return ArraySortHelper<T>.InternalBinarySearch(array, index, length, value, comparer);
                 }
             }
+            catch (ThreadAbortException)
+            {
+                    throw;
+            }
             catch (Exception e)
             {
                 throw new InvalidOperationException(SR.InvalidOperation_IComparerFailed, e);
@@ -645,6 +666,10 @@ namespace System.Collections.Generic
             {
                 IntrospectiveSortUtilities.ThrowOrIgnoreBadComparer(comparer);
             }
+            catch (ThreadAbortException)
+            {
+                    throw;
+            }
             catch (Exception e)
             {
                 throw new InvalidOperationException(SR.InvalidOperation_IComparerFailed, e);
@@ -893,6 +918,10 @@ namespace System.Collections.Generic
             {
                 IntrospectiveSortUtilities.ThrowOrIgnoreBadComparer(comparer);
             }
+            catch (ThreadAbortException)
+            {
+                    throw;
+            }
             catch (Exception e)
             {
                 throw new InvalidOperationException(SR.InvalidOperation_IComparerFailed, e);

mcs/build/common/Consts.cs

@@ -41,7 +41,7 @@ static partial class Consts
 	// Use these assembly version constants to make code more maintainable.
 	//
 
-	public const string MonoVersion = "6.12.0.101";
+	public const string MonoVersion = "6.12.0.102";
 	public const string MonoCompany = "Mono development team";
 	public const string MonoProduct = "Mono Common Language Infrastructure";
 	public const string MonoCopyright = "(c) Various Mono authors";

mcs/class/corlib/Test/System/ArrayTest.cs

@@ -12,6 +12,7 @@ using System;
 using System.Collections;
 using System.Globalization;
 using System.Reflection;
+using System.Threading;
 using System.Collections.Generic;
 
 namespace MonoTests.System
@@ -3745,5 +3746,66 @@ public class ArrayTest
 		Assert.Throws<NotSupportedException> (() => { var _ = x.GetValue (0); }, "#2");
 		Assert.Throws<NotSupportedException> (() => { x.SetValue (0, 0); }, "#3");
 	}
+
+
+#if MONO_FEATURE_THREAD_ABORT
+	public struct J
+	{
+		public int i;
+
+		public J(int i_) { i = i_; }
+	}
+
+	struct JComp : IComparer<J>
+	{
+		public int Compare(J x, J y)
+		{
+			int val = 0;
+			Thread.Sleep (Timeout.Infinite);
+			return val;
+		}
+	}
+
+	class ArraySortAbortData {
+		internal ManualResetEventSlim mre;
+		internal bool threw;
+
+		internal ArraySortAbortData () {
+			mre = new ManualResetEventSlim ();
+			threw = false;
+		}
+	}
+
+	[Test]
+	public void ArraySortAbort ()
+	{
+		var d = new ArraySortAbortData();
+		var t = new Thread(RunArraySort);
+		t.Start(d);
+		d.mre.Wait();
+		Thread.Sleep(400);
+		t.Abort();
+		t.Join();
+		Assert.IsFalse (d.threw);
+	}
+
+	public static void RunArraySort(object data)
+	{
+		var d = data as ArraySortAbortData;
+		int n = 10;
+		var a = new J[n];
+		for (int i = 0; i < n; ++i)
+		{
+			a[i] = new J(n - i);
+		}
+		d.mre.Set();
+		try {
+			Array.Sort(a, 0, n, new JComp());
+		} catch (InvalidOperationException) {
+			// t.Abort in ArraySortAbort should _not_ end up here
+			d.threw = true;
+		}
+	}
+#endif
 }
 }

mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/Mono.Security.dll.REMOVED.git-id

@@ -1 +1 @@
-3f80a942606c0cbf8b39d8d26edef2a7401db948
+fe7019b61fa72d8b8ed5e5c76309f21cc3bd4333

mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Configuration.dll.REMOVED.git-id

@@ -1 +1 @@
-7d288343a4b69d466d02a2f8a00c3308969190b7
+3f12ff73aef60805d3834dbf746883a786891208

mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Core.dll.REMOVED.git-id

@@ -1 +1 @@
-ce5e42fabb108841a9e875d56557d4b723439af2
+8efc742e1f9e1097f77d685613d879e9ad1169b1

mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.IO.Compression.dll.REMOVED.git-id

@@ -1 +1 @@
-1ed53529ca622bef68256f4f62ab76f522cc1995
+9264413601f7c9f0c566cbd3b44f12a5a1c2a5ef

mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Numerics.dll.REMOVED.git-id

@@ -1 +1 @@
-c609f925fc19565f6abb4e8c25ae203f49aaba9e
+a9c16ec464b53bccf80b13d4d0a0ebcbfa07792c

mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Xml.dll.REMOVED.git-id

@@ -1 +1 @@
-1f4d7832b20f9a1bd242d76a01f447dc0f231935
+0f81c95ff9a039e1b9d4e8dfd337a9e9d412acca

mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mcs.exe.REMOVED.git-id

@@ -1 +1 @@
-f83e72da976e0df970d17518a05c9e325d67dc1e
+c57e33c350493fe88cdec6d496902da293c24fe1

mcs/class/lib/monolite-linux/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/mscorlib.dll.REMOVED.git-id

@@ -1 +1 @@
-fa62d17411a409cff47710f05176976516a61cf4
+fb4738551375e666826f84055cebc58e93644614

mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/Mono.Security.dll.REMOVED.git-id

@@ -1 +1 @@
-3f80a942606c0cbf8b39d8d26edef2a7401db948
+fe7019b61fa72d8b8ed5e5c76309f21cc3bd4333

mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Configuration.dll.REMOVED.git-id

@@ -1 +1 @@
-7d288343a4b69d466d02a2f8a00c3308969190b7
+3f12ff73aef60805d3834dbf746883a786891208

mcs/class/lib/monolite-macos/1A5E0066-58DC-428A-B21C-0AD6CDAE2789/System.Core.dll.REMOVED.git-id

@@ -1 +1 @@
-ce5e42fabb108841a9e875d56557d4b723439af2
+8efc742e1f9e1097f77d685613d879e9ad1169b1