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: 0c377d551ac972562568d120d3d3c49df8a1d9be
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-03-09 09:00:38 +00:00
commit 9e6c9d43c3
40 changed files with 43 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
4d3eccac1a321ef2ee9d5042ffff0156a34a3026
9840eda3e915e4ad624f62b24ab5fbc0766a3c0d

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

@ -1 +1 @@
1caacd293068a073ffa1b57f3fb05837600c23f2
aac479edf738e3ecb1ea6b1127e1407f4db22fb6

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

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

2
mcs/class/corlib/Test/System/TypeTest.cs.REMOVED.git-id
View File

@ -1 +1 @@
8abbb6fa6686078f6c619fd2b2e5e8f1ef3ab045
9feda2ab31c0832aa8ddef3b30100db2246253e7

2
mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
d9fad072698d45ec4b6d55a4352c2de27ebeb5d7
c0da0dce9bf20100c7f4ab975037276cdbe89c08

2
mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
934861dbe6711e129666fd5805326ab0073e3b42
55824e8b2ffa45040741cb8c958e830a6e166621

2
mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
a83d98b1ac3bfabb08f9c54a39671da65356d43a
a822c9369ebff537de1caf4b5f901d65a427ac89

2
mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
204c69b446f5268c93cb74d854e437eda0c544a8
8209901140c061f98d47be6566287ac0499aac19

2
mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
9cc9e38d1f64bce5cb47a1158dcf1426c4dca460
957702c72fa1f6c43aabfecb5ed549e5f6aa70a7

2
mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
cd3dcf420b7b680f0a485dd04dcf6a97d50c9e61
eade14bf1279bc091045a1219949530e5b77503b

2
mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
3a88127e8bd195610a4a4dcfbcd9661b387f1c35
7c9efacd3728f855d15e98cff3d52fda072ccde3

2
mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
d9fad072698d45ec4b6d55a4352c2de27ebeb5d7
c0da0dce9bf20100c7f4ab975037276cdbe89c08

2
mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
934861dbe6711e129666fd5805326ab0073e3b42
55824e8b2ffa45040741cb8c958e830a6e166621

2
mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
a83d98b1ac3bfabb08f9c54a39671da65356d43a
a822c9369ebff537de1caf4b5f901d65a427ac89

2
mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
204c69b446f5268c93cb74d854e437eda0c544a8
8209901140c061f98d47be6566287ac0499aac19

2
mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
9cc9e38d1f64bce5cb47a1158dcf1426c4dca460
957702c72fa1f6c43aabfecb5ed549e5f6aa70a7

2
mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
cd3dcf420b7b680f0a485dd04dcf6a97d50c9e61
eade14bf1279bc091045a1219949530e5b77503b

2
mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
3a88127e8bd195610a4a4dcfbcd9661b387f1c35
7c9efacd3728f855d15e98cff3d52fda072ccde3

2
mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
d9fad072698d45ec4b6d55a4352c2de27ebeb5d7
c0da0dce9bf20100c7f4ab975037276cdbe89c08

2
mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
934861dbe6711e129666fd5805326ab0073e3b42
55824e8b2ffa45040741cb8c958e830a6e166621

2
mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
a83d98b1ac3bfabb08f9c54a39671da65356d43a
a822c9369ebff537de1caf4b5f901d65a427ac89

2
mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
204c69b446f5268c93cb74d854e437eda0c544a8
8209901140c061f98d47be6566287ac0499aac19

2
mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
9cc9e38d1f64bce5cb47a1158dcf1426c4dca460
957702c72fa1f6c43aabfecb5ed549e5f6aa70a7

2
mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
cd3dcf420b7b680f0a485dd04dcf6a97d50c9e61
eade14bf1279bc091045a1219949530e5b77503b

2
mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
3a88127e8bd195610a4a4dcfbcd9661b387f1c35
7c9efacd3728f855d15e98cff3d52fda072ccde3

1
mono/metadata/class-internals.h
View File

@ -1116,6 +1116,7 @@ typedef struct {
MonoClass *customattribute_data_class;
MonoClass *critical_finalizer_object; /* MAYBE NULL */
MonoClass *generic_ireadonlylist_class;
MonoClass *generic_ienumerator_class;
MonoClass *threadpool_wait_callback_class;
MonoMethod *threadpool_perform_wait_callback_method;
} MonoDefaults;

2
mono/metadata/class.c.REMOVED.git-id
View File

@ -1 +1 @@
a83a637f7da9c270a6ec168f7a0e5bbf953749c1
49080993b6bc617c20c8f1552fa6cc495dd80a9d

2
mono/metadata/domain.c
View File

@ -753,6 +753,8 @@ mono_init_internal (const char *filename, const char *exe_filename, const char *
mono_defaults.corlib, "System.Collections.Generic", "IList`1");
mono_defaults.generic_ireadonlylist_class = mono_class_load_from_name (
mono_defaults.corlib, "System.Collections.Generic", "IReadOnlyList`1");
mono_defaults.generic_ienumerator_class = mono_class_load_from_name (
mono_defaults.corlib, "System.Collections.Generic", "IEnumerator`1");
mono_defaults.threadpool_wait_callback_class = mono_class_load_from_name (
mono_defaults.corlib, "System.Threading", "_ThreadPoolWaitCallback");

6
mono/mini/aot-tests.cs
View File

@ -510,4 +510,10 @@ class Tests
}
return 0;
}
public static int test_0_regress_gh_7364 () {
var map1 = new Dictionary <Type, IntPtr> (EqualityComparer<Type>.Default);
var map2 = new Dictionary <IntPtr, WeakReference> (EqualityComparer<IntPtr>.Default);
return 0;
}
}

2
mono/mini/mini-runtime.c.REMOVED.git-id
View File

@ -1 +1 @@
6a27b69fc127584776d984dcc833c2cd81c74681
b2bae52ba61b8482455ccd7484e5dc1290538d3b

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "explicit/15d76bf"
#define FULL_VERSION "explicit/266326d"

BIN
po/mcs/de.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
1ad237e9a79592e873b8b2f4e43189dfb1ade6f7
527224c2dc64f527e0cfe4fd5ed2c81fbea38471

BIN
po/mcs/es.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
f4454fcc3cf6ed8a6c5128fda4f61078bcb873eb
c35efe0392b5525fa655ed8b29c31771a5a420cc

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
44b7a477b775d109e7aafc3bc62a23a218118b6b
84ea27576663ea204e958d8a87a63bb357d7dcb1

4
po/mcs/mcs.pot
View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.10.0.161\n"
"Project-Id-Version: mono 5.10.0.170\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-03-08 08:21+0000\n"
"POT-Creation-Date: 2018-03-09 08:27+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

BIN
po/mcs/pt_BR.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
88306d03503318f2a5bd0a3ec110fdc84cd2afa0
36517b6c7cc7354be8b23b6b5a3fa0a6378abd44