diff options
| author | Stephen Toub <stoub@microsoft.com> | 2015-02-10 17:29:51 -0500 |
|---|---|---|
| committer | Stephen Toub <stoub@microsoft.com> | 2015-02-10 17:29:51 -0500 |
| commit | f243903923b0624312317a8132c6246e56ff2356 (patch) | |
| tree | db6475425172bc10176d96e06698601d40f9bb6e /clr.coreclr.props | |
| parent | d92129870bcdeb1ed04cb73cce14874a905848d8 (diff) | |
| download | coreclr-f243903923b0624312317a8132c6246e56ff2356.tar.gz coreclr-f243903923b0624312317a8132c6246e56ff2356.tar.bz2 coreclr-f243903923b0624312317a8132c6246e56ff2356.zip | |
Update FEATURE_MANAGED_ETW and disable it on Unix
EventSource is used throughout mscorlib for tracing. Most of EventSource's connection to Windows ETW APIs is already behind a FEATURE_MANAGED_ETW feature flag, but not all. As a result, code that touches certain aspects of an EventSource can end up crashing as it tries to call into Windows APIs.
This commit updates places protected by the FEATURE_MANAGED_ETW flag, and then disables the flag when building mscorlib for Unix. Eventually we're aiming to have a different implementation of EventSource on Unix that implicitly connects it to another tracing mechanism, but this change at least allows code paths that touch EventSource to function on Unix.
Diffstat (limited to 'clr.coreclr.props')
| -rw-r--r-- | clr.coreclr.props | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clr.coreclr.props b/clr.coreclr.props index 698cc8375a..9788642cba 100644 --- a/clr.coreclr.props +++ b/clr.coreclr.props @@ -78,7 +78,7 @@ <!-- The rejit feature is available only on supported architectures (x86 & x64) --> <FeatureReJIT Condition="('$(TargetArch)' == 'i386') or ('$(TargetArch)' == 'amd64')">true</FeatureReJIT> <FeatureWindowsPhone>true</FeatureWindowsPhone> - <FeatureManagedEtw>true</FeatureManagedEtw> + <FeatureManagedEtw Condition="'$(OS)' != 'Unix'">true</FeatureManagedEtw> <FeatureManagedEtwChannels>true</FeatureManagedEtwChannels> <FeatureHostedBinder>true</FeatureHostedBinder> <BinderDebugLog Condition="'$(_BuildType)'=='dbg'">true</BinderDebugLog> |