Merge branch 'upstream'

Former-commit-id: 8daba42f2011c4459893dbefa890f51e2ff70546
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-09-26 08:24:13 +00:00
38 changed files with 35 additions and 31 deletions

View File

@ -1 +1 @@
2fa3f57583fe80e16566c45c49f72898f2a8fe85 edeab869a238010eab0c6ae8925c74dbfabe005a

View File

@ -1 +1 @@
85b53c4580832aad662b7c2238e80e5bd439b678 336a9cae567bfbf11970a9574b47ab40dbf09dbe

View File

@ -57,7 +57,11 @@ namespace System.Collections.Generic.Tests
Assert.Equal(comparer.GetHashCode(), comparer.GetHashCode()); Assert.Equal(comparer.GetHashCode(), comparer.GetHashCode());
} }
#if MOBILE
[Fact(Skip="Mono issue #10807")]
#else
[Fact] [Fact]
#endif
public void EqualityComparer_GetHashCodeShouldBeOverriddenAndBeTheSameAsLongAsTheTypeIsTheSame_cloned() public void EqualityComparer_GetHashCodeShouldBeOverriddenAndBeTheSameAsLongAsTheTypeIsTheSame_cloned()
{ {
var comparer = EqualityComparer<T>.Default; var comparer = EqualityComparer<T>.Default;

View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable. // Use these assembly version constants to make code more maintainable.
// //
public const string MonoVersion = "5.16.0.167"; public const string MonoVersion = "5.16.0.168";
public const string MonoCompany = "Mono development team"; public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors"; public const string MonoCopyright = "(c) Various Mono authors";

View File

@ -1 +1 @@
661fa05a4cc87ff1b8f0d3f36c75820876c954ca 5469238f307139bfb54bdbe42fcb877e2cf273bc

View File

@ -1 +1 @@
4fabef2aba17c5ac1aac498460fd0114b9872292 4434e532924a095657096c31623446fc7773d33a

View File

@ -1 +1 @@
13f5fb45e09afc3445e683519aedcc922bf7d828 e98f6d09a94747ba282f7c195cc95c9c62a06901

View File

@ -1 +1 @@
beade6cc48d2c019b2e4c9bbe1a856a490849b15 2873ec7d2a941016516ff1429e94397f83805f9b

View File

@ -1 +1 @@
6d59749a4a1ee91888eec7e84496aa3f71a6689a fba576a1996777348d40ba1ce8d7d82f7cf30796

View File

@ -1 +1 @@
f45f316ba7b82843fbef59766e29fe82ffa465f3 1199285dd4df05b9633d365cbeeac536ecd0b258

View File

@ -1 +1 @@
caba2eac02a7fae8ebd6d042f1138662b15f1915 b714353945deee5c92ea0d8f901d0d8431c0f287

View File

@ -1 +1 @@
661fa05a4cc87ff1b8f0d3f36c75820876c954ca 5469238f307139bfb54bdbe42fcb877e2cf273bc

View File

@ -1 +1 @@
4fabef2aba17c5ac1aac498460fd0114b9872292 4434e532924a095657096c31623446fc7773d33a

View File

@ -1 +1 @@
13f5fb45e09afc3445e683519aedcc922bf7d828 e98f6d09a94747ba282f7c195cc95c9c62a06901

View File

@ -1 +1 @@
beade6cc48d2c019b2e4c9bbe1a856a490849b15 2873ec7d2a941016516ff1429e94397f83805f9b

View File

@ -1 +1 @@
6d59749a4a1ee91888eec7e84496aa3f71a6689a fba576a1996777348d40ba1ce8d7d82f7cf30796

View File

@ -1 +1 @@
f45f316ba7b82843fbef59766e29fe82ffa465f3 1199285dd4df05b9633d365cbeeac536ecd0b258

View File

@ -1 +1 @@
caba2eac02a7fae8ebd6d042f1138662b15f1915 b714353945deee5c92ea0d8f901d0d8431c0f287

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