Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@@ -134,7 +134,7 @@ namespace System.Diagnostics {
public virtual string GetFileName()
{
#if !MOBILE
#if MONO_FEATURE_CAS
if (SecurityManager.SecurityEnabled && (fileName != null) && (fileName.Length > 0)) {
string fn = Path.GetFullPath (fileName);
new FileIOPermission (FileIOPermissionAccess.PathDiscovery, fn).Demand ();

View File

@@ -59,9 +59,9 @@ namespace System.Diagnostics {
private StackFrame[] frames;
readonly StackTrace[] captured_traces;
#pragma warning disable 414
private bool debug_info;
private static Dictionary<string, Func<StackTrace, string>> metadataHandlers;
#pragma warning restore
[MethodImplAttribute (MethodImplOptions.NoInlining)]
public StackTrace ()
@@ -198,7 +198,6 @@ namespace System.Diagnostics {
bool AddFrames (StringBuilder sb)
{
bool printOffset;
string debugInfo, indentation;
string unknown = Locale.GetText ("<unknown method>");