From aecada3e67a8f919cb71a140ff1595e321413b88 Mon Sep 17 00:00:00 2001 From: xtqqczze <45661989+xtqqczze@users.noreply.github.com> Date: Wed, 9 Dec 2020 19:04:23 +0000 Subject: [PATCH] Enable CA1822: Mark private members as static (#13897) --- .globalconfig | 3 ++- src/Microsoft.PowerShell.MarkdownRender/ListBlockRenderer.cs | 2 +- src/TypeCatalogGen/TypeCatalogGen.cs | 2 +- test/tools/WebListener/Controllers/LinkController.cs | 2 +- test/tools/WebListener/Controllers/ResponseController.cs | 2 +- test/tools/WebListener/Controllers/ResumeController.cs | 2 +- test/xUnit/csharp/test_FileSystemProvider.cs | 4 ++-- test/xUnit/csharp/test_PSConfiguration.cs | 4 ++-- 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.globalconfig b/.globalconfig index 1deb8dd7fb..f0cc41c388 100644 --- a/.globalconfig +++ b/.globalconfig @@ -280,7 +280,8 @@ dotnet_diagnostic.CA1820.severity = none dotnet_diagnostic.CA1821.severity = warning # CA1822: Mark members as static -dotnet_diagnostic.CA1822.severity = suggestion +dotnet_diagnostic.CA1822.severity = warning +dotnet_code_quality.ca1822.api_surface = private # CA1823: Avoid unused private fields dotnet_diagnostic.CA1823.severity = none diff --git a/src/Microsoft.PowerShell.MarkdownRender/ListBlockRenderer.cs b/src/Microsoft.PowerShell.MarkdownRender/ListBlockRenderer.cs index eac9c9c698..100565ba86 100644 --- a/src/Microsoft.PowerShell.MarkdownRender/ListBlockRenderer.cs +++ b/src/Microsoft.PowerShell.MarkdownRender/ListBlockRenderer.cs @@ -33,7 +33,7 @@ namespace Microsoft.PowerShell.MarkdownRender renderer.WriteLine(); } - private void RenderNumberedList(VT100Renderer renderer, ListItemBlock block, int index) + private static void RenderNumberedList(VT100Renderer renderer, ListItemBlock block, int index) { // For a numbered list, we need to make sure the index is incremented. foreach (var line in block) diff --git a/src/TypeCatalogGen/TypeCatalogGen.cs b/src/TypeCatalogGen/TypeCatalogGen.cs index e05f8b63e1..993413bc59 100644 --- a/src/TypeCatalogGen/TypeCatalogGen.cs +++ b/src/TypeCatalogGen/TypeCatalogGen.cs @@ -431,7 +431,7 @@ namespace System.Management.Automation {{ internal partial class PowerShellAssemblyLoadContext {{ - private Dictionary InitializeTypeCatalog() + private static Dictionary InitializeTypeCatalog() {{ return new Dictionary({0}, StringComparer.OrdinalIgnoreCase) {{"; const string SourceEnd = @" diff --git a/test/tools/WebListener/Controllers/LinkController.cs b/test/tools/WebListener/Controllers/LinkController.cs index 3aa7541f4e..e15607d6b9 100644 --- a/test/tools/WebListener/Controllers/LinkController.cs +++ b/test/tools/WebListener/Controllers/LinkController.cs @@ -109,7 +109,7 @@ namespace mvc.Controllers return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier }); } - private string GetLink(string baseUri, int maxLinks, int linkNumber, string whitespace, string type, string rel) + private static string GetLink(string baseUri, int maxLinks, int linkNumber, string whitespace, string type, string rel) { return string.Format(Constants.LinkUriTemplate, baseUri, maxLinks, linkNumber, type, whitespace, rel); } diff --git a/test/tools/WebListener/Controllers/ResponseController.cs b/test/tools/WebListener/Controllers/ResponseController.cs index 70e4659b3a..6347abc98e 100644 --- a/test/tools/WebListener/Controllers/ResponseController.cs +++ b/test/tools/WebListener/Controllers/ResponseController.cs @@ -99,7 +99,7 @@ namespace mvc.Controllers return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier }); } - private List GetSingleOrArray(JToken token) + private static List GetSingleOrArray(JToken token) { if (token.HasValues) { diff --git a/test/tools/WebListener/Controllers/ResumeController.cs b/test/tools/WebListener/Controllers/ResumeController.cs index 623744ab7d..8aec71e416 100644 --- a/test/tools/WebListener/Controllers/ResumeController.cs +++ b/test/tools/WebListener/Controllers/ResumeController.cs @@ -91,7 +91,7 @@ namespace mvc.Controllers return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier }); } - private RangeItemHeaderValue GetRange(string rangeHeader) + private static RangeItemHeaderValue GetRange(string rangeHeader) { return RangeHeaderValue.Parse(rangeHeader).Ranges.FirstOrDefault(); } diff --git a/test/xUnit/csharp/test_FileSystemProvider.cs b/test/xUnit/csharp/test_FileSystemProvider.cs index 23702755e7..b2a017b4b9 100644 --- a/test/xUnit/csharp/test_FileSystemProvider.cs +++ b/test/xUnit/csharp/test_FileSystemProvider.cs @@ -53,7 +53,7 @@ namespace PSTests.Parallel } } - private ExecutionContext GetExecutionContext() + private static ExecutionContext GetExecutionContext() { CultureInfo currentCulture = CultureInfo.CurrentCulture; PSHost hostInterface = new DefaultHost(currentCulture, currentCulture); @@ -63,7 +63,7 @@ namespace PSTests.Parallel return executionContext; } - private ProviderInfo GetProvider() + private static ProviderInfo GetProvider() { ExecutionContext executionContext = GetExecutionContext(); SessionStateInternal sessionState = new SessionStateInternal(executionContext); diff --git a/test/xUnit/csharp/test_PSConfiguration.cs b/test/xUnit/csharp/test_PSConfiguration.cs index 99e8560b0c..54e69da68f 100644 --- a/test/xUnit/csharp/test_PSConfiguration.cs +++ b/test/xUnit/csharp/test_PSConfiguration.cs @@ -366,7 +366,7 @@ namespace PSTests.Sequential CreateEmptyFile(currentUserConfigFile); } - private void CreateEmptyFile(string fileName) + private static void CreateEmptyFile(string fileName) { File.Create(fileName).Dispose(); } @@ -382,7 +382,7 @@ namespace PSTests.Sequential CreateBrokenConfigFile(currentUserConfigFile); } - private void CreateBrokenConfigFile(string fileName) + private static void CreateBrokenConfigFile(string fileName) { File.WriteAllText(fileName, "[abbra"); }