minimize diff

Author: baronfel

src/Cli/dotnet/Commands/MSBuild/MSBuildForwardingApp.cs

@@ -28,7 +28,7 @@ private static MSBuildArgs ConcatTelemetryLogger(MSBuildArgs msbuildArgs)
             }
             catch (Exception)
             {
-                // Exceptions during _telemetry shouldn't cause anything else to fail
+                // Exceptions during telemetry shouldn't cause anything else to fail
             }
         }
         return msbuildArgs;

src/Cli/dotnet/Commands/MSBuild/MSBuildForwardingLogger.cs

@@ -26,7 +26,7 @@ public void Initialize(IEventSource eventSource)
             eventSource4.IncludeEvaluationPropertiesAndItems();
         }
 
-        // Only forward _telemetry events
+        // Only forward telemetry events
         if (eventSource is IEventSource2 eventSource2)
         {
             eventSource2.TelemetryLogged += (sender, args) => BuildEventRedirector.ForwardEvent(args);

src/Cli/dotnet/Commands/MSBuild/MSBuildLogger.cs

@@ -58,7 +58,7 @@ public MSBuildLogger()
         }
         catch (Exception)
         {
-            // Exceptions during _telemetry shouldn't cause anything else to fail
+            // Exceptions during telemetry shouldn't cause anything else to fail
         }
     }
 
@@ -88,7 +88,7 @@ public void Initialize(IEventSource eventSource)
         }
         catch (Exception)
         {
-            // Exceptions during _telemetry shouldn't cause anything else to fail
+            // Exceptions during telemetry shouldn't cause anything else to fail
         }
     }
 
@@ -170,7 +170,7 @@ private static void TrackEvent(ITelemetry? telemetry, string eventName, IDiction
         {
             if (eventProperties.TryGetValue(propertyToBeHashed, out string? value) && value is not null)
             {
-                // Lets lazy allocate in case there is tons of _telemetry
+                // Lets lazy allocate in case there is tons of
                 properties ??= new Dictionary<string, string?>(eventProperties);
                 properties[propertyToBeHashed] = Sha256Hasher.HashWithNormalizedCasing(value);
             }
@@ -180,12 +180,12 @@ private static void TrackEvent(ITelemetry? telemetry, string eventName, IDiction
         {
             if (eventProperties.TryGetValue(propertyToBeMeasured, out string? value))
             {
-                // Lets lazy allocate in case there is tons of _telemetry
+                // Lets lazy allocate in case there is tons of telemetry
                 properties ??= new Dictionary<string, string?>(eventProperties);
                 properties.Remove(propertyToBeMeasured);
                 if (double.TryParse(value, CultureInfo.InvariantCulture, out double realValue))
                 {
-                    // Lets lazy allocate in case there is tons of _telemetry
+                    // Lets lazy allocate in case there is tons of telemetry
                     measurements ??= [];
                     measurements[propertyToBeMeasured] = realValue;
                 }

src/Cli/dotnet/Commands/NuGet/NuGetCommandParser.cs

@@ -7,7 +7,7 @@
 
 namespace Microsoft.DotNet.Cli.Commands.NuGet;
 
-// This parser is used for completion and _telemetry.
+// This parser is used for completion and telemetry.
 // See https://github.com/NuGet/NuGet.Client for the actual implementation.
 internal static class NuGetCommandParser
 {

src/Cli/dotnet/Commands/Test/TestCommand.cs

@@ -240,7 +240,7 @@ private static TestCommand FromParseResult(ParseResult result, string[] settings
             }
         }
 
-        
+
         Dictionary<string, string> variables = VSTestForwardingApp.GetVSTestRootVariables();
         foreach (var (rootVariableName, rootValue) in variables) {
             testCommand.EnvironmentVariable(rootVariableName, rootValue);
@@ -408,7 +408,7 @@ static bool CheckIfTerminalIsSupportedAndTryEnableAnsiColorCodes()
 
         string? FindDefaultValue(IReadOnlyList<string> unmatchedTokens)
         {
-            // Find default configuration so it is part of _telemetry even when default is not used.
+            // Find default configuration so it is part of telemetry even when default is not used.
             // Default can be stored in /tlp:default=true|false|on|off|auto
             Switch? terminalLoggerDefault = TryFind(unmatchedTokens, "tlp", "terminalloggerparameters");
             if (terminalLoggerDefault == null)

src/Cli/dotnet/Commands/Test/TestingPlatformCommand.cs

@@ -131,7 +131,7 @@ private void InitializeOutput(int degreeOfParallelism, ParseResult parseResult,
         var noProgress = parseResult.HasOption(TestingPlatformOptions.NoProgressOption);
         var noAnsi = parseResult.HasOption(TestingPlatformOptions.NoAnsiOption);
 
-        // TODO: Replace this with proper CI detection that we already have in _telemetry. https://github.com/microsoft/testfx/issues/5533#issuecomment-2838893327
+        // TODO: Replace this with proper CI detection that we already have in telemetry. https://github.com/microsoft/testfx/issues/5533#issuecomment-2838893327
         bool inCI = string.Equals(Environment.GetEnvironmentVariable("TF_BUILD"), "true", StringComparison.OrdinalIgnoreCase) || string.Equals(Environment.GetEnvironmentVariable("GITHUB_ACTIONS"), "true", StringComparison.OrdinalIgnoreCase);
 
         _output = new TerminalTestReporter(console, new TerminalTestReporterOptions()

src/Cli/dotnet/Extensions/ParseResultExtensions.cs

@@ -234,7 +234,7 @@ public static void HandleDebugSwitch(this ParseResult parseResult)
 
     /// <summary>
     /// Only returns the value for this option if the option is present and there are no parse errors for that option.
-    /// This allows cross-cutting code like the _telemetry filters to safely get the value without throwing on null-ref errors.
+    /// This allows cross-cutting code like the telemetry filters to safely get the value without throwing on null-ref errors.
     /// If you are inside a command handler or 'normal' System.CommandLine code then you don't need this - the parse error handling
     /// will have covered these cases.
     /// </summary>

src/Cli/dotnet/Program.cs

@@ -122,7 +122,7 @@ public static int Main(string[] args)
         }
         catch (Exception e) when (!e.ShouldBeDisplayedAsError())
         {
-            // If _telemetry object has not been initialized yet. It cannot be collected
+            // If telemetry object has not been initialized yet. It cannot be collected
             TelemetryEventEntry.SendFiltered(e);
             Reporter.Error.WriteLine(e.ToString().Red().Bold());
 
@@ -238,7 +238,7 @@ private static void SetDisplayName(Activity? activity, ParseResult parseResult)
         // Set the display name to the full command name
         activity.DisplayName = name;
 
-        // Set the command name as an attribute for better filtering in _telemetry
+        // Set the command name as an attribute for better filtering in telemetry
         activity.SetTag("command.name", name);
     }
 

src/Cli/dotnet/Telemetry/ExternalTelemetryProperties.cs

@@ -10,7 +10,7 @@
 
 namespace Microsoft.DotNet.Cli.Telemetry;
 
-// Some properties we need for _telemetry, that don't yet have suitable
+// Some properties we need for telemetry, that don't yet have suitable
 // public API
 internal static class ExternalTelemetryProperties
 {
@@ -32,7 +32,7 @@ internal static string GetInstallationType()
         {
             return (string)Registry.GetValue(Key, ValueName, defaultValue: "");
         }
-        // Catch everything: this is for _telemetry only.
+        // Catch everything: this is for telemetry only.
         catch (Exception e)
         {
             Debug.Assert(e is ArgumentException | e is SecurityException | e is InvalidCastException);
@@ -64,7 +64,7 @@ internal static string GetProductType()
                 return productType.ToString("D", CultureInfo.InvariantCulture);
             }
         }
-        // Catch everything: this is for _telemetry only
+        // Catch everything: this is for telemetry only
         catch (Exception e)
         {
             Debug.Assert(false, $"Unexpected exception from GetProductInfo: ${e.GetType().Name}: ${e.Message}");
@@ -95,7 +95,7 @@ internal static string GetLibcRelease()
         {
             return Marshal.PtrToStringUTF8(gnu_get_libc_release());
         }
-        // Catch everything: this is for _telemetry only
+        // Catch everything: this is for  only
         catch (Exception e)
         {
             Debug.Assert(e is DllNotFoundException || e is EntryPointNotFoundException);
@@ -119,7 +119,7 @@ internal static string GetLibcVersion()
         {
             return Marshal.PtrToStringUTF8(gnu_get_libc_version());
         }
-        // Catch everything: this is for _telemetry only
+        // Catch everything: this is for telemetry only
         catch (Exception e)
         {
             Debug.Assert(e is DllNotFoundException || e is EntryPointNotFoundException);