diff options
| author | Eric St. John <ericstj@microsoft.com> | 2015-05-13 15:05:57 -0700 |
|---|---|---|
| committer | Eric St. John <ericstj@microsoft.com> | 2015-05-13 15:05:57 -0700 |
| commit | 08dd1c89375adbd9218475b8c6f044fe3a226c50 (patch) | |
| tree | a657dc5465ec727cf1f26f2158349658756f4189 /src | |
| parent | 29b174c96d754be7761e7a1165e476671d40701e (diff) | |
| download | coreclr-08dd1c89375adbd9218475b8c6f044fe3a226c50.tar.gz coreclr-08dd1c89375adbd9218475b8c6f044fe3a226c50.tar.bz2 coreclr-08dd1c89375adbd9218475b8c6f044fe3a226c50.zip | |
Remove circular dependency from System.Diagnostics.Tracing
EventSource was recently changed to depend on System.Collections.Concurrent, which is a problem since System.Collections.Concurrent itself uses eventsource. This cycle caused issues during package resolution (NUGET/DNX fails fast when it finds a cycle) and would also cause problems during cross-gen.
Desktop & CoreCLR do not have this cycle since ConcurrentDictionary and EventSource both live in mscorlib. This is only a problem for N.
According to @VanceM the FEATURE_ACTIVITYSAMPLING that requires ConcurrentDictionary is not needed for ProjectN so we are disabling it. The feature is not needed for CoreCLR either, so even though we don't care about the cycle we'll remove the feature for consistency.
[tfs-changeset: 1470229]
Diffstat (limited to 'src')
| -rw-r--r-- | src/mscorlib/src/System/Diagnostics/Eventing/EventSource.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mscorlib/src/System/Diagnostics/Eventing/EventSource.cs b/src/mscorlib/src/System/Diagnostics/Eventing/EventSource.cs index 835e49077e..863c4db2e3 100644 --- a/src/mscorlib/src/System/Diagnostics/Eventing/EventSource.cs +++ b/src/mscorlib/src/System/Diagnostics/Eventing/EventSource.cs @@ -7,7 +7,7 @@ #define FEATURE_MANAGED_ETW -#if !ES_BUILD_STANDALONE +#if !ES_BUILD_STANDALONE && !CORECLR && !PROJECTN #define FEATURE_ACTIVITYSAMPLING #endif // !ES_BUILD_STANDALONE |