diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 18dabda9a1..adafd043d1 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -4f949ee4d3493ae84799bc004909d8c02cd95387 \ No newline at end of file +4f583806bb8c4568601605309293ef257e338bf6 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 6844994c0a..0272b91f66 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -5bc587207ca36625c9e0ef11bedf144610db22df \ No newline at end of file +7f5772066f164630cebec71d176804ed59bd8c71 \ No newline at end of file diff --git a/external/api-snapshot/profiles/monodroid/System.cs.REMOVED.git-id b/external/api-snapshot/profiles/monodroid/System.cs.REMOVED.git-id index ae21c21d0e..4dd08040fb 100644 --- a/external/api-snapshot/profiles/monodroid/System.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monodroid/System.cs.REMOVED.git-id @@ -1 +1 @@ -6ee3ca8968f7c2c5a13fde0d89329b4efbbd7f4f \ No newline at end of file +b7c15b7b9fa8148f527c4a789c88891b3083d91e \ No newline at end of file diff --git a/external/api-snapshot/profiles/monodroid/mscorlib.cs.REMOVED.git-id b/external/api-snapshot/profiles/monodroid/mscorlib.cs.REMOVED.git-id index ae0fdf8021..5357538f09 100644 --- a/external/api-snapshot/profiles/monodroid/mscorlib.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monodroid/mscorlib.cs.REMOVED.git-id @@ -1 +1 @@ -e2fe033997a386b136170ffee03d043df47c88df \ No newline at end of file +0b5f3952cc382be37d272154abe74be5a66a17ec \ No newline at end of file diff --git a/external/api-snapshot/profiles/monotouch/System.cs.REMOVED.git-id b/external/api-snapshot/profiles/monotouch/System.cs.REMOVED.git-id index 718de2e02d..cb7d3c34a2 100644 --- a/external/api-snapshot/profiles/monotouch/System.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monotouch/System.cs.REMOVED.git-id @@ -1 +1 @@ -0aabd5e9b1f4b5f354b3f274cad6983bfa8434e8 \ No newline at end of file +e666675a5e7c7a12e9a991ff5c40ea2427b626d2 \ No newline at end of file diff --git a/external/api-snapshot/profiles/monotouch/mscorlib.cs.REMOVED.git-id b/external/api-snapshot/profiles/monotouch/mscorlib.cs.REMOVED.git-id index f46e01aa27..42e7491c3e 100644 --- a/external/api-snapshot/profiles/monotouch/mscorlib.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monotouch/mscorlib.cs.REMOVED.git-id @@ -1 +1 @@ -caea80eb9a8aeae8d816300ba49e3e58a189a287 \ No newline at end of file +1f3ffce45e728f3afdbcc4f62441ec66b01d28b9 \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/System.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/System.cs.REMOVED.git-id index 7b895cf724..0c4204dcab 100644 --- a/external/api-snapshot/profiles/net_4_x/System.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/System.cs.REMOVED.git-id @@ -1 +1 @@ -f41727750b395e4019243785bcefced55377f2f3 \ No newline at end of file +7f3bafeaee74306109dc28c841c32bf76b62e0a2 \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/mscorlib.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/mscorlib.cs.REMOVED.git-id index 61748bdbab..503977db2f 100644 --- a/external/api-snapshot/profiles/net_4_x/mscorlib.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/mscorlib.cs.REMOVED.git-id @@ -1 +1 @@ -9a68bbd21ee9196ff71f50bc108c1324eae4f4f9 \ No newline at end of file +4aceab7b6bffa92aab373aabde9c34d48d497e91 \ No newline at end of file diff --git a/external/corefx/src/Common/src/CoreLib/System/Buffers/IRetainable.cs b/external/corefx/src/Common/src/CoreLib/System/Buffers/IRetainable.cs index 6ac508859c..92641cf354 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Buffers/IRetainable.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Buffers/IRetainable.cs @@ -10,7 +10,7 @@ namespace System.Buffers /// /// Provides a mechanism for manual lifetime management. /// - public interface IRetainable + interface IRetainable { /// /// Call this method to indicate that the IRetainable object is in use. diff --git a/external/corefx/src/Common/src/CoreLib/System/Buffers/MemoryHandle.cs b/external/corefx/src/Common/src/CoreLib/System/Buffers/MemoryHandle.cs index 7544038629..b3f666c51d 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Buffers/MemoryHandle.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Buffers/MemoryHandle.cs @@ -10,7 +10,7 @@ namespace System.Buffers /// /// A handle for the memory. /// - public unsafe struct MemoryHandle : IDisposable + unsafe struct MemoryHandle : IDisposable { private IRetainable _retainable; private void* _pointer; diff --git a/external/corefx/src/Common/src/CoreLib/System/Buffers/OwnedMemory.cs b/external/corefx/src/Common/src/CoreLib/System/Buffers/OwnedMemory.cs index 6946addc80..9bbb2dc2b7 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Buffers/OwnedMemory.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Buffers/OwnedMemory.cs @@ -10,7 +10,7 @@ namespace System.Buffers /// /// Owner of Memory that provides appropriate lifetime management mechanisms for it. /// - public abstract class OwnedMemory : IDisposable, IRetainable + abstract class OwnedMemory : IDisposable, IRetainable { /// /// The number of items in the Memory. diff --git a/external/corefx/src/Common/src/CoreLib/System/Memory.cs b/external/corefx/src/Common/src/CoreLib/System/Memory.cs index 40c4cd9e53..4d1caea82a 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Memory.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Memory.cs @@ -239,7 +239,7 @@ namespace System /// Returns a handle for the array. /// If pin is true, the GC will not move the array and hence its address can be taken /// - public unsafe MemoryHandle Retain(bool pin = false) + unsafe MemoryHandle Retain(bool pin = false) { MemoryHandle memoryHandle = default; if (pin) diff --git a/external/corefx/src/Common/src/CoreLib/System/ReadOnlyMemory.cs b/external/corefx/src/Common/src/CoreLib/System/ReadOnlyMemory.cs index de423bbd06..e261b242bf 100644 --- a/external/corefx/src/Common/src/CoreLib/System/ReadOnlyMemory.cs +++ b/external/corefx/src/Common/src/CoreLib/System/ReadOnlyMemory.cs @@ -217,7 +217,7 @@ namespace System /// If pin is true, the GC will not move the array until the returned /// is disposed, enabling the memory's address can be taken and used. /// - public unsafe MemoryHandle Retain(bool pin = false) + unsafe MemoryHandle Retain(bool pin = false) { MemoryHandle memoryHandle = default; if (pin) diff --git a/external/corefx/src/Common/src/CoreLib/System/Runtime/InteropServices/MemoryMarshal.cs b/external/corefx/src/Common/src/CoreLib/System/Runtime/InteropServices/MemoryMarshal.cs index 63e301beca..4fff48ca7a 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Runtime/InteropServices/MemoryMarshal.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Runtime/InteropServices/MemoryMarshal.cs @@ -14,7 +14,7 @@ namespace System.Runtime.InteropServices /// Provides a collection of methods for interoperating with , , /// , and . /// - public static class MemoryMarshal + static class MemoryMarshal { /// Creates a from a . /// The . diff --git a/external/corefx/src/System.Collections.Concurrent/src/System/Collections/Concurrent/ConcurrentDictionary.cs b/external/corefx/src/System.Collections.Concurrent/src/System/Collections/Concurrent/ConcurrentDictionary.cs index 95a1e533e9..054ea9935d 100644 --- a/external/corefx/src/System.Collections.Concurrent/src/System/Collections/Concurrent/ConcurrentDictionary.cs +++ b/external/corefx/src/System.Collections.Concurrent/src/System/Collections/Concurrent/ConcurrentDictionary.cs @@ -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 _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[] _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 + /// Get the data array to be serialized. + [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; + } + + /// Clear the serialized state. + [OnSerialized] + private void OnSerialized(StreamingContext context) + { + _serializationArray = null; + } + + /// Construct the dictionary from a previously serialized one + [OnDeserialized] + private void OnDeserialized(StreamingContext context) + { + KeyValuePair[] 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 diff --git a/external/corefx/src/System.IO.Compression/src/System/IO/Compression/GZipStream.cs b/external/corefx/src/System.IO.Compression/src/System/IO/Compression/GZipStream.cs index 4796b9b39b..a70012ebb8 100644 --- a/external/corefx/src/System.IO.Compression/src/System/IO/Compression/GZipStream.cs +++ b/external/corefx/src/System.IO.Compression/src/System/IO/Compression/GZipStream.cs @@ -180,7 +180,7 @@ namespace System.IO.Compression return _deflateStream.WriteAsync(array, offset, count, cancellationToken); } - public override Task WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default(CancellationToken)) + internal override Task WriteAsync(ReadOnlyMemory source, CancellationToken cancellationToken = default(CancellationToken)) { if (GetType() != typeof(GZipStream)) { diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Binary/Reader.cs b/external/corefx/src/System.Memory/src/System/Buffers/Binary/Reader.cs index 599bcf27f8..52f3e10eaf 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Binary/Reader.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Binary/Reader.cs @@ -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. /// - public static partial class BinaryPrimitives + static partial class BinaryPrimitives { /// /// This is a no-op and added only for consistency. diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Binary/ReaderBigEndian.cs b/external/corefx/src/System.Memory/src/System/Buffers/Binary/ReaderBigEndian.cs index 54cef4eb1f..a450f58475 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Binary/ReaderBigEndian.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Binary/ReaderBigEndian.cs @@ -6,7 +6,7 @@ using System.Runtime.CompilerServices; namespace System.Buffers.Binary { - public static partial class BinaryPrimitives + static partial class BinaryPrimitives { /// /// Reads an Int16 out of a read-only span of bytes as big endian. diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Binary/ReaderLittleEndian.cs b/external/corefx/src/System.Memory/src/System/Buffers/Binary/ReaderLittleEndian.cs index 17cebf1f27..7fa7c256b8 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Binary/ReaderLittleEndian.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Binary/ReaderLittleEndian.cs @@ -6,7 +6,7 @@ using System.Runtime.CompilerServices; namespace System.Buffers.Binary { - public static partial class BinaryPrimitives + static partial class BinaryPrimitives { /// /// Reads an Int16 out of a read-only span of bytes as little endian. diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Binary/Writer.cs b/external/corefx/src/System.Memory/src/System/Buffers/Binary/Writer.cs index fe59623138..dc28ae0aae 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Binary/Writer.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Binary/Writer.cs @@ -11,7 +11,7 @@ using Internal.Runtime.CompilerServices; namespace System.Buffers.Binary { - public static partial class BinaryPrimitives + static partial class BinaryPrimitives { /// /// Writes a structure of type T into a span of bytes. diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Binary/WriterBigEndian.cs b/external/corefx/src/System.Memory/src/System/Buffers/Binary/WriterBigEndian.cs index fa7228ba3b..1b926cc40b 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Binary/WriterBigEndian.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Binary/WriterBigEndian.cs @@ -6,7 +6,7 @@ using System.Runtime.CompilerServices; namespace System.Buffers.Binary { - public static partial class BinaryPrimitives + static partial class BinaryPrimitives { /// /// Writes an Int16 into a span of bytes as big endian. diff --git a/external/corefx/src/System.Memory/src/System/Buffers/Binary/WriterLittleEndian.cs b/external/corefx/src/System.Memory/src/System/Buffers/Binary/WriterLittleEndian.cs index 22bbe070eb..f87eeea19a 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/Binary/WriterLittleEndian.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/Binary/WriterLittleEndian.cs @@ -6,7 +6,7 @@ using System.Runtime.CompilerServices; namespace System.Buffers.Binary { - public static partial class BinaryPrimitives + static partial class BinaryPrimitives { /// /// Writes an Int16 into a span of bytes as little endian. diff --git a/external/corefx/src/System.Memory/src/System/Buffers/StandardFormat.cs b/external/corefx/src/System.Memory/src/System/Buffers/StandardFormat.cs index 58c6514d3c..afc4ad3465 100644 --- a/external/corefx/src/System.Memory/src/System/Buffers/StandardFormat.cs +++ b/external/corefx/src/System.Memory/src/System/Buffers/StandardFormat.cs @@ -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. /// - public readonly struct StandardFormat : IEquatable + readonly struct StandardFormat : IEquatable { /// /// Precision values for format that don't use a precision, or for when the precision is to be unspecified. diff --git a/external/corefx/src/System.Memory/src/System/MemoryExtensions.Portable.cs b/external/corefx/src/System.Memory/src/System/MemoryExtensions.Portable.cs index dc3ffad9ba..f700d02d34 100644 --- a/external/corefx/src/System.Memory/src/System/MemoryExtensions.Portable.cs +++ b/external/corefx/src/System.Memory/src/System/MemoryExtensions.Portable.cs @@ -10,7 +10,7 @@ namespace System /// /// Extension methods for Span{T}, Memory{T}, and friends. /// - public static partial class MemoryExtensions + static partial class MemoryExtensions { /// /// Casts a Span of one primitive type to Span of bytes. diff --git a/external/corefx/src/System.Memory/src/System/MemoryExtensions.cs b/external/corefx/src/System.Memory/src/System/MemoryExtensions.cs index d886fd5864..a851f00790 100644 --- a/external/corefx/src/System.Memory/src/System/MemoryExtensions.cs +++ b/external/corefx/src/System.Memory/src/System/MemoryExtensions.cs @@ -15,7 +15,7 @@ namespace System /// /// Extension methods for Span{T}, Memory{T}, and friends. /// - public static partial class MemoryExtensions + static partial class MemoryExtensions { /// /// 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). diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index c812581222..de8c3f100d 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -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"; diff --git a/mcs/class/System.Numerics/Makefile b/mcs/class/System.Numerics/Makefile index fcbdfcee40..a5f4718f2b 100644 --- a/mcs/class/System.Numerics/Makefile +++ b/mcs/class/System.Numerics/Makefile @@ -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 \ diff --git a/mcs/class/corlib/Assembly/AssemblyInfo.cs b/mcs/class/corlib/Assembly/AssemblyInfo.cs index 54b21cdf3b..7c3809e7f0 100644 --- a/mcs/class/corlib/Assembly/AssemblyInfo.cs +++ b/mcs/class/corlib/Assembly/AssemblyInfo.cs @@ -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")] diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile index 4e7a250bf5..4185a545b2 100644 --- a/mcs/class/corlib/Makefile +++ b/mcs/class/corlib/Makefile @@ -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 diff --git a/mcs/class/corlib/corert/Stream.cs b/mcs/class/corlib/corert/Stream.cs index 80eb3c22e4..9a9ebf0bd1 100644 --- a/mcs/class/corlib/corert/Stream.cs +++ b/mcs/class/corlib/corert/Stream.cs @@ -23,7 +23,7 @@ namespace System.IO throw new NotImplementedException (); } - public virtual Task WriteAsync (ReadOnlyMemory source, CancellationToken cancellationToken = default(CancellationToken)) + internal virtual Task WriteAsync (ReadOnlyMemory source, CancellationToken cancellationToken = default(CancellationToken)) { throw new NotImplementedException (); } diff --git a/mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id index 116e3ef40f..40cfb558a8 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -e12df6cf6f11a9623646797366fde0c96a9be4e7 \ No newline at end of file +8643a3e9b2d7a5f632803bbc7ae1d39a4a8ece7d \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id index 3f6a3ffe3d..0c8a75cf6f 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -cfc62ef7d708a82187f2ddbacfde7d94150c89cf \ No newline at end of file +0f12a8108dc4168a49274bbde35493873b57a8c9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id index a667e80824..8b96fc6e61 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -fa34ee078856c45d24d70629b13266372102f5af \ No newline at end of file +647d2e4c6f9fd2703f3e45d144e3f2aa1a64a8f5 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id index 57cca7d3e8..837e879b92 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -36a5fe92bcd5f99696793ec32c77a0cbd800fa4f \ No newline at end of file +1df2c53b18f6cc67616ba47d684a56208d812e85 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id index 8f1039e940..4df964b51c 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -d8780bbd16a07188ff2559e6fbee1debec06ebc3 \ No newline at end of file +e2ec8ff30e727761bdf337475901347fd7f862f7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.dll.REMOVED.git-id index 692234a833..fec6383249 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.dll.REMOVED.git-id @@ -1 +1 @@ -06ebfe85fdfa099e1612af5c62716124d41e6b9f \ No newline at end of file +4f13db2e6344de8931df89de1cb101a2e66b44dc \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id index ae7d56a5a7..f57851d03d 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -3d574cfd3dcfa0668dfe416f794ca365fb2d7b0c \ No newline at end of file +f2fe82f4f9517875f1bc24f75040a5920ed3f79b \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id index 2413c48c82..f0e526fc9d 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -8c6b5f6ac354b88976f707d0ac9b8dc8826a3cf7 \ No newline at end of file +5bc04b8bcea60a959c138b51f185cf37d3ebb0ce \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id index 116e3ef40f..40cfb558a8 100644 --- a/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -e12df6cf6f11a9623646797366fde0c96a9be4e7 \ No newline at end of file +8643a3e9b2d7a5f632803bbc7ae1d39a4a8ece7d \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id index 3f6a3ffe3d..0c8a75cf6f 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -cfc62ef7d708a82187f2ddbacfde7d94150c89cf \ No newline at end of file +0f12a8108dc4168a49274bbde35493873b57a8c9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id index a667e80824..8b96fc6e61 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -fa34ee078856c45d24d70629b13266372102f5af \ No newline at end of file +647d2e4c6f9fd2703f3e45d144e3f2aa1a64a8f5 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id index 57cca7d3e8..837e879b92 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -36a5fe92bcd5f99696793ec32c77a0cbd800fa4f \ No newline at end of file +1df2c53b18f6cc67616ba47d684a56208d812e85 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id index 8f1039e940..4df964b51c 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -d8780bbd16a07188ff2559e6fbee1debec06ebc3 \ No newline at end of file +e2ec8ff30e727761bdf337475901347fd7f862f7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.dll.REMOVED.git-id index 692234a833..fec6383249 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.dll.REMOVED.git-id @@ -1 +1 @@ -06ebfe85fdfa099e1612af5c62716124d41e6b9f \ No newline at end of file +4f13db2e6344de8931df89de1cb101a2e66b44dc \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id index ae7d56a5a7..f57851d03d 100644 --- a/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -3d574cfd3dcfa0668dfe416f794ca365fb2d7b0c \ No newline at end of file +f2fe82f4f9517875f1bc24f75040a5920ed3f79b \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id index 2413c48c82..f0e526fc9d 100644 --- a/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -8c6b5f6ac354b88976f707d0ac9b8dc8826a3cf7 \ No newline at end of file +5bc04b8bcea60a959c138b51f185cf37d3ebb0ce \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id index 116e3ef40f..40cfb558a8 100644 --- a/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -e12df6cf6f11a9623646797366fde0c96a9be4e7 \ No newline at end of file +8643a3e9b2d7a5f632803bbc7ae1d39a4a8ece7d \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id index 3f6a3ffe3d..0c8a75cf6f 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -cfc62ef7d708a82187f2ddbacfde7d94150c89cf \ No newline at end of file +0f12a8108dc4168a49274bbde35493873b57a8c9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id index a667e80824..8b96fc6e61 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -fa34ee078856c45d24d70629b13266372102f5af \ No newline at end of file +647d2e4c6f9fd2703f3e45d144e3f2aa1a64a8f5 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id index 57cca7d3e8..837e879b92 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -36a5fe92bcd5f99696793ec32c77a0cbd800fa4f \ No newline at end of file +1df2c53b18f6cc67616ba47d684a56208d812e85 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id index 8f1039e940..4df964b51c 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -d8780bbd16a07188ff2559e6fbee1debec06ebc3 \ No newline at end of file +e2ec8ff30e727761bdf337475901347fd7f862f7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.dll.REMOVED.git-id index 692234a833..fec6383249 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.dll.REMOVED.git-id @@ -1 +1 @@ -06ebfe85fdfa099e1612af5c62716124d41e6b9f \ No newline at end of file +4f13db2e6344de8931df89de1cb101a2e66b44dc \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id index ae7d56a5a7..f57851d03d 100644 --- a/mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -3d574cfd3dcfa0668dfe416f794ca365fb2d7b0c \ No newline at end of file +f2fe82f4f9517875f1bc24f75040a5920ed3f79b \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id index 2413c48c82..f0e526fc9d 100644 --- a/mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -8c6b5f6ac354b88976f707d0ac9b8dc8826a3cf7 \ No newline at end of file +5bc04b8bcea60a959c138b51f185cf37d3ebb0ce \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 169ac78e29..2557639e06 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/34c3d01" +#define FULL_VERSION "explicit/de7bff2" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index a5ea773cca..23f1f74570 100644 Binary files a/po/mcs/de.gmo and b/po/mcs/de.gmo differ diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 2510c941c3..e9f944430c 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -fe9eedb6e42ed181cfdf5609d20d9574673ec55e \ No newline at end of file +c652e4c0e113f11d3335b1c846e5f45838903e90 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 72482a84ee..dc63bb0298 100644 Binary files a/po/mcs/es.gmo and b/po/mcs/es.gmo differ diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 88293ba517..27a5751891 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -baee75b09631be3ebba5b2ba6c5dfd3dc4a261ef \ No newline at end of file +1953c3929869462f44a67fa46d17e2b5c718f5ab \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index b832ce5fbd..814c9bede1 100644 Binary files a/po/mcs/ja.gmo and b/po/mcs/ja.gmo differ diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index adf705af79..1eb350ae3e 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -f8aa0288faabf55a27dbff9272901fd97d489031 \ No newline at end of file +94b4596be3a50bec45268f15c52b24afaed9674b \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index e4d094a725..d64fe334d2 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -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 \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 886d2f7fa1..4c29d383b2 100644 Binary files a/po/mcs/pt_BR.gmo and b/po/mcs/pt_BR.gmo differ diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 3c6e078130..7996b99ef7 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -cd4bb5780a7848ae1940f74b0200283b23e2497a \ No newline at end of file +e20f53b5e45c409f44c4755740607927464f1138 \ No newline at end of file