Imported Upstream version 5.10.1.25
Former-commit-id: 14ef8af3b54f8c453b5049813edca31fa68f672b
This commit is contained in:
parent
fa33682fe9
commit
f31f5cf987
@ -1 +1 @@
|
||||
4f949ee4d3493ae84799bc004909d8c02cd95387
|
||||
4f583806bb8c4568601605309293ef257e338bf6
|
@ -1 +1 @@
|
||||
5bc587207ca36625c9e0ef11bedf144610db22df
|
||||
7f5772066f164630cebec71d176804ed59bd8c71
|
@ -1 +1 @@
|
||||
6ee3ca8968f7c2c5a13fde0d89329b4efbbd7f4f
|
||||
b7c15b7b9fa8148f527c4a789c88891b3083d91e
|
@ -1 +1 @@
|
||||
e2fe033997a386b136170ffee03d043df47c88df
|
||||
0b5f3952cc382be37d272154abe74be5a66a17ec
|
@ -1 +1 @@
|
||||
0aabd5e9b1f4b5f354b3f274cad6983bfa8434e8
|
||||
e666675a5e7c7a12e9a991ff5c40ea2427b626d2
|
@ -1 +1 @@
|
||||
caea80eb9a8aeae8d816300ba49e3e58a189a287
|
||||
1f3ffce45e728f3afdbcc4f62441ec66b01d28b9
|
@ -1 +1 @@
|
||||
f41727750b395e4019243785bcefced55377f2f3
|
||||
7f3bafeaee74306109dc28c841c32bf76b62e0a2
|
@ -1 +1 @@
|
||||
9a68bbd21ee9196ff71f50bc108c1324eae4f4f9
|
||||
4aceab7b6bffa92aab373aabde9c34d48d497e91
|
@ -10,7 +10,7 @@ namespace System.Buffers
|
||||
/// <summary>
|
||||
/// Provides a mechanism for manual lifetime management.
|
||||
/// </summary>
|
||||
public interface IRetainable
|
||||
interface IRetainable
|
||||
{
|
||||
/// <summary>
|
||||
/// Call this method to indicate that the IRetainable object is in use.
|
||||
|
@ -10,7 +10,7 @@ namespace System.Buffers
|
||||
/// <summary>
|
||||
/// A handle for the memory.
|
||||
/// </summary>
|
||||
public unsafe struct MemoryHandle : IDisposable
|
||||
unsafe struct MemoryHandle : IDisposable
|
||||
{
|
||||
private IRetainable _retainable;
|
||||
private void* _pointer;
|
||||
|
@ -10,7 +10,7 @@ namespace System.Buffers
|
||||
/// <summary>
|
||||
/// Owner of Memory<typeparamref name="T"/> that provides appropriate lifetime management mechanisms for it.
|
||||
/// </summary>
|
||||
public abstract class OwnedMemory<T> : IDisposable, IRetainable
|
||||
abstract class OwnedMemory<T> : IDisposable, IRetainable
|
||||
{
|
||||
/// <summary>
|
||||
/// The number of items in the Memory<typeparamref name="T"/>.
|
||||
|
@ -239,7 +239,7 @@ namespace System
|
||||
/// Returns a handle for the array.
|
||||
/// <param name="pin">If pin is true, the GC will not move the array and hence its address can be taken</param>
|
||||
/// </summary>
|
||||
public unsafe MemoryHandle Retain(bool pin = false)
|
||||
unsafe MemoryHandle Retain(bool pin = false)
|
||||
{
|
||||
MemoryHandle memoryHandle = default;
|
||||
if (pin)
|
||||
|
@ -217,7 +217,7 @@ namespace System
|
||||
/// If pin is true, the GC will not move the array until the returned <see cref="MemoryHandle"/>
|
||||
/// is disposed, enabling the memory's address can be taken and used.
|
||||
/// </param>
|
||||
public unsafe MemoryHandle Retain(bool pin = false)
|
||||
unsafe MemoryHandle Retain(bool pin = false)
|
||||
{
|
||||
MemoryHandle memoryHandle = default;
|
||||
if (pin)
|
||||
|
@ -14,7 +14,7 @@ namespace System.Runtime.InteropServices
|
||||
/// Provides a collection of methods for interoperating with <see cref="Memory{T}"/>, <see cref="ReadOnlyMemory{T}"/>,
|
||||
/// <see cref="Span{T}"/>, and <see cref="ReadOnlySpan{T}"/>.
|
||||
/// </summary>
|
||||
public static class MemoryMarshal
|
||||
static class MemoryMarshal
|
||||
{
|
||||
/// <summary>Creates a <see cref="Memory{T}"/> from a <see cref="ReadOnlyMemory{T}"/>.</summary>
|
||||
/// <param name="readOnlyMemory">The <see cref="ReadOnlyMemory{T}"/>.</param>
|
||||
|
@ -19,6 +19,9 @@ using System.Diagnostics.Private;
|
||||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Threading;
|
||||
#if MONO
|
||||
using System.Runtime.Serialization;
|
||||
#endif
|
||||
|
||||
namespace System.Collections.Concurrent
|
||||
{
|
||||
@ -56,11 +59,20 @@ namespace System.Collections.Concurrent
|
||||
}
|
||||
}
|
||||
|
||||
[NonSerialized]
|
||||
private volatile Tables _tables; // Internal tables of the dictionary
|
||||
private IEqualityComparer<TKey> _comparer; // Key equality comparer
|
||||
[NonSerialized]
|
||||
private readonly bool _growLockArray; // Whether to dynamically increase the size of the striped lock
|
||||
[NonSerialized]
|
||||
private int _budget; // The maximum number of elements per lock before a resize operation is triggered
|
||||
|
||||
#if MONO
|
||||
private KeyValuePair<TKey, TValue>[] _serializationArray; // Used for custom serialization
|
||||
private int _serializationConcurrencyLevel; // used to save the concurrency level in serialization
|
||||
private int _serializationCapacity; // used to save the capacity in serialization
|
||||
#endif
|
||||
|
||||
// The default capacity, i.e. the initial # of buckets. When choosing this value, we are making
|
||||
// a trade-off between the size of a very small dictionary, and the number of resizes when
|
||||
// constructing a large dictionary. Also, the capacity should not be divisible by a small prime.
|
||||
@ -2053,6 +2065,46 @@ namespace System.Collections.Concurrent
|
||||
_enumerator.Reset();
|
||||
}
|
||||
}
|
||||
|
||||
#if MONO
|
||||
/// <summary>Get the data array to be serialized.</summary>
|
||||
[OnSerializing]
|
||||
private void OnSerializing(StreamingContext context)
|
||||
{
|
||||
Tables tables = _tables;
|
||||
|
||||
// save the data into the serialization array to be saved
|
||||
_serializationArray = ToArray();
|
||||
_serializationConcurrencyLevel = tables._locks.Length;
|
||||
_serializationCapacity = tables._buckets.Length;
|
||||
}
|
||||
|
||||
/// <summary>Clear the serialized state.</summary>
|
||||
[OnSerialized]
|
||||
private void OnSerialized(StreamingContext context)
|
||||
{
|
||||
_serializationArray = null;
|
||||
}
|
||||
|
||||
/// <summary>Construct the dictionary from a previously serialized one</summary>
|
||||
[OnDeserialized]
|
||||
private void OnDeserialized(StreamingContext context)
|
||||
{
|
||||
KeyValuePair<TKey, TValue>[] array = _serializationArray;
|
||||
|
||||
var buckets = new Node[_serializationCapacity];
|
||||
var countPerLock = new int[_serializationConcurrencyLevel];
|
||||
var locks = new object[_serializationConcurrencyLevel];
|
||||
for (int i = 0; i < locks.Length; i++)
|
||||
{
|
||||
locks[i] = new object();
|
||||
}
|
||||
_tables = new Tables(buckets, locks, countPerLock);
|
||||
|
||||
InitializeFromCollection(array);
|
||||
_serializationArray = null;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
internal sealed class IDictionaryDebugView<K, V>
|
||||
|
@ -180,7 +180,7 @@ namespace System.IO.Compression
|
||||
return _deflateStream.WriteAsync(array, offset, count, cancellationToken);
|
||||
}
|
||||
|
||||
public override Task WriteAsync(ReadOnlyMemory<byte> source, CancellationToken cancellationToken = default(CancellationToken))
|
||||
internal override Task WriteAsync(ReadOnlyMemory<byte> source, CancellationToken cancellationToken = default(CancellationToken))
|
||||
{
|
||||
if (GetType() != typeof(GZipStream))
|
||||
{
|
||||
|
@ -18,7 +18,7 @@ namespace System.Buffers.Binary
|
||||
/// For native formats, MemoryExtensions.Read{T}; should be used.
|
||||
/// Use these helpers when you need to read specific endinanness.
|
||||
/// </remarks>
|
||||
public static partial class BinaryPrimitives
|
||||
static partial class BinaryPrimitives
|
||||
{
|
||||
/// <summary>
|
||||
/// This is a no-op and added only for consistency.
|
||||
|
@ -6,7 +6,7 @@ using System.Runtime.CompilerServices;
|
||||
|
||||
namespace System.Buffers.Binary
|
||||
{
|
||||
public static partial class BinaryPrimitives
|
||||
static partial class BinaryPrimitives
|
||||
{
|
||||
/// <summary>
|
||||
/// Reads an Int16 out of a read-only span of bytes as big endian.
|
||||
|
@ -6,7 +6,7 @@ using System.Runtime.CompilerServices;
|
||||
|
||||
namespace System.Buffers.Binary
|
||||
{
|
||||
public static partial class BinaryPrimitives
|
||||
static partial class BinaryPrimitives
|
||||
{
|
||||
/// <summary>
|
||||
/// Reads an Int16 out of a read-only span of bytes as little endian.
|
||||
|
@ -11,7 +11,7 @@ using Internal.Runtime.CompilerServices;
|
||||
|
||||
namespace System.Buffers.Binary
|
||||
{
|
||||
public static partial class BinaryPrimitives
|
||||
static partial class BinaryPrimitives
|
||||
{
|
||||
/// <summary>
|
||||
/// Writes a structure of type T into a span of bytes.
|
||||
|
@ -6,7 +6,7 @@ using System.Runtime.CompilerServices;
|
||||
|
||||
namespace System.Buffers.Binary
|
||||
{
|
||||
public static partial class BinaryPrimitives
|
||||
static partial class BinaryPrimitives
|
||||
{
|
||||
/// <summary>
|
||||
/// Writes an Int16 into a span of bytes as big endian.
|
||||
|
@ -6,7 +6,7 @@ using System.Runtime.CompilerServices;
|
||||
|
||||
namespace System.Buffers.Binary
|
||||
{
|
||||
public static partial class BinaryPrimitives
|
||||
static partial class BinaryPrimitives
|
||||
{
|
||||
/// <summary>
|
||||
/// Writes an Int16 into a span of bytes as little endian.
|
||||
|
@ -10,7 +10,7 @@ namespace System.Buffers
|
||||
/// Represents a standard formatting string without using an actual String. A StandardFormat consists of a character (such as 'G', 'D' or 'X')
|
||||
/// and an optional precision ranging from 0..99, or the special value NoPrecision.
|
||||
/// </summary>
|
||||
public readonly struct StandardFormat : IEquatable<StandardFormat>
|
||||
readonly struct StandardFormat : IEquatable<StandardFormat>
|
||||
{
|
||||
/// <summary>
|
||||
/// Precision values for format that don't use a precision, or for when the precision is to be unspecified.
|
||||
|
@ -10,7 +10,7 @@ namespace System
|
||||
/// <summary>
|
||||
/// Extension methods for Span{T}, Memory{T}, and friends.
|
||||
/// </summary>
|
||||
public static partial class MemoryExtensions
|
||||
static partial class MemoryExtensions
|
||||
{
|
||||
/// <summary>
|
||||
/// Casts a Span of one primitive type <typeparamref name="T"/> to Span of bytes.
|
||||
|
@ -15,7 +15,7 @@ namespace System
|
||||
/// <summary>
|
||||
/// Extension methods for Span{T}, Memory{T}, and friends.
|
||||
/// </summary>
|
||||
public static partial class MemoryExtensions
|
||||
static partial class MemoryExtensions
|
||||
{
|
||||
/// <summary>
|
||||
/// Searches for the specified value and returns the index of its first occurrence. If not found, returns -1. Values are compared using IEquatable{T}.Equals(T).
|
||||
|
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.10.1.20";
|
||||
public const string MonoVersion = "5.10.1.25";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
@ -9,7 +9,7 @@ LIB_MCS_FLAGS = /unsafe
|
||||
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
|
||||
XTEST_LIB_REFS = System Facades/System.Threading.Tasks Facades/System.Runtime.InteropServices.RuntimeInformation System.Core System.Numerics.Vectors Microsoft.CSharp
|
||||
XTEST_LIB_FLAGS = -unsafe
|
||||
LIBRARY_WARN_AS_ERROR = yes
|
||||
#LIBRARY_WARN_AS_ERROR = yes
|
||||
|
||||
RESX_RESOURCE_STRING = \
|
||||
../../../external/corefx/src/System.Runtime.Numerics/src/Resources/Strings.resx \
|
||||
|
@ -75,6 +75,7 @@ using System.Runtime.InteropServices;
|
||||
|
||||
[assembly: InternalsVisibleTo ("System, PublicKey=" + AssemblyRef.FrameworkPublicKeyFull2)]
|
||||
[assembly: InternalsVisibleTo ("System.Core, PublicKey=" + AssemblyRef.FrameworkPublicKeyFull2)]
|
||||
[assembly: InternalsVisibleTo ("System.Numerics, PublicKey=00000000000000000400000000000000")]
|
||||
|
||||
[assembly: InternalsVisibleTo ("System.Runtime.WindowsRuntime, PublicKey=00000000000000000400000000000000")]
|
||||
[assembly: InternalsVisibleTo ("System.Runtime.WindowsRuntime.UI.Xaml, PublicKey=00000000000000000400000000000000")]
|
||||
|
@ -6,7 +6,7 @@ export __SECURITY_BOOTSTRAP_DB=$(topdir)/class/corlib
|
||||
LIBRARY = corlib.dll
|
||||
LIBRARY_NAME = mscorlib.dll
|
||||
|
||||
LIB_MCS_FLAGS = $(REFERENCE_SOURCES_FLAGS) $(RESOURCE_FILES:%=-resource:%)
|
||||
LIB_MCS_FLAGS = $(REFERENCE_SOURCES_FLAGS) $(RESOURCE_FILES:%=-resource:%) -nowarn:3019
|
||||
|
||||
LIBRARY_WARN_AS_ERROR = yes
|
||||
#LIBRARY_USE_INTERMEDIATE_FILE = yes
|
||||
|
@ -23,7 +23,7 @@ namespace System.IO
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
public virtual Task WriteAsync (ReadOnlyMemory<byte> source, CancellationToken cancellationToken = default(CancellationToken))
|
||||
internal virtual Task WriteAsync (ReadOnlyMemory<byte> source, CancellationToken cancellationToken = default(CancellationToken))
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
@ -1 +1 @@
|
||||
e12df6cf6f11a9623646797366fde0c96a9be4e7
|
||||
8643a3e9b2d7a5f632803bbc7ae1d39a4a8ece7d
|
@ -1 +1 @@
|
||||
cfc62ef7d708a82187f2ddbacfde7d94150c89cf
|
||||
0f12a8108dc4168a49274bbde35493873b57a8c9
|
@ -1 +1 @@
|
||||
fa34ee078856c45d24d70629b13266372102f5af
|
||||
647d2e4c6f9fd2703f3e45d144e3f2aa1a64a8f5
|
@ -1 +1 @@
|
||||
36a5fe92bcd5f99696793ec32c77a0cbd800fa4f
|
||||
1df2c53b18f6cc67616ba47d684a56208d812e85
|
@ -1 +1 @@
|
||||
d8780bbd16a07188ff2559e6fbee1debec06ebc3
|
||||
e2ec8ff30e727761bdf337475901347fd7f862f7
|
@ -1 +1 @@
|
||||
06ebfe85fdfa099e1612af5c62716124d41e6b9f
|
||||
4f13db2e6344de8931df89de1cb101a2e66b44dc
|
@ -1 +1 @@
|
||||
3d574cfd3dcfa0668dfe416f794ca365fb2d7b0c
|
||||
f2fe82f4f9517875f1bc24f75040a5920ed3f79b
|
@ -1 +1 @@
|
||||
8c6b5f6ac354b88976f707d0ac9b8dc8826a3cf7
|
||||
5bc04b8bcea60a959c138b51f185cf37d3ebb0ce
|
@ -1 +1 @@
|
||||
e12df6cf6f11a9623646797366fde0c96a9be4e7
|
||||
8643a3e9b2d7a5f632803bbc7ae1d39a4a8ece7d
|
@ -1 +1 @@
|
||||
cfc62ef7d708a82187f2ddbacfde7d94150c89cf
|
||||
0f12a8108dc4168a49274bbde35493873b57a8c9
|
@ -1 +1 @@
|
||||
fa34ee078856c45d24d70629b13266372102f5af
|
||||
647d2e4c6f9fd2703f3e45d144e3f2aa1a64a8f5
|
@ -1 +1 @@
|
||||
36a5fe92bcd5f99696793ec32c77a0cbd800fa4f
|
||||
1df2c53b18f6cc67616ba47d684a56208d812e85
|
@ -1 +1 @@
|
||||
d8780bbd16a07188ff2559e6fbee1debec06ebc3
|
||||
e2ec8ff30e727761bdf337475901347fd7f862f7
|
@ -1 +1 @@
|
||||
06ebfe85fdfa099e1612af5c62716124d41e6b9f
|
||||
4f13db2e6344de8931df89de1cb101a2e66b44dc
|
@ -1 +1 @@
|
||||
3d574cfd3dcfa0668dfe416f794ca365fb2d7b0c
|
||||
f2fe82f4f9517875f1bc24f75040a5920ed3f79b
|
@ -1 +1 @@
|
||||
8c6b5f6ac354b88976f707d0ac9b8dc8826a3cf7
|
||||
5bc04b8bcea60a959c138b51f185cf37d3ebb0ce
|
@ -1 +1 @@
|
||||
e12df6cf6f11a9623646797366fde0c96a9be4e7
|
||||
8643a3e9b2d7a5f632803bbc7ae1d39a4a8ece7d
|
@ -1 +1 @@
|
||||
cfc62ef7d708a82187f2ddbacfde7d94150c89cf
|
||||
0f12a8108dc4168a49274bbde35493873b57a8c9
|
@ -1 +1 @@
|
||||
fa34ee078856c45d24d70629b13266372102f5af
|
||||
647d2e4c6f9fd2703f3e45d144e3f2aa1a64a8f5
|
@ -1 +1 @@
|
||||
36a5fe92bcd5f99696793ec32c77a0cbd800fa4f
|
||||
1df2c53b18f6cc67616ba47d684a56208d812e85
|
@ -1 +1 @@
|
||||
d8780bbd16a07188ff2559e6fbee1debec06ebc3
|
||||
e2ec8ff30e727761bdf337475901347fd7f862f7
|
@ -1 +1 @@
|
||||
06ebfe85fdfa099e1612af5c62716124d41e6b9f
|
||||
4f13db2e6344de8931df89de1cb101a2e66b44dc
|
@ -1 +1 @@
|
||||
3d574cfd3dcfa0668dfe416f794ca365fb2d7b0c
|
||||
f2fe82f4f9517875f1bc24f75040a5920ed3f79b
|
@ -1 +1 @@
|
||||
8c6b5f6ac354b88976f707d0ac9b8dc8826a3cf7
|
||||
5bc04b8bcea60a959c138b51f185cf37d3ebb0ce
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/34c3d01"
|
||||
#define FULL_VERSION "explicit/de7bff2"
|
||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
fe9eedb6e42ed181cfdf5609d20d9574673ec55e
|
||||
c652e4c0e113f11d3335b1c846e5f45838903e90
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
baee75b09631be3ebba5b2ba6c5dfd3dc4a261ef
|
||||
1953c3929869462f44a67fa46d17e2b5c718f5ab
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
f8aa0288faabf55a27dbff9272901fd97d489031
|
||||
94b4596be3a50bec45268f15c52b24afaed9674b
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 5.10.1.20\n"
|
||||
"Project-Id-Version: mono 5.10.1.25\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2018-03-29 08:29+0000\n"
|
||||
"POT-Creation-Date: 2018-03-30 08:21+0000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
cd4bb5780a7848ae1940f74b0200283b23e2497a
|
||||
e20f53b5e45c409f44c4755740607927464f1138
|
Loading…
x
Reference in New Issue
Block a user