From 0a515cf13be8b87993c60494d2be80df17031bfe Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Thu, 6 Oct 2016 15:10:09 +0200 Subject: [PATCH] [corlib] Add ValueTuple --- .gitmodules | 3 +++ external/corefx | 1 + mcs/class/corlib/Makefile | 2 +- mcs/class/corlib/corefx/SR.cs | 7 +++++++ mcs/class/corlib/corlib.dll.sources | 11 +++++++++-- 5 files changed, 21 insertions(+), 3 deletions(-) create mode 160000 external/corefx create mode 100644 mcs/class/corlib/corefx/SR.cs diff --git a/.gitmodules b/.gitmodules index 6d87209417e..1c8f76e0107 100644 --- a/.gitmodules +++ b/.gitmodules @@ -43,3 +43,6 @@ path = external/boringssl url = git://github.com/mono/boringssl.git branch = mono +[submodule "external/corefx"] + path = external/corefx + url = git://github.com/mono/corefx.git diff --git a/external/corefx b/external/corefx new file mode 160000 index 00000000000..b1aa1d92ca3 --- /dev/null +++ b/external/corefx @@ -0,0 +1 @@ +Subproject commit b1aa1d92ca33d0cb8ffbac9b6ff73b284db6bbf1 diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile index a0f17b0f196..c05eb889821 100644 --- a/mcs/class/corlib/Makefile +++ b/mcs/class/corlib/Makefile @@ -35,7 +35,7 @@ RESOURCE_FILES = \ resources/collation.cjkKO.bin \ resources/collation.cjkKOlv2.bin -REFERENCE_SOURCES_FLAGS = -d:FEATURE_PAL,GENERICS_WORK,FEATURE_LIST_PREDICATES,FEATURE_SERIALIZATION,FEATURE_ASCII,FEATURE_LATIN1,FEATURE_UTF7,FEATURE_UTF32,MONO_HYBRID_ENCODING_SUPPORT,FEATURE_ASYNC_IO,NEW_EXPERIMENTAL_ASYNC_IO,FEATURE_UTF32,FEATURE_EXCEPTIONDISPATCHINFO,FEATURE_CORRUPTING_EXCEPTIONS,FEATURE_EXCEPTION_NOTIFICATIONS,FEATURE_STRONGNAME_MIGRATION,FEATURE_USE_LCID,FEATURE_FUSION,FEATURE_CRYPTO,FEATURE_X509_SECURESTRINGS,FEATURE_SYNCHRONIZATIONCONTEXT,FEATURE_SYNCHRONIZATIONCONTEXT_WAIT +REFERENCE_SOURCES_FLAGS = -d:FEATURE_PAL,GENERICS_WORK,FEATURE_LIST_PREDICATES,FEATURE_SERIALIZATION,FEATURE_ASCII,FEATURE_LATIN1,FEATURE_UTF7,FEATURE_UTF32,MONO_HYBRID_ENCODING_SUPPORT,FEATURE_ASYNC_IO,NEW_EXPERIMENTAL_ASYNC_IO,FEATURE_UTF32,FEATURE_EXCEPTIONDISPATCHINFO,FEATURE_CORRUPTING_EXCEPTIONS,FEATURE_EXCEPTION_NOTIFICATIONS,FEATURE_STRONGNAME_MIGRATION,FEATURE_USE_LCID,FEATURE_FUSION,FEATURE_CRYPTO,FEATURE_X509_SECURESTRINGS,FEATURE_SYNCHRONIZATIONCONTEXT,FEATURE_SYNCHRONIZATIONCONTEXT_WAIT,HAS_CORLIB_CONTRACTS ifndef MOBILE_PROFILE REFERENCE_SOURCES_FLAGS += -d:FEATURE_MACL diff --git a/mcs/class/corlib/corefx/SR.cs b/mcs/class/corlib/corefx/SR.cs new file mode 100644 index 00000000000..7330ff645cf --- /dev/null +++ b/mcs/class/corlib/corefx/SR.cs @@ -0,0 +1,7 @@ +// TODO: Should be auto-generated from resources.resx + +static class SR +{ + public const string ArgumentException_ValueTupleIncorrectType = "The parameter should be a ValueTuple type of appropriate arity."; + public const string ArgumentException_ValueTupleLastArgumentNotAValueTuple = "The TRest type argument of ValueTuple`8 must be a ValueTuple."; +} \ No newline at end of file diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources index 63f78fbf85b..e2dfdbb5b8f 100644 --- a/mcs/class/corlib/corlib.dll.sources +++ b/mcs/class/corlib/corlib.dll.sources @@ -906,6 +906,8 @@ ReferenceSources/SharedStatics.cs ReferenceSources/SecurityContext.cs ReferenceSources/PathInternal.cs ReferenceSources/BinaryCompatibility.cs +ReferenceSources/String.cs +ReferenceSources/Type.cs ../referencesource/mscorlib/system/__filters.cs ../referencesource/mscorlib/system/__hresults.cs @@ -1640,5 +1642,10 @@ ReferenceSources/BinaryCompatibility.cs ../referencesource/mscorlib/microsoft/win32/safehandles/safewaithandle.cs ../referencesource/mscorlib/microsoft/win32/safehandles/win32safehandles.cs -ReferenceSources/String.cs -ReferenceSources/Type.cs +corefx/SR.cs + +../../../external/corefx/src/Common/src/System/Numerics/Hashing/HashHelpers.cs + +../../../external/corefx/src/System.ValueTuple/src/System/ValueTuple/ValueTuple.cs +../../../external/corefx/src/System.ValueTuple/src/System/ValueTuple/TupleExtensions.cs +../../../external/corefx/src/System.ValueTuple/src/System/Runtime/CompilerServices/TupleElementNamesAttribute.cs -- 2.25.1