Only call EventActivityIdControl ETW function on Windows. (#11549)

brianrob · web-flow · commit 97beb51d9289 · 2017-05-12T12:22:06.000-07:00
diff --git a/src/mscorlib/src/System/Diagnostics/Eventing/EventSource_CoreCLR.cs b/src/mscorlib/src/System/Diagnostics/Eventing/EventSource_CoreCLR.cs
@@ -33,7 +33,7 @@ public static void SetCurrentThreadActivityId(Guid activityId)
         {
             if (TplEtwProvider.Log != null)
                 TplEtwProvider.Log.SetActivityId(activityId);
-#if FEATURE_MANAGED_ETW
+#if FEATURE_MANAGED_ETW && PLATFORM_WINDOWS
 #if FEATURE_ACTIVITYSAMPLING
             Guid newId = activityId;
 #endif // FEATURE_ACTIVITYSAMPLING
@@ -57,7 +57,7 @@ public static void SetCurrentThreadActivityId(Guid activityId)
                 }
 #endif // FEATURE_ACTIVITYSAMPLING
             }
-#endif // FEATURE_MANAGED_ETW
+#endif // FEATURE_MANAGED_ETW && PLATFORM_WINDOWS
         }
 
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public static void SetCurrentThreadActivityId(Guid activityId)`
`33`	`33`	`{`
`34`	`34`	`if (TplEtwProvider.Log != null)`
`35`	`35`	`TplEtwProvider.Log.SetActivityId(activityId);`
`36`		`-#if FEATURE_MANAGED_ETW`
	`36`	`+#if FEATURE_MANAGED_ETW && PLATFORM_WINDOWS`
`37`	`37`	`#if FEATURE_ACTIVITYSAMPLING`
`38`	`38`	`Guid newId = activityId;`
`39`	`39`	`#endif // FEATURE_ACTIVITYSAMPLING`
`@@ -57,7 +57,7 @@ public static void SetCurrentThreadActivityId(Guid activityId)`
`57`	`57`	`}`
`58`	`58`	`#endif // FEATURE_ACTIVITYSAMPLING`
`59`	`59`	`}`
`60`		`-#endif // FEATURE_MANAGED_ETW`
	`60`	`+#endif // FEATURE_MANAGED_ETW && PLATFORM_WINDOWS`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`/// <summary>`