Imported Upstream version 5.10.0.105

Former-commit-id: 6e251d044a07c59c414f9b731c508b1c0b97caa7
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-02-13 19:02:56 +00:00
parent e8112b0628
commit 5e8fcc7e50
38 changed files with 95 additions and 64 deletions

View File

@ -1 +1 @@
d14366b531b59bf249a7d028ed19c2a11ab16eef
e85437818f00d2cd9616f6dcf51f3e793755c691

View File

@ -1 +1 @@
374b05f540bd7262e73749cf47856879fd8b1f59
f717d8e40d24ffb6ae41b33e6a891cb36e88c578

View File

@ -29,18 +29,9 @@ using System.Diagnostics;
using System.Threading;
using NUnit.Framework.Api;
using System.Collections.Generic;
using System.Runtime.Remoting.Messaging;
namespace NUnit.Framework.Internal
{
[Serializable]
class Container : ILogicalThreadAffinative {
public string testName;
public Container(string testName) {
this.testName = testName;
}
}
public class FinallyDelegate
{
// If our test spawns a thread that throws, we will bubble
@ -58,31 +49,19 @@ namespace NUnit.Framework.Internal
// so we need a stack of finally delegate continuations
Stack<Tuple<TestExecutionContext, long, TestResult>> testStack;
Dictionary<string, TestResult> lookupTable;
private static readonly string CONTEXT_KEY = "TestResultName";
public FinallyDelegate () {
this.testStack = new Stack<Tuple<TestExecutionContext, long, TestResult>>();
this.lookupTable = new Dictionary<string, TestResult>();
}
public void Set (TestExecutionContext context, long startTicks, TestResult result) {
var frame = new Tuple<TestExecutionContext, long, TestResult>(context, startTicks, result);
/* keep name in LogicalCallContext, because this will be inherited by
* Threads spawned by the test case */
CallContext.SetData(CONTEXT_KEY, new Container(result.Test.FullName));
this.lookupTable.Add(result.Test.FullName, result);
this.testStack.Push(frame);
}
public void HandleUnhandledExc (Exception ex) {
Container c = (Container) CallContext.GetData(CONTEXT_KEY);
TestResult result = this.lookupTable [c.testName];
result.RecordException(ex);
result.ThreadCrashFail = true;
TestExecutionContext context = this.testStack.Peek().Item1;
context.CurrentResult.RecordException(ex);
context.CurrentResult.ThreadCrashFail = true;
}
public void Complete () {

View File

@ -180,15 +180,6 @@ namespace NUnit.Framework.Internal.WorkItems
#endif
private void RunTest()
{
/* using a separate ExecutionContext for every test case,
* guarantees us to have a dedicated "namespace" for the
* LogicalCallContext per testcase */
ExecutionContext ec = ExecutionContext.Capture();
ExecutionContext.Run(ec, DispatchWork, null);
}
private void DispatchWork(object o)
{
_context.CurrentTest = this.Test;
_context.CurrentResult = this.Result;

View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.10.0.103";
public const string MonoVersion = "5.10.0.105";
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

@ -1 +1 @@
91510c0d48e8b8e4fd0244ba7b73ffb5b0008d59
fddd884e0a3f48fdac078ec0d528d6159dfe3856

View File

@ -1 +1 @@
254d9408bc8a59955b3acbd045dab6ff7b365c37
3d10120799d1ccf8914b1902a7c3fb41069946f5

View File

@ -1 +1 @@
29b49effce90b7f2fe0c79a6de7b247df79e829a
d599d559b4f824d76c3fcfcf98e6a7ee61fdcfb6

View File

@ -1 +1 @@
8eba7aa42674b1f25626dfbf370c22074eea751e
4c4fd3ffa294a529c35142173f121f7298a5c4a1

View File

@ -1 +1 @@
9f6e1f37b3af679ed3d2549d5d41977edc9134df
4fddd6a0abadcaa77515b4ed9f5f6f64ae70cfa4

View File

@ -1 +1 @@
33afdd892811cf9251820346c334158d1c465bca
040c8846dde8f31ee7cfa823ba1e2e45f34138a8

View File

@ -1 +1 @@
e54e0d5a9a12b874a7aee94f6b7e79fab0d46910
67be408a823afdbf1873d117d1ecc541ba05d81a

View File

@ -1 +1 @@
91510c0d48e8b8e4fd0244ba7b73ffb5b0008d59
fddd884e0a3f48fdac078ec0d528d6159dfe3856

View File

@ -1 +1 @@
254d9408bc8a59955b3acbd045dab6ff7b365c37
3d10120799d1ccf8914b1902a7c3fb41069946f5

View File

@ -1 +1 @@
29b49effce90b7f2fe0c79a6de7b247df79e829a
d599d559b4f824d76c3fcfcf98e6a7ee61fdcfb6

View File

@ -1 +1 @@
8eba7aa42674b1f25626dfbf370c22074eea751e
4c4fd3ffa294a529c35142173f121f7298a5c4a1

View File

@ -1 +1 @@
9f6e1f37b3af679ed3d2549d5d41977edc9134df
4fddd6a0abadcaa77515b4ed9f5f6f64ae70cfa4

View File

@ -1 +1 @@
33afdd892811cf9251820346c334158d1c465bca
040c8846dde8f31ee7cfa823ba1e2e45f34138a8

View File

@ -1 +1 @@
e54e0d5a9a12b874a7aee94f6b7e79fab0d46910
67be408a823afdbf1873d117d1ecc541ba05d81a

View File

@ -1 +1 @@
91510c0d48e8b8e4fd0244ba7b73ffb5b0008d59
fddd884e0a3f48fdac078ec0d528d6159dfe3856

View File

@ -1 +1 @@
254d9408bc8a59955b3acbd045dab6ff7b365c37
3d10120799d1ccf8914b1902a7c3fb41069946f5

View File

@ -1 +1 @@
29b49effce90b7f2fe0c79a6de7b247df79e829a
d599d559b4f824d76c3fcfcf98e6a7ee61fdcfb6

View File

@ -1 +1 @@
8eba7aa42674b1f25626dfbf370c22074eea751e
4c4fd3ffa294a529c35142173f121f7298a5c4a1

View File

@ -1 +1 @@
9f6e1f37b3af679ed3d2549d5d41977edc9134df
4fddd6a0abadcaa77515b4ed9f5f6f64ae70cfa4

View File

@ -1 +1 @@
33afdd892811cf9251820346c334158d1c465bca
040c8846dde8f31ee7cfa823ba1e2e45f34138a8

View File

@ -1 +1 @@
e54e0d5a9a12b874a7aee94f6b7e79fab0d46910
67be408a823afdbf1873d117d1ecc541ba05d81a

View File

@ -1,3 +1,32 @@
System.Globalization.Extensions.dll,50F4163A-D692-452F-90ED-2F8024BB5319,4,1,0,0
System.IO.Compression.dll,33AD8174-7781-46FA-A110-33821CCBE810,4,2,0,0
System.Net.Http.dll,82C79759-CB3C-4EB6-A17C-BDE85AF00A9B,4,2,0,0
System.Runtime.InteropServices.RuntimeInformation.dll,F580BAAC-12BD-4716-B486-C0A5E3EE6EEA,4,0,2,0
System.Threading.Overlapped.dll,212BEDF2-E3F5-4D59-8C1A-F4D1C58B46CD,4,1,0,0
System.Runtime.InteropServices.RuntimeInformation.dll,33D296D9-EE6D-404E-BF9F-432A429FF5DA,4,0,2,0
System.Runtime.InteropServices.RuntimeInformation.dll,E5AE3324-2100-4F77-9E41-AEEF226C9649,4,0,2,0
System.Globalization.Extensions.dll,FC1439FC-C1B8-4DB1-914D-165CCFA77002,4,1,0,0
System.IO.Compression.dll,05C07BD4-AFF1-4B12-900B-F0A5EB88DDB4,4,2,0,0
System.Net.Http.dll,DB06A592-E332-44A1-8B85-20CAB3C3C147,4,2,0,0
System.Runtime.InteropServices.RuntimeInformation.dll,1F37581E-4589-4C71-A465-05C6B9AE966E,4,0,2,0
System.Threading.Overlapped.dll,E933407E-C846-4413-82C5-09F4BCFA67F1,4,1,0,0
System.Runtime.InteropServices.RuntimeInformation.dll,9A3724BF-DF8F-4955-8CFA-41D45F11B586,4,0,2,0
System.Globalization.Extensions.dll,3B30D67C-B16B-47BC-B949-9500B5AAAAFB,4,1,0,0
System.IO.Compression.dll,C786B28D-0850-4D4C-AED9-FE6B86EE7C31,4,2,0,0
System.Net.Http.dll,903A137B-BB3F-464A-94D4-780B89EE5580,4,2,0,0
System.Threading.Overlapped.dll,3336A2A3-1772-4EF9-A74B-AFDC80A8B21E,4,1,0,0
System.Runtime.InteropServices.RuntimeInformation.dll,D87389D8-6E9C-48CF-B128-3637018577AF,4,0,2,0
System.Globalization.Extensions.dll,B9BA8638-25D2-4A3B-B91F-16B3D3799861,4,1,0,0
System.IO.Compression.dll,35DD20B5-8766-476B-B5D2-0EA16EF0A946,4,2,0,0
System.Net.Http.dll,27BBDD4C-EAF0-4A95-B172-EE502D76A725,4,2,0,0
System.Runtime.InteropServices.RuntimeInformation.dll,E46BA45E-6A63-47CD-AF70-2C3016AFF75A,4,0,2,0
System.Threading.Overlapped.dll,A0439CB6-A5E6-4813-A76C-13F92ADDDED5,4,1,0,0
System.Runtime.InteropServices.RuntimeInformation.dll,488CE209-4E5D-40E7-BE8C-F81F2B99F13A,4,0,2,0
System.Globalization.Extensions.dll,1A2B9B2A-02F5-4C78-AB0C-7C6D2795CE2B,4,1,0,0
System.IO.Compression.dll,8DBD1669-97BC-4190-9BD8-738561193741,4,2,0,0
System.Net.Http.dll,41ACE450-8F44-455A-97AC-0679E5462071,4,2,0,0
System.Threading.Overlapped.dll,82D565AC-E41C-4E29-9939-C031C88EDBDD,4,1,0,0
System.Runtime.InteropServices.RuntimeInformation.dll,FD6C8616-C1D8-43F9-AC17-A1C48A45FDA2,4,0,2,0
System.Globalization.Extensions.dll,475DBF02-9F68-44F1-8FB5-C9F69F1BD2B1,4,0,0,0
System.Globalization.Extensions.dll,5FCD54F0-4B97-4259-875D-30E481F02EA2,4,0,1,0
System.Globalization.Extensions.dll,E9FCFF5B-4DE1-4BDC-9CE8-08C640FC78CC,4,0,2,0
@ -8,10 +37,12 @@ System.Net.Http.dll,EA2EC6DC-51DD-479C-BFC2-E713FB9E7E47,4,1,0,1
System.Net.Http.dll,C0E04D9C-70CF-48A6-A179-FBFD8CE69FD0,4,1,1,0
System.Net.Http.dll,817F01C3-4011-477D-890A-98232B85553D,4,1,1,0
System.Net.Http.dll,09D4A140-061C-4884-9B63-22067E841931,4,1,1,1
System.Net.Http.dll,56203551-6937-47C1-9246-346A733913EE,4,1,1,2
System.Runtime.InteropServices.RuntimeInformation.dll,F13660F8-9D0D-419F-BA4E-315693DD26EA,4,0,0,0
System.Runtime.InteropServices.RuntimeInformation.dll,DD91439F-3167-478E-BD2C-BF9C036A1395,4,0,1,0
System.Text.Encoding.CodePages.dll,C142254F-DEB5-46A7-AE43-6F10320D1D1F,4,0,1,0
System.Text.Encoding.CodePages.dll,FD178CD4-EF4F-44D5-9C3F-812B1E25126B,4,0,2,0
System.Text.Encoding.CodePages.dll,FD178CD4-EF4F-44D5-9C3F-812B1E25126B,4,0,2,0
System.Text.Encoding.CodePages.dll,F5CCCBEC-E1AD-4DBB-9B44-9B42C86B94B8,4,1,0,0
System.Threading.Overlapped.dll,9F5D4F09-787A-458A-BA08-553AA71470F1,4,0,0,0
System.Threading.Overlapped.dll,FCBD003B-2BB4-4940-BAEF-63AF520C2336,4,0,1,0

View File

@ -1152,6 +1152,35 @@ const char *ignored_assemblies_file_names[] = {
#define IGNORED_ASSEMBLY(HASH, NAME, GUID, VER_STR) { .hash = HASH, .assembly_name = NAME, .guid = GUID }
static const IgnoredAssembly ignored_assemblies [] = {
IGNORED_ASSEMBLY (0xE4016B17, SYS_GLOBALIZATION_EXT, "50F4163A-D692-452F-90ED-2F8024BB5319", "15.5.0-preview-20171027-2 net461"),
IGNORED_ASSEMBLY (0xC69BED92, SYS_IO_COMPRESSION, "33AD8174-7781-46FA-A110-33821CCBE810", "15.5.0-preview-20171027-2 net461"),
IGNORED_ASSEMBLY (0xD08A991A, SYS_NET_HTTP, "82C79759-CB3C-4EB6-A17C-BDE85AF00A9B", "15.5.0-preview-20171027-2 net461"),
IGNORED_ASSEMBLY (0x1438EAE0, SYS_RT_INTEROP_RUNTIME_INFO, "F580BAAC-12BD-4716-B486-C0A5E3EE6EEA", "15.5.0-preview-20171027-2 net461"),
IGNORED_ASSEMBLY (0x79F6E37F, SYS_THREADING_OVERLAPPED, "212BEDF2-E3F5-4D59-8C1A-F4D1C58B46CD", "15.5.0-preview-20171027-2 net461"),
IGNORED_ASSEMBLY (0xA3BFE786, SYS_RT_INTEROP_RUNTIME_INFO, "33D296D9-EE6D-404E-BF9F-432A429FF5DA", "15.5.0-preview-20171027-2 net462"),
IGNORED_ASSEMBLY (0x74EA304F, SYS_RT_INTEROP_RUNTIME_INFO, "E5AE3324-2100-4F77-9E41-AEEF226C9649", "15.5.0-preview-20171027-2 net47"),
IGNORED_ASSEMBLY (0xF9D06E1E, SYS_GLOBALIZATION_EXT, "FC1439FC-C1B8-4DB1-914D-165CCFA77002", "2.1.0-preview1-62414-02 net461"),
IGNORED_ASSEMBLY (0x1EA951BB, SYS_IO_COMPRESSION, "05C07BD4-AFF1-4B12-900B-F0A5EB88DDB4", "2.1.0-preview1-62414-02 net461"),
IGNORED_ASSEMBLY (0x96B5F0BA, SYS_NET_HTTP, "DB06A592-E332-44A1-8B85-20CAB3C3C147", "2.1.0-preview1-62414-02 net461"),
IGNORED_ASSEMBLY (0xCA951D5B, SYS_RT_INTEROP_RUNTIME_INFO, "1F37581E-4589-4C71-A465-05C6B9AE966E", "2.1.0-preview1-62414-02 net461"),
IGNORED_ASSEMBLY (0x284ECF63, SYS_THREADING_OVERLAPPED, "E933407E-C846-4413-82C5-09F4BCFA67F1", "2.1.0-preview1-62414-02 net461"),
IGNORED_ASSEMBLY (0x8CCF2469, SYS_RT_INTEROP_RUNTIME_INFO, "9A3724BF-DF8F-4955-8CFA-41D45F11B586", "2.1.0-preview1-62414-02 net462"),
IGNORED_ASSEMBLY (0x39C3575D, SYS_GLOBALIZATION_EXT, "3B30D67C-B16B-47BC-B949-9500B5AAAAFB", "2.1.0-preview1-62414-02 net471"),
IGNORED_ASSEMBLY (0x662BC58F, SYS_IO_COMPRESSION, "C786B28D-0850-4D4C-AED9-FE6B86EE7C31", "2.1.0-preview1-62414-02 net471"),
IGNORED_ASSEMBLY (0x9DBB28A2, SYS_NET_HTTP, "903A137B-BB3F-464A-94D4-780B89EE5580", "2.1.0-preview1-62414-02 net471"),
IGNORED_ASSEMBLY (0xD00F7419, SYS_THREADING_OVERLAPPED, "3336A2A3-1772-4EF9-A74B-AFDC80A8B21E", "2.1.0-preview1-62414-02 net471"),
IGNORED_ASSEMBLY (0x17A113, SYS_RT_INTEROP_RUNTIME_INFO, "D87389D8-6E9C-48CF-B128-3637018577AF", "2.1.0-preview1-62414-02 net47"),
IGNORED_ASSEMBLY (0x1FB3F8E8, SYS_GLOBALIZATION_EXT, "B9BA8638-25D2-4A3B-B91F-16B3D3799861", "2.1.0-preview1-62516-03 net461"),
IGNORED_ASSEMBLY (0x6AE7C015, SYS_IO_COMPRESSION, "35DD20B5-8766-476B-B5D2-0EA16EF0A946", "2.1.0-preview1-62516-03 net461"),
IGNORED_ASSEMBLY (0x4E906129, SYS_NET_HTTP, "27BBDD4C-EAF0-4A95-B172-EE502D76A725", "2.1.0-preview1-62516-03 net461"),
IGNORED_ASSEMBLY (0x765A8E04, SYS_RT_INTEROP_RUNTIME_INFO, "E46BA45E-6A63-47CD-AF70-2C3016AFF75A", "2.1.0-preview1-62516-03 net461"),
IGNORED_ASSEMBLY (0x66CEDA9, SYS_THREADING_OVERLAPPED, "A0439CB6-A5E6-4813-A76C-13F92ADDDED5", "2.1.0-preview1-62516-03 net461"),
IGNORED_ASSEMBLY (0xD3ABE53A, SYS_RT_INTEROP_RUNTIME_INFO, "488CE209-4E5D-40E7-BE8C-F81F2B99F13A", "2.1.0-preview1-62516-03 net462"),
IGNORED_ASSEMBLY (0xE16ECCCD, SYS_GLOBALIZATION_EXT, "1A2B9B2A-02F5-4C78-AB0C-7C6D2795CE2B", "2.1.0-preview1-62516-03 net471"),
IGNORED_ASSEMBLY (0xE758DAD4, SYS_IO_COMPRESSION, "8DBD1669-97BC-4190-9BD8-738561193741", "2.1.0-preview1-62516-03 net471"),
IGNORED_ASSEMBLY (0xA99E866F, SYS_NET_HTTP, "41ACE450-8F44-455A-97AC-0679E5462071", "2.1.0-preview1-62516-03 net471"),
IGNORED_ASSEMBLY (0x8BFCB05D, SYS_THREADING_OVERLAPPED, "82D565AC-E41C-4E29-9939-C031C88EDBDD", "2.1.0-preview1-62516-03 net471"),
IGNORED_ASSEMBLY (0xFC67D3A7, SYS_RT_INTEROP_RUNTIME_INFO, "FD6C8616-C1D8-43F9-AC17-A1C48A45FDA2", "2.1.0-preview1-62516-03 net47"),
IGNORED_ASSEMBLY (0x1136045D, SYS_GLOBALIZATION_EXT, "475DBF02-9F68-44F1-8FB5-C9F69F1BD2B1", "4.0.0 net46"),
IGNORED_ASSEMBLY (0x358C9723, SYS_GLOBALIZATION_EXT, "5FCD54F0-4B97-4259-875D-30E481F02EA2", "4.0.1 net46"),
IGNORED_ASSEMBLY (0x450A096A, SYS_GLOBALIZATION_EXT, "E9FCFF5B-4DE1-4BDC-9CE8-08C640FC78CC", "4.3.0 net46"),
@ -1167,6 +1196,7 @@ static const IgnoredAssembly ignored_assemblies [] = {
IGNORED_ASSEMBLY (0xD07383BB, SYS_RT_INTEROP_RUNTIME_INFO, "DD91439F-3167-478E-BD2C-BF9C036A1395", "4.3.0 net45"),
IGNORED_ASSEMBLY (0x911D9EC3, SYS_TEXT_ENC_CODEPAGES, "C142254F-DEB5-46A7-AE43-6F10320D1D1F", "4.0.1 net46"),
IGNORED_ASSEMBLY (0xFA686A38, SYS_TEXT_ENC_CODEPAGES, "FD178CD4-EF4F-44D5-9C3F-812B1E25126B", "4.3.0 net46"),
IGNORED_ASSEMBLY (0xFA686A38, SYS_TEXT_ENC_CODEPAGES, "FD178CD4-EF4F-44D5-9C3F-812B1E25126B", "4.4.0 net46"),
IGNORED_ASSEMBLY (0xF6D18A2E, SYS_TEXT_ENC_CODEPAGES, "F5CCCBEC-E1AD-4DBB-9B44-9B42C86B94B8", "4.4.0 net461"),
IGNORED_ASSEMBLY (0xAA21986B, SYS_THREADING_OVERLAPPED, "9F5D4F09-787A-458A-BA08-553AA71470F1", "4.0.0 net46"),
IGNORED_ASSEMBLY (0x7D927C2A, SYS_THREADING_OVERLAPPED, "FCBD003B-2BB4-4940-BAEF-63AF520C2336", "4.0.1 net46"),

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/38c4fa9"
#define FULL_VERSION "explicit/4b17454"

Binary file not shown.

View File

@ -1 +1 @@
1e380e8dae219f581df3a141350c335d93230b4a
cc8024f516ae9fea459ceda6fba3c016f14a6efc

Binary file not shown.

View File

@ -1 +1 @@
5e63cf17be60fe31d3024175347f2fb6ba156dcc
c4537258cd664d87def43be8805b47ed38c4472c

Binary file not shown.

View File

@ -1 +1 @@
8994d013c0a79eb03ddae022aa20abb4f4fc691c
a99facea2d20fef37b686f85f7183b5e4bb9939a

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.10.0.103\n"
"Project-Id-Version: mono 5.10.0.105\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-02-10 18:49+0000\n"
"POT-Creation-Date: 2018-02-13 18:43+0000\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"

Binary file not shown.

View File

@ -1 +1 @@
a4d139ee6e877a6ec9dce5dab635fa73f8f35d18
de04511f37523886da0f4f17f42cbd88f60476a0