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

Imported Upstream version 6.4.0.137

Browse Source 
Former-commit-id: 943baa9f16a098c33e129777827f3a9d20da00d6
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-07-26 19:53:28 +00:00
parent e9207cf623
commit ef583813eb
2712 changed files with 74169 additions and 40587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mcs/class/referencesource/System/compmod/system/diagnostics/CorrelationManager.cs
View File

@@ -20,17 +20,22 @@ namespace System.Diagnostics {
public Guid ActivityId {
get {
#if !DISABLE_REMOTING
Object id = CallContext.LogicalGetData(activityIdSlotName);
if (id != null)
return (Guid) id;
else
#endif
return Guid.Empty;
}
set {
#if !DISABLE_REMOTING
CallContext.LogicalSetData(activityIdSlotName, value);
#endif
}
}
#if !DISABLE_REMOTING
public Stack LogicalOperationStack {
get {
return GetLogicalOperationStack();
@@ -63,6 +68,11 @@ namespace System.Diagnostics {
return idStack;
}
#else
public Stack LogicalOperationStack => throw new PlatformNotSupportedException ();
public void StartLogicalOperation (object operationId) => throw new PlatformNotSupportedException ();
public void StartLogicalOperation () => throw new PlatformNotSupportedException ();
public void StopLogicalOperation () => throw new PlatformNotSupportedException ();
#endif
}
}

4
mcs/class/referencesource/System/compmod/system/diagnostics/TraceEventCache.cs
View File

@@ -40,7 +40,11 @@ namespace System.Diagnostics {
public Stack LogicalOperationStack {
get {
#if DISABLE_REMOTING
throw new PlatformNotSupportedException ();
#else
return Trace.CorrelationManager.LogicalOperationStack;
#endif
}
}