Skip to content

Commit 0a0d749

Browse files
committed
minimize diff
1 parent ce33b64 commit 0a0d749

File tree

9 files changed

+19
-19
lines changed

9 files changed

+19
-19
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ private static MSBuildArgs ConcatTelemetryLogger(MSBuildArgs msbuildArgs)
2828
}
2929
catch (Exception)
3030
{
31-
// Exceptions during _telemetry shouldn't cause anything else to fail
31+
// Exceptions during telemetry shouldn't cause anything else to fail
3232
}
3333
}
3434
return msbuildArgs;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void Initialize(IEventSource eventSource)
2626
eventSource4.IncludeEvaluationPropertiesAndItems();
2727
}
2828

29-
// Only forward _telemetry events
29+
// Only forward telemetry events
3030
if (eventSource is IEventSource2 eventSource2)
3131
{
3232
eventSource2.TelemetryLogged += (sender, args) => BuildEventRedirector.ForwardEvent(args);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public MSBuildLogger()
5858
}
5959
catch (Exception)
6060
{
61-
// Exceptions during _telemetry shouldn't cause anything else to fail
61+
// Exceptions during telemetry shouldn't cause anything else to fail
6262
}
6363
}
6464

@@ -88,7 +88,7 @@ public void Initialize(IEventSource eventSource)
8888
}
8989
catch (Exception)
9090
{
91-
// Exceptions during _telemetry shouldn't cause anything else to fail
91+
// Exceptions during telemetry shouldn't cause anything else to fail
9292
}
9393
}
9494

@@ -170,7 +170,7 @@ private static void TrackEvent(ITelemetry? telemetry, string eventName, IDiction
170170
{
171171
if (eventProperties.TryGetValue(propertyToBeHashed, out string? value) && value is not null)
172172
{
173-
// Lets lazy allocate in case there is tons of _telemetry
173+
// Lets lazy allocate in case there is tons of
174174
properties ??= new Dictionary<string, string?>(eventProperties);
175175
properties[propertyToBeHashed] = Sha256Hasher.HashWithNormalizedCasing(value);
176176
}
@@ -180,12 +180,12 @@ private static void TrackEvent(ITelemetry? telemetry, string eventName, IDiction
180180
{
181181
if (eventProperties.TryGetValue(propertyToBeMeasured, out string? value))
182182
{
183-
// Lets lazy allocate in case there is tons of _telemetry
183+
// Lets lazy allocate in case there is tons of telemetry
184184
properties ??= new Dictionary<string, string?>(eventProperties);
185185
properties.Remove(propertyToBeMeasured);
186186
if (double.TryParse(value, CultureInfo.InvariantCulture, out double realValue))
187187
{
188-
// Lets lazy allocate in case there is tons of _telemetry
188+
// Lets lazy allocate in case there is tons of telemetry
189189
measurements ??= [];
190190
measurements[propertyToBeMeasured] = realValue;
191191
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace Microsoft.DotNet.Cli.Commands.NuGet;
99

10-
// This parser is used for completion and _telemetry.
10+
// This parser is used for completion and telemetry.
1111
// See https://github.com/NuGet/NuGet.Client for the actual implementation.
1212
internal static class NuGetCommandParser
1313
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ private static TestCommand FromParseResult(ParseResult result, string[] settings
240240
}
241241
}
242242

243-
243+
244244
Dictionary<string, string> variables = VSTestForwardingApp.GetVSTestRootVariables();
245245
foreach (var (rootVariableName, rootValue) in variables) {
246246
testCommand.EnvironmentVariable(rootVariableName, rootValue);
@@ -408,7 +408,7 @@ static bool CheckIfTerminalIsSupportedAndTryEnableAnsiColorCodes()
408408

409409
string? FindDefaultValue(IReadOnlyList<string> unmatchedTokens)
410410
{
411-
// Find default configuration so it is part of _telemetry even when default is not used.
411+
// Find default configuration so it is part of telemetry even when default is not used.
412412
// Default can be stored in /tlp:default=true|false|on|off|auto
413413
Switch? terminalLoggerDefault = TryFind(unmatchedTokens, "tlp", "terminalloggerparameters");
414414
if (terminalLoggerDefault == null)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ private void InitializeOutput(int degreeOfParallelism, ParseResult parseResult,
131131
var noProgress = parseResult.HasOption(TestingPlatformOptions.NoProgressOption);
132132
var noAnsi = parseResult.HasOption(TestingPlatformOptions.NoAnsiOption);
133133

134-
// TODO: Replace this with proper CI detection that we already have in _telemetry. https://github.com/microsoft/testfx/issues/5533#issuecomment-2838893327
134+
// TODO: Replace this with proper CI detection that we already have in telemetry. https://github.com/microsoft/testfx/issues/5533#issuecomment-2838893327
135135
bool inCI = string.Equals(Environment.GetEnvironmentVariable("TF_BUILD"), "true", StringComparison.OrdinalIgnoreCase) || string.Equals(Environment.GetEnvironmentVariable("GITHUB_ACTIONS"), "true", StringComparison.OrdinalIgnoreCase);
136136

137137
_output = new TerminalTestReporter(console, new TerminalTestReporterOptions()

src/Cli/dotnet/Extensions/ParseResultExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public static void HandleDebugSwitch(this ParseResult parseResult)
234234

235235
/// <summary>
236236
/// Only returns the value for this option if the option is present and there are no parse errors for that option.
237-
/// This allows cross-cutting code like the _telemetry filters to safely get the value without throwing on null-ref errors.
237+
/// This allows cross-cutting code like the telemetry filters to safely get the value without throwing on null-ref errors.
238238
/// If you are inside a command handler or 'normal' System.CommandLine code then you don't need this - the parse error handling
239239
/// will have covered these cases.
240240
/// </summary>

src/Cli/dotnet/Program.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public static int Main(string[] args)
122122
}
123123
catch (Exception e) when (!e.ShouldBeDisplayedAsError())
124124
{
125-
// If _telemetry object has not been initialized yet. It cannot be collected
125+
// If telemetry object has not been initialized yet. It cannot be collected
126126
TelemetryEventEntry.SendFiltered(e);
127127
Reporter.Error.WriteLine(e.ToString().Red().Bold());
128128

@@ -238,7 +238,7 @@ private static void SetDisplayName(Activity? activity, ParseResult parseResult)
238238
// Set the display name to the full command name
239239
activity.DisplayName = name;
240240

241-
// Set the command name as an attribute for better filtering in _telemetry
241+
// Set the command name as an attribute for better filtering in telemetry
242242
activity.SetTag("command.name", name);
243243
}
244244

src/Cli/dotnet/Telemetry/ExternalTelemetryProperties.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
namespace Microsoft.DotNet.Cli.Telemetry;
1212

13-
// Some properties we need for _telemetry, that don't yet have suitable
13+
// Some properties we need for telemetry, that don't yet have suitable
1414
// public API
1515
internal static class ExternalTelemetryProperties
1616
{
@@ -32,7 +32,7 @@ internal static string GetInstallationType()
3232
{
3333
return (string)Registry.GetValue(Key, ValueName, defaultValue: "");
3434
}
35-
// Catch everything: this is for _telemetry only.
35+
// Catch everything: this is for telemetry only.
3636
catch (Exception e)
3737
{
3838
Debug.Assert(e is ArgumentException | e is SecurityException | e is InvalidCastException);
@@ -64,7 +64,7 @@ internal static string GetProductType()
6464
return productType.ToString("D", CultureInfo.InvariantCulture);
6565
}
6666
}
67-
// Catch everything: this is for _telemetry only
67+
// Catch everything: this is for telemetry only
6868
catch (Exception e)
6969
{
7070
Debug.Assert(false, $"Unexpected exception from GetProductInfo: ${e.GetType().Name}: ${e.Message}");
@@ -95,7 +95,7 @@ internal static string GetLibcRelease()
9595
{
9696
return Marshal.PtrToStringUTF8(gnu_get_libc_release());
9797
}
98-
// Catch everything: this is for _telemetry only
98+
// Catch everything: this is for only
9999
catch (Exception e)
100100
{
101101
Debug.Assert(e is DllNotFoundException || e is EntryPointNotFoundException);
@@ -119,7 +119,7 @@ internal static string GetLibcVersion()
119119
{
120120
return Marshal.PtrToStringUTF8(gnu_get_libc_version());
121121
}
122-
// Catch everything: this is for _telemetry only
122+
// Catch everything: this is for telemetry only
123123
catch (Exception e)
124124
{
125125
Debug.Assert(e is DllNotFoundException || e is EntryPointNotFoundException);

0 commit comments

Comments
 (0)