diff --git a/.globalconfig b/.globalconfig
index 5913d8b5a7..28a3ac5ca5 100644
--- a/.globalconfig
+++ b/.globalconfig
@@ -1116,7 +1116,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
index 999cb3baec..b0b9e06c3f 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimSessionOptionCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimSessionOptionCommand.cs
@@ -24,7 +24,7 @@ namespace Microsoft.Management.Infrastructure.CimCmdlets
 
         [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
index b95a3cca1e..b749efb957 100644
--- a/src/Microsoft.PowerShell.Commands.Diagnostics/PdhHelper.cs
+++ b/src/Microsoft.PowerShell.Commands.Diagnostics/PdhHelper.cs
@@ -225,7 +225,7 @@ namespace Microsoft.Powershell.Commands.GetCounter.PdhNative
 
             // [FieldOffset(4), MarshalAs(UnmanagedType.LPWStr)]
             // public string WideStringValue;
-        };
+        }
 
         [StructLayout(LayoutKind.Sequential)]
         private struct PDH_FMT_COUNTERVALUE_DOUBLE
@@ -233,7 +233,7 @@ namespace Microsoft.Powershell.Commands.GetCounter.PdhNative
             public uint CStatus;
 
             public double doubleValue;
-        };
+        }
 
         [StructLayout(LayoutKind.Sequential)]
         private struct PDH_FMT_COUNTERVALUE_UNICODE
@@ -242,7 +242,7 @@ namespace Microsoft.Powershell.Commands.GetCounter.PdhNative
 
             [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
index 32e33d59d6..44b885f56e 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs
@@ -54,7 +54,7 @@ namespace Microsoft.PowerShell.Commands
             /// 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
index a5f80af87d..27369c5bce 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Service.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Service.cs
@@ -179,7 +179,7 @@ namespace Microsoft.PowerShell.Commands
             /// Select services by Service name.
             /// </summary>
             ServiceName = 3
-        };
+        }
         /// <summary>
         /// Holds the selection mode setting.
         /// </summary>
@@ -2706,7 +2706,7 @@ namespace Microsoft.PowerShell.Commands
         {
             [MarshalAs(UnmanagedType.LPWStr)]
             internal string lpDescription;
-        };
+        }
 
         [StructLayout(LayoutKind.Sequential)]
         internal struct QUERY_SERVICE_CONFIG
@@ -2720,13 +2720,13 @@ namespace Microsoft.PowerShell.Commands
             [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
index 133c03646f..03525eca55 100644
--- 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 @@ namespace Microsoft.PowerShell.Commands
 
         /// <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
index f9f666e972..165d1993be 100644
--- 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
index 2b3dae996a..63d81615f4 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/UnsafeNativeMethods.cs
+++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/UnsafeNativeMethods.cs
@@ -866,7 +866,7 @@ namespace System.Diagnostics.Eventing
 
             [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
index 7054766373..1385989b0e 100644
--- a/src/Microsoft.WSMan.Management/ConfigProvider.cs
+++ b/src/Microsoft.WSMan.Management/ConfigProvider.cs
@@ -5434,14 +5434,14 @@ namespace Microsoft.WSMan.Management
         {
             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
index 7084a111f2..6685770b0e 100644
--- a/src/Microsoft.WSMan.Management/Interop.cs
+++ b/src/Microsoft.WSMan.Management/Interop.cs
@@ -376,7 +376,7 @@ namespace Microsoft.WSMan.Management
         /// <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
index 773eb9d377..9c0fbc90b6 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/XmlLoaderBase.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/XmlLoaderBase.cs
@@ -44,7 +44,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
     /// </summary>
     internal class XmlLoaderLoggerEntry
     {
-        internal enum EntryType { Error, Trace };
+        internal enum EntryType { Error, Trace }
 
         /// <summary>
         /// Type of information being logged.
diff --git a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayResourceManagerCache.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayResourceManagerCache.cs
index aafd09cc25..43e1d0ea6f 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayResourceManagerCache.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayResourceManagerCache.cs
@@ -13,7 +13,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
     {
         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
index 13121b6969..961532a8a5 100644
--- a/src/System.Management.Automation/engine/ComInterop/ComEventDesc.cs
+++ b/src/System.Management.Automation/engine/ComInterop/ComEventDesc.cs
@@ -9,5 +9,5 @@ namespace System.Management.Automation.ComInterop
     {
         public Guid SourceIID;
         public int Dispid;
-    };
+    }
 }
diff --git a/src/System.Management.Automation/engine/ExecutionContext.cs b/src/System.Management.Automation/engine/ExecutionContext.cs
index 2ff58c0874..740ae1ae1d 100644
--- a/src/System.Management.Automation/engine/ExecutionContext.cs
+++ b/src/System.Management.Automation/engine/ExecutionContext.cs
@@ -1699,5 +1699,5 @@ namespace System.Management.Automation
         /// Engine is stopped.
         /// </summary>
         Stopped = 4
-    };
+    }
 }
diff --git a/src/System.Management.Automation/engine/LanguagePrimitives.cs b/src/System.Management.Automation/engine/LanguagePrimitives.cs
index 703fbcd46e..4f4e946b0a 100644
--- a/src/System.Management.Automation/engine/LanguagePrimitives.cs
+++ b/src/System.Management.Automation/engine/LanguagePrimitives.cs
@@ -5779,7 +5779,7 @@ namespace System.Management.Automation
             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
index bd23408fcf..e19defd57a 100644
--- a/src/System.Management.Automation/engine/MinishellParameterBinderController.cs
+++ b/src/System.Management.Automation/engine/MinishellParameterBinderController.cs
@@ -254,7 +254,7 @@ namespace System.Management.Automation
             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
index 43af0e45a9..cc1b38d7d0 100644
--- a/src/System.Management.Automation/engine/MshCommandRuntime.cs
+++ b/src/System.Management.Automation/engine/MshCommandRuntime.cs
@@ -3384,7 +3384,7 @@ namespace System.Management.Automation
             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
index e5c12620e3..fa9621a663 100644
--- a/src/System.Management.Automation/engine/NativeCommandProcessor.cs
+++ b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
@@ -32,7 +32,7 @@ namespace System.Management.Automation
     {
         Text,
         Xml
-    };
+    }
 
     /// <summary>
     /// Different streams produced by minishell output.
@@ -1419,7 +1419,7 @@ namespace System.Management.Automation
 
             [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
index 98b55cf110..e340583700 100644
--- a/src/System.Management.Automation/engine/Pipe.cs
+++ b/src/System.Management.Automation/engine/Pipe.cs
@@ -16,7 +16,7 @@ namespace System.Management.Automation.Internal
         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
index a06156086d..81b0f9cb74 100644
--- a/src/System.Management.Automation/engine/SerializationStrings.cs
+++ b/src/System.Management.Automation/engine/SerializationStrings.cs
@@ -308,5 +308,5 @@ namespace System.Management.Automation
         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
index 428a134842..d3e4a45879 100644
--- a/src/System.Management.Automation/engine/debugger/debugger.cs
+++ b/src/System.Management.Automation/engine/debugger/debugger.cs
@@ -50,7 +50,7 @@ namespace System.Management.Automation
         /// Stop executing the script.
         /// </summary>
         Stop = 4,
-    };
+    }
 
     /// <summary>
     /// Arguments for the DebuggerStop event.
@@ -112,7 +112,7 @@ namespace System.Management.Automation
         /// 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 @@ namespace System.Management.Automation
         /// A breakpoint was disabled.
         /// </summary>
         Disabled = 3
-    };
+    }
 
     /// <summary>
     /// Arguments for the BreakpointUpdated event.
@@ -166,7 +166,7 @@ namespace System.Management.Automation
         /// Gets the current breakpoint count.
         /// </summary>
         public int BreakpointCount { get; }
-    };
+    }
 
     #region PSJobStartEventArgs
 
@@ -292,7 +292,7 @@ namespace System.Management.Automation
         /// PowerShell remote script debugging.
         /// </summary>
         RemoteScript = 0x4
-    };
+    }
 
     /// <summary>
     /// Defines unhandled breakpoint processing behavior.
@@ -1592,7 +1592,7 @@ namespace System.Management.Automation
             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
index 916707054a..5af011adb8 100644
--- a/src/System.Management.Automation/engine/hostifaces/Connection.cs
+++ b/src/System.Management.Automation/engine/hostifaces/Connection.cs
@@ -226,7 +226,7 @@ namespace System.Management.Automation.Runspaces
         /// This option is not valid for asynchronous calls
         /// </remarks>
         UseCurrentThread = 3
-    };
+    }
 
     /// <summary>
     /// Defines type which has information about RunspaceState and
diff --git a/src/System.Management.Automation/engine/parser/tokenizer.cs b/src/System.Management.Automation/engine/parser/tokenizer.cs
index 910ed15d08..159f697725 100644
--- a/src/System.Management.Automation/engine/parser/tokenizer.cs
+++ b/src/System.Management.Automation/engine/parser/tokenizer.cs
@@ -41,7 +41,7 @@ namespace System.Management.Automation.Language
         /// 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
index 06b9676c0e..1ee6a3525e 100644
--- a/src/System.Management.Automation/engine/regex.cs
+++ b/src/System.Management.Automation/engine/regex.cs
@@ -43,7 +43,7 @@ namespace System.Management.Automation
         /// Specifies culture-invariant matching.
         /// </summary>
         CultureInvariant = 4
-    };
+    }
 
     /// <summary>
     /// Represents a wildcard pattern.
@@ -729,7 +729,7 @@ namespace System.Management.Automation
 
             return e;
         }
-    };
+    }
 
     /// <summary>
     /// Convert a string with wild cards into its equivalent regex.
diff --git a/src/System.Management.Automation/engine/remoting/client/ClientRemotePowerShell.cs b/src/System.Management.Automation/engine/remoting/client/ClientRemotePowerShell.cs
index 3345b7b5c3..962151afff 100644
--- a/src/System.Management.Automation/engine/remoting/client/ClientRemotePowerShell.cs
+++ b/src/System.Management.Automation/engine/remoting/client/ClientRemotePowerShell.cs
@@ -977,7 +977,7 @@ namespace System.Management.Automation.Runspaces.Internal
         AutoDisconnectStarting = 4,
         AutoDisconnectSucceeded = 5,
         InternalErrorAbort = 6
-    };
+    }
 
     /// <summary>
     /// PSConnectionRetryStatusEventArgs.
diff --git a/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs b/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
index 9b2dfffa17..b5e1aa925f 100644
--- a/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
+++ b/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
@@ -2297,7 +2297,7 @@ namespace System.Management.Automation.Runspaces
                     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 @@ namespace System.Management.Automation.Runspaces
 
                     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();
diff --git a/src/System.Management.Automation/engine/remoting/fanin/BaseTransportManager.cs b/src/System.Management.Automation/engine/remoting/fanin/BaseTransportManager.cs
index 9a4f19e59f..499fdd239a 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/BaseTransportManager.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/BaseTransportManager.cs
@@ -97,7 +97,7 @@ namespace System.Management.Automation.Remoting
         AutoDisconnectStarting = 4,
         AutoDisconnectSucceeded = 5,
         InternalErrorAbort = 6
-    };
+    }
 
     /// <summary>
     /// ConnectionStatusEventArgs.
diff --git a/src/System.Management.Automation/engine/remoting/fanin/WSManNativeAPI.cs b/src/System.Management.Automation/engine/remoting/fanin/WSManNativeAPI.cs
index 83e554f819..efbb3ba7ee 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/WSManNativeAPI.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/WSManNativeAPI.cs
@@ -612,7 +612,7 @@ namespace System.Management.Automation.Remoting.Client
             WSMAN_DATA_TYPE_BINARY = 2,
             WSMAN_DATA_TYPE_WS_XML_READER = 3,
             WSMAN_DATA_TYPE_DWORD = 4
-        };
+        }
 
         [StructLayout(LayoutKind.Sequential)]
         internal class WSManDataStruct
diff --git a/src/System.Management.Automation/engine/remoting/server/ServerRunspacePoolDriver.cs b/src/System.Management.Automation/engine/remoting/server/ServerRunspacePoolDriver.cs
index 556ada4062..0c6691532b 100644
--- a/src/System.Management.Automation/engine/remoting/server/ServerRunspacePoolDriver.cs
+++ b/src/System.Management.Automation/engine/remoting/server/ServerRunspacePoolDriver.cs
@@ -1248,7 +1248,7 @@ namespace System.Management.Automation
             /// 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
index 4d794910cb..81c678a076 100644
--- a/src/System.Management.Automation/engine/serialization.cs
+++ b/src/System.Management.Automation/engine/serialization.cs
@@ -791,7 +791,7 @@ namespace System.Management.Automation
         List,
         Enumerable,
         None
-    };
+    }
 
     /// <summary>
     /// This internal helper class provides methods for serializing mshObject.
diff --git a/src/System.Management.Automation/help/CabinetNativeApi.cs b/src/System.Management.Automation/help/CabinetNativeApi.cs
index acc5bddcf6..20ae932d5d 100644
--- a/src/System.Management.Automation/help/CabinetNativeApi.cs
+++ b/src/System.Management.Automation/help/CabinetNativeApi.cs
@@ -164,7 +164,7 @@ namespace System.Management.Automation.Internal
                 _fdiNotifyHandle.Free();
             }
         }
-    };
+    }
 
     // CabinetExtractor loader implementation
     internal class CabinetExtractorLoader : ICabinetExtractorLoader
@@ -188,7 +188,7 @@ namespace System.Management.Automation.Internal
         {
             return s_extractorInstance;
         }
-    };
+    }
 
     internal static class CabinetNativeApi
     {
@@ -589,7 +589,7 @@ namespace System.Management.Automation.Internal
             internal short iCabinet; // USHORT
             internal short iFolder; // USHORT
             internal int fdie; // FDIERROR
-        };
+        }
 
         internal enum FdiNotificationType : int
         {
@@ -607,7 +607,7 @@ namespace System.Management.Automation.Internal
             internal int erfOper;
             internal int erfType;
             internal bool fError;
-        };
+        }
 
         internal sealed class FdiContextHandle : SafeHandleZeroOrMinusOneIsInvalid
         {
diff --git a/src/System.Management.Automation/logging/MshLog.cs b/src/System.Management.Automation/logging/MshLog.cs
index 23c687b58e..32de4db2af 100644
--- a/src/System.Management.Automation/logging/MshLog.cs
+++ b/src/System.Management.Automation/logging/MshLog.cs
@@ -1085,7 +1085,7 @@ namespace System.Management.Automation
         /// Informational.
         /// </summary>
         Informational
-    };
+    }
 
     /// <summary>
     /// Enum for command states.
@@ -1103,7 +1103,7 @@ namespace System.Management.Automation
         /// <summary>
         /// </summary>
         Terminated = 2
-    };
+    }
 
     /// <summary>
     /// Enum for provider states.
@@ -1117,7 +1117,7 @@ namespace System.Management.Automation
         /// <summary>
         /// </summary>
         Stopped = 1,
-    };
+    }
 
     #endregion
 }
diff --git a/src/System.Management.Automation/namespaces/FileSystemContentStream.cs b/src/System.Management.Automation/namespaces/FileSystemContentStream.cs
index 5134997070..3c627542b4 100644
--- a/src/System.Management.Automation/namespaces/FileSystemContentStream.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemContentStream.cs
@@ -1515,7 +1515,7 @@ namespace Microsoft.PowerShell.Commands
 
                 [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_LEADBYTES)]
                 public byte[] LeadBytes;
-            };
+            }
 
             /// <summary>
             /// Get information on a named code page.
diff --git a/src/System.Management.Automation/namespaces/FileSystemProvider.cs b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
index d39733bed4..8d77bc000d 100644
--- a/src/System.Management.Automation/namespaces/FileSystemProvider.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
@@ -2721,7 +2721,7 @@ namespace Microsoft.PowerShell.Commands
             SymbolicLink,
             Junction,
             HardLink
-        };
+        }
 
         private static ItemType GetItemType(string input)
         {
diff --git a/src/System.Management.Automation/security/MshSignature.cs b/src/System.Management.Automation/security/MshSignature.cs
index 221472a12d..96ff8a9638 100644
--- a/src/System.Management.Automation/security/MshSignature.cs
+++ b/src/System.Management.Automation/security/MshSignature.cs
@@ -71,7 +71,7 @@ namespace System.Management.Automation
         /// with the current system.
         /// </summary>
         Incompatible
-    };
+    }
 
     /// <summary>
     /// Defines the valid types of signatures.
@@ -92,7 +92,7 @@ namespace System.Management.Automation
         /// The signature is a catalog signature.
         /// </summary>
         Catalog = 2
-    };
+    }
 
     /// <summary>
     /// Represents a digital signature on a signed
@@ -389,5 +389,5 @@ namespace System.Management.Automation
 
             return message;
         }
-    };
+    }
 }
diff --git a/src/System.Management.Automation/security/SecuritySupport.cs b/src/System.Management.Automation/security/SecuritySupport.cs
index 4303075d8e..809c13efb3 100644
--- a/src/System.Management.Automation/security/SecuritySupport.cs
+++ b/src/System.Management.Automation/security/SecuritySupport.cs
@@ -63,7 +63,7 @@ namespace Microsoft.PowerShell
         /// Default - The most restrictive policy available.
         /// </summary>
         Default = Restricted
-    };
+    }
 
     /// <summary>
     /// Defines the available configuration scopes for an execution
diff --git a/src/System.Management.Automation/security/nativeMethods.cs b/src/System.Management.Automation/security/nativeMethods.cs
index 6040e075a4..24d5f9f68d 100644
--- a/src/System.Management.Automation/security/nativeMethods.cs
+++ b/src/System.Management.Automation/security/nativeMethods.cs
@@ -556,7 +556,7 @@ namespace System.Management.Automation.Security
         {
             CRYPTUI_WIZ_NO_UI = 0x0001
             // other flags not used
-        };
+        }
 
         [StructLayout(LayoutKind.Sequential)]
         internal struct CRYPTUI_WIZ_DIGITAL_SIGN_INFO
@@ -575,14 +575,14 @@ namespace System.Management.Automation.Security
 
             internal DWORD dwAdditionalCertChoice;
             internal IntPtr pSignExtInfo; // PCCRYPTUI_WIZ_DIGITAL_SIGN_EXTENDED_INFO
-        };
+        }
 
         [Flags]
         internal enum SignInfoSubjectChoice
         {
             CRYPTUI_WIZ_DIGITAL_SIGN_SUBJECT_FILE = 0x01
             // CRYPTUI_WIZ_DIGITAL_SIGN_SUBJECT_BLOB = 0x02 NotUsed
-        };
+        }
 
         [Flags]
         internal enum SignInfoCertChoice
@@ -590,14 +590,14 @@ namespace System.Management.Automation.Security
             CRYPTUI_WIZ_DIGITAL_SIGN_CERT = 0x01
             // CRYPTUI_WIZ_DIGITAL_SIGN_STORE = 0x02, NotUsed
             // CRYPTUI_WIZ_DIGITAL_SIGN_PVK = 0x03, NotUsed
-        };
+        }
 
         [Flags]
         internal enum SignInfoAdditionalCertChoice
         {
             CRYPTUI_WIZ_DIGITAL_SIGN_ADD_CHAIN = 1,
             CRYPTUI_WIZ_DIGITAL_SIGN_ADD_CHAIN_NO_ROOT = 2
-        };
+        }
 
         [StructLayout(LayoutKind.Sequential)]
         internal struct CRYPTUI_WIZ_DIGITAL_SIGN_EXTENDED_INFO
@@ -618,7 +618,7 @@ namespace System.Management.Automation.Security
             internal IntPtr hAdditionalCertStoreNotUsed; // HCERTSTORE
             internal IntPtr psAuthenticatedNotUsed;      // PCRYPT_ATTRIBUTES
             internal IntPtr psUnauthenticatedNotUsed;    // PCRYPT_ATTRIBUTES
-        };
+        }
 
         [ArchitectureSensitive]
         internal static CRYPTUI_WIZ_DIGITAL_SIGN_EXTENDED_INFO
@@ -806,7 +806,7 @@ namespace System.Management.Automation.Security
             internal IntPtr hFileNotUsed;          // optional, HANDLE to pcwszFilePath
             internal IntPtr pgKnownSubjectNotUsed; // optional: GUID* : fill if the
                                                    // subject type is known
-        };
+        }
 
         [StructLayoutAttribute(LayoutKind.Sequential)]
         internal struct WINTRUST_BLOB_INFO
@@ -871,7 +871,7 @@ namespace System.Management.Automation.Security
             WTD_UI_NONE = 2,
             WTD_UI_NOBAD = 3,
             WTD_UI_NOGOOD = 4
-        };
+        }
 
         [Flags]
         internal enum WintrustUnionChoice
@@ -881,7 +881,7 @@ namespace System.Management.Automation.Security
             WTD_CHOICE_BLOB = 3,
             // WTD_CHOICE_SIGNER = 4,
             // WTD_CHOICE_CERT = 5,
-        };
+        }
 
         [Flags]
         internal enum WintrustProviderFlags
@@ -899,7 +899,7 @@ namespace System.Management.Automation.Security
             WTD_USE_DEFAULT_OSVER_CHECK = 0x00000400,
             WTD_LIFETIME_SIGNING_FLAG = 0x00000800,
             WTD_CACHE_ONLY_URL_RETRIEVAL = 0x00001000
-        };
+        }
 
         [Flags]
         internal enum WintrustAction
@@ -909,7 +909,7 @@ namespace System.Management.Automation.Security
             WTD_STATEACTION_CLOSE = 0x00000002,
             WTD_STATEACTION_AUTO_CACHE = 0x00000003,
             WTD_STATEACTION_AUTO_CACHE_FLUSH = 0x00000004
-        };
+        }
 
         [StructLayoutAttribute(LayoutKind.Explicit)]
         internal struct WinTrust_Choice
@@ -1103,7 +1103,7 @@ namespace System.Management.Automation.Security
             private DWORD _dwCtlError;
             private BOOL _fIsCyclic;
             private IntPtr _pChainElement; // PCERT_CHAIN_ELEMENT
-        };
+        }
 
         [StructLayout(LayoutKind.Sequential)]
         internal struct CRYPT_PROVIDER_SGNR
@@ -1118,7 +1118,7 @@ namespace System.Management.Automation.Security
             internal DWORD csCounterSigners;
             internal IntPtr pasCounterSigners; // CRYPT_PROVIDER_SGNR*
             private IntPtr _pChainContext; // PCCERT_CHAIN_CONTEXT
-        };
+        }
 
         [DllImport("wintrust.dll", SetLastError = true, CharSet = CharSet.Unicode)]
         internal static extern
@@ -1210,7 +1210,7 @@ namespace System.Management.Automation.Security
             // [MarshalAs(UnmanagedType.LPArray, ArraySubType=UnmanagedType.LPStr, SizeParamIndex=0)]
             // internal string[] rgpszUsageIdentifier; // LPSTR*
             internal IntPtr rgpszUsageIdentifier;
-        };
+        }
 
         internal enum SIGNATURE_STATE
         {
@@ -1967,7 +1967,7 @@ namespace System.Management.Automation.Security
             private string _pwszResultDir;
 
             private IntPtr _hCATStore;
-        };
+        }
 
         [StructLayout(LayoutKind.Sequential)]
         internal struct CRYPTCATMEMBER
@@ -1988,7 +1988,7 @@ namespace System.Management.Automation.Security
             internal IntPtr hReserved;
             internal CRYPT_ATTR_BLOB sEncodedIndirectData;
             internal CRYPT_ATTR_BLOB sEncodedMemberInfo;
-        };
+        }
 
         [StructLayout(LayoutKind.Sequential)]
         internal struct CRYPTCATATTRIBUTE
@@ -2002,7 +2002,7 @@ namespace System.Management.Automation.Security
             internal DWORD cbValue;
             internal System.IntPtr pbValue;
             private DWORD _dwReserved;
-        };
+        }
 
         [StructLayout(LayoutKind.Sequential)]
         internal struct CRYPTCATSTORE
@@ -2020,7 +2020,7 @@ namespace System.Management.Automation.Security
             private IntPtr _hAttrs;
             private IntPtr _hCryptMsg;
             private IntPtr _hSorted;
-        };
+        }
 
         [DllImport("wintrust.dll", CharSet = CharSet.Unicode)]
         internal static extern IntPtr CryptCATCDFOpen(
diff --git a/src/System.Management.Automation/utils/PlatformInvokes.cs b/src/System.Management.Automation/utils/PlatformInvokes.cs
index 6d76f8feb1..c8dc629051 100644
--- a/src/System.Management.Automation/utils/PlatformInvokes.cs
+++ b/src/System.Management.Automation/utils/PlatformInvokes.cs
@@ -32,7 +32,7 @@ namespace System.Management.Automation
             {
                 return ((long)dwHighDateTime << 32) + dwLowDateTime;
             }
-        };
+        }
 
         [Flags]
         // dwDesiredAccess of CreateFile