From 928e6c8b16e1fb3653533eedd09b446c3ad3d668 Mon Sep 17 00:00:00 2001 From: Stephen Toub Date: Mon, 24 Jun 2019 22:10:45 -0400 Subject: [PATCH] Fix ActivityTracker ES_BUILD_STANDALONE build Signed-off-by: dotnet-bot --- .../shared/System/Diagnostics/Tracing/ActivityTracker.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/System.Private.CoreLib/shared/System/Diagnostics/Tracing/ActivityTracker.cs b/src/System.Private.CoreLib/shared/System/Diagnostics/Tracing/ActivityTracker.cs index 254df1a..4b465b5 100644 --- a/src/System.Private.CoreLib/shared/System/Diagnostics/Tracing/ActivityTracker.cs +++ b/src/System.Private.CoreLib/shared/System/Diagnostics/Tracing/ActivityTracker.cs @@ -273,11 +273,19 @@ namespace System.Diagnostics.Tracing if (activityName.EndsWith(EventSource.s_ActivityStartSuffix, StringComparison.Ordinal)) { +#if ES_BUILD_STANDALONE + return string.Concat(providerName, activityName.Substring(0, activityName.Length - EventSource.s_ActivityStartSuffix.Length)); +#else return string.Concat(providerName, activityName.AsSpan(0, activityName.Length - EventSource.s_ActivityStartSuffix.Length)); +#endif } else if (activityName.EndsWith(EventSource.s_ActivityStopSuffix, StringComparison.Ordinal)) { +#if ES_BUILD_STANDALONE + return string.Concat(providerName, activityName.Substring(0, activityName.Length - EventSource.s_ActivityStopSuffix.Length)); +#else return string.Concat(providerName, activityName.AsSpan(0, activityName.Length - EventSource.s_ActivityStopSuffix.Length)); +#endif } else if (task != 0) { -- 2.7.4