diff options
| author | dotnet bot <dotnet-bot@dotnetfoundation.org> | 2017-05-15 21:52:24 +0300 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2017-05-15 21:52:24 +0300 |
| commit | 53c8ca4adf7147c6a8c16b540f98180185e84344 (patch) | |
| tree | 9303ba90ec25800e7eab27c8639c801573dc6050 /src/System.Private.CoreLib/shared | |
| parent | a0e4becaa808613aead618db612885c046dfdb34 (diff) | |
Merge pull request dotnet/coreclr#11593 from brianrob/eventsource_unix (#3613)
Disable ETW calls on UNIX
Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
Diffstat (limited to 'src/System.Private.CoreLib/shared')
| -rw-r--r-- | src/System.Private.CoreLib/shared/System/Diagnostics/Tracing/EventSource.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/System.Private.CoreLib/shared/System/Diagnostics/Tracing/EventSource.cs b/src/System.Private.CoreLib/shared/System/Diagnostics/Tracing/EventSource.cs index 440e758f2..513366ff8 100644 --- a/src/System.Private.CoreLib/shared/System/Diagnostics/Tracing/EventSource.cs +++ b/src/System.Private.CoreLib/shared/System/Diagnostics/Tracing/EventSource.cs @@ -1468,7 +1468,8 @@ namespace System.Diagnostics.Tracing // Set m_provider, which allows this. m_provider = provider; -#if (!ES_BUILD_STANDALONE && !ES_BUILD_PN && !PLATFORM_UNIX) +#if PLATFORM_WINDOWS +#if (!ES_BUILD_STANDALONE && !ES_BUILD_PN) // API available on OS >= Win 8 and patched Win 7. // Disable only for FrameworkEventSource to avoid recursion inside exception handling. if (this.Name != "System.Diagnostics.Eventing.FrameworkEventSource" || Environment.IsWindows8OrAbove) @@ -1486,6 +1487,7 @@ namespace System.Diagnostics.Tracing metadataHandle.Free(); } +#endif // PLATFORM_WINDOWS #endif // FEATURE_MANAGED_ETW Debug.Assert(!m_eventSourceEnabled); // We can't be enabled until we are completely initted. |