Bump corert (#6420)

* Bump corert

* Bump API snapshot submodule

4 files changed, 125 insertions, 40 deletions

diff --git a/mcs/class/corlib/coreclr/SorterArray.cs b/mcs/class/corlib/coreclr/SorterArray.cs
index da5086b01e1..d8184f811d0 100644
--- a/mcs/class/corlib/coreclr/SorterArray.cs
+++ b/mcs/class/corlib/coreclr/SorterArray.cs
@@ -65,7 +65,7 @@ namespace System
 
                 try
                 {
-                    IntroSort(left, length + left - 1, 2 * IntrospectiveSortUtilities.FloorLog2(keys.Length));
+                    IntroSort(left, length + left - 1, 2 * IntrospectiveSortUtilities.FloorLog2PlusOne(keys.Length));
                 }
                 catch (IndexOutOfRangeException)
                 {
@@ -271,7 +271,7 @@ namespace System
 
                 try
                 {
-                    IntroSort(left, length + left - 1, 2 * IntrospectiveSortUtilities.FloorLog2(keys.Length));
+                    IntroSort(left, length + left - 1, 2 * IntrospectiveSortUtilities.FloorLog2PlusOne(keys.Length));
                 }
                 catch (IndexOutOfRangeException)
                 {
diff --git a/mcs/class/corlib/corefx/SR.cs b/mcs/class/corlib/corefx/SR.cs
index f08136e9fd8..862cedc12f1 100644
--- a/mcs/class/corlib/corefx/SR.cs
+++ b/mcs/class/corlib/corefx/SR.cs
@@ -50,6 +50,7 @@ partial class SR
 	public const string Arg_InvalidRuntimeTypeHandle = "Invalid RuntimeTypeHandle.";
 	public const string Arg_IOException = "I/O error occurred.";
 	public const string Arg_KeyNotFound = "The given key was not present in the dictionary.";
+	public const string Arg_KeyNotFoundWithKey = "The given key '{0}' was not present in the dictionary.";
 	public const string Arg_LongerThanSrcString = "Source string was not long enough. Check sourceIndex and count.";
 	public const string Arg_LowerBoundsMustMatch = "The arrays' lower bounds must be identical.";
 	public const string Arg_MissingFieldException = "Attempted to access a non-existing field.";
@@ -96,8 +97,8 @@ partial class SR
 	public const string Arg_OutOfMemoryException = "Insufficient memory to continue the execution of the program.";
 	public const string Arg_PlatformNotSupported = "Operation is not supported on this platform.";
 	public const string Arg_ParamName_Name = "Parameter name: {0}";
-	public const string Arg_PathIllegal = "The path is not of a legal form.";
-	public const string Arg_PathIllegalUNC = "The UNC path should be of the form \\\\\\\\server\\\\share.";
+	public const string Arg_PathEmpty = "The path is empty.";
+	public const string Arg_PathIllegalUNC_Path = "The UNC path '{0}' should be of the form \\\\\\\\server\\\\share.";
 	public const string Arg_RankException = "Attempted to operate on an array with the incorrect number of dimensions.";
 	public const string Arg_RankIndices = "Indices length does not match the array rank.";
 	public const string Arg_RankMultiDimNotSupported = "Only single dimensional arrays are supported for the requested action.";
@@ -203,7 +204,9 @@ partial class SR
 	public const string ArgumentOutOfRange_LengthTooLarge = "The specified length exceeds the maximum value of {0}.";
 	public const string ArgumentOutOfRange_NeedNonNegNum = "Non-negative number required.";
 	public const string ArgumentOutOfRange_NeedNonNegNumRequired = "Non-negative number required.";
-	public const string Argument_PathFormatNotSupported = "The given path's format is not supported.";
+	public const string ArgumentOutOfRange_NeedValidId = "The ID parameter must be in the range {0} through {1}.";
+	public const string Argument_InvalidTypeName = "The name of the type is invalid.";
+	public const string Argument_PathFormatNotSupported_Path = "The format of the path '{0}' is not supported.";
 	public const string Argument_RecursiveFallback = "Recursive fallback not allowed for character \\\\u{0:X4}.";
 	public const string Argument_RecursiveFallbackBytes = "Recursive fallback not allowed for bytes {0}.";
 	public const string Argument_ResultCalendarRange = "The result is out of the supported range for this calendar. The result should be between {0} (Gregorian date) and {1} (Gregorian date), inclusive.";
@@ -278,6 +281,7 @@ partial class SR
 	public const string ArgumentOutOfRange_NegativeCapacity = "Capacity must be positive.";
 	public const string ArgumentOutOfRange_NegativeCount = "Count cannot be less than zero.";
 	public const string ArgumentOutOfRange_NegativeLength = "Length cannot be less than zero.";
+	public const string ArgumentOutOfRange_NoGCLohSizeGreaterTotalSize = "lohSize can't be greater than totalSize";
 	public const string ArgumentOutOfRange_OffsetLength = "Offset and length must refer to a position in the string.";
 	public const string ArgumentOutOfRange_OffsetOut = "Either offset did not refer to a position in the string, or there is an insufficient length of destination character array.";
 	public const string ArgumentOutOfRange_PartialWCHAR = "Pointer startIndex and length do not refer to a valid string.";
@@ -302,7 +306,8 @@ partial class SR
 	public const string Format_BadBase64Char = "The input is not a valid Base-64 string as it contains a non-base 64 character, more than two padding characters, or an illegal character among the padding characters.";
 	public const string Format_BadBase64CharArrayLength = "Invalid length for a Base-64 char array or string.";
 	public const string Format_BadBoolean = "String was not recognized as a valid Boolean.";
-	public const string Format_BadFormatSpecifier = "Format specifier was invalid.";
+	public const string Format_BadFormatSpecifier = "Format specifier '{0}' was invalid.";
+	public const string Format_NoFormatSpecifier = "No format specifiers were provided.";
 	public const string Format_BadQuote = "Cannot find a matching quote character for the character '{0}'.";
 	public const string Format_EmptyInputString = "Input string was either empty or contained only whitespace.";
 	public const string Format_GuidHexPrefix = "Expected hex 0x in '{0}'.";
@@ -356,7 +361,9 @@ partial class SR
 	public const string InvalidProgram_Specific = "Common Language Runtime detected an invalid program. The body of method '{0}' is invalid.";
 	public const string InvalidProgram_Vararg = "Method '{0}' has a variable argument list. Variable argument lists are not supported in .NET Core.";
 	public const string InvalidProgram_CallVirtFinalize = "Object.Finalize() can not be called directly. It is only callable by the runtime.";
+	public const string InvalidProgram_NativeCallable = "NativeCallable method cannot be called from managed code.";
 	public const string InvalidTimeZone_InvalidRegistryData = "The time zone ID '{0}' was found on the local computer, but the registry information was corrupt.";
+	public const string IO_DriveNotFound_Drive = "Could not find the drive '{0}'. The drive might not be ready or might not be mapped.";
 	public const string IO_FileExists_Name = "The file '{0}' already exists.";
 	public const string IO_FileName_Name = "File name: '{0}'";
 	public const string IO_FileNotFound = "Unable to find the specified file.";
@@ -365,7 +372,8 @@ partial class SR
 	public const string IO_FileLoad_FileName = "Could not load the file '{0}'.";
 	public const string IO_PathNotFound_NoPathName = "Could not find a part of the path.";
 	public const string IO_PathNotFound_Path = "Could not find a part of the path '{0}'.";
-	public const string IO_PathTooLong = "The specified path, file name, or both are too long. The fully qualified file name must be less than 260 characters, and the directory name must be less than 248 characters.";
+	public const string IO_PathTooLong = "The specified file name or path is too long, or a component of the specified path is too long.";
+	public const string IO_PathTooLong_Path = "The path '{0}' is too long, or a component of the specified path is too long.";
 	public const string IO_SharingViolation_File = "The process cannot access the file '{0}' because it is being used by another process.";
 	public const string IO_SharingViolation_NoFileName = "The process cannot access the file because it is being used by another process.";
 	public const string IO_AlreadyExists_Name = "Cannot create '{0}' because a file or directory with the same name already exists.";
@@ -462,15 +470,15 @@ partial class SR
 	public const string InvalidCast_Empty = "Object cannot be cast to Empty.";
 	public const string Arg_UnknownTypeCode = "Unknown TypeCode value.";
 	public const string Format_BadDatePattern = "Could not determine the order of year, month, and date from '{0}'.";
-	public const string Format_BadDateTime = "String was not recognized as a valid DateTime.";
-	public const string Format_BadDateTimeCalendar = "The DateTime represented by the string is not supported in calendar {0}.";
-	public const string Format_BadDayOfWeek = "String was not recognized as a valid DateTime because the day of week was incorrect.";
-	public const string Format_DateOutOfRange = "The DateTime represented by the string is out of range.";
-	public const string Format_MissingIncompleteDate = "There must be at least a partial date with a year present in the input.";
-	public const string Format_OffsetOutOfRange = "The time zone offset must be within plus or minus 14 hours.";
+	public const string Format_BadDateTime = "String '{0}' was not recognized as a valid DateTime.";
+	public const string Format_BadDateTimeCalendar = "The DateTime represented by the string '{0}' is not supported in calendar '{1}'.";
+	public const string Format_BadDayOfWeek = "String '{0}' was not recognized as a valid DateTime because the day of week was incorrect.";
+	public const string Format_DateOutOfRange = "The DateTime represented by the string '{0}' is out of range.";
+	public const string Format_MissingIncompleteDate = "There must be at least a partial date with a year present in the input string '{0}'.";
+	public const string Format_OffsetOutOfRange = "The time zone offset of string '{0}' must be within plus or minus 14 hours.";
 	public const string Format_RepeatDateTimePattern = "DateTime pattern '{0}' appears more than once with different values.";
-	public const string Format_UnknowDateTimeWord = "The string was not recognized as a valid DateTime. There is an unknown word starting at index {0}.";
-	public const string Format_UTCOutOfRange = "The UTC representation of the date falls outside the year range 1-9999.";
+	public const string Format_UnknownDateTimeWord = "The string '{0}' was not recognized as a valid DateTime. There is an unknown word starting at index '{1}'.";
+	public const string Format_UTCOutOfRange = "The UTC representation of the date '{0}' falls outside the year range 1-9999.";
 	public const string RFLCT_Ambiguous = "Ambiguous match found.";
 	public const string AggregateException_ctor_DefaultMessage = "One or more errors occurred.";
 	public const string AggregateException_ctor_InnerExceptionNull = "An element of innerExceptions was null.";
@@ -526,7 +534,6 @@ partial class SR
 	public const string ManualResetEventSlim_ctor_SpinCountOutOfRange = "The spinCount argument must be in the range 0 to {0}, inclusive.";
 	public const string ManualResetEventSlim_ctor_TooManyWaiters = "There are too many threads currently waiting on the event. A maximum of {0} waiting threads are supported.";
 	public const string InvalidOperation_SendNotSupportedOnWindowsRTSynchronizationContext = "Send is not supported in the Windows Runtime SynchronizationContext";
-	public const string InvalidOperation_SetData_OnlyOnce = "SetData can only be used to set the value of a given name once.";
 	public const string SemaphoreSlim_Disposed = "The semaphore has been disposed.";
 	public const string SemaphoreSlim_Release_CountWrong = "The releaseCount argument must be greater than zero.";
 	public const string SemaphoreSlim_Wait_TimeoutWrong = "The timeout must represent a value between -1 and Int32.MaxValue, inclusive.";
@@ -592,7 +599,7 @@ partial class SR
 	public const string Argument_NeedStructWithNoRefs = "The specified Type must be a struct containing no references.";
 	public const string ArgumentNull_Buffer = "Buffer cannot be null.";
 	public const string ArgumentOutOfRange_AddressSpace = "The number of bytes cannot exceed the virtual address space on a 32 bit machine.";
-	public const string ArgumentOutOfRange_UIntPtrMaxMinusOne = "The length of the buffer must be less than the maximum UIntPtr value for your platform.";
+	public const string ArgumentOutOfRange_UIntPtrMax = "The length of the buffer must be less than the maximum UIntPtr value for your platform.";
 	public const string Arg_BufferTooSmall = "Not enough space available in the buffer.";
 	public const string InvalidOperation_MustCallInitialize = "You must call Initialize on this object instance before using it.";
 	public const string ArgumentException_BufferNotFromPool = "The buffer is not associated with this pool and may not be returned to it.";
@@ -621,7 +628,7 @@ partial class SR
 	public const string IO_EOF_ReadBeyondEOF = "Unable to read beyond the end of the stream.";
 	public const string Arg_EndOfStreamException = "Attempted to read past the end of the stream.";
 	public const string ObjectDisposed_FileClosed = "Cannot access a closed file.";
-	public const string Arg_InvalidSearchPattern = "Search pattern cannot contain \\\"..\\\" to move up directories and can be contained only internally in file/directory names, as in \\\"a..b\\\".";
+	public const string Arg_InvalidSearchPattern = "Search pattern '{0}' cannot contain \"..\" to move up directories and can be contained only internally in file/directory names, as in \"a..b\".";
 	public const string ArgumentOutOfRange_FileLengthTooBig = "Specified file length was too large for the file system.";
 	public const string Argument_InvalidHandle = "'handle' has been disposed or is an invalid handle.";
 	public const string Argument_AlreadyBoundOrSyncHandle = "'handle' has already been bound to the thread pool, or was not opened for asynchronous I/O.";
@@ -659,12 +666,10 @@ partial class SR
 	public const string Serialization_NullKey = "One of the serialized keys is null.";
 	public const string NotSupported_KeyCollectionSet = "Mutating a key collection derived from a dictionary is not allowed.";
 	public const string NotSupported_ValueCollectionSet = "Mutating a value collection derived from a dictionary is not allowed.";
-	public const string IO_IO_StreamTooLong = "Stream was too long.";
 	public const string UnauthorizedAccess_MemStreamBuffer = "MemoryStream's internal buffer cannot be accessed.";
 	public const string NotSupported_MemStreamNotExpandable = "Memory stream is not expandable.";
-	public const string IO_IO_SeekBeforeBegin = "An attempt was made to move the position before the beginning of the stream.";
 	public const string ArgumentNull_Stream = "Stream cannot be null.";
-	public const string IO_IO_InvalidStringLen_Len = "BinaryReader encountered an invalid string length of {0} characters.";
+	public const string IO_InvalidStringLen_Len = "BinaryReader encountered an invalid string length of {0} characters.";
 	public const string ArgumentOutOfRange_BinaryReaderFillBuffer = "The number of bytes requested does not fit into BinaryReader's internal buffer.";
 	public const string Serialization_InsufficientDeserializationState = "Insufficient state to deserialize the object. Missing field '{0}'.";
 	public const string NotSupported_UnitySerHolder = "The UnitySerializationHolder object is designed to transmit information about other types and is not serializable itself.";
@@ -753,16 +758,71 @@ partial class SR
 	public const string Overflow_Currency = "Value was either too large or too small for a Currency.";
 	public const string PlatformNotSupported_SecureBinarySerialization = "Secure binary serialization is not supported on this platform.";
 	public const string Serialization_InvalidPtrValue = "An IntPtr or UIntPtr with an eight byte value cannot be deserialized on a machine with a four byte word size.";
+	public const string EventSource_AbstractMustNotDeclareEventMethods = "Abstract event source must not declare event methods ({0} with ID {1}).";
+	public const string EventSource_AbstractMustNotDeclareKTOC = "Abstract event source must not declare {0} nested type.";
+	public const string EventSource_AddScalarOutOfRange = "Getting out of bounds during scalar addition.";
+	public const string EventSource_BadHexDigit = "Bad Hexidecimal digit \"{0}\".";
+	public const string EventSource_ChannelTypeDoesNotMatchEventChannelValue = "Channel {0} does not match event channel value {1}.";
+	public const string EventSource_DataDescriptorsOutOfRange = "Data descriptors are out of range.";
+	public const string EventSource_DuplicateStringKey = "Multiple definitions for string \"{0}\".";
+	public const string EventSource_EnumKindMismatch = "The type of {0} is not expected in {1}.";
+	public const string EventSource_EvenHexDigits = "Must have an even number of Hexidecimal digits.";
+	public const string EventSource_EventChannelOutOfRange = "Channel {0} has a value of {1} which is outside the legal range (16-254).";
+	public const string EventSource_EventIdReused = "Event {0} has ID {1} which is already in use.";
+	public const string EventSource_EventMustHaveTaskIfNonDefaultOpcode = "Event {0} (with ID {1}) has a non-default opcode but not a task.";
+	public const string EventSource_EventMustNotBeExplicitImplementation = "Event method {0} (with ID {1}) is an explicit interface method implementation. Re-write method as implicit implementation.";
+	public const string EventSource_EventNameDoesNotEqualTaskPlusOpcode = "Event {0} (with ID {1}) has a name that is not the concatenation of its task name and opcode.";
+	public const string EventSource_EventNameReused = "Event name {0} used more than once.  If you wish to overload a method, the overloaded method should have a NonEvent attribute.";
+	public const string EventSource_EventParametersMismatch = "Event {0} was called with {1} argument(s), but it is defined with {2} parameter(s).";
+	public const string EventSource_EventSourceGuidInUse = "An instance of EventSource with Guid {0} already exists.";
+	public const string EventSource_EventTooBig = "The payload for a single event is too large.";
+	public const string EventSource_EventWithAdminChannelMustHaveMessage = "Event {0} specifies an Admin channel {1}. It must specify a Message property.";
+	public const string EventSource_IllegalKeywordsValue = "Keyword {0} has a value of {1} which is outside the legal range (0-0x0000080000000000).";
+	public const string EventSource_IllegalOpcodeValue = "Opcode {0} has a value of {1} which is outside the legal range (11-238).";
+	public const string EventSource_IllegalTaskValue = "Task {0} has a value of {1} which is outside the legal range (1-65535).";
+	public const string EventSource_IllegalValue = "Illegal value \"{0}\" (prefix strings with @ to indicate a literal string).";
+	public const string EventSource_IncorrentlyAuthoredTypeInfo = "Incorrectly-authored TypeInfo - a type should be serialized as one field or as one group";
+	public const string EventSource_InvalidCommand = "Invalid command value.";
+	public const string EventSource_InvalidEventFormat = "Can't specify both etw event format flags.";
+	public const string EventSource_KeywordCollision = "Keywords {0} and {1} are defined with the same value ({2}).";
+	public const string EventSource_KeywordNeedPowerOfTwo = "Value {0} for keyword {1} needs to be a power of 2.";
+	public const string EventSource_ListenerCreatedInsideCallback = "Creating an EventListener inside a EventListener callback.";
 	public const string EventSource_ListenerNotFound = "Listener not found.";
-	public const string EventSource_ToString = "EventSource({0}, {1})";
-	public const string EventSource_ImplementGetMetadata = "Please implement the GetMetadata method in your derived class";
+	public const string EventSource_ListenerWriteFailure = "An error occurred when writing to a listener.";
+	public const string EventSource_MaxChannelExceeded = "Attempt to define more than the maximum limit of 8 channels for a provider.";
+	public const string EventSource_MismatchIdToWriteEvent = "Event {0} was assigned event ID {1} but {2} was passed to WriteEvent.";
 	public const string EventSource_NeedGuid = "The Guid of an EventSource must be non zero.";
 	public const string EventSource_NeedName = "The name of an EventSource must not be null.";
-	public const string EventSource_NeedDescriptors = "The descriptor of an EventSource must be non-null.";
-	public const string EventSource_NeedManifest = "The manifest of an EventSource must be non-null.";
-	public const string EventSource_EventSourceGuidInUse = "An instance of EventSource with Guid {0} already exists.";
-	public const string EventSource_ListenerWriteFailure = "An error occurred when writing to a listener.";
-	public const string EventSource_NoManifest = "A manifest could not be generated for this EventSource because it contains one or more ill-formed event methods.";
+	public const string EventSource_NeedPositiveId = "Event IDs must be positive integers.";
+	public const string EventSource_NoFreeBuffers = "No Free Buffers available from the operating system (e.g. event rate too fast).";
+	public const string EventSource_NonCompliantTypeError = "The API supports only anonymous types or types decorated with the EventDataAttribute. Non-compliant type: {0} dataType.";
+	public const string EventSource_NoRelatedActivityId = "EventSource expects the first parameter of the Event method to be of type Guid and to be named \"relatedActivityId\" when calling WriteEventWithRelatedActivityId.";
+	public const string EventSource_NotSupportedArrayOfBinary = "Arrays of Binary are not supported.";
+	public const string EventSource_NotSupportedArrayOfNil = "Arrays of Nil are not supported.";
+	public const string EventSource_NotSupportedArrayOfNullTerminatedString = "Arrays of null-terminated string are not supported.";
+	public const string EventSource_NotSupportedCustomSerializedData = "Enumerables of custom-serialized data are not supported";
+	public const string EventSource_NotSupportedNestedArraysEnums = "Nested arrays/enumerables are not supported.";
+	public const string EventSource_NullInput = "Null passed as a event argument.";
+	public const string EventSource_OpcodeCollision = "Opcodes {0} and {1} are defined with the same value ({2}).";
+	public const string EventSource_PinArrayOutOfRange = "Pins are out of range.";
+	public const string EventSource_RecursiveTypeDefinition = "Recursive type definition is not supported.";
+	public const string EventSource_SessionIdError = "Bit position in AllKeywords ({0}) must equal the command argument named \"EtwSessionKeyword\" ({1}).";
+	public const string EventSource_StopsFollowStarts = "An event with stop suffix must follow a corresponding event with a start suffix.";
+	public const string EventSource_TaskCollision = "Tasks {0} and {1} are defined with the same value ({2}).";
+	public const string EventSource_TaskOpcodePairReused = "Event {0} (with ID {1}) has the same task/opcode pair as event {2} (with ID {3}).";
+	public const string EventSource_TooManyArgs = "Too many arguments.";
+	public const string EventSource_TooManyFields = "Too many fields in structure.";
+	public const string EventSource_ToString = "EventSource({0}, {1})";
+	public const string EventSource_TraitEven = "There must be an even number of trait strings (they are key-value pairs).";
+	public const string EventSource_TypeMustBeSealedOrAbstract = "Event source types must be sealed or abstract.";
+	public const string EventSource_TypeMustDeriveFromEventSource = "Event source types must derive from EventSource.";
+	public const string EventSource_UndefinedChannel = "Use of undefined channel value {0} for event {1}.";
+	public const string EventSource_UndefinedKeyword = "Use of undefined keyword value {0} for event {1}.";
+	public const string EventSource_UndefinedOpcode = "Use of undefined opcode value {0} for event {1}.";
+	public const string EventSource_UnknownEtwTrait = "Unknown ETW trait \"{0}\".";
+	public const string EventSource_UnsupportedEventTypeInManifest = "Unsupported type {0} in event source.";
+	public const string EventSource_UnsupportedMessageProperty = "Event {0} specifies an illegal or unsupported formatting message (\"{1}\").";
+	public const string EventSource_VarArgsParameterMismatch = "The parameters to the Event method do not match the parameters to the WriteEvent method. This may cause the event to be displayed incorrectly.";
 	public const string Argument_StreamNotWritable = "Stream was not writable.";
 	public const string Arg_SurrogatesNotAllowedAsSingleChar = "Unicode surrogate characters must be written out as pairs together in the same call, not individually. Consider passing in a character array instead.";
 	public const string CustomAttributeFormat_InvalidFieldFail = "'{0}' field specified was not found.";
@@ -774,9 +834,30 @@ partial class SR
 	public const string ArrayTypeMismatch_ConstrainedCopy = "Array.ConstrainedCopy will only work on array types that are provably compatible, without any form of boxing, unboxing, widening, or casting of each array element.  Change the array types (i.e., copy a Derived[] to a Base[]), or use a mitigation strategy in the CER for Array.Copy's less powerful reliability contract, such as cloning the array or throwing away the potentially corrupt destination array.";
 	public const string Arg_DllNotFoundException = "Dll was not found.";
 	public const string Arg_DllNotFoundExceptionParameterized = "Unable to load DLL '{0}': The specified module could not be found.";
+	public const string Arg_DriveNotFoundException = "Attempted to access a drive that is not available.";
 	public const string WrongSizeArrayInNStruct = "Type could not be marshaled because the length of an embedded array instance does not match the declared length in the layout.";
 	public const string Arg_InteropMarshalUnmappableChar = "Cannot marshal: Encountered unmappable character.";
 	public const string Arg_MarshalDirectiveException = "Marshaling directives are invalid.";
+	public const string Arg_RegSubKeyValueAbsent = "No value exists with that name.";
+	public const string Arg_RegValStrLenBug = "Registry value names should not be greater than 16,383 characters.";
+	public const string Serialization_DelegatesNotSupported = "Serializing delegates is not supported on this platform.";
+	public const string Arg_OpenType = "Cannot create an instance of {0} as it is an open type.";
+	public const string Arg_PlatformNotSupported_AssemblyName_GetAssemblyName = "AssemblyName.GetAssemblyName() is not supported on this platform.";
+	public const string NotSupported_OpenType = "Cannot create arrays of open type.";
+	public const string NotSupported_ByRefLikeArray = "Cannot create arrays of ByRef-like values.";
+	public const string StackTrace_AtWord = "   at ";
+	public const string StackTrace_EndStackTraceFromPreviousThrow = "--- End of stack trace from previous location where exception was thrown ---";
+	public const string InvalidAssemblyName = "The given assembly name or codebase was invalid";
+	public const string Argument_HasToBeArrayClass = "Must be an array type.";
+	public const string Argument_IdnBadBidi = "Left to right characters may not be mixed with right to left characters in IDN labels.";
+	public const string Argument_IdnBadNameSize = "IDN names must be between 1 and {0} characters long.";
+	public const string Argument_IdnBadStd3 = "Label contains character '{0}' not allowed with UseStd3AsciiRules";
+	public const string InvalidOperation_NotGenericType = "This operation is only valid on generic types.";
+	public const string NotSupported_SignatureType = "This method is not supported on signature types.";
+	public const string Memory_ThrowIfDisposed = "Memory<T> has been disposed.";
+	public const string Memory_OutstandingReferences = "Release all references before disposing this instance.";
+	public const string HashCode_HashCodeNotSupported = "HashCode is a mutable struct and should not be compared with other HashCodes. Use ToHashCode to retrieve the computed hash code.";
+	public const string HashCode_EqualityNotSupported = "HashCode is a mutable struct and should not be compared with other HashCodes.";
 	public const string BlockingCollection_Add_ConcurrentCompleteAdd = "CompleteAdding may not be used concurrently with additions to the collection.";
 	public const string BlockingCollection_Add_Failed = "The underlying collection didn't accept the item.";
 	public const string BlockingCollection_CantAddAnyWhenCompleted = "At least one of the specified collections is marked as complete with regards to additions.";
@@ -818,7 +899,6 @@ partial class SR
 	public const string PartitionerStatic_CanNotCallGetEnumeratorAfterSourceHasBeenDisposed = "Can not call GetEnumerator on partitions after the source enumerable is disposed";
 	public const string PartitionerStatic_CurrentCalledBeforeMoveNext = "MoveNext must be called at least once before calling Current.";
 	public const string ConcurrentBag_Enumerator_EnumerationNotStartedOrAlreadyFinished = "Enumeration has either not started or has already finished.";
-	public const string Arg_KeyNotFoundWithKey = "The given key '{0}' was not present in the dictionary.";
 	public const string ArrayTypeMustBeExactMatch = "The array type must be exactly {0}.";
 	public const string CannotCallEqualsOnSpan = "Equals() on Span and ReadOnlySpan is not supported. Use operator== instead.";
 	public const string CannotCallGetHashCodeOnSpan = "GetHashCode() on Span and ReadOnlySpan is not supported.";
diff --git a/mcs/class/corlib/corert/RuntimeThread.cs b/mcs/class/corlib/corert/RuntimeThread.cs
index 72810fade38..a296d8cbc21 100644
--- a/mcs/class/corlib/corert/RuntimeThread.cs
+++ b/mcs/class/corlib/corert/RuntimeThread.cs
@@ -1,9 +1,14 @@
 namespace Internal.Runtime.Augments
 {
-    class RuntimeThread
-    {
-    	public static void InitializeThreadPoolThread ()
-    	{
-    	}
-    }
+	class RuntimeThread
+	{
+		public static RuntimeThread InitializeThreadPoolThread ()
+		{
+			return default;
+		}
+
+		public void ResetThreadPoolThread ()
+		{
+		}
+	}
 }
\ No newline at end of file
diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources
index 82573d852c4..821afe19aeb 100644
--- a/mcs/class/corlib/corlib.dll.sources
+++ b/mcs/class/corlib/corlib.dll.sources
@@ -1636,11 +1636,14 @@ corert/ThreadPoolBoundHandle.cs
 
 ../../../external/corert/src/Runtime.Base/src/System/Runtime/InteropServices/NativeCallableAttribute.cs
 
+../../../external/corert/src/System.Private.CoreLib/shared/System/Tuple.cs
 ../../../external/corert/src/System.Private.CoreLib/shared/System/TupleExtensions.cs
 ../../../external/corert/src/System.Private.CoreLib/shared/System/ValueTuple.cs
 
 ../../../external/corert/src/System.Private.CoreLib/shared/System/Collections/DictionaryEntry.cs
 
+../../../external/corert/src/System.Private.CoreLib/shared/System/Collections/Generic/Dictionary.cs
+../../../external/corert/src/System.Private.CoreLib/shared/System/Collections/Generic/IDictionaryDebugView.cs
 ../../../external/corert/src/System.Private.CoreLib/shared/System/Collections/Generic/KeyValuePair.cs
 
 ../../../external/corert/src/System.Private.CoreLib/shared/System/Diagnostics/Debug.cs
@@ -1655,15 +1658,12 @@ corert/ThreadPoolBoundHandle.cs
 
 
 ../../../external/corert/src/System.Private.CoreLib/src/System/Array.cs
-../../../external/corert/src/System.Private.CoreLib/src/System/Tuple.cs
 
 ../../../external/corert/src/System.Private.CoreLib/src/System/Collections/LowLevelComparer.cs
-../../../external/corert/src/System.Private.CoreLib/src/System/Collections/ObjectEqualityComparer.cs
 
 ../../../external/corert/src/System.Private.CoreLib/src/System/Collections/Generic/ArraySortHelper.cs
-../../../external/corert/src/System.Private.CoreLib/src/System/Collections/Generic/IDictionaryDebugView.cs
-../../../external/corert/src/System.Private.CoreLib/src/System/Collections/Generic/Dictionary.cs
-../../../external/corert/src/System.Private.CoreLib/src/System/Collections/Generic/NonRandomizedStringEqualityComparer.cs
+
+../../../external/corert/src/System.Private.CoreLib/src/System/Threading/ThreadPoolCallbackWrapper.cs
 
 corefx/SR.cs