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: deb98bcd8d879bb852fa1ef428c7cb920d6ac978
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-01-26 08:29:40 +00:00
commit d49cb725cd
315 changed files with 1737 additions and 313 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -271,6 +271,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@

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

@ -1 +1 @@
185fb4f08d318b39e998de65aba693189afa76a0
7f3958be9a6931aca43164ee90cc309157607744

3
config.h.in
View File

@ -128,6 +128,9 @@
/* Enable checked build */
#undef ENABLE_CHECKED_BUILD
/* Enable private types checked build */
#undef ENABLE_CHECKED_BUILD_CRASH_REPORTING
/* Enable GC checked build */
#undef ENABLE_CHECKED_BUILD_GC

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
71dc8fe57558a446321e50a23e91869dab8dedaa
bdbd153c60b89936e581e8ab20760519f6c085d5

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

@ -1 +1 @@
92303c6a5292257b11be207811e10a1229c86eed
9bc140b656340fd663721273ac122fbbd2d71135

1
data/Makefile.in
View File

@ -294,6 +294,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@

1
data/net_2_0/Browsers/Makefile.in
View File

@ -216,6 +216,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@

1
data/net_2_0/Makefile.in
View File

@ -276,6 +276,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@

1
data/net_4_0/Browsers/Makefile.in
View File

@ -216,6 +216,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@

1
data/net_4_0/Makefile.in
View File

@ -276,6 +276,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@

1
data/net_4_5/Browsers/Makefile.in
View File

@ -216,6 +216,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@

1
data/net_4_5/Makefile.in
View File

@ -276,6 +276,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@

1
docs/Makefile.in
View File

@ -216,6 +216,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@

1
ikvm-native/Makefile.in
View File

@ -263,6 +263,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@

1
llvm/Makefile.in
View File

@ -200,6 +200,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@

1
m4/Makefile.in
View File

@ -186,6 +186,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@

1
man/Makefile.in
View File

@ -218,6 +218,7 @@ GTKX11 = @GTKX11@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@
HAVE_UNISTD_H = @HAVE_UNISTD_H@
HOST_CC = @HOST_CC@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@

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

@ -34,11 +34,11 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.18.0.247";
public const string MonoVersion = "5.18.0.248";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";
public const string MonoCorlibVersion = "CA4932AE-2294-4ECD-B863-BF98FDD84F33";
public const string MonoCorlibVersion = "179F7FD7-9CE8-424E-84AF-0DF5B0B8B469";
#if MOBILE
// Versions of .NET Framework for Silverlight 4.0

31
mcs/class/corlib/Mono/Runtime.cs
View File

@ -204,16 +204,43 @@ namespace Mono {
}
}
enum CrashReportLogLevel : int {
MonoSummaryNone = 0,
MonoSummarySetup,
MonoSummarySuspendHandshake,
MonoSummaryUnmanagedStacks,
MonoSummaryManagedStacks,
MonoSummaryStateWriter,
MonoSummaryStateWriterDone,
MonoSummaryMerpWriter,
MonoSummaryMerpInvoke,
MonoSummaryCleanup,
MonoSummaryDone,
MonoSummaryDoubleFault
}
[MethodImplAttribute (MethodImplOptions.InternalCall)]
static extern int CheckCrashReportLog_internal (IntPtr directory, bool clear);
static int CheckCrashReportLog (string directory_str, bool clear)
static CrashReportLogLevel CheckCrashReportLog (string directory_str, bool clear)
{
using (var directory_chars = RuntimeMarshal.MarshalString (directory_str))
{
return CheckCrashReportLog_internal (directory_chars.Value, clear);
return (CrashReportLogLevel) CheckCrashReportLog_internal (directory_chars.Value, clear);
}
}
[MethodImplAttribute (MethodImplOptions.InternalCall)]
static extern void AnnotateMicrosoftTelemetry_internal (IntPtr key, IntPtr val);
static void AnnotateMicrosoftTelemetry (string key, string val)
{
using (var key_chars = RuntimeMarshal.MarshalString (key))
using (var val_chars = RuntimeMarshal.MarshalString (val))
{
AnnotateMicrosoftTelemetry_internal (key_chars.Value, val_chars.Value);
}
}
}
}

7
mcs/class/corlib/Test/System/ExceptionTest.cs
View File

@ -525,9 +525,10 @@ namespace MonoTests.System
{
var monoType = Type.GetType ("Mono.Runtime", false);
var convert = monoType.GetMethod("CheckCrashReportLog", BindingFlags.NonPublic | BindingFlags.Static);
var result = (int) convert.Invoke(null, new object[] { "./", true });
var monoSummaryDone = 8;
Assert.AreEqual (monoSummaryDone, result, "#DLC1");
var result = convert.Invoke(null, new object[] { "./", true });
var enumType = monoType.Assembly.GetType("Mono.Runtime+CrashReportLogLevel");
var doneEnum = Enum.Parse(enumType, "MonoSummaryDone");
Assert.AreEqual (doneEnum, result, "#DLC1");
}
[Test]

Some files were not shown because too many files have changed in this diff Show More