mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.12.0.220

Browse Source 
Former-commit-id: c477e03582759447177c6d4bf412cd2355aad476
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-04-24 09:31:23 +00:00
parent 8bd104cef2
commit 8fc30896db
1200 changed files with 29534 additions and 26161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mcs/class/corlib/System/Console.cs
View File

@@ -36,6 +36,7 @@ using System.Runtime.InteropServices;
using System.Security;
using System.Security.Permissions;
using System.Text;
using System.Threading;
namespace System
{
@@ -751,16 +752,12 @@ namespace System
}
}
delegate void InternalCancelHandler ();
#pragma warning disable 414
//
// Used by console-io.c
//
static readonly InternalCancelHandler cancel_handler = new InternalCancelHandler (DoConsoleCancelEvent);
#pragma warning restore 414
static void DoConsoleCancelEventInBackground ()
{
ThreadPool.UnsafeQueueUserWorkItem (_ => DoConsoleCancelEvent(), null);
}
internal static void DoConsoleCancelEvent ()
static void DoConsoleCancelEvent ()
{
bool exit = true;
if (cancel_event != null) {

2
mcs/class/corlib/System/Delegate.cs
View File

@@ -134,6 +134,8 @@ namespace System
if (!match) {
if (delArgType.IsEnum && Enum.GetUnderlyingType (delArgType) == argType)
match = true;
else if (argType.IsEnum && Enum.GetUnderlyingType (argType) == delArgType)
match = true;
}
return match;

3
mcs/class/corlib/System/TimeZoneInfo.cs
View File

@@ -266,11 +266,12 @@ namespace System
}
}
#if LIBC
const string DefaultTimeZoneDirectory = "/usr/share/zoneinfo";
static string timeZoneDirectory;
static string TimeZoneDirectory {
get {
if (timeZoneDirectory == null)
timeZoneDirectory = "/usr/share/zoneinfo";
timeZoneDirectory = readlink (DefaultTimeZoneDirectory) ?? DefaultTimeZoneDirectory;
return timeZoneDirectory;
}
set {