diff options
| author | Marek Safar <marek.safar@gmail.com> | 2019-01-22 04:28:13 +0100 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2019-01-21 19:28:13 -0800 |
| commit | 5c9febf6346f90c06e70b3cb9e002300e50fa54b (patch) | |
| tree | 9f589c28bba076725c51def4d189b7fc814dd4a5 | |
| parent | edffbd9c545aa9c1f6cb7ae048efdf5db13d3991 (diff) | |
| download | coreclr-5c9febf6346f90c06e70b3cb9e002300e50fa54b.tar.gz coreclr-5c9febf6346f90c06e70b3cb9e002300e50fa54b.tar.bz2 coreclr-5c9febf6346f90c06e70b3cb9e002300e50fa54b.zip | |
Move TplEtwProvider to shared partition (#22120)
| -rw-r--r-- | src/System.Private.CoreLib/System.Private.CoreLib.csproj | 1 | ||||
| -rw-r--r-- | src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems | 1 | ||||
| -rw-r--r-- | src/System.Private.CoreLib/shared/System/Threading/Tasks/TplEtwProvider.cs (renamed from src/System.Private.CoreLib/src/System/Threading/Tasks/TPLETWProvider.cs) | 20 |
3 files changed, 6 insertions, 16 deletions
diff --git a/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/System.Private.CoreLib/System.Private.CoreLib.csproj index 5f18c51a27..b7c5623f6e 100644 --- a/src/System.Private.CoreLib/System.Private.CoreLib.csproj +++ b/src/System.Private.CoreLib/System.Private.CoreLib.csproj @@ -279,7 +279,6 @@ <Compile Include="$(BclSourcesRoot)\System\Threading\SynchronizationContext.cs" /> <Compile Include="$(BclSourcesRoot)\System\Threading\Tasks\Task.cs" /> <Compile Include="$(BclSourcesRoot)\System\Threading\Tasks\TaskContinuation.cs" /> - <Compile Include="$(BclSourcesRoot)\System\Threading\Tasks\TPLETWProvider.cs" /> <Compile Include="$(BclSourcesRoot)\System\Threading\Thread.cs" /> <Compile Include="$(BclSourcesRoot)\System\Threading\ThreadPool.cs" /> <Compile Include="$(BclSourcesRoot)\System\Threading\Timer.cs" /> diff --git a/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems b/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems index 5db0c043f0..faecf9bf34 100644 --- a/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems +++ b/src/System.Private.CoreLib/shared/System.Private.CoreLib.Shared.projitems @@ -788,6 +788,7 @@ <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\TaskScheduler.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\TaskSchedulerException.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\ThreadPoolTaskScheduler.cs" /> + <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\TplEtwProvider.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\ValueTask.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\Sources\ManualResetValueTaskSourceCore.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Threading\Tasks\Sources\IValueTaskSource.cs" /> diff --git a/src/System.Private.CoreLib/src/System/Threading/Tasks/TPLETWProvider.cs b/src/System.Private.CoreLib/shared/System/Threading/Tasks/TplEtwProvider.cs index 6c28ba52f4..311445ec28 100644 --- a/src/System.Private.CoreLib/src/System/Threading/Tasks/TPLETWProvider.cs +++ b/src/System.Private.CoreLib/shared/System/Threading/Tasks/TplEtwProvider.cs @@ -2,21 +2,8 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -// =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ -// -// -// -// EventSource for TPL. -// -// =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- - -using System; -using System.Collections.Generic; -using System.Text; -using System.Security; using System.Runtime.CompilerServices; using System.Diagnostics.Tracing; - using Internal.Runtime.CompilerServices; namespace System.Threading.Tasks @@ -24,8 +11,11 @@ namespace System.Threading.Tasks /// <summary>Provides an event source for tracing TPL information.</summary> [EventSource( Name = "System.Threading.Tasks.TplEventSource", - Guid = "2e5dba47-a3d2-4d16-8ee0-6671ffdcd7b5", - LocalizationResources = "FxResources.System.Private.CoreLib.SR")] + Guid = "2e5dba47-a3d2-4d16-8ee0-6671ffdcd7b5" +#if CORECLR + ,LocalizationResources = "FxResources.System.Private.CoreLib.SR" +#endif + )] internal sealed class TplEtwProvider : EventSource { /// Used to determine if tasks should generate Activity IDs for themselves |