Imported Upstream version 6.12.0.102

Former-commit-id: e614926ae5b86d74c564629f26c1f12b72a78823
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2020-10-10 08:55:28 +00:00
parent d7ffa4a239
commit 0e6f307daf
53 changed files with 828 additions and 737 deletions

View File

@ -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";

View File

@ -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
}
}

View File

@ -1 +1 @@
3f80a942606c0cbf8b39d8d26edef2a7401db948
fe7019b61fa72d8b8ed5e5c76309f21cc3bd4333

View File

@ -1 +1 @@
7d288343a4b69d466d02a2f8a00c3308969190b7
3f12ff73aef60805d3834dbf746883a786891208

View File

@ -1 +1 @@
ce5e42fabb108841a9e875d56557d4b723439af2
8efc742e1f9e1097f77d685613d879e9ad1169b1

View File

@ -1 +1 @@
1ed53529ca622bef68256f4f62ab76f522cc1995
9264413601f7c9f0c566cbd3b44f12a5a1c2a5ef

View File

@ -1 +1 @@
c609f925fc19565f6abb4e8c25ae203f49aaba9e
a9c16ec464b53bccf80b13d4d0a0ebcbfa07792c

View File

@ -1 +1 @@
1f4d7832b20f9a1bd242d76a01f447dc0f231935
0f81c95ff9a039e1b9d4e8dfd337a9e9d412acca

View File

@ -1 +1 @@
f83e72da976e0df970d17518a05c9e325d67dc1e
c57e33c350493fe88cdec6d496902da293c24fe1

View File

@ -1 +1 @@
fa62d17411a409cff47710f05176976516a61cf4
fb4738551375e666826f84055cebc58e93644614

View File

@ -1 +1 @@
3f80a942606c0cbf8b39d8d26edef2a7401db948
fe7019b61fa72d8b8ed5e5c76309f21cc3bd4333

View File

@ -1 +1 @@
7d288343a4b69d466d02a2f8a00c3308969190b7
3f12ff73aef60805d3834dbf746883a786891208

View File

@ -1 +1 @@
ce5e42fabb108841a9e875d56557d4b723439af2
8efc742e1f9e1097f77d685613d879e9ad1169b1

View File

@ -1 +1 @@
1ed53529ca622bef68256f4f62ab76f522cc1995
9264413601f7c9f0c566cbd3b44f12a5a1c2a5ef

View File

@ -1 +1 @@
c609f925fc19565f6abb4e8c25ae203f49aaba9e
a9c16ec464b53bccf80b13d4d0a0ebcbfa07792c

View File

@ -1 +1 @@
1f4d7832b20f9a1bd242d76a01f447dc0f231935
0f81c95ff9a039e1b9d4e8dfd337a9e9d412acca

View File

@ -1 +1 @@
f83e72da976e0df970d17518a05c9e325d67dc1e
c57e33c350493fe88cdec6d496902da293c24fe1

View File

@ -1 +1 @@
fa62d17411a409cff47710f05176976516a61cf4
fb4738551375e666826f84055cebc58e93644614

View File

@ -1 +1 @@
3f80a942606c0cbf8b39d8d26edef2a7401db948
fe7019b61fa72d8b8ed5e5c76309f21cc3bd4333

View File

@ -1 +1 @@
7d288343a4b69d466d02a2f8a00c3308969190b7
3f12ff73aef60805d3834dbf746883a786891208

Some files were not shown because too many files have changed in this diff Show More