Merge branch 'upstream'

Former-commit-id: 68f710b02708b66009d730f6eaf075c14a285faa
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-02-10 08:30:58 +00:00
commit 8b4d7d8eee
46 changed files with 44 additions and 39 deletions

View File

@ -1 +1 @@
614e386f452de288ad25cf8bcc6cc8c52895725e
769b531ea57992a7de8d467045b0b0363f4bef85

View File

@ -1 +1 @@
a6e1aaf149f62742bb8957ffa3a03529a6b46dbe
de9e08d09db715340f3fedac711b2ce0bc451900

View File

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

@ -690,7 +690,12 @@ namespace Microsoft.Win32 {
public void DirtyTimeout (object state)
{
Flush ();
try {
Flush ();
} catch {
// This was identified as a crasher under some scenarios
// Internal MS issue: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/787119
}
}
public void Flush ()

View File

@ -1 +1 @@
11edb02350ed75b55fc884159ac11000eb956a3a
68cd0727d205644efa4b0e76fd1414ff7e6fb568

View File

@ -1 +1 @@
1bd22293b7b92de83e22d39e1ff97fa286c884e3
865d6f16ff33ecad2fa3f2b82dc0879d2a272171

View File

@ -1 +1 @@
1cb06e425be41ed94546d04d837e9432db750448
da5300c53b604109a0843ba6b06e835b8935f98f

View File

@ -1 +1 @@
adc618f49511118ee5f21252b88d3949f71dfcde
9c8557889ca80d15cc20227155cba8786f38270d

View File

@ -1 +1 @@
9e2aafee7d31e49a01f1502aa00b67c1a1904fb0
12435ae569a4b56dbb1e948d1b1f04e989dbde96

View File

@ -1 +1 @@
fbd3f505c8886e1d95a5a83c8e1d0976059a4233
d976679f48fc24ef44d78c372933eca343b77e1f

View File

@ -1 +1 @@
d61f67c1b8380fb0ee08877aa66ef1ea23aca853
7f96c6bf5631426b4ef9480e64066919eda63e8b

View File

@ -1 +1 @@
11edb02350ed75b55fc884159ac11000eb956a3a
68cd0727d205644efa4b0e76fd1414ff7e6fb568

View File

@ -1 +1 @@
1bd22293b7b92de83e22d39e1ff97fa286c884e3
865d6f16ff33ecad2fa3f2b82dc0879d2a272171

View File

@ -1 +1 @@
1cb06e425be41ed94546d04d837e9432db750448
da5300c53b604109a0843ba6b06e835b8935f98f

View File

@ -1 +1 @@
adc618f49511118ee5f21252b88d3949f71dfcde
9c8557889ca80d15cc20227155cba8786f38270d

View File

@ -1 +1 @@
9e2aafee7d31e49a01f1502aa00b67c1a1904fb0
12435ae569a4b56dbb1e948d1b1f04e989dbde96

View File

@ -1 +1 @@
fbd3f505c8886e1d95a5a83c8e1d0976059a4233
d976679f48fc24ef44d78c372933eca343b77e1f

View File

@ -1 +1 @@
d61f67c1b8380fb0ee08877aa66ef1ea23aca853
7f96c6bf5631426b4ef9480e64066919eda63e8b

View File

@ -1 +1 @@
11edb02350ed75b55fc884159ac11000eb956a3a
68cd0727d205644efa4b0e76fd1414ff7e6fb568

View File

@ -1 +1 @@
1bd22293b7b92de83e22d39e1ff97fa286c884e3
865d6f16ff33ecad2fa3f2b82dc0879d2a272171

View File

@ -1 +1 @@
1cb06e425be41ed94546d04d837e9432db750448
da5300c53b604109a0843ba6b06e835b8935f98f

View File

@ -1 +1 @@
adc618f49511118ee5f21252b88d3949f71dfcde
9c8557889ca80d15cc20227155cba8786f38270d

View File

@ -1 +1 @@
9e2aafee7d31e49a01f1502aa00b67c1a1904fb0
12435ae569a4b56dbb1e948d1b1f04e989dbde96

View File

@ -1 +1 @@
fbd3f505c8886e1d95a5a83c8e1d0976059a4233
d976679f48fc24ef44d78c372933eca343b77e1f

View File

@ -1 +1 @@
d61f67c1b8380fb0ee08877aa66ef1ea23aca853
7f96c6bf5631426b4ef9480e64066919eda63e8b

View File

@ -1 +1 @@
11edb02350ed75b55fc884159ac11000eb956a3a
68cd0727d205644efa4b0e76fd1414ff7e6fb568

View File

@ -1 +1 @@
1bd22293b7b92de83e22d39e1ff97fa286c884e3
865d6f16ff33ecad2fa3f2b82dc0879d2a272171

View File

@ -1 +1 @@
1cb06e425be41ed94546d04d837e9432db750448
da5300c53b604109a0843ba6b06e835b8935f98f

View File

@ -1 +1 @@
adc618f49511118ee5f21252b88d3949f71dfcde
9c8557889ca80d15cc20227155cba8786f38270d

View File

@ -1 +1 @@
9e2aafee7d31e49a01f1502aa00b67c1a1904fb0
12435ae569a4b56dbb1e948d1b1f04e989dbde96

View File

@ -1 +1 @@
fbd3f505c8886e1d95a5a83c8e1d0976059a4233
d976679f48fc24ef44d78c372933eca343b77e1f

View File

@ -1 +1 @@
d61f67c1b8380fb0ee08877aa66ef1ea23aca853
7f96c6bf5631426b4ef9480e64066919eda63e8b

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/a13ca00"
#define FULL_VERSION "explicit/73a1f12"

Binary file not shown.

View File

@ -1 +1 @@
accd51aba71622210895cf94f264bcdd5ccd941b
5556979c3dd70fc3f95337fb03812b34c2b16441

Binary file not shown.

View File

@ -1 +1 @@
9d51c5e362caffa8254005266e691d0f34f38c0e
6bdc9890293d8526278f267fa03931ee902e7c6b

Binary file not shown.

View File

@ -1 +1 @@
6f33ab318482690b6b44e8f6bae2ecc8b01781ec
9791d60ab91bece920aaebdcc5d9edbc4be67a65

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.20.0.197\n"
"Project-Id-Version: mono 5.20.0.200\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2019-02-09 08:06+0000\n"
"POT-Creation-Date: 2019-02-10 08:08+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 @@
d589f80e59f13b276b3e63357edae720244352fb
c4bbf64f5bdc6a76bc0aeaf48161cb67a157d2b6