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: b5153953c7d5a5589f06bc8d031652a6c067d8a3
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-07-21 08:20:20 +00:00
commit 131a2ee3d0
35 changed files with 32 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
c90694a5a334d4af0381fcf93eea0b359d1708b9
3f0d0c5a3b2386b0e7251bcbcaf67bc5e1ad1e52

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

@ -1 +1 @@
3998e85c1b62216ba2f5c64713f8b5127812e913
1577675c777512af107f4ec5a9ddd60285a4b9c6

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.14.0.171";
public const string MonoVersion = "5.14.0.172";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

23
mcs/class/corlib/System/TermInfoReader.cs
View File

@ -173,7 +173,7 @@ namespace System {
offset++;
offset += ((int) number) * intOffset;
return GetInteger (buffer, offset);
return GetInt16 (buffer, offset);
}
public string Get (TermInfoStrings tstr)
@ -222,27 +222,6 @@ namespace System {
return (short) (uno + dos * 256);
}
int GetInt32 (byte [] buffer, int offset)
{
int b1 = (int) buffer [offset];
int b2 = (int) buffer [offset + 1];
int b3 = (int) buffer [offset + 2];
int b4 = (int) buffer [offset + 3];
if (b1 == 255 && b2 == 255 && b3 == 255 && b4 == 255)
return -1;
return b1 + b2 << 8 + b3 << 16 + b4 << 24;
}
int GetInteger (byte [] buffer, int offset)
{
if (intOffset == 2)
return GetInt16 (buffer, offset);
else
// intOffset == 4
return GetInt32 (buffer, offset);
}
string GetString (byte [] buffer, int offset)
{
int length = 0;

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

@ -1 +1 @@
f846c0f0518298f26ffb2399ace8dc6a37537574
1b9a44332a612b60a46d6288a0d1c6072f7f8428

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

@ -1 +1 @@
b05133cd7c331586deace52e4b262c1e752dfb4a
a75eecb5c6b9b446e80ab028b9b4c29a6f5e9dd2

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

@ -1 +1 @@
2529bc8fe0705d0d044ba2437eec769e69ae178c
37b028e2f8a160ce6678e35b345af9fef600934b

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

@ -1 +1 @@
168ff73c8a6ffe34cfbdcd6e5c83002011a1547f
af34ccffcfc81d0195dd122b87643b9d9107fe96

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

@ -1 +1 @@
4cd08e1ba992913daef88c9feb4740fca9ea0d31
eb3597bc417c874560030e98fdd4effd79bece68

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

@ -1 +1 @@
274992efdddda839b2e0febd321f6e199e24f9a5
7aa4cfced2fae9ca66c248cfab3a74e5f5c1ecb3

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

@ -1 +1 @@
b664ccab2a1503d8bdcdfbac55240b6b99085c84
efde2771e83913ef603f521df00dfbe779bbc52b

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

@ -1 +1 @@
f846c0f0518298f26ffb2399ace8dc6a37537574
1b9a44332a612b60a46d6288a0d1c6072f7f8428

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

@ -1 +1 @@
b05133cd7c331586deace52e4b262c1e752dfb4a
a75eecb5c6b9b446e80ab028b9b4c29a6f5e9dd2

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

@ -1 +1 @@
2529bc8fe0705d0d044ba2437eec769e69ae178c
37b028e2f8a160ce6678e35b345af9fef600934b

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

@ -1 +1 @@
168ff73c8a6ffe34cfbdcd6e5c83002011a1547f
af34ccffcfc81d0195dd122b87643b9d9107fe96

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

@ -1 +1 @@
4cd08e1ba992913daef88c9feb4740fca9ea0d31
eb3597bc417c874560030e98fdd4effd79bece68

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

@ -1 +1 @@
274992efdddda839b2e0febd321f6e199e24f9a5
7aa4cfced2fae9ca66c248cfab3a74e5f5c1ecb3

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

@ -1 +1 @@
b664ccab2a1503d8bdcdfbac55240b6b99085c84
efde2771e83913ef603f521df00dfbe779bbc52b

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

@ -1 +1 @@
f846c0f0518298f26ffb2399ace8dc6a37537574
1b9a44332a612b60a46d6288a0d1c6072f7f8428

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

@ -1 +1 @@
b05133cd7c331586deace52e4b262c1e752dfb4a
a75eecb5c6b9b446e80ab028b9b4c29a6f5e9dd2

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

@ -1 +1 @@
2529bc8fe0705d0d044ba2437eec769e69ae178c
37b028e2f8a160ce6678e35b345af9fef600934b

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

@ -1 +1 @@
168ff73c8a6ffe34cfbdcd6e5c83002011a1547f
af34ccffcfc81d0195dd122b87643b9d9107fe96

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

@ -1 +1 @@
4cd08e1ba992913daef88c9feb4740fca9ea0d31
eb3597bc417c874560030e98fdd4effd79bece68

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

@ -1 +1 @@
274992efdddda839b2e0febd321f6e199e24f9a5
7aa4cfced2fae9ca66c248cfab3a74e5f5c1ecb3

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

@ -1 +1 @@
b664ccab2a1503d8bdcdfbac55240b6b99085c84
efde2771e83913ef603f521df00dfbe779bbc52b

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "explicit/e92217a"
#define FULL_VERSION "explicit/16538b2"

BIN
po/mcs/de.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
25908e695c81eadd0240cd529230862de02895d3
2779c742879b8144989ec917964e7a5167a55bd3

BIN
po/mcs/es.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
59470a287be652759d2c3f4dd666f82f256c9696
eb96432cf38c8cbe16a17cfd13083e6a3263a352

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
65eb792ccc5b22741ec64fc7ee1a70a8d6c489b4
1b78d9f5fe198dec1e200a4eda818067112a757b

4
po/mcs/mcs.pot
View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.14.0.171\n"
"Project-Id-Version: mono 5.14.0.172\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-07-20 08:04+0000\n"
"POT-Creation-Date: 2018-07-21 08:01+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 @@
3e8a2346f30c24ed931b1befdf5f8f3b04d9bf4a
57939ed530fdafd9ca68ea71c03a0686e9fd2b1b