From c2efd8c2fee78302e7836a4be9252890b51bd838 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Mon, 16 May 2022 16:06:09 -0700 Subject: [PATCH] Fix CodeFactor issues --- .../host/msh/CommandLineParameterParser.cs | 6 +----- src/System.Management.Automation/utils/Telemetry.cs | 12 ++++++------ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs index bc9f9d558c6e1..aefcb58cfd864 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs +++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs @@ -704,7 +704,7 @@ private static ParameterBitmap GetExecutionPolicy(string? _executionPolicy) return ParameterBitmap.EPUndefined; } - ParameterBitmap executionPolicySetting = ParameterBitmap.EPUndefined; + ParameterBitmap executionPolicySetting = ParameterBitmap.EPIncorrect; if (string.Equals(_executionPolicy, "default", StringComparison.OrdinalIgnoreCase)) { @@ -734,10 +734,6 @@ private static ParameterBitmap GetExecutionPolicy(string? _executionPolicy) { executionPolicySetting = ParameterBitmap.EPUndefined; } - else - { - executionPolicySetting = ParameterBitmap.EPIncorrect; - } return executionPolicySetting; } diff --git a/src/System.Management.Automation/utils/Telemetry.cs b/src/System.Management.Automation/utils/Telemetry.cs index 7f1f1deba693f..625f9571651f8 100644 --- a/src/System.Management.Automation/utils/Telemetry.cs +++ b/src/System.Management.Automation/utils/Telemetry.cs @@ -100,10 +100,10 @@ public static class ApplicationInsightsTelemetry private static readonly Guid _defaultNodeIdentifier = new Guid("2f998828-3f4a-4741-bf50-d11c6be42f50"); // Use "anonymous" as the string to return when you can't report a name - private const string _anonymous = "anonymous"; + private const string Anonymous = "anonymous"; // Use '0.0' as the string for an anonymous module version - private const string _anonymousVersion = "0.0"; + private const string AnonymousVersion = "0.0"; // the telemetry failure string private const string _telemetryFailure = "TELEMETRY_FAILURE"; @@ -659,12 +659,12 @@ private static bool GetEnvironmentVariableAsBool(string name, bool defaultValue) /// The type of telemetry that we'll be sending. /// The module name to report. If it is not allowed, then it is set to 'anonymous'. /// The module version to report. The default value is the anonymous version '0.0.0.0'. - internal static void SendModuleTelemetryMetric(TelemetryType telemetryType, string moduleName, string moduleVersion = _anonymousVersion) + internal static void SendModuleTelemetryMetric(TelemetryType telemetryType, string moduleName, string moduleVersion = AnonymousVersion) { try { string allowedModuleName = GetModuleName(moduleName); - string allowedModuleVersion = allowedModuleName == _anonymous ? _anonymousVersion : moduleVersion; + string allowedModuleVersion = allowedModuleName == Anonymous ? AnonymousVersion : moduleVersion; s_telemetryClient.GetMetric(telemetryType.ToString(), "uuid", "SessionId", "ModuleName", "Version").TrackValue(metricValue: 1.0, s_uniqueUserIdentifier, s_sessionId, allowedModuleName, allowedModuleVersion); } catch @@ -725,7 +725,7 @@ private static string GetExperimentalFeatureName(string featureNameToValidate) return featureNameToValidate; } - return _anonymous; + return Anonymous; } // Get the module name. If we can report it, we'll return the name, otherwise, we'll return "anonymous" @@ -736,7 +736,7 @@ private static string GetModuleName(string moduleNameToValidate) return moduleNameToValidate; } - return _anonymous; + return Anonymous; } ///