Fix CA1822: Mark members as static part 3 (#14226)

xtqqczze · web-flow · commit 09ae5d729b30 · 2020-11-24T12:12:00.000+05:00
https://docs.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1822
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/SessionBasedWrapper.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/SessionBasedWrapper.cs
@@ -237,7 +237,7 @@ private StartableJob DoCreateStaticMethodInvocationJob(TSession sessionForJob, M
             return methodInvocationJob;
         }
 
-        private void HandleJobOutput(Job job, TSession sessionForJob, bool discardNonPipelineResults, Action<PSObject> outputAction)
+        private static void HandleJobOutput(Job job, TSession sessionForJob, bool discardNonPipelineResults, Action<PSObject> outputAction)
         {
             Action<PSObject> processOutput =
                     (PSObject pso) =>
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/ClearRecycleBinCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/ClearRecycleBinCommand.cs
@@ -154,7 +154,7 @@ private bool ValidDrivePath(string drivePath)
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
-        private bool IsValidPattern(string input)
+        private static bool IsValidPattern(string input)
         {
             return Regex.IsMatch(input, @"^[a-z]{1}$|^[a-z]{1}:$|^[a-z]{1}:\\$", RegexOptions.IgnoreCase);
         }
@@ -165,7 +165,7 @@ private bool IsValidPattern(string input)
         /// </summary>
         /// <param name="driveName"></param>
         /// <returns></returns>
-        private string GetDrivePath(string driveName)
+        private static string GetDrivePath(string driveName)
         {
             string drivePath;
             if (driveName.EndsWith(":\\", StringComparison.OrdinalIgnoreCase))
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
@@ -1639,7 +1639,7 @@ public override string ToString()
         /// <param name="HasSucceeded"></param>
         /// <param name="computername"></param>
         /// <returns></returns>
-        private string FormatLine(string HasSucceeded, string computername)
+        private static string FormatLine(string HasSucceeded, string computername)
         {
             return StringUtil.Format(MatchFormat, HasSucceeded, computername);
         }
@@ -1683,7 +1683,7 @@ public override string ToString()
         /// <param name="newcomputername"></param>
         /// <param name="oldcomputername"></param>
         /// <returns></returns>
-        private string FormatLine(string HasSucceeded, string newcomputername, string oldcomputername)
+        private static string FormatLine(string HasSucceeded, string newcomputername, string oldcomputername)
         {
             return StringUtil.Format(MatchFormat, HasSucceeded, newcomputername, oldcomputername);
         }
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs
@@ -1885,7 +1885,7 @@ public string GetLocale()
         #endregion Public Methods
 
         #region Private Methods
-        private OSProductSuite[] MakeProductSuites(uint? suiteMask)
+        private static OSProductSuite[] MakeProductSuites(uint? suiteMask)
         {
             if (suiteMask == null)
                 return null;
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs
@@ -1578,7 +1578,7 @@ private void AttachDebuggerToProcess(Process process)
         /// <summary>
         /// Map the return code from 'AttachDebugger' to error message.
         /// </summary>
-        private string MapReturnCodeToErrorMessage(int returnCode)
+        private static string MapReturnCodeToErrorMessage(int returnCode)
         {
             string errorMessage = string.Empty;
             switch (returnCode)
@@ -2106,7 +2106,7 @@ private string ResolveFilePath(string path)
             return filepath;
         }
 
-        private void LoadEnvironmentVariable(ProcessStartInfo startinfo, IDictionary EnvironmentVariables)
+        private static void LoadEnvironmentVariable(ProcessStartInfo startinfo, IDictionary EnvironmentVariables)
         {
             var processEnvironment = startinfo.EnvironmentVariables;
             foreach (DictionaryEntry entry in EnvironmentVariables)
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Service.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Service.cs
@@ -1085,7 +1085,7 @@ internal List<ServiceController> DoStopService(ServiceController serviceControll
         /// True if all dependent services are stopped
         /// False if not all dependent services are stopped
         /// </returns>
-        private bool HaveAllDependentServicesStopped(ServiceController[] dependentServices)
+        private static bool HaveAllDependentServicesStopped(ServiceController[] dependentServices)
         {
             return Array.TrueForAll(dependentServices, service => service.Status == ServiceControllerStatus.Stopped);
         }
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/TestConnectionCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/TestConnectionCommand.cs
@@ -793,7 +793,7 @@ private IPHostEntry GetCancellableHostEntry(string targetNameOrAddress)
 
         // Users most often use the default buffer size so we cache the buffer.
         // Creates and fills a send buffer. This follows the ping.exe and CoreFX model.
-        private byte[] GetSendBuffer(int bufferSize)
+        private static byte[] GetSendBuffer(int bufferSize)
         {
             if (bufferSize == DefaultSendBufferSize && s_DefaultSendBuffer != null)
             {

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ private StartableJob DoCreateStaticMethodInvocationJob(TSession sessionForJob, M`
`237`	`237`	`return methodInvocationJob;`
`238`	`238`	`}`
`239`	`239`
`240`		`- private void HandleJobOutput(Job job, TSession sessionForJob, bool discardNonPipelineResults, Action<PSObject> outputAction)`
	`240`	`+ private static void HandleJobOutput(Job job, TSession sessionForJob, bool discardNonPipelineResults, Action<PSObject> outputAction)`
`241`	`241`	`{`
`242`	`242`	`Action<PSObject> processOutput =`
`243`	`243`	`(PSObject pso) =>`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ private bool ValidDrivePath(string drivePath)`
`154`	`154`	`/// </summary>`
`155`	`155`	`/// <param name="input"></param>`
`156`	`156`	`/// <returns></returns>`
`157`		`- private bool IsValidPattern(string input)`
	`157`	`+ private static bool IsValidPattern(string input)`
`158`	`158`	`{`
`159`	`159`	`return Regex.IsMatch(input, @"^[a-z]{1}$\|^[a-z]{1}:$\|^[a-z]{1}:\\$", RegexOptions.IgnoreCase);`
`160`	`160`	`}`
`@@ -165,7 +165,7 @@ private bool IsValidPattern(string input)`
`165`	`165`	`/// </summary>`
`166`	`166`	`/// <param name="driveName"></param>`
`167`	`167`	`/// <returns></returns>`
`168`		`- private string GetDrivePath(string driveName)`
	`168`	`+ private static string GetDrivePath(string driveName)`
`169`	`169`	`{`
`170`	`170`	`string drivePath;`
`171`	`171`	`if (driveName.EndsWith(":\\", StringComparison.OrdinalIgnoreCase))`
Original file line number	Diff line number	Diff line change
`@@ -1639,7 +1639,7 @@ public override string ToString()`
`1639`	`1639`	`/// <param name="HasSucceeded"></param>`
`1640`	`1640`	`/// <param name="computername"></param>`
`1641`	`1641`	`/// <returns></returns>`
`1642`		`- private string FormatLine(string HasSucceeded, string computername)`
	`1642`	`+ private static string FormatLine(string HasSucceeded, string computername)`
`1643`	`1643`	`{`
`1644`	`1644`	`return StringUtil.Format(MatchFormat, HasSucceeded, computername);`
`1645`	`1645`	`}`
`@@ -1683,7 +1683,7 @@ public override string ToString()`
`1683`	`1683`	`/// <param name="newcomputername"></param>`
`1684`	`1684`	`/// <param name="oldcomputername"></param>`
`1685`	`1685`	`/// <returns></returns>`
`1686`		`- private string FormatLine(string HasSucceeded, string newcomputername, string oldcomputername)`
	`1686`	`+ private static string FormatLine(string HasSucceeded, string newcomputername, string oldcomputername)`
`1687`	`1687`	`{`
`1688`	`1688`	`return StringUtil.Format(MatchFormat, HasSucceeded, newcomputername, oldcomputername);`
`1689`	`1689`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1885,7 +1885,7 @@ public string GetLocale()`
`1885`	`1885`	`#endregion Public Methods`
`1886`	`1886`
`1887`	`1887`	`#region Private Methods`
`1888`		`- private OSProductSuite[] MakeProductSuites(uint? suiteMask)`
	`1888`	`+ private static OSProductSuite[] MakeProductSuites(uint? suiteMask)`
`1889`	`1889`	`{`
`1890`	`1890`	`if (suiteMask == null)`
`1891`	`1891`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -1578,7 +1578,7 @@ private void AttachDebuggerToProcess(Process process)`
`1578`	`1578`	`/// <summary>`
`1579`	`1579`	`/// Map the return code from 'AttachDebugger' to error message.`
`1580`	`1580`	`/// </summary>`
`1581`		`- private string MapReturnCodeToErrorMessage(int returnCode)`
	`1581`	`+ private static string MapReturnCodeToErrorMessage(int returnCode)`
`1582`	`1582`	`{`
`1583`	`1583`	`string errorMessage = string.Empty;`
`1584`	`1584`	`switch (returnCode)`
`@@ -2106,7 +2106,7 @@ private string ResolveFilePath(string path)`
`2106`	`2106`	`return filepath;`
`2107`	`2107`	`}`
`2108`	`2108`
`2109`		`- private void LoadEnvironmentVariable(ProcessStartInfo startinfo, IDictionary EnvironmentVariables)`
	`2109`	`+ private static void LoadEnvironmentVariable(ProcessStartInfo startinfo, IDictionary EnvironmentVariables)`
`2110`	`2110`	`{`
`2111`	`2111`	`var processEnvironment = startinfo.EnvironmentVariables;`
`2112`	`2112`	`foreach (DictionaryEntry entry in EnvironmentVariables)`
Original file line number	Diff line number	Diff line change
`@@ -1085,7 +1085,7 @@ internal List<ServiceController> DoStopService(ServiceController serviceControll`
`1085`	`1085`	`/// True if all dependent services are stopped`
`1086`	`1086`	`/// False if not all dependent services are stopped`
`1087`	`1087`	`/// </returns>`
`1088`		`- private bool HaveAllDependentServicesStopped(ServiceController[] dependentServices)`
	`1088`	`+ private static bool HaveAllDependentServicesStopped(ServiceController[] dependentServices)`
`1089`	`1089`	`{`
`1090`	`1090`	`return Array.TrueForAll(dependentServices, service => service.Status == ServiceControllerStatus.Stopped);`
`1091`	`1091`	`}`
Original file line number	Diff line number	Diff line change
`@@ -793,7 +793,7 @@ private IPHostEntry GetCancellableHostEntry(string targetNameOrAddress)`
`793`	`793`
`794`	`794`	`// Users most often use the default buffer size so we cache the buffer.`
`795`	`795`	`// Creates and fills a send buffer. This follows the ping.exe and CoreFX model.`
`796`		`- private byte[] GetSendBuffer(int bufferSize)`
	`796`	`+ private static byte[] GetSendBuffer(int bufferSize)`
`797`	`797`	`{`
`798`	`798`	`if (bufferSize == DefaultSendBufferSize && s_DefaultSendBuffer != null)`
`799`	`799`	`{`