From 219eec173f88449e05797441daf17bca1b284eb8 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Wed, 13 Feb 2019 08:25:33 +0000 Subject: [PATCH] Imported Upstream version 5.20.0.208 Former-commit-id: 8fbf7dae6cd486bffb1fa6a52020e8eb23c570b1 --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- .../profiles/net_4_x/Mono.Cecil.Mdb.cs | 6 +- .../net_4_x/Mono.Cecil.cs.REMOVED.git-id | 2 +- external/bockbuild/packages/fontconfig.py | 2 +- external/cecil/Mono.Cecil.Cil/PortablePdb.cs | 45 ++----- external/cecil/Mono.Cecil.Cil/Symbols.cs | 5 + external/cecil/Mono.Cecil.PE/Image.cs | 2 + external/cecil/Mono.Cecil.PE/ImageReader.cs | 16 ++- external/cecil/Mono.Cecil.PE/ImageWriter.cs | 27 ++-- external/cecil/Mono.Cecil.nuspec | 2 +- external/cecil/Mono.Cecil/AssemblyReader.cs | 13 +- external/cecil/Mono.Cecil/AssemblyWriter.cs | 61 ++++----- .../cecil/Mono.Cecil/BaseAssemblyResolver.cs | 2 +- external/cecil/Mono.Cecil/MethodDefinition.cs | 3 + external/cecil/Mono.Cecil/MethodReference.cs | 2 +- external/cecil/Mono.Cecil/ModuleDefinition.cs | 11 +- external/cecil/Mono/MergeSort.cs | 66 ++++++++++ external/cecil/ProjectInfo.cs | 6 +- .../Mono.Cecil.Tests/CustomAttributesTests.cs | 29 +++++ .../Test/Mono.Cecil.Tests/ImageReadTests.cs | 11 ++ .../Test/Mono.Cecil.Tests/PortablePdbTests.cs | 122 +++++++++++++++++- .../cecil/Test/Mono.Cecil.Tests/TypeTests.cs | 11 ++ .../pdb/Mono.Cecil.Pdb/NativePdbReader.cs | 4 +- .../pdb/Mono.Cecil.Pdb/NativePdbWriter.cs | 15 +-- mcs/build/common/Consts.cs | 2 +- mcs/class/System/corefx/Unix/Interop.cs | 2 +- ...monodroid_System_xtest.dll.exclude.sources | 5 + .../Mono.Cecil.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Cecil.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Cecil.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Cecil.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- po/mcs/de.gmo | Bin 5406 -> 5406 bytes po/mcs/de.po.REMOVED.git-id | 2 +- po/mcs/es.gmo | Bin 16329 -> 16329 bytes po/mcs/es.po.REMOVED.git-id | 2 +- po/mcs/ja.gmo | Bin 20863 -> 20863 bytes po/mcs/ja.po.REMOVED.git-id | 2 +- po/mcs/mcs.pot | 4 +- po/mcs/pt_BR.gmo | Bin 72806 -> 72806 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- 74 files changed, 391 insertions(+), 163 deletions(-) create mode 100644 external/cecil/Mono/MergeSort.cs diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index ac3ca052b4..2ccadf7627 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -88af1283ee7ed4bfd171ac03a450d09684d3fdb3 \ No newline at end of file +a95e320dc816cf245e735ade01aba6ea08cc8dfb \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 628edac297..7d478e79e8 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -e2ff7c6aca9e90849d3f357529d3bbb884829755 \ No newline at end of file +7fc911b48686244d25c2890ed5bf73bcc205f10a \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/Mono.Cecil.Mdb.cs b/external/api-snapshot/profiles/net_4_x/Mono.Cecil.Mdb.cs index 3443507c0d..8ea9ac7cb5 100644 --- a/external/api-snapshot/profiles/net_4_x/Mono.Cecil.Mdb.cs +++ b/external/api-snapshot/profiles/net_4_x/Mono.Cecil.Mdb.cs @@ -2,12 +2,12 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -[assembly:System.Reflection.AssemblyVersionAttribute("0.10.1.0")] +[assembly:System.Reflection.AssemblyVersionAttribute("0.10.3.0")] [assembly:System.CLSCompliantAttribute(false)] [assembly:System.Diagnostics.DebuggableAttribute((System.Diagnostics.DebuggableAttribute.DebuggingModes)(2))] [assembly:System.Reflection.AssemblyCopyrightAttribute("Copyright © 2008 - 2018 Jb Evain")] -[assembly:System.Reflection.AssemblyFileVersionAttribute("0.10.1.0")] -[assembly:System.Reflection.AssemblyInformationalVersionAttribute("0.10.1.0")] +[assembly:System.Reflection.AssemblyFileVersionAttribute("0.10.3.0")] +[assembly:System.Reflection.AssemblyInformationalVersionAttribute("0.10.3.0")] [assembly:System.Reflection.AssemblyProductAttribute("Mono.Cecil")] [assembly:System.Reflection.AssemblyTitleAttribute("Mono.Cecil.Mdb")] [assembly:System.Runtime.CompilerServices.CompilationRelaxationsAttribute(8)] diff --git a/external/api-snapshot/profiles/net_4_x/Mono.Cecil.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/Mono.Cecil.cs.REMOVED.git-id index 8f77ac4c64..bfcc4d9e75 100644 --- a/external/api-snapshot/profiles/net_4_x/Mono.Cecil.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/Mono.Cecil.cs.REMOVED.git-id @@ -1 +1 @@ -19b503b65f6796fbd03668ae2a73555fcb8fda32 \ No newline at end of file +3378e64a4e2dd96212fc88a657abe1ac071ddc16 \ No newline at end of file diff --git a/external/bockbuild/packages/fontconfig.py b/external/bockbuild/packages/fontconfig.py index 8d890be607..af6fab7fe0 100644 --- a/external/bockbuild/packages/fontconfig.py +++ b/external/bockbuild/packages/fontconfig.py @@ -4,7 +4,7 @@ class FontConfigPackage (Package): Package.__init__(self, 'fontconfig', '2.10.2', configure_flags=['--disable-docs'], sources=[ - 'http://www.fontconfig.org/release/%{name}-%{version}.tar.gz' + 'https://www.freedesktop.org/software/fontconfig/release/%{name}-%{version}.tar.gz' ], # note: a non-empty DESTDIR keeps fc-cache from running at # install-time diff --git a/external/cecil/Mono.Cecil.Cil/PortablePdb.cs b/external/cecil/Mono.Cecil.Cil/PortablePdb.cs index 5d0555fbcc..4f734f38ef 100644 --- a/external/cecil/Mono.Cecil.Cil/PortablePdb.cs +++ b/external/cecil/Mono.Cecil.Cil/PortablePdb.cs @@ -253,12 +253,7 @@ namespace Mono.Cecil.Cil { } } - interface IMetadataSymbolWriter : ISymbolWriter { - void SetMetadata (MetadataBuilder metadata); - void WriteModule (); - } - - public sealed class PortablePdbWriter : ISymbolWriter, IMetadataSymbolWriter { + public sealed class PortablePdbWriter : ISymbolWriter { readonly MetadataBuilder pdb_metadata; readonly ModuleDefinition module; @@ -272,6 +267,13 @@ namespace Mono.Cecil.Cil { { this.pdb_metadata = pdb_metadata; this.module = module; + + this.module_metadata = module.metadata_builder; + + if (module_metadata != pdb_metadata) + this.pdb_metadata.metadata_builder = this.module_metadata; + + pdb_metadata.AddCustomDebugInformations (module); } internal PortablePdbWriter (MetadataBuilder pdb_metadata, ModuleDefinition module, ImageWriter writer) @@ -280,19 +282,6 @@ namespace Mono.Cecil.Cil { this.writer = writer; } - void IMetadataSymbolWriter.SetMetadata (MetadataBuilder metadata) - { - this.module_metadata = metadata; - - if (module_metadata != pdb_metadata) - this.pdb_metadata.metadata_builder = metadata; - } - - void IMetadataSymbolWriter.WriteModule () - { - pdb_metadata.AddCustomDebugInformations (module); - } - public ISymbolReaderProvider GetReaderProvider () { return new PortablePdbReaderProvider (); @@ -318,11 +307,7 @@ namespace Mono.Cecil.Cil { // PDB Age buffer.WriteUInt32 (1); // PDB Path - var filename = writer.BaseStream.GetFileName (); - if (!string.IsNullOrEmpty (filename)) - filename = Path.GetFileName (filename); - - buffer.WriteBytes (System.Text.Encoding.UTF8.GetBytes (filename)); + buffer.WriteBytes (System.Text.Encoding.UTF8.GetBytes (writer.BaseStream.GetFileName ())); buffer.WriteByte (0); var data = new byte [buffer.length]; @@ -428,7 +413,7 @@ namespace Mono.Cecil.Cil { } } - public sealed class EmbeddedPortablePdbWriter : ISymbolWriter, IMetadataSymbolWriter { + public sealed class EmbeddedPortablePdbWriter : ISymbolWriter { readonly Stream stream; readonly PortablePdbWriter writer; @@ -485,16 +470,6 @@ namespace Mono.Cecil.Cil { public void Dispose () { } - - void IMetadataSymbolWriter.SetMetadata (MetadataBuilder metadata) - { - ((IMetadataSymbolWriter) writer).SetMetadata (metadata); - } - - void IMetadataSymbolWriter.WriteModule () - { - ((IMetadataSymbolWriter) writer).WriteModule (); - } } #endif diff --git a/external/cecil/Mono.Cecil.Cil/Symbols.cs b/external/cecil/Mono.Cecil.Cil/Symbols.cs index fc734ceb3a..3095318097 100644 --- a/external/cecil/Mono.Cecil.Cil/Symbols.cs +++ b/external/cecil/Mono.Cecil.Cil/Symbols.cs @@ -943,6 +943,11 @@ namespace Mono.Cecil.Cil { var name = new SR.AssemblyName { Name = cecil_name.Name + "." + suffix, Version = cecil_name.Version, +#if NET_CORE + CultureName = cecil_name.CultureName, +#else + CultureInfo = cecil_name.CultureInfo, +#endif }; name.SetPublicKeyToken (cecil_name.GetPublicKeyToken ()); diff --git a/external/cecil/Mono.Cecil.PE/Image.cs b/external/cecil/Mono.Cecil.PE/Image.cs index 25ea1869ed..109206187c 100644 --- a/external/cecil/Mono.Cecil.PE/Image.cs +++ b/external/cecil/Mono.Cecil.PE/Image.cs @@ -29,6 +29,8 @@ namespace Mono.Cecil.PE { public TargetArchitecture Architecture; public ModuleCharacteristics Characteristics; public ushort LinkerVersion; + public ushort SubSystemMajor; + public ushort SubSystemMinor; public ImageDebugHeader DebugHeader; diff --git a/external/cecil/Mono.Cecil.PE/ImageReader.cs b/external/cecil/Mono.Cecil.PE/ImageReader.cs index f3f3d2641a..e1bcd4c71d 100644 --- a/external/cecil/Mono.Cecil.PE/ImageReader.cs +++ b/external/cecil/Mono.Cecil.PE/ImageReader.cs @@ -81,8 +81,8 @@ namespace Mono.Cecil.PE { // Characteristics 2 ushort characteristics = ReadUInt16 (); - ushort subsystem, dll_characteristics, linker_version; - ReadOptionalHeaders (out subsystem, out dll_characteristics, out linker_version); + ushort subsystem, dll_characteristics; + ReadOptionalHeaders (out subsystem, out dll_characteristics); ReadSections (sections); ReadCLIHeader (); ReadMetadata (); @@ -90,7 +90,6 @@ namespace Mono.Cecil.PE { image.Kind = GetModuleKind (characteristics, subsystem); image.Characteristics = (ModuleCharacteristics) dll_characteristics; - image.LinkerVersion = linker_version; } TargetArchitecture ReadArchitecture () @@ -109,7 +108,7 @@ namespace Mono.Cecil.PE { return ModuleKind.Console; } - void ReadOptionalHeaders (out ushort subsystem, out ushort dll_characteristics, out ushort linker) + void ReadOptionalHeaders (out ushort subsystem, out ushort dll_characteristics) { // - PEOptionalHeader // - StandardFieldsHeader @@ -119,7 +118,7 @@ namespace Mono.Cecil.PE { // pe32 || pe64 - linker = ReadUInt16 (); + image.LinkerVersion = ReadUInt16 (); // CodeSize 4 // InitializedDataSize 4 // UninitializedDataSize4 @@ -138,11 +137,16 @@ namespace Mono.Cecil.PE { // UserMinor 2 // SubSysMajor 2 // SubSysMinor 2 + Advance(44); + + image.SubSystemMajor = ReadUInt16 (); + image.SubSystemMinor = ReadUInt16 (); + // Reserved 4 // ImageSize 4 // HeaderSize 4 // FileChecksum 4 - Advance (64); + Advance (16); // SubSystem 2 subsystem = ReadUInt16 (); diff --git a/external/cecil/Mono.Cecil.PE/ImageWriter.cs b/external/cecil/Mono.Cecil.PE/ImageWriter.cs index 366f4f4205..95a36c1307 100644 --- a/external/cecil/Mono.Cecil.PE/ImageWriter.cs +++ b/external/cecil/Mono.Cecil.PE/ImageWriter.cs @@ -243,8 +243,8 @@ namespace Mono.Cecil.PE { WriteUInt16 (0); // OSMinor WriteUInt16 (0); // UserMajor WriteUInt16 (0); // UserMinor - WriteUInt16 (4); // SubSysMajor - WriteUInt16 (0); // SubSysMinor + WriteUInt16 (module.subsystem_major); // SubSysMajor + WriteUInt16 (module.subsystem_minor); // SubSysMinor WriteUInt32 (0); // Reserved var last_section = LastSection(); @@ -255,17 +255,22 @@ namespace Mono.Cecil.PE { WriteUInt16 (GetSubSystem ()); // SubSystem WriteUInt16 ((ushort) module.Characteristics); // DLLFlags - const ulong stack_reserve = 0x100000; - const ulong stack_commit = 0x1000; - const ulong heap_reserve = 0x100000; - const ulong heap_commit = 0x1000; - if (!pe64) { - WriteUInt32 ((uint) stack_reserve); - WriteUInt32 ((uint) stack_commit); - WriteUInt32 ((uint) heap_reserve); - WriteUInt32 ((uint) heap_commit); + const uint stack_reserve = 0x100000; + const uint stack_commit = 0x1000; + const uint heap_reserve = 0x100000; + const uint heap_commit = 0x1000; + + WriteUInt32 (stack_reserve); + WriteUInt32 (stack_commit); + WriteUInt32 (heap_reserve); + WriteUInt32 (heap_commit); } else { + const ulong stack_reserve = 0x400000; + const ulong stack_commit = 0x4000; + const ulong heap_reserve = 0x100000; + const ulong heap_commit = 0x2000; + WriteUInt64 (stack_reserve); WriteUInt64 (stack_commit); WriteUInt64 (heap_reserve); diff --git a/external/cecil/Mono.Cecil.nuspec b/external/cecil/Mono.Cecil.nuspec index 6432e14ab3..27b8a36c6c 100644 --- a/external/cecil/Mono.Cecil.nuspec +++ b/external/cecil/Mono.Cecil.nuspec @@ -2,7 +2,7 @@ Mono.Cecil - 0.10.1.0 + 0.10.3.0 Mono.Cecil Jb Evain Jb Evain diff --git a/external/cecil/Mono.Cecil/AssemblyReader.cs b/external/cecil/Mono.Cecil/AssemblyReader.cs index 7954e9701f..bf16b8a6fc 100644 --- a/external/cecil/Mono.Cecil/AssemblyReader.cs +++ b/external/cecil/Mono.Cecil/AssemblyReader.cs @@ -1119,11 +1119,14 @@ namespace Mono.Cecil { metadata.AddTypeReference (type); if (scope_token.TokenType == TokenType.TypeRef) { - declaring_type = GetTypeDefOrRef (scope_token); + if (scope_token.RID != rid) { + declaring_type = GetTypeDefOrRef (scope_token); - scope = declaring_type != null - ? declaring_type.Scope - : module; + scope = declaring_type != null + ? declaring_type.Scope + : module; + } else // obfuscated typeref row pointing to self + scope = module; } else scope = GetTypeReferenceScope (scope_token); @@ -3766,7 +3769,7 @@ namespace Mono.Cecil { if (length == 0) return string.Empty; - if (position + length >= buffer.Length) + if (position + length > buffer.Length) return string.Empty; var @string = Encoding.UTF8.GetString (buffer, position, length); diff --git a/external/cecil/Mono.Cecil/AssemblyWriter.cs b/external/cecil/Mono.Cecil/AssemblyWriter.cs index 1bccd027c4..f7b555933f 100644 --- a/external/cecil/Mono.Cecil/AssemblyWriter.cs +++ b/external/cecil/Mono.Cecil/AssemblyWriter.cs @@ -110,18 +110,25 @@ namespace Mono.Cecil { } #endif - using (var symbol_writer = GetSymbolWriter (module, fq_name, symbol_writer_provider, parameters)) { - var metadata = new MetadataBuilder (module, fq_name, timestamp, symbol_writer_provider, symbol_writer); - BuildMetadata (module, metadata); + var metadata = new MetadataBuilder (module, fq_name, timestamp, symbol_writer_provider); + try { + module.metadata_builder = metadata; - var writer = ImageWriter.CreateWriter (module, metadata, stream); - stream.value.SetLength (0); - writer.WriteImage (); + using (var symbol_writer = GetSymbolWriter (module, fq_name, symbol_writer_provider, parameters)) { + metadata.SetSymbolWriter (symbol_writer); + BuildMetadata (module, metadata); + + var writer = ImageWriter.CreateWriter (module, metadata, stream); + stream.value.SetLength (0); + writer.WriteImage (); #if !NET_CORE - if (parameters.StrongNameKeyPair != null) - CryptoService.StrongName (stream.value, writer, parameters.StrongNameKeyPair); + if (parameters.StrongNameKeyPair != null) + CryptoService.StrongName (stream.value, writer, parameters.StrongNameKeyPair); #endif + } + } finally { + module.metadata_builder = null; } } @@ -209,10 +216,10 @@ namespace Mono.Cecil { public sealed override void Sort () { - Array.Sort (rows, 0, length, this); + MergeSort.Sort (rows, 0, this.length, this); } - protected int Compare (uint x, uint y) + protected static int Compare (uint x, uint y) { return x == y ? 0 : x > y ? 1 : -1; } @@ -796,7 +803,7 @@ namespace Mono.Cecil { readonly internal ModuleDefinition module; readonly internal ISymbolWriterProvider symbol_writer_provider; - readonly internal ISymbolWriter symbol_writer; + internal ISymbolWriter symbol_writer; readonly internal TextMap text_map; readonly internal string fq_name; readonly internal uint timestamp; @@ -846,8 +853,6 @@ namespace Mono.Cecil { readonly TypeSpecTable typespec_table; readonly MethodSpecTable method_spec_table; - readonly bool portable_pdb; - internal MetadataBuilder metadata_builder; readonly DocumentTable document_table; @@ -862,7 +867,7 @@ namespace Mono.Cecil { readonly Dictionary import_scope_map; readonly Dictionary document_map; - public MetadataBuilder (ModuleDefinition module, string fq_name, uint timestamp, ISymbolWriterProvider symbol_writer_provider, ISymbolWriter symbol_writer) + public MetadataBuilder (ModuleDefinition module, string fq_name, uint timestamp, ISymbolWriterProvider symbol_writer_provider) { this.module = module; this.text_map = CreateTextMap (); @@ -870,18 +875,6 @@ namespace Mono.Cecil { this.timestamp = timestamp; this.symbol_writer_provider = symbol_writer_provider; - if (symbol_writer == null && module.HasImage && module.Image.HasDebugTables ()) { - symbol_writer = new PortablePdbWriter (this, module); - } - - this.symbol_writer = symbol_writer; - - var pdb_writer = symbol_writer as IMetadataSymbolWriter; - if (pdb_writer != null) { - portable_pdb = true; - pdb_writer.SetMetadata (this); - } - this.code = new CodeWriter (this); this.data = new DataBuffer (); this.resources = new ResourceBuffer (); @@ -916,9 +909,6 @@ namespace Mono.Cecil { method_spec_map = new Dictionary (row_equality_comparer); generic_parameters = new Collection (); - if (!portable_pdb) - return; - this.document_table = GetTable (Table.Document); this.method_debug_information_table = GetTable (Table.MethodDebugInformation); this.local_scope_table = GetTable (Table.LocalScope); @@ -937,7 +927,6 @@ namespace Mono.Cecil { this.module = module; this.text_map = new TextMap (); this.symbol_writer_provider = writer_provider; - this.portable_pdb = true; this.string_heap = new StringHeapBuffer (); this.guid_heap = new GuidHeapBuffer (); @@ -961,6 +950,14 @@ namespace Mono.Cecil { this.import_scope_map = new Dictionary (row_equality_comparer); } + public void SetSymbolWriter (ISymbolWriter writer) + { + symbol_writer = writer; + + if (symbol_writer == null && module.HasImage && module.Image.HasDebugTables ()) + symbol_writer = new PortablePdbWriter (this, module); + } + TextMap CreateTextMap () { var map = new TextMap (); @@ -1050,10 +1047,6 @@ namespace Mono.Cecil { if (module.EntryPoint != null) entry_point = LookupToken (module.EntryPoint); - - var pdb_writer = symbol_writer as IMetadataSymbolWriter; - if (pdb_writer != null) - pdb_writer.WriteModule (); } void BuildAssembly () diff --git a/external/cecil/Mono.Cecil/BaseAssemblyResolver.cs b/external/cecil/Mono.Cecil/BaseAssemblyResolver.cs index 97eb4cc20e..c10a826db9 100644 --- a/external/cecil/Mono.Cecil/BaseAssemblyResolver.cs +++ b/external/cecil/Mono.Cecil/BaseAssemblyResolver.cs @@ -265,7 +265,7 @@ namespace Mono.Cecil { if (version.MajorRevision == 3300) path = Path.Combine (path, "v1.0.3705"); else - path = Path.Combine (path, "v1.0.5000.0"); + path = Path.Combine (path, "v1.1.4322"); break; case 2: path = Path.Combine (path, "v2.0.50727"); diff --git a/external/cecil/Mono.Cecil/MethodDefinition.cs b/external/cecil/Mono.Cecil/MethodDefinition.cs index 95245abd2b..76ce612d96 100644 --- a/external/cecil/Mono.Cecil/MethodDefinition.cs +++ b/external/cecil/Mono.Cecil/MethodDefinition.cs @@ -180,6 +180,9 @@ namespace Mono.Cecil { return debug_info ?? (debug_info = new MethodDebugInformation (this)); } + set { + debug_info = value; + } } public bool HasPInvokeInfo { diff --git a/external/cecil/Mono.Cecil/MethodReference.cs b/external/cecil/Mono.Cecil/MethodReference.cs index 89ee6a7719..bd5fb77ba0 100644 --- a/external/cecil/Mono.Cecil/MethodReference.cs +++ b/external/cecil/Mono.Cecil/MethodReference.cs @@ -183,7 +183,7 @@ namespace Mono.Cecil { public static bool IsVarArg (this IMethodSignature self) { - return (self.CallingConvention & MethodCallingConvention.VarArg) != 0; + return self.CallingConvention == MethodCallingConvention.VarArg; } public static int GetSentinelPosition (this IMethodSignature self) diff --git a/external/cecil/Mono.Cecil/ModuleDefinition.cs b/external/cecil/Mono.Cecil/ModuleDefinition.cs index b61cc9ef7a..92160da1ac 100644 --- a/external/cecil/Mono.Cecil/ModuleDefinition.cs +++ b/external/cecil/Mono.Cecil/ModuleDefinition.cs @@ -283,8 +283,11 @@ namespace Mono.Cecil { TargetArchitecture architecture; ModuleAttributes attributes; ModuleCharacteristics characteristics; - internal ushort linker_version = 8; Guid mvid; + + internal ushort linker_version = 8; + internal ushort subsystem_major = 4; + internal ushort subsystem_minor = 0; internal uint timestamp; internal AssemblyDefinition assembly; @@ -304,6 +307,10 @@ namespace Mono.Cecil { internal Collection custom_infos; +#if !READ_ONLY + internal MetadataBuilder metadata_builder; +#endif + public bool IsMain { get { return kind != ModuleKind.NetModule; } } @@ -616,6 +623,8 @@ namespace Mono.Cecil { this.attributes = image.Attributes; this.characteristics = image.Characteristics; this.linker_version = image.LinkerVersion; + this.subsystem_major = image.SubSystemMajor; + this.subsystem_minor = image.SubSystemMinor; this.file_name = image.FileName; this.timestamp = image.Timestamp; diff --git a/external/cecil/Mono/MergeSort.cs b/external/cecil/Mono/MergeSort.cs new file mode 100644 index 0000000000..5d856eaf09 --- /dev/null +++ b/external/cecil/Mono/MergeSort.cs @@ -0,0 +1,66 @@ +// +// Author: +// Jb Evain (jbevain@gmail.com) +// +// Copyright (c) 2008 - 2015 Jb Evain +// Copyright (c) 2008 - 2011 Novell, Inc. +// +// Licensed under the MIT/X11 license. +// + +using System; +using System.Collections.Generic; + +namespace Mono { + + class MergeSort { + private readonly T [] elements; + private readonly T [] buffer; + private readonly IComparer comparer; + + private MergeSort (T [] elements, IComparer comparer) + { + this.elements = elements; + this.buffer = new T [elements.Length]; + Array.Copy (this.elements, this.buffer, elements.Length); + this.comparer = comparer; + } + + public static void Sort (T [] source, IComparer comparer) + { + Sort (source, 0, source.Length, comparer); + } + + public static void Sort (T [] source, int start, int length, IComparer comparer) + { + new MergeSort (source, comparer).Sort (start, length); + } + + private void Sort (int start, int length) + { + TopDownSplitMerge (this.buffer, this.elements, start, length); + } + + private void TopDownSplitMerge (T [] a, T [] b, int start, int end) + { + if (end - start < 2) + return; + + int middle = (end + start) / 2; + TopDownSplitMerge (b, a, start, middle); + TopDownSplitMerge (b, a, middle, end); + TopDownMerge (a, b, start, middle, end); + } + + private void TopDownMerge (T [] a, T [] b, int start, int middle, int end) + { + for (int i = start, j = middle, k = start; k < end; k++) { + if (i < middle && (j >= end || comparer.Compare (a [i], a [j]) <= 0)) { + b [k] = a [i++]; + } else { + b [k] = a [j++]; + } + } + } + } +} diff --git a/external/cecil/ProjectInfo.cs b/external/cecil/ProjectInfo.cs index 750118bbae..3b6952c1a3 100644 --- a/external/cecil/ProjectInfo.cs +++ b/external/cecil/ProjectInfo.cs @@ -15,6 +15,6 @@ using System.Runtime.InteropServices; [assembly: ComVisible (false)] -[assembly: AssemblyVersion ("0.10.1.0")] -[assembly: AssemblyFileVersion ("0.10.1.0")] -[assembly: AssemblyInformationalVersion ("0.10.1.0")] +[assembly: AssemblyVersion ("0.10.3.0")] +[assembly: AssemblyFileVersion ("0.10.3.0")] +[assembly: AssemblyInformationalVersion ("0.10.3.0")] diff --git a/external/cecil/Test/Mono.Cecil.Tests/CustomAttributesTests.cs b/external/cecil/Test/Mono.Cecil.Tests/CustomAttributesTests.cs index db28ab5c18..970b3aa569 100644 --- a/external/cecil/Test/Mono.Cecil.Tests/CustomAttributesTests.cs +++ b/external/cecil/Test/Mono.Cecil.Tests/CustomAttributesTests.cs @@ -464,6 +464,35 @@ namespace Mono.Cecil.Tests { }); } + [Test] + public void OrderedAttributes () + { + TestModule ("ordered-attrs.exe", module => { + var type = module.GetType ("Program"); + var method = type.GetMethod ("Main"); + var attributes = method.CustomAttributes; + Assert.AreEqual (6, attributes.Count); + + Assert.AreEqual ("AAttribute", attributes [0].AttributeType.Name); + Assert.AreEqual ("Main.A1", attributes [0].Fields [0].Argument.Value as string); + + Assert.AreEqual ("AAttribute", attributes [1].AttributeType.Name); + Assert.AreEqual ("Main.A2", attributes [1].Fields [0].Argument.Value as string); + + Assert.AreEqual ("BAttribute", attributes [2].AttributeType.Name); + Assert.AreEqual ("Main.B1", attributes [2].Fields [0].Argument.Value as string); + + Assert.AreEqual ("AAttribute", attributes [3].AttributeType.Name); + Assert.AreEqual ("Main.A3", attributes [3].Fields [0].Argument.Value as string); + + Assert.AreEqual ("BAttribute", attributes [4].AttributeType.Name); + Assert.AreEqual ("Main.B2", attributes [4].Fields [0].Argument.Value as string); + + Assert.AreEqual ("BAttribute", attributes [5].AttributeType.Name); + Assert.AreEqual ("Main.B3", attributes [5].Fields [0].Argument.Value as string); + }); + } + #if !READ_ONLY [Test] public void DefineCustomAttributeFromBlob () diff --git a/external/cecil/Test/Mono.Cecil.Tests/ImageReadTests.cs b/external/cecil/Test/Mono.Cecil.Tests/ImageReadTests.cs index 16b8a7b3f1..13c8474eac 100644 --- a/external/cecil/Test/Mono.Cecil.Tests/ImageReadTests.cs +++ b/external/cecil/Test/Mono.Cecil.Tests/ImageReadTests.cs @@ -180,6 +180,8 @@ namespace Mono.Cecil.Tests { TestModule("winrtcomp.winmd", module => { Assert.IsTrue (module.Assembly.Name.IsWindowsRuntime); + Assert.AreEqual (6, module.Image.SubSystemMajor); + Assert.AreEqual (2, module.Image.SubSystemMinor); }, verify: false, assemblyResolver: resolver); } #endif @@ -196,6 +198,15 @@ namespace Mono.Cecil.Tests { }); } + [Test] + public void Net471TargetingAssembly () + { + TestModule ("net471.exe", module => { + Assert.AreEqual (6, module.Image.SubSystemMajor); + Assert.AreEqual (0, module.Image.SubSystemMinor); + }); + } + #if !READ_ONLY [Test] public void ExternalPdbDeterministicAssembly () diff --git a/external/cecil/Test/Mono.Cecil.Tests/PortablePdbTests.cs b/external/cecil/Test/Mono.Cecil.Tests/PortablePdbTests.cs index 964c2accfa..34d998a6d7 100644 --- a/external/cecil/Test/Mono.Cecil.Tests/PortablePdbTests.cs +++ b/external/cecil/Test/Mono.Cecil.Tests/PortablePdbTests.cs @@ -6,6 +6,7 @@ using System.Text; using NUnit.Framework; using Mono.Cecil.Cil; +using Mono.Cecil.PE; namespace Mono.Cecil.Tests { @@ -347,7 +348,6 @@ namespace Mono.Cecil.Tests { }); } -#if !READ_ONLY [Test] public void EmbeddedCompressedPortablePdb () { @@ -373,7 +373,7 @@ namespace Mono.Cecil.Tests { { TestModule ("PdbTarget.exe", test, symbolReaderProvider: typeof (PortablePdbReaderProvider), symbolWriterProvider: typeof (PortablePdbWriterProvider)); TestModule ("EmbeddedPdbTarget.exe", test, verify: !Platform.OnMono); - TestModule("EmbeddedCompressedPdbTarget.exe", test, symbolReaderProvider: typeof(EmbeddedPortablePdbReaderProvider), symbolWriterProvider: typeof(EmbeddedPortablePdbWriterProvider)); + TestModule ("EmbeddedCompressedPdbTarget.exe", test, symbolReaderProvider: typeof(EmbeddedPortablePdbReaderProvider), symbolWriterProvider: typeof(EmbeddedPortablePdbWriterProvider)); } [Test] @@ -553,7 +553,123 @@ class Program IL_0001: ret", main); }, symbolReaderProvider: typeof (PortablePdbReaderProvider), symbolWriterProvider: typeof (PortablePdbWriterProvider)); } -#endif + + public sealed class SymbolWriterProvider : ISymbolWriterProvider { + + readonly DefaultSymbolWriterProvider writer_provider = new DefaultSymbolWriterProvider (); + + public ISymbolWriter GetSymbolWriter (ModuleDefinition module, string fileName) + { + return new SymbolWriter (writer_provider.GetSymbolWriter (module, fileName)); + } + + public ISymbolWriter GetSymbolWriter (ModuleDefinition module, Stream symbolStream) + { + return new SymbolWriter (writer_provider.GetSymbolWriter (module, symbolStream)); + } + } + + public sealed class SymbolWriter : ISymbolWriter { + + readonly ISymbolWriter symbol_writer; + + public SymbolWriter (ISymbolWriter symbolWriter) + { + this.symbol_writer = symbolWriter; + } + + public ImageDebugHeader GetDebugHeader () + { + var header = symbol_writer.GetDebugHeader (); + if (!header.HasEntries) + return header; + + for (int i = 0; i < header.Entries.Length; i++) { + header.Entries [i] = ProcessEntry (header.Entries [i]); + } + + return header; + } + + private static ImageDebugHeaderEntry ProcessEntry (ImageDebugHeaderEntry entry) + { + if (entry.Directory.Type != ImageDebugType.CodeView) + return entry; + + var reader = new ByteBuffer (entry.Data); + var writer = new ByteBuffer (); + + var sig = reader.ReadUInt32 (); + if (sig != 0x53445352) + return entry; + + writer.WriteUInt32 (sig); // RSDS + writer.WriteBytes (reader.ReadBytes (16)); // MVID + writer.WriteUInt32 (reader.ReadUInt32 ()); // Age + + var length = Array.IndexOf (entry.Data, (byte) 0, reader.position) - reader.position; + + var fullPath = Encoding.UTF8.GetString (reader.ReadBytes (length)); + + writer.WriteBytes (Encoding.UTF8.GetBytes (Path.GetFileName (fullPath))); + writer.WriteByte (0); + + var newData = new byte [writer.length]; + Buffer.BlockCopy (writer.buffer, 0, newData, 0, writer.length); + + var directory = entry.Directory; + directory.SizeOfData = newData.Length; + + return new ImageDebugHeaderEntry (directory, newData); + } + + public ISymbolReaderProvider GetReaderProvider () + { + return symbol_writer.GetReaderProvider (); + } + + public void Write (MethodDebugInformation info) + { + symbol_writer.Write (info); + } + + public void Dispose () + { + symbol_writer.Dispose (); + } + } + + static string GetDebugHeaderPdbPath (ModuleDefinition module) + { + var header = module.GetDebugHeader (); + var cv = Mixin.GetCodeViewEntry (header); + Assert.IsNotNull (cv); + var length = Array.IndexOf (cv.Data, (byte)0, 24) - 24; + var bytes = new byte [length]; + Buffer.BlockCopy (cv.Data, 24, bytes, 0, length); + return Encoding.UTF8.GetString (bytes); + } + + [Test] + public void UseCustomSymbolWriterToChangeDebugHeaderPdbPath () + { + const string resource = "mylib.dll"; + + string debug_header_pdb_path; + string dest = Path.Combine (Path.GetTempPath (), resource); + + using (var module = GetResourceModule (resource, new ReaderParameters { SymbolReaderProvider = new PortablePdbReaderProvider () })) { + debug_header_pdb_path = GetDebugHeaderPdbPath (module); + Assert.IsTrue (Path.IsPathRooted (debug_header_pdb_path)); + module.Write (dest, new WriterParameters { SymbolWriterProvider = new SymbolWriterProvider () }); + } + + using (var module = ModuleDefinition.ReadModule (dest, new ReaderParameters { SymbolReaderProvider = new PortablePdbReaderProvider () })) { + var pdb_path = GetDebugHeaderPdbPath (module); + Assert.IsFalse (Path.IsPathRooted (pdb_path)); + Assert.AreEqual (Path.GetFileName (debug_header_pdb_path), pdb_path); + } + } } } #endif \ No newline at end of file diff --git a/external/cecil/Test/Mono.Cecil.Tests/TypeTests.cs b/external/cecil/Test/Mono.Cecil.Tests/TypeTests.cs index a18e4a1884..0bdb48c4c3 100644 --- a/external/cecil/Test/Mono.Cecil.Tests/TypeTests.cs +++ b/external/cecil/Test/Mono.Cecil.Tests/TypeTests.cs @@ -30,6 +30,8 @@ namespace Mono.Cecil.Tests { }); } +#if !READ_ONLY + [Test] public void EmptyStructLayout () { @@ -43,6 +45,8 @@ namespace Mono.Cecil.Tests { }) ; } +#endif + [Test] public void SimpleInterfaces () { @@ -287,5 +291,12 @@ namespace Mono.Cecil.Tests { Assert.AreEqual (MetadataType.Object, type.BaseType.MetadataType); } } + + [Test] + public void SelfReferencingTypeRef () + { + TestModule ("self-ref-typeref.dll", module => { + }, verify: false); + } } } diff --git a/external/cecil/symbols/pdb/Mono.Cecil.Pdb/NativePdbReader.cs b/external/cecil/symbols/pdb/Mono.Cecil.Pdb/NativePdbReader.cs index 49c509a59c..468e88208a 100644 --- a/external/cecil/symbols/pdb/Mono.Cecil.Pdb/NativePdbReader.cs +++ b/external/cecil/symbols/pdb/Mono.Cecil.Pdb/NativePdbReader.cs @@ -183,12 +183,12 @@ namespace Mono.Cecil.Pdb { parent.variables = new Collection (scope.slots.Length); foreach (PdbSlot slot in scope.slots) { - if (slot.flags == 1) // parameter names + if ((slot.flags & 1) != 0) // parameter names continue; var index = (int) slot.slot; var variable = new VariableDebugInformation (index, slot.name); - if (slot.flags == 4) + if ((slot.flags & 4) != 0) variable.IsDebuggerHidden = true; parent.variables.Add (variable); } diff --git a/external/cecil/symbols/pdb/Mono.Cecil.Pdb/NativePdbWriter.cs b/external/cecil/symbols/pdb/Mono.Cecil.Pdb/NativePdbWriter.cs index 57e75801d3..4e295290fb 100644 --- a/external/cecil/symbols/pdb/Mono.Cecil.Pdb/NativePdbWriter.cs +++ b/external/cecil/symbols/pdb/Mono.Cecil.Pdb/NativePdbWriter.cs @@ -22,18 +22,18 @@ using Mono.Collections.Generic; namespace Mono.Cecil.Pdb { - public class NativePdbWriter : ISymbolWriter, IMetadataSymbolWriter { + public class NativePdbWriter : ISymbolWriter { readonly ModuleDefinition module; + readonly MetadataBuilder metadata; readonly SymWriter writer; readonly Dictionary documents; readonly Dictionary import_info_to_parent; - MetadataBuilder metadata; - internal NativePdbWriter (ModuleDefinition module, SymWriter writer) { this.module = module; + this.metadata = module.metadata_builder; this.writer = writer; this.documents = new Dictionary (); this.import_info_to_parent = new Dictionary (); @@ -75,15 +75,6 @@ namespace Mono.Cecil.Pdb { writer.CloseMethod (); } - void IMetadataSymbolWriter.SetMetadata (MetadataBuilder metadata) - { - this.metadata = metadata; - } - - void IMetadataSymbolWriter.WriteModule () - { - } - void DefineCustomMetadata (MethodDebugInformation info, MetadataToken import_parent) { var metadata = new CustomMetadataWriter (this.writer); diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index b8fa9e733d..ab1b152d07 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.20.0.203"; + public const string MonoVersion = "5.20.0.208"; 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/corefx/Unix/Interop.cs b/mcs/class/System/corefx/Unix/Interop.cs index 312b1efa86..4ec2ec3ca2 100644 --- a/mcs/class/System/corefx/Unix/Interop.cs +++ b/mcs/class/System/corefx/Unix/Interop.cs @@ -6,6 +6,6 @@ using System.Runtime.InteropServices; internal static partial class Interop { - [DllImport("__Internal")] + [DllImport("System.Native")] internal static extern void mono_pal_init (); } diff --git a/mcs/class/System/monodroid_System_xtest.dll.exclude.sources b/mcs/class/System/monodroid_System_xtest.dll.exclude.sources index 009b279c6b..50cc0f1d6c 100644 --- a/mcs/class/System/monodroid_System_xtest.dll.exclude.sources +++ b/mcs/class/System/monodroid_System_xtest.dll.exclude.sources @@ -13,3 +13,8 @@ ../../../external/corefx/src/System.Net.Security/tests/UnitTests/Fakes/*.cs ../../../external/corefx/src/System.Text.RegularExpressions/tests/*.cs + +System/RemoteExecutorTests.cs + +# FileSystemWatcher_Path fails with "System.ArgumentException : The directory name is invalid" +../../../external/corefx/src/System.IO.FileSystem.Watcher/tests/FileSystemWatcher.unit.cs diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Cecil.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Cecil.dll.REMOVED.git-id index be37de0f4c..3eaf7e4466 100644 --- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Cecil.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Cecil.dll.REMOVED.git-id @@ -1 +1 @@ -ac4040e2d669b15a51f36831721a799b30c9d9d8 \ No newline at end of file +ec92e2d26b2a065c44d46ddd58a6635a7a1d7410 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id index c06a4e4548..767ba25bdc 100644 --- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -0f75e4f8390e4bdc479ec1f677778a687fde86f5 \ No newline at end of file +ce9f6695f80917a3792dc8b3e0ab228d4f026b77 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id index 593795bb80..6c755b96f6 100644 --- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -4c77f8350549d6bd4e462e2c6d9b54c9c8b8fc0c \ No newline at end of file +e09358a1f156c34e495f035b21e98ad237432941 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id index cdebb2cd65..decf8870f1 100644 --- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -be1d05d050de6a4f697f1a317e38487f1dbd5d00 \ No newline at end of file +c2b5880df60f97dc434825f9741f338c9a389075 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll index 6b478841962bca2abb5edad97a3d170624b35f85..db8aa949b9042fd63d6732552c723123b89e91f8 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZGc6UZfsD0`0W=H{p{7}gu-6Ddrex6lj$Y6b%{ Q04kTDeE}-BXA=RLaF4ex6lj$Y6b%{ Q04kTDeE}-BXA=RLaF4ex6lj$Y6b%{ Q04kTDeE}-BXA=RLaF4ex6lj$Y6b%{ Q04kTDeE}-BXA=RLaF4_!R(7FGt9oB7oXv;biB2MYiI diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 893aeb340e..05a6c62c82 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -0929cffcf97adb47ce0707020cc83ff05fc2ff59 \ No newline at end of file +39addc88d6353d2c3a6ca19af5d8074c6c3dacba \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 155c9cd87e..9774cfe932 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 5.20.0.203\n" +"Project-Id-Version: mono 5.20.0.208\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-02-12 08:09+0000\n" +"POT-Creation-Date: 2019-02-13 08:08+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 8dc034342fcb3339a1c83cef58bff70a3f5c10b8..edc28748f7af5f3c0a2a20e728f13bfdb11a4f19 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*^LzpEUXMHHm6QyYzF{s@(6(d delta 22 ecmaF1gXP%{mJM-J*^LwoEUXMHH>XZzYzF{s>