Merge branch 'upstream'

Former-commit-id: 460743d8e3418a5b39169e07c4d3a1b41213cc7f
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-08-11 09:05:43 +00:00
commit 41c96ecc54
46 changed files with 43 additions and 43 deletions

View File

@ -1 +1 @@
9c60b2a58fd4358cef9898d43c0a27a57d794eba
197ca258347daeaf65fe020181c8b1d54fdaea6d

View File

@ -1 +1 @@
cd4632b919d60f43cbb4658eac407568905a1e61
ec463992ec72aa3b0a3a316d2635b7f87fd7ff2e

View File

@ -483,7 +483,7 @@ namespace System.IO
// Remove the base directory prefix and add the paired event to the list of
// events to skip and notify the user of the rename
if (events[pairedId].Span.Length >= _fullDirectory.Length
&& ((ReadOnlySpan<char>) events[pairedId].Span).Equals(_fullDirectory.AsSpan(0, events[pairedId].Span.Length), StringComparison.OrdinalIgnoreCase))
&& _fullDirectory.AsSpan().Equals(events[pairedId].Span.Slice(0, _fullDirectory.Length), StringComparison.OrdinalIgnoreCase))
{
ReadOnlySpan<char> newPathRelativeName = events[pairedId].Span.Slice(_fullDirectory.Length);
watcher.NotifyRenameEventArgs(WatcherChangeTypes.Renamed, newPathRelativeName, relativePath);

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.163";
public const string MonoVersion = "6.4.0.165";
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 @@
4434bf4dc2005ce6c3672cff53968277d28a2474
b15c8c634913d273dec69558326b7e6427add463

View File

@ -1 +1 @@
c855079723107655fe190dcd39e617eacc879127
dce8d2ea28eea5fc411c0d6c6147964a6d2c81a3

View File

@ -1 +1 @@
1f89bf19763a0982301385ca3836fa1cf25de7c0
919b370886dca688742724b3609127a424927792

View File

@ -1 +1 @@
47b05693eef12e1619c3f8d7c1a86904367821a8
47b03dcf75530cb258583bd22ca049ffea0da272

View File

@ -1 +1 @@
9a3de54cc21160679b9943aa74de2d619d77cf9c
72c91f65a2a638338f8d384aacb252206c33d031

View File

@ -1 +1 @@
64f8ff01f5f8833ff796000f7a6c59622079c6e1
a48339ca95ee07c04f4ef42ccfad775237de99cf

View File

@ -1 +1 @@
7e1e0a3383922b1fd3447748e6f4e6727fdbf87b
dca2db69436f394fb96bbe848127df97b09d034c

View File

@ -1 +1 @@
4434bf4dc2005ce6c3672cff53968277d28a2474
b15c8c634913d273dec69558326b7e6427add463

View File

@ -1 +1 @@
c855079723107655fe190dcd39e617eacc879127
dce8d2ea28eea5fc411c0d6c6147964a6d2c81a3

View File

@ -1 +1 @@
1f89bf19763a0982301385ca3836fa1cf25de7c0
919b370886dca688742724b3609127a424927792

View File

@ -1 +1 @@
47b05693eef12e1619c3f8d7c1a86904367821a8
47b03dcf75530cb258583bd22ca049ffea0da272

View File

@ -1 +1 @@
9a3de54cc21160679b9943aa74de2d619d77cf9c
72c91f65a2a638338f8d384aacb252206c33d031

View File

@ -1 +1 @@
64f8ff01f5f8833ff796000f7a6c59622079c6e1
a48339ca95ee07c04f4ef42ccfad775237de99cf

View File

@ -1 +1 @@
b96987b79376304652e1e0d32608706f45dadd8d
d3caeec541184e198e6ad23b7e8112e568b49daa

View File

@ -1 +1 @@
7e1e0a3383922b1fd3447748e6f4e6727fdbf87b
dca2db69436f394fb96bbe848127df97b09d034c

View File

@ -1 +1 @@
4434bf4dc2005ce6c3672cff53968277d28a2474
b15c8c634913d273dec69558326b7e6427add463

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