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: b8fabde7e3778a59b9f44be96f5d5b2a1f774edc
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-03-08 08:55:17 +00:00
commit 65cbe666db
38 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
3dfddaef886efdcb16b0fb7a9666e20ecfc37c62
4d3eccac1a321ef2ee9d5042ffff0156a34a3026

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

@ -1 +1 @@
db18931c9022bc8170fe1397e334f168716084cb
1caacd293068a073ffa1b57f3fb05837600c23f2

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

12
mcs/class/Mono.Profiler.Log/Mono.Profiler.Log/LogProcessor.cs
View File

@ -373,8 +373,8 @@ namespace Mono.Profiler.Log {
case LogEventType.MonitorBacktrace:
ev = new MonitorEvent {
Event = StreamHeader.FormatVersion >= 14 ?
(LogMonitorEvent) _reader.ReadByte () :
(LogMonitorEvent) ((((byte) type & 0xf0) >> 4) & 0x3),
(LogMonitorEvent) _reader.ReadByte () :
(LogMonitorEvent) ((((byte) type & 0xf0) >> 4) & 0x3),
ObjectPointer = ReadObject (),
Backtrace = ReadBacktrace (extType == LogEventType.MonitorBacktrace),
};
@ -476,9 +476,9 @@ namespace Mono.Profiler.Log {
Section = section,
SectionName = section == LogCounterSection.User ? _reader.ReadCString () : null,
CounterName = _reader.ReadCString (),
Type = StreamHeader.FormatVersion < 15 ? (LogCounterType) _reader.ReadByte () : (LogCounterType) _reader.ReadULeb128 (),
Unit = StreamHeader.FormatVersion < 15 ? (LogCounterUnit) _reader.ReadByte () : (LogCounterUnit) _reader.ReadULeb128 (),
Variance = StreamHeader.FormatVersion < 15 ? (LogCounterVariance) _reader.ReadByte () : (LogCounterVariance) _reader.ReadULeb128 (),
Type = (LogCounterType) _reader.ReadByte (),
Unit = (LogCounterUnit) _reader.ReadByte (),
Variance = (LogCounterVariance) _reader.ReadByte (),
Index = (long) _reader.ReadULeb128 (),
};
}
@ -498,7 +498,7 @@ namespace Mono.Profiler.Log {
if (index == 0)
break;
var counterType = StreamHeader.FormatVersion < 15 ? (LogCounterType) _reader.ReadByte () : (LogCounterType) _reader.ReadULeb128 ();
var counterType = (LogCounterType) _reader.ReadByte ();
object value = null;

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

@ -1 +1 @@
e3648ec762ca2ee3c7d8eb8dd47db4fbc37ab604
d9fad072698d45ec4b6d55a4352c2de27ebeb5d7

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

@ -1 +1 @@
efd89075bd285db5211e08ed43d8a1f277983c2a
934861dbe6711e129666fd5805326ab0073e3b42

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

@ -1 +1 @@
398a8f3785344006fc2a18c537335f051152c742
a83d98b1ac3bfabb08f9c54a39671da65356d43a

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

@ -1 +1 @@
e67714b89e0fd4da4a82040c8532f7d87780dcce
204c69b446f5268c93cb74d854e437eda0c544a8

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

@ -1 +1 @@
d229e5822be263f7985dd2fe47457be78943cd31
9cc9e38d1f64bce5cb47a1158dcf1426c4dca460

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

@ -1 +1 @@
911ec1eda3f29662b7de938f41e2a56815290873
cd3dcf420b7b680f0a485dd04dcf6a97d50c9e61

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

@ -1 +1 @@
fe3eb98c4140e84f03eaf1395a30988958a8d221
3a88127e8bd195610a4a4dcfbcd9661b387f1c35

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

@ -1 +1 @@
e3648ec762ca2ee3c7d8eb8dd47db4fbc37ab604
d9fad072698d45ec4b6d55a4352c2de27ebeb5d7

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

@ -1 +1 @@
efd89075bd285db5211e08ed43d8a1f277983c2a
934861dbe6711e129666fd5805326ab0073e3b42

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

@ -1 +1 @@
398a8f3785344006fc2a18c537335f051152c742
a83d98b1ac3bfabb08f9c54a39671da65356d43a

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

@ -1 +1 @@
e67714b89e0fd4da4a82040c8532f7d87780dcce
204c69b446f5268c93cb74d854e437eda0c544a8

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

@ -1 +1 @@
d229e5822be263f7985dd2fe47457be78943cd31
9cc9e38d1f64bce5cb47a1158dcf1426c4dca460

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

@ -1 +1 @@
911ec1eda3f29662b7de938f41e2a56815290873
cd3dcf420b7b680f0a485dd04dcf6a97d50c9e61

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

@ -1 +1 @@
fe3eb98c4140e84f03eaf1395a30988958a8d221
3a88127e8bd195610a4a4dcfbcd9661b387f1c35

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

@ -1 +1 @@
e3648ec762ca2ee3c7d8eb8dd47db4fbc37ab604
d9fad072698d45ec4b6d55a4352c2de27ebeb5d7

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

@ -1 +1 @@
efd89075bd285db5211e08ed43d8a1f277983c2a
934861dbe6711e129666fd5805326ab0073e3b42

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

@ -1 +1 @@
398a8f3785344006fc2a18c537335f051152c742
a83d98b1ac3bfabb08f9c54a39671da65356d43a

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

@ -1 +1 @@
e67714b89e0fd4da4a82040c8532f7d87780dcce
204c69b446f5268c93cb74d854e437eda0c544a8

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

@ -1 +1 @@
d229e5822be263f7985dd2fe47457be78943cd31
9cc9e38d1f64bce5cb47a1158dcf1426c4dca460

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

@ -1 +1 @@
911ec1eda3f29662b7de938f41e2a56815290873
cd3dcf420b7b680f0a485dd04dcf6a97d50c9e61

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

@ -1 +1 @@
fe3eb98c4140e84f03eaf1395a30988958a8d221
3a88127e8bd195610a4a4dcfbcd9661b387f1c35

2
mono/mini/version.h
View File

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

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

@ -1 +1 @@
fd055f27704039589f86200e444261e9f4a48b23
3e36d1d595ab2a77a6726d1cf02315cd1143ed00

11
mono/profiler/log.h
View File

@ -10,7 +10,7 @@
#define LOG_HEADER_ID 0x4D505A01
#define LOG_VERSION_MAJOR 2
#define LOG_VERSION_MINOR 0
#define LOG_DATA_VERSION 15
#define LOG_DATA_VERSION 14
/*
* Changes in major/minor versions:
@ -72,7 +72,6 @@
removed type field from TYPE_SAMPLE_HIT
removed MONO_GC_EVENT_{MARK,RECLAIM}_{START,END}
reverted the root_type field back to uleb128
* version 15: reverted the type, unit, and variance fields back to uleb128
*/
/*
@ -298,16 +297,16 @@
* if section == MONO_COUNTER_PERFCOUNTERS:
* [section_name: string] section name of counter
* [name: string] name of counter
* [type: uleb128] type of counter
* [unit: uleb128] unit of counter
* [variance: uleb128] variance of counter
* [type: byte] type of counter
* [unit: byte] unit of counter
* [variance: byte] variance of counter
* [index: uleb128] unique index of counter
* if exinfo == TYPE_SAMPLE_COUNTERS
* while true:
* [index: uleb128] unique index of counter
* if index == 0:
* break
* [type: uleb128] type of counter value
* [type: byte] type of counter value
* if type == string:
* if value == null:
* [0: byte] 0 -> value is null

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

@ -1 +1 @@
4647b1be92495ac7316c8408b16af8f6579e5968
40076afbb903c8e0082452f1c9ae699f4de1d751

BIN
po/mcs/de.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
4ef49bd2b7ed49aa2fe4a4ef6a2ddf1784005825
1ad237e9a79592e873b8b2f4e43189dfb1ade6f7

BIN
po/mcs/es.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
f2848362465fccc30ee55872fa65a8a570d5f885
f4454fcc3cf6ed8a6c5128fda4f61078bcb873eb

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
be955f3b4e4605106613aea7801f7ba5a1b3d17b
44b7a477b775d109e7aafc3bc62a23a218118b6b

4
po/mcs/mcs.pot
View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.10.0.160\n"
"Project-Id-Version: mono 5.10.0.161\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-03-07 08:21+0000\n"
"POT-Creation-Date: 2018-03-08 08:21+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 @@
96fb724c139f6b24fe8d09f586d49dccdc4a2692
88306d03503318f2a5bd0a3ec110fdc84cd2afa0