mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream'

Browse Source 
Former-commit-id: 437e8b96b2812ca82a400497864922cd3f0f7e00
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-06-20 09:15:04 +00:00
commit 8d2988d7f8
50 changed files with 49 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
31a9498daf6bb155f2123b3ecd7faa579ade4c98 c48be7e29de6b82f66ccf3bb75aca7896ab3d884

2
configure.ac.REMOVED.git-id
View File

@ -1 +1 @@
e17288b2e852e32474aebf862e6347b06e6cd2a2 4dec026a8bfffef65a1ed8299e0eb45feb636dfc

2
mcs/build/common/Consts.cs
View File

@ -41,7 +41,7 @@ static partial class Consts
// Use these assembly version constants to make code more maintainable. // Use these assembly version constants to make code more maintainable.
// //
public const string MonoVersion = "6.0.0.302"; public const string MonoVersion = "6.0.0.306";
public const string MonoCompany = "Mono development team"; public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors"; public const string MonoCopyright = "(c) Various Mono authors";

2
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
707e0df8d36d7e873f6a93d82ff286a0e675825a 404f25458c2c32cfe1450e0a7306093972cefbd2

2
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
e0cfa451b476ede754a8d5bb0ecaf177b2506b98 e75ae226aa0e0864a53c5ee44242b8bf9256607e

2
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
a8e0dec34755f207498bca98116670d810e34bd7 34073db9a5ef7ccdcc7b6152716b068b2e426bb3

BIN
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
00060537c5a7b8b3b1b854dc6199b695e1084f0a e717f7a8bc6f721bb081fa1abe563dee384724a8

2
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
ef46214686b5696543af92d0c70196ba0b943a6d 23711c4a9b9ec04b46a2db7839293bcae131b6fa

2
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
1b047b44ee58aa8a884a47305868b76578a88ff3 b0a022225d70931c15e24955a4ea32e98c1e3e82

2
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
a1d786bde0d6c4c74526dc14a87da6a44f9279ad 4ccdacb28b157affe97addec35459eb8d29694dc

2
mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
707e0df8d36d7e873f6a93d82ff286a0e675825a 404f25458c2c32cfe1450e0a7306093972cefbd2

2
mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
e0cfa451b476ede754a8d5bb0ecaf177b2506b98 e75ae226aa0e0864a53c5ee44242b8bf9256607e

2
mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
a8e0dec34755f207498bca98116670d810e34bd7 34073db9a5ef7ccdcc7b6152716b068b2e426bb3

BIN
mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
00060537c5a7b8b3b1b854dc6199b695e1084f0a e717f7a8bc6f721bb081fa1abe563dee384724a8

2
mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
ef46214686b5696543af92d0c70196ba0b943a6d 23711c4a9b9ec04b46a2db7839293bcae131b6fa

2
mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
1b047b44ee58aa8a884a47305868b76578a88ff3 b0a022225d70931c15e24955a4ea32e98c1e3e82

2
mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
a1d786bde0d6c4c74526dc14a87da6a44f9279ad 4ccdacb28b157affe97addec35459eb8d29694dc

2
mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
707e0df8d36d7e873f6a93d82ff286a0e675825a 404f25458c2c32cfe1450e0a7306093972cefbd2

2
mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
e0cfa451b476ede754a8d5bb0ecaf177b2506b98 e75ae226aa0e0864a53c5ee44242b8bf9256607e

2
mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
a8e0dec34755f207498bca98116670d810e34bd7 34073db9a5ef7ccdcc7b6152716b068b2e426bb3

BIN
mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
00060537c5a7b8b3b1b854dc6199b695e1084f0a e717f7a8bc6f721bb081fa1abe563dee384724a8

2
mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
ef46214686b5696543af92d0c70196ba0b943a6d 23711c4a9b9ec04b46a2db7839293bcae131b6fa

2
mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
1b047b44ee58aa8a884a47305868b76578a88ff3 b0a022225d70931c15e24955a4ea32e98c1e3e82

2
mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
a1d786bde0d6c4c74526dc14a87da6a44f9279ad 4ccdacb28b157affe97addec35459eb8d29694dc

2
mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
707e0df8d36d7e873f6a93d82ff286a0e675825a 404f25458c2c32cfe1450e0a7306093972cefbd2

2
mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
e0cfa451b476ede754a8d5bb0ecaf177b2506b98 e75ae226aa0e0864a53c5ee44242b8bf9256607e

2
mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
7fc95be03837f157066d246f3e7ac3f2c7ced403 a17a0c96ae88165365add3ba94c0903b1572a845

BIN
mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
00060537c5a7b8b3b1b854dc6199b695e1084f0a e717f7a8bc6f721bb081fa1abe563dee384724a8

2
mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
ef46214686b5696543af92d0c70196ba0b943a6d 23711c4a9b9ec04b46a2db7839293bcae131b6fa

2
mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
1b047b44ee58aa8a884a47305868b76578a88ff3 b0a022225d70931c15e24955a4ea32e98c1e3e82

2
mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
c5c13a9dfb924885908c55b62252c3cd2a543a99 6e094419447718425554d31f74c0d83013347327

7
mono/metadata/external-only.c
View File

@ -92,7 +92,12 @@ mono_gchandle_get_target (uint32_t gchandle)
void void
mono_gchandle_free (uint32_t gchandle) mono_gchandle_free (uint32_t gchandle)
{ {
MONO_EXTERNAL_ONLY_GC_UNSAFE_VOID (mono_gchandle_free_internal (gchandle)); /* Xamarin.Mac and Xamarin.iOS can call this from a worker thread
* that's not attached to the runtime. This is okay for SGen because
* the gchandle code is lockfree. SGen calls back into Mono which
* fires a profiler event, so the profiler must be prepared to be
* called from threads that aren't attached to Mono. */
MONO_EXTERNAL_ONLY_VOID (mono_gchandle_free_internal (gchandle));
} }
/* GC write barriers support */ /* GC write barriers support */

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "explicit/fdf6490" #define FULL_VERSION "explicit/537654c"

2
mono/profiler/log.c.REMOVED.git-id
View File

@ -1 +1 @@
66f6acf9cdb8bac60cf62e7562b4e29c0f443623 300d3839a9130f1dac2a73e34a2a704a1540a0bd

4
mono/unit-tests/Makefile.in
View File

@ -1443,10 +1443,10 @@ distclean-generic:
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
@CROSS_COMPILE_TRUE@clean-local:
@HOST_WIN32_TRUE@clean-local:
@CROSS_COMPILE_TRUE@test-local: @CROSS_COMPILE_TRUE@test-local:
@HOST_WIN32_TRUE@test-local: @HOST_WIN32_TRUE@test-local:
@CROSS_COMPILE_TRUE@clean-local:
@HOST_WIN32_TRUE@clean-local:
clean: clean-am clean: clean-am
clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \ clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \

6
mono/utils/mono-threads-coop.h
View File

@ -116,11 +116,7 @@ void mono_threads_suspend_override_policy (MonoThreadsSuspendPolicy new_policy);
* runtime assertion error when trying to switch the state of the current thread. * runtime assertion error when trying to switch the state of the current thread.
*/ */
G_EXTERN_C // due to THREAD_INFO_TYPE varying MONO_PROFILER_API
gpointer
mono_threads_enter_gc_safe_region_with_info (THREAD_INFO_TYPE *info, MonoStackData *stackdata);
G_EXTERN_C // due to THREAD_INFO_TYPE varying
gpointer gpointer
mono_threads_enter_gc_safe_region_with_info (THREAD_INFO_TYPE *info, MonoStackData *stackdata); mono_threads_enter_gc_safe_region_with_info (THREAD_INFO_TYPE *info, MonoStackData *stackdata);

2
mono/utils/mono-threads.h
View File

@ -432,7 +432,7 @@ MONO_API void*
mono_thread_info_get_tools_data (void); mono_thread_info_get_tools_data (void);
THREAD_INFO_TYPE* MONO_PROFILER_API THREAD_INFO_TYPE*
mono_thread_info_current_unchecked (void); mono_thread_info_current_unchecked (void);
MONO_API int MONO_API int

BIN
po/mcs/de.gmo
View File

Binary file not shown.

2
po/mcs/de.po.REMOVED.git-id
View File

@ -1 +1 @@
677dc9591de53fcfdbd708940b441191503b3496 814a42669cfe295824bba461960c5ab84f5da358

BIN
po/mcs/es.gmo
View File

Binary file not shown.

2
po/mcs/es.po.REMOVED.git-id
View File

@ -1 +1 @@
907ea4e25da95b086f1327c2357ee1e995071bd4 d5dafd6b5594a762280937ec2c005a92cf61a73b

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

2
po/mcs/ja.po.REMOVED.git-id
View File

@ -1 +1 @@
5dc06f534ea570b212a34a0f3d4138248208e5dd 1be2d088e7f722075deacf9b0c6c04af8a5aa7b0

4
po/mcs/mcs.pot
View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mono 6.0.0.302\n" "Project-Id-Version: mono 6.0.0.306\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2019-06-15 08:08+0000\n" "POT-Creation-Date: 2019-06-20 08:12+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"

BIN
po/mcs/pt_BR.gmo
View File

Binary file not shown.

2
po/mcs/pt_BR.po.REMOVED.git-id
View File

@ -1 +1 @@
7c8080c91e032fa76e5f088eadb2df4d784b29fe c532895021b199067af65654f8d00ffb96c2d0d8