more cleanup

Author: YuliiaKovalova

src/Framework/Microsoft.Build.Framework.csproj

@@ -31,13 +31,12 @@
   <!-- Framework and standard don't have these. -->
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' OR '$(TargetFrameworkIdentifier)' == '.NETStandard'">
     <PackageReference Include="System.Collections.Immutable" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" />
   </ItemGroup>
 
   <!-- When targeting NS2.0, make private all references not exposed in the public API. -->
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'">
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" PrivateAssets="all" />
     <PackageReference Update="System.Collections.Immutable" PrivateAssets="all" />
-    <PackageReference Update="System.Diagnostics.DiagnosticSource" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

src/Framework/Telemetry/DiagnosticActivity.cs

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#if !NETFRAMEWORK
+
 using System.Collections.Generic;
 using System.Diagnostics;
 
@@ -43,13 +45,6 @@ public DiagnosticActivity(Activity activity)
             return this;
         }
 
-        public IActivity? AddEvent(ActivityEvent activityEvent)
-        {
-            _activity.AddEvent(activityEvent);
-
-            return this;
-        }
-
         public void Dispose()
         {
             if (_disposed)
@@ -63,3 +58,5 @@ public void Dispose()
         }
     }
 }
+
+#endif

src/Framework/Telemetry/IActivity.cs

@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using System.Diagnostics;
 
 namespace Microsoft.Build.Framework.Telemetry
 {
@@ -25,12 +24,5 @@ internal interface IActivity : IDisposable
         /// <param name="value">The tag value.</param>
         /// <returns>The activity instance for method chaining.</returns>
         IActivity? SetTag(string key, object? value);
-
-        /// <summary>
-        /// Adds an event to the activity.
-        /// </summary>
-        /// <param name="activityEvent">The event to add.</param>
-        /// <returns>The activity instance for method chaining.</returns>
-        IActivity? AddEvent(ActivityEvent activityEvent);
     }
 }

src/Framework/Telemetry/IActivityTelemetryDataHolder.cs

@@ -2,12 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Generic;
-using System.Diagnostics;
 
 namespace Microsoft.Build.Framework.Telemetry;
 
 /// <summary>
-/// Interface for classes that hold telemetry data that should be added as tags to an <see cref="Activity"/>.
+/// Interface for classes that hold telemetry data that should be added as tags to an <see cref="IActivity"/>.
 /// </summary>
 internal interface IActivityTelemetryDataHolder
 {

src/Framework/Telemetry/MSBuildActivitySource.cs

@@ -42,7 +42,7 @@ public MSBuildActivitySource(string name)
 
 #if NETFRAMEWORK
             TelemetryScope<OperationEvent>? operation = _telemetrySession?.StartOperation(eventName);
-            return operation != null ? new VsTelemetryActivity(operation, _telemetrySession) : null;
+            return operation != null ? new VsTelemetryActivity(operation) : null;
 #else
             Activity? activity = Activity.Current?.HasRemoteParent == true
                 ? _source.StartActivity(eventName, ActivityKind.Internal, parentId: Activity.Current.ParentId)

src/Framework/Telemetry/VSTelemetryActivity.cs

@@ -4,7 +4,6 @@
 #if NETFRAMEWORK
 
 using System.Collections.Generic;
-using System.Diagnostics;
 using Microsoft.VisualStudio.Telemetry;
 
 namespace Microsoft.Build.Framework.Telemetry
@@ -17,21 +16,13 @@ namespace Microsoft.Build.Framework.Telemetry
     internal class VsTelemetryActivity : IActivity
     {
         private readonly TelemetryScope<OperationEvent> _scope;
-        private readonly TelemetrySession? _session;
         private TelemetryResult _result = TelemetryResult.Success;
 
         private bool _disposed;
 
-        public VsTelemetryActivity(TelemetryScope<OperationEvent> scope, TelemetrySession? session)
+        public VsTelemetryActivity(TelemetryScope<OperationEvent> scope)
         {
             _scope = scope;
-            _session = session;
-        }
-
-        public IActivity? SetResult(TelemetryResult result)
-        {
-            _result = result;
-            return this;
         }
 
         public IActivity? SetTags(IActivityTelemetryDataHolder? dataHolder)
@@ -59,21 +50,6 @@ public VsTelemetryActivity(TelemetryScope<OperationEvent> scope, TelemetrySessio
             return this;
         }
 
-        public IActivity? AddEvent(ActivityEvent activityEvent)
-        {
-            // VS Telemetry doesn't have a direct equivalent to ActivityEvent.
-            // We create and post a custom event to the session associated with this activity.
-            var telemetryEvent = new TelemetryEvent(activityEvent.Name);
-            foreach (KeyValuePair<string, object?> tag in activityEvent.Tags)
-            {
-                telemetryEvent.Properties[$"{TelemetryConstants.PropertyPrefix}{tag.Key}"] = tag.Value;
-            }
-
-            _session?.PostEvent(telemetryEvent);
-
-            return this;
-        }
-
         public void Dispose()
         {
             if (_disposed)