PowerShell · iSazonov · Nov 21, 2020 · Nov 2, 2020
diff --git a/.globalconfig b/.globalconfig
@@ -1115,7 +1115,7 @@ dotnet_diagnostic.SA1104.severity = none
 dotnet_diagnostic.SA1105.severity = none
 
 # SA1106: Code should not contain empty statements
-dotnet_diagnostic.SA1106.severity = none
+dotnet_diagnostic.SA1106.severity = warning
 
 # SA1107: Code should not contain multiple statements on one line
 dotnet_diagnostic.SA1107.severity = none

diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimSessionOptionCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimSessionOptionCommand.cs
@@ -24,7 +24,7 @@ public enum ProtocolType
 
         [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly")]
         Wsman
-    };
+    }
 
     /// <summary>
     /// The Cmdlet allows the IT Pro to create a CimSessionOptions object that she/he

diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/PdhHelper.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/PdhHelper.cs
@@ -225,15 +225,15 @@ private struct PDH_FMT_COUNTERVALUE_LARGE
 
             // [FieldOffset(4), MarshalAs(UnmanagedType.LPWStr)]
             // public string WideStringValue;
-        };
+        }
 
         [StructLayout(LayoutKind.Sequential)]
         private struct PDH_FMT_COUNTERVALUE_DOUBLE
         {
             public uint CStatus;
 
             public double doubleValue;
-        };
+        }
 
         [StructLayout(LayoutKind.Sequential)]
         private struct PDH_FMT_COUNTERVALUE_UNICODE
@@ -242,7 +242,7 @@ private struct PDH_FMT_COUNTERVALUE_UNICODE
 
             [MarshalAs(UnmanagedType.LPWStr)]
             public string WideStringValue;
-        };
+        }
 
         [StructLayout(LayoutKind.Sequential)]
         private struct PDH_RAW_COUNTER

diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs
@@ -54,7 +54,7 @@ internal enum MatchMode
             /// Select the processes specified as input.
             /// </summary>
             ByInput
-        };
+        }
         /// <summary>
         /// The current process selection mode.
         /// </summary>

diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Service.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Service.cs
@@ -179,7 +179,7 @@ internal enum SelectionMode
             /// Select services by Service name.
             /// </summary>
             ServiceName = 3
-        };
+        }
         /// <summary>
         /// Holds the selection mode setting.
         /// </summary>
@@ -2706,7 +2706,7 @@ internal struct SERVICE_DESCRIPTIONW
         {
             [MarshalAs(UnmanagedType.LPWStr)]
             internal string lpDescription;
-        };
+        }
 
         [StructLayout(LayoutKind.Sequential)]
         internal struct QUERY_SERVICE_CONFIG
@@ -2720,13 +2720,13 @@ internal struct QUERY_SERVICE_CONFIG
             [MarshalAs(UnmanagedType.LPWStr)] internal string lpDependencies;
             [MarshalAs(UnmanagedType.LPWStr)] internal string lpServiceStartName;
             [MarshalAs(UnmanagedType.LPWStr)] internal string lpDisplayName;
-        };
+        }
 
         [StructLayout(LayoutKind.Sequential)]
         internal struct SERVICE_DELAYED_AUTO_START_INFO
         {
             internal bool fDelayedAutostart;
-        };
+        }
 
         [DllImport(PinvokeDllNames.CreateServiceWDllName, CharSet = CharSet.Unicode, SetLastError = true)]
         internal static extern

diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Get-PSBreakpoint.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Get-PSBreakpoint.cs
@@ -22,7 +22,7 @@ public enum BreakpointType
 
         /// <summary>Breakpoint on a command</summary>
         Command
-    };
+    }
 
     /// <summary>
     /// This class implements Get-PSBreakpoint.

diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ProgressNode.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ProgressNode.cs
@@ -40,7 +40,7 @@ namespace Microsoft.PowerShell
             /// The node will be displayed the same as Full, plus, the whole StatusDescription and CurrentOperation will be displayed (in multiple lines if needed).
             /// </summary>
             FullPlus = 4,
-        };
+        }
 
         /// <summary>
         /// Constructs an instance from a ProgressRecord.

diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/UnsafeNativeMethods.cs b/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/UnsafeNativeMethods.cs
@@ -865,7 +865,7 @@ internal struct EvtStringVariant
 
             [FieldOffset(12)]
             public UInt32 Type;
-        };
+        }
 
         [DllImport(WEVTAPI, CharSet = CharSet.Unicode, SetLastError = true)]
         [SecurityCritical]

diff --git a/src/Microsoft.WSMan.Management/ConfigProvider.cs b/src/Microsoft.WSMan.Management/ConfigProvider.cs
@@ -5434,14 +5434,14 @@ private enum ProviderMethods
         {
             GetChildItems,
             GetChildNames
-        };
+        }
 
         private enum WsManElementObjectTypes
         {
             WSManConfigElement,
             WSManConfigContainerElement,
             WSManConfigLeafElement
-        };
+        }
 
         #region def
         private static readonly string[] WinrmRootName = new string[] { "winrm/Config" };

diff --git a/src/Microsoft.WSMan.Management/Interop.cs b/src/Microsoft.WSMan.Management/Interop.cs
@@ -376,7 +376,7 @@ void SetProxy(int accessType,
         /// <summary><para><c>ProxyAuthenticationUseDigest</c> method of <c>IWSManConnectionOptionsEx2</c> interface.</para></summary>
         [DispId(11)]
         int ProxyAuthenticationUseDigest();
-    };
+    }
 
     #endregion IWSManConnectionOptions
 

diff --git a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/XmlLoaderBase.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/XmlLoaderBase.cs
@@ -44,7 +44,7 @@ internal class TooManyErrorsException : TypeInfoDataBaseLoaderException
     /// </summary>
     internal class XmlLoaderLoggerEntry
     {
-        internal enum EntryType { Error, Trace };
+        internal enum EntryType { Error, Trace }
 
         /// <summary>
         /// Type of information being logged.

diff --git a/...nagement.Automation/FormatAndOutput/common/DisplayDatabase/displayResourceManagerCache.cs b/...nagement.Automation/FormatAndOutput/common/DisplayDatabase/displayResourceManagerCache.cs
@@ -13,7 +13,7 @@ internal sealed class DisplayResourceManagerCache
     {
         internal enum LoadingResult { NoError, AssemblyNotFound, ResourceNotFound, StringNotFound }
 
-        internal enum AssemblyBindingStatus { NotFound, FoundInGac, FoundInPath };
+        internal enum AssemblyBindingStatus { NotFound, FoundInGac, FoundInPath }
 
         internal string GetTextTokenString(TextToken tt)
         {

diff --git a/src/System.Management.Automation/engine/ComInterop/ComEventDesc.cs b/src/System.Management.Automation/engine/ComInterop/ComEventDesc.cs
@@ -9,5 +9,5 @@ internal class ComEventDesc
     {
         public Guid SourceIID;
         public int Dispid;
-    };
+    }
 }
diff --git a/src/System.Management.Automation/engine/ExecutionContext.cs b/src/System.Management.Automation/engine/ExecutionContext.cs
@@ -1698,5 +1698,5 @@ internal enum EngineState
         /// Engine is stopped.
         /// </summary>
         Stopped = 4
-    };
+    }
 }
diff --git a/src/System.Management.Automation/engine/LanguagePrimitives.cs b/src/System.Management.Automation/engine/LanguagePrimitives.cs
@@ -5779,7 +5779,7 @@ internal static IConversionData FigureConversion(Type fromType, Type toType)
             return CacheConversion(fromType, toType, converter, rank);
         }
 
-        internal class Null { };
+        internal class Null { }
 
         private static IConversionData FigureConversionFromNull(Type toType)
         {

diff --git a/src/System.Management.Automation/engine/MinishellParameterBinderController.cs b/src/System.Management.Automation/engine/MinishellParameterBinderController.cs
@@ -254,7 +254,7 @@ private enum MinishellParameters
             Arguments = 0x02,
             InputFormat = 0x04,
             OutputFormat = 0x08
-        };
+        }
 
         /// <summary>
         /// Handles error handling if some parameter is specified more than once.

diff --git a/src/System.Management.Automation/engine/MshCommandRuntime.cs b/src/System.Management.Automation/engine/MshCommandRuntime.cs
@@ -3384,7 +3384,7 @@ internal enum ContinueStatus
             No,
             YesToAll,
             NoToAll
-        };
+        }
 
         internal ContinueStatus lastShouldProcessContinueStatus = ContinueStatus.Yes;
         internal ContinueStatus lastErrorContinueStatus = ContinueStatus.Yes;

diff --git a/src/System.Management.Automation/engine/NativeCommandProcessor.cs b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
@@ -32,7 +32,7 @@ internal enum NativeCommandIOFormat
     {
         Text,
         Xml
-    };
+    }
 
     /// <summary>
     /// Different streams produced by minishell output.
@@ -1419,7 +1419,7 @@ private struct SHFILEINFO
 
             [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 80)]
             public string szTypeName;
-        };
+        }
 
         private const uint SHGFI_EXETYPE = 0x000002000; // flag used to ask to return exe type
 

diff --git a/src/System.Management.Automation/engine/Pipe.cs b/src/System.Management.Automation/engine/Pipe.cs
@@ -16,7 +16,7 @@ internal enum VariableStreamKind
         Error,
         Warning,
         Information
-    };
+    }
 
     /// <summary>
     /// Pipe provides a way to stitch two commands.

diff --git a/src/System.Management.Automation/engine/SerializationStrings.cs b/src/System.Management.Automation/engine/SerializationStrings.cs
@@ -308,5 +308,5 @@ internal static class SerializationStrings
         internal const string MonadNamespacePrefix = "ps";
 
         #endregion namespace values
-    };
+    }
 }
diff --git a/src/System.Management.Automation/engine/debugger/debugger.cs b/src/System.Management.Automation/engine/debugger/debugger.cs
@@ -50,7 +50,7 @@ public enum DebuggerResumeAction
         /// Stop executing the script.
         /// </summary>
         Stop = 4,
-    };
+    }
 
     /// <summary>
     /// Arguments for the DebuggerStop event.
@@ -112,7 +112,7 @@ public DebuggerStopEventArgs(
         /// leave pending runspace debug sessions suspended until a debugger is attached.
         /// </summary>
         internal bool SuspendRemote { get; set; }
-    };
+    }
 
     /// <summary>
     /// Kinds of breakpoint updates.
@@ -135,7 +135,7 @@ public enum BreakpointUpdateType
         /// A breakpoint was disabled.
         /// </summary>
         Disabled = 3
-    };
+    }
 
     /// <summary>
     /// Arguments for the BreakpointUpdated event.
@@ -166,7 +166,7 @@ internal BreakpointUpdatedEventArgs(Breakpoint breakpoint, BreakpointUpdateType
         /// Gets the current breakpoint count.
         /// </summary>
         public int BreakpointCount { get; }
-    };
+    }
 
     #region PSJobStartEventArgs
 
@@ -292,7 +292,7 @@ public enum DebugModes
         /// PowerShell remote script debugging.
         /// </summary>
         RemoteScript = 0x4
-    };
+    }
 
     /// <summary>
     /// Defines unhandled breakpoint processing behavior.
@@ -1589,7 +1589,7 @@ private class CallStackInfo
             internal bool IsFrameHidden { get; set; }
 
             internal bool TopFrameAtBreakpoint { get; set; }
-        };
+        }
 
         private struct CallStackList
         {

diff --git a/src/System.Management.Automation/engine/hostifaces/Connection.cs b/src/System.Management.Automation/engine/hostifaces/Connection.cs
@@ -226,7 +226,7 @@ public enum PSThreadOptions
         /// This option is not valid for asynchronous calls
         /// </remarks>
         UseCurrentThread = 3
-    };
+    }
 
     /// <summary>
     /// Defines type which has information about RunspaceState and

@@ -41,7 +41,7 @@ public enum DynamicKeywordNameMode
         /// Name may be optionally present, expression or bare word.
         /// </summary>
         OptionalName = 4,
-    };
+    }
 
     /// <summary>
     /// Defines the body mode for a dynamic keyword. It can be a scriptblock, hashtable or command which means no body.

diff --git a/src/System.Management.Automation/engine/regex.cs b/src/System.Management.Automation/engine/regex.cs
@@ -43,7 +43,7 @@ public enum WildcardOptions
         /// Specifies culture-invariant matching.
         /// </summary>
         CultureInvariant = 4
-    };
+    }
 
     /// <summary>
     /// Represents a wildcard pattern.
@@ -729,7 +729,7 @@ internal static WildcardPatternException NewWildcardPatternException(string inva
 
             return e;
         }
-    };
+    }
 
     /// <summary>
     /// Convert a string with wild cards into its equivalent regex.

@@ -977,7 +977,7 @@ internal enum PSConnectionRetryStatus
         AutoDisconnectStarting = 4,
         AutoDisconnectSucceeded = 5,
         InternalErrorAbort = 6
-    };
+    }
 
     /// <summary>
     /// PSConnectionRetryStatusEventArgs.

@@ -2297,7 +2297,7 @@ private static string[] ParseArgv(ProcessStartInfo psi)
                     case '"':
                         // Special case for arguments within quotes
                         // Just return argument value within the quotes
-                        while ((++i < argsLength) && argsToParse[i] != '"') { };
+                        while ((++i < argsLength) && argsToParse[i] != '"') { }
                         if (iStart < argsLength - 1)
                         {
                             iStart++;
@@ -2307,12 +2307,12 @@ private static string[] ParseArgv(ProcessStartInfo psi)
 
                     default:
                         // Common case for parsing arguments with space character delimiter
-                        while ((++i < argsLength) && argsToParse[i] != ' ') { };
+                        while ((++i < argsLength) && argsToParse[i] != ' ') { }
                         break;
                 }
 
                 argvList.Add(argsToParse.Substring(iStart, (i-iStart)));
-                while ((++i < argsLength) && argsToParse[i] == ' ') { };
+                while ((++i < argsLength) && argsToParse[i] == ' ') { }
             }
 
             return argvList.ToArray();

@@ -97,7 +97,7 @@ internal enum ConnectionStatus
         AutoDisconnectStarting = 4,
         AutoDisconnectSucceeded = 5,
         InternalErrorAbort = 6
-    };
+    }
 
     /// <summary>
     /// ConnectionStatusEventArgs.

@@ -612,7 +612,7 @@ internal enum WSManDataType : uint
             WSMAN_DATA_TYPE_BINARY = 2,
             WSMAN_DATA_TYPE_WS_XML_READER = 3,
             WSMAN_DATA_TYPE_DWORD = 4
-        };
+        }
 
         [StructLayout(LayoutKind.Sequential)]
         internal class WSManDataStruct

@@ -1246,7 +1246,7 @@ private enum PreProcessCommandResult
             /// The PreProcessCommandResult used for managing breakpoints.
             /// </summary>
             BreakpointManagement,
-        };
+        }
 
         private class DebuggerCommandArgument
         {

diff --git a/src/System.Management.Automation/engine/serialization.cs b/src/System.Management.Automation/engine/serialization.cs
@@ -791,7 +791,7 @@ internal enum ContainerType
         List,
         Enumerable,
         None
-    };
+    }
 
     /// <summary>
     /// This internal helper class provides methods for serializing mshObject.
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ public enum ProtocolType @@
             [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly")]
             Wsman
-        };
+        }
         /// <summary>
         /// The Cmdlet allows the IT Pro to create a CimSessionOptions object that she/he
@@ Expand Down @@