Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions

View File

@ -262,7 +262,7 @@ internal static partial class Bid
[BidMethod]
[BidArgumentType(typeof(string))] // format string should have a string spec (%ls) for an Activity ID argument as last
internal static void CorrelationTrace(string fmtPrintfW, System.Int32 a1) {
if ((modFlags & System.Data.Common.ActivityCorrelator.CorrelationTracePoints) != 0
if ((modFlags & Bid.ApiGroup.Correlation) != 0
&& (modFlags & Bid.ApiGroup.Trace) != 0 && modID != NoData) {
System.Data.Common.ActivityCorrelator.ActivityId actId = System.Data.Common.ActivityCorrelator.Next();
NativeMethods.Trace(modID, UIntPtr.Zero, UIntPtr.Zero, fmtPrintfW, a1, actId.ToString());
@ -273,7 +273,7 @@ internal static partial class Bid
[BidArgumentType(typeof(string))] // format string should have a string spec (%ls) for an Activity ID argument as last
internal static void CorrelationTrace(string fmtPrintfW)
{
if ((modFlags & System.Data.Common.ActivityCorrelator.CorrelationTracePoints) != 0
if ((modFlags & Bid.ApiGroup.Correlation) != 0
&& (modFlags & Bid.ApiGroup.Trace) != 0 && modID != NoData) {
System.Data.Common.ActivityCorrelator.ActivityId actId = System.Data.Common.ActivityCorrelator.Next();
NativeMethods.Trace(modID, UIntPtr.Zero, UIntPtr.Zero, fmtPrintfW, actId.ToString());
@ -283,7 +283,7 @@ internal static partial class Bid
[BidMethod]
[BidArgumentType(typeof(string))] // format string should have a string spec (%ls) for an Activity ID argument as last
internal static void CorrelationTrace(string fmtPrintfW, System.Int32 a1, System.Int32 a2) {
if ((modFlags & System.Data.Common.ActivityCorrelator.CorrelationTracePoints) != 0
if ((modFlags & Bid.ApiGroup.Correlation) != 0
&& (modFlags & Bid.ApiGroup.Trace) != 0 && modID != NoData) {
System.Data.Common.ActivityCorrelator.ActivityId actId = System.Data.Common.ActivityCorrelator.Next();
NativeMethods.Trace(modID, UIntPtr.Zero, UIntPtr.Zero, fmtPrintfW, a1, a2, actId.ToString());