From a63e3f015664dbf39ad26f83c5363ddbfdfb58b1 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Thu, 13 Jun 2019 09:02:23 +0000 Subject: [PATCH] Imported Upstream version 6.0.0.299 Former-commit-id: 58c3002e8712d6dd8574da4588af7a17eca4547f --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- .../System.Runtime.CompilerServices.Unsafe.cs | 1 + .../System.Runtime.CompilerServices.Unsafe.cs | 1 + .../System.Runtime.CompilerServices.Unsafe.cs | 1 + mcs/build/common/Consts.cs | 2 +- .../System.Runtime.CompilerServices/Unsafe.il | 8 ++++++ .../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.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.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.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/metadata/external-only.c | 24 +++++++++--------- mono/metadata/marshal.c.REMOVED.git-id | 2 +- mono/mini/aot-compiler.c.REMOVED.git-id | 2 +- mono/mini/gshared.cs | 2 -- .../mini-generic-sharing.c.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- msvc/Makefile.in | 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 +- 55 files changed, 65 insertions(+), 56 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 894a33adac..0c4b85da8e 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -225e5801b2254c7cc0492a0eda9316bd5ac37e6d \ No newline at end of file +bfddb03c995a54a8367cd96b232d2c10364544db \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 5b6309ed3d..829add97c6 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -e57cc65761fe70cfc34d3a9b1f4cd58a839eaf3f \ No newline at end of file +2b32e12835f376e47158033368c4a732d55a5047 \ No newline at end of file diff --git a/external/api-snapshot/profiles/monodroid/System.Runtime.CompilerServices.Unsafe.cs b/external/api-snapshot/profiles/monodroid/System.Runtime.CompilerServices.Unsafe.cs index d954239a7b..bd40369845 100644 --- a/external/api-snapshot/profiles/monodroid/System.Runtime.CompilerServices.Unsafe.cs +++ b/external/api-snapshot/profiles/monodroid/System.Runtime.CompilerServices.Unsafe.cs @@ -40,6 +40,7 @@ namespace System.Runtime.CompilerServices [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public unsafe static void* Subtract(void* source, int elementOffset) { throw null; } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static ref T Subtract(ref T source, int elementOffset) { throw null; } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static ref T Subtract(ref T source, System.IntPtr elementOffset) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static ref T Unbox(object box) where T : struct { throw null; } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static void WriteUnaligned(ref byte destination, T value) { } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public unsafe static void WriteUnaligned(void* destination, T value) { } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public unsafe static void Write(void* destination, T value) { } diff --git a/external/api-snapshot/profiles/monotouch/System.Runtime.CompilerServices.Unsafe.cs b/external/api-snapshot/profiles/monotouch/System.Runtime.CompilerServices.Unsafe.cs index d954239a7b..bd40369845 100644 --- a/external/api-snapshot/profiles/monotouch/System.Runtime.CompilerServices.Unsafe.cs +++ b/external/api-snapshot/profiles/monotouch/System.Runtime.CompilerServices.Unsafe.cs @@ -40,6 +40,7 @@ namespace System.Runtime.CompilerServices [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public unsafe static void* Subtract(void* source, int elementOffset) { throw null; } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static ref T Subtract(ref T source, int elementOffset) { throw null; } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static ref T Subtract(ref T source, System.IntPtr elementOffset) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static ref T Unbox(object box) where T : struct { throw null; } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static void WriteUnaligned(ref byte destination, T value) { } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public unsafe static void WriteUnaligned(void* destination, T value) { } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public unsafe static void Write(void* destination, T value) { } diff --git a/external/api-snapshot/profiles/net_4_x/System.Runtime.CompilerServices.Unsafe.cs b/external/api-snapshot/profiles/net_4_x/System.Runtime.CompilerServices.Unsafe.cs index d954239a7b..bd40369845 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Runtime.CompilerServices.Unsafe.cs +++ b/external/api-snapshot/profiles/net_4_x/System.Runtime.CompilerServices.Unsafe.cs @@ -40,6 +40,7 @@ namespace System.Runtime.CompilerServices [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public unsafe static void* Subtract(void* source, int elementOffset) { throw null; } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static ref T Subtract(ref T source, int elementOffset) { throw null; } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static ref T Subtract(ref T source, System.IntPtr elementOffset) { throw null; } + [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static ref T Unbox(object box) where T : struct { throw null; } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public static void WriteUnaligned(ref byte destination, T value) { } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public unsafe static void WriteUnaligned(void* destination, T value) { } [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]public unsafe static void Write(void* destination, T value) { } diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index d531098c62..5fd12131a4 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -41,7 +41,7 @@ static partial class Consts // Use these assembly version constants to make code more maintainable. // - public const string MonoVersion = "6.0.0.294"; + public const string MonoVersion = "6.0.0.299"; 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/corlib/System.Runtime.CompilerServices/Unsafe.il b/mcs/class/corlib/System.Runtime.CompilerServices/Unsafe.il index 35f18857f9..c432c6229e 100644 --- a/mcs/class/corlib/System.Runtime.CompilerServices/Unsafe.il +++ b/mcs/class/corlib/System.Runtime.CompilerServices/Unsafe.il @@ -365,4 +365,12 @@ clt.un ret } + + .method public hidebysig static !!T& Unbox (object 'box') cil managed aggressiveinlining + { + .maxstack 1 + ldarg.0 + unbox !!T + ret + } } \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id index 6c82a48d09..6066066026 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -af6194e8716a564a367f4efbb3891fd096eb8811 \ No newline at end of file +8819bfc5318a074dcb1a11cd1ce8404e35920142 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id index 3e2ff679cb..ffc1c767c1 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -1704b81433e53b67202fb2c938d02c96add68a3a \ No newline at end of file +8135c87708bb0e6972b341ed4dcf542c8c5d38b5 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id index 58cf4bdb76..14c73cd4e8 100644 --- a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -dc16bcbafc79b523bbd1cef5abc74fabb96ea5cb \ No newline at end of file +692db1871a0f948ec05d95e07e58d1adddfbecf1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll index d4aa1a49c16ba6e6e14178f8da297852d710e1fb..c301bdd9f9155f10c093a41a2ae07924f03f1915 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZ4)V7DfsD0`0W1s%#VK+CQK|;8 diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 71fb350182..2e9fc225f2 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -3973322cd5c7355afc10177f706faf431ecf2763 \ No newline at end of file +1663d55fb672628d6ec044f619cae17cc77c86f3 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 529faf69740b36677ad9dd585050c493009bc5bf..9bb1f8c039e500d2d9017956ee036eec99caa314 100644 GIT binary patch delta 22 dcmeyri1Gg-#tj_m?8XWP7FI^aoB7oXv;bi12M7QF delta 22 dcmeyri1Gg-#tj_m>_!R(7FLFqoB7oXv;biI2MhoJ diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 04370bbbb6..00423e24de 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -672233584d922c44c737606770ab8df3e9867354 \ No newline at end of file +89453a46146bc867e2070c63aa6832a764dfd062 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 91b319e7dd..bf09a0d9eb 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 6.0.0.294\n" +"Project-Id-Version: mono 6.0.0.299\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-06-12 08:19+0000\n" +"POT-Creation-Date: 2019-06-13 08:23+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 3255b77d147a8519269eba4e2c389625b0793b68..ec9679b9efa7dc87c50f42bac5905ecee3aae53a 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*^LzpEUb)-H>XZzYzF{s;s|~K delta 22 ecmaF1gXP%{mJM-J*^LwoEUXMIH>XZzYzF{s^9X_f diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 864a27e577..0a83d39d72 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -dc8cc41d04934bb9dcac7fb0698c1886d26817b2 \ No newline at end of file +be68d34584641f65526ca88a1ed82c4f949a286d \ No newline at end of file