From e1e94cb6b183096c06cfe80add57e6cd4bffe339 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Tue, 22 May 2018 15:40:41 +0200 Subject: [PATCH] [corlib] Finish System.Memory facade types import Fixes #8623 --- external/corefx | 2 +- mcs/class/Facades/System.Memory/TypeForwarders.cs | 17 +++++++---------- mcs/class/corlib/corlib.dll.sources | 8 +++----- mcs/class/corlib/corlib_xtest.dll.sources | 11 ++++++++--- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/external/corefx b/external/corefx index c57553dcdb6..26b71b5a712 160000 --- a/external/corefx +++ b/external/corefx @@ -1 +1 @@ -Subproject commit c57553dcdb6bc9b34d0f133b6afad6430d91d13c +Subproject commit 26b71b5a712ea51a8b446fe72c2296c6d21d3a5d diff --git a/mcs/class/Facades/System.Memory/TypeForwarders.cs b/mcs/class/Facades/System.Memory/TypeForwarders.cs index af06b409217..d7d2b797acc 100644 --- a/mcs/class/Facades/System.Memory/TypeForwarders.cs +++ b/mcs/class/Facades/System.Memory/TypeForwarders.cs @@ -24,23 +24,20 @@ [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Memory<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ReadOnlyMemory<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.ReadOnlySpan<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.SequencePosition))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Span<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.BuffersExtensions))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.IBufferWriter<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.IMemoryOwner<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.IPinnable))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.MemoryManager<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.MemoryHandle))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.MemoryPool<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ReadOnlySequenceSegment<>))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ReadOnlySequence<>))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Binary.BinaryPrimitives))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Text.Base64))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Text.Utf8Formatter))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.Text.Utf8Parser))] [assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.MemoryMarshal))] - -// TODO: we don't have these types yet -// Needs to be update to match RTM -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.SequencePosition))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.BuffersExtensions))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.IBufferWriter<>))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.MemoryPool<>))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ReadOnlySequenceSegment<>))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Buffers.ReadOnlySequence<>))] -//[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.SequenceMarshal))] +[assembly:System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.InteropServices.SequenceMarshal))] diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources index 0ab713b294a..953be93eb40 100644 --- a/mcs/class/corlib/corlib.dll.sources +++ b/mcs/class/corlib/corlib.dll.sources @@ -1749,15 +1749,13 @@ corert/RuntimeAugments.cs ../../../external/corefx/src/System.Memory/src/System/Pinnable.cs ../../../external/corefx/src/System.Memory/src/System/MemoryExtensions.Portable.cs ../../../external/corefx/src/System.Memory/src/System/ReadOnlySpan.Portable.cs -#../../../external/corefx/src/System.Memory/src/System/SequencePosition.cs +../../../external/corefx/src/System.Memory/src/System/SequencePosition.cs ../../../external/corefx/src/System.Memory/src/System/SpanHelpers.cs ../../../external/corefx/src/System.Memory/src/System/Span.Portable.cs ../../../external/corefx/src/System.Memory/src/System/ThrowHelper.cs -#../../../external/corefx/src/System.Memory/src/System/Buffers/*.cs:ArrayMemoryPool.ArrayMemoryPoolBuffer.cs,ArrayMemoryPool.cs -#../../../external/corefx/src/System.Memory/src/System/Buffers/ReadOnlySequence.cs -#../../../external/corefx/src/System.Memory/src/System/Buffers/ReadOnlySequenceSegment.cs +../../../external/corefx/src/System.Memory/src/System/Buffers/*.cs ../../../external/corefx/src/System.Memory/src/System/Buffers/Binary/*.cs -../../../external/corefx/src/System.Memory/src/System/Runtime/InteropServices/MemoryMarshal.Portable.cs +../../../external/corefx/src/System.Memory/src/System/Runtime/InteropServices/*.cs ../../../external/corefx/src/Common/src/CoreLib/System/Buffers/Text/FormattingHelpers.CountDigits.cs ../../../external/corefx/src/System.Memory/src/System/Buffers/StandardFormat.cs diff --git a/mcs/class/corlib/corlib_xtest.dll.sources b/mcs/class/corlib/corlib_xtest.dll.sources index 7b3778c8f09..85b096b6ce1 100644 --- a/mcs/class/corlib/corlib_xtest.dll.sources +++ b/mcs/class/corlib/corlib_xtest.dll.sources @@ -3,6 +3,7 @@ ../../../external/corefx/src/Common/tests/System/RandomExtensions.cs ../../../external/corefx/src/Common/tests/System/RandomDataGenerator.cs +../../../external/corefx/src/Common/tests/System/Buffers/NativeMemoryManager.cs ../../../external/corefx/src/Common/tests/System/Diagnostics/Tracing/TestEventListener.cs ../../../external/corefx/src/Common/tests/System/Threading/ThreadTestHelpers.cs ../../../external/corefx/src/Common/tests/System/Threading/ThreadPoolHelpers.cs @@ -171,15 +172,19 @@ # System.Memory ../../../external/corefx/src/System.Memory/tests/*.cs +../../../external/corefx/src/System.Memory/tests/Base64/*.cs ../../../external/corefx/src/System.Memory/tests/Binary/*.cs ../../../external/corefx/src/System.Memory/tests/Memory/*.cs +../../../external/corefx/src/System.Memory/tests/MemoryMarshal/*.cs:CreateReadOnlySpan.cs,CreateSpan.cs +../../../external/corefx/src/System.Memory/tests/MemoryPool/*.cs +../../../external/corefx/src/System.Memory/tests/ParsersAndFormatters/*.cs +../../../external/corefx/src/System.Memory/tests/ParsersAndFormatters/Formatter/*.cs +../../../external/corefx/src/System.Memory/tests/ParsersAndFormatters/Parser/*.cs +../../../external/corefx/src/System.Memory/tests/ReadOnlyBuffer/*.cs ../../../external/corefx/src/System.Memory/tests/ReadOnlyMemory/*.cs ../../../external/corefx/src/System.Memory/tests/ReadOnlySpan/*.cs:GetPinnableReference.cs ../../../external/corefx/src/System.Memory/tests/Span/*.cs:Reflection.cs,GetPinnableReference.cs -../../../external/corefx/src/System.Memory/tests/ParsersAndFormatters/*.cs -../../../external/corefx/src/System.Memory/tests/ParsersAndFormatters/Formatter/*.cs -../../../external/corefx/src/System.Memory/tests/ParsersAndFormatters/Parser/*.cs # FIXME: this is internal in corlib ../../../external/corefx/src/Common/src/System/MutableDecimal.cs -- 2.11.4.GIT