Merge pull request #4929 from xamarin/d15-9-bump-mono-head

Bump mono to head of 2018-04
This commit is contained in:
Chris Hamons 2018-10-05 09:14:03 -05:00 коммит произвёл GitHub
Родитель 6d4e78b419 1044fa602d
Коммит 2d1d118302
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 10 добавлений и 5 удалений

2
external/mono поставляемый

@ -1 +1 @@
Subproject commit 46ff31252daa7e594600ad39fac195d971ee27d1
Subproject commit 1fd01f4fd7dd34a3a71a79dec074c114a6f6e1e3

Просмотреть файл

@ -202,7 +202,8 @@ namespace Compression
return ReadCore (new Span<byte> (array, offset, count));
}
public override int Read (Span<byte> destination)
// FIXME needs Span
internal override int Read (Span<byte> destination)
{
if (GetType () != typeof (CompressionStream)) {
// CompressStream is not sealed, and a derived type may have overridden Read(byte[], int, int) prior
@ -312,7 +313,8 @@ namespace Compression
return ReadAsyncMemory (new Memory<byte>(array, offset, count), cancellationToken).AsTask ();
}
public override ValueTask<int> ReadAsync (Memory<byte> destination, CancellationToken cancellationToken = default(CancellationToken))
// FIXME needs Span
internal override ValueTask<int> ReadAsync (Memory<byte> destination, CancellationToken cancellationToken = default(CancellationToken))
{
if (GetType () != typeof (CompressionStream)) {
// Ensure that existing streams derived from DeflateStream and that override ReadAsync(byte[],...)
@ -405,7 +407,8 @@ namespace Compression
WriteCore (new ReadOnlySpan<byte> (array, offset, count));
}
public override void Write (ReadOnlySpan<byte> source)
// FIXME needs Span
internal override void Write (ReadOnlySpan<byte> source)
{
if (GetType () != typeof (CompressionStream)) {
// DeflateStream is not sealed, and a derived type may have overridden Write(byte[], int, int) prior
@ -558,7 +561,8 @@ namespace Compression
return WriteAsyncMemory (new ReadOnlyMemory<byte> (array, offset, count), cancellationToken);
}
public override Task WriteAsync (ReadOnlyMemory<byte> source, CancellationToken cancellationToken)
// FIXME needs Span
internal override Task WriteAsync (ReadOnlyMemory<byte> source, CancellationToken cancellationToken)
{
if (GetType () != typeof (CompressionStream)) {
// Ensure that existing streams derived from DeflateStream and that override WriteAsync(byte[],...)

Просмотреть файл

@ -172,6 +172,7 @@ namespace Xamarin.Linker {
"System.Threading.Overlapped",
"System.Threading.Tasks.Parallel",
"System.Threading.Tasks",
"System.Threading.Tasks.Extensions",
"System.Threading.Thread",
"System.Threading.ThreadPool",
"System.Threading.Timer",