Imported Upstream version 6.0.0.197

Former-commit-id: ce8df4f105a5e534ae52c5975c6525634631b55b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-04-25 08:34:32 +00:00
parent b8f7d9129e
commit 91848d672d
62 changed files with 72 additions and 47 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.0.0.190";
public const string MonoVersion = "6.0.0.197";
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

@ -180,7 +180,7 @@ namespace MonoTests.Mono.Security.Cryptography {
}
catch (CryptographicException ce) {
// not everyone can write to the machine store
if (!(ce.InnerException is UnauthorizedAccessException))
if (!(ce.InnerException is UnauthorizedAccessException) && !(ce.InnerException is IOException))
throw;
Assert.Ignore ("Access denied to key containers files.");
}
@ -208,7 +208,7 @@ namespace MonoTests.Mono.Security.Cryptography {
}
catch (CryptographicException ce) {
// not everyone can write to the machine store
if (!(ce.InnerException is UnauthorizedAccessException))
if (!(ce.InnerException is UnauthorizedAccessException) && !(ce.InnerException is IOException))
throw;
Assert.Ignore ("Access denied to key containers files.");
}

View File

@ -850,7 +850,7 @@ public class DSACryptoServiceProviderTest {
catch (CryptographicException ce) {
// only root can create the required directory (if inexistant)
// afterward anyone can use (read from) it
if (!(ce.InnerException is UnauthorizedAccessException))
if (!(ce.InnerException is UnauthorizedAccessException) && !(ce.InnerException is IOException))
throw;
}
catch (UnauthorizedAccessException) {

View File

@ -1 +1 @@
c9011cb41f6f9a37736eb9d0ba9e89d39e203b67
181cf71935494b79c12bbaaf91e3e070add5033e

View File

@ -1 +1 @@
100bbcb5886d1d2f421e6f14e9a7ac65a6c46a77
6ea3ae9edc197662299ca0d3075e685019a7b8dd

View File

@ -1 +1 @@
f0b284f1eef9c4ad53e46eb667569acbc301c8eb
f1a222b408068895f22724347ada81b5003d862f

View File

@ -1 +1 @@
c97fa81a52e33e709aba8f6d48ce0e15ba59648e
e1e7132d5b1c9a2ee55b7bdb9806d30084653ba6

View File

@ -1 +1 @@
2b37718af0ab691d006d4153f926d0ad3e61c24a
7c33198f69feeb6579e3f58225e1f0e8ac7124ea

View File

@ -1 +1 @@
3d8a09adb5c438493dd8010212b9a1114f3890f1
573311b27754edd7471b26643bd8eeffa55b5b89

View File

@ -1 +1 @@
885e28e998117d99418431439fdcefda35b945dd
e73142283b03345f330630803b4c58749bad9117

View File

@ -1 +1 @@
ab35bec467401fde399b5f27fac9b8d6df19eaca
61c024d204a54a55f550964baa702d5517a1a4c0

View File

@ -1 +1 @@
100bbcb5886d1d2f421e6f14e9a7ac65a6c46a77
6ea3ae9edc197662299ca0d3075e685019a7b8dd

View File

@ -1 +1 @@
f0b284f1eef9c4ad53e46eb667569acbc301c8eb
f1a222b408068895f22724347ada81b5003d862f

View File

@ -1 +1 @@
c97fa81a52e33e709aba8f6d48ce0e15ba59648e
e1e7132d5b1c9a2ee55b7bdb9806d30084653ba6

View File

@ -1 +1 @@
2b37718af0ab691d006d4153f926d0ad3e61c24a
7c33198f69feeb6579e3f58225e1f0e8ac7124ea

View File

@ -1 +1 @@
3d8a09adb5c438493dd8010212b9a1114f3890f1
573311b27754edd7471b26643bd8eeffa55b5b89

View File

@ -1 +1 @@
885e28e998117d99418431439fdcefda35b945dd
e73142283b03345f330630803b4c58749bad9117

View File

@ -1 +1 @@
ab35bec467401fde399b5f27fac9b8d6df19eaca
61c024d204a54a55f550964baa702d5517a1a4c0

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