Merge branch 'upstream'
Former-commit-id: 68f710b02708b66009d730f6eaf075c14a285faa
This commit is contained in:
commit
8b4d7d8eee
@ -1 +1 @@
|
||||
614e386f452de288ad25cf8bcc6cc8c52895725e
|
||||
769b531ea57992a7de8d467045b0b0363f4bef85
|
@ -1 +1 @@
|
||||
a6e1aaf149f62742bb8957ffa3a03529a6b46dbe
|
||||
de9e08d09db715340f3fedac711b2ce0bc451900
|
@ -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";
|
||||
|
@ -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 ()
|
||||
|
@ -1 +1 @@
|
||||
11edb02350ed75b55fc884159ac11000eb956a3a
|
||||
68cd0727d205644efa4b0e76fd1414ff7e6fb568
|
@ -1 +1 @@
|
||||
1bd22293b7b92de83e22d39e1ff97fa286c884e3
|
||||
865d6f16ff33ecad2fa3f2b82dc0879d2a272171
|
@ -1 +1 @@
|
||||
1cb06e425be41ed94546d04d837e9432db750448
|
||||
da5300c53b604109a0843ba6b06e835b8935f98f
|
Binary file not shown.
@ -1 +1 @@
|
||||
adc618f49511118ee5f21252b88d3949f71dfcde
|
||||
9c8557889ca80d15cc20227155cba8786f38270d
|
@ -1 +1 @@
|
||||
9e2aafee7d31e49a01f1502aa00b67c1a1904fb0
|
||||
12435ae569a4b56dbb1e948d1b1f04e989dbde96
|
@ -1 +1 @@
|
||||
fbd3f505c8886e1d95a5a83c8e1d0976059a4233
|
||||
d976679f48fc24ef44d78c372933eca343b77e1f
|
@ -1 +1 @@
|
||||
d61f67c1b8380fb0ee08877aa66ef1ea23aca853
|
||||
7f96c6bf5631426b4ef9480e64066919eda63e8b
|
@ -1 +1 @@
|
||||
11edb02350ed75b55fc884159ac11000eb956a3a
|
||||
68cd0727d205644efa4b0e76fd1414ff7e6fb568
|
@ -1 +1 @@
|
||||
1bd22293b7b92de83e22d39e1ff97fa286c884e3
|
||||
865d6f16ff33ecad2fa3f2b82dc0879d2a272171
|
@ -1 +1 @@
|
||||
1cb06e425be41ed94546d04d837e9432db750448
|
||||
da5300c53b604109a0843ba6b06e835b8935f98f
|
Binary file not shown.
@ -1 +1 @@
|
||||
adc618f49511118ee5f21252b88d3949f71dfcde
|
||||
9c8557889ca80d15cc20227155cba8786f38270d
|
@ -1 +1 @@
|
||||
9e2aafee7d31e49a01f1502aa00b67c1a1904fb0
|
||||
12435ae569a4b56dbb1e948d1b1f04e989dbde96
|
@ -1 +1 @@
|
||||
fbd3f505c8886e1d95a5a83c8e1d0976059a4233
|
||||
d976679f48fc24ef44d78c372933eca343b77e1f
|
@ -1 +1 @@
|
||||
d61f67c1b8380fb0ee08877aa66ef1ea23aca853
|
||||
7f96c6bf5631426b4ef9480e64066919eda63e8b
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user