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: 348f56759b7da831e5a958a8a5b1209fd0eeddab
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-04-01 09:18:49 +00:00
commit 8288661277
38 changed files with 71 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 @@
4f583806bb8c4568601605309293ef257e338bf6
44cf7ec112594f4314428506fd070ed385355c07

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

@ -1 +1 @@
7f5772066f164630cebec71d176804ed59bd8c71
4a5d555c96705e7301c7f00f2f6932f64f86bb87

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.1.25";
public const string MonoVersion = "5.10.1.27";
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/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
8643a3e9b2d7a5f632803bbc7ae1d39a4a8ece7d
14b3df91ea74b8fbf2dd4cecb26fa2b8dd2e5f95

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

@ -1 +1 @@
0f12a8108dc4168a49274bbde35493873b57a8c9
832e19c239189c07e84830b67875773a9ac9c593

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

@ -1 +1 @@
647d2e4c6f9fd2703f3e45d144e3f2aa1a64a8f5
22eb54f8cea212b7e73e74b56283db83c4fb02fc

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

@ -1 +1 @@
1df2c53b18f6cc67616ba47d684a56208d812e85
8a8ae92bc00eec576a7fce45c384a2acd9257da4

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

@ -1 +1 @@
e2ec8ff30e727761bdf337475901347fd7f862f7
6c782e0ae1de7e6c5909f2bdf4ed2ec4500b14b6

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

@ -1 +1 @@
f2fe82f4f9517875f1bc24f75040a5920ed3f79b
2feacd91f28e38484bfafa2b6e4d74abbb6b64c0

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

@ -1 +1 @@
5bc04b8bcea60a959c138b51f185cf37d3ebb0ce
3926a4cbfbdc807e572e44087b7e5c72d20ab65f

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

@ -1 +1 @@
8643a3e9b2d7a5f632803bbc7ae1d39a4a8ece7d
14b3df91ea74b8fbf2dd4cecb26fa2b8dd2e5f95

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

@ -1 +1 @@
0f12a8108dc4168a49274bbde35493873b57a8c9
832e19c239189c07e84830b67875773a9ac9c593

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

@ -1 +1 @@
647d2e4c6f9fd2703f3e45d144e3f2aa1a64a8f5
22eb54f8cea212b7e73e74b56283db83c4fb02fc

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

@ -1 +1 @@
1df2c53b18f6cc67616ba47d684a56208d812e85
8a8ae92bc00eec576a7fce45c384a2acd9257da4

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

@ -1 +1 @@
e2ec8ff30e727761bdf337475901347fd7f862f7
6c782e0ae1de7e6c5909f2bdf4ed2ec4500b14b6

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

@ -1 +1 @@
f2fe82f4f9517875f1bc24f75040a5920ed3f79b
2feacd91f28e38484bfafa2b6e4d74abbb6b64c0

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

@ -1 +1 @@
5bc04b8bcea60a959c138b51f185cf37d3ebb0ce
3926a4cbfbdc807e572e44087b7e5c72d20ab65f

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

@ -1 +1 @@
8643a3e9b2d7a5f632803bbc7ae1d39a4a8ece7d
14b3df91ea74b8fbf2dd4cecb26fa2b8dd2e5f95

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

@ -1 +1 @@
0f12a8108dc4168a49274bbde35493873b57a8c9
832e19c239189c07e84830b67875773a9ac9c593

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

@ -1 +1 @@
647d2e4c6f9fd2703f3e45d144e3f2aa1a64a8f5
22eb54f8cea212b7e73e74b56283db83c4fb02fc

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

@ -1 +1 @@
1df2c53b18f6cc67616ba47d684a56208d812e85
8a8ae92bc00eec576a7fce45c384a2acd9257da4

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

@ -1 +1 @@
e2ec8ff30e727761bdf337475901347fd7f862f7
6c782e0ae1de7e6c5909f2bdf4ed2ec4500b14b6

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

@ -1 +1 @@
f2fe82f4f9517875f1bc24f75040a5920ed3f79b
2feacd91f28e38484bfafa2b6e4d74abbb6b64c0

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

@ -1 +1 @@
5bc04b8bcea60a959c138b51f185cf37d3ebb0ce
3926a4cbfbdc807e572e44087b7e5c72d20ab65f

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

@ -1 +1 @@
49080993b6bc617c20c8f1552fa6cc495dd80a9d
68ab440b71fd8ec8a06ecaf8b49681b8555a6143

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "explicit/de7bff2"
#define FULL_VERSION "explicit/8aa3f61"

3
mono/tests/Makefile.am
View File

@ -531,7 +531,8 @@ TESTS_CS_SRC= \
bug-59281.cs \
init_array_with_lazy_type.cs \
weak-fields.cs \
threads-leak.cs
threads-leak.cs \
nested_type_visibility.cs
if AMD64
TESTS_CS_SRC += async-exc-compilation.cs finally_guard.cs finally_block_ending_in_dead_bb.cs

2
mono/tests/Makefile.in.REMOVED.git-id
View File

@ -1 +1 @@
2c4b5fc1124b05fe96f152bc6589da0203e774cf
84a771e98363ad74606456fd353212593fc429d3

36
mono/tests/nested_type_visibility.cs Normal file
View File

@ -0,0 +1,36 @@
namespace ConsoleApplication1
{
public abstract class SuperClass
{
protected abstract class SuperInnerAbstractClass
{
protected class SuperInnerInnerClass
{
}
}
}
public class ChildClass : SuperClass
{
private class ChildInnerClass : SuperInnerAbstractClass
{
private readonly SuperInnerInnerClass s_class = new SuperInnerInnerClass();
}
public ChildClass()
{
var childInnerClass = new ChildInnerClass();
}
}
internal class Program
{
public static int Main(string[] args)
{
new ChildClass();
return 0;
}
}
}

BIN
po/mcs/de.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
c652e4c0e113f11d3335b1c846e5f45838903e90
c6a9c5bfd1a92fd395f019a0e49d437207b6b823

BIN
po/mcs/es.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
1953c3929869462f44a67fa46d17e2b5c718f5ab
2a924939aa1d560f32a4562d585216eaf699c4da

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
94b4596be3a50bec45268f15c52b24afaed9674b
27e0f2e7c44c90fdda96b868e89d3cca62c25059

4
po/mcs/mcs.pot
View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.10.1.25\n"
"Project-Id-Version: mono 5.10.1.27\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-03-30 08:21+0000\n"
"POT-Creation-Date: 2018-04-01 08:41+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 @@
e20f53b5e45c409f44c4755740607927464f1138
517c9152b3ab54be52ea0e8c04a20d2d49641010