From fca37a613c653411426a678dd440e61e91f44548 Mon Sep 17 00:00:00 2001 From: xtqqczze Date: Wed, 14 Jul 2021 20:17:49 +0100 Subject: [PATCH 1/3] Fix CA1052 --- .globalconfig | 2 +- src/System.Management.Automation/engine/PSVersionInfo.cs | 2 +- src/System.Management.Automation/engine/serialization.cs | 2 +- test/tools/WebListener/Program.cs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.globalconfig b/.globalconfig index 7b2eef9ca88..2002da53789 100644 --- a/.globalconfig +++ b/.globalconfig @@ -135,7 +135,7 @@ dotnet_diagnostic.CA1051.severity = silent # CA1052: Static holder types should be Static or NotInheritable # https://docs.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1052 dotnet_diagnostic.CA1052.severity = warning -dotnet_code_quality.CA1052.api_surface = private, internal +dotnet_code_quality.CA1052.api_surface = all # CA1054: URI-like parameters should not be strings # https://docs.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1054 diff --git a/src/System.Management.Automation/engine/PSVersionInfo.cs b/src/System.Management.Automation/engine/PSVersionInfo.cs index 5dc19e33606..0f9cba065fd 100644 --- a/src/System.Management.Automation/engine/PSVersionInfo.cs +++ b/src/System.Management.Automation/engine/PSVersionInfo.cs @@ -27,7 +27,7 @@ namespace System.Management.Automation /// The above statement retrieves the PowerShell edition. /// /// - public class PSVersionInfo + public static class PSVersionInfo { internal const string PSVersionTableName = "PSVersionTable"; internal const string PSRemotingProtocolVersionName = "PSRemotingProtocolVersion"; diff --git a/src/System.Management.Automation/engine/serialization.cs b/src/System.Management.Automation/engine/serialization.cs index 8608dd622c5..31aa02c035b 100644 --- a/src/System.Management.Automation/engine/serialization.cs +++ b/src/System.Management.Automation/engine/serialization.cs @@ -82,7 +82,7 @@ internal SerializationContext(int depth, SerializationOptions options, PSRemotin /// /// This class provides public functionality for serializing a PSObject. /// - public class PSSerializer + public static class PSSerializer { internal PSSerializer() { } diff --git a/test/tools/WebListener/Program.cs b/test/tools/WebListener/Program.cs index 49f3df50bb9..a4b575121d2 100644 --- a/test/tools/WebListener/Program.cs +++ b/test/tools/WebListener/Program.cs @@ -17,7 +17,7 @@ namespace mvc { - public class Program + public static class Program { public static void Main(string[] args) { From fe194aa777bb7eb2396a519cc43bd95b4609daf3 Mon Sep 17 00:00:00 2001 From: xtqqczze Date: Wed, 14 Jul 2021 20:19:10 +0100 Subject: [PATCH 2/3] Fix CS0710 --- src/System.Management.Automation/engine/serialization.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/System.Management.Automation/engine/serialization.cs b/src/System.Management.Automation/engine/serialization.cs index 31aa02c035b..a05db214ced 100644 --- a/src/System.Management.Automation/engine/serialization.cs +++ b/src/System.Management.Automation/engine/serialization.cs @@ -84,8 +84,6 @@ internal SerializationContext(int depth, SerializationOptions options, PSRemotin /// public static class PSSerializer { - internal PSSerializer() { } - /// /// Serializes an object into PowerShell CliXml. /// From f0c974b54d0a2e5e045a07a621e6d3e3e834ed9d Mon Sep 17 00:00:00 2001 From: xtqqczze Date: Wed, 14 Jul 2021 22:48:33 +0100 Subject: [PATCH 3/3] Update standardtypes.csv --- test/powershell/engine/Basic/assets/standardtypes.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/powershell/engine/Basic/assets/standardtypes.csv b/test/powershell/engine/Basic/assets/standardtypes.csv index dfae58ea321..d372000dcb5 100644 --- a/test/powershell/engine/Basic/assets/standardtypes.csv +++ b/test/powershell/engine/Basic/assets/standardtypes.csv @@ -250,7 +250,7 @@ "System.Management.Automation.PSScriptMethod","False","False","False","False","False","False","False","True","True","False","False","False","False","False","False","False","False","False","False","False","False","False","False","True","False","False","False","False","False","False","False","True","True","False","False","True","False","False","False","False","False","False","False","False","False","False","True" "System.Management.Automation.PSScriptProperty","False","False","False","False","False","False","False","True","True","False","False","False","False","False","False","False","False","False","False","False","False","False","False","True","False","False","False","False","False","False","False","True","True","False","False","True","False","False","False","False","False","False","False","False","False","False","True" "System.Management.Automation.PSSecurityException","False","False","False","False","False","False","False","True","True","False","False","False","False","False","False","False","False","False","False","False","False","False","False","True","False","False","False","False","False","False","False","True","True","False","False","True","False","False","False","False","False","False","False","False","False","True","True" -"System.Management.Automation.PSSerializer","False","False","False","False","False","False","False","True","True","False","False","False","False","False","False","False","False","False","False","False","False","False","False","True","False","False","False","False","False","False","False","True","True","False","False","True","False","False","False","False","False","False","False","False","False","False","True" +"System.Management.Automation.PSSerializer","False","False","False","False","False","False","False","True","True","False","False","False","False","False","False","False","False","False","False","True","False","True","False","True","False","False","False","False","False","False","False","True","True","False","False","True","False","False","False","False","False","False","False","False","False","False","True" "System.Management.Automation.PSSessionTypeOption","False","False","False","False","False","False","False","True","True","False","False","False","False","False","False","False","False","False","False","True","False","False","False","True","False","False","False","False","False","False","False","True","True","False","False","True","False","False","False","False","False","False","False","False","False","False","True" "System.Management.Automation.PSTraceSource","False","False","False","False","False","False","False","True","True","False","False","False","False","False","False","False","False","False","False","False","False","False","False","True","False","False","False","False","False","False","False","True","True","False","False","True","False","False","False","False","False","False","False","False","False","False","True" "System.Management.Automation.PSTraceSourceOptions","False","False","False","False","False","False","False","True","True","False","False","False","False","False","False","False","False","False","False","False","False","True","False","False","False","False","False","False","False","False","False","True","True","False","False","True","False","False","False","False","True","False","False","True","False","True","True"