Imported Upstream version 6.8.0.82

Former-commit-id: 7e63bf6e0646194a7ccc6e2356266bef05ce51bb
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-12-20 08:48:16 +00:00
parent 665300eaa7
commit f0b8def9a1
53 changed files with 57 additions and 54 deletions

View File

@ -1 +1 @@
bacb1f475e2036ea994368c7b49ed0018b7b9dd8
f9a08857736b629d086347e11dedbd999c2eeda6

View File

@ -1 +1 @@
1cf6adc868326f1166e24e061f92b195d6e62849
e065a05af79d940fce064c779fbf67318c89e376

View File

@ -94,7 +94,7 @@ namespace System.Reflection.Tests
public void Name()
{
#if MONO
Assert.EndsWith("corlib_xunit-test.dll", Module.Name);
Assert.Contains("corlib_xunit-test", Module.Name);
#else
Assert.Equal("system.runtime.tests.dll", Module.Name, ignoreCase: true);
#endif
@ -126,7 +126,7 @@ namespace System.Reflection.Tests
public void TestToString()
{
#if MONO
Assert.EndsWith("corlib_xunit-test.dll", Module.ToString());
Assert.Contains("corlib_xunit-test", Module.ToString());
#else
Assert.Equal("System.Runtime.Tests.dll", Module.ToString());
#endif

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.8.0.80";
public const string MonoVersion = "6.8.0.82";
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

@ -64,6 +64,7 @@ namespace Mono.Net.Security
}
SslStream sslStream;
readonly object sslStreamLock = new object ();
internal SslStream SslStream {
get { return sslStream; }
@ -157,9 +158,11 @@ namespace Mono.Net.Security
}
void CloseSslStream () {
if (sslStream != null) {
sslStream.Dispose ();
sslStream = null;
lock (sslStreamLock) {
if (sslStream != null) {
sslStream.Dispose ();
sslStream = null;
}
}
}
}

View File

@ -1 +1 @@
caafc3b0caa3733b229a324ee4cfd611b31c0763
1710bcecc4294be974d55f512f339dde5840f47c

View File

@ -1 +1 @@
88430f86b81e4741c640dee58f50efecace578a4
01d083d035f338355961c5d585bdadf74d7d8046

View File

@ -1 +1 @@
b223753a441db306d43081e991adb39927c0bb52
b504ed14acf8e098d6d291a9f40601b2c77080e9

View File

@ -1 +1 @@
12695fb87737987cfb9d9a3f20f7df2c1bae65c0
b72c8b5faf0b9c235e916b9dbdf173d37519f4cd

View File

@ -1 +1 @@
d542d2a274dba487571ab0c3be41fc0522b0a8e4
19508a2b2318eaf44702a2668cd256842bee5719

View File

@ -1 +1 @@
62abef29cb7959ce1d24ff6bbbc0f860af8d07d0
01ae2c999c1c03b62124c4d910552312d867e53d

View File

@ -1 +1 @@
444cfb43e9d19732c08dfc47c74331d659aabd72
ac8b31db4a2273ede654bd0e95ff8ac109f9e021

View File

@ -1 +1 @@
f55d1577c9cf31fea473d5f581ff1a84272e1199
637e676483b332929868825d9aed8d6374a51617

View File

@ -1 +1 @@
6c77f7a64bd4a08091fbfe9983c35ef3847838cc
69dd828f411167347be6ba45741a52438f6228d8

View File

@ -1 +1 @@
caafc3b0caa3733b229a324ee4cfd611b31c0763
1710bcecc4294be974d55f512f339dde5840f47c

View File

@ -1 +1 @@
88430f86b81e4741c640dee58f50efecace578a4
01d083d035f338355961c5d585bdadf74d7d8046

View File

@ -1 +1 @@
b223753a441db306d43081e991adb39927c0bb52
b504ed14acf8e098d6d291a9f40601b2c77080e9

View File

@ -1 +1 @@
12695fb87737987cfb9d9a3f20f7df2c1bae65c0
b72c8b5faf0b9c235e916b9dbdf173d37519f4cd

View File

@ -1 +1 @@
d542d2a274dba487571ab0c3be41fc0522b0a8e4
19508a2b2318eaf44702a2668cd256842bee5719

View File

@ -1 +1 @@
62abef29cb7959ce1d24ff6bbbc0f860af8d07d0
01ae2c999c1c03b62124c4d910552312d867e53d

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