Rename TplEtwProvider in non-shared partition

dotnet · Jan 25, 2019 · 0edc16a · 0edc16a
1 parent ca760ba
commit 0edc16a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj b/src/System.Private.CoreLib/src/System.Private.CoreLib.csproj
@@ -25,6 +25,7 @@
   <PropertyGroup>
     <ExcludeMscorlibFacade>true</ExcludeMscorlibFacade>
     <ExcludeAssemblyInfoPartialFile>true</ExcludeAssemblyInfoPartialFile>
+    <TargetsCoreRT>true</TargetsCoreRT>
     <UseSyncTable>true</UseSyncTable>
     <DefineConstants>netcoreapp;EETYPE_TYPE_MANAGER;ES_BUILD_PN;ES_SESSION_INFO;$(DefineConstants)</DefineConstants>
   </PropertyGroup>

diff --git a/src/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource_CoreRT.cs b/src/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventSource_CoreRT.cs
@@ -31,8 +31,8 @@ public partial class EventSource : IDisposable
         [System.Security.SecuritySafeCritical]
         public static void SetCurrentThreadActivityId(Guid activityId)
         {
-            if (TplEtwProvider.Log != null)
-                TplEtwProvider.Log.SetActivityId(activityId);
+            if (TplEventSource.Log != null)
+                TplEventSource.Log.SetActivityId(activityId);
 #if FEATURE_MANAGED_ETW
 #if FEATURE_ACTIVITYSAMPLING
             Guid newId = activityId;
@@ -94,8 +94,8 @@ public static void SetCurrentThreadActivityId(Guid activityId, out Guid oldActiv
 
             // We don't call the activityDying callback here because the caller has declared that
             // it is not dying.  
-            if (TplEtwProvider.Log != null)
-                TplEtwProvider.Log.SetActivityId(activityId);
+            if (TplEventSource.Log != null)
+                TplEventSource.Log.SetActivityId(activityId);
         }
 
         /// <summary>