Merge branch 'upstream'

Former-commit-id: c6600880db66540c9a40da837394a0c3a2674f64
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-09-13 09:30:16 +00:00
commit a287bbf057
47 changed files with 102 additions and 42 deletions

View File

@ -1 +1 @@
55ac6d9eb003b59dc675dde185889aa5abf29b95
eba57d5450053070dce90b75b8eb2e9fb354e537

View File

@ -1 +1 @@
d30c2d8bd4cc5dc03586260fd76a2f670bf62216
d0c7db459ee67164a3f4c3dd24d9df3977e63ab8

View File

@ -280,6 +280,8 @@ namespace System.IO
finally
{
StaticWatcherRunLoopManager.UnscheduleFromRunLoop(_eventStream);
_eventStream.Close();
_eventStream = null;
}
}
}

View File

@ -8,6 +8,7 @@ using System.Collections.ObjectModel;
using System.Diagnostics;
using System.Linq.Expressions;
using System.Reflection;
using System.Runtime.CompilerServices;
namespace System.Linq
{
@ -212,6 +213,63 @@ namespace System.Linq
private static ILookup<string, MethodInfo> s_seqMethods;
[PreserveDependency ("Aggregate`1", "System.Linq.Enumerable")]
[PreserveDependency ("Aggregate`2", "System.Linq.Enumerable")]
[PreserveDependency ("Aggregate`3", "System.Linq.Enumerable")]
[PreserveDependency ("All`1", "System.Linq.Enumerable")]
[PreserveDependency ("Any`1", "System.Linq.Enumerable")]
[PreserveDependency ("Append`1", "System.Linq.Enumerable")]
[PreserveDependency ("Average", "System.Linq.Enumerable")]
[PreserveDependency ("Average`1", "System.Linq.Enumerable")]
[PreserveDependency ("Cast`1", "System.Linq.Enumerable")]
[PreserveDependency ("Concat`1", "System.Linq.Enumerable")]
[PreserveDependency ("Contains`1", "System.Linq.Enumerable")]
[PreserveDependency ("Count`1", "System.Linq.Enumerable")]
[PreserveDependency ("DefaultIfEmpty`1", "System.Linq.Enumerable")]
[PreserveDependency ("Distinct`1", "System.Linq.Enumerable")]
[PreserveDependency ("ElementAt`1", "System.Linq.Enumerable")]
[PreserveDependency ("ElementAtOrDefault`1", "System.Linq.Enumerable")]
[PreserveDependency ("Except`1", "System.Linq.Enumerable")]
[PreserveDependency ("First`1", "System.Linq.Enumerable")]
[PreserveDependency ("FirstOrDefault`1", "System.Linq.Enumerable")]
[PreserveDependency ("GroupBy`2", "System.Linq.Enumerable")]
[PreserveDependency ("GroupBy`3", "System.Linq.Enumerable")]
[PreserveDependency ("GroupBy`4", "System.Linq.Enumerable")]
[PreserveDependency ("GroupJoin`4", "System.Linq.Enumerable")]
[PreserveDependency ("Intersect`1", "System.Linq.Enumerable")]
[PreserveDependency ("Join`4", "System.Linq.Enumerable")]
[PreserveDependency ("Last`1", "System.Linq.Enumerable")]
[PreserveDependency ("LastOrDefault`1", "System.Linq.Enumerable")]
[PreserveDependency ("LongCount`1", "System.Linq.Enumerable")]
[PreserveDependency ("Max`1", "System.Linq.Enumerable")]
[PreserveDependency ("Max`2", "System.Linq.Enumerable")]
[PreserveDependency ("Min`1", "System.Linq.Enumerable")]
[PreserveDependency ("Min`2", "System.Linq.Enumerable")]
[PreserveDependency ("OfType`1", "System.Linq.Enumerable")]
[PreserveDependency ("OrderBy`2", "System.Linq.Enumerable")]
[PreserveDependency ("OrderByDescending`2", "System.Linq.Enumerable")]
[PreserveDependency ("Prepend`1", "System.Linq.Enumerable")]
[PreserveDependency ("Reverse`1", "System.Linq.Enumerable")]
[PreserveDependency ("Select`2", "System.Linq.Enumerable")]
[PreserveDependency ("SelectMany`2", "System.Linq.Enumerable")]
[PreserveDependency ("SelectMany`3", "System.Linq.Enumerable")]
[PreserveDependency ("SequenceEqual`1", "System.Linq.Enumerable")]
[PreserveDependency ("Single`1", "System.Linq.Enumerable")]
[PreserveDependency ("SingleOrDefault`1", "System.Linq.Enumerable")]
[PreserveDependency ("Skip`1", "System.Linq.Enumerable")]
[PreserveDependency ("SkipLast`1", "System.Linq.Enumerable")]
[PreserveDependency ("SkipWhile`1", "System.Linq.Enumerable")]
[PreserveDependency ("Sum", "System.Linq.Enumerable")]
[PreserveDependency ("Sum`1", "System.Linq.Enumerable")]
[PreserveDependency ("Take`1", "System.Linq.Enumerable")]
[PreserveDependency ("TakeLast`1", "System.Linq.Enumerable")]
[PreserveDependency ("TakeWhile`1", "System.Linq.Enumerable")]
[PreserveDependency ("ThenBy`2", "System.Linq.Enumerable")]
[PreserveDependency ("ThenByDescending`2", "System.Linq.Enumerable")]
[PreserveDependency ("Union`1", "System.Linq.Enumerable")]
[PreserveDependency ("Where`1", "System.Linq.Enumerable")]
[PreserveDependency ("Zip`3", "System.Linq.Enumerable")]
private static MethodInfo FindEnumerableMethod(string name, ReadOnlyCollection<Expression> args, params Type[] typeArgs)
{
if (s_seqMethods == null)

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

@ -1 +1 @@
3d1b895dafac8b924cbe5e123b208624c556f31c
aeab8befa2acc173f50c51710a4112a022c4a809

View File

@ -1 +1 @@
5b46665f9f5a883f40570f7545f211ffc436158c
7ca446d1eb7cd3bddcd05167868c0b2741ce3e17

View File

@ -1 +1 @@
7d135b737c46169f6185b7343f0a513a1abda279
6b2bb697b159d57d869f43380ecac87b13ab1027

View File

@ -1 +1 @@
7a3b9c036737fd3c8b8c3803dbac156cbac4d0a8
95319c3eb884cd0f4c95a17bc7f478630a208ae5

View File

@ -1 +1 @@
bd4ae53b76e7eb19861fe972a3be468c355259bd
0a605081002199665d9c9b28bb2f40193620e417

View File

@ -1 +1 @@
601854e24895192414207f56537fdc4adf2a332e
b7edbb82773e124a7fbcfb5cd1844ae456a33572

View File

@ -1 +1 @@
784ebf05648d22f85dea19b80fff5fa8b2f82825
cba332b7141236f4d0e67a3b35cc1d42eaa9db04

View File

@ -1 +1 @@
3d1b895dafac8b924cbe5e123b208624c556f31c
aeab8befa2acc173f50c51710a4112a022c4a809

View File

@ -1 +1 @@
5b46665f9f5a883f40570f7545f211ffc436158c
7ca446d1eb7cd3bddcd05167868c0b2741ce3e17

View File

@ -1 +1 @@
7d135b737c46169f6185b7343f0a513a1abda279
6b2bb697b159d57d869f43380ecac87b13ab1027

View File

@ -1 +1 @@
7a3b9c036737fd3c8b8c3803dbac156cbac4d0a8
95319c3eb884cd0f4c95a17bc7f478630a208ae5

View File

@ -1 +1 @@
bd4ae53b76e7eb19861fe972a3be468c355259bd
0a605081002199665d9c9b28bb2f40193620e417

View File

@ -1 +1 @@
601854e24895192414207f56537fdc4adf2a332e
b7edbb82773e124a7fbcfb5cd1844ae456a33572

View File

@ -1 +1 @@
5fa149a3835f5f51bd259ceb982a96173d8c7fb2
b627ff92a95640b43c7d99030cdd8edf87215ba8

View File

@ -1 +1 @@
784ebf05648d22f85dea19b80fff5fa8b2f82825
cba332b7141236f4d0e67a3b35cc1d42eaa9db04

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