diff --git a/.globalconfig b/.globalconfig
index c22cb5a96c8..f0cc41c388e 100644
--- a/.globalconfig
+++ b/.globalconfig
@@ -1,7 +1,8 @@
 is_global = true
 
 # CA1000: Do not declare static members on generic types
-dotnet_diagnostic.CA1000.severity = silent
+dotnet_diagnostic.CA1000.severity = warning
+dotnet_code_quality.ca1000.api_surface = all
 
 # CA1001: Types that own disposable fields should be disposable
 dotnet_diagnostic.CA1001.severity = silent
@@ -23,7 +24,8 @@ dotnet_diagnostic.CA1008.severity = none
 dotnet_diagnostic.CA1010.severity = silent
 
 # CA1012: Abstract types should not have public constructors
-dotnet_diagnostic.CA1012.severity = none
+dotnet_diagnostic.CA1012.severity = warning
+dotnet_code_quality.ca1012.api_surface = all
 
 # CA1014: Mark assemblies with CLSCompliant
 dotnet_diagnostic.CA1014.severity = none
@@ -128,7 +130,7 @@ dotnet_diagnostic.CA1063.severity = none
 dotnet_diagnostic.CA1064.severity = none
 
 # CA1065: Do not raise exceptions in unexpected locations
-dotnet_diagnostic.CA1065.severity = none
+dotnet_diagnostic.CA1065.severity = warning
 
 # CA1066: Implement IEquatable when overriding Object.Equals
 dotnet_diagnostic.CA1066.severity = none
@@ -266,7 +268,7 @@ dotnet_diagnostic.CA1814.severity = none
 dotnet_diagnostic.CA1815.severity = none
 
 # CA1816: Dispose methods should call SuppressFinalize
-dotnet_diagnostic.CA1816.severity = suggestion
+dotnet_diagnostic.CA1816.severity = warning
 
 # CA1819: Properties should not return arrays
 dotnet_diagnostic.CA1819.severity = none
@@ -278,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
@@ -389,7 +392,7 @@ dotnet_diagnostic.CA2207.severity = warning
 dotnet_diagnostic.CA2208.severity = suggestion
 
 # CA2211: Non-constant fields should not be visible
-dotnet_diagnostic.CA2211.severity = suggestion
+dotnet_diagnostic.CA2211.severity = warning
 
 # CA2213: Disposable fields should be disposed
 dotnet_diagnostic.CA2213.severity = none
@@ -401,7 +404,7 @@ dotnet_diagnostic.CA2214.severity = none
 dotnet_diagnostic.CA2215.severity = silent
 
 # CA2216: Disposable types should declare finalizer
-dotnet_diagnostic.CA2216.severity = none
+dotnet_diagnostic.CA2216.severity = warning
 
 # CA2217: Do not mark enums with FlagsAttribute
 dotnet_diagnostic.CA2217.severity = none
@@ -818,7 +821,7 @@ dotnet_diagnostic.IDE0029.severity = silent
 dotnet_diagnostic.IDE0030.severity = silent
 
 # IDE0031: UseNullPropagation
-dotnet_diagnostic.IDE0031.severity = silent
+dotnet_diagnostic.IDE0031.severity = warning
 
 # IDE0032: UseAutoProperty
 dotnet_diagnostic.IDE0032.severity = silent
@@ -848,7 +851,7 @@ dotnet_diagnostic.IDE0039.severity = silent
 dotnet_diagnostic.IDE0040.severity = warning
 
 # IDE0041: UseIsNullCheck
-dotnet_diagnostic.IDE0041.severity = silent
+dotnet_diagnostic.IDE0041.severity = warning
 
 # IDE0042: UseDeconstruction
 dotnet_diagnostic.IDE0042.severity = silent
@@ -947,10 +950,10 @@ dotnet_diagnostic.IDE0072.severity = silent
 dotnet_diagnostic.IDE0073.severity = suggestion
 
 # IDE0074: UseCoalesceCompoundAssignment
-dotnet_diagnostic.IDE0074.severity = silent
+dotnet_diagnostic.IDE0074.severity = warning
 
 # IDE0075: SimplifyConditionalExpression
-dotnet_diagnostic.IDE0075.severity = silent
+dotnet_diagnostic.IDE0075.severity = warning
 
 # IDE0076: InvalidSuppressMessageAttribute
 dotnet_diagnostic.IDE0076.severity = silent
@@ -971,7 +974,7 @@ dotnet_diagnostic.IDE0080.severity = silent
 dotnet_diagnostic.IDE0081.severity = silent
 
 # IDE0082: ConvertTypeOfToNameOf
-dotnet_diagnostic.IDE0082.severity = silent
+dotnet_diagnostic.IDE0082.severity = warning
 
 # IDE0083: UseNotPattern
 dotnet_diagnostic.IDE0083.severity = silent
@@ -1002,3 +1005,549 @@ dotnet_diagnostic.IDE1007.severity = silent
 
 # IDE1008: UnboundConstructor
 dotnet_diagnostic.IDE1008.severity = silent
+
+# SA0001: XML comment analysis disabled
+dotnet_diagnostic.SA0001.severity = none
+
+# SA0002: Invalid settings file
+dotnet_diagnostic.SA0002.severity = none
+
+# SA1000: Keywords should be spaced correctly
+dotnet_diagnostic.SA1000.severity = warning
+
+# SA1001: Commas should be spaced correctly
+dotnet_diagnostic.SA1001.severity = none
+
+# SA1002: Semicolons should be spaced correctly
+dotnet_diagnostic.SA1002.severity = warning
+
+# SA1003: Symbols should be spaced correctly
+dotnet_diagnostic.SA1003.severity = none
+
+# SA1004: Documentation lines should begin with single space
+dotnet_diagnostic.SA1004.severity = none
+
+# SA1005: Single line comments should begin with single space
+dotnet_diagnostic.SA1005.severity = none
+
+# SA1006: Preprocessor keywords should not be preceded by space
+dotnet_diagnostic.SA1006.severity = warning
+
+# SA1007: Operator keyword should be followed by space
+dotnet_diagnostic.SA1007.severity = warning
+
+# SA1008: Opening parenthesis should be spaced correctly
+dotnet_diagnostic.SA1008.severity = none
+
+# SA1009: Closing parenthesis should be spaced correctly
+dotnet_diagnostic.SA1009.severity = none
+
+# SA1010: Opening square brackets should be spaced correctly
+dotnet_diagnostic.SA1010.severity = none
+
+# SA1011: Closing square brackets should be spaced correctly
+dotnet_diagnostic.SA1011.severity = none
+
+# SA1012: Opening braces should be spaced correctly
+dotnet_diagnostic.SA1012.severity = none
+
+# SA1013: Closing braces should be spaced correctly
+dotnet_diagnostic.SA1013.severity = none
+
+# SA1014: Opening generic brackets should be spaced correctly
+dotnet_diagnostic.SA1014.severity = none
+
+# SA1015: Closing generic brackets should be spaced correctly
+dotnet_diagnostic.SA1015.severity = none
+
+# SA1016: Opening attribute brackets should be spaced correctly
+dotnet_diagnostic.SA1016.severity = none
+
+# SA1017: Closing attribute brackets should be spaced correctly
+dotnet_diagnostic.SA1017.severity = none
+
+# SA1018: Nullable type symbols should be spaced correctly
+dotnet_diagnostic.SA1018.severity = none
+
+# SA1019: Member access symbols should be spaced correctly
+dotnet_diagnostic.SA1019.severity = none
+
+# SA1020: Increment decrement symbols should be spaced correctly
+dotnet_diagnostic.SA1020.severity = none
+
+# SA1021: Negative signs should be spaced correctly
+dotnet_diagnostic.SA1021.severity = none
+
+# SA1022: Positive signs should be spaced correctly
+dotnet_diagnostic.SA1022.severity = none
+
+# SA1023: Dereference and access of symbols should be spaced correctly
+dotnet_diagnostic.SA1023.severity = none
+
+# SA1024: Colons Should Be Spaced Correctly
+dotnet_diagnostic.SA1024.severity = none
+
+# SA1025: Code should not contain multiple whitespace in a row
+dotnet_diagnostic.SA1025.severity = none
+
+# SA1026: Code should not contain space after new or stackalloc keyword in implicitly typed array allocation
+dotnet_diagnostic.SA1026.severity = none
+
+# SA1027: Use tabs correctly
+dotnet_diagnostic.SA1027.severity = none
+
+# SA1028: Code should not contain trailing whitespace
+dotnet_diagnostic.SA1028.severity = none
+
+# SA1100: Do not prefix calls with base unless local implementation exists
+dotnet_diagnostic.SA1100.severity = none
+
+# SA1101: Prefix local calls with this
+dotnet_diagnostic.SA1101.severity = none
+
+# SA1102: Query clause should follow previous clause
+dotnet_diagnostic.SA1102.severity = none
+
+# SA1103: Query clauses should be on separate lines or all on one line
+dotnet_diagnostic.SA1103.severity = none
+
+# SA1104: Query clause should begin on new line when previous clause spans multiple lines
+dotnet_diagnostic.SA1104.severity = none
+
+# SA1105: Query clauses spanning multiple lines should begin on own line
+dotnet_diagnostic.SA1105.severity = none
+
+# SA1106: Code should not contain empty statements
+dotnet_diagnostic.SA1106.severity = warning
+
+# SA1107: Code should not contain multiple statements on one line
+dotnet_diagnostic.SA1107.severity = none
+
+# SA1108: Block statements should not contain embedded comments
+dotnet_diagnostic.SA1108.severity = none
+
+# SA1110: Opening parenthesis or bracket should be on declaration line
+dotnet_diagnostic.SA1110.severity = none
+
+# SA1111: Closing parenthesis should be on line of last parameter
+dotnet_diagnostic.SA1111.severity = none
+
+# SA1112: Closing parenthesis should be on line of opening parenthesis
+dotnet_diagnostic.SA1112.severity = none
+
+# SA1113: Comma should be on the same line as previous parameter
+dotnet_diagnostic.SA1113.severity = none
+
+# SA1114: Parameter list should follow declaration
+dotnet_diagnostic.SA1114.severity = none
+
+# SA1115: Parameter should follow comma
+dotnet_diagnostic.SA1115.severity = none
+
+# SA1116: Split parameters should start on line after declaration
+dotnet_diagnostic.SA1116.severity = none
+
+# SA1117: Parameters should be on same line or separate lines
+dotnet_diagnostic.SA1117.severity = none
+
+# SA1118: Parameter should not span multiple lines
+dotnet_diagnostic.SA1118.severity = none
+
+# SA1119: Statement should not use unnecessary parenthesis
+dotnet_diagnostic.SA1119.severity = none
+
+# SA1120: Comments should contain text
+dotnet_diagnostic.SA1120.severity = none
+
+# SA1121: Use built-in type alias
+dotnet_diagnostic.SA1121.severity = none
+
+# SA1122: Use string.Empty for empty strings
+dotnet_diagnostic.SA1122.severity = warning
+
+# SA1123: Do not place regions within elements
+dotnet_diagnostic.SA1123.severity = none
+
+# SA1124: Do not use regions
+dotnet_diagnostic.SA1124.severity = none
+
+# SA1125: Use shorthand for nullable types
+dotnet_diagnostic.SA1125.severity = none
+
+# SA1127: Generic type constraints should be on their own line
+dotnet_diagnostic.SA1127.severity = none
+
+# SA1128: Put constructor initializers on their own line
+dotnet_diagnostic.SA1128.severity = none
+
+# SA1129: Do not use default value type constructor
+dotnet_diagnostic.SA1129.severity = none
+
+# SA1130: Use lambda syntax
+dotnet_diagnostic.SA1130.severity = none
+
+# SA1131: Use readable conditions
+dotnet_diagnostic.SA1131.severity = warning
+
+# SA1132: Do not combine fields
+dotnet_diagnostic.SA1132.severity = none
+
+# SA1133: Do not combine attributes
+dotnet_diagnostic.SA1133.severity = none
+
+# SA1134: Attributes should not share line
+dotnet_diagnostic.SA1134.severity = none
+
+# SA1135: Using directives should be qualified
+dotnet_diagnostic.SA1135.severity = none
+
+# SA1136: Enum values should be on separate lines
+dotnet_diagnostic.SA1136.severity = none
+
+# SA1137: Elements should have the same indentation
+dotnet_diagnostic.SA1137.severity = none
+
+# SA1139: Use literal suffix notation instead of casting
+dotnet_diagnostic.SA1139.severity = none
+
+# SA1141: Use tuple syntax
+dotnet_diagnostic.SA1141.severity = none
+
+# SA1142: Refer to tuple fields by name
+dotnet_diagnostic.SA1142.severity = none
+
+# SA1200: Using directives should be placed correctly
+dotnet_diagnostic.SA1200.severity = none
+
+# SA1201: Elements should appear in the correct order
+dotnet_diagnostic.SA1201.severity = none
+
+# SA1202: Elements should be ordered by access
+dotnet_diagnostic.SA1202.severity = none
+
+# SA1203: Constants should appear before fields
+dotnet_diagnostic.SA1203.severity = none
+
+# SA1204: Static elements should appear before instance elements
+dotnet_diagnostic.SA1204.severity = none
+
+# SA1205: Partial elements should declare access
+dotnet_diagnostic.SA1205.severity = none
+
+# SA1206: Declaration keywords should follow order
+dotnet_diagnostic.SA1206.severity = none
+
+# SA1207: Protected should come before internal
+dotnet_diagnostic.SA1207.severity = none
+
+# SA1208: System using directives should be placed before other using directives
+dotnet_diagnostic.SA1208.severity = none
+
+# SA1209: Using alias directives should be placed after other using directives
+dotnet_diagnostic.SA1209.severity = none
+
+# SA1210: Using directives should be ordered alphabetically by namespace
+dotnet_diagnostic.SA1210.severity = none
+
+# SA1211: Using alias directives should be ordered alphabetically by alias name
+dotnet_diagnostic.SA1211.severity = none
+
+# SA1212: Property accessors should follow order
+dotnet_diagnostic.SA1212.severity = warning
+
+# SA1213: Event accessors should follow order
+dotnet_diagnostic.SA1213.severity = none
+
+# SA1214: Readonly fields should appear before non-readonly fields
+dotnet_diagnostic.SA1214.severity = none
+
+# SA1216: Using static directives should be placed at the correct location
+dotnet_diagnostic.SA1216.severity = none
+
+# SA1217: Using static directives should be ordered alphabetically
+dotnet_diagnostic.SA1217.severity = none
+
+# SA1300: Element should begin with upper-case letter
+dotnet_diagnostic.SA1300.severity = none
+
+# SA1302: Interface names should begin with I
+dotnet_diagnostic.SA1302.severity = none
+
+# SA1303: Const field names should begin with upper-case letter
+dotnet_diagnostic.SA1303.severity = none
+
+# SA1304: Non-private readonly fields should begin with upper-case letter
+dotnet_diagnostic.SA1304.severity = none
+
+# SA1305: Field names should not use Hungarian notation
+dotnet_diagnostic.SA1305.severity = none
+
+# SA1306: Field names should begin with lower-case letter
+dotnet_diagnostic.SA1306.severity = none
+
+# SA1307: Accessible fields should begin with upper-case letter
+dotnet_diagnostic.SA1307.severity = none
+
+# SA1308: Variable names should not be prefixed
+dotnet_diagnostic.SA1308.severity = none
+
+# SA1309: Field names should not begin with underscore
+dotnet_diagnostic.SA1309.severity = none
+
+# SA1310: Field names should not contain underscore
+dotnet_diagnostic.SA1310.severity = none
+
+# SA1311: Static readonly fields should begin with upper-case letter
+dotnet_diagnostic.SA1311.severity = none
+
+# SA1312: Variable names should begin with lower-case letter
+dotnet_diagnostic.SA1312.severity = none
+
+# SA1313: Parameter names should begin with lower-case letter
+dotnet_diagnostic.SA1313.severity = none
+
+# SA1314: Type parameter names should begin with T
+dotnet_diagnostic.SA1314.severity = none
+
+# SA1316: Tuple element names should use correct casing
+dotnet_diagnostic.SA1316.severity = none
+
+# SA1400: Access modifier should be declared
+dotnet_diagnostic.SA1400.severity = none
+
+# SA1401: Fields should be private
+dotnet_diagnostic.SA1401.severity = none
+
+# SA1402: File may only contain a single type
+dotnet_diagnostic.SA1402.severity = none
+
+# SA1403: File may only contain a single namespace
+dotnet_diagnostic.SA1403.severity = none
+
+# SA1404: Code analysis suppression should have justification
+dotnet_diagnostic.SA1404.severity = none
+
+# SA1405: Debug.Assert should provide message text
+dotnet_diagnostic.SA1405.severity = none
+
+# SA1406: Debug.Fail should provide message text
+dotnet_diagnostic.SA1406.severity = none
+
+# SA1407: Arithmetic expressions should declare precedence
+dotnet_diagnostic.SA1407.severity = none
+
+# SA1408: Conditional expressions should declare precedence
+dotnet_diagnostic.SA1408.severity = none
+
+# SA1410: Remove delegate parenthesis when possible
+dotnet_diagnostic.SA1410.severity = none
+
+# SA1411: Attribute constructor should not use unnecessary parenthesis
+dotnet_diagnostic.SA1411.severity = none
+
+# SA1412: Store files as UTF-8 with byte order mark
+dotnet_diagnostic.SA1412.severity = none
+
+# SA1413: Use trailing comma in multi-line initializers
+dotnet_diagnostic.SA1413.severity = none
+
+# SA1414: Tuple types in signatures should have element names
+dotnet_diagnostic.SA1414.severity = none
+
+# SA1500: Braces for multi-line statements should not share line
+dotnet_diagnostic.SA1500.severity = none
+
+# SA1501: Statement should not be on a single line
+dotnet_diagnostic.SA1501.severity = none
+
+# SA1502: Element should not be on a single line
+dotnet_diagnostic.SA1502.severity = none
+
+# SA1503: Braces should not be omitted
+dotnet_diagnostic.SA1503.severity = none
+
+# SA1504: All accessors should be single-line or multi-line
+dotnet_diagnostic.SA1504.severity = none
+
+# SA1505: Opening braces should not be followed by blank line
+dotnet_diagnostic.SA1505.severity = none
+
+# SA1506: Element documentation headers should not be followed by blank line
+dotnet_diagnostic.SA1506.severity = none
+
+# SA1507: Code should not contain multiple blank lines in a row
+dotnet_diagnostic.SA1507.severity = warning
+
+# SA1508: Closing braces should not be preceded by blank line
+dotnet_diagnostic.SA1508.severity = none
+
+# SA1509: Opening braces should not be preceded by blank line
+dotnet_diagnostic.SA1509.severity = none
+
+# SA1510: Chained statement blocks should not be preceded by blank line
+dotnet_diagnostic.SA1510.severity = none
+
+# SA1511: While-do footer should not be preceded by blank line
+dotnet_diagnostic.SA1511.severity = none
+
+# SA1512: Single-line comments should not be followed by blank line
+dotnet_diagnostic.SA1512.severity = none
+
+# SA1513: Closing brace should be followed by blank line
+dotnet_diagnostic.SA1513.severity = none
+
+# SA1514: Element documentation header should be preceded by blank line
+dotnet_diagnostic.SA1514.severity = none
+
+# SA1515: Single-line comment should be preceded by blank line
+dotnet_diagnostic.SA1515.severity = none
+
+# SA1516: Elements should be separated by blank line
+dotnet_diagnostic.SA1516.severity = warning
+
+# SA1517: Code should not contain blank lines at start of file
+dotnet_diagnostic.SA1517.severity = warning
+
+# SA1518: Use line endings correctly at end of file
+dotnet_diagnostic.SA1518.severity = warning
+
+# SA1519: Braces should not be omitted from multi-line child statement
+dotnet_diagnostic.SA1519.severity = none
+
+# SA1520: Use braces consistently
+dotnet_diagnostic.SA1520.severity = none
+
+# SA1600: Elements should be documented
+dotnet_diagnostic.SA1600.severity = none
+
+# SA1601: Partial elements should be documented
+dotnet_diagnostic.SA1601.severity = none
+
+# SA1602: Enumeration items should be documented
+dotnet_diagnostic.SA1602.severity = none
+
+# SA1604: Element documentation should have summary
+dotnet_diagnostic.SA1604.severity = none
+
+# SA1605: Partial element documentation should have summary
+dotnet_diagnostic.SA1605.severity = none
+
+# SA1606: Element documentation should have summary text
+dotnet_diagnostic.SA1606.severity = none
+
+# SA1607: Partial element documentation should have summary text
+dotnet_diagnostic.SA1607.severity = none
+
+# SA1608: Element documentation should not have default summary
+dotnet_diagnostic.SA1608.severity = none
+
+# SA1609: Property documentation should have value
+dotnet_diagnostic.SA1609.severity = none
+
+# SA1610: Property documentation should have value text
+dotnet_diagnostic.SA1610.severity = none
+
+# SA1611: Element parameters should be documented
+dotnet_diagnostic.SA1611.severity = none
+
+# SA1612: Element parameter documentation should match element parameters
+dotnet_diagnostic.SA1612.severity = none
+
+# SA1613: Element parameter documentation should declare parameter name
+dotnet_diagnostic.SA1613.severity = none
+
+# SA1614: Element parameter documentation should have text
+dotnet_diagnostic.SA1614.severity = none
+
+# SA1615: Element return value should be documented
+dotnet_diagnostic.SA1615.severity = none
+
+# SA1616: Element return value documentation should have text
+dotnet_diagnostic.SA1616.severity = none
+
+# SA1617: Void return value should not be documented
+dotnet_diagnostic.SA1617.severity = none
+
+# SA1618: Generic type parameters should be documented
+dotnet_diagnostic.SA1618.severity = none
+
+# SA1619: Generic type parameters should be documented partial class
+dotnet_diagnostic.SA1619.severity = none
+
+# SA1620: Generic type parameter documentation should match type parameters
+dotnet_diagnostic.SA1620.severity = none
+
+# SA1621: Generic type parameter documentation should declare parameter name
+dotnet_diagnostic.SA1621.severity = none
+
+# SA1622: Generic type parameter documentation should have text
+dotnet_diagnostic.SA1622.severity = none
+
+# SA1623: Property summary documentation should match accessors
+dotnet_diagnostic.SA1623.severity = none
+
+# SA1624: Property summary documentation should omit accessor with restricted access
+dotnet_diagnostic.SA1624.severity = none
+
+# SA1625: Element documentation should not be copied and pasted
+dotnet_diagnostic.SA1625.severity = none
+
+# SA1626: Single-line comments should not use documentation style slashes
+dotnet_diagnostic.SA1626.severity = none
+
+# SA1627: Documentation text should not be empty
+dotnet_diagnostic.SA1627.severity = none
+
+# SA1629: Documentation text should end with a period
+dotnet_diagnostic.SA1629.severity = none
+
+# SA1633: File should have header
+dotnet_diagnostic.SA1633.severity = none
+
+# SA1634: File header should show copyright
+dotnet_diagnostic.SA1634.severity = none
+
+# SA1635: File header should have copyright text
+dotnet_diagnostic.SA1635.severity = none
+
+# SA1636: File header copyright text should match
+dotnet_diagnostic.SA1636.severity = none
+
+# SA1637: File header should contain file name
+dotnet_diagnostic.SA1637.severity = none
+
+# SA1638: File header file name documentation should match file name
+dotnet_diagnostic.SA1638.severity = none
+
+# SA1639: File header should have summary
+dotnet_diagnostic.SA1639.severity = none
+
+# SA1640: File header should have valid company text
+dotnet_diagnostic.SA1640.severity = none
+
+# SA1641: File header company name text should match
+dotnet_diagnostic.SA1641.severity = none
+
+# SA1642: Constructor summary documentation should begin with standard text
+dotnet_diagnostic.SA1642.severity = none
+
+# SA1643: Destructor summary documentation should begin with standard text
+dotnet_diagnostic.SA1643.severity = warning
+
+# SA1648: inheritdoc should be used with inheriting class
+dotnet_diagnostic.SA1648.severity = none
+
+# SA1649: File name should match first type name
+dotnet_diagnostic.SA1649.severity = none
+
+# SA1651: Do not use placeholder elements
+dotnet_diagnostic.SA1651.severity = none
+
+# SX1101: Do not prefix local calls with 'this.'
+dotnet_diagnostic.SX1101.severity = none
+
+# SX1309: Field names should begin with underscore
+dotnet_diagnostic.SX1309.severity = none
+
+# SX1309S: Static field names should begin with underscore
+dotnet_diagnostic.SX1309S.severity = none
diff --git a/Analyzers.props b/Analyzers.props
new file mode 100644
index 00000000000..d0b16622b8c
--- /dev/null
+++ b/Analyzers.props
@@ -0,0 +1,5 @@
+<Project>
+  <ItemGroup>
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.261" PrivateAssets="all" />
+  </ItemGroup>
+</Project>
diff --git a/CHANGELOG/preview.md b/CHANGELOG/preview.md
index 2e89bcd37df..afc36040313 100644
--- a/CHANGELOG/preview.md
+++ b/CHANGELOG/preview.md
@@ -1,5 +1,188 @@
 # Current preview release
 
+## [7.2.0-preview.2] - 2020-12-15
+
+### Breaking Changes
+
+- Improve detection of mutable value types (#12495) (Thanks @vexx32!)
+- Ensure `-PipelineVariable` is set for all output from script cmdlets (#12766) (Thanks @vexx32!)
+
+### Experimental Features
+
+- `PSAnsiRendering`: Enable ANSI formatting via `$PSStyle` and support suppressing ANSI output (#13758)
+
+### Performance
+
+- Optimize `IEnumerable` variant of replace operator (#14221) (Thanks @iSazonov!)
+- Refactor multiply operation for better performance in two `Microsoft.PowerShell.Commands.Utility` methods (#14148) (Thanks @xtqqczze!)
+- Use `Environment.TickCount64` instead of `Datetime.Now` as the random seed for AppLocker test file content (#14283) (Thanks @iSazonov!)
+- Avoid unnecessary array allocations when searching in GAC (#14291) (Thanks @xtqqczze!)
+- Use `OrdinalIgnoreCase` in `CommandLineParser` (#14303) (Thanks @iSazonov!)
+- Use `StringComparison.Ordinal` instead of `StringComparison.CurrentCulture` (#14298) (Thanks @iSazonov!)
+- Avoid creating instances of the generated delegate helper class in `-replace` implementation (#14128)
+
+### General Cmdlet Updates and Fixes
+
+- Write better error message if config file is broken (#13496) (Thanks @iSazonov!)
+- Make AppLocker Enforce mode take precedence over UMCI Audit mode (#14353)
+- Add `-SkipLimitCheck` switch to `Import-PowerShellDataFile` (#13672)
+- Restrict `New-Object` in NoLanguage mode under lock down (#14140) (Thanks @krishnayalavarthi!)
+- The `-Stream` parameter now works with directories (#13941) (Thanks @kyanha!)
+- Avoid an exception if file system does not support reparse points (#13634) (Thanks @iSazonov!)
+- Enable `CA1012`: Abstract types should not have public constructors (#13940) (Thanks @xtqqczze!)
+- Enable `SA1212`: Property accessors should follow order (#14051) (Thanks @xtqqczze!)
+
+### Code Cleanup
+
+<details>
+
+<summary>
+
+<p>We thank the following contributors!</p>
+<p>@xtqqczze, @matthewjdegarmo, @powercode, @Gimly</p>
+
+</summary>
+
+<ul>
+<li>Enable <code>SA1007</code>: Operator keyword should be followed by space (#14130) (Thanks @xtqqczze!)</li>
+<li>Expand <code>where</code> alias to <code>Where-Object</code> in <code>Reset-PWSHSystemPath.ps1</code> (#14113) (Thanks @matthewjdegarmo!)</li>
+<li>Fix whitespace issues (#14092) (Thanks @xtqqczze!)</li>
+<li>Add <code>StyleCop.Analyzers</code> package (#13963) (Thanks @xtqqczze!)</li>
+<li>Enable <code>IDE0041</code>: <code>UseIsNullCheck</code> (#14041) (Thanks @xtqqczze!)</li>
+<li>Enable <code>IDE0082</code>: <code>ConvertTypeOfToNameOf</code> (#14042) (Thanks @xtqqczze!)</li>
+<li>Remove unnecessary usings part 4 (#14023) (Thanks @xtqqczze!)</li>
+<li>Fix <code>PriorityAttribute</code> name (#14094) (Thanks @xtqqczze!)</li>
+<li>Enable nullable: <code>System.Management.Automation.Interpreter.IBoxableInstruction</code> (#14165) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.Provider.IDynamicPropertyProvider</code> (#14167) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.Language.IScriptExtent</code> (#14179) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.Language.ICustomAstVisitor2</code> (#14192) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.LanguagePrimitives.IConversionData</code> (#14187) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Automation.Remoting.Client.IWSManNativeApiFacade</code> (#14186) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.Language.ISupportsAssignment</code> (#14180) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.ICommandRuntime2</code> (#14183) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.IOutputProcessingState</code> (#14175) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.IJobDebugger</code> (#14174) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.Interpreter.IInstructionProvider</code> (#14173) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.IHasSessionStateEntryVisibility</code> (#14169) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.Tracing.IEtwEventCorrelator</code> (#14168) (Thanks @powercode!)</li>
+<li>Fix syntax error in Windows packaging script (#14377)</li>
+<li>Remove redundant local assignment in <code>AclCommands</code> (#14358) (Thanks @xtqqczze!)</li>
+<li>Enable nullable: <code>System.Management.Automation.Language.IAstPostVisitHandler</code> (#14164) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.IModuleAssemblyInitializer</code> (#14158) (Thanks @powercode!)</li>
+<li>Use <code>Microsoft.PowerShell.MarkdownRender</code> package from <code>nuget.org</code> (#14090)</li>
+<li>Replace <code>GetFiles</code> in <code>TestModuleManifestCommand</code> (#14317) (Thanks @xtqqczze!)</li>
+<li>Enable nullable: <code>System.Management.Automation.Provider.IContentWriter</code> (#14152) (Thanks @powercode!)</li>
+<li>Simplify getting Encoding in <code>TranscriptionOption.FlushContentToDisk</code> (#13910) (Thanks @Gimly!)</li>
+<li>Mark applicable structs as <code>readonly</code> and use <code>in</code>-modifier (#13919) (Thanks @xtqqczze!)</li>
+<li>Enable nullable: <code>System.Management.Automation.IArgumentCompleter</code> (#14182) (Thanks @powercode!)</li>
+<li>Enable <code>CA1822</code>: Mark <code>private</code> members as <code>static</code> (#13897) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 6 (#14338) (Thanks @xtqqczze!)</li>
+<li>Avoid array allocations from <code>GetDirectories</code>/<code>GetFiles</code>. (#14328) (Thanks @xtqqczze!)</li>
+<li>Avoid array allocations from <code>GetDirectories</code>/<code>GetFiles</code>. (#14330) (Thanks @xtqqczze!)</li>
+<li>Fix <code>RCS1188</code>: Remove redundant auto-property initialization part 2 (#14262) (Thanks @xtqqczze!)</li>
+<li>Enable nullable: <code>System.Management.Automation.Host.IHostSupportsInteractiveSession</code> (#14170) (Thanks @powercode!)</li>
+<li>Enable nullable: <code>System.Management.Automation.Provider.IPropertyCmdletProvider</code> (#14176) (Thanks @powercode!)</li>
+<li>Fix <code>IDE0090</code>: Simplify new expression part 5 (#14301) (Thanks @xtqqczze!)</li>
+<li>Enable <code>IDE0075</code>: <code>SimplifyConditionalExpression</code> (#14078) (Thanks @xtqqczze!)</li>
+<li>Remove unnecessary usings part 9 (#14288) (Thanks @xtqqczze!)</li>
+<li>Fix StyleCop and MarkdownLint CI failures (#14297) (Thanks @xtqqczze!)</li>
+<li>Enable <code>SA1000</code>: Keywords should be spaced correctly (#13973) (Thanks @xtqqczze!)</li>
+<li>Fix <code>RCS1188</code>: Remove redundant auto-property initialization part 1 (#14261) (Thanks @xtqqczze!)</li>
+<li>Mark <code>private</code> members as <code>static</code> part 10 (#14235) (Thanks @xtqqczze!)</li>
+<li>Mark <code>private</code> members as <code>static</code> part 9 (#14234) (Thanks @xtqqczze!)</li>
+<li>Fix <code>SA1642</code> for <code>Microsoft.Management.Infrastructure.CimCmdlets</code> (#14239) (Thanks @xtqqczze!)</li>
+<li>Use <code>AsSpan</code>/<code>AsMemory</code> slice constructor (#14265) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 4.6 (#14260) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 4.5 (#14259) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 4.3 (#14257) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 4.2 (#14256) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 2 (#14200) (Thanks @xtqqczze!)</li>
+<li>Enable <code>SA1643</code>: Destructor summary documentation should begin with standard text (#14236) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDE0090</code>: Simplify new expression part 4.4 (#14258) (Thanks @xtqqczze!)</li>
+<li>Use xml documentation child blocks correctly (#14249) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 4.1 (#14255) (Thanks @xtqqczze!)</li>
+<li>Use consistent spacing in xml documentation tags (#14231) (Thanks @xtqqczze!)</li>
+<li>Enable <code>IDE0074</code>: Use coalesce compound assignment (#13396) (Thanks @xtqqczze!)</li>
+<li>Remove unnecessary finalizers (#14248) (Thanks @xtqqczze!)</li>
+<li>Mark local variable as <code>const</code> (#13217) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDE0032</code>: <code>UseAutoProperty</code> part 2 (#14244) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDE0032</code>: <code>UseAutoProperty</code> part 1 (#14243) (Thanks @xtqqczze!)</li>
+<li>Mark <code>private</code> members as <code>static</code> part 8 (#14233) (Thanks @xtqqczze!)</li>
+<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 6 (#14229) (Thanks @xtqqczze!)</li>
+<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 5 (#14228) (Thanks @xtqqczze!)</li>
+<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 4 (#14227) (Thanks @xtqqczze!)</li>
+<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 3 (#14226) (Thanks @xtqqczze!)</li>
+<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 2 (#14225) (Thanks @xtqqczze!)</li>
+<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 1 (#14224) (Thanks @xtqqczze!)</li>
+<li>Use <code>see</code> keyword in documentation (#14220) (Thanks @xtqqczze!)</li>
+<li>Enable <code>CA2211</code>: Non-constant fields should not be visible (#14073) (Thanks @xtqqczze!)</li>
+<li>Enable <code>CA1816</code>: <code>Dispose</code> methods should call <code>SuppressFinalize</code> (#14074) (Thanks @xtqqczze!)</li>
+<li>Remove incorrectly implemented finalizer (#14246) (Thanks @xtqqczze!)</li>
+<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 7 (#14230) (Thanks @xtqqczze!)</li>
+<li>Fix <code>SA1122</code>: Use <code>string.Empty</code> for empty strings (#14218) (Thanks @xtqqczze!)</li>
+<li>Fix various xml documentation issues (#14223) (Thanks @xtqqczze!)</li>
+<li>Remove unnecessary <code>using</code>s part 8 (#14072) (Thanks @xtqqczze!)</li>
+<li>Enable <code>SA1006</code>: Preprocessor keywords should not be preceded by space (#14052) (Thanks @xtqqczze!)</li>
+<li>Fix <code>SA1642</code> for <code>Microsoft.PowerShell.Commands.Utility</code> (#14142) (Thanks @xtqqczze!)</li>
+<li>Enable <code>CA2216</code>: Disposable types should declare finalizer (#14089) (Thanks @xtqqczze!)</li>
+<li>Wrap and name <code>LoadBinaryModule</code> arguments (#14193) (Thanks @xtqqczze!)</li>
+<li>Wrap and name <code>GetListOfFilesFromData</code> arguments (#14194) (Thanks @xtqqczze!)</li>
+<li>Enable <code>SA1002</code>: Semicolons should be spaced correctly (#14197) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 3 (#14201) (Thanks @xtqqczze!)</li>
+<li>Enable <code>SA1106</code>: Code should not contain empty statements (#13964) (Thanks @xtqqczze!)</li>
+<li>Code performance fixes follow-up (#14207) (Thanks @xtqqczze!)</li>
+<li>Remove uninformative comments (#14199) (Thanks @xtqqczze!)</li>
+<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 1 (#14027) (Thanks @xtqqczze!)</li>
+<li>Enable <code>SA1517</code>: Code should not contain blank lines at start of file (#14131) (Thanks @xtqqczze!)</li>
+<li>Enable <code>SA1131</code>: Use readable conditions (#14132) (Thanks @xtqqczze!)</li>
+<li>Enable <code>SA1507</code>: Code should not contain multiple blank lines in a row (#14136) (Thanks @xtqqczze!)</li>
+<li>Enable <code>SA1516</code> Elements should be separated by blank line (#14137) (Thanks @xtqqczze!)</li>
+<li>Enable <code>IDE0031</code>: Null check can be simplified (#13548) (Thanks @xtqqczze!)</li>
+<li>Enable <code>CA1065</code>: Do not raise exceptions in unexpected locations (#14117) (Thanks @xtqqczze!)</li>
+<li>Enable <code>CA1000</code>: Do not declare <code>static</code> members on generic types (#14097) (Thanks @xtqqczze!)</li>
+</ul>
+
+</details>
+
+### Tools
+
+- Fixing formatting in `Reset-PWSHSystemPath.ps1` (#13689) (Thanks @dgoldman-msft!)
+
+### Tests
+
+- Reinstate `Test-Connection` tests (#13324)
+- Update markdown test packages with security fixes (#14145)
+
+### Build and Packaging Improvements
+
+<details>
+
+<ul>
+<li>Fix a typo in the <code>Get-ChangeLog</code> function (#14129)</li>
+<li>Update <code>README</code> and <code>metadata.json</code> for <code>7.2.0-preview.1</code> release (#14104)</li>
+<li>Bump <code>NJsonSchema</code> from <code>10.2.2</code> to <code>10.3.1</code> (#14040)</li>
+<li>Move windows package signing to use ESRP (#14060)</li>
+<li>Use one feed in each <code>nuget.config</code> in official builds (#14363)</li>
+<li>Fix path signed RPMs are uploaded from in release build (#14424)</li>
+<li>Add <code>Microsoft.PowerShell.MarkdownRender</code> to the package reference list (#14386)</li>
+<li>Fix issue with unsigned build (#14367)</li>
+<li>Move macOS and nuget to ESRP signing (#14324)</li>
+<li>Fix nuget packaging to scrub <code>NullableAttribute</code> (#14344)</li>
+<li>Bump <code>Microsoft.NET.Test.Sdk</code> from 16.8.0 to 16.8.3 (#14310)</li>
+<li>Bump <code>Markdig.Signed</code> from 0.22.0 to 0.22.1 (#14305)</li>
+<li>Bump <code>Microsoft.ApplicationInsights</code> from 2.15.0 to 2.16.0 (#14031)</li>
+<li>Move Linux to ESRP signing (#14210)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Fix example `nuget.config` (#14349)
+- Fix a broken link in Code Guidelines doc (#14314) (Thanks @iSazonov!)
+
+[7.2.0-preview.2]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.1...v7.2.0-preview.2
+
 ## [7.2.0-preview.1] - 2020-11-17
 
 ### Engine Updates and Fixes
diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index e03bf2cd1a9..2e9f8e6f63b 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -1,4 +1,5 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project=".\Analyzers.props" />
 
   <!--
       The 'version' property is populated with the default value in 'Microsoft.NET.DefaultAssemblyInfo.targets'
diff --git a/PowerShell.sln b/PowerShell.sln
index b164361d7d2..224d27ab3fc 100644
--- a/PowerShell.sln
+++ b/PowerShell.sln
@@ -1,5 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16 
+# Visual Studio Version 16
 # https://github.com/dotnet/project-system/blob/master/docs/opening-with-new-project-system.md#project-type-guids
 VisualStudioVersion = 15.0.26730.12
 MinimumVisualStudioVersion = 10.0.40219.1
@@ -29,8 +29,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.WSMan.Runtime", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "powershell-unix", "src\powershell-unix\powershell-unix.csproj", "{73EA0BE6-C0C5-4B56-A5AA-DADA4C01D690}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerShell.MarkdownRender", "src\Microsoft.PowerShell.MarkdownRender\Microsoft.PowerShell.MarkdownRender.csproj", "{43D4F8DA-A7DE-494B-81B0-BDE3CFD7B1F1}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "xUnit.tests", "test\xUnit\xUnit.tests.csproj", "{08704934-9764-48CE-86DB-BCF0A1CF7899}"
 EndProject
 # Configuration mapping comment
diff --git a/README.md b/README.md
index 851a42a161d..bddb85540ac 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ You can download and install a PowerShell package for any of the following platf
 | -------------------------------------------| ------------------------| ------------------------| ----------------------| ------------------------------|
 | [Windows (x64)][corefx-win]                | [.msi][lts-windows-64]  | [.msi][rl-windows-64]   | [.msi][pv-windows-64] | [Instructions][in-windows]    |
 | [Windows (x86)][corefx-win]                | [.msi][lts-windows-86]  | [.msi][rl-windows-86]   | [.msi][pv-windows-86] | [Instructions][in-windows]    |
-| [Ubuntu 20.04][corefx-linux]               |                         | [.deb][rl-ubuntu20]     |                       | [Instructions][in-ubuntu20]   |
+| [Ubuntu 20.04][corefx-linux]               |                         | [.deb][rl-ubuntu20]     | [.deb][pv-ubuntu20]   | [Instructions][in-ubuntu20]   |
 | [Ubuntu 18.04][corefx-linux]               | [.deb][lts-ubuntu18]    | [.deb][rl-ubuntu18]     | [.deb][pv-ubuntu18]   | [Instructions][in-ubuntu18]   |
 | [Ubuntu 16.04][corefx-linux]               | [.deb][lts-ubuntu16]    | [.deb][rl-ubuntu16]     | [.deb][pv-ubuntu16]   | [Instructions][in-ubuntu16]   |
 | [Debian 9][corefx-linux]                   | [.deb][lts-debian9]     | [.deb][rl-debian9]      | [.deb][pv-debian9]    | [Instructions][in-deb9]       |
@@ -59,7 +59,7 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu
 | Windows        | [32-bit][rl-winx86-zip]/[64-bit][rl-winx64-zip]     | [32-bit][pv-winx86-zip]/[64-bit][pv-winx64-zip] | [Instructions][in-windows-zip]                 |
 | macOS          | [64-bit][rl-macos-tar]                              | [64-bit][pv-macos-tar]                          | [Instructions][in-tar-macos]                   |
 | Linux          | [64-bit][rl-linux-tar]                              | [64-bit][pv-linux-tar]                          | [Instructions][in-tar-linux]                   |
-| Windows (Arm)  | [64-bit][rl-winarm64] (preview) | [32-bit][pv-winarm]/[64-bit][pv-winarm64]       | [Instructions][in-arm]                         |
+| Windows (Arm)  | [64-bit][rl-winarm64] (preview)                     | [64-bit][pv-winarm64]                           | [Instructions][in-arm]                         |
 | Raspbian (Arm) | [32-bit][rl-arm32]/[64-bit][rl-arm64]               | [32-bit][pv-arm32]/[64-bit][pv-arm64]           | [Instructions][in-raspbian]                    |
 
 [lts-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.3/PowerShell-7.0.3-win-x86.msi
@@ -92,24 +92,24 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu
 [rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.0/powershell-7.1.0-linux-arm64.tar.gz
 [rl-snap]: https://snapcraft.io/powershell
 
-[pv-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.0-rc.2/PowerShell-7.1.0-rc.2-win-x64.msi
-[pv-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.0-rc.2/PowerShell-7.1.0-rc.2-win-x86.msi
-[pv-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.0-rc.2/powershell-preview_7.1.0-rc.2-1.ubuntu.18.04_amd64.deb
-[pv-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.0-rc.2/powershell-preview_7.1.0-rc.2-1.ubuntu.16.04_amd64.deb
-[pv-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.0-rc.2/powershell-preview_7.1.0-rc.2-1.debian.9_amd64.deb
-[pv-debian10]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.0-rc.2/powershell-preview_7.1.0-rc.2-1.debian.10_amd64.deb
-[pv-debian11]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.0-rc.2/powershell-preview_7.1.0-rc.2-1.debian.11_amd64.deb
-[pv-centos]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.0-rc.2/powershell-preview-7.1.0_rc.2-1.rhel.7.x86_64.rpm
-[pv-centos8]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.0-rc.2/powershell-preview-7.1.0_rc.2-1.centos.8.x86_64.rpm
-[pv-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.0-rc.2/powershell-7.1.0-rc.2-osx-x64.pkg
-[pv-winarm]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.0-rc.2/PowerShell-7.1.0-rc.2-win-arm32.zip
-[pv-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.0-rc.2/PowerShell-7.1.0-rc.2-win-arm64.zip
-[pv-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.0-rc.2/PowerShell-7.1.0-rc.2-win-x86.zip
-[pv-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.0-rc.2/PowerShell-7.1.0-rc.2-win-x64.zip
-[pv-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.0-rc.2/powershell-7.1.0-rc.2-osx-x64.tar.gz
-[pv-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.0-rc.2/powershell-7.1.0-rc.2-linux-x64.tar.gz
-[pv-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.0-rc.2/powershell-7.1.0-rc.2-linux-arm32.tar.gz
-[pv-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.0-rc.2/powershell-7.1.0-rc.2-linux-arm64.tar.gz
+[pv-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.1/PowerShell-7.2.0-preview.1-win-x64.msi
+[pv-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.1/PowerShell-7.2.0-preview.1-win-x86.msi
+[pv-ubuntu20]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.1/powershell-preview_7.2.0-preview.1-1.ubuntu.20.04_amd64.deb
+[pv-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.1/powershell-preview_7.2.0-preview.1-1.ubuntu.18.04_amd64.deb
+[pv-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.1/powershell-preview_7.2.0-preview.1-1.ubuntu.16.04_amd64.deb
+[pv-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.1/powershell-preview_7.2.0-preview.1-1.debian.9_amd64.deb
+[pv-debian10]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.1/powershell-preview_7.2.0-preview.1-1.debian.10_amd64.deb
+[pv-debian11]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.1/powershell-preview_7.2.0-preview.1-1.debian.11_amd64.deb
+[pv-centos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.1/powershell-preview-7.2.0_preview.1-1.rhel.7.x86_64.rpm
+[pv-centos8]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.1/powershell-preview-7.2.0_preview.1-1.centos.8.x86_64.rpm
+[pv-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.1/powershell-7.2.0-preview.1-osx-x64.pkg
+[pv-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.1/PowerShell-7.2.0-preview.1-win-arm64.zip
+[pv-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.1/PowerShell-7.2.0-preview.1-win-x86.zip
+[pv-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.1/PowerShell-7.2.0-preview.1-win-x64.zip
+[pv-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.1/powershell-7.2.0-preview.1-osx-x64.tar.gz
+[pv-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.1/powershell-7.2.0-preview.1-linux-x64.tar.gz
+[pv-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.1/powershell-7.2.0-preview.1-linux-arm32.tar.gz
+[pv-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.1/powershell-7.2.0-preview.1-linux-arm64.tar.gz
 [pv-snap]: https://snapcraft.io/powershell-preview
 
 [in-windows]: https://docs.microsoft.com/powershell/scripting/install/installing-powershell-core-on-windows
diff --git a/assets/files.wxs b/assets/files.wxs
index 418a32db376..199e964fe17 100644
--- a/assets/files.wxs
+++ b/assets/files.wxs
@@ -1163,9 +1163,6 @@
       <Component Id="cmpf2a3c81eb19246b6be74af07e70a06f0">
         <File Id="fil90f9e9f09d6744f68331100e6d7da03d" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.PowerShell.MarkdownRender.dll" />
       </Component>
-      <Component Id="cmp75c6b7b418bb4f439dd5519c570a14e0">
-        <File Id="fil1c8a95614a8348f9ac6982b3340a303c" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.PowerShell.MarkdownRender.xml" />
-      </Component>
       <Directory Id="dir23E9C47466D341314C603F5C7118348B" Name="ref">
         <Component Id="cmp50D8B0DCCF114B58987590FF8212ACB9">
           <File Id="filAAF1E2DE95144FAD97B91D1E8EA8ADC6" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Data.DataSetExtensions.dll" />
@@ -3451,7 +3448,6 @@
       <ComponentRef Id="cmp557A49B03E72CD07149A6CD0595C9245" />
       <ComponentRef Id="cmp51F2F26684B5C4D0FFFFFBD72174D1BC" />
       <ComponentRef Id="cmpf2a3c81eb19246b6be74af07e70a06f0" />
-      <ComponentRef Id="cmp75c6b7b418bb4f439dd5519c570a14e0" />
       <ComponentRef Id="cmp50D8B0DCCF114B58987590FF8212ACB9" />
       <ComponentRef Id="cmpC39C65F1709E407B9D6AD3AF64F710D3" />
       <ComponentRef Id="cmp2C63290BD1A34304BAF371F4146D9EFD" />
diff --git a/build.psm1 b/build.psm1
index ce9ff123b1b..c6eb8624a41 100644
--- a/build.psm1
+++ b/build.psm1
@@ -337,7 +337,8 @@ function Start-PSBuild {
         try {
             # Excluded sqlite3 folder is due to this Roslyn issue: https://github.com/dotnet/roslyn/issues/23060
             # Excluded src/Modules/nuget.config as this is required for release build.
-            git clean -fdX --exclude .vs/PowerShell/v16/Server/sqlite3 --exclude src/Modules/nuget.config
+            # Excluded nuget.config as this is required for release build.
+            git clean -fdX --exclude .vs/PowerShell/v16/Server/sqlite3 --exclude src/Modules/nuget.config  --exclude nuget.config
         } finally {
             Pop-Location
         }
@@ -628,7 +629,9 @@ function Restore-PSPackage
 
         [switch] $Force,
 
-        [switch] $InteractiveAuth
+        [switch] $InteractiveAuth,
+
+        [switch] $PSModule
     )
 
     if (-not $ProjectDirs)
@@ -652,7 +655,10 @@ function Restore-PSPackage
             'Microsoft.NET.Sdk'
         }
 
-        if ($Options.Runtime -notlike 'fxdependent*') {
+        if ($PSModule.IsPresent) {
+            $RestoreArguments = @("--verbosity")
+        }
+        elseif ($Options.Runtime -notlike 'fxdependent*') {
             $RestoreArguments = @("--runtime", $Options.Runtime, "/property:SDKToUse=$sdkToUse", "--verbosity")
         } else {
             $RestoreArguments = @("/property:SDKToUse=$sdkToUse", "--verbosity")
@@ -2500,7 +2506,7 @@ function Copy-PSGalleryModules
 
     Find-DotNet
 
-    Restore-PSPackage -ProjectDirs (Split-Path $CsProjPath) -Force:$Force.IsPresent
+    Restore-PSPackage -ProjectDirs (Split-Path $CsProjPath) -Force:$Force.IsPresent -PSModule
 
     $cache = dotnet nuget locals global-packages -l
     if ($cache -match "global-packages: (.*)") {
@@ -3282,8 +3288,10 @@ function New-NugetConfigFile
   <packageSources>
     <clear />
     <add key="[FEEDNAME]" value="[FEED]" />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
+  <disabledPackageSources>
+    <clear />
+  </disabledPackageSources>
   <packageSourceCredentials>
     <[FEEDNAME]>
       <add key="Username" value="[USERNAME]" />
diff --git a/docs/dev-process/coding-guidelines.md b/docs/dev-process/coding-guidelines.md
index dab26aa5bf7..389981c3f7b 100644
--- a/docs/dev-process/coding-guidelines.md
+++ b/docs/dev-process/coding-guidelines.md
@@ -86,7 +86,7 @@ We also run the [.NET code formatter tool](https://github.com/dotnet/codeformatt
 
 * Make sure the added/updated comments are meaningful, accurate and easy to understand.
 
-* Public members must use [doc comments](https://docs.microsoft.com/dotnet/csharp/programming-guide/xmldoc/xml-documentation-comments).
+* Public members must use [doc comments](https://docs.microsoft.com/dotnet/csharp/programming-guide/xmldoc/).
   Internal and private members may use doc comments but it is not required.
 
 ## Performance Considerations
diff --git a/docs/host-powershell/sample/NuGet.config b/docs/host-powershell/sample/NuGet.config
index 58f8d2c9b6d..b3ce3cb82a5 100644
--- a/docs/host-powershell/sample/NuGet.config
+++ b/docs/host-powershell/sample/NuGet.config
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
+    <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" /> 
-    <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
-    <add key="powershell-core" value="https://powershell.myget.org/F/powershell-core/api/v3/index.json" />
   </packageSources>
+  <disabledPackageSources>
+    <clear />
+  </disabledPackageSources>
 </configuration>
diff --git a/docs/testing-guidelines/testing-guidelines.md b/docs/testing-guidelines/testing-guidelines.md
index ce987beb6d0..e00c8352ee7 100755
--- a/docs/testing-guidelines/testing-guidelines.md
+++ b/docs/testing-guidelines/testing-guidelines.md
@@ -88,7 +88,7 @@ When you would want to do this:
 
 ### xUnit
 
-For those tests which are not easily run via Pester, we have decided to use [xUnit](https://xunit.github.io/) as the test framework.
+For those tests which are not easily run via Pester, we have decided to use [xUnit](https://xunit.net/) as the test framework.
 Currently, we have a minuscule number of tests which are run by using xUnit.
 
 ## Running tests outside of CI
diff --git a/nuget.config b/nuget.config
index cbb2494cecf..760e780c8ec 100644
--- a/nuget.config
+++ b/nuget.config
@@ -4,8 +4,8 @@
     <clear />
     <add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
-    <add key="powershell_nuget" value="https://powershell.pkgs.visualstudio.com/PowerShell/_packaging/powershell/nuget/v3/index.json" />
-    <add key="PSGallery" value="https://www.powershellgallery.com/api/v2/" />
   </packageSources>
+  <disabledPackageSources>
+    <clear />
+  </disabledPackageSources>
 </configuration>
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimAsyncOperation.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimAsyncOperation.cs
index 99a2d21cab4..49f39c8c019 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimAsyncOperation.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimAsyncOperation.cs
@@ -26,9 +26,9 @@ internal abstract class CimAsyncOperation : IDisposable
         #region Constructor
 
         /// <summary>
-        /// The constructor.
+        /// Initializes a new instance of the <see cref="CimAsyncOperation"/> class.
         /// </summary>
-        public CimAsyncOperation()
+        protected CimAsyncOperation()
         {
             this.moreActionEvent = new ManualResetEventSlim(false);
             this.actionQueue = new ConcurrentQueue<CimBaseAction>();
@@ -237,7 +237,7 @@ protected bool IsActive()
         /// <param name="session"></param>
         protected CimSessionProxy CreateCimSessionProxy(CimSessionProxy originalProxy)
         {
-            CimSessionProxy proxy = new CimSessionProxy(originalProxy);
+            CimSessionProxy proxy = new(originalProxy);
             this.SubscribeEventAndAddProxytoCache(proxy);
             return proxy;
         }
@@ -259,7 +259,7 @@ protected CimSessionProxy CreateCimSessionProxy(CimSessionProxy originalProxy, b
         /// <param name="session"></param>
         protected CimSessionProxy CreateCimSessionProxy(CimSession session)
         {
-            CimSessionProxy proxy = new CimSessionProxy(session);
+            CimSessionProxy proxy = new(session);
             this.SubscribeEventAndAddProxytoCache(proxy);
             return proxy;
         }
@@ -282,7 +282,7 @@ protected CimSessionProxy CreateCimSessionProxy(CimSession session, bool passThr
         /// <param name="computerName"></param>
         protected CimSessionProxy CreateCimSessionProxy(string computerName)
         {
-            CimSessionProxy proxy = new CimSessionProxy(computerName);
+            CimSessionProxy proxy = new(computerName);
             this.SubscribeEventAndAddProxytoCache(proxy);
             return proxy;
         }
@@ -296,7 +296,7 @@ protected CimSessionProxy CreateCimSessionProxy(string computerName)
         /// <returns></returns>
         protected CimSessionProxy CreateCimSessionProxy(string computerName, CimInstance cimInstance)
         {
-            CimSessionProxy proxy = new CimSessionProxy(computerName, cimInstance);
+            CimSessionProxy proxy = new(computerName, cimInstance);
             this.SubscribeEventAndAddProxytoCache(proxy);
             return proxy;
         }
@@ -546,7 +546,7 @@ private void Cleanup()
         /// <summary>
         /// Lock object.
         /// </summary>
-        private readonly object a_lock = new object();
+        private readonly object a_lock = new();
 
         /// <summary>
         /// Number of active operations.
@@ -568,7 +568,7 @@ private void Cleanup()
         /// <summary>
         /// Lock object.
         /// </summary>
-        private readonly object cimSessionProxyCacheLock = new object();
+        private readonly object cimSessionProxyCacheLock = new();
 
         /// <summary>
         /// Cache all <see cref="CimSessionProxy"/> objects related to
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimBaseAction.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimBaseAction.cs
index 256130f0d31..e3e487a9533 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimBaseAction.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimBaseAction.cs
@@ -17,9 +17,9 @@ namespace Microsoft.Management.Infrastructure.CimCmdlets
     internal abstract class CimBaseAction
     {
         /// <summary>
-        /// Constructor method.
+        /// Initializes a new instance of the <see cref="CimBaseAction"/> class.
         /// </summary>
-        public CimBaseAction()
+        protected CimBaseAction()
         {
         }
 
@@ -44,20 +44,7 @@ public virtual void Execute(CmdletOperationBase cmdlet)
         /// <see cref="CimSession"/>, <see cref="CimOperationOptions"/> object.
         /// </para>
         /// </summary>
-        protected XOperationContextBase Context
-        {
-            get
-            {
-                return this.context;
-            }
-
-            set
-            {
-                this.context = value;
-            }
-        }
-
-        private XOperationContextBase context;
+        protected XOperationContextBase Context { get; set; }
     }
 
     /// <summary>
@@ -69,7 +56,7 @@ protected XOperationContextBase Context
     internal class CimSyncAction : CimBaseAction, IDisposable
     {
         /// <summary>
-        /// The constructor.
+        /// Initializes a new instance of the <see cref="CimSyncAction"/> class.
         /// </summary>
         public CimSyncAction()
         {
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimCommandBase.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimCommandBase.cs
index ada2e6fa424..059f58a97b2 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimCommandBase.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimCommandBase.cs
@@ -25,41 +25,25 @@ namespace Microsoft.Management.Infrastructure.CimCmdlets
     internal class ParameterDefinitionEntry
     {
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="ParameterDefinitionEntry"/> class.
         /// </summary>
         /// <param name="parameterSetName"></param>
         /// <param name="mandatory"></param>
         internal ParameterDefinitionEntry(string parameterSetName, bool mandatory)
         {
-            this.mandatory = mandatory;
-            this.parameterSetName = parameterSetName;
+            this.IsMandatory = mandatory;
+            this.ParameterSetName = parameterSetName;
         }
 
         /// <summary>
         /// Property ParameterSetName.
         /// </summary>
-        internal string ParameterSetName
-        {
-            get
-            {
-                return this.parameterSetName;
-            }
-        }
-
-        private readonly string parameterSetName = null;
+        internal string ParameterSetName { get; }
 
         /// <summary>
         /// Whether the parameter is mandatory to the set.
         /// </summary>
-        internal bool IsMandatory
-        {
-            get
-            {
-                return this.mandatory;
-            }
-        }
-
-        private readonly bool mandatory = false;
+        internal bool IsMandatory { get; }
     }
 
     /// <summary>
@@ -70,36 +54,36 @@ internal bool IsMandatory
     internal class ParameterSetEntry
     {
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="ParameterSetEntry"/> class.
         /// </summary>
         /// <param name="mandatoryParameterCount"></param>
         internal ParameterSetEntry(UInt32 mandatoryParameterCount)
         {
-            this.mandatoryParameterCount = mandatoryParameterCount;
-            this.isDefaultParameterSet = false;
+            this.MandatoryParameterCount = mandatoryParameterCount;
+            this.IsDefaultParameterSet = false;
             reset();
         }
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="ParameterSetEntry"/> class.
         /// </summary>
         /// <param name="toClone"></param>
         internal ParameterSetEntry(ParameterSetEntry toClone)
         {
-            this.mandatoryParameterCount = toClone.MandatoryParameterCount;
-            this.isDefaultParameterSet = toClone.IsDefaultParameterSet;
+            this.MandatoryParameterCount = toClone.MandatoryParameterCount;
+            this.IsDefaultParameterSet = toClone.IsDefaultParameterSet;
             reset();
         }
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="ParameterSetEntry"/> class.
         /// </summary>
         /// <param name="mandatoryParameterCount"></param>
         /// <param name="mandatory"></param>
         internal ParameterSetEntry(UInt32 mandatoryParameterCount, bool isDefault)
         {
-            this.mandatoryParameterCount = mandatoryParameterCount;
-            this.isDefaultParameterSet = isDefault;
+            this.MandatoryParameterCount = mandatoryParameterCount;
+            this.IsDefaultParameterSet = isDefault;
             reset();
         }
 
@@ -108,107 +92,39 @@ internal ParameterSetEntry(UInt32 mandatoryParameterCount, bool isDefault)
         /// </summary>
         internal void reset()
         {
-            this.setMandatoryParameterCount = this.setMandatoryParameterCountAtBeginProcess;
-            this.isValueSet = this.isValueSetAtBeginProcess;
+            this.SetMandatoryParameterCount = this.SetMandatoryParameterCountAtBeginProcess;
+            this.IsValueSet = this.IsValueSetAtBeginProcess;
         }
 
         /// <summary>
         /// Property <c>DefaultParameterSet</c>
         /// </summary>
-        internal bool IsDefaultParameterSet
-        {
-            get
-            {
-                return this.isDefaultParameterSet;
-            }
-        }
-
-        private readonly bool isDefaultParameterSet = false;
+        internal bool IsDefaultParameterSet { get; }
 
         /// <summary>
         /// Property <c>MandatoryParameterCount</c>
         /// </summary>
-        internal UInt32 MandatoryParameterCount
-        {
-            get
-            {
-                return this.mandatoryParameterCount;
-            }
-        }
-
-        private readonly UInt32 mandatoryParameterCount = 0;
+        internal UInt32 MandatoryParameterCount { get; } = 0;
 
         /// <summary>
         /// Property <c>IsValueSet</c>
         /// </summary>
-        internal bool IsValueSet
-        {
-            get
-            {
-                return this.isValueSet;
-            }
-
-            set
-            {
-                this.isValueSet = value;
-            }
-        }
-
-        private bool isValueSet = false;
+        internal bool IsValueSet { get; set; }
 
         /// <summary>
         /// Property <c>IsValueSetAtBeginProcess</c>
         /// </summary>
-        internal bool IsValueSetAtBeginProcess
-        {
-            get
-            {
-                return this.isValueSetAtBeginProcess;
-            }
-
-            set
-            {
-                this.isValueSetAtBeginProcess = value;
-            }
-        }
-
-        private bool isValueSetAtBeginProcess = false;
+        internal bool IsValueSetAtBeginProcess { get; set; }
 
         /// <summary>
         /// Property <c>SetMandatoryParameterCount</c>
         /// </summary>
-        internal UInt32 SetMandatoryParameterCount
-        {
-            get
-            {
-                return this.setMandatoryParameterCount;
-            }
-
-            set
-            {
-                this.setMandatoryParameterCount = value;
-            }
-        }
-
-        private UInt32 setMandatoryParameterCount = 0;
+        internal UInt32 SetMandatoryParameterCount { get; set; } = 0;
 
         /// <summary>
         /// Property <c>SetMandatoryParameterCountAtBeginProcess</c>
         /// </summary>
-        internal UInt32 SetMandatoryParameterCountAtBeginProcess
-        {
-            get
-            {
-                return this.setMandatoryParameterCountAtBeginProcess;
-            }
-
-            set
-            {
-                this.setMandatoryParameterCountAtBeginProcess = value;
-            }
-        }
-
-        private UInt32 setMandatoryParameterCountAtBeginProcess = 0;
+        internal UInt32 SetMandatoryParameterCountAtBeginProcess { get; set; } = 0;
     }
 
     /// <summary>
@@ -217,7 +133,7 @@ internal UInt32 SetMandatoryParameterCountAtBeginProcess
     internal class ParameterBinder
     {
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="ParameterBinder"/> class.
         /// </summary>
         /// <param name="parameters"></param>
         /// <param name="sets"></param>
@@ -256,12 +172,12 @@ internal ParameterBinder(
         /// throw exception
         /// </para>
         /// </summary>
-        private List<string> parametersetNamesList = new List<string>();
+        private List<string> parametersetNamesList = new();
 
         /// <summary>
         /// Parameter names list.
         /// </summary>
-        private readonly List<string> parameterNamesList = new List<string>();
+        private readonly List<string> parameterNamesList = new();
 
         /// <summary>
         /// <para>
@@ -270,12 +186,12 @@ internal ParameterBinder(
         /// throw exception
         /// </para>
         /// </summary>
-        private List<string> parametersetNamesListAtBeginProcess = new List<string>();
+        private List<string> parametersetNamesListAtBeginProcess = new();
 
         /// <summary>
         /// Parameter names list before begin process.
         /// </summary>
-        private readonly List<string> parameterNamesListAtBeginProcess = new List<string>();
+        private readonly List<string> parameterNamesListAtBeginProcess = new();
 
         /// <summary>
         /// <para>
@@ -331,7 +247,7 @@ internal void SetParameter(string parameterName, bool isBeginProcess)
 
             if (this.parametersetNamesList.Count == 0)
             {
-                List<string> nameset = new List<string>();
+                List<string> nameset = new();
                 foreach (ParameterDefinitionEntry parameterDefinitionEntry in this.parameterDefinitionEntries[parameterName])
                 {
                     DebugHelper.WriteLogEx("parameterset name = '{0}'; mandatory = '{1}'", 1, parameterDefinitionEntry.ParameterSetName, parameterDefinitionEntry.IsMandatory);
@@ -370,7 +286,7 @@ internal void SetParameter(string parameterName, bool isBeginProcess)
             }
             else
             {
-                List<string> nameset = new List<string>();
+                List<string> nameset = new();
                 foreach (ParameterDefinitionEntry entry in this.parameterDefinitionEntries[parameterName])
                 {
                     if (this.parametersetNamesList.Contains(entry.ParameterSetName))
@@ -418,7 +334,7 @@ internal string GetParameterSet()
 
             string boundParameterSetName = null;
             string defaultParameterSetName = null;
-            List<string> noMandatoryParameterSet = new List<string>();
+            List<string> noMandatoryParameterSet = new();
 
             // Looking for parameter set which have mandatory parameters
             foreach (string parameterSetName in this.parameterSetEntries.Keys)
@@ -531,7 +447,7 @@ internal void CheckParameterSet()
             {
                 try
                 {
-                    this.parameterSetName = this.parameterBinder.GetParameterSet();
+                    this.ParameterSetName = this.parameterBinder.GetParameterSet();
                 }
                 finally
                 {
@@ -539,7 +455,7 @@ internal void CheckParameterSet()
                 }
             }
 
-            DebugHelper.WriteLog("current parameterset is: " + this.parameterSetName, 4);
+            DebugHelper.WriteLog("current parameterset is: " + this.ParameterSetName, 4);
         }
 
         /// <summary>
@@ -567,7 +483,7 @@ internal void SetParameter(object value, string parameterName)
         #region constructors
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="CimBaseCommand"/> class.
         /// </summary>
         internal CimBaseCommand()
         {
@@ -576,7 +492,7 @@ internal CimBaseCommand()
         }
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="CimBaseCommand"/> class.
         /// </summary>
         internal CimBaseCommand(Dictionary<string, HashSet<ParameterDefinitionEntry>> parameters,
             Dictionary<string, ParameterSetEntry> sets)
@@ -687,14 +603,7 @@ protected virtual void DisposeInternal()
         /// <summary>
         /// Lock object.
         /// </summary>
-        private readonly object myLock = new object();
-
-        /// <summary>
-        /// <para>
-        /// parameter set name
-        /// </para>
-        /// </summary>
-        private string parameterSetName;
+        private readonly object myLock = new();
 
         /// <summary>
         /// This flag is introduced to resolve the parameter set name
@@ -747,13 +656,7 @@ internal CimAsyncOperation AsyncOperation
         /// Get current ParameterSetName of the cmdlet
         /// </para>
         /// </summary>
-        internal string ParameterSetName
-        {
-            get
-            {
-                return this.parameterSetName;
-            }
-        }
+        internal string ParameterSetName { get; private set; }
 
         /// <summary>
         /// Gets/Sets cmdlet operation wrapper object.
@@ -771,7 +674,7 @@ internal virtual CmdletOperationBase CmdletOperation
         /// </summary>
         internal void ThrowTerminatingError(Exception exception, string operation)
         {
-            ErrorRecord errorRecord = new ErrorRecord(exception, operation, ErrorCategory.InvalidOperation, this);
+            ErrorRecord errorRecord = new(exception, operation, ErrorCategory.InvalidOperation, this);
             this.CmdletOperation.ThrowTerminatingError(errorRecord);
         }
 
@@ -909,7 +812,7 @@ internal void ThrowInvalidAuthenticationTypeError(
                 ImpersonatedAuthenticationMechanism.Negotiate,
                 ImpersonatedAuthenticationMechanism.Kerberos,
                 ImpersonatedAuthenticationMechanism.NtlmDomain);
-            PSArgumentOutOfRangeException exception = new PSArgumentOutOfRangeException(
+            PSArgumentOutOfRangeException exception = new(
                 parameterName, authentication, message);
             ThrowTerminatingError(exception, operationName);
         }
@@ -928,7 +831,7 @@ internal void ThrowConflictParameterWasSet(
             string message = string.Format(CultureInfo.CurrentUICulture,
                 CimCmdletStrings.ConflictParameterWasSet,
                 parameterName, conflictParameterName);
-            PSArgumentException exception = new PSArgumentException(message, parameterName);
+            PSArgumentException exception = new(message, parameterName);
             ThrowTerminatingError(exception, operationName);
         }
 
@@ -944,7 +847,7 @@ internal void ThrowInvalidProperty(
             string operationName,
             IDictionary actualValue)
         {
-            StringBuilder propList = new StringBuilder();
+            StringBuilder propList = new();
             foreach (string property in propertiesList)
             {
                 if (propList.Length > 0)
@@ -957,7 +860,7 @@ internal void ThrowInvalidProperty(
 
             string message = string.Format(CultureInfo.CurrentUICulture, CimCmdletStrings.CouldNotFindPropertyFromGivenClass,
                 className, propList);
-            PSArgumentOutOfRangeException exception = new PSArgumentOutOfRangeException(
+            PSArgumentOutOfRangeException exception = new(
                 parameterName, actualValue, message);
             ThrowTerminatingError(exception, operationName);
         }
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetAssociatedInstance.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetAssociatedInstance.cs
index 26acd81757e..0ab4988c57d 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetAssociatedInstance.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetAssociatedInstance.cs
@@ -17,9 +17,7 @@ namespace Microsoft.Management.Infrastructure.CimCmdlets
     internal sealed class CimGetAssociatedInstance : CimAsyncOperation
     {
         /// <summary>
-        /// <para>
-        /// Constructor
-        /// </para>
+        /// Initializes a new instance of the <see cref="CimGetAssociatedInstance"/> class.
         /// </summary>
         public CimGetAssociatedInstance()
             : base()
@@ -43,7 +41,7 @@ public void GetCimAssociatedInstance(GetCimAssociatedInstanceCommand cmdlet)
                 nameSpace = ConstValue.GetNamespace(cmdlet.CimInstance.CimSystemProperties.Namespace);
             }
 
-            List<CimSessionProxy> proxys = new List<CimSessionProxy>();
+            List<CimSessionProxy> proxys = new();
             switch (cmdlet.ParameterSetName)
             {
                 case CimBaseCommand.ComputerSetName:
@@ -87,7 +85,7 @@ public void GetCimAssociatedInstance(GetCimAssociatedInstanceCommand cmdlet)
         /// </summary>
         /// <param name="proxy"></param>
         /// <param name="cmdlet"></param>
-        private void SetSessionProxyProperties(
+        private static void SetSessionProxyProperties(
             ref CimSessionProxy proxy,
             GetCimAssociatedInstanceCommand cmdlet)
         {
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetCimClass.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetCimClass.cs
index 59a0668026a..386482f11c5 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetCimClass.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetCimClass.cs
@@ -17,9 +17,7 @@ namespace Microsoft.Management.Infrastructure.CimCmdlets
     internal class CimGetCimClassContext : XOperationContextBase
     {
         /// <summary>
-        /// <para>
-        /// Constructor
-        /// </para>
+        /// Initializes a new instance of the <see cref="CimGetCimClassContext"/> class.
         /// </summary>
         /// <param name="methodName"></param>
         /// <param name="propertyName"></param>
@@ -30,10 +28,10 @@ internal CimGetCimClassContext(
             string thePropertyName,
             string theQualifierName)
         {
-            this.className = theClassName;
-            this.methodName = theMethodName;
-            this.propertyName = thePropertyName;
-            this.qualifierName = theQualifierName;
+            this.ClassName = theClassName;
+            this.MethodName = theMethodName;
+            this.PropertyName = thePropertyName;
+            this.QualifierName = theQualifierName;
         }
 
         /// <summary>
@@ -44,14 +42,7 @@ internal CimGetCimClassContext(
         /// Wildcard expansion should be allowed.
         /// </para>
         /// </summary>
-        public string ClassName
-        {
-            get { return className; }
-
-            set { className = value; }
-        }
-
-        private string className;
+        public string ClassName { get; set; }
 
         /// <summary>
         /// <para>
@@ -60,12 +51,7 @@ public string ClassName
         /// Then Filter the <see cref="CimClass"/> by given methodname
         /// </para>
         /// </summary>
-        internal string MethodName
-        {
-            get { return methodName; }
-        }
-
-        private readonly string methodName;
+        internal string MethodName { get; }
 
         /// <summary>
         /// <para>
@@ -74,12 +60,7 @@ internal string MethodName
         /// Filter the <see cref="CimClass"/> by given property name.
         /// </para>
         /// </summary>
-        internal string PropertyName
-        {
-            get { return propertyName; }
-        }
-
-        private readonly string propertyName;
+        internal string PropertyName { get; }
 
         /// <summary>
         /// <para>
@@ -88,12 +69,7 @@ internal string PropertyName
         /// Filter the <see cref="CimClass"/> by given methodname
         /// </para>
         /// </summary>
-        internal string QualifierName
-        {
-            get { return qualifierName; }
-        }
-
-        private readonly string qualifierName;
+        internal string QualifierName { get; }
     }
 
     /// <summary>
@@ -104,9 +80,7 @@ internal string QualifierName
     internal sealed class CimGetCimClass : CimAsyncOperation
     {
         /// <summary>
-        /// <para>
-        /// Constructor
-        /// </para>
+        /// Initializes a new instance of the <see cref="CimGetCimClass"/> class.
         /// </summary>
         public CimGetCimClass()
             : base()
@@ -121,10 +95,10 @@ public CimGetCimClass()
         /// <param name="cmdlet"><see cref="GetCimClassCommand"/> object.</param>
         public void GetCimClass(GetCimClassCommand cmdlet)
         {
-            List<CimSessionProxy> proxys = new List<CimSessionProxy>();
+            List<CimSessionProxy> proxys = new();
             string nameSpace = ConstValue.GetNamespace(cmdlet.Namespace);
             string className = (cmdlet.ClassName == null) ? @"*" : cmdlet.ClassName;
-            CimGetCimClassContext context = new CimGetCimClassContext(
+            CimGetCimClassContext context = new(
                 cmdlet.ClassName,
                 cmdlet.MethodName,
                 cmdlet.PropertyName,
@@ -186,7 +160,7 @@ public void GetCimClass(GetCimClassCommand cmdlet)
         /// </summary>
         /// <param name="proxy"></param>
         /// <param name="cmdlet"></param>
-        private void SetSessionProxyProperties(
+        private static void SetSessionProxyProperties(
             ref CimSessionProxy proxy,
             GetCimClassCommand cmdlet)
         {
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetInstance.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetInstance.cs
index 62342ba3a55..184a3537fec 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetInstance.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimGetInstance.cs
@@ -51,6 +51,7 @@ public object Process(object resultObject)
     internal class CimGetInstance : CimAsyncOperation
     {
         /// <summary>
+        /// Initializes a new instance of the <see cref="CimGetInstance"/> class.
         /// <para>
         /// Constructor
         /// </para>
@@ -81,7 +82,7 @@ protected void GetCimInstanceInternal(CimBaseCommand cmdlet)
             IEnumerable<string> computerNames = ConstValue.GetComputerNames(
                 GetComputerName(cmdlet));
             string nameSpace;
-            List<CimSessionProxy> proxys = new List<CimSessionProxy>();
+            List<CimSessionProxy> proxys = new();
             bool isGetCimInstanceCommand = (cmdlet is GetCimInstanceCommand);
             CimInstance targetCimInstance = null;
             switch (cmdlet.ParameterSetName)
@@ -93,7 +94,7 @@ protected void GetCimInstanceInternal(CimBaseCommand cmdlet)
                         CimSessionProxy proxy = CreateSessionProxy(computerName, targetCimInstance, cmdlet);
                         if (isGetCimInstanceCommand)
                         {
-                            this.SetPreProcess(proxy, cmdlet as GetCimInstanceCommand);
+                            SetPreProcess(proxy, cmdlet as GetCimInstanceCommand);
                         }
 
                         proxys.Add(proxy);
@@ -108,7 +109,7 @@ protected void GetCimInstanceInternal(CimBaseCommand cmdlet)
                         CimSessionProxy proxy = CreateSessionProxy(computerName, cmdlet);
                         if (isGetCimInstanceCommand)
                         {
-                            this.SetPreProcess(proxy, cmdlet as GetCimInstanceCommand);
+                            SetPreProcess(proxy, cmdlet as GetCimInstanceCommand);
                         }
 
                         proxys.Add(proxy);
@@ -124,7 +125,7 @@ protected void GetCimInstanceInternal(CimBaseCommand cmdlet)
                         CimSessionProxy proxy = CreateSessionProxy(session, cmdlet);
                         if (isGetCimInstanceCommand)
                         {
-                            this.SetPreProcess(proxy, cmdlet as GetCimInstanceCommand);
+                            SetPreProcess(proxy, cmdlet as GetCimInstanceCommand);
                         }
 
                         proxys.Add(proxy);
@@ -301,7 +302,7 @@ protected static string CreateQuery(CimBaseCommand cmdlet)
             GetCimInstanceCommand cmd = cmdlet as GetCimInstanceCommand;
             if (cmd != null)
             {
-                StringBuilder propertyList = new StringBuilder();
+                StringBuilder propertyList = new();
                 if (cmd.SelectProperties == null)
                 {
                     propertyList.Append('*');
@@ -373,7 +374,7 @@ protected static CimInstance GetCimInstanceParameter(CimBaseCommand cmdlet)
         /// </summary>
         /// <param name="proxy"></param>
         /// <param name="cmdlet"></param>
-        private void SetSessionProxyProperties(
+        private static void SetSessionProxyProperties(
             ref CimSessionProxy proxy,
             CimBaseCommand cmdlet)
         {
@@ -397,7 +398,7 @@ private void SetSessionProxyProperties(
                     proxy.ResourceUri = removeCimInstance.ResourceUri;
                 }
 
-                CimRemoveCimInstanceContext context = new CimRemoveCimInstanceContext(
+                CimRemoveCimInstanceContext context = new(
                     ConstValue.GetNamespace(removeCimInstance.Namespace),
                     proxy);
                 proxy.ContextObject = context;
@@ -411,7 +412,7 @@ private void SetSessionProxyProperties(
                     proxy.ResourceUri = setCimInstance.ResourceUri;
                 }
 
-                CimSetCimInstanceContext context = new CimSetCimInstanceContext(
+                CimSetCimInstanceContext context = new(
                     ConstValue.GetNamespace(setCimInstance.Namespace),
                     setCimInstance.Property,
                     proxy,
@@ -514,7 +515,7 @@ protected CimSessionProxy CreateSessionProxy(
         /// </summary>
         /// <param name="proxy"></param>
         /// <param name="cmdlet"></param>
-        private void SetPreProcess(CimSessionProxy proxy, GetCimInstanceCommand cmdlet)
+        private static void SetPreProcess(CimSessionProxy proxy, GetCimInstanceCommand cmdlet)
         {
             if (cmdlet.KeyOnly || (cmdlet.SelectProperties != null))
             {
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimIndicationWatcher.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimIndicationWatcher.cs
index 198c86e96af..0c847265cfe 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimIndicationWatcher.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimIndicationWatcher.cs
@@ -45,26 +45,16 @@ public class CimIndicationEventExceptionEventArgs : CimIndicationEventArgs
         /// Returns an exception
         /// </para>
         /// </summary>
-        public Exception Exception
-        {
-            get
-            {
-                return exception;
-            }
-        }
-
-        private readonly Exception exception;
+        public Exception Exception { get; }
 
         /// <summary>
-        /// <para>
-        /// Constructor
-        /// </para>
+        /// Initializes a new instance of the <see cref="CimIndicationEventExceptionEventArgs"/> class.
         /// </summary>
         /// <param name="result"></param>
         public CimIndicationEventExceptionEventArgs(Exception theException)
         {
             context = null;
-            this.exception = theException;
+            this.Exception = theException;
         }
     }
 
@@ -81,7 +71,7 @@ public CimInstance NewEvent
         {
             get
             {
-                return (result == null) ? null : result.Instance;
+                return result?.Instance;
             }
         }
 
@@ -92,7 +82,7 @@ public string MachineId
         {
             get
             {
-                return (result == null) ? null : result.MachineId;
+                return result?.MachineId;
             }
         }
 
@@ -103,14 +93,12 @@ public string Bookmark
         {
             get
             {
-                return (result == null) ? null : result.Bookmark;
+                return result?.Bookmark;
             }
         }
 
         /// <summary>
-        /// <para>
-        /// Constructor
-        /// </para>
+        /// Initializes a new instance of the <see cref="CimIndicationEventInstanceEventArgs"/> class.
         /// </summary>
         /// <param name="result"></param>
         public CimIndicationEventInstanceEventArgs(CimSubscriptionResult result)
@@ -154,9 +142,7 @@ internal enum Status
         public event EventHandler<CimIndicationEventArgs> CimIndicationArrived;
 
         /// <summary>
-        /// <para>
-        /// Constructor with given computerName, namespace, queryExpression and timeout
-        /// </para>
+        /// Initializes a new instance of the <see cref="CimIndicationWatcher"/> class.
         /// </summary>
         /// <param name="computerName"></param>
         /// <param name="nameSpace"></param>
@@ -176,9 +162,7 @@ public CimIndicationWatcher(
         }
 
         /// <summary>
-        /// <para>
-        /// Constructor with given cimsession, namespace, queryExpression and timeout
-        /// </para>
+        /// Initializes a new instance of the <see cref="CimIndicationWatcher"/> class.
         /// </summary>
         /// <param name="cimSession"></param>
         /// <param name="nameSpace"></param>
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimInvokeCimMethod.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimInvokeCimMethod.cs
index 95d2aafec7c..50f4d12dd74 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimInvokeCimMethod.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimInvokeCimMethod.cs
@@ -27,9 +27,7 @@ internal sealed class CimInvokeCimMethod : CimAsyncOperation
         internal class CimInvokeCimMethodContext : XOperationContextBase
         {
             /// <summary>
-            /// <para>
-            /// Constructor
-            /// </para>
+            /// Initializes a new instance of the <see cref="CimInvokeCimMethodContext"/> class.
             /// </summary>
             /// <param name="theNamespace"></param>
             /// <param name="theCollection"></param>
@@ -40,42 +38,24 @@ internal CimInvokeCimMethodContext(string theNamespace,
                 CimSessionProxy theProxy)
             {
                 this.proxy = theProxy;
-                this.methodName = theMethodName;
-                this.collection = theCollection;
+                this.MethodName = theMethodName;
+                this.ParametersCollection = theCollection;
                 this.nameSpace = theNamespace;
             }
 
             /// <summary>
             /// <para>namespace</para>
             /// </summary>
-            internal string MethodName
-            {
-                get
-                {
-                    return this.methodName;
-                }
-            }
-
-            private readonly string methodName;
+            internal string MethodName { get; }
 
             /// <summary>
             /// <para>parameters collection</para>
             /// </summary>
-            internal CimMethodParametersCollection ParametersCollection
-            {
-                get
-                {
-                    return this.collection;
-                }
-            }
-
-            private readonly CimMethodParametersCollection collection;
+            internal CimMethodParametersCollection ParametersCollection { get; }
         }
 
         /// <summary>
-        /// <para>
-        /// Constructor
-        /// </para>
+        /// Initializes a new instance of the <see cref="CimInvokeCimMethod"/> class.
         /// </summary>
         public CimInvokeCimMethod()
             : base()
@@ -92,7 +72,7 @@ public void InvokeCimMethod(InvokeCimMethodCommand cmdlet)
         {
             IEnumerable<string> computerNames = ConstValue.GetComputerNames(cmdlet.ComputerName);
             string nameSpace;
-            List<CimSessionProxy> proxys = new List<CimSessionProxy>();
+            List<CimSessionProxy> proxys = new();
             string action = string.Format(CultureInfo.CurrentUICulture, actionTemplate, cmdlet.MethodName);
 
             switch (cmdlet.ParameterSetName)
@@ -194,7 +174,7 @@ public void InvokeCimMethod(InvokeCimMethodCommand cmdlet)
                     foreach (CimSessionProxy proxy in proxys)
                     {
                         // create context object
-                        CimInvokeCimMethodContext context = new CimInvokeCimMethodContext(
+                        CimInvokeCimMethodContext context = new(
                             nameSpace,
                             cmdlet.MethodName,
                             paramsCollection,
@@ -274,7 +254,7 @@ public void InvokeCimMethodOnCimInstance(CimInstance cimInstance, XOperationCont
         /// </summary>
         /// <param name="proxy"></param>
         /// <param name="cmdlet"></param>
-        private void SetSessionProxyProperties(
+        private static void SetSessionProxyProperties(
             ref CimSessionProxy proxy,
             InvokeCimMethodCommand cmdlet)
         {
@@ -373,7 +353,7 @@ private CimMethodParametersCollection CreateParametersCollection(
             {
                 string parameterName = enumerator.Key.ToString();
 
-                CimFlags parameterFlags = CimFlags.In;
+                const CimFlags parameterFlags = CimFlags.In;
                 object parameterValue = GetBaseObject(enumerator.Value);
 
                 DebugHelper.WriteLog(@"Create parameter name= {0}, value= {1}, flags= {2}.", 4,
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimNewCimInstance.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimNewCimInstance.cs
index 14c57c87888..d7436fc0ec8 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimNewCimInstance.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimNewCimInstance.cs
@@ -20,9 +20,7 @@ namespace Microsoft.Management.Infrastructure.CimCmdlets
     internal class CimNewCimInstanceContext : XOperationContextBase
     {
         /// <summary>
-        /// <para>
-        /// Constructor
-        /// </para>
+        /// Initializes a new instance of the <see cref="CimNewCimInstanceContext"/> class.
         /// </summary>
         /// <param name="methodName"></param>
         /// <param name="propertyName"></param>
@@ -44,6 +42,7 @@ internal CimNewCimInstanceContext(
     internal sealed class CimNewCimInstance : CimAsyncOperation
     {
         /// <summary>
+        /// Initializes a new instance of the <see cref="CimNewCimInstance"/> class.
         /// <para>
         /// Constructor
         /// </para>
@@ -133,7 +132,7 @@ public void NewCimInstance(NewCimInstanceCommand cmdlet)
             }
 
             // create ciminstance on server
-            List<CimSessionProxy> proxys = new List<CimSessionProxy>();
+            List<CimSessionProxy> proxys = new();
 
             switch (cmdlet.ParameterSetName)
             {
@@ -203,7 +202,7 @@ internal void GetCimInstance(CimInstance cimInstance, XOperationContextBase cont
         /// </summary>
         /// <param name="proxy"></param>
         /// <param name="cmdlet"></param>
-        private void SetSessionProxyProperties(
+        private static void SetSessionProxyProperties(
             ref CimSessionProxy proxy,
             NewCimInstanceCommand cmdlet)
         {
@@ -267,13 +266,13 @@ private CimInstance CreateCimInstance(
             IDictionary properties,
             NewCimInstanceCommand cmdlet)
         {
-            CimInstance cimInstance = new CimInstance(className, cimNamespace);
+            CimInstance cimInstance = new(className, cimNamespace);
             if (properties == null)
             {
                 return cimInstance;
             }
 
-            List<string> keys = new List<string>();
+            List<string> keys = new();
             if (key != null)
             {
                 foreach (string keyName in key)
@@ -331,13 +330,13 @@ private CimInstance CreateCimInstance(
             IDictionary properties,
             NewCimInstanceCommand cmdlet)
         {
-            CimInstance cimInstance = new CimInstance(cimClass);
+            CimInstance cimInstance = new(cimClass);
             if (properties == null)
             {
                 return cimInstance;
             }
 
-            List<string> notfoundProperties = new List<string>();
+            List<string> notfoundProperties = new();
             foreach (string property in properties.Keys)
             {
                 if (cimInstance.CimInstanceProperties[property] == null)
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimPromptUser.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimPromptUser.cs
index 98fb4ed3fc8..48b887f00b4 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimPromptUser.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimPromptUser.cs
@@ -22,12 +22,12 @@ namespace Microsoft.Management.Infrastructure.CimCmdlets
     internal sealed class CimPromptUser : CimSyncAction
     {
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="CimPromptUser"/> class.
         /// </summary>
         public CimPromptUser(string message,
             CimPromptType prompt)
         {
-            this.message = message;
+            this.Message = message;
             this.prompt = prompt;
         }
 
@@ -54,7 +54,7 @@ public override void Execute(CmdletOperationBase cmdlet)
                     // NOTES: prepare the whatif message and caption
                     try
                     {
-                        result = cmdlet.ShouldContinue(message, "caption", ref yestoall, ref notoall);
+                        result = cmdlet.ShouldContinue(Message, "caption", ref yestoall, ref notoall);
                         if (yestoall)
                         {
                             this.responseType = CimResponseType.YesToAll;
@@ -87,7 +87,7 @@ public override void Execute(CmdletOperationBase cmdlet)
                 case CimPromptType.Normal:
                     try
                     {
-                        result = cmdlet.ShouldProcess(message);
+                        result = cmdlet.ShouldProcess(Message);
                         if (result)
                         {
                             this.responseType = CimResponseType.Yes;
@@ -121,15 +121,7 @@ public override void Execute(CmdletOperationBase cmdlet)
         /// <summary>
         /// Prompt message.
         /// </summary>
-        public string Message
-        {
-            get
-            {
-                return message;
-            }
-        }
-
-        private readonly string message;
+        public string Message { get; }
 
         /// <summary>
         /// Prompt type -Normal or Critical.
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimRegisterCimIndication.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimRegisterCimIndication.cs
index ed547444adc..e0fbb1aa095 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimRegisterCimIndication.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimRegisterCimIndication.cs
@@ -47,25 +47,17 @@ internal class CimSubscriptionResultEventArgs : CimSubscriptionEventArgs
         /// subscription result
         /// </para>
         /// </summary>
-        public CimSubscriptionResult Result
-        {
-            get
-            {
-                return result;
-            }
-        }
-
-        private readonly CimSubscriptionResult result;
+        public CimSubscriptionResult Result { get; }
 
         /// <summary>
-        /// <para>Constructor</para>
+        /// Initializes a new instance of the <see cref="CimSubscriptionResultEventArgs"/> class.
         /// </summary>
         /// <param name="theResult"></param>
         public CimSubscriptionResultEventArgs(
             CimSubscriptionResult theResult)
         {
             this.context = null;
-            this.result = theResult;
+            this.Result = theResult;
         }
     }
 
@@ -81,25 +73,17 @@ internal class CimSubscriptionExceptionEventArgs : CimSubscriptionEventArgs
         /// subscription result
         /// </para>
         /// </summary>
-        public Exception Exception
-        {
-            get
-            {
-                return exception;
-            }
-        }
-
-        private readonly Exception exception;
+        public Exception Exception { get; }
 
         /// <summary>
-        /// <para>Constructor</para>
+        /// Initializes a new instance of the <see cref="CimSubscriptionExceptionEventArgs"/> class.
         /// </summary>
         /// <param name="theResult"></param>
         public CimSubscriptionExceptionEventArgs(
             Exception theException)
         {
             this.context = null;
-            this.exception = theException;
+            this.Exception = theException;
         }
     }
 
@@ -118,9 +102,7 @@ internal sealed class CimRegisterCimIndication : CimAsyncOperation
         public event EventHandler<CimSubscriptionEventArgs> OnNewSubscriptionResult;
 
         /// <summary>
-        /// <para>
-        /// Constructor
-        /// </para>
+        /// Initializes a new instance of the <see cref="CimRegisterCimIndication"/> class.
         /// </summary>
         public CimRegisterCimIndication()
             : base()
@@ -219,7 +201,7 @@ private void CimIndicationHandler(object cimSession, CmdletActionEventArgs actio
             CimWriteError cimWriteError = actionArgs.Action as CimWriteError;
             if (cimWriteError != null)
             {
-                this.exception = cimWriteError.Exception;
+                this.Exception = cimWriteError.Exception;
                 if (!this.ackedEvent.IsSet)
                 {
                     // an exception happened
@@ -233,10 +215,10 @@ private void CimIndicationHandler(object cimSession, CmdletActionEventArgs actio
                 {
                     DebugHelper.WriteLog("Raise an exception event", 2);
 
-                    temp(this, new CimSubscriptionExceptionEventArgs(this.exception));
+                    temp(this, new CimSubscriptionExceptionEventArgs(this.Exception));
                 }
 
-                DebugHelper.WriteLog("Got an exception: {0}", 2, exception);
+                DebugHelper.WriteLog("Got an exception: {0}", 2, Exception);
             }
 
             CimWriteResultObject cimWriteResultObject = actionArgs.Action as CimWriteResultObject;
@@ -276,7 +258,7 @@ private void WaitForAckMessage()
         {
             DebugHelper.WriteLogEx();
             this.ackedEvent.Wait();
-            if (this.exception != null)
+            if (this.Exception != null)
             {
                 DebugHelper.WriteLogEx("error happened", 0);
                 if (this.Cmdlet != null)
@@ -285,14 +267,14 @@ private void WaitForAckMessage()
 
                     // throw terminating error
                     ErrorRecord errorRecord = ErrorToErrorRecord.ErrorRecordFromAnyException(
-                        new InvocationContext(this.TargetComputerName, null), this.exception, null);
+                        new InvocationContext(this.TargetComputerName, null), this.Exception, null);
                     this.Cmdlet.ThrowTerminatingError(errorRecord);
                 }
                 else
                 {
                     DebugHelper.WriteLogEx("Throw exception", 1);
                     // throw exception out
-                    throw this.exception;
+                    throw this.Exception;
                 }
             }
 
@@ -363,15 +345,7 @@ private CimSessionProxy CreateSessionProxy(
         /// <summary>
         /// Exception occurred while start the subscription.
         /// </summary>
-        internal Exception Exception
-        {
-            get
-            {
-                return exception;
-            }
-        }
-
-        private Exception exception;
+        internal Exception Exception { get; private set; }
 
         #endregion
 
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimRemoveCimInstance.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimRemoveCimInstance.cs
index 9293874717c..a6182166170 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimRemoveCimInstance.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimRemoveCimInstance.cs
@@ -17,9 +17,7 @@ namespace Microsoft.Management.Infrastructure.CimCmdlets
     internal class CimRemoveCimInstanceContext : XOperationContextBase
     {
         /// <summary>
-        /// <para>
-        /// Constructor
-        /// </para>
+        /// Initializes a new instance of the <see cref="CimRemoveCimInstanceContext"/> class.
         /// </summary>
         /// <param name="theNamespace"></param>
         /// <param name="theProxy"></param>
@@ -39,9 +37,7 @@ internal CimRemoveCimInstanceContext(string theNamespace,
     internal sealed class CimRemoveCimInstance : CimGetInstance
     {
         /// <summary>
-        /// <para>
-        /// Constructor
-        /// </para>
+        /// Initializes a new instance of the <see cref="CimRemoveCimInstance"/> class.
         /// </summary>
         public CimRemoveCimInstance()
             : base()
@@ -60,7 +56,7 @@ public void RemoveCimInstance(RemoveCimInstanceCommand cmdlet)
 
             IEnumerable<string> computerNames = ConstValue.GetComputerNames(
                 GetComputerName(cmdlet));
-            List<CimSessionProxy> proxys = new List<CimSessionProxy>();
+            List<CimSessionProxy> proxys = new();
             switch (cmdlet.ParameterSetName)
             {
                 case CimBaseCommand.CimInstanceComputerSet:
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimResultObserver.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimResultObserver.cs
index 35c6e6cf883..5e548a405ac 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimResultObserver.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimResultObserver.cs
@@ -32,26 +32,18 @@ public enum AsyncResultType
     internal class CimResultContext
     {
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="CimResultContext"/> class.
         /// </summary>
         /// <param name="ErrorSource"></param>
         internal CimResultContext(object ErrorSource)
         {
-            this.errorSource = ErrorSource;
+            this.ErrorSource = ErrorSource;
         }
 
         /// <summary>
         /// ErrorSource property.
         /// </summary>
-        internal object ErrorSource
-        {
-            get
-            {
-                return this.errorSource;
-            }
-        }
-
-        private readonly object errorSource;
+        internal object ErrorSource { get; }
     }
     #endregion
 
@@ -64,12 +56,12 @@ internal object ErrorSource
     internal abstract class AsyncResultEventArgsBase : EventArgs
     {
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="AsyncResultEventArgsBase"/> class.
         /// </summary>
         /// <param name="session"></param>
         /// <param name="observable"></param>
         /// <param name="resultType"></param>
-        public AsyncResultEventArgsBase(
+        protected AsyncResultEventArgsBase(
             CimSession session,
             IObservable<object> observable,
             AsyncResultType resultType)
@@ -80,13 +72,13 @@ public AsyncResultEventArgsBase(
         }
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="AsyncResultEventArgsBase"/> class.
         /// </summary>
         /// <param name="session"></param>
         /// <param name="observable"></param>
         /// <param name="resultType"></param>
         /// <param name="context"></param>
-        public AsyncResultEventArgsBase(
+        protected AsyncResultEventArgsBase(
             CimSession session,
             IObservable<object> observable,
             AsyncResultType resultType,
@@ -117,9 +109,7 @@ public AsyncResultEventArgsBase(
     internal class AsyncResultCompleteEventArgs : AsyncResultEventArgsBase
     {
         /// <summary>
-        /// <para>
-        /// Constructor
-        /// </para>
+        /// Initializes a new instance of the <see cref="AsyncResultCompleteEventArgs"/> class.
         /// </summary>
         /// <param name="session"><see cref="CimSession"/> object.</param>
         /// <param name="cancellationDisposable"></param>
@@ -139,7 +129,7 @@ public AsyncResultCompleteEventArgs(
     internal class AsyncResultObjectEventArgs : AsyncResultEventArgsBase
     {
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="AsyncResultObjectEventArgs"/> class.
         /// </summary>
         /// <param name="session"></param>
         /// <param name="observable"></param>
@@ -164,7 +154,7 @@ public AsyncResultObjectEventArgs(
     internal class AsyncResultErrorEventArgs : AsyncResultEventArgsBase
     {
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="AsyncResultErrorEventArgs"/> class.
         /// </summary>
         /// <param name="session"></param>
         /// <param name="observable"></param>
@@ -179,7 +169,7 @@ public AsyncResultErrorEventArgs(
         }
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="AsyncResultErrorEventArgs"/> class.
         /// </summary>
         /// <param name="session"></param>
         /// <param name="observable"></param>
@@ -222,18 +212,18 @@ internal class CimResultObserver<T> : IObserver<T>
         public event EventHandler<AsyncResultEventArgsBase> OnNewResult;
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="CimResultObserver{T}"/> class.
         /// </summary>
         /// <param name="session"><see cref="CimSession"/> object that issued the operation.</param>
         /// <param name="observable">Operation that can be observed.</param>
         public CimResultObserver(CimSession session, IObservable<object> observable)
         {
-            this.session = session;
+            this.CurrentSession = session;
             this.observable = observable;
         }
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="CimResultObserver{T}"/> class.
         /// </summary>
         /// <param name="session"><see cref="CimSession"/> object that issued the operation.</param>
         /// <param name="observable">Operation that can be observed.</param>
@@ -241,7 +231,7 @@ public CimResultObserver(CimSession session,
             IObservable<object> observable,
             CimResultContext cimResultContext)
         {
-            this.session = session;
+            this.CurrentSession = session;
             this.observable = observable;
             this.context = cimResultContext;
         }
@@ -259,8 +249,8 @@ public virtual void OnCompleted()
             // OnNext, OnError
             try
             {
-                AsyncResultCompleteEventArgs completeArgs = new AsyncResultCompleteEventArgs(
-                    this.session, this.observable);
+                AsyncResultCompleteEventArgs completeArgs = new(
+                    this.CurrentSession, this.observable);
                 this.OnNewResult(this, completeArgs);
             }
             catch (Exception ex)
@@ -280,8 +270,8 @@ public virtual void OnError(Exception error)
         {
             try
             {
-                AsyncResultErrorEventArgs errorArgs = new AsyncResultErrorEventArgs(
-                    this.session, this.observable, error, this.context);
+                AsyncResultErrorEventArgs errorArgs = new(
+                    this.CurrentSession, this.observable, error, this.context);
                 this.OnNewResult(this, errorArgs);
             }
             catch (Exception ex)
@@ -300,8 +290,8 @@ protected void OnNextCore(object value)
             DebugHelper.WriteLogEx("value = {0}.", 1, value);
             try
             {
-                AsyncResultObjectEventArgs resultArgs = new AsyncResultObjectEventArgs(
-                    this.session, this.observable, value);
+                AsyncResultObjectEventArgs resultArgs = new(
+                    this.CurrentSession, this.observable, value);
                 this.OnNewResult(this, resultArgs);
             }
             catch (Exception ex)
@@ -334,15 +324,7 @@ public virtual void OnNext(T value)
         /// <summary>
         /// Session object of the operation.
         /// </summary>
-        protected CimSession CurrentSession
-        {
-            get
-            {
-                return session;
-            }
-        }
-
-        private readonly CimSession session;
+        protected CimSession CurrentSession { get; }
 
         /// <summary>
         /// Async operation that can be observed.
@@ -362,7 +344,7 @@ protected CimSession CurrentSession
     internal class CimSubscriptionResultObserver : CimResultObserver<CimSubscriptionResult>
     {
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="CimSubscriptionResultObserver"/> class.
         /// </summary>
         /// <param name="session"></param>
         /// <param name="observable"></param>
@@ -372,7 +354,7 @@ public CimSubscriptionResultObserver(CimSession session, IObservable<object> obs
         }
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="CimSubscriptionResultObserver"/> class.
         /// </summary>
         /// <param name="session"></param>
         /// <param name="observable"></param>
@@ -401,7 +383,7 @@ public override void OnNext(CimSubscriptionResult value)
     internal class CimMethodResultObserver : CimResultObserver<CimMethodResultBase>
     {
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="CimMethodResultObserver"/> class.
         /// </summary>
         /// <param name="session"></param>
         /// <param name="observable"></param>
@@ -411,7 +393,7 @@ public CimMethodResultObserver(CimSession session, IObservable<object> observabl
         }
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="CimMethodResultObserver"/> class.
         /// </summary>
         /// <param name="session"></param>
         /// <param name="observable"></param>
@@ -494,7 +476,7 @@ internal string ClassName
     internal class IgnoreResultObserver : CimResultObserver<CimInstance>
     {
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="IgnoreResultObserver"/> class.
         /// </summary>
         /// <param name="session"></param>
         /// <param name="observable"></param>
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionOperations.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionOperations.cs
index f91fbccbb97..f03f76c09dd 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionOperations.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionOperations.cs
@@ -24,67 +24,27 @@ internal class CimSessionWrapper
         /// <summary>
         /// Id of the cimsession.
         /// </summary>
-        public uint SessionId
-        {
-            get
-            {
-                return this.sessionId;
-            }
-        }
-
-        private readonly uint sessionId;
+        public uint SessionId { get; }
 
         /// <summary>
         /// InstanceId of the cimsession.
         /// </summary>
-        public Guid InstanceId
-        {
-            get
-            {
-                return this.instanceId;
-            }
-        }
-
-        private readonly Guid instanceId;
+        public Guid InstanceId { get; }
 
         /// <summary>
         /// Name of the cimsession.
         /// </summary>
-        public string Name
-        {
-            get
-            {
-                return this.name;
-            }
-        }
-
-        private readonly string name;
+        public string Name { get; }
 
         /// <summary>
         /// Computer name of the cimsession.
         /// </summary>
-        public string ComputerName
-        {
-            get
-            {
-                return this.computerName;
-            }
-        }
-
-        private readonly string computerName;
+        public string ComputerName { get; }
 
         /// <summary>
         /// Wrapped cimsession object.
         /// </summary>
-        public CimSession CimSession
-        {
-            get
-            {
-                return this.cimSession;
-            }
-        }
-
-        private readonly CimSession cimSession;
+        public CimSession CimSession { get; }
 
         /// <summary>
         /// Computer name of the cimsession.
@@ -127,11 +87,11 @@ internal CimSessionWrapper(
             CimSession theCimSession,
             ProtocolType theProtocol)
         {
-            this.sessionId = theSessionId;
-            this.instanceId = theInstanceId;
-            this.name = theName;
-            this.computerName = theComputerName;
-            this.cimSession = theCimSession;
+            this.SessionId = theSessionId;
+            this.InstanceId = theInstanceId;
+            this.Name = theName;
+            this.ComputerName = theComputerName;
+            this.CimSession = theCimSession;
             this.psObject = null;
             this.protocol = theProtocol;
         }
@@ -140,18 +100,18 @@ internal PSObject GetPSObject()
         {
             if (psObject == null)
             {
-                psObject = new PSObject(this.cimSession);
-                psObject.Properties.Add(new PSNoteProperty(CimSessionState.idPropName, this.sessionId));
-                psObject.Properties.Add(new PSNoteProperty(CimSessionState.namePropName, this.name));
-                psObject.Properties.Add(new PSNoteProperty(CimSessionState.instanceidPropName, this.instanceId));
+                psObject = new PSObject(this.CimSession);
+                psObject.Properties.Add(new PSNoteProperty(CimSessionState.idPropName, this.SessionId));
+                psObject.Properties.Add(new PSNoteProperty(CimSessionState.namePropName, this.Name));
+                psObject.Properties.Add(new PSNoteProperty(CimSessionState.instanceidPropName, this.InstanceId));
                 psObject.Properties.Add(new PSNoteProperty(CimSessionState.computernamePropName, this.ComputerName));
                 psObject.Properties.Add(new PSNoteProperty(CimSessionState.protocolPropName, this.Protocol));
             }
             else
             {
                 psObject.Properties[CimSessionState.idPropName].Value = this.SessionId;
-                psObject.Properties[CimSessionState.namePropName].Value = this.name;
-                psObject.Properties[CimSessionState.instanceidPropName].Value = this.instanceId;
+                psObject.Properties[CimSessionState.namePropName].Value = this.Name;
+                psObject.Properties[CimSessionState.instanceidPropName].Value = this.InstanceId;
                 psObject.Properties[CimSessionState.computernamePropName].Value = this.ComputerName;
                 psObject.Properties[CimSessionState.protocolPropName].Value = this.Protocol;
             }
@@ -264,9 +224,7 @@ internal class CimSessionState : IDisposable
         #endregion
 
         /// <summary>
-        /// <para>
-        /// The constructor.
-        /// </para>
+        /// Initializes a new instance of the <see cref="CimSessionState"/> class.
         /// </summary>
         internal CimSessionState()
         {
@@ -399,7 +357,7 @@ internal PSObject AddObjectToCache(
             string computerName,
             ProtocolType protocol)
         {
-            CimSessionWrapper wrapper = new CimSessionWrapper(
+            CimSessionWrapper wrapper = new(
                 sessionId, instanceId, name, computerName, session, protocol);
 
             HashSet<CimSessionWrapper> objects;
@@ -546,7 +504,7 @@ private void RemoveSessionInternal(CimSession session, CimSessionWrapper wrapper
         /// <param name="errRecords"></param>
         /// <param name="propertyName"></param>
         /// <param name="propertyValue"></param>
-        private void AddErrorRecord(
+        private static void AddErrorRecord(
             ref List<ErrorRecord> errRecords,
             string propertyName,
             object propertyValue)
@@ -568,9 +526,9 @@ internal IEnumerable<PSObject> QuerySession(
             IEnumerable<uint> ids,
             out IEnumerable<ErrorRecord> errorRecords)
         {
-            HashSet<PSObject> sessions = new HashSet<PSObject>();
-            HashSet<uint> sessionIds = new HashSet<uint>();
-            List<ErrorRecord> errRecords = new List<ErrorRecord>();
+            HashSet<PSObject> sessions = new();
+            HashSet<uint> sessionIds = new();
+            List<ErrorRecord> errRecords = new();
             errorRecords = errRecords;
             // NOTES: use template function to implement this will save duplicate code
             foreach (uint id in ids)
@@ -601,9 +559,9 @@ internal IEnumerable<PSObject> QuerySession(
             IEnumerable<Guid> instanceIds,
             out IEnumerable<ErrorRecord> errorRecords)
         {
-            HashSet<PSObject> sessions = new HashSet<PSObject>();
-            HashSet<uint> sessionIds = new HashSet<uint>();
-            List<ErrorRecord> errRecords = new List<ErrorRecord>();
+            HashSet<PSObject> sessions = new();
+            HashSet<uint> sessionIds = new();
+            List<ErrorRecord> errRecords = new();
             errorRecords = errRecords;
             foreach (Guid instanceid in instanceIds)
             {
@@ -633,14 +591,14 @@ internal IEnumerable<PSObject> QuerySession(
         internal IEnumerable<PSObject> QuerySession(IEnumerable<string> nameArray,
             out IEnumerable<ErrorRecord> errorRecords)
         {
-            HashSet<PSObject> sessions = new HashSet<PSObject>();
-            HashSet<uint> sessionIds = new HashSet<uint>();
-            List<ErrorRecord> errRecords = new List<ErrorRecord>();
+            HashSet<PSObject> sessions = new();
+            HashSet<uint> sessionIds = new();
+            List<ErrorRecord> errRecords = new();
             errorRecords = errRecords;
             foreach (string name in nameArray)
             {
                 bool foundSession = false;
-                WildcardPattern pattern = new WildcardPattern(name, WildcardOptions.IgnoreCase);
+                WildcardPattern pattern = new(name, WildcardOptions.IgnoreCase);
                 foreach (KeyValuePair<string, HashSet<CimSessionWrapper>> kvp in this.curCimSessionsByName)
                 {
                     if (pattern.IsMatch(kvp.Key))
@@ -676,9 +634,9 @@ internal IEnumerable<PSObject> QuerySessionByComputerName(
             IEnumerable<string> computernameArray,
             out IEnumerable<ErrorRecord> errorRecords)
         {
-            HashSet<PSObject> sessions = new HashSet<PSObject>();
-            HashSet<uint> sessionIds = new HashSet<uint>();
-            List<ErrorRecord> errRecords = new List<ErrorRecord>();
+            HashSet<PSObject> sessions = new();
+            HashSet<uint> sessionIds = new();
+            List<ErrorRecord> errRecords = new();
             errorRecords = errRecords;
             foreach (string computername in computernameArray)
             {
@@ -714,9 +672,9 @@ internal IEnumerable<PSObject> QuerySessionByComputerName(
         internal IEnumerable<PSObject> QuerySession(IEnumerable<CimSession> cimsessions,
             out IEnumerable<ErrorRecord> errorRecords)
         {
-            HashSet<PSObject> sessions = new HashSet<PSObject>();
-            HashSet<uint> sessionIds = new HashSet<uint>();
-            List<ErrorRecord> errRecords = new List<ErrorRecord>();
+            HashSet<PSObject> sessions = new();
+            HashSet<uint> sessionIds = new();
+            List<ErrorRecord> errRecords = new();
             errorRecords = errRecords;
             foreach (CimSession cimsession in cimsessions)
             {
@@ -785,7 +743,7 @@ internal class CimSessionBase
         #region constructor
 
         /// <summary>
-        /// The constructor.
+        /// Initializes a new instance of the <see cref="CimSessionBase"/> class.
         /// </summary>
         public CimSessionBase()
         {
@@ -814,7 +772,7 @@ public CimSessionBase()
         /// </para>
         /// </summary>
         internal static readonly ConcurrentDictionary<Guid, CimSessionState> cimSessions
-            = new ConcurrentDictionary<Guid, CimSessionState>();
+            = new();
 
         /// <summary>
         /// <para>
@@ -908,9 +866,7 @@ internal class CimNewSession : CimSessionBase, IDisposable
         internal class CimTestCimSessionContext : XOperationContextBase
         {
             /// <summary>
-            /// <para>
-            /// The constructor.
-            /// </para>
+            /// Initializes a new instance of the <see cref="CimTestCimSessionContext"/> class.
             /// </summary>
             /// <param name="theProxy"></param>
             /// <param name="wrapper"></param>
@@ -919,33 +875,23 @@ internal CimTestCimSessionContext(
                 CimSessionWrapper wrapper)
             {
                 this.proxy = theProxy;
-                this.cimSessionWrapper = wrapper;
+                this.CimSessionWrapper = wrapper;
                 this.nameSpace = null;
             }
 
             /// <summary>
             /// <para>Namespace</para>
             /// </summary>
-            internal CimSessionWrapper CimSessionWrapper
-            {
-                get
-                {
-                    return this.cimSessionWrapper;
-                }
-            }
-
-            private readonly CimSessionWrapper cimSessionWrapper;
+            internal CimSessionWrapper CimSessionWrapper { get; }
         }
 
         /// <summary>
-        /// <para>
-        /// The constructor.
-        /// </para>
+        /// Initializes a new instance of the <see cref="CimNewSession"/> class.
         /// </summary>
         internal CimNewSession() : base()
         {
             this.cimTestSession = new CimTestSession();
-            this._disposed = false;
+            this.Disposed = false;
         }
 
         /// <summary>
@@ -974,8 +920,8 @@ internal void NewCimSession(NewCimSessionCommand cmdlet,
 
                 proxy = new CimSessionProxyTestConnection(computerName, sessionOptions);
                 string computerNameValue = (computerName == ConstValue.NullComputerName) ? ConstValue.LocalhostComputerName : computerName;
-                CimSessionWrapper wrapper = new CimSessionWrapper(0, Guid.Empty, cmdlet.Name, computerNameValue, proxy.CimSession, proxy.Protocol);
-                CimTestCimSessionContext context = new CimTestCimSessionContext(proxy, wrapper);
+                CimSessionWrapper wrapper = new(0, Guid.Empty, cmdlet.Name, computerNameValue, proxy.CimSession, proxy.Protocol);
+                CimTestCimSessionContext context = new(proxy, wrapper);
                 proxy.ContextObject = context;
                 // Skip test the connection if user intend to
                 if (cmdlet.SkipTestConnection.IsPresent)
@@ -1062,15 +1008,7 @@ public void ProcessRemainActions(CmdletOperationBase cmdletOperation)
         /// Indicates whether this object was disposed or not.
         /// </para>
         /// </summary>
-        protected bool Disposed
-        {
-            get
-            {
-                return _disposed;
-            }
-        }
-
-        private bool _disposed;
+        protected bool Disposed { get; private set; }
 
         /// <summary>
         /// <para>
@@ -1104,13 +1042,13 @@ public void Dispose()
         /// <param name="disposing">Whether it is directly called.</param>
         protected virtual void Dispose(bool disposing)
         {
-            if (!this._disposed)
+            if (!this.Disposed)
             {
                 if (disposing)
                 {
                     // free managed resources
                     this.cimTestSession.Dispose();
-                    this._disposed = true;
+                    this.Disposed = true;
                 }
                 // free native resources if there are any
             }
@@ -1130,7 +1068,7 @@ protected virtual void Dispose(bool disposing)
     internal class CimGetSession : CimSessionBase
     {
         /// <summary>
-        /// The constructor.
+        /// Initializes a new instance of the <see cref="CimGetSession"/> class.
         /// </summary>
         public CimGetSession() : base()
         {
@@ -1212,7 +1150,7 @@ internal class CimRemoveSession : CimSessionBase
         internal static readonly string RemoveCimSessionActionName = "Remove CimSession";
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="CimRemoveSession"/> class.
         /// </summary>
         public CimRemoveSession() : base()
         {
@@ -1282,7 +1220,7 @@ public void RemoveCimSession(RemoveCimSessionCommand cmdlet)
     internal class CimTestSession : CimAsyncOperation
     {
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="CimTestSession"/> class.
         /// </summary>
         internal CimTestSession()
             : base()
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionProxy.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionProxy.cs
index fed951c50da..40a1f390b0d 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionProxy.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSessionProxy.cs
@@ -65,7 +65,7 @@ internal CimSessionProxy Proxy
     internal class InvocationContext
     {
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="InvocationContext"/> class.
         /// </summary>
         /// <param name="proxy"></param>
         internal InvocationContext(CimSessionProxy proxy)
@@ -78,7 +78,7 @@ internal InvocationContext(CimSessionProxy proxy)
         }
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="InvocationContext"/> class.
         /// </summary>
         /// <param name="proxy"></param>
         internal InvocationContext(string computerName, CimInstance targetCimInstance)
@@ -91,20 +91,20 @@ internal InvocationContext(string computerName, CimInstance targetCimInstance)
         /// <para>
         /// ComputerName of the session
         /// </para>
+        /// </summary>
         /// <remarks>
         /// return value could be null
         /// </remarks>
-        /// </summary>
         internal virtual string ComputerName { get; }
 
         /// <summary>
         /// <para>
         /// CimInstance on which the current operation against.
         /// </para>
+        /// </summary>
         /// <remarks>
         /// return value could be null
         /// </remarks>
-        /// </summary>
         internal virtual CimInstance TargetCimInstance { get; }
     }
     #endregion
@@ -135,7 +135,7 @@ internal interface IObjectPreProcess
     internal sealed class CmdletActionEventArgs : EventArgs
     {
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="CmdletActionEventArgs"/> class.
         /// </summary>
         /// <param name="action">CimBaseAction object bound to the event.</param>
         public CmdletActionEventArgs(CimBaseAction action)
@@ -152,7 +152,7 @@ public CmdletActionEventArgs(CimBaseAction action)
     internal sealed class OperationEventArgs : EventArgs
     {
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="OperationEventArgs"/> class.
         /// </summary>
         /// <param name="operationCancellation">Object used to cancel the operation.</param>
         /// <param name="operation">Async observable operation.</param>
@@ -192,7 +192,7 @@ internal class CimSessionProxy : IDisposable
         /// <summary>
         /// Temporary CimSession cache lock.
         /// </summary>
-        private static readonly object temporarySessionCacheLock = new object();
+        private static readonly object temporarySessionCacheLock = new();
 
         /// <summary>
         /// <para>temporary CimSession cache</para>
@@ -210,7 +210,7 @@ internal class CimSessionProxy : IDisposable
         /// then call Dispose on it.
         /// </para>
         /// </summary>
-        private static readonly Dictionary<CimSession, uint> temporarySessionCache = new Dictionary<CimSession, uint>();
+        private static readonly Dictionary<CimSession, uint> temporarySessionCache = new();
 
         /// <summary>
         /// <para>
@@ -317,23 +317,29 @@ internal static void RemoveCimSessionFromTemporaryCache(CimSession session)
         #region constructors
 
         /// <summary>
-        /// Then create wrapper object by given CimSessionProxy object.
+        /// Initializes a new instance of the <see cref="CimSessionProxy"/> class.
         /// </summary>
+        /// <remarks>
+        /// Then create wrapper object by given CimSessionProxy object.
+        /// </remarks>
         /// <param name="computerName"></param>
         public CimSessionProxy(CimSessionProxy proxy)
         {
             DebugHelper.WriteLogEx("protocol = {0}", 1, proxy.Protocol);
 
             CreateSetSession(null, proxy.CimSession, null, proxy.OperationOptions, proxy.IsTemporaryCimSession);
-            this.protocol = proxy.Protocol;
+            this.Protocol = proxy.Protocol;
             this.OperationTimeout = proxy.OperationTimeout;
             this.isDefaultSession = proxy.isDefaultSession;
         }
 
         /// <summary>
+        /// Initializes a new instance of the <see cref="CimSessionProxy"/> class.
+        /// </summary>
+        /// <remarks>
         /// Create <see cref="CimSession"/> by given computer name.
         /// Then create wrapper object.
-        /// </summary>
+        /// </remarks>
         /// <param name="computerName"></param>
         public CimSessionProxy(string computerName)
         {
@@ -342,10 +348,13 @@ public CimSessionProxy(string computerName)
         }
 
         /// <summary>
+        /// Initializes a new instance of the <see cref="CimSessionProxy"/> class.
+        /// </summary>
+        /// <remarks>
         /// Create <see cref="CimSession"/> by given computer name
         /// and session options.
         /// Then create wrapper object.
-        /// </summary>
+        /// </remarks>
         /// <param name="computerName"></param>
         /// <param name="sessionOptions"></param>
         public CimSessionProxy(string computerName, CimSessionOptions sessionOptions)
@@ -355,9 +364,12 @@ public CimSessionProxy(string computerName, CimSessionOptions sessionOptions)
         }
 
         /// <summary>
+        /// Initializes a new instance of the <see cref="CimSessionProxy"/> class.
+        /// </summary>
+        /// <remarks>
         /// Create <see cref="CimSession"/> by given computer name
         /// and cimInstance. Then create wrapper object.
-        /// </summary>
+        /// </remarks>
         /// <param name="computerName"></param>
         /// <param name="cimInstance"></param>
         public CimSessionProxy(string computerName, CimInstance cimInstance)
@@ -397,9 +409,12 @@ public CimSessionProxy(string computerName, CimInstance cimInstance)
         }
 
         /// <summary>
+        /// Initializes a new instance of the <see cref="CimSessionProxy"/> class.
+        /// </summary>
+        /// <remarks>
         /// Create <see cref="CimSession"/> by given computer name,
         /// session options.
-        /// </summary>
+        /// </remarks>
         /// <param name="computerName"></param>
         /// <param name="sessionOptions"></param>
         /// <param name="operOptions">Used when create async operation.</param>
@@ -410,9 +425,12 @@ public CimSessionProxy(string computerName, CimSessionOptions sessionOptions, Ci
         }
 
         /// <summary>
+        /// Initializes a new instance of the <see cref="CimSessionProxy"/> class.
+        /// </summary>
+        /// <remarks>
         /// Create <see cref="CimSession"/> by given computer name.
         /// Then create wrapper object.
-        /// </summary>
+        /// </remarks>
         /// <param name="computerName"></param>
         /// <param name="operOptions">Used when create async operation.</param>
         public CimSessionProxy(string computerName, CimOperationOptions operOptions)
@@ -422,8 +440,11 @@ public CimSessionProxy(string computerName, CimOperationOptions operOptions)
         }
 
         /// <summary>
-        /// Create wrapper object by given session object.
+        /// Initializes a new instance of the <see cref="CimSessionProxy"/> class.
         /// </summary>
+        /// <remarks>
+        /// Create wrapper object by given session object.
+        /// </remarks>
         /// <param name="session"></param>
         public CimSessionProxy(CimSession session)
         {
@@ -431,8 +452,11 @@ public CimSessionProxy(CimSession session)
         }
 
         /// <summary>
-        /// Create wrapper object by given session object.
+        /// Initializes a new instance of the <see cref="CimSessionProxy"/> class.
         /// </summary>
+        /// <remarks>
+        /// Create wrapper object by given session object.
+        /// </remarks>
         /// <param name="session"></param>
         /// <param name="operOptions">Used when create async operation.</param>
         public CimSessionProxy(CimSession session, CimOperationOptions operOptions)
@@ -463,19 +487,19 @@ private void CreateSetSession(
             }
 
             InitOption(operOptions);
-            this.protocol = ProtocolType.Wsman;
-            this.isTemporaryCimSession = temporaryCimSession;
+            this.Protocol = ProtocolType.Wsman;
+            this.IsTemporaryCimSession = temporaryCimSession;
 
             if (cimSession != null)
             {
-                this.session = cimSession;
+                this.CimSession = cimSession;
                 CimSessionState state = CimSessionBase.GetCimSessionState();
                 if (state != null)
                 {
                     CimSessionWrapper wrapper = state.QuerySession(cimSession);
                     if (wrapper != null)
                     {
-                        this.protocol = wrapper.GetProtocolType();
+                        this.Protocol = wrapper.GetProtocolType();
                     }
                 }
             }
@@ -486,29 +510,29 @@ private void CreateSetSession(
                     if (sessionOptions is DComSessionOptions)
                     {
                         string defaultComputerName = ConstValue.IsDefaultComputerName(computerName) ? ConstValue.NullComputerName : computerName;
-                        this.session = CimSession.Create(defaultComputerName, sessionOptions);
-                        this.protocol = ProtocolType.Dcom;
+                        this.CimSession = CimSession.Create(defaultComputerName, sessionOptions);
+                        this.Protocol = ProtocolType.Dcom;
                     }
                     else
                     {
-                        this.session = CimSession.Create(computerName, sessionOptions);
+                        this.CimSession = CimSession.Create(computerName, sessionOptions);
                     }
                 }
                 else
                 {
-                    this.session = CreateCimSessionByComputerName(computerName);
+                    this.CimSession = CreateCimSessionByComputerName(computerName);
                 }
 
-                this.isTemporaryCimSession = true;
+                this.IsTemporaryCimSession = true;
             }
 
-            if (this.isTemporaryCimSession)
+            if (this.IsTemporaryCimSession)
             {
-                AddCimSessionToTemporaryCache(this.session);
+                AddCimSessionToTemporaryCache(this.CimSession);
             }
 
             this.invocationContextObject = new InvocationContext(this);
-            DebugHelper.WriteLog("Protocol {0}, Is temporary session ? {1}", 1, this.protocol, this.isTemporaryCimSession);
+            DebugHelper.WriteLog("Protocol {0}, Is temporary session ? {1}", 1, this.Protocol, this.IsTemporaryCimSession);
         }
 
         #endregion
@@ -522,14 +546,14 @@ public UInt32 OperationTimeout
         {
             get
             {
-                return (UInt32)this.options.Timeout.TotalSeconds;
+                return (UInt32)this.OperationOptions.Timeout.TotalSeconds;
             }
 
             set
             {
                 DebugHelper.WriteLogEx("OperationTimeout {0},", 0, value);
 
-                this.options.Timeout = TimeSpan.FromSeconds((double)value);
+                this.OperationOptions.Timeout = TimeSpan.FromSeconds((double)value);
             }
         }
 
@@ -540,14 +564,14 @@ public Uri ResourceUri
         {
             get
             {
-                return this.options.ResourceUri;
+                return this.OperationOptions.ResourceUri;
             }
 
             set
             {
                 DebugHelper.WriteLogEx("ResourceUri {0},", 0, value);
 
-                this.options.ResourceUri = value;
+                this.OperationOptions.ResourceUri = value;
             }
         }
 
@@ -559,13 +583,13 @@ public bool EnableMethodResultStreaming
         {
             get
             {
-                return this.options.EnableMethodResultStreaming;
+                return this.OperationOptions.EnableMethodResultStreaming;
             }
 
             set
             {
                 DebugHelper.WriteLogEx("EnableMethodResultStreaming {0}", 0, value);
-                this.options.EnableMethodResultStreaming = value;
+                this.OperationOptions.EnableMethodResultStreaming = value;
             }
         }
 
@@ -580,7 +604,7 @@ public bool EnablePromptUser
                 DebugHelper.WriteLogEx("EnablePromptUser {0}", 0, value);
                 if (value)
                 {
-                    this.options.PromptUser = this.PromptUser;
+                    this.OperationOptions.PromptUser = this.PromptUser;
                 }
             }
         }
@@ -594,15 +618,15 @@ private void EnablePSSemantics()
 
             // this.options.PromptUserForceFlag...
             // this.options.WriteErrorMode
-            this.options.WriteErrorMode = CimCallbackMode.Inquire;
+            this.OperationOptions.WriteErrorMode = CimCallbackMode.Inquire;
 
             // !!!NOTES: Does not subscribe to PromptUser for CimCmdlets now
             // since cmdlet does not provider an approach
             // to let user select how to handle prompt message
             // this can be enabled later if needed.
-            this.options.WriteError = this.WriteError;
-            this.options.WriteMessage = this.WriteMessage;
-            this.options.WriteProgress = this.WriteProgress;
+            this.OperationOptions.WriteError = this.WriteError;
+            this.OperationOptions.WriteMessage = this.WriteMessage;
+            this.OperationOptions.WriteProgress = this.WriteProgress;
         }
 
         /// <summary>
@@ -610,7 +634,7 @@ private void EnablePSSemantics()
         /// </summary>
         public SwitchParameter KeyOnly
         {
-            set { this.options.KeysOnly = value.IsPresent; }
+            set { this.OperationOptions.KeysOnly = value.IsPresent; }
         }
 
         /// <summary>
@@ -622,11 +646,11 @@ public SwitchParameter Shallow
             {
                 if (value.IsPresent)
                 {
-                    this.options.Flags = CimOperationFlags.PolymorphismShallow;
+                    this.OperationOptions.Flags = CimOperationFlags.PolymorphismShallow;
                 }
                 else
                 {
-                    this.options.Flags = CimOperationFlags.None;
+                    this.OperationOptions.Flags = CimOperationFlags.None;
                 }
             }
         }
@@ -640,11 +664,11 @@ private void InitOption(CimOperationOptions operOptions)
 
             if (operOptions != null)
             {
-                this.options = new CimOperationOptions(operOptions);
+                this.OperationOptions = new CimOperationOptions(operOptions);
             }
-            else if (this.options == null)
+            else if (this.OperationOptions == null)
             {
-                this.options = new CimOperationOptions();
+                this.OperationOptions = new CimOperationOptions();
             }
 
             this.EnableMethodResultStreaming = true;
@@ -665,10 +689,10 @@ public CimSession Detach()
             DebugHelper.WriteLogEx();
 
             // Remove the CimSession from cache but don't dispose it
-            RemoveCimSessionFromTemporaryCache(this.session, false);
-            CimSession sessionToReturn = this.session;
-            this.session = null;
-            this.isTemporaryCimSession = false;
+            RemoveCimSessionFromTemporaryCache(this.CimSession, false);
+            CimSession sessionToReturn = this.CimSession;
+            this.CimSession = null;
+            this.IsTemporaryCimSession = false;
             return sessionToReturn;
         }
 
@@ -707,7 +731,7 @@ private void RemoveOperation(IObservable<object> operation)
                     this.operation = null;
                 }
 
-                if (this.session != null && this.ContextObject == null)
+                if (this.CimSession != null && this.ContextObject == null)
                 {
                     DebugHelper.WriteLog("Dispose this proxy object @ RemoveOperation");
                     this.Dispose();
@@ -725,7 +749,7 @@ protected void FireNewActionEvent(CimBaseAction action)
         {
             DebugHelper.WriteLogEx();
 
-            CmdletActionEventArgs actionArgs = new CmdletActionEventArgs(action);
+            CmdletActionEventArgs actionArgs = new(action);
             if (!PreNewActionEvent(actionArgs))
             {
                 return;
@@ -734,7 +758,7 @@ protected void FireNewActionEvent(CimBaseAction action)
             EventHandler<CmdletActionEventArgs> temp = this.OnNewCmdletAction;
             if (temp != null)
             {
-                temp(this.session, actionArgs);
+                temp(this.CimSession, actionArgs);
             }
             else
             {
@@ -757,9 +781,9 @@ private void FireOperationCreatedEvent(
         {
             DebugHelper.WriteLogEx();
 
-            OperationEventArgs args = new OperationEventArgs(
+            OperationEventArgs args = new(
                 cancelOperation, operation, false);
-            this.OnOperationCreated?.Invoke(this.session, args);
+            this.OnOperationCreated?.Invoke(this.CimSession, args);
 
             this.PostOperationCreateEvent(args);
         }
@@ -776,10 +800,10 @@ private void FireOperationDeletedEvent(
         {
             DebugHelper.WriteLogEx();
             this.WriteOperationCompleteMessage(this.operationName);
-            OperationEventArgs args = new OperationEventArgs(
+            OperationEventArgs args = new(
                 null, operation, success);
             PreOperationDeleteEvent(args);
-            this.OnOperationDeleted?.Invoke(this.session, args);
+            this.OnOperationDeleted?.Invoke(this.CimSession, args);
 
             this.PostOperationDeleteEvent(args);
             this.RemoveOperation(operation);
@@ -802,7 +826,7 @@ internal void WriteMessage(UInt32 channel, string message)
             DebugHelper.WriteLogEx("Channel = {0} message = {1}", 0, channel, message);
             try
             {
-                CimWriteMessage action = new CimWriteMessage(channel, message);
+                CimWriteMessage action = new(channel, message);
                 this.FireNewActionEvent(action);
             }
             catch (Exception ex)
@@ -821,7 +845,7 @@ internal void WriteMessage(UInt32 channel, string message)
         internal void WriteOperationStartMessage(string operation, Hashtable parameterList)
         {
             DebugHelper.WriteLogEx();
-            StringBuilder parameters = new StringBuilder();
+            StringBuilder parameters = new();
             if (parameterList != null)
             {
                 foreach (string key in parameterList.Keys)
@@ -878,7 +902,7 @@ public void WriteProgress(string activity,
 
             try
             {
-                CimWriteProgress action = new CimWriteProgress(
+                CimWriteProgress action = new(
                     activity,
                     (int)this.operationID,
                     currentOperation,
@@ -905,7 +929,7 @@ public CimResponseType WriteError(CimInstance instance)
             DebugHelper.WriteLogEx("Error:{0}", 0, instance);
             try
             {
-                CimWriteError action = new CimWriteError(instance, this.invocationContextObject);
+                CimWriteError action = new(instance, this.invocationContextObject);
                 this.FireNewActionEvent(action);
                 return action.GetResponse();
             }
@@ -927,7 +951,7 @@ public CimResponseType PromptUser(string message, CimPromptType prompt)
             DebugHelper.WriteLogEx("message:{0} prompt:{1}", 0, message, prompt);
             try
             {
-                CimPromptUser action = new CimPromptUser(message, prompt);
+                CimPromptUser action = new(message, prompt);
                 this.FireNewActionEvent(action);
                 return action.GetResponse();
             }
@@ -943,7 +967,7 @@ public CimResponseType PromptUser(string message, CimPromptType prompt)
 
         /// <summary>
         /// <para>
-        /// Handle async event triggered by <see cref="CimResultObserver<T>"/>
+        /// Handle async event triggered by <see cref="CimResultObserver{T}"/>
         /// </para>
         /// </summary>
         /// <param name="observer">Object triggered the event.</param>
@@ -969,7 +993,7 @@ internal void ResultEventHandler(
                         AsyncResultErrorEventArgs args = resultArgs as AsyncResultErrorEventArgs;
                         DebugHelper.WriteLog("ResultEventHandler::Exception {0}", 4, args.error);
 
-                        using (CimWriteError action = new CimWriteError(args.error, this.invocationContextObject, args.context))
+                        using (CimWriteError action = new(args.error, this.invocationContextObject, args.context))
                         {
                             this.FireNewActionEvent(action);
                         }
@@ -995,7 +1019,7 @@ internal void ResultEventHandler(
 #if DEBUG
                         resultObject = PostProcessCimInstance(resultObject);
 #endif
-                        CimWriteResultObject action = new CimWriteResultObject(resultObject, this.ContextObject);
+                        CimWriteResultObject action = new(resultObject, this.ContextObject);
                         this.FireNewActionEvent(action);
                     }
 
@@ -1024,7 +1048,7 @@ private static void AddShowComputerNameMarker(object o)
                 return;
             }
 
-            PSNoteProperty psShowComputerNameProperty = new PSNoteProperty(ConstValue.ShowComputerNameNoteProperty, true);
+            PSNoteProperty psShowComputerNameProperty = new(ConstValue.ShowComputerNameNoteProperty, true);
             pso.Members.Add(psShowComputerNameProperty);
         }
 
@@ -1036,7 +1060,7 @@ private static bool GetIsCliXmlTestabilityHookActive()
             return !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("CDXML_CLIXML_TEST"));
         }
 
-        private object PostProcessCimInstance(object resultObject)
+        private static object PostProcessCimInstance(object resultObject)
         {
             DebugHelper.WriteLogEx();
             if (isCliXmlTestabilityHookActive && (resultObject is CimInstance))
@@ -1065,15 +1089,15 @@ private object PostProcessCimInstance(object resultObject)
         public void CreateInstanceAsync(string namespaceName, CimInstance instance)
         {
             Debug.Assert(instance != null, "Caller should verify that instance != NULL.");
-            DebugHelper.WriteLogEx("EnableMethodResultStreaming = {0}", 0, this.options.EnableMethodResultStreaming);
+            DebugHelper.WriteLogEx("EnableMethodResultStreaming = {0}", 0, this.OperationOptions.EnableMethodResultStreaming);
             this.CheckAvailability();
-            this.targetCimInstance = instance;
+            this.TargetCimInstance = instance;
             this.operationName = CimCmdletStrings.CimOperationNameCreateInstance;
             this.operationParameters.Clear();
             this.operationParameters.Add(@"namespaceName", namespaceName);
             this.operationParameters.Add(@"instance", instance);
             this.WriteOperationStartMessage(this.operationName, this.operationParameters);
-            CimAsyncResult<CimInstance> asyncResult = this.session.CreateInstanceAsync(namespaceName, instance, this.options);
+            CimAsyncResult<CimInstance> asyncResult = this.CimSession.CreateInstanceAsync(namespaceName, instance, this.OperationOptions);
             ConsumeCimInstanceAsync(asyncResult, new CimResultContext(instance));
         }
 
@@ -1087,13 +1111,13 @@ public void DeleteInstanceAsync(string namespaceName, CimInstance instance)
             Debug.Assert(instance != null, "Caller should verify that instance != NULL.");
             DebugHelper.WriteLogEx("namespace = {0}; classname = {1};", 0, namespaceName, instance.CimSystemProperties.ClassName);
             this.CheckAvailability();
-            this.targetCimInstance = instance;
+            this.TargetCimInstance = instance;
             this.operationName = CimCmdletStrings.CimOperationNameDeleteInstance;
             this.operationParameters.Clear();
             this.operationParameters.Add(@"namespaceName", namespaceName);
             this.operationParameters.Add(@"instance", instance);
             this.WriteOperationStartMessage(this.operationName, this.operationParameters);
-            CimAsyncStatus asyncResult = this.session.DeleteInstanceAsync(namespaceName, instance, this.options);
+            CimAsyncStatus asyncResult = this.CimSession.DeleteInstanceAsync(namespaceName, instance, this.OperationOptions);
             ConsumeObjectAsync(asyncResult, new CimResultContext(instance));
         }
 
@@ -1105,15 +1129,15 @@ public void DeleteInstanceAsync(string namespaceName, CimInstance instance)
         public void GetInstanceAsync(string namespaceName, CimInstance instance)
         {
             Debug.Assert(instance != null, "Caller should verify that instance != NULL.");
-            DebugHelper.WriteLogEx("namespace = {0}; classname = {1}; keyonly = {2}", 0, namespaceName, instance.CimSystemProperties.ClassName, this.options.KeysOnly);
+            DebugHelper.WriteLogEx("namespace = {0}; classname = {1}; keyonly = {2}", 0, namespaceName, instance.CimSystemProperties.ClassName, this.OperationOptions.KeysOnly);
             this.CheckAvailability();
-            this.targetCimInstance = instance;
+            this.TargetCimInstance = instance;
             this.operationName = CimCmdletStrings.CimOperationNameGetInstance;
             this.operationParameters.Clear();
             this.operationParameters.Add(@"namespaceName", namespaceName);
             this.operationParameters.Add(@"instance", instance);
             this.WriteOperationStartMessage(this.operationName, this.operationParameters);
-            CimAsyncResult<CimInstance> asyncResult = this.session.GetInstanceAsync(namespaceName, instance, this.options);
+            CimAsyncResult<CimInstance> asyncResult = this.CimSession.GetInstanceAsync(namespaceName, instance, this.OperationOptions);
             ConsumeCimInstanceAsync(asyncResult, new CimResultContext(instance));
         }
 
@@ -1127,13 +1151,13 @@ public void ModifyInstanceAsync(string namespaceName, CimInstance instance)
             Debug.Assert(instance != null, "Caller should verify that instance != NULL.");
             DebugHelper.WriteLogEx("namespace = {0}; classname = {1}", 0, namespaceName, instance.CimSystemProperties.ClassName);
             this.CheckAvailability();
-            this.targetCimInstance = instance;
+            this.TargetCimInstance = instance;
             this.operationName = CimCmdletStrings.CimOperationNameModifyInstance;
             this.operationParameters.Clear();
             this.operationParameters.Add(@"namespaceName", namespaceName);
             this.operationParameters.Add(@"instance", instance);
             this.WriteOperationStartMessage(this.operationName, this.operationParameters);
-            CimAsyncResult<CimInstance> asyncResult = this.session.ModifyInstanceAsync(namespaceName, instance, this.options);
+            CimAsyncResult<CimInstance> asyncResult = this.CimSession.ModifyInstanceAsync(namespaceName, instance, this.OperationOptions);
             ConsumeObjectAsync(asyncResult, new CimResultContext(instance));
         }
 
@@ -1158,7 +1182,7 @@ public void EnumerateAssociatedInstancesAsync(
             Debug.Assert(sourceInstance != null, "Caller should verify that sourceInstance != NULL.");
             DebugHelper.WriteLogEx("Instance class {0}, association class {1}", 0, sourceInstance.CimSystemProperties.ClassName, associationClassName);
             this.CheckAvailability();
-            this.targetCimInstance = sourceInstance;
+            this.TargetCimInstance = sourceInstance;
             this.operationName = CimCmdletStrings.CimOperationNameEnumerateAssociatedInstances;
             this.operationParameters.Clear();
             this.operationParameters.Add(@"namespaceName", namespaceName);
@@ -1168,7 +1192,7 @@ public void EnumerateAssociatedInstancesAsync(
             this.operationParameters.Add(@"sourceRole", sourceRole);
             this.operationParameters.Add(@"resultRole", resultRole);
             this.WriteOperationStartMessage(this.operationName, this.operationParameters);
-            CimAsyncMultipleResults<CimInstance> asyncResult = this.session.EnumerateAssociatedInstancesAsync(namespaceName, sourceInstance, associationClassName, resultClassName, sourceRole, resultRole, this.options);
+            CimAsyncMultipleResults<CimInstance> asyncResult = this.CimSession.EnumerateAssociatedInstancesAsync(namespaceName, sourceInstance, associationClassName, resultClassName, sourceRole, resultRole, this.OperationOptions);
             ConsumeCimInstanceAsync(asyncResult, new CimResultContext(sourceInstance));
         }
 
@@ -1179,15 +1203,15 @@ public void EnumerateAssociatedInstancesAsync(
         /// <param name="className"></param>
         public void EnumerateInstancesAsync(string namespaceName, string className)
         {
-            DebugHelper.WriteLogEx("KeyOnly {0}", 0, this.options.KeysOnly);
+            DebugHelper.WriteLogEx("KeyOnly {0}", 0, this.OperationOptions.KeysOnly);
             this.CheckAvailability();
-            this.targetCimInstance = null;
+            this.TargetCimInstance = null;
             this.operationName = CimCmdletStrings.CimOperationNameEnumerateInstances;
             this.operationParameters.Clear();
             this.operationParameters.Add(@"namespaceName", namespaceName);
             this.operationParameters.Add(@"className", className);
             this.WriteOperationStartMessage(this.operationName, this.operationParameters);
-            CimAsyncMultipleResults<CimInstance> asyncResult = this.session.EnumerateInstancesAsync(namespaceName, className, this.options);
+            CimAsyncMultipleResults<CimInstance> asyncResult = this.CimSession.EnumerateInstancesAsync(namespaceName, className, this.OperationOptions);
             string errorSource = string.Format(CultureInfo.CurrentUICulture, "{0}:{1}", namespaceName, className);
             ConsumeCimInstanceAsync(asyncResult, new CimResultContext(errorSource));
         }
@@ -1224,16 +1248,16 @@ public void QueryInstancesAsync(
             string queryDialect,
             string queryExpression)
         {
-            DebugHelper.WriteLogEx("KeyOnly = {0}", 0, this.options.KeysOnly);
+            DebugHelper.WriteLogEx("KeyOnly = {0}", 0, this.OperationOptions.KeysOnly);
             this.CheckAvailability();
-            this.targetCimInstance = null;
+            this.TargetCimInstance = null;
             this.operationName = CimCmdletStrings.CimOperationNameQueryInstances;
             this.operationParameters.Clear();
             this.operationParameters.Add(@"namespaceName", namespaceName);
             this.operationParameters.Add(@"queryDialect", queryDialect);
             this.operationParameters.Add(@"queryExpression", queryExpression);
             this.WriteOperationStartMessage(this.operationName, this.operationParameters);
-            CimAsyncMultipleResults<CimInstance> asyncResult = this.session.QueryInstancesAsync(namespaceName, queryDialect, queryExpression, this.options);
+            CimAsyncMultipleResults<CimInstance> asyncResult = this.CimSession.QueryInstancesAsync(namespaceName, queryDialect, queryExpression, this.OperationOptions);
             ConsumeCimInstanceAsync(asyncResult, null);
         }
 
@@ -1246,12 +1270,12 @@ public void EnumerateClassesAsync(string namespaceName)
         {
             DebugHelper.WriteLogEx("namespace {0}", 0, namespaceName);
             this.CheckAvailability();
-            this.targetCimInstance = null;
+            this.TargetCimInstance = null;
             this.operationName = CimCmdletStrings.CimOperationNameEnumerateClasses;
             this.operationParameters.Clear();
             this.operationParameters.Add(@"namespaceName", namespaceName);
             this.WriteOperationStartMessage(this.operationName, this.operationParameters);
-            CimAsyncMultipleResults<CimClass> asyncResult = this.session.EnumerateClassesAsync(namespaceName, null, this.options);
+            CimAsyncMultipleResults<CimClass> asyncResult = this.CimSession.EnumerateClassesAsync(namespaceName, null, this.OperationOptions);
             ConsumeCimClassAsync(asyncResult, null);
         }
 
@@ -1263,13 +1287,13 @@ public void EnumerateClassesAsync(string namespaceName)
         public void EnumerateClassesAsync(string namespaceName, string className)
         {
             this.CheckAvailability();
-            this.targetCimInstance = null;
+            this.TargetCimInstance = null;
             this.operationName = CimCmdletStrings.CimOperationNameEnumerateClasses;
             this.operationParameters.Clear();
             this.operationParameters.Add(@"namespaceName", namespaceName);
             this.operationParameters.Add(@"className", className);
             this.WriteOperationStartMessage(this.operationName, this.operationParameters);
-            CimAsyncMultipleResults<CimClass> asyncResult = this.session.EnumerateClassesAsync(namespaceName, className, this.options);
+            CimAsyncMultipleResults<CimClass> asyncResult = this.CimSession.EnumerateClassesAsync(namespaceName, className, this.OperationOptions);
             string errorSource = string.Format(CultureInfo.CurrentUICulture, "{0}:{1}", namespaceName, className);
             ConsumeCimClassAsync(asyncResult, new CimResultContext(errorSource));
         }
@@ -1283,13 +1307,13 @@ public void GetClassAsync(string namespaceName, string className)
         {
             DebugHelper.WriteLogEx("namespace = {0}, className = {1}", 0, namespaceName, className);
             this.CheckAvailability();
-            this.targetCimInstance = null;
+            this.TargetCimInstance = null;
             this.operationName = CimCmdletStrings.CimOperationNameGetClass;
             this.operationParameters.Clear();
             this.operationParameters.Add(@"namespaceName", namespaceName);
             this.operationParameters.Add(@"className", className);
             this.WriteOperationStartMessage(this.operationName, this.operationParameters);
-            CimAsyncResult<CimClass> asyncResult = this.session.GetClassAsync(namespaceName, className, this.options);
+            CimAsyncResult<CimClass> asyncResult = this.CimSession.GetClassAsync(namespaceName, className, this.OperationOptions);
             string errorSource = string.Format(CultureInfo.CurrentUICulture, "{0}:{1}", namespaceName, className);
             ConsumeCimClassAsync(asyncResult, new CimResultContext(errorSource));
         }
@@ -1308,16 +1332,16 @@ public void InvokeMethodAsync(
             CimMethodParametersCollection methodParameters)
         {
             Debug.Assert(instance != null, "Caller should verify that instance != NULL.");
-            DebugHelper.WriteLogEx("EnableMethodResultStreaming = {0}", 0, this.options.EnableMethodResultStreaming);
+            DebugHelper.WriteLogEx("EnableMethodResultStreaming = {0}", 0, this.OperationOptions.EnableMethodResultStreaming);
             this.CheckAvailability();
-            this.targetCimInstance = instance;
+            this.TargetCimInstance = instance;
             this.operationName = CimCmdletStrings.CimOperationNameInvokeMethod;
             this.operationParameters.Clear();
             this.operationParameters.Add(@"namespaceName", namespaceName);
             this.operationParameters.Add(@"instance", instance);
             this.operationParameters.Add(@"methodName", methodName);
             this.WriteOperationStartMessage(this.operationName, this.operationParameters);
-            CimAsyncMultipleResults<CimMethodResultBase> asyncResult = this.session.InvokeMethodAsync(namespaceName, instance, methodName, methodParameters, this.options);
+            CimAsyncMultipleResults<CimMethodResultBase> asyncResult = this.CimSession.InvokeMethodAsync(namespaceName, instance, methodName, methodParameters, this.OperationOptions);
             ConsumeCimInvokeMethodResultAsync(asyncResult, instance.CimSystemProperties.ClassName, methodName, new CimResultContext(instance));
         }
 
@@ -1334,16 +1358,16 @@ public void InvokeMethodAsync(
             string methodName,
             CimMethodParametersCollection methodParameters)
         {
-            DebugHelper.WriteLogEx("EnableMethodResultStreaming = {0}", 0, this.options.EnableMethodResultStreaming);
+            DebugHelper.WriteLogEx("EnableMethodResultStreaming = {0}", 0, this.OperationOptions.EnableMethodResultStreaming);
             this.CheckAvailability();
-            this.targetCimInstance = null;
+            this.TargetCimInstance = null;
             this.operationName = CimCmdletStrings.CimOperationNameInvokeMethod;
             this.operationParameters.Clear();
             this.operationParameters.Add(@"namespaceName", namespaceName);
             this.operationParameters.Add(@"className", className);
             this.operationParameters.Add(@"methodName", methodName);
             this.WriteOperationStartMessage(this.operationName, this.operationParameters);
-            CimAsyncMultipleResults<CimMethodResultBase> asyncResult = this.session.InvokeMethodAsync(namespaceName, className, methodName, methodParameters, this.options);
+            CimAsyncMultipleResults<CimMethodResultBase> asyncResult = this.CimSession.InvokeMethodAsync(namespaceName, className, methodName, methodParameters, this.OperationOptions);
             string errorSource = string.Format(CultureInfo.CurrentUICulture, "{0}:{1}", namespaceName, className);
             ConsumeCimInvokeMethodResultAsync(asyncResult, className, methodName, new CimResultContext(errorSource));
         }
@@ -1363,7 +1387,7 @@ public void SubscribeAsync(
         {
             DebugHelper.WriteLogEx("QueryDialect = '{0}'; queryExpression = '{1}'", 0, queryDialect, queryExpression);
             this.CheckAvailability();
-            this.targetCimInstance = null;
+            this.TargetCimInstance = null;
             this.operationName = CimCmdletStrings.CimOperationNameSubscribeIndication;
             this.operationParameters.Clear();
             this.operationParameters.Add(@"namespaceName", namespaceName);
@@ -1371,8 +1395,8 @@ public void SubscribeAsync(
             this.operationParameters.Add(@"queryExpression", queryExpression);
             this.WriteOperationStartMessage(this.operationName, this.operationParameters);
 
-            this.options.Flags |= CimOperationFlags.ReportOperationStarted;
-            CimAsyncMultipleResults<CimSubscriptionResult> asyncResult = this.session.SubscribeAsync(namespaceName, queryDialect, queryExpression, this.options);
+            this.OperationOptions.Flags |= CimOperationFlags.ReportOperationStarted;
+            CimAsyncMultipleResults<CimSubscriptionResult> asyncResult = this.CimSession.SubscribeAsync(namespaceName, queryDialect, queryExpression, this.OperationOptions);
             ConsumeCimSubscriptionResultAsync(asyncResult, null);
         }
 
@@ -1385,8 +1409,8 @@ public void TestConnectionAsync()
         {
             DebugHelper.WriteLogEx("Start test connection", 0);
             this.CheckAvailability();
-            this.targetCimInstance = null;
-            CimAsyncResult<CimInstance> asyncResult = this.session.TestConnectionAsync();
+            this.TargetCimInstance = null;
+            CimAsyncResult<CimInstance> asyncResult = this.CimSession.TestConnectionAsync();
             // ignore the test connection result objects
             ConsumeCimInstanceAsync(asyncResult, true, null);
         }
@@ -1451,42 +1475,15 @@ protected virtual void PostOperationDeleteEvent(OperationEventArgs args)
         /// The session will be closed while disposing this proxy object
         /// if it is created by constuctor.
         /// </summary>
-        internal CimSession CimSession
-        {
-            get
-            {
-                return this.session;
-            }
-        }
-
-        private CimSession session;
+        internal CimSession CimSession { get; private set; }
 
         /// <summary>
         /// The current CimInstance object, against which issued
         /// current operation, it could be null.
         /// </summary>
-        internal CimInstance TargetCimInstance
-        {
-            get
-            {
-                return this.targetCimInstance;
-            }
-        }
+        internal CimInstance TargetCimInstance { get; private set; }
 
-        private CimInstance targetCimInstance = null;
-
-        /// <summary>
-        /// Flag controls whether session object should be closed or not.
-        /// </summary>
-        private bool isTemporaryCimSession;
-
-        internal bool IsTemporaryCimSession
-        {
-            get
-            {
-                return isTemporaryCimSession;
-            }
-        }
+        internal bool IsTemporaryCimSession { get; private set; }
 
         /// <summary>
         /// The CimOperationOptions object, which specifies the options
@@ -1496,15 +1493,7 @@ internal bool IsTemporaryCimSession
         /// The setting MUST be set before start new operation on the
         /// this proxy object.
         /// </summary>
-        internal CimOperationOptions OperationOptions
-        {
-            get
-            {
-                return this.options;
-            }
-        }
-
-        private CimOperationOptions options;
+        internal CimOperationOptions OperationOptions { get; private set; }
 
         /// <summary>
         /// All operations completed.
@@ -1518,7 +1507,7 @@ private bool Completed
         /// Lock object used to lock
         /// operation & cancelOperation members.
         /// </summary>
-        private readonly object stateLock = new object();
+        private readonly object stateLock = new();
 
         /// <summary>
         /// The operation issued by cimSession.
@@ -1533,7 +1522,7 @@ private bool Completed
         /// <summary>
         /// The current operation parameters.
         /// </summary>
-        private readonly Hashtable operationParameters = new Hashtable();
+        private readonly Hashtable operationParameters = new();
 
         /// <summary>
         /// Handler used to cancel operation.
@@ -1584,33 +1573,12 @@ private IDisposable CancelOperation
         /// Current protocol name
         /// DCOM or WSMAN.
         /// </summary>
-        internal ProtocolType Protocol
-        {
-            get
-            {
-                return protocol;
-            }
-        }
-
-        private ProtocolType protocol;
+        internal ProtocolType Protocol { get; private set; }
 
         /// <summary>
         /// Cross operation context object.
         /// </summary>
-        internal XOperationContextBase ContextObject
-        {
-            get
-            {
-                return this.contextObject;
-            }
-
-            set
-            {
-                this.contextObject = value;
-            }
-        }
-
-        private XOperationContextBase contextObject;
+        internal XOperationContextBase ContextObject { get; set; }
 
         /// <summary>
         /// Invocation context object.
@@ -1621,23 +1589,10 @@ internal XOperationContextBase ContextObject
         /// A preprocess object to pre-processing the result object,
         /// for example, adding PSTypeName, etc.
         /// </summary>
-        internal IObjectPreProcess ObjectPreProcess
-        {
-            get
-            {
-                return this.objectPreprocess;
-            }
-
-            set
-            {
-                this.objectPreprocess = value;
-            }
-        }
-
-        private IObjectPreProcess objectPreprocess;
+        internal IObjectPreProcess ObjectPreProcess { get; set; }
 
         /// <summary>
-        /// <see cref="isDefaultSession"/> is <c>true</c> if this <see cref="CimSessionProxy"/> was
+        /// <see cref="isDefaultSession"/> is <see langword="true"/> if this <see cref="CimSessionProxy"/> was
         /// created to handle the "default" session, in cases where cmdlets are invoked without
         /// ComputerName and/or CimSession parameters.
         /// </summary>
@@ -1684,10 +1639,10 @@ protected virtual void Dispose(bool disposing)
                     // Dispose managed resources.
                     this.DisposeCancelOperation();
 
-                    if (this.options != null)
+                    if (this.OperationOptions != null)
                     {
-                        this.options.Dispose();
-                        this.options = null;
+                        this.OperationOptions.Dispose();
+                        this.OperationOptions = null;
                     }
 
                     DisposeTemporaryCimSession();
@@ -1710,12 +1665,12 @@ public bool IsDisposed
         /// </summary>
         private void DisposeTemporaryCimSession()
         {
-            if (this.isTemporaryCimSession && this.session != null)
+            if (this.IsTemporaryCimSession && this.CimSession != null)
             {
                 // remove the cimsession from temporary cache
-                RemoveCimSessionFromTemporaryCache(this.session);
-                this.isTemporaryCimSession = false;
-                this.session = null;
+                RemoveCimSessionFromTemporaryCache(this.CimSession);
+                this.IsTemporaryCimSession = false;
+                this.CimSession = null;
             }
         }
         #endregion
@@ -1751,11 +1706,11 @@ protected void ConsumeCimInstanceAsync(
             CimResultObserver<CimInstance> observer;
             if (ignoreResultObjects)
             {
-                observer = new IgnoreResultObserver(this.session, asyncResult);
+                observer = new IgnoreResultObserver(this.CimSession, asyncResult);
             }
             else
             {
-                observer = new CimResultObserver<CimInstance>(this.session, asyncResult, cimResultContext);
+                observer = new CimResultObserver<CimInstance>(this.CimSession, asyncResult, cimResultContext);
             }
 
             observer.OnNewResult += this.ResultEventHandler;
@@ -1775,8 +1730,8 @@ protected void ConsumeCimInstanceAsync(
         protected void ConsumeObjectAsync(IObservable<object> asyncResult,
             CimResultContext cimResultContext)
         {
-            CimResultObserver<object> observer = new CimResultObserver<object>(
-                this.session, asyncResult, cimResultContext);
+            CimResultObserver<object> observer = new(
+                this.CimSession, asyncResult, cimResultContext);
 
             observer.OnNewResult += this.ResultEventHandler;
             this.operationID = Interlocked.Increment(ref gOperationCounter);
@@ -1796,8 +1751,8 @@ protected void ConsumeObjectAsync(IObservable<object> asyncResult,
         protected void ConsumeCimClassAsync(IObservable<CimClass> asyncResult,
             CimResultContext cimResultContext)
         {
-            CimResultObserver<CimClass> observer = new CimResultObserver<CimClass>(
-                this.session, asyncResult, cimResultContext);
+            CimResultObserver<CimClass> observer = new(
+                this.CimSession, asyncResult, cimResultContext);
 
             observer.OnNewResult += this.ResultEventHandler;
             this.operationID = Interlocked.Increment(ref gOperationCounter);
@@ -1817,8 +1772,8 @@ protected void ConsumeCimSubscriptionResultAsync(
             IObservable<CimSubscriptionResult> asyncResult,
             CimResultContext cimResultContext)
         {
-            CimSubscriptionResultObserver observer = new CimSubscriptionResultObserver(
-                this.session, asyncResult, cimResultContext);
+            CimSubscriptionResultObserver observer = new(
+                this.CimSession, asyncResult, cimResultContext);
             observer.OnNewResult += this.ResultEventHandler;
             this.operationID = Interlocked.Increment(ref gOperationCounter);
             this.AddOperation(asyncResult);
@@ -1841,7 +1796,7 @@ protected void ConsumeCimInvokeMethodResultAsync(
             string methodName,
             CimResultContext cimResultContext)
         {
-            CimMethodResultObserver observer = new CimMethodResultObserver(this.session, asyncResult, cimResultContext)
+            CimMethodResultObserver observer = new(this.CimSession, asyncResult, cimResultContext)
             {
                 ClassName = className,
                 MethodName = methodName
@@ -1872,7 +1827,7 @@ private void CheckAvailability()
                 }
             }
 
-            DebugHelper.WriteLog("KeyOnly {0},", 1, this.options.KeysOnly);
+            DebugHelper.WriteLog("KeyOnly {0},", 1, this.OperationOptions.KeysOnly);
         }
 
         /// <summary>
@@ -1882,9 +1837,9 @@ private void CheckAvailability()
         /// </summary>
         private void AssertSession()
         {
-            if (this.IsDisposed || (this.session == null))
+            if (this.IsDisposed || (this.CimSession == null))
             {
-                DebugHelper.WriteLogEx("Invalid CimSessionProxy object, disposed? {0}; session object {1}", 1, this.IsDisposed, this.session);
+                DebugHelper.WriteLogEx("Invalid CimSessionProxy object, disposed? {0}; session object {1}", 1, this.IsDisposed, this.CimSession);
                 throw new ObjectDisposedException(this.ToString());
             }
         }
@@ -1903,7 +1858,7 @@ private CimSession CreateCimSessionByComputerName(string computerName)
             if (option is DComSessionOptions)
             {
                 DebugHelper.WriteLog("Create dcom cimSession");
-                this.protocol = ProtocolType.Dcom;
+                this.Protocol = ProtocolType.Dcom;
                 return CimSession.Create(ConstValue.NullComputerName, option);
             }
             else
@@ -1969,10 +1924,13 @@ internal class CimSessionProxyTestConnection : CimSessionProxy
         #region constructors
 
         /// <summary>
+        /// Initializes a new instance of the <see cref="CimSessionProxyTestConnection"/> class.
+        /// </summary>
+        /// <remarks>
         /// Create <see cref="CimSession"/> by given computer name
         /// and session options.
         /// Then create wrapper object.
-        /// </summary>
+        /// </remarks>
         /// <param name="computerName"></param>
         /// <param name="sessionOptions"></param>
         public CimSessionProxyTestConnection(string computerName, CimSessionOptions sessionOptions)
@@ -1995,7 +1953,7 @@ protected override void PreOperationDeleteEvent(OperationEventArgs args)
             if (args.success)
             {
                 // test connection success, write session object to pipeline
-                CimWriteResultObject result = new CimWriteResultObject(this.CimSession, this.ContextObject);
+                CimWriteResultObject result = new(this.CimSession, this.ContextObject);
                 this.FireNewActionEvent(result);
             }
         }
@@ -2018,9 +1976,12 @@ internal class CimSessionProxyGetCimClass : CimSessionProxy
         #region constructors
 
         /// <summary>
+        /// Initializes a new instance of the <see cref="CimSessionProxyGetCimClass"/> class.
+        /// </summary>
+        /// <remarks>
         /// Create <see cref="CimSession"/> by given computer name.
         /// Then create wrapper object.
-        /// </summary>
+        /// </remarks>
         /// <param name="computerName"></param>
         public CimSessionProxyGetCimClass(string computerName)
             : base(computerName)
@@ -2028,10 +1989,13 @@ public CimSessionProxyGetCimClass(string computerName)
         }
 
         /// <summary>
+        /// Initializes a new instance of the <see cref="CimSessionProxyGetCimClass"/> class.
+        /// </summary>
+        /// <remarks>
         /// Create <see cref="CimSession"/> by given computer name
         /// and session options.
         /// Then create wrapper object.
-        /// </summary>
+        /// </remarks>
         /// <param name="computerName"></param>
         /// <param name="sessionOptions"></param>
         public CimSessionProxyGetCimClass(CimSession session)
@@ -2169,27 +2133,33 @@ internal class CimSessionProxyNewCimInstance : CimSessionProxy
         #region constructors
 
         /// <summary>
+        /// Initializes a new instance of the <see cref="CimSessionProxyNewCimInstance"/> class.
+        /// <summary>
+        /// <remarks>
         /// Create <see cref="CimSession"/> by given computer name.
         /// Then create wrapper object.
-        /// </summary>
+        /// </remarks>
         /// <param name="computerName"></param>
         public CimSessionProxyNewCimInstance(string computerName, CimNewCimInstance operation)
             : base(computerName)
         {
-            this.newCimInstance = operation;
+            this.NewCimInstanceOperation = operation;
         }
 
         /// <summary>
+        /// Initializes a new instance of the <see cref="CimSessionProxyNewCimInstance"/> class.
+        /// </summary>
+        /// <remarks>
         /// Create <see cref="CimSession"/> by given computer name
         /// and session options.
         /// Then create wrapper object.
-        /// </summary>
+        /// </remarks>
         /// <param name="computerName"></param>
         /// <param name="sessionOptions"></param>
         public CimSessionProxyNewCimInstance(CimSession session, CimNewCimInstance operation)
             : base(session)
         {
-            this.newCimInstance = operation;
+            this.NewCimInstanceOperation = operation;
         }
 
         #endregion
@@ -2223,15 +2193,7 @@ protected override bool PreNewActionEvent(CmdletActionEventArgs args)
 
         #region private members
 
-        private readonly CimNewCimInstance newCimInstance = null;
-
-        internal CimNewCimInstance NewCimInstanceOperation
-        {
-            get
-            {
-                return this.newCimInstance;
-            }
-        }
+        internal CimNewCimInstance NewCimInstanceOperation { get; }
 
         #endregion
     }
@@ -2249,9 +2211,12 @@ internal class CimSessionProxySetCimInstance : CimSessionProxy
     {
         #region constructors
         /// <summary>
+        /// Initializes a new instance of the <see cref="CimSessionProxySetCimInstance"/> class.
+        /// </summary>
+        /// <remarks>
         /// Create <see cref="CimSession"/> by given <see cref="CimSessionProxy"/> object.
         /// Then create wrapper object.
-        /// </summary>
+        /// </remarks>
         /// <param name="originalProxy"><see cref="CimSessionProxy"/> object to clone.</param>
         /// <param name="passThru">PassThru, true means output the modified instance; otherwise does not output.</param>
         public CimSessionProxySetCimInstance(CimSessionProxy originalProxy, bool passThru)
@@ -2261,9 +2226,12 @@ public CimSessionProxySetCimInstance(CimSessionProxy originalProxy, bool passThr
         }
 
         /// <summary>
+        /// Initializes a new instance of the <see cref="CimSessionProxySetCimInstance"/> class.
+        /// </summary>
+        /// <remarks>
         /// Create <see cref="CimSession"/> by given computer name.
         /// Then create wrapper object.
-        /// </summary>
+        /// </remarks>
         /// <param name="computerName"></param>
         /// <param name="cimInstance"></param>
         /// <param name="passThru"></param>
@@ -2276,10 +2244,13 @@ public CimSessionProxySetCimInstance(string computerName,
         }
 
         /// <summary>
+        /// Initializes a new instance of the <see cref="CimSessionProxySetCimInstance"/> class.
+        /// </summary>
+        /// <remarks>
         /// Create <see cref="CimSession"/> by given computer name
         /// and session options.
         /// Then create wrapper object.
-        /// </summary>
+        /// </remarks>
         /// <param name="computerName"></param>
         /// <param name="sessionOptions"></param>
         public CimSessionProxySetCimInstance(CimSession session, bool passThru)
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSetCimInstance.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSetCimInstance.cs
index d6a125528f0..91cf332bde9 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSetCimInstance.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimSetCimInstance.cs
@@ -19,9 +19,7 @@ namespace Microsoft.Management.Infrastructure.CimCmdlets
     internal class CimSetCimInstanceContext : XOperationContextBase
     {
         /// <summary>
-        /// <para>
-        /// Constructor
-        /// </para>
+        /// Initializes a new instance of the <see cref="CimSetCimInstanceContext"/> class.
         /// </summary>
         /// <param name="theNamespace"></param>
         /// <param name="theCollection"></param>
@@ -33,50 +31,26 @@ internal CimSetCimInstanceContext(string theNamespace,
             bool passThru)
         {
             this.proxy = theProxy;
-            this.property = theProperty;
+            this.Property = theProperty;
             this.nameSpace = theNamespace;
-            this.parameterSetName = theParameterSetName;
-            this.passThru = passThru;
+            this.ParameterSetName = theParameterSetName;
+            this.PassThru = passThru;
         }
 
         /// <summary>
         /// <para>property value</para>
         /// </summary>
-        internal IDictionary Property
-        {
-            get
-            {
-                return this.property;
-            }
-        }
-
-        private readonly IDictionary property;
+        internal IDictionary Property { get; }
 
         /// <summary>
         /// <para>parameter set name</para>
         /// </summary>
-        internal string ParameterSetName
-        {
-            get
-            {
-                return this.parameterSetName;
-            }
-        }
-
-        private readonly string parameterSetName;
+        internal string ParameterSetName { get; }
 
         /// <summary>
         /// <para>PassThru value</para>
         /// </summary>
-        internal bool PassThru
-        {
-            get
-            {
-                return this.passThru;
-            }
-        }
-
-        private readonly bool passThru;
+        internal bool PassThru { get; }
     }
 
     /// <summary>
@@ -87,9 +61,7 @@ internal bool PassThru
     internal sealed class CimSetCimInstance : CimGetInstance
     {
         /// <summary>
-        /// <para>
-        /// Constructor
-        /// </para>
+        /// Initializes a new instance of the <see cref="CimSetCimInstance"/> class.
         /// </summary>
         public CimSetCimInstance()
             : base()
@@ -106,7 +78,7 @@ public void SetCimInstance(SetCimInstanceCommand cmdlet)
         {
             IEnumerable<string> computerNames = ConstValue.GetComputerNames(
                 GetComputerName(cmdlet));
-            List<CimSessionProxy> proxys = new List<CimSessionProxy>();
+            List<CimSessionProxy> proxys = new();
             switch (cmdlet.ParameterSetName)
             {
                 case CimBaseCommand.CimInstanceComputerSet:
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimWriteError.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimWriteError.cs
index 9d367877a4c..d3ae3419fa4 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimWriteError.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimWriteError.cs
@@ -166,7 +166,7 @@ internal static ErrorRecord InitializeErrorRecordCore(
                 }
             }
 
-            ErrorRecord coreErrorRecord = new ErrorRecord(
+            ErrorRecord coreErrorRecord = new(
                 exception: exception,
                 errorId: errorId,
                 errorCategory: errorCategory,
@@ -177,7 +177,7 @@ internal static ErrorRecord InitializeErrorRecordCore(
                 return coreErrorRecord;
             }
 
-            System.Management.Automation.Remoting.OriginInfo originInfo = new System.Management.Automation.Remoting.OriginInfo(
+            System.Management.Automation.Remoting.OriginInfo originInfo = new(
                 context.ComputerName,
                 Guid.Empty);
 
@@ -317,24 +317,26 @@ internal static ErrorCategory ConvertCimErrorToErrorCategory(CimInstance cimErro
     internal sealed class CimWriteError : CimSyncAction
     {
         /// <summary>
-        /// Constructor with an <see cref="CimInstance"/> error.
+        /// Initializes a new instance of the <see cref="CimWriteError"/> class
+        /// with the specified <see cref="CimInstance"/>.
         /// </summary>
         /// <param name="error"></param>
         public CimWriteError(CimInstance error, InvocationContext context)
         {
-            this.error = error;
-            this.invocationContext = context;
+            this.Error = error;
+            this.CimInvocationContext = context;
         }
 
         /// <summary>
-        /// Construct with an exception object.
+        /// Initializes a new instance of the <see cref="CimWriteError"/> class
+        /// with the specified <see cref="Exception"/>.
         /// </summary>
         /// <param name="exception"></param>
         public CimWriteError(Exception exception, InvocationContext context, CimResultContext cimResultContext)
         {
-            this.exception = exception;
-            this.invocationContext = context;
-            this.cimResultContext = cimResultContext;
+            this.Exception = exception;
+            this.CimInvocationContext = context;
+            this.ResultContext = cimResultContext;
         }
 
         /// <summary>
@@ -348,10 +350,10 @@ public override void Execute(CmdletOperationBase cmdlet)
             Debug.Assert(cmdlet != null, "Caller should verify that cmdlet != null");
             try
             {
-                Exception errorException = (error != null) ? new CimException(error) : this.Exception;
+                Exception errorException = (Error != null) ? new CimException(Error) : this.Exception;
 
                 // PS engine takes care of handling error action
-                cmdlet.WriteError(ErrorToErrorRecord.ErrorRecordFromAnyException(this.invocationContext, errorException, this.cimResultContext));
+                cmdlet.WriteError(ErrorToErrorRecord.ErrorRecordFromAnyException(this.CimInvocationContext, errorException, this.ResultContext));
 
                 // if user wants to continue, we will get here
                 this.responseType = CimResponseType.Yes;
@@ -375,59 +377,19 @@ public override void Execute(CmdletOperationBase cmdlet)
         /// Error instance
         /// </para>
         /// </summary>
-        private readonly CimInstance error;
 
-        internal CimInstance Error
-        {
-            get
-            {
-                return error;
-            }
-        }
+        internal CimInstance Error { get; }
 
         /// <summary>
         /// <para>
         /// Exception object
         /// </para>
         /// </summary>
-        internal Exception Exception
-        {
-            get
-            {
-                return exception;
-            }
-        }
-
-        private readonly Exception exception;
+        internal Exception Exception { get; }
 
-        /// <summary>
-        /// <para>
-        /// <see cref="InvocationContext"/> object that contains
-        /// the information while issuing the current operation
-        /// </para>
-        /// </summary>
-        private readonly InvocationContext invocationContext;
+        internal InvocationContext CimInvocationContext { get; }
 
-        internal InvocationContext CimInvocationContext
-        {
-            get
-            {
-                return invocationContext;
-            }
-        }
-
-        /// <summary>
-        /// <see cref="CimResultConte"/>
-        /// </summary>
-        private readonly CimResultContext cimResultContext;
-
-        internal CimResultContext ResultContext
-        {
-            get
-            {
-                return cimResultContext;
-            }
-        }
+        internal CimResultContext ResultContext { get; }
 
         #endregion
     }
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimWriteMessage.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimWriteMessage.cs
index 9a556b68c5e..cf927617235 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimWriteMessage.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimWriteMessage.cs
@@ -22,36 +22,24 @@ internal sealed class CimWriteMessage : CimBaseAction
         /// <summary>
         /// Channel id.
         /// </summary>
-        private readonly UInt32 channel;
-
-        /// <summary>
-        /// Message to write to the channel.
-        /// </summary>
-        private readonly string message;
         #endregion
 
         #region Properties
 
-        internal UInt32 Channel
-        {
-            get { return channel; }
-        }
+        internal UInt32 Channel { get; }
 
-        internal string Message
-        {
-            get { return message; }
-        }
+        internal string Message { get; }
 
         #endregion
 
         /// <summary>
-        /// Constructor method.
+        /// Initializes a new instance of the <see cref="CimWriteMessage"/> class.
         /// </summary>
         public CimWriteMessage(UInt32 channel,
             string message)
         {
-            this.channel = channel;
-            this.message = message;
+            this.Channel = channel;
+            this.Message = message;
         }
 
         /// <summary>
@@ -64,16 +52,16 @@ public override void Execute(CmdletOperationBase cmdlet)
         {
             ValidationHelper.ValidateNoNullArgument(cmdlet, "cmdlet");
 
-            switch ((CimWriteMessageChannel)channel)
+            switch ((CimWriteMessageChannel)Channel)
             {
                 case CimWriteMessageChannel.Verbose:
-                    cmdlet.WriteVerbose(message);
+                    cmdlet.WriteVerbose(Message);
                     break;
                 case CimWriteMessageChannel.Warning:
-                    cmdlet.WriteWarning(message);
+                    cmdlet.WriteWarning(Message);
                     break;
                 case CimWriteMessageChannel.Debug:
-                    cmdlet.WriteDebug(message);
+                    cmdlet.WriteDebug(Message);
                     break;
                 default:
                     break;
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimWriteProgress.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimWriteProgress.cs
index 99a8fa1c6ad..8e5632215a0 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimWriteProgress.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimWriteProgress.cs
@@ -18,7 +18,7 @@ namespace Microsoft.Management.Infrastructure.CimCmdlets
     internal sealed class CimWriteProgress : CimBaseAction
     {
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="CimWriteProgress"/> class.
         /// </summary>
         /// <param name="activity">
         ///  Activity identifier of the given activity
@@ -43,20 +43,20 @@ public CimWriteProgress(
             UInt32 thePercentageCompleted,
             UInt32 theSecondsRemaining)
         {
-            this.activity = theActivity;
-            this.activityID = theActivityID;
-            this.currentOperation = theCurrentOperation;
+            this.Activity = theActivity;
+            this.ActivityID = theActivityID;
+            this.CurrentOperation = theCurrentOperation;
             if (string.IsNullOrEmpty(theStatusDescription))
             {
-                this.statusDescription = CimCmdletStrings.DefaultStatusDescription;
+                this.StatusDescription = CimCmdletStrings.DefaultStatusDescription;
             }
             else
             {
-                this.statusDescription = theStatusDescription;
+                this.StatusDescription = theStatusDescription;
             }
 
-            this.percentageCompleted = thePercentageCompleted;
-            this.secondsRemaining = theSecondsRemaining;
+            this.PercentageCompleted = thePercentageCompleted;
+            this.SecondsRemaining = theSecondsRemaining;
         }
 
         /// <summary>
@@ -70,84 +70,54 @@ public override void Execute(CmdletOperationBase cmdlet)
             DebugHelper.WriteLog(
                 "...Activity {0}: id={1}, remain seconds ={2}, percentage completed = {3}",
                 4,
-                this.activity,
-                this.activityID,
-                this.secondsRemaining,
-                this.percentageCompleted);
+                this.Activity,
+                this.ActivityID,
+                this.SecondsRemaining,
+                this.PercentageCompleted);
 
             ValidationHelper.ValidateNoNullArgument(cmdlet, "cmdlet");
-            ProgressRecord record = new ProgressRecord(
-                this.activityID,
-                this.activity,
-                this.statusDescription);
-            record.Activity = this.activity;
+            ProgressRecord record = new(
+                this.ActivityID,
+                this.Activity,
+                this.StatusDescription);
+            record.Activity = this.Activity;
             record.ParentActivityId = 0;
-            record.SecondsRemaining = (int)this.secondsRemaining;
-            record.PercentComplete = (int)this.percentageCompleted;
+            record.SecondsRemaining = (int)this.SecondsRemaining;
+            record.PercentComplete = (int)this.PercentageCompleted;
             cmdlet.WriteProgress(record);
         }
 
         #region members
 
         /// <summary>
-        /// Activity of the given activity.
+        /// Gets the activity of the given activity.
         /// </summary>
-        private readonly string activity;
+        internal string Activity { get; }
 
         /// <summary>
-        /// Activity identifier of the given activity.
+        /// Gets the activity identifier of the given activity.
         /// </summary>
-        private readonly int activityID;
+        internal int ActivityID { get; }
 
         /// <summary>
-        /// Current operation text of the given activity.
+        /// Gets the current operation text of the given activity.
         /// </summary>
-        private readonly string currentOperation;
+        internal string CurrentOperation { get; }
 
         /// <summary>
-        /// Status description of the given activity.
+        /// Gets the status description of the given activity.
         /// </summary>
-        private readonly string statusDescription;
+        internal string StatusDescription { get; }
 
         /// <summary>
-        /// Percentage completed of the given activity.
+        /// Gets the percentage completed of the given activity.
         /// </summary>
-        private readonly UInt32 percentageCompleted;
+        internal UInt32 PercentageCompleted { get; }
 
         /// <summary>
-        /// How many seconds remained for the given activity.
+        /// Gets the number of seconds remaining for the given activity.
         /// </summary>
-        private readonly UInt32 secondsRemaining;
-
-        internal string Activity
-        {
-            get { return activity; }
-        }
-
-        internal int ActivityID
-        {
-            get { return activityID; }
-        }
-
-        internal string CurrentOperation
-        {
-            get { return currentOperation; }
-        }
-
-        internal string StatusDescription
-        {
-            get { return statusDescription; }
-        }
-
-        internal UInt32 PercentageCompleted
-        {
-            get { return percentageCompleted; }
-        }
-
-        internal UInt32 SecondsRemaining
-        {
-            get { return secondsRemaining; }
-        }
+        internal UInt32 SecondsRemaining { get; }
 
         #endregion
     }
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimWriteResultObject.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimWriteResultObject.cs
index 492819c6535..a4dcdfaa5c4 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CimWriteResultObject.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CimWriteResultObject.cs
@@ -15,11 +15,11 @@ namespace Microsoft.Management.Infrastructure.CimCmdlets
     internal sealed class CimWriteResultObject : CimBaseAction
     {
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="CimWriteResultObject"/> class.
         /// </summary>
         public CimWriteResultObject(object result, XOperationContextBase theContext)
         {
-            this.result = result;
+            this.Result = result;
             this.Context = theContext;
         }
 
@@ -32,22 +32,14 @@ public CimWriteResultObject(object result, XOperationContextBase theContext)
         public override void Execute(CmdletOperationBase cmdlet)
         {
             ValidationHelper.ValidateNoNullArgument(cmdlet, "cmdlet");
-            cmdlet.WriteObject(result, this.Context);
+            cmdlet.WriteObject(Result, this.Context);
         }
 
         #region members
         /// <summary>
         /// Result object.
         /// </summary>
-        internal object Result
-        {
-            get
-            {
-                return result;
-            }
-        }
-
-        private readonly object result;
+        internal object Result { get; }
         #endregion
     }
 }
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/CmdletOperation.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/CmdletOperation.cs
index 71289242e8a..3c49b1dcbb8 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/CmdletOperation.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/CmdletOperation.cs
@@ -117,13 +117,13 @@ public virtual void WriteWarning(string text)
         /// </summary>
         internal void ThrowTerminatingError(Exception exception, string operation)
         {
-            ErrorRecord errorRecord = new ErrorRecord(exception, operation, ErrorCategory.InvalidOperation, this);
+            ErrorRecord errorRecord = new(exception, operation, ErrorCategory.InvalidOperation, this);
             cmdlet.ThrowTerminatingError(errorRecord);
         }
         #endregion
 
         /// <summary>
-        /// Constructor method.
+        /// Initializes a new instance of the <see cref="CmdletOperationBase"/> class.
         /// </summary>
         public CmdletOperationBase(Cmdlet cmdlet)
         {
@@ -143,7 +143,7 @@ public CmdletOperationBase(Cmdlet cmdlet)
     internal class CmdletOperationRemoveCimInstance : CmdletOperationBase
     {
         /// <summary>
-        /// Constructor method.
+        /// Initializes a new instance of the <see cref="CmdletOperationRemoveCimInstance"/> class.
         /// </summary>
         /// <param name="cmdlet"></param>
         public CmdletOperationRemoveCimInstance(Cmdlet cmdlet,
@@ -207,7 +207,7 @@ public override void WriteObject(object sendToPipeline, bool enumerateCollection
     internal class CmdletOperationSetCimInstance : CmdletOperationBase
     {
         /// <summary>
-        /// Constructor method.
+        /// Initializes a new instance of the <see cref="CmdletOperationSetCimInstance"/> class.
         /// </summary>
         /// <param name="cmdlet"></param>
         public CmdletOperationSetCimInstance(Cmdlet cmdlet,
@@ -285,7 +285,7 @@ public override void WriteObject(object sendToPipeline, bool enumerateCollection
     internal class CmdletOperationInvokeCimMethod : CmdletOperationBase
     {
         /// <summary>
-        /// Constructor method.
+        /// Initializes a new instance of the <see cref="CmdletOperationInvokeCimMethod"/> class.
         /// </summary>
         /// <param name="cmdlet"></param>
         public CmdletOperationInvokeCimMethod(Cmdlet cmdlet,
@@ -350,7 +350,7 @@ public override void WriteObject(object sendToPipeline, bool enumerateCollection
     internal class CmdletOperationTestCimSession : CmdletOperationBase
     {
         /// <summary>
-        /// Constructor method.
+        /// Initializes a new instance of the <see cref="CmdletOperationTestCimSession"/> class.
         /// </summary>
         /// <param name="cmdlet"></param>
         public CmdletOperationTestCimSession(Cmdlet cmdlet,
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimAssociatedInstanceCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimAssociatedInstanceCommand.cs
index cc402a110ec..306bb57e288 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimAssociatedInstanceCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimAssociatedInstanceCommand.cs
@@ -33,7 +33,7 @@ public class GetCimAssociatedInstanceCommand : CimBaseCommand
         #region constructor
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="GetCimAssociatedInstanceCommand"/> class.
         /// </summary>
         public GetCimAssociatedInstanceCommand()
             : base(parameters, parameterSets)
@@ -53,14 +53,7 @@ public GetCimAssociatedInstanceCommand()
         [Parameter(
             Position = 1,
             ValueFromPipelineByPropertyName = true)]
-        public string Association
-        {
-            get { return association; }
-
-            set { association = value; }
-        }
-
-        private string association;
+        public string Association { get; set; }
 
         /// <summary>
         /// The following is the definition of the input parameter "ResultClassName".
@@ -68,14 +61,7 @@ public string Association
         /// the given instance.
         /// </summary>
         [Parameter]
-        public string ResultClassName
-        {
-            get { return resultClassName; }
-
-            set { resultClassName = value; }
-        }
-
-        private string resultClassName;
+        public string ResultClassName { get; set; }
 
         /// <summary>
         /// <para>
@@ -90,11 +76,11 @@ public string ResultClassName
         [Alias(CimBaseCommand.AliasCimInstance)]
         public CimInstance InputObject
         {
-            get { return cimInstance; }
+            get { return CimInstance; }
 
             set
             {
-                cimInstance = value;
+                CimInstance = value;
                 base.SetParameter(value, nameCimInstance);
             }
         }
@@ -102,12 +88,7 @@ public CimInstance InputObject
         /// <summary>
         /// Property for internal usage purpose.
         /// </summary>
-        internal CimInstance CimInstance
-        {
-            get { return cimInstance; }
-        }
-
-        private CimInstance cimInstance;
+        internal CimInstance CimInstance { get; private set; }
 
         /// <summary>
         /// The following is the definition of the input parameter "Namespace".
@@ -115,14 +96,7 @@ internal CimInstance CimInstance
         /// is registered.
         /// </summary>
         [Parameter(ValueFromPipelineByPropertyName = true)]
-        public string Namespace
-        {
-            get { return nameSpace; }
-
-            set { nameSpace = value; }
-        }
-
-        private string nameSpace;
+        public string Namespace { get; set; }
 
         /// <summary>
         /// The following is the definition of the input parameter "OperationTimeoutSec".
@@ -133,14 +107,7 @@ public string Namespace
         /// </summary>
         [Alias(AliasOT)]
         [Parameter(ValueFromPipelineByPropertyName = true)]
-        public UInt32 OperationTimeoutSec
-        {
-            get { return operationTimeout; }
-
-            set { operationTimeout = value; }
-        }
-
-        private UInt32 operationTimeout;
+        public UInt32 OperationTimeoutSec { get; set; }
 
         /// <summary>
         /// <para>
@@ -220,14 +187,7 @@ public Microsoft.Management.Infrastructure.CimSession[] CimSession
         /// </para>
         /// </summary>
         [Parameter]
-        public SwitchParameter KeyOnly
-        {
-            get { return keyOnly; }
-
-            set { keyOnly = value; }
-        }
-
-        private SwitchParameter keyOnly;
+        public SwitchParameter KeyOnly { get; set; }
 
         #endregion
 
@@ -315,7 +275,7 @@ private CimGetAssociatedInstance CreateOperationAgent()
         /// <summary>
         /// Static parameter definition entries.
         /// </summary>
-        private static readonly Dictionary<string, HashSet<ParameterDefinitionEntry>> parameters = new Dictionary<string, HashSet<ParameterDefinitionEntry>>
+        private static readonly Dictionary<string, HashSet<ParameterDefinitionEntry>> parameters = new()
         {
             {
                 nameComputerName, new HashSet<ParameterDefinitionEntry> {
@@ -344,7 +304,7 @@ private CimGetAssociatedInstance CreateOperationAgent()
         /// <summary>
         /// Static parameter set entries.
         /// </summary>
-        private static readonly Dictionary<string, ParameterSetEntry> parameterSets = new Dictionary<string, ParameterSetEntry>
+        private static readonly Dictionary<string, ParameterSetEntry> parameterSets = new()
         {
             {   CimBaseCommand.SessionSetName, new ParameterSetEntry(2, false)     },
             {   CimBaseCommand.ComputerSetName, new ParameterSetEntry(1, true)     },
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimClassCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimClassCommand.cs
index 498c1f06f8b..0d9de236f05 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimClassCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimClassCommand.cs
@@ -31,7 +31,7 @@ public class GetCimClassCommand : CimBaseCommand
         #region constructor
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="GetCimClassCommand"/> class.
         /// </summary>
         public GetCimClassCommand()
             : base(parameters, parameterSets)
@@ -54,14 +54,7 @@ public GetCimClassCommand()
         [Parameter(
             Position = 0,
             ValueFromPipelineByPropertyName = true)]
-        public string ClassName
-        {
-            get { return className; }
-
-            set { className = value; }
-        }
-
-        private string className;
+        public string ClassName { get; set; }
 
         /// <summary>
         /// <para>
@@ -77,14 +70,7 @@ public string ClassName
         [Parameter(
             Position = 1,
             ValueFromPipelineByPropertyName = true)]
-        public string Namespace
-        {
-            get { return nameSpace; }
-
-            set { nameSpace = value; }
-        }
-
-        private string nameSpace;
+        public string Namespace { get; set; }
 
         /// <summary>
         /// The following is the definition of the input parameter "OperationTimeoutSec".
@@ -93,14 +79,7 @@ public string Namespace
         /// </summary>
         [Alias(AliasOT)]
         [Parameter(ValueFromPipelineByPropertyName = true)]
-        public UInt32 OperationTimeoutSec
-        {
-            get { return operationTimeout; }
-
-            set { operationTimeout = value; }
-        }
-
-        private UInt32 operationTimeout;
+        public UInt32 OperationTimeoutSec { get; set; }
 
         /// <summary>
         /// The following is the definition of the input parameter "Session".
@@ -158,14 +137,7 @@ public string[] ComputerName
         /// </para>
         /// </summary>
         [Parameter(ValueFromPipelineByPropertyName = true)]
-        public string MethodName
-        {
-            get { return methodName; }
-
-            set { methodName = value; }
-        }
-
-        private string methodName;
+        public string MethodName { get; set; }
 
         /// <summary>
         /// <para>
@@ -175,14 +147,7 @@ public string MethodName
         /// </para>
         /// </summary>
         [Parameter(ValueFromPipelineByPropertyName = true)]
-        public string PropertyName
-        {
-            get { return propertyName; }
-
-            set { propertyName = value; }
-        }
-
-        private string propertyName;
+        public string PropertyName { get; set; }
 
         /// <summary>
         /// <para>
@@ -192,14 +157,7 @@ public string PropertyName
         /// </para>
         /// </summary>
         [Parameter(ValueFromPipelineByPropertyName = true)]
-        public string QualifierName
-        {
-            get { return qualifierName; }
-
-            set { qualifierName = value; }
-        }
-
-        private string qualifierName;
+        public string QualifierName { get; set; }
 
         #endregion
 
@@ -262,7 +220,7 @@ private CimGetCimClass GetOperationAgent()
         /// <returns></returns>
         private CimGetCimClass CreateOperationAgent()
         {
-            CimGetCimClass cimGetCimClass = new CimGetCimClass();
+            CimGetCimClass cimGetCimClass = new();
             this.AsyncOperation = cimGetCimClass;
             return cimGetCimClass;
         }
@@ -288,7 +246,7 @@ private CimGetCimClass CreateOperationAgent()
         /// <summary>
         /// Static parameter definition entries.
         /// </summary>
-        private static readonly Dictionary<string, HashSet<ParameterDefinitionEntry>> parameters = new Dictionary<string, HashSet<ParameterDefinitionEntry>>
+        private static readonly Dictionary<string, HashSet<ParameterDefinitionEntry>> parameters = new()
         {
             {
                 nameCimSession, new HashSet<ParameterDefinitionEntry> {
@@ -306,7 +264,7 @@ private CimGetCimClass CreateOperationAgent()
         /// <summary>
         /// Static parameter set entries.
         /// </summary>
-        private static readonly Dictionary<string, ParameterSetEntry> parameterSets = new Dictionary<string, ParameterSetEntry>
+        private static readonly Dictionary<string, ParameterSetEntry> parameterSets = new()
         {
             {   CimBaseCommand.SessionSetName, new ParameterSetEntry(1)     },
             {   CimBaseCommand.ComputerSetName, new ParameterSetEntry(0, true)     },
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimInstanceCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimInstanceCommand.cs
index 76d95d7e039..b2f00a0e624 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimInstanceCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimInstanceCommand.cs
@@ -25,6 +25,7 @@ public class GetCimInstanceCommand : CimBaseCommand
         #region constructor
 
         /// <summary>
+        /// Initializes a new instance of the <see cref="GetCimInstanceCommand"/> class.
         /// Constructor.
         /// </summary>
         public GetCimInstanceCommand()
@@ -241,14 +242,7 @@ public string Namespace
         /// </summary>
         [Alias(AliasOT)]
         [Parameter]
-        public UInt32 OperationTimeoutSec
-        {
-            get { return operationTimeout; }
-
-            set { operationTimeout = value; }
-        }
-
-        private UInt32 operationTimeout;
+        public UInt32 OperationTimeoutSec { get; set; }
 
         /// <summary>
         /// <para>The following is the definition of the input parameter "InputObject".
@@ -276,11 +270,11 @@ public UInt32 OperationTimeoutSec
         [Alias(CimBaseCommand.AliasCimInstance)]
         public CimInstance InputObject
         {
-            get { return cimInstance; }
+            get { return CimInstance; }
 
             set
             {
-                cimInstance = value;
+                CimInstance = value;
                 base.SetParameter(value, nameCimInstance);
             }
         }
@@ -288,12 +282,7 @@ public CimInstance InputObject
         /// <summary>
         /// Property for internal usage purpose.
         /// </summary>
-        internal CimInstance CimInstance
-        {
-            get { return cimInstance; }
-        }
-
-        private CimInstance cimInstance;
+        internal CimInstance CimInstance { get; private set; }
 
         /// <summary>
         /// The following is the definition of the input parameter "Query".
@@ -421,23 +410,18 @@ public string Filter
         [Alias("SelectProperties")]
         public string[] Property
         {
-            get { return property; }
+            get { return SelectProperties; }
 
             set
             {
-                property = value;
+                SelectProperties = value;
                 base.SetParameter(value, nameSelectProperties);
             }
         }
         /// <summary>
         /// Property for internal usage.
         /// </summary>
-        internal string[] SelectProperties
-        {
-            get { return property; }
-        }
-
-        private string[] property;
+        internal string[] SelectProperties { get; private set; }
 
         #endregion
 
@@ -503,7 +487,7 @@ private CimGetInstance GetOperationAgent()
         /// <returns></returns>
         private CimGetInstance CreateOperationAgent()
         {
-            CimGetInstance cimGetInstance = new CimGetInstance();
+            CimGetInstance cimGetInstance = new();
             this.AsyncOperation = cimGetInstance;
             return cimGetInstance;
         }
@@ -519,7 +503,7 @@ private void CheckArgument()
                 case CimBaseCommand.ClassNameSessionSet:
                     // validate the classname & property
                     this.className = ValidationHelper.ValidateArgumentIsValidName(nameClassName, this.className);
-                    this.property = ValidationHelper.ValidateArgumentIsValidName(nameSelectProperties, this.property);
+                    this.SelectProperties = ValidationHelper.ValidateArgumentIsValidName(nameSelectProperties, this.SelectProperties);
                     break;
                 default:
                     break;
@@ -548,7 +532,7 @@ private void CheckArgument()
         /// <summary>
         /// Static parameter definition entries.
         /// </summary>
-        private static readonly Dictionary<string, HashSet<ParameterDefinitionEntry>> parameters = new Dictionary<string, HashSet<ParameterDefinitionEntry>>
+        private static readonly Dictionary<string, HashSet<ParameterDefinitionEntry>> parameters = new()
         {
             {
                 nameCimSession, new HashSet<ParameterDefinitionEntry> {
@@ -651,7 +635,7 @@ private void CheckArgument()
         /// <summary>
         /// Static parameter set entries.
         /// </summary>
-        private static readonly Dictionary<string, ParameterSetEntry> parameterSets = new Dictionary<string, ParameterSetEntry>
+        private static readonly Dictionary<string, ParameterSetEntry> parameterSets = new()
         {
             {   CimBaseCommand.CimInstanceComputerSet, new ParameterSetEntry(1)     },
             {   CimBaseCommand.CimInstanceSessionSet, new ParameterSetEntry(2)     },
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimSessionCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimSessionCommand.cs
index 06e43b098f5..0be1b643f79 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimSessionCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/GetCimSessionCommand.cs
@@ -22,7 +22,7 @@ public sealed class GetCimSessionCommand : CimBaseCommand
         #region constructor
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="GetCimSessionCommand"/> class.
         /// </summary>
         public GetCimSessionCommand()
             : base(parameters, parameterSets)
@@ -173,7 +173,7 @@ protected override void ProcessRecord()
         /// <summary>
         /// Static parameter definition entries.
         /// </summary>
-        private static readonly Dictionary<string, HashSet<ParameterDefinitionEntry>> parameters = new Dictionary<string, HashSet<ParameterDefinitionEntry>>
+        private static readonly Dictionary<string, HashSet<ParameterDefinitionEntry>> parameters = new()
         {
             {
                 nameComputerName, new HashSet<ParameterDefinitionEntry> {
@@ -200,7 +200,7 @@ protected override void ProcessRecord()
         /// <summary>
         /// Static parameter set entries.
         /// </summary>
-        private static readonly Dictionary<string, ParameterSetEntry> parameterSets = new Dictionary<string, ParameterSetEntry>
+        private static readonly Dictionary<string, ParameterSetEntry> parameterSets = new()
         {
             {   CimBaseCommand.ComputerNameSet, new ParameterSetEntry(0, true)     },
             {   CimBaseCommand.SessionIdSet, new ParameterSetEntry(1)     },
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/InvokeCimMethodCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/InvokeCimMethodCommand.cs
index 143fa962ead..4377aeacfa4 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/InvokeCimMethodCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/InvokeCimMethodCommand.cs
@@ -27,7 +27,7 @@ public class InvokeCimMethodCommand : CimBaseCommand
         #region constructor
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="InvokeCimMethodCommand"/> class.
         /// </summary>
         public InvokeCimMethodCommand()
             : base(parameters, parameterSets)
@@ -182,11 +182,11 @@ public string QueryDialect
         [Alias(CimBaseCommand.AliasCimInstance)]
         public CimInstance InputObject
         {
-            get { return cimInstance; }
+            get { return CimInstance; }
 
             set
             {
-                cimInstance = value;
+                CimInstance = value;
                 base.SetParameter(value, nameCimInstance);
             }
         }
@@ -194,12 +194,7 @@ public CimInstance InputObject
         /// <summary>
         /// Property for internal usage purpose.
         /// </summary>
-        internal CimInstance CimInstance
-        {
-            get { return cimInstance; }
-        }
-
-        private CimInstance cimInstance;
+        internal CimInstance CimInstance { get; private set; }
 
         /// <summary>
         /// <para>The following is the definition of the input parameter "ComputerName".
@@ -287,14 +282,7 @@ public CimSession[] CimSession
         /// </summary>
         [Parameter(Position = 1, ValueFromPipelineByPropertyName = true)]
         [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
-        public IDictionary Arguments
-        {
-            get { return arguments; }
-
-            set { arguments = value; }
-        }
-
-        private IDictionary arguments;
+        public IDictionary Arguments { get; set; }
 
         /// <summary>
         /// The following is the definition of the input parameter "MethodName".
@@ -355,14 +343,7 @@ public string Namespace
         /// </summary>
         [Alias(AliasOT)]
         [Parameter]
-        public UInt32 OperationTimeoutSec
-        {
-            get { return operationTimeout; }
-
-            set { operationTimeout = value; }
-        }
-
-        private UInt32 operationTimeout;
+        public UInt32 OperationTimeoutSec { get; set; }
 
         #endregion
 
@@ -427,7 +408,7 @@ private CimInvokeCimMethod GetOperationAgent()
         /// <returns></returns>
         private CimInvokeCimMethod CreateOperationAgent()
         {
-            CimInvokeCimMethod cimInvokeMethod = new CimInvokeCimMethod();
+            CimInvokeCimMethod cimInvokeMethod = new();
             this.AsyncOperation = cimInvokeMethod;
             return cimInvokeMethod;
         }
@@ -469,7 +450,7 @@ private void CheckArgument()
         /// <summary>
         /// Static parameter definition entries.
         /// </summary>
-        private static readonly Dictionary<string, HashSet<ParameterDefinitionEntry>> parameters = new Dictionary<string, HashSet<ParameterDefinitionEntry>>
+        private static readonly Dictionary<string, HashSet<ParameterDefinitionEntry>> parameters = new()
         {
             {
                 nameClassName, new HashSet<ParameterDefinitionEntry> {
@@ -556,7 +537,7 @@ private void CheckArgument()
         /// <summary>
         /// Static parameter set entries.
         /// </summary>
-        private static readonly Dictionary<string, ParameterSetEntry> parameterSets = new Dictionary<string, ParameterSetEntry>
+        private static readonly Dictionary<string, ParameterSetEntry> parameterSets = new()
         {
             {   CimBaseCommand.ClassNameComputerSet, new ParameterSetEntry(2, true)     },
             {   CimBaseCommand.ResourceUriSessionSet, new ParameterSetEntry(3)     },
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimInstanceCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimInstanceCommand.cs
index 878f06c5e1d..e3daf3e0ede 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimInstanceCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimInstanceCommand.cs
@@ -29,7 +29,7 @@ public class NewCimInstanceCommand : CimBaseCommand
         #region constructor
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="NewCimInstanceCommand"/> class.
         /// </summary>
         public NewCimInstanceCommand()
             : base(parameters, parameterSets)
@@ -169,14 +169,7 @@ public CimClass CimClass
             ValueFromPipelineByPropertyName = true)]
         [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         [Alias("Arguments")]
-        public IDictionary Property
-        {
-            get { return property; }
-
-            set { property = value; }
-        }
-
-        private IDictionary property;
+        public IDictionary Property { get; set; }
 
         /// <summary>
         /// The following is the definition of the input parameter "Namespace".
@@ -215,14 +208,7 @@ public string Namespace
         /// </summary>
         [Alias(AliasOT)]
         [Parameter]
-        public UInt32 OperationTimeoutSec
-        {
-            get { return operationTimeout; }
-
-            set { operationTimeout = value; }
-        }
-
-        private UInt32 operationTimeout;
+        public UInt32 OperationTimeoutSec { get; set; }
 
         /// <summary>
         /// <para>
@@ -397,7 +383,7 @@ private CimNewCimInstance GetOperationAgent()
         /// <returns></returns>
         private CimNewCimInstance CreateOperationAgent()
         {
-            CimNewCimInstance cimNewCimInstance = new CimNewCimInstance();
+            CimNewCimInstance cimNewCimInstance = new();
             this.AsyncOperation = cimNewCimInstance;
             return cimNewCimInstance;
         }
@@ -437,7 +423,7 @@ private void CheckArgument()
         /// <summary>
         /// Static parameter definition entries.
         /// </summary>
-        private static readonly Dictionary<string, HashSet<ParameterDefinitionEntry>> parameters = new Dictionary<string, HashSet<ParameterDefinitionEntry>>
+        private static readonly Dictionary<string, HashSet<ParameterDefinitionEntry>> parameters = new()
         {
             {
                 nameClassName, new HashSet<ParameterDefinitionEntry> {
@@ -500,7 +486,7 @@ private void CheckArgument()
         /// <summary>
         /// Static parameter set entries.
         /// </summary>
-        private static readonly Dictionary<string, ParameterSetEntry> parameterSets = new Dictionary<string, ParameterSetEntry>
+        private static readonly Dictionary<string, ParameterSetEntry> parameterSets = new()
         {
             {   CimBaseCommand.ClassNameSessionSet, new ParameterSetEntry(2)     },
             {   CimBaseCommand.ClassNameComputerSet, new ParameterSetEntry(1, true)     },
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimSessionCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimSessionCommand.cs
index f3cff55eaf2..a4a93419e70 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimSessionCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimSessionCommand.cs
@@ -52,14 +52,7 @@ public PasswordAuthenticationMechanism Authentication
         /// </summary>
         [Parameter(Position = 1, ParameterSetName = CredentialParameterSet)]
         [Credential()]
-        public PSCredential Credential
-        {
-            get { return credential; }
-
-            set { credential = value; }
-        }
-
-        private PSCredential credential;
+        public PSCredential Credential { get; set; }
 
         /// <summary>
         /// The following is the definition of the input parameter "CertificateThumbprint".
@@ -67,14 +60,7 @@ public PSCredential Credential
         /// </summary>
         [Parameter(ValueFromPipelineByPropertyName = true,
                    ParameterSetName = CertificateParameterSet)]
-        public string CertificateThumbprint
-        {
-            get { return certificatethumbprint; }
-
-            set { certificatethumbprint = value; }
-        }
-
-        private string certificatethumbprint;
+        public string CertificateThumbprint { get; set; }
 
         /// <summary>
         /// The following is the definition of the input parameter "ComputerName".
@@ -87,14 +73,7 @@ public string CertificateThumbprint
             ValueFromPipelineByPropertyName = true)]
         [ValidateNotNullOrEmpty]
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
-        public string[] ComputerName
-        {
-            get { return computername; }
-
-            set { computername = value; }
-        }
-
-        private string[] computername;
+        public string[] ComputerName { get; set; }
 
         /// <summary>
         /// <para>
@@ -108,14 +87,7 @@ public string[] ComputerName
         /// </para>
         /// </summary>
         [Parameter(ValueFromPipelineByPropertyName = true)]
-        public string Name
-        {
-            get { return name; }
-
-            set { name = value; }
-        }
-
-        private string name;
+        public string Name { get; set; }
 
         /// <summary>
         /// <para>
@@ -125,7 +97,7 @@ public string Name
         /// </para>
         /// <para>
         /// The unit is Second.
-        /// <para>
+        /// </para>
         /// </summary>
         [Alias(AliasOT)]
         [Parameter(ValueFromPipelineByPropertyName = true)]
@@ -150,17 +122,7 @@ public UInt32 OperationTimeoutSec
         /// </para>
         /// </summary>
         [Parameter(ValueFromPipelineByPropertyName = true)]
-        public SwitchParameter SkipTestConnection
-        {
-            get { return skipTestConnection; }
-
-            set
-            {
-                skipTestConnection = value;
-            }
-        }
-
-        private SwitchParameter skipTestConnection;
+        public SwitchParameter SkipTestConnection { get; set; }
 
         /// <summary>
         /// The following is the definition of the input parameter "Port".
@@ -191,19 +153,14 @@ public UInt32 Port
         /// If the argument is not given, a default SessionOption will be created for
         /// the session in .NET API layer.
         /// </para>
+        /// <para>
         /// If a <see cref="DCOMSessionOption"/> object is passed, then
         /// connection is made using DCOM. If a <see cref="WsManSessionOption"/>
         /// object is passed, then connection is made using WsMan.
+        /// </para>
         /// </summary>
         [Parameter(ValueFromPipelineByPropertyName = true)]
-        public Microsoft.Management.Infrastructure.Options.CimSessionOptions SessionOption
-        {
-            get { return sessionOption; }
-
-            set { sessionOption = value; }
-        }
-
-        private Microsoft.Management.Infrastructure.Options.CimSessionOptions sessionOption;
+        public Microsoft.Management.Infrastructure.Options.CimSessionOptions SessionOption { get; set; }
 
         #endregion
 
@@ -256,11 +213,11 @@ internal void BuildSessionOptions(out CimSessionOptions outputOptions, out CimCr
                 // clone the sessionOption object
                 if (this.SessionOption is WSManSessionOptions)
                 {
-                    options = new WSManSessionOptions(this.sessionOption as WSManSessionOptions);
+                    options = new WSManSessionOptions(this.SessionOption as WSManSessionOptions);
                 }
                 else
                 {
-                    options = new DComSessionOptions(this.sessionOption as DComSessionOptions);
+                    options = new DComSessionOptions(this.SessionOption as DComSessionOptions);
                 }
             }
 
@@ -304,7 +261,7 @@ internal void BuildSessionOptions(out CimSessionOptions outputOptions, out CimCr
 
                 if (this.CertificateThumbprint != null)
                 {
-                    CimCredential credentials = new CimCredential(CertificateAuthenticationMechanism.Default, this.CertificateThumbprint);
+                    CimCredential credentials = new(CertificateAuthenticationMechanism.Default, this.CertificateThumbprint);
                     wsmanOptions.AddDestinationCredentials(credentials);
                 }
 
@@ -319,7 +276,7 @@ internal void BuildSessionOptions(out CimSessionOptions outputOptions, out CimCr
                 }
             }
 
-            if (this.authenticationSet || (this.credential != null))
+            if (this.authenticationSet || (this.Credential != null))
             {
                 PasswordAuthenticationMechanism authentication = this.authenticationSet ? this.Authentication : PasswordAuthenticationMechanism.Default;
                 if (this.authenticationSet)
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimSessionOptionCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/NewCimSessionOptionCommand.cs
index 999cb3baecc..7fb8f91b9dc 100644
--- 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
@@ -45,7 +45,7 @@ public sealed class NewCimSessionOptionCommand : CimBaseCommand
         #region constructor
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="NewCimSessionOptionCommand"/> class.
         /// </summary>
         public NewCimSessionOptionCommand()
             : base(parameters, parameterSets)
@@ -416,28 +416,14 @@ public ProtocolType Protocol
         /// Specifies the UI Culture to use. i.e. en-us, ar-sa.
         /// </summary>
         [Parameter(ValueFromPipelineByPropertyName = true)]
-        public CultureInfo UICulture
-        {
-            get { return uiculture; }
-
-            set { uiculture = value; }
-        }
-
-        private CultureInfo uiculture;
+        public CultureInfo UICulture { get; set; }
 
         /// <summary>
         /// The following is the definition of the input parameter "Culture".
         /// Specifies the culture to use. i.e. en-us, ar-sa.
         /// </summary>
         [Parameter(ValueFromPipelineByPropertyName = true)]
-        public CultureInfo Culture
-        {
-            get { return culture; }
-
-            set { culture = value; }
-        }
-
-        private CultureInfo culture;
+        public CultureInfo Culture { get; set; }
 
         #endregion
 
@@ -522,7 +508,7 @@ protected override void EndProcessing()
         /// <returns></returns>
         internal DComSessionOptions CreateDComSessionOptions()
         {
-            DComSessionOptions dcomoptions = new DComSessionOptions();
+            DComSessionOptions dcomoptions = new();
             if (this.impersonationSet)
             {
                 dcomoptions.Impersonation = this.Impersonation;
@@ -562,7 +548,7 @@ internal DComSessionOptions CreateDComSessionOptions()
         /// <returns></returns>
         internal WSManSessionOptions CreateWSMANSessionOptions()
         {
-            WSManSessionOptions wsmanoptions = new WSManSessionOptions();
+            WSManSessionOptions wsmanoptions = new();
             if (this.noEncryptionSet)
             {
                 wsmanoptions.NoEncryption = true;
@@ -638,7 +624,7 @@ internal WSManSessionOptions CreateWSMANSessionOptions()
 
             if (!string.IsNullOrWhiteSpace(this.ProxyCertificateThumbprint))
             {
-                CimCredential credentials = new CimCredential(CertificateAuthenticationMechanism.Default, this.ProxyCertificateThumbprint);
+                CimCredential credentials = new(CertificateAuthenticationMechanism.Default, this.ProxyCertificateThumbprint);
                 wsmanoptions.AddProxyCredentials(credentials);
             }
 
@@ -712,7 +698,7 @@ internal WSManSessionOptions CreateWSMANSessionOptions()
         /// <summary>
         /// Static parameter definition entries.
         /// </summary>
-        private static readonly Dictionary<string, HashSet<ParameterDefinitionEntry>> parameters = new Dictionary<string, HashSet<ParameterDefinitionEntry>>
+        private static readonly Dictionary<string, HashSet<ParameterDefinitionEntry>> parameters = new()
         {
             {
                 nameNoEncryption, new HashSet<ParameterDefinitionEntry> {
@@ -813,7 +799,7 @@ internal WSManSessionOptions CreateWSMANSessionOptions()
         /// <summary>
         /// Static parameter set entries.
         /// </summary>
-        private static readonly Dictionary<string, ParameterSetEntry> parameterSets = new Dictionary<string, ParameterSetEntry>
+        private static readonly Dictionary<string, ParameterSetEntry> parameterSets = new()
         {
             {   CimBaseCommand.ProtocolNameParameterSet, new ParameterSetEntry(1, true)     },
             {   CimBaseCommand.DcomParameterSet, new ParameterSetEntry(0)     },
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/RegisterCimIndicationCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/RegisterCimIndicationCommand.cs
index ec761587b64..159a75ed3ef 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/RegisterCimIndicationCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/RegisterCimIndicationCommand.cs
@@ -35,14 +35,7 @@ public class RegisterCimIndicationCommand : ObjectEventRegistrationBase
         /// </para>
         /// </summary>
         [Parameter]
-        public string Namespace
-        {
-            get { return nameSpace; }
-
-            set { nameSpace = value; }
-        }
-
-        private string nameSpace;
+        public string Namespace { get; set; }
 
         /// <summary>
         /// The following is the definition of the input parameter "ClassName".
@@ -122,14 +115,7 @@ public string QueryDialect
         /// </summary>
         [Alias(CimBaseCommand.AliasOT)]
         [Parameter]
-        public UInt32 OperationTimeoutSec
-        {
-            get { return operationTimeout; }
-
-            set { operationTimeout = value; }
-        }
-
-        private UInt32 operationTimeout;
+        public UInt32 OperationTimeoutSec { get; set; }
 
         /// <summary>
         /// The following is the definition of the input parameter "Session".
@@ -292,7 +278,7 @@ private void CheckArgument()
         /// <summary>
         /// Parameter binder used to resolve parameter set name.
         /// </summary>
-        private readonly ParameterBinder parameterBinder = new ParameterBinder(
+        private readonly ParameterBinder parameterBinder = new(
             parameters, parameterSets);
 
         /// <summary>
@@ -320,7 +306,7 @@ private void SetParameter(object value, string parameterName)
         /// <summary>
         /// Static parameter definition entries.
         /// </summary>
-        private static readonly Dictionary<string, HashSet<ParameterDefinitionEntry>> parameters = new Dictionary<string, HashSet<ParameterDefinitionEntry>>
+        private static readonly Dictionary<string, HashSet<ParameterDefinitionEntry>> parameters = new()
         {
             {
                 nameClassName, new HashSet<ParameterDefinitionEntry> {
@@ -357,7 +343,7 @@ private void SetParameter(object value, string parameterName)
         /// <summary>
         /// Static parameter set entries.
         /// </summary>
-        private static readonly Dictionary<string, ParameterSetEntry> parameterSets = new Dictionary<string, ParameterSetEntry>
+        private static readonly Dictionary<string, ParameterSetEntry> parameterSets = new()
         {
             {   CimBaseCommand.QueryExpressionSessionSet, new ParameterSetEntry(2)     },
             {   CimBaseCommand.QueryExpressionComputerSet, new ParameterSetEntry(1)     },
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/RemoveCimInstanceCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/RemoveCimInstanceCommand.cs
index e778b2b1184..dcdcbd405f7 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/RemoveCimInstanceCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/RemoveCimInstanceCommand.cs
@@ -27,7 +27,7 @@ public class RemoveCimInstanceCommand : CimBaseCommand
         #region constructor
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="RemoveCimInstanceCommand"/> class.
         /// </summary>
         public RemoveCimInstanceCommand()
             : base(parameters, parameterSets)
@@ -142,14 +142,7 @@ public string Namespace
         /// </summary>
         [Alias(AliasOT)]
         [Parameter]
-        public UInt32 OperationTimeoutSec
-        {
-            get { return operationTimeout; }
-
-            set { operationTimeout = value; }
-        }
-
-        private UInt32 operationTimeout;
+        public UInt32 OperationTimeoutSec { get; set; }
 
         /// <summary>
         /// The following is the definition of the input parameter "InputObject".
@@ -168,11 +161,11 @@ public UInt32 OperationTimeoutSec
         [Alias(CimBaseCommand.AliasCimInstance)]
         public CimInstance InputObject
         {
-            get { return cimInstance; }
+            get { return CimInstance; }
 
             set
             {
-                cimInstance = value;
+                CimInstance = value;
                 base.SetParameter(value, nameCimInstance);
             }
         }
@@ -180,12 +173,7 @@ public CimInstance InputObject
         /// <summary>
         /// Property for internal usage purpose.
         /// </summary>
-        internal CimInstance CimInstance
-        {
-            get { return cimInstance; }
-        }
-
-        private CimInstance cimInstance;
+        internal CimInstance CimInstance { get; private set; }
 
         /// <summary>
         /// The following is the definition of the input parameter "Query".
@@ -297,7 +285,7 @@ private CimRemoveCimInstance GetOperationAgent()
         /// <returns></returns>
         private CimRemoveCimInstance CreateOperationAgent()
         {
-            CimRemoveCimInstance cimRemoveInstance = new CimRemoveCimInstance();
+            CimRemoveCimInstance cimRemoveInstance = new();
             this.AsyncOperation = cimRemoveInstance;
             return cimRemoveInstance;
         }
@@ -319,7 +307,7 @@ private CimRemoveCimInstance CreateOperationAgent()
         /// <summary>
         /// Static parameter definition entries.
         /// </summary>
-        private static readonly Dictionary<string, HashSet<ParameterDefinitionEntry>> parameters = new Dictionary<string, HashSet<ParameterDefinitionEntry>>
+        private static readonly Dictionary<string, HashSet<ParameterDefinitionEntry>> parameters = new()
         {
             {
                 nameCimSession, new HashSet<ParameterDefinitionEntry> {
@@ -368,7 +356,7 @@ private CimRemoveCimInstance CreateOperationAgent()
         /// <summary>
         /// Static parameter set entries.
         /// </summary>
-        private static readonly Dictionary<string, ParameterSetEntry> parameterSets = new Dictionary<string, ParameterSetEntry>
+        private static readonly Dictionary<string, ParameterSetEntry> parameterSets = new()
         {
             {   CimBaseCommand.CimInstanceComputerSet, new ParameterSetEntry(1, true)     },
             {   CimBaseCommand.CimInstanceSessionSet, new ParameterSetEntry(2)     },
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/RemoveCimSessionCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/RemoveCimSessionCommand.cs
index 13b13fa11b5..00f575c41c8 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/RemoveCimSessionCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/RemoveCimSessionCommand.cs
@@ -29,7 +29,7 @@ public sealed class RemoveCimSessionCommand : CimBaseCommand
         #region constructor
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="RemoveCimSessionCommand"/> class.
         /// </summary>
         public RemoveCimSessionCommand()
             : base(parameters, parameterSets)
@@ -199,7 +199,7 @@ protected override void ProcessRecord()
         /// <summary>
         /// Static parameter definition entries.
         /// </summary>
-        private static readonly Dictionary<string, HashSet<ParameterDefinitionEntry>> parameters = new Dictionary<string, HashSet<ParameterDefinitionEntry>>
+        private static readonly Dictionary<string, HashSet<ParameterDefinitionEntry>> parameters = new()
         {
             {
                 nameCimSession, new HashSet<ParameterDefinitionEntry> {
@@ -231,7 +231,7 @@ protected override void ProcessRecord()
         /// <summary>
         /// Static parameter set entries.
         /// </summary>
-        private static readonly Dictionary<string, ParameterSetEntry> parameterSets = new Dictionary<string, ParameterSetEntry>
+        private static readonly Dictionary<string, ParameterSetEntry> parameterSets = new()
         {
             {   CimBaseCommand.CimSessionSet, new ParameterSetEntry(1, true)     },
             {   CimBaseCommand.ComputerNameSet, new ParameterSetEntry(1)     },
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/SetCimInstanceCommand.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/SetCimInstanceCommand.cs
index fb8ad66d834..03c01785f1c 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/SetCimInstanceCommand.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/SetCimInstanceCommand.cs
@@ -29,7 +29,7 @@ public class SetCimInstanceCommand : CimBaseCommand
         #region constructor
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="SetCimInstanceCommand"/> class.
         /// </summary>
         public SetCimInstanceCommand()
             : base(parameters, parameterSets)
@@ -139,14 +139,7 @@ public string Namespace
         /// </summary>
         [Alias(AliasOT)]
         [Parameter]
-        public UInt32 OperationTimeoutSec
-        {
-            get { return operationTimeout; }
-
-            set { operationTimeout = value; }
-        }
-
-        private UInt32 operationTimeout;
+        public UInt32 OperationTimeoutSec { get; set; }
 
         /// <summary>
         /// The following is the definition of the input parameter "InputObject".
@@ -165,11 +158,11 @@ public UInt32 OperationTimeoutSec
         [Alias(CimBaseCommand.AliasCimInstance)]
         public CimInstance InputObject
         {
-            get { return cimInstance; }
+            get { return CimInstance; }
 
             set
             {
-                cimInstance = value;
+                CimInstance = value;
                 base.SetParameter(value, nameCimInstance);
             }
         }
@@ -177,12 +170,7 @@ public CimInstance InputObject
         /// <summary>
         /// Property for internal usage purpose.
         /// </summary>
-        internal CimInstance CimInstance
-        {
-            get { return cimInstance; }
-        }
-
-        private CimInstance cimInstance;
+        internal CimInstance CimInstance { get; private set; }
 
         /// <summary>
         /// The following is the definition of the input parameter "Query".
@@ -268,8 +256,10 @@ public IDictionary Property
         private IDictionary property;
 
         /// <summary>
+        /// <para>
         /// The following is the definition of the input parameter "PassThru",
         /// indicate whether Set-CimInstance should output modified result instance or not.
+        /// </para>
         /// <para>
         /// True indicates output the result instance, otherwise output nothing as by default
         /// behavior.
@@ -277,20 +267,7 @@ public IDictionary Property
         /// </summary>
         [Parameter]
         [ValidateNotNull]
-        public SwitchParameter PassThru
-        {
-            get
-            {
-                return this.passThru;
-            }
-
-            set
-            {
-                this.passThru = value;
-            }
-        }
-
-        private SwitchParameter passThru;
+        public SwitchParameter PassThru { get; set; }
 
         #endregion
 
@@ -354,7 +331,7 @@ private CimSetCimInstance GetOperationAgent()
         /// <returns></returns>
         private CimSetCimInstance CreateOperationAgent()
         {
-            CimSetCimInstance cimSetCimInstance = new CimSetCimInstance();
+            CimSetCimInstance cimSetCimInstance = new();
             this.AsyncOperation = cimSetCimInstance;
             return cimSetCimInstance;
         }
@@ -377,7 +354,7 @@ private CimSetCimInstance CreateOperationAgent()
         /// <summary>
         /// Static parameter definition entries.
         /// </summary>
-        private static readonly Dictionary<string, HashSet<ParameterDefinitionEntry>> parameters = new Dictionary<string, HashSet<ParameterDefinitionEntry>>
+        private static readonly Dictionary<string, HashSet<ParameterDefinitionEntry>> parameters = new()
         {
             {
                 nameCimSession, new HashSet<ParameterDefinitionEntry> {
@@ -434,7 +411,7 @@ private CimSetCimInstance CreateOperationAgent()
         /// <summary>
         /// Static parameter set entries.
         /// </summary>
-        private static readonly Dictionary<string, ParameterSetEntry> parameterSets = new Dictionary<string, ParameterSetEntry>
+        private static readonly Dictionary<string, ParameterSetEntry> parameterSets = new()
         {
             {   CimBaseCommand.QuerySessionSet, new ParameterSetEntry(3)     },
             {   CimBaseCommand.QueryComputerSet, new ParameterSetEntry(2)     },
diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/Utils.cs b/src/Microsoft.Management.Infrastructure.CimCmdlets/Utils.cs
index 34614051ece..bab5c092894 100644
--- a/src/Microsoft.Management.Infrastructure.CimCmdlets/Utils.cs
+++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/Utils.cs
@@ -138,31 +138,14 @@ internal static class DebugHelper
         /// <summary>
         /// Flag used to control generating log message into file.
         /// </summary>
-        private static bool generateLog = true;
-
-        internal static bool GenerateLog
-        {
-            get { return generateLog; }
-
-            set { generateLog = value; }
-        }
+        internal static bool GenerateLog { get; set; } = true;
 
         /// <summary>
         /// Whether the log been initialized.
         /// </summary>
         private static bool logInitialized = false;
 
-        /// <summary>
-        /// Flag used to control generating message into powershell.
-        /// </summary>
-        private static bool generateVerboseMessage = true;
-
-        internal static bool GenerateVerboseMessage
-        {
-            get { return generateVerboseMessage; }
-
-            set { generateVerboseMessage = value; }
-        }
+        internal static bool GenerateVerboseMessage { get; set; } = true;
 
         /// <summary>
         /// Flag used to control generating message into powershell.
@@ -189,7 +172,7 @@ internal static bool GenerateVerboseMessage
         /// <summary>
         /// Lock the log file.
         /// </summary>
-        internal static readonly object logLock = new object();
+        internal static readonly object logLock = new();
 
         #endregion
 
@@ -214,7 +197,7 @@ internal static bool GenerateVerboseMessage
         #region runtime methods
         internal static string GetSourceCodeInformation(bool withFileName, int depth)
         {
-            StackTrace trace = new StackTrace();
+            StackTrace trace = new();
             StackFrame frame = trace.GetFrame(depth);
             // if (withFileName)
             // {
@@ -337,7 +320,7 @@ private static void WriteLogInternal(string message, int indent, int depth)
                 }
             }
 
-            if (generateLog)
+            if (GenerateLog)
             {
                 if (indent < 0)
                 {
@@ -364,8 +347,8 @@ private static void WriteLogInternal(string message, int indent, int depth)
 
                 lock (logLock)
                 {
-                    using (FileStream fs = new FileStream(logFile, FileMode.OpenOrCreate))
-                    using (StreamWriter writer = new StreamWriter(fs))
+                    using (FileStream fs = new(logFile, FileMode.OpenOrCreate))
+                    using (StreamWriter writer = new(fs))
                     {
                         writer.WriteLineAsync(spaces[indent] + sourceInformation + @"        " + message);
                     }
@@ -423,7 +406,7 @@ public static string ValidateArgumentIsValidName(string parameterName, string va
                 string trimed = value.Trim();
                 // The first character should be contained in set: [A-Za-z_]
                 // Inner characters should be contained in set: [A-Za-z0-9_]
-                Regex regex = new Regex(@"^[a-zA-Z_][a-zA-Z0-9_]*\z");
+                Regex regex = new(@"^[a-zA-Z_][a-zA-Z0-9_]*\z");
                 if (regex.IsMatch(trimed))
                 {
                     DebugHelper.WriteLogEx("A valid name: {0}={1}", 0, parameterName, value);
diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/CommonUtils.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/CommonUtils.cs
index b38be768eee..fb788b4d26c 100644
--- a/src/Microsoft.PowerShell.Commands.Diagnostics/CommonUtils.cs
+++ b/src/Microsoft.PowerShell.Commands.Diagnostics/CommonUtils.cs
@@ -55,7 +55,6 @@ public static uint FormatMessageFromModule(uint lastError, string moduleName, ou
 
             try
             {
-                uint dwFormatFlags = FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE;
                 uint LANGID = (uint)GetUserDefaultLangID();
                 uint langError = (uint)Marshal.GetLastWin32Error();
                 if (langError != 0)
@@ -63,14 +62,15 @@ public static uint FormatMessageFromModule(uint lastError, string moduleName, ou
                     LANGID = 0; // neutral
                 }
 
-                StringBuilder outStringBuilder = new StringBuilder(1024);
-                uint nChars = FormatMessage(dwFormatFlags,
-                    moduleHandle,
-                    lastError,
-                    LANGID,
-                    outStringBuilder,
-                    (uint)outStringBuilder.Capacity,
-                    IntPtr.Zero);
+                StringBuilder outStringBuilder = new(1024);
+                uint nChars = FormatMessage(
+                    dwFlags: FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_HMODULE,
+                    lpSource: moduleHandle,
+                    dwMessageId: lastError,
+                    dwLanguageId: LANGID,
+                    lpBuffer: outStringBuilder,
+                    nSize: (uint)outStringBuilder.Capacity,
+                    Arguments: IntPtr.Zero);
 
                 if (nChars == 0)
                 {
diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/CoreCLR/Stubs.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/CoreCLR/Stubs.cs
index 9e320e610d0..5d57816c0e7 100644
--- a/src/Microsoft.PowerShell.Commands.Diagnostics/CoreCLR/Stubs.cs
+++ b/src/Microsoft.PowerShell.Commands.Diagnostics/CoreCLR/Stubs.cs
@@ -28,8 +28,8 @@ public enum PerformanceCounterCategoryType
     }
 
     /// <summary>
-    /// Specifies the formula used to calculate the <see cref="M:System.Diagnostics.PerformanceCounter.NextValue" />
-    /// method for a <see cref="T:System.Diagnostics.PerformanceCounter" /> instance.
+    /// Specifies the formula used to calculate the <see cref="M:System.Diagnostics.PerformanceCounter.NextValue"/>
+    /// method for a <see cref="T:System.Diagnostics.PerformanceCounter"/> instance.
     /// </summary>
     /// <filterpriority>2</filterpriority>
     public enum PerformanceCounterType
diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/CounterSet.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/CounterSet.cs
index a8c5b8a74d5..2eb6b1dd7ce 100644
--- a/src/Microsoft.PowerShell.Commands.Diagnostics/CounterSet.cs
+++ b/src/Microsoft.PowerShell.Commands.Diagnostics/CounterSet.cs
@@ -89,7 +89,7 @@ public StringCollection Paths
         {
             get
             {
-                StringCollection retColl = new StringCollection();
+                StringCollection retColl = new();
                 foreach (string counterName in this.CounterInstanceMapping.Keys)
                 {
                     string path;
@@ -117,7 +117,7 @@ public StringCollection PathsWithInstances
         {
             get
             {
-                StringCollection retColl = new StringCollection();
+                StringCollection retColl = new();
                 foreach (string counterName in CounterInstanceMapping.Keys)
                 {
                     foreach (string instanceName in CounterInstanceMapping[counterName])
diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/GetCounterCommand.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/GetCounterCommand.cs
index 015f7a31d8e..b3f98a9364e 100644
--- a/src/Microsoft.PowerShell.Commands.Diagnostics/GetCounterCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Diagnostics/GetCounterCommand.cs
@@ -81,7 +81,7 @@ public string[] Counter
 
         private bool _defaultCounters = true;
 
-        private readonly List<string> _accumulatedCounters = new List<string>();
+        private readonly List<string> _accumulatedCounters = new();
 
         //
         // SampleInterval parameter.
@@ -168,7 +168,7 @@ public string[] ComputerName
 
         private PdhHelper _pdhHelper = null;
 
-        private readonly EventWaitHandle _cancelEventArrived = new EventWaitHandle(false, EventResetMode.ManualReset);
+        private readonly EventWaitHandle _cancelEventArrived = new(false, EventResetMode.ManualReset);
 
         // Culture identifier(s)
         private const string FrenchCultureId = "fr-FR";
@@ -180,7 +180,7 @@ public string[] ComputerName
         //
         // With this dictionary, we can add special mapping if we find other special cases in the future.
         private readonly Dictionary<string, List<Tuple<char, char>>> _cultureAndSpecialCharacterMap =
-            new Dictionary<string, List<Tuple<char, char>>>()
+            new()
                 {
                    {
                        FrenchCultureId, new List<Tuple<char, char>>()
@@ -218,7 +218,7 @@ protected override void BeginProcessing()
 
             if (Continuous.IsPresent && _maxSamplesSpecified)
             {
-                Exception exc = new Exception(string.Format(CultureInfo.CurrentCulture, _resourceMgr.GetString("CounterContinuousOrMaxSamples")));
+                Exception exc = new(string.Format(CultureInfo.CurrentCulture, _resourceMgr.GetString("CounterContinuousOrMaxSamples")));
                 ThrowTerminatingError(new ErrorRecord(exc, "CounterContinuousOrMaxSamples", ErrorCategory.InvalidArgument, null));
             }
         }
@@ -305,20 +305,20 @@ private void ProcessListSet()
         //
         private void ProcessListSetPerMachine(string machine)
         {
-            StringCollection counterSets = new StringCollection();
+            StringCollection counterSets = new();
             uint res = _pdhHelper.EnumObjects(machine, ref counterSets);
             if (res != PdhResults.PDH_CSTATUS_VALID_DATA)
             {
                 // add an error message
                 string msg = string.Format(CultureInfo.InvariantCulture, _resourceMgr.GetString("NoCounterSetsOnComputer"), machine, res);
-                Exception exc = new Exception(msg);
+                Exception exc = new(msg);
                 WriteError(new ErrorRecord(exc, "NoCounterSetsOnComputer", ErrorCategory.InvalidResult, machine));
                 return;
             }
 
             CultureInfo culture = GetCurrentCulture();
             List<Tuple<char, char>> characterReplacementList = null;
-            StringCollection validPaths = new StringCollection();
+            StringCollection validPaths = new();
 
             _cultureAndSpecialCharacterMap.TryGetValue(culture.Name, out characterReplacementList);
 
@@ -335,7 +335,7 @@ private void ProcessListSetPerMachine(string machine)
                     }
                 }
 
-                WildcardPattern wildLogPattern = new WildcardPattern(normalizedPattern, WildcardOptions.IgnoreCase);
+                WildcardPattern wildLogPattern = new(normalizedPattern, WildcardOptions.IgnoreCase);
 
                 foreach (string counterSet in counterSets)
                 {
@@ -344,14 +344,14 @@ private void ProcessListSetPerMachine(string machine)
                         continue;
                     }
 
-                    StringCollection counterSetCounters = new StringCollection();
-                    StringCollection counterSetInstances = new StringCollection();
+                    StringCollection counterSetCounters = new();
+                    StringCollection counterSetInstances = new();
 
                     res = _pdhHelper.EnumObjectItems(machine, counterSet, ref counterSetCounters, ref counterSetInstances);
                     if (res == PdhResults.PDH_ACCESS_DENIED)
                     {
                         string msg = string.Format(CultureInfo.InvariantCulture, _resourceMgr.GetString("CounterSetEnumAccessDenied"), counterSet);
-                        Exception exc = new Exception(msg);
+                        Exception exc = new(msg);
                         WriteError(new ErrorRecord(exc, "CounterSetEnumAccessDenied", ErrorCategory.InvalidResult, null));
                         continue;
                     }
@@ -377,7 +377,7 @@ private void ProcessListSetPerMachine(string machine)
                         instanceArray[0] = "*";
                     }
 
-                    Dictionary<string, string[]> counterInstanceMapping = new Dictionary<string, string[]>();
+                    Dictionary<string, string[]> counterInstanceMapping = new();
                     foreach (string counter in counterSetCounters)
                     {
                         counterInstanceMapping.TryAdd(counter, instanceArray);
@@ -395,7 +395,7 @@ private void ProcessListSetPerMachine(string machine)
 
                     string setHelp = _pdhHelper.GetCounterSetHelp(machine, counterSet);
 
-                    CounterSet setObj = new CounterSet(counterSet, machine, categoryType, setHelp, ref counterInstanceMapping);
+                    CounterSet setObj = new(counterSet, machine, categoryType, setHelp, ref counterInstanceMapping);
                     WriteObject(setObj);
                     bMatched = true;
                 }
@@ -403,7 +403,7 @@ private void ProcessListSetPerMachine(string machine)
                 if (!bMatched)
                 {
                     string msg = _resourceMgr.GetString("NoMatchingCounterSetsFound");
-                    Exception exc = new Exception(string.Format(CultureInfo.InvariantCulture, msg,
+                    Exception exc = new(string.Format(CultureInfo.InvariantCulture, msg,
                       machine ?? "localhost", normalizedPattern));
                     WriteError(new ErrorRecord(exc, "NoMatchingCounterSetsFound", ErrorCategory.ObjectNotFound, null));
                 }
@@ -431,7 +431,7 @@ private void ProcessGetCounter()
                 _cultureAndSpecialCharacterMap.TryGetValue(culture.Name, out characterReplacementList);
             }
 
-            StringCollection allExpandedPaths = new StringCollection();
+            StringCollection allExpandedPaths = new();
             uint res;
             foreach (string path in paths)
             {
@@ -442,7 +442,7 @@ private void ProcessGetCounter()
                     if (res != PdhResults.PDH_CSTATUS_VALID_DATA)
                     {
                         string msg = string.Format(CultureInfo.CurrentCulture, _resourceMgr.GetString("CounterPathTranslationFailed"), res);
-                        Exception exc = new Exception(msg);
+                        Exception exc = new(msg);
                         WriteError(new ErrorRecord(exc, "CounterPathTranslationFailed", ErrorCategory.InvalidResult, null));
 
                         localizedPath = path;
@@ -470,7 +470,7 @@ private void ProcessGetCounter()
                     if (!_pdhHelper.IsPathValid(expandedPath))
                     {
                         string msg = string.Format(CultureInfo.CurrentCulture, _resourceMgr.GetString("CounterPathIsInvalid"), localizedPath);
-                        Exception exc = new Exception(msg);
+                        Exception exc = new(msg);
                         WriteError(new ErrorRecord(exc, "CounterPathIsInvalid", ErrorCategory.InvalidResult, null));
 
                         continue;
@@ -567,7 +567,7 @@ private void ReportPdhError(uint res, bool bTerminate)
                 msg = string.Format(CultureInfo.InvariantCulture, _resourceMgr.GetString("CounterApiError"), res);
             }
 
-            Exception exc = new Exception(msg);
+            Exception exc = new(msg);
             if (bTerminate)
             {
                 ThrowTerminatingError(new ErrorRecord(exc, "CounterApiError", ErrorCategory.InvalidResult, null));
@@ -585,7 +585,7 @@ private void ReportPdhError(uint res, bool bTerminate)
         //
         private List<string> CombineMachinesAndCounterPaths()
         {
-            List<string> retColl = new List<string>();
+            List<string> retColl = new();
 
             if (_computerName.Length == 0)
             {
@@ -630,7 +630,7 @@ private void WriteSampleSetObject(PerformanceCounterSampleSet set)
                 if (sample.Status != 0)
                 {
                     string msg = string.Format(CultureInfo.InvariantCulture, _resourceMgr.GetString("CounterSampleDataInvalid"));
-                    Exception exc = new Exception(msg);
+                    Exception exc = new(msg);
                     WriteError(new ErrorRecord(exc, "CounterApiError", ErrorCategory.InvalidResult, null));
                     break;
                 }
diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/GetEventCommand.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/GetEventCommand.cs
index 5289767da29..ae362bcfb0e 100644
--- a/src/Microsoft.PowerShell.Commands.Diagnostics/GetEventCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Diagnostics/GetEventCommand.cs
@@ -395,14 +395,14 @@ public SwitchParameter Oldest
         // Other private members and constants
         //
         private ResourceManager _resourceMgr = null;
-        private readonly Dictionary<string, StringCollection> _providersByLogMap = new Dictionary<string, StringCollection>();
+        private readonly Dictionary<string, StringCollection> _providersByLogMap = new();
 
         private StringCollection _logNamesMatchingWildcard = null;
-        private readonly StringCollection _resolvedPaths = new StringCollection();
+        private readonly StringCollection _resolvedPaths = new();
 
-        private readonly List<string> _accumulatedLogNames = new List<string>();
-        private readonly List<string> _accumulatedProviderNames = new List<string>();
-        private readonly List<string> _accumulatedFileNames = new List<string>();
+        private readonly List<string> _accumulatedLogNames = new();
+        private readonly List<string> _accumulatedProviderNames = new();
+        private readonly List<string> _accumulatedFileNames = new();
 
         private const uint MAX_EVENT_BATCH = 100;
 
@@ -607,7 +607,7 @@ private void ProcessListLog()
                 foreach (string logPattern in _listLog)
                 {
                     bool bMatchFound = false;
-                    WildcardPattern wildLogPattern = new WildcardPattern(logPattern, WildcardOptions.IgnoreCase);
+                    WildcardPattern wildLogPattern = new(logPattern, WildcardOptions.IgnoreCase);
 
                     foreach (string logName in eventLogSession.GetLogNames())
                     {
@@ -618,7 +618,7 @@ private void ProcessListLog()
                         {
                             try
                             {
-                                EventLogConfiguration logObj = new EventLogConfiguration(logName, eventLogSession);
+                                EventLogConfiguration logObj = new(logName, eventLogSession);
 
                                 //
                                 // Skip direct channels matching the wildcard unless -Force is present.
@@ -633,7 +633,7 @@ private void ProcessListLog()
 
                                 EventLogInformation logInfoObj = eventLogSession.GetLogInformation(logName, PathType.LogName);
 
-                                PSObject outputObj = new PSObject(logObj);
+                                PSObject outputObj = new(logObj);
 
                                 outputObj.Properties.Add(new PSNoteProperty("FileSize", logInfoObj.FileSize));
                                 outputObj.Properties.Add(new PSNoteProperty("IsLogFull", logInfoObj.IsLogFull));
@@ -650,7 +650,7 @@ private void ProcessListLog()
                                 string msg = string.Format(CultureInfo.InvariantCulture,
                                                         _resourceMgr.GetString("LogInfoUnavailable"),
                                                         logName, exc.Message);
-                                Exception outerExc = new Exception(msg, exc);
+                                Exception outerExc = new(msg, exc);
                                 WriteError(new ErrorRecord(outerExc, "LogInfoUnavailable", ErrorCategory.NotSpecified, null));
                                 continue;
                             }
@@ -660,7 +660,7 @@ private void ProcessListLog()
                     if (!bMatchFound)
                     {
                         string msg = _resourceMgr.GetString("NoMatchingLogsFound");
-                        Exception exc = new Exception(string.Format(CultureInfo.InvariantCulture, msg, _computerName, logPattern));
+                        Exception exc = new(string.Format(CultureInfo.InvariantCulture, msg, _computerName, logPattern));
                         WriteError(new ErrorRecord(exc, "NoMatchingLogsFound", ErrorCategory.ObjectNotFound, null));
                     }
                 }
@@ -677,7 +677,7 @@ private void ProcessListProvider()
                 foreach (string provPattern in _listProvider)
                 {
                     bool bMatchFound = false;
-                    WildcardPattern wildProvPattern = new WildcardPattern(provPattern, WildcardOptions.IgnoreCase);
+                    WildcardPattern wildProvPattern = new(provPattern, WildcardOptions.IgnoreCase);
 
                     foreach (string provName in eventLogSession.GetProviderNames())
                     {
@@ -688,7 +688,7 @@ private void ProcessListProvider()
                         {
                             try
                             {
-                                ProviderMetadata provObj = new ProviderMetadata(provName, eventLogSession, CultureInfo.CurrentCulture);
+                                ProviderMetadata provObj = new(provName, eventLogSession, CultureInfo.CurrentCulture);
                                 WriteObject(provObj);
                                 bMatchFound = true;
                             }
@@ -697,7 +697,7 @@ private void ProcessListProvider()
                                 string msg = string.Format(CultureInfo.InvariantCulture,
                                                         _resourceMgr.GetString("ProviderMetadataUnavailable"),
                                                         provName, exc.Message);
-                                Exception outerExc = new Exception(msg, exc);
+                                Exception outerExc = new(msg, exc);
                                 WriteError(new ErrorRecord(outerExc, "ProviderMetadataUnavailable", ErrorCategory.NotSpecified, null));
                                 continue;
                             }
@@ -708,7 +708,7 @@ private void ProcessListProvider()
                     {
                         string msg = string.Format(CultureInfo.InvariantCulture, _resourceMgr.GetString("NoMatchingProvidersFound"),
                                                 _computerName, provPattern);
-                        Exception exc = new Exception(msg);
+                        Exception exc = new(msg);
                         WriteError(new ErrorRecord(exc, "NoMatchingProvidersFound", ErrorCategory.ObjectNotFound, null));
                     }
                 }
@@ -749,7 +749,7 @@ private void ProcessFilterXml()
                     }
                 }
 
-                EventLogQuery logQuery = new EventLogQuery(null, PathType.LogName, _xmlQuery.InnerXml);
+                EventLogQuery logQuery = new(null, PathType.LogName, _xmlQuery.InnerXml);
                 logQuery.Session = eventLogSession;
                 logQuery.ReverseDirection = !_oldest;
 
@@ -816,7 +816,7 @@ private void ProcessHashQuery()
                     return;
                 }
 
-                EventLogQuery logQuery = new EventLogQuery(null, PathType.FilePath, query);
+                EventLogQuery logQuery = new(null, PathType.FilePath, query);
                 logQuery.Session = eventLogSession;
                 logQuery.TolerateQueryErrors = true;
                 logQuery.ReverseDirection = !_oldest;
@@ -872,7 +872,7 @@ private EventLogSession CreateSession()
         //
         private void ReadEvents(EventLogQuery logQuery)
         {
-            using (EventLogReader readerObj = new EventLogReader(logQuery))
+            using (EventLogReader readerObj = new(logQuery))
             {
                 Int64 numEvents = 0;
                 EventRecord evtObj = null;
@@ -899,7 +899,7 @@ private void ReadEvents(EventLogQuery logQuery)
                         break;
                     }
 
-                    PSObject outputObj = new PSObject(evtObj);
+                    PSObject outputObj = new(evtObj);
 
                     string evtMessage = _resourceMgr.GetString("NoEventMessage");
                     try
@@ -923,7 +923,7 @@ private void ReadEvents(EventLogQuery logQuery)
                 if (numEvents == 0)
                 {
                     string msg = _resourceMgr.GetString("NoMatchingEventsFound");
-                    Exception exc = new Exception(msg);
+                    Exception exc = new(msg);
                     WriteError(new ErrorRecord(exc, "NoMatchingEventsFound", ErrorCategory.ObjectNotFound, null));
                 }
             }
@@ -934,7 +934,7 @@ private void ReadEvents(EventLogQuery logQuery)
         //
         private string BuildStructuredQuery(EventLogSession eventLogSession)
         {
-            StringBuilder result = new StringBuilder();
+            StringBuilder result = new();
 
             switch (ParameterSetName)
             {
@@ -966,7 +966,7 @@ private string BuildStructuredQuery(EventLogSession eventLogSession)
                         if (_logNamesMatchingWildcard.Count > WindowsEventLogAPILimit)
                         {
                             string msg = _resourceMgr.GetString("LogCountLimitExceeded");
-                            Exception exc = new Exception(string.Format(CultureInfo.InvariantCulture, msg, _logNamesMatchingWildcard.Count, WindowsEventLogAPILimit));
+                            Exception exc = new(string.Format(CultureInfo.InvariantCulture, msg, _logNamesMatchingWildcard.Count, WindowsEventLogAPILimit));
                             ThrowTerminatingError(new ErrorRecord(exc, "LogCountLimitExceeded", ErrorCategory.LimitsExceeded, null));
                         }
 
@@ -1016,7 +1016,7 @@ private string BuildStructuredQuery(EventLogSession eventLogSession)
         //
         private string BuildXPathFromHashTable(Hashtable hash)
         {
-            StringBuilder xpathString = new StringBuilder(string.Empty);
+            StringBuilder xpathString = new(string.Empty);
             bool bDateTimeHandled = false;
 
             foreach (string key in hash.Keys)
@@ -1105,7 +1105,7 @@ private string BuildXPathFromHashTable(Hashtable hash)
         //
         private string BuildStructuredQueryFromHashTable(EventLogSession eventLogSession)
         {
-            StringBuilder result = new StringBuilder(string.Empty);
+            StringBuilder result = new(string.Empty);
 
             result.Append(queryListOpen);
 
@@ -1122,12 +1122,12 @@ private string BuildStructuredQueryFromHashTable(EventLogSession eventLogSession
                 // Local queriedLogsQueryMap will hold names of logs or files to be queried
                 // mapped to the actual query strings being built up.
                 //
-                Dictionary<string, string> queriedLogsQueryMap = new Dictionary<string, string>();
+                Dictionary<string, string> queriedLogsQueryMap = new();
 
                 //
                 // queriedLogsQueryMapSuppress is the same as queriedLogsQueryMap but for <Suppress>
                 //
-                Dictionary<string, string> queriedLogsQueryMapSuppress = new Dictionary<string, string>();
+                Dictionary<string, string> queriedLogsQueryMapSuppress = new();
 
                 //
                 // Process log, _path, or provider parameters first
@@ -1138,7 +1138,7 @@ private string BuildStructuredQueryFromHashTable(EventLogSession eventLogSession
                 //
                 if (hash.ContainsKey(hashkey_logname_lc))
                 {
-                    List<string> logPatterns = new List<string>();
+                    List<string> logPatterns = new();
                     if (hash[hashkey_logname_lc] is Array)
                     {
                         foreach (object elt in (Array)hash[hashkey_logname_lc])
@@ -1193,7 +1193,7 @@ private string BuildStructuredQueryFromHashTable(EventLogSession eventLogSession
 
                 if (hash.ContainsKey(hashkey_providername_lc))
                 {
-                    List<string> provPatterns = new List<string>();
+                    List<string> provPatterns = new();
                     if (hash[hashkey_providername_lc] is Array)
                     {
                         foreach (object elt in (Array)hash[hashkey_providername_lc])
@@ -1226,7 +1226,7 @@ private string BuildStructuredQueryFromHashTable(EventLogSession eventLogSession
                     }
                     else
                     {
-                        List<string> keysList = new List<string>(queriedLogsQueryMap.Keys);
+                        List<string> keysList = new(queriedLogsQueryMap.Keys);
                         bool bRemovedIrrelevantLogs = false;
                         foreach (string queriedLog in keysList)
                         {
@@ -1256,7 +1256,7 @@ private string BuildStructuredQueryFromHashTable(EventLogSession eventLogSession
                         if (bRemovedIrrelevantLogs && (queriedLogsQueryMap.Count == 0))
                         {
                             string msg = string.Format(CultureInfo.InvariantCulture, _resourceMgr.GetString("LogsAndProvidersDontOverlap"));
-                            Exception exc = new Exception(msg);
+                            Exception exc = new(msg);
                             WriteError(new ErrorRecord(exc, "LogsAndProvidersDontOverlap", ErrorCategory.InvalidArgument, null));
                             continue;
                         }
@@ -1346,9 +1346,9 @@ private string BuildStructuredQueryFromHashTable(EventLogSession eventLogSession
         // HandleEventIdHashValue helper for hashtable structured query builder.
         // Constructs and returns EventId XPath portion as a string.
         //
-        private string HandleEventIdHashValue(object value)
+        private static string HandleEventIdHashValue(object value)
         {
-            StringBuilder ret = new StringBuilder();
+            StringBuilder ret = new();
             Array idsArray = value as Array;
             if (idsArray != null)
             {
@@ -1376,9 +1376,9 @@ private string HandleEventIdHashValue(object value)
         // HandleLevelHashValue helper for hashtable structured query builder.
         // Constructs and returns Level XPath portion as a string.
         //
-        private string HandleLevelHashValue(object value)
+        private static string HandleLevelHashValue(object value)
         {
-            StringBuilder ret = new StringBuilder();
+            StringBuilder ret = new();
             Array levelsArray = value as Array;
             if (levelsArray != null)
             {
@@ -1457,13 +1457,13 @@ private string HandleContextHashValue(object value)
             {
                 try
                 {
-                    NTAccount acct = new NTAccount(value.ToString());
+                    NTAccount acct = new(value.ToString());
                     sidCandidate = (SecurityIdentifier)acct.Translate(typeof(SecurityIdentifier));
                 }
                 catch (ArgumentException exc)
                 {
                     string msg = string.Format(CultureInfo.InvariantCulture, _resourceMgr.GetString("InvalidContext"), value.ToString());
-                    Exception outerExc = new Exception(msg, exc);
+                    Exception outerExc = new(msg, exc);
                     WriteError(new ErrorRecord(outerExc, "InvalidContext", ErrorCategory.InvalidArgument, null));
                     return string.Empty;
                 }
@@ -1479,8 +1479,8 @@ private string HandleContextHashValue(object value)
         //
         private string HandleStartTimeHashValue(object value, Hashtable hash)
         {
-            StringBuilder ret = new StringBuilder();
-            DateTime startTime = new DateTime();
+            StringBuilder ret = new();
+            DateTime startTime = new();
             if (!StringToDateTime(value.ToString(), ref startTime))
             {
                 return string.Empty;
@@ -1491,7 +1491,7 @@ private string HandleStartTimeHashValue(object value, Hashtable hash)
 
             if (hash.ContainsKey(hashkey_endtime_lc))
             {
-                DateTime endTime = new DateTime();
+                DateTime endTime = new();
                 if (!StringToDateTime(hash[hashkey_endtime_lc].ToString(), ref endTime))
                 {
                     return string.Empty;
@@ -1522,8 +1522,8 @@ private string HandleStartTimeHashValue(object value, Hashtable hash)
         //
         private string HandleEndTimeHashValue(object value, Hashtable hash)
         {
-            StringBuilder ret = new StringBuilder();
-            DateTime endTime = new DateTime();
+            StringBuilder ret = new();
+            DateTime endTime = new();
             if (!StringToDateTime(value.ToString(), ref endTime))
             {
                 return string.Empty;
@@ -1535,7 +1535,7 @@ private string HandleEndTimeHashValue(object value, Hashtable hash)
 
             if (hash.ContainsKey(hashkey_starttime_lc))
             {
-                DateTime startTime = new DateTime();
+                DateTime startTime = new();
                 if (!StringToDateTime(hash[hashkey_starttime_lc].ToString(), ref startTime))
                 {
                     return string.Empty;
@@ -1564,9 +1564,9 @@ private string HandleEndTimeHashValue(object value, Hashtable hash)
         // HandleDataHashValue helper for hashtable structured query builder.
         // Constructs and returns EventData/Data XPath portion as a string.
         //
-        private string HandleDataHashValue(object value)
+        private static string HandleDataHashValue(object value)
         {
-            StringBuilder ret = new StringBuilder();
+            StringBuilder ret = new();
             Array dataArray = value as Array;
             if (dataArray != null)
             {
@@ -1595,9 +1595,9 @@ private string HandleDataHashValue(object value)
         // Constructs and returns named event data field XPath portion as a string.
         // Fix Issue #2327
         //
-        private string HandleNamedDataHashValue(string key, object value)
+        private static string HandleNamedDataHashValue(string key, object value)
         {
-            StringBuilder ret = new StringBuilder();
+            StringBuilder ret = new();
             Array dataArray = value as Array;
             if (dataArray != null)
             {
@@ -1638,7 +1638,7 @@ private void CheckHashTableForQueryPathPresence(Hashtable hash)
             if (!isLogHash && !isProviderHash && !isPathHash)
             {
                 string msg = _resourceMgr.GetString("LogProviderOrPathNeeded");
-                Exception exc = new Exception(msg);
+                Exception exc = new(msg);
                 ThrowTerminatingError(new ErrorRecord(exc, "LogProviderOrPathNeeded", ErrorCategory.InvalidArgument, null));
             }
         }
@@ -1654,7 +1654,7 @@ private void TerminateForNonEvtxFileWithoutOldest(string fileName)
                     System.IO.Path.GetExtension(fileName).Equals(".evt", StringComparison.OrdinalIgnoreCase))
                 {
                     string msg = _resourceMgr.GetString("SpecifyOldestForEtlEvt");
-                    Exception exc = new Exception(string.Format(CultureInfo.InvariantCulture, msg, fileName));
+                    Exception exc = new(string.Format(CultureInfo.InvariantCulture, msg, fileName));
                     ThrowTerminatingError(new ErrorRecord(exc, "SpecifyOldestForEtlEvt", ErrorCategory.InvalidArgument, fileName));
                 }
             }
@@ -1674,7 +1674,7 @@ private bool ValidateLogName(string logName, EventLogSession eventLogSession)
             catch (EventLogNotFoundException)
             {
                 string msg = _resourceMgr.GetString("NoMatchingLogsFound");
-                Exception exc = new Exception(string.Format(CultureInfo.InvariantCulture, msg, _computerName, logName));
+                Exception exc = new(string.Format(CultureInfo.InvariantCulture, msg, _computerName, logName));
                 WriteError(new ErrorRecord(exc, "NoMatchingLogsFound", ErrorCategory.ObjectNotFound, logName));
                 return false;
             }
@@ -1683,7 +1683,7 @@ private bool ValidateLogName(string logName, EventLogSession eventLogSession)
                 string msg = string.Format(CultureInfo.InvariantCulture,
                                          _resourceMgr.GetString("LogInfoUnavailable"),
                                          logName, exc.Message);
-                Exception outerExc = new Exception(msg, exc);
+                Exception outerExc = new(msg, exc);
                 WriteError(new ErrorRecord(outerExc, "LogInfoUnavailable", ErrorCategory.NotSpecified, null));
                 return false;
             }
@@ -1693,7 +1693,7 @@ private bool ValidateLogName(string logName, EventLogSession eventLogSession)
                 if (logObj.LogType == EventLogType.Debug || logObj.LogType == EventLogType.Analytical)
                 {
                     string msg = _resourceMgr.GetString("SpecifyOldestForLog");
-                    Exception exc = new Exception(string.Format(CultureInfo.InvariantCulture, msg, logName));
+                    Exception exc = new(string.Format(CultureInfo.InvariantCulture, msg, logName));
                     ThrowTerminatingError(new ErrorRecord(exc, "SpecifyOldestForLog", ErrorCategory.InvalidArgument, logName));
                 }
             }
@@ -1715,7 +1715,7 @@ private bool KeywordStringToInt64(string keyString, ref Int64 keyLong)
             catch (Exception exc)
             {
                 string msg = _resourceMgr.GetString("KeywordLongExpected");
-                Exception outerExc = new Exception(string.Format(CultureInfo.InvariantCulture, msg, keyString), exc);
+                Exception outerExc = new(string.Format(CultureInfo.InvariantCulture, msg, keyString), exc);
                 WriteError(new ErrorRecord(outerExc, "KeywordLongExpected", ErrorCategory.InvalidArgument, null));
                 return false;
             }
@@ -1737,7 +1737,7 @@ private bool StringToDateTime(string dtString, ref DateTime dt)
             catch (FormatException exc)
             {
                 string msg = _resourceMgr.GetString("DateTimeExpected");
-                Exception outerExc = new Exception(string.Format(CultureInfo.InvariantCulture, msg, dtString), exc);
+                Exception outerExc = new(string.Format(CultureInfo.InvariantCulture, msg, dtString), exc);
                 WriteError(new ErrorRecord(outerExc, "DateTimeExpected", ErrorCategory.InvalidArgument, null));
                 return false;
             }
@@ -1753,7 +1753,7 @@ private bool StringToDateTime(string dtString, ref DateTime dt)
         //
         private StringCollection ValidateAndResolveFilePath(string path)
         {
-            StringCollection retColl = new StringCollection();
+            StringCollection retColl = new();
 
             Collection<PathInfo> resolvedPathSubset = null;
             try
@@ -1794,7 +1794,7 @@ private StringCollection ValidateAndResolveFilePath(string path)
                 if (pi.Provider.Name != "FileSystem")
                 {
                     string msg = _resourceMgr.GetString("NotAFileSystemPath");
-                    Exception exc = new Exception(string.Format(CultureInfo.InvariantCulture, msg, path));
+                    Exception exc = new(string.Format(CultureInfo.InvariantCulture, msg, path));
                     WriteError(new ErrorRecord(exc, "NotAFileSystemPath", ErrorCategory.InvalidArgument, path));
                     continue;
                 }
@@ -1811,7 +1811,7 @@ private StringCollection ValidateAndResolveFilePath(string path)
                     if (!WildcardPattern.ContainsWildcardCharacters(path))
                     {
                         string msg = _resourceMgr.GetString("NotALogFile");
-                        Exception exc = new Exception(string.Format(CultureInfo.InvariantCulture, msg, pi.ProviderPath));
+                        Exception exc = new(string.Format(CultureInfo.InvariantCulture, msg, pi.ProviderPath));
                         WriteError(new ErrorRecord(exc, "NotALogFile", ErrorCategory.InvalidArgument, path));
                     }
 
@@ -1841,7 +1841,7 @@ private void CheckHashTablesForNullValues()
                     if (value == null)
                     {
                         string msg = _resourceMgr.GetString("NullNotAllowedInHashtable");
-                        Exception exc = new Exception(string.Format(CultureInfo.InvariantCulture, msg, key));
+                        Exception exc = new(string.Format(CultureInfo.InvariantCulture, msg, key));
                         ThrowTerminatingError(new ErrorRecord(exc, "NullNotAllowedInHashtable", ErrorCategory.InvalidArgument, key));
                     }
                     else
@@ -1854,7 +1854,7 @@ private void CheckHashTablesForNullValues()
                                 if (elt == null)
                                 {
                                     string msg = _resourceMgr.GetString("NullNotAllowedInHashtable");
-                                    Exception exc = new Exception(string.Format(CultureInfo.InvariantCulture, msg, key));
+                                    Exception exc = new(string.Format(CultureInfo.InvariantCulture, msg, key));
                                     ThrowTerminatingError(new ErrorRecord(exc, "NullNotAllowedInHashtable", ErrorCategory.InvalidArgument, key));
                                 }
                             }
@@ -1909,14 +1909,14 @@ private string AddProviderPredicatesToFilter(StringCollection providers)
         // "System/Provider[@Name='a' or @Name='b']"
         // for all provider names specified in the "providers" argument.
         //
-        private string BuildProvidersPredicate(StringCollection providers)
+        private static string BuildProvidersPredicate(StringCollection providers)
         {
             if (providers.Count == 0)
             {
                 return string.Empty;
             }
 
-            StringBuilder predicate = new StringBuilder("System/Provider[");
+            StringBuilder predicate = new("System/Provider[");
             for (int i = 0; i < providers.Count; i++)
             {
                 predicate.Append("@Name='").Append(providers[i]).Append('\'');
@@ -1945,9 +1945,9 @@ private string BuildAllProvidersPredicate()
                 return string.Empty;
             }
 
-            StringBuilder predicate = new StringBuilder("System/Provider[");
+            StringBuilder predicate = new("System/Provider[");
 
-            List<string> uniqueProviderNames = new List<string>();
+            List<string> uniqueProviderNames = new();
 
             foreach (string logKey in _providersByLogMap.Keys)
             {
@@ -1986,7 +1986,7 @@ private void AddLogsForProviderToInternalMap(EventLogSession eventLogSession, st
         {
             try
             {
-                ProviderMetadata providerMetadata = new ProviderMetadata(providerName, eventLogSession, CultureInfo.CurrentCulture);
+                ProviderMetadata providerMetadata = new(providerName, eventLogSession, CultureInfo.CurrentCulture);
 
                 System.Collections.IEnumerable logLinks = providerMetadata.LogLinks;
 
@@ -1998,7 +1998,7 @@ private void AddLogsForProviderToInternalMap(EventLogSession eventLogSession, st
                         // Skip direct ETW channels unless -force is present.
                         // Error out for direct channels unless -oldest is present.
                         //
-                        EventLogConfiguration logObj = new EventLogConfiguration(logLink.LogName, eventLogSession);
+                        EventLogConfiguration logObj = new(logLink.LogName, eventLogSession);
                         if (logObj.LogType == EventLogType.Debug || logObj.LogType == EventLogType.Analytical)
                         {
                             if (!Force.IsPresent)
@@ -2011,7 +2011,7 @@ private void AddLogsForProviderToInternalMap(EventLogSession eventLogSession, st
 
                         WriteVerbose(string.Format(CultureInfo.InvariantCulture, _resourceMgr.GetString("ProviderLogLink"), providerName, logLink.LogName));
 
-                        StringCollection provColl = new StringCollection();
+                        StringCollection provColl = new();
                         provColl.Add(providerName.ToLowerInvariant());
 
                         _providersByLogMap.Add(logLink.LogName.ToLowerInvariant(), provColl);
@@ -2037,7 +2037,7 @@ private void AddLogsForProviderToInternalMap(EventLogSession eventLogSession, st
                 string msg = string.Format(CultureInfo.InvariantCulture,
                                            _resourceMgr.GetString("ProviderMetadataUnavailable"),
                                            providerName, exc.Message);
-                Exception outerExc = new Exception(msg, exc);
+                Exception outerExc = new(msg, exc);
                 WriteError(new ErrorRecord(outerExc, "ProviderMetadataUnavailable", ErrorCategory.NotSpecified, null));
                 return;
             }
@@ -2063,7 +2063,7 @@ private void FindLogNamesMatchingWildcards(EventLogSession eventLogSession, IEnu
             foreach (string logPattern in logPatterns)
             {
                 bool bMatched = false;
-                WildcardPattern wildLogPattern = new WildcardPattern(logPattern, WildcardOptions.IgnoreCase);
+                WildcardPattern wildLogPattern = new(logPattern, WildcardOptions.IgnoreCase);
 
                 foreach (string actualLogName in eventLogSession.GetLogNames())
                 {
@@ -2086,7 +2086,7 @@ private void FindLogNamesMatchingWildcards(EventLogSession eventLogSession, IEnu
                             string msg = string.Format(CultureInfo.InvariantCulture,
                                                      _resourceMgr.GetString("LogInfoUnavailable"),
                                                      actualLogName, exc.Message);
-                            Exception outerExc = new Exception(msg, exc);
+                            Exception outerExc = new(msg, exc);
                             WriteError(new ErrorRecord(outerExc, "LogInfoUnavailable", ErrorCategory.NotSpecified, null));
                             continue;
                         }
@@ -2113,7 +2113,7 @@ private void FindLogNamesMatchingWildcards(EventLogSession eventLogSession, IEnu
                 if (!bMatched)
                 {
                     string msg = _resourceMgr.GetString("NoMatchingLogsFound");
-                    Exception exc = new Exception(string.Format(CultureInfo.InvariantCulture, msg, _computerName, logPattern));
+                    Exception exc = new(string.Format(CultureInfo.InvariantCulture, msg, _computerName, logPattern));
                     WriteError(new ErrorRecord(exc, "NoMatchingLogsFound", ErrorCategory.ObjectNotFound, logPattern));
                 }
             }
@@ -2132,7 +2132,7 @@ private void FindProvidersByLogForWildcardPatterns(EventLogSession eventLogSessi
             foreach (string provPattern in providerPatterns)
             {
                 bool bMatched = false;
-                WildcardPattern wildProvPattern = new WildcardPattern(provPattern, WildcardOptions.IgnoreCase);
+                WildcardPattern wildProvPattern = new(provPattern, WildcardOptions.IgnoreCase);
 
                 foreach (string provName in eventLogSession.GetProviderNames())
                 {
@@ -2150,7 +2150,7 @@ private void FindProvidersByLogForWildcardPatterns(EventLogSession eventLogSessi
                 if (!bMatched)
                 {
                     string msg = _resourceMgr.GetString("NoMatchingProvidersFound");
-                    Exception exc = new Exception(string.Format(CultureInfo.InvariantCulture, msg, _computerName, provPattern));
+                    Exception exc = new(string.Format(CultureInfo.InvariantCulture, msg, _computerName, provPattern));
                     WriteError(new ErrorRecord(exc, "NoMatchingProvidersFound", ErrorCategory.ObjectNotFound, provPattern));
                 }
             }
diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/NewWinEventCommand.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/NewWinEventCommand.cs
index f302d867eef..5fceca05b47 100644
--- a/src/Microsoft.PowerShell.Commands.Diagnostics/NewWinEventCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Diagnostics/NewWinEventCommand.cs
@@ -142,7 +142,7 @@ private void LoadProvider()
                 throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, _resourceMgr.GetString("ProviderNotSpecified")), "ProviderName");
             }
 
-            using (EventLogSession session = new EventLogSession())
+            using (EventLogSession session = new())
             {
                 foreach (string providerName in session.GetProviderNames())
                 {
@@ -174,7 +174,7 @@ private void LoadEventDescriptor()
         {
             if (_idSpecified)
             {
-                List<EventMetadata> matchedEvents = new List<EventMetadata>();
+                List<EventMetadata> matchedEvents = new();
                 foreach (EventMetadata emd in _providerMetadata.Events)
                 {
                     if (emd.Id == _id)
@@ -245,7 +245,7 @@ private bool VerifyTemplate(EventMetadata emd)
         {
             if (emd.Template != null)
             {
-                XmlReaderSettings readerSettings = new XmlReaderSettings
+                XmlReaderSettings readerSettings = new()
                 {
                     CheckCharacters = false,
                     IgnoreComments = true,
@@ -313,7 +313,7 @@ private static EventDescriptor CreateEventDescriptor(ProviderMetadata providerMe
         /// </summary>
         protected override void ProcessRecord()
         {
-            using (EventProvider provider = new EventProvider(_providerMetadata.Id))
+            using (EventProvider provider = new(_providerMetadata.Id))
             {
                 EventDescriptor ed = _eventDescriptor.Value;
 
@@ -327,11 +327,11 @@ protected override void ProcessRecord()
                         }
                     }
 
-                    provider.WriteEvent(ref ed, _payload);
+                    provider.WriteEvent(in ed, _payload);
                 }
                 else
                 {
-                    provider.WriteEvent(ref ed);
+                    provider.WriteEvent(in ed);
                 }
             }
 
diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/PdhHelper.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/PdhHelper.cs
index 541aeabe7c6..97eff22db0d 100644
--- a/src/Microsoft.PowerShell.Commands.Diagnostics/PdhHelper.cs
+++ b/src/Microsoft.PowerShell.Commands.Diagnostics/PdhHelper.cs
@@ -225,7 +225,7 @@ private struct PDH_FMT_COUNTERVALUE_LARGE
 
             // [FieldOffset(4), MarshalAs(UnmanagedType.LPWStr)]
             // public string WideStringValue;
-        };
+        }
 
         [StructLayout(LayoutKind.Sequential)]
         private struct PDH_FMT_COUNTERVALUE_DOUBLE
@@ -233,7 +233,7 @@ 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
@@ -421,7 +421,7 @@ public void Dispose()
         //
         // m_ConsumerPathToHandleAndInstanceMap map is used for reading counter date (live or from files).
         //
-        private readonly Dictionary<string, CounterHandleNInstance> _consumerPathToHandleAndInstanceMap = new Dictionary<string, CounterHandleNInstance>();
+        private readonly Dictionary<string, CounterHandleNInstance> _consumerPathToHandleAndInstanceMap = new();
 
         /// <summary>
         /// A helper reading in a Unicode string with embedded NULLs and splitting it into a StringCollection.
@@ -429,7 +429,7 @@ public void Dispose()
         /// <param name="strNative"></param>
         /// <param name="strSize"></param>
         /// <param name="strColl"></param>
-        private void ReadPdhMultiString(ref IntPtr strNative, Int32 strSize, ref StringCollection strColl)
+        private static void ReadPdhMultiString(ref IntPtr strNative, Int32 strSize, ref StringCollection strColl)
         {
             Debug.Assert(strSize >= 2);
             int offset = 0;
@@ -452,7 +452,7 @@ private void ReadPdhMultiString(ref IntPtr strNative, Int32 strSize, ref StringC
             strColl.AddRange(allSubstringsWithNulls.Split('\0'));
         }
 
-        private uint GetCounterInfoPlus(IntPtr hCounter, out UInt32 counterType, out UInt32 defaultScale, out UInt64 timeBase)
+        private static uint GetCounterInfoPlus(IntPtr hCounter, out UInt32 counterType, out UInt32 defaultScale, out UInt64 timeBase)
         {
             counterType = 0;
             defaultScale = 0;
@@ -460,7 +460,7 @@ private uint GetCounterInfoPlus(IntPtr hCounter, out UInt32 counterType, out UIn
 
             Debug.Assert(hCounter != IntPtr.Zero);
 
-            IntPtr pBufferSize = new IntPtr(0);
+            IntPtr pBufferSize = new(0);
             uint res = PdhGetCounterInfo(hCounter, false, ref pBufferSize, IntPtr.Zero);
             if (res != PdhResults.PDH_MORE_DATA)
             {
@@ -585,7 +585,7 @@ public uint SetQueryTimeRange(DateTime startTime, DateTime endTime)
             Debug.Assert(_hQuery != null);
             Debug.Assert(endTime >= startTime);
 
-            PDH_TIME_INFO pTimeInfo = new PDH_TIME_INFO();
+            PDH_TIME_INFO pTimeInfo = new();
 
             if (startTime != DateTime.MinValue && startTime.Kind == DateTimeKind.Local)
             {
@@ -608,7 +608,7 @@ public uint SetQueryTimeRange(DateTime startTime, DateTime endTime)
 
         public uint EnumBlgFilesMachines(ref StringCollection machineNames)
         {
-            IntPtr MachineListTcharSizePtr = new IntPtr(0);
+            IntPtr MachineListTcharSizePtr = new(0);
             uint res = PdhHelper.PdhEnumMachinesH(_hDataSource, IntPtr.Zero, ref MachineListTcharSizePtr);
             if (res != PdhResults.PDH_MORE_DATA)
             {
@@ -636,7 +636,7 @@ public uint EnumBlgFilesMachines(ref StringCollection machineNames)
 
         public uint EnumObjects(string machineName, ref StringCollection objectNames)
         {
-            IntPtr pBufferSize = new IntPtr(0);
+            IntPtr pBufferSize = new(0);
             uint res = PdhEnumObjectsH(_hDataSource, machineName, IntPtr.Zero, ref pBufferSize, PerfDetail.PERF_DETAIL_WIZARD, false);
             if (res != PdhResults.PDH_MORE_DATA)
             {
@@ -664,8 +664,8 @@ public uint EnumObjects(string machineName, ref StringCollection objectNames)
 
         public uint EnumObjectItems(string machineName, string objectName, ref StringCollection counterNames, ref StringCollection instanceNames)
         {
-            IntPtr pCounterBufferSize = new IntPtr(0);
-            IntPtr pInstanceBufferSize = new IntPtr(0);
+            IntPtr pCounterBufferSize = new(0);
+            IntPtr pInstanceBufferSize = new(0);
 
             uint res = PdhEnumObjectItemsH(_hDataSource, machineName, objectName,
                                             IntPtr.Zero, ref pCounterBufferSize,
@@ -746,7 +746,7 @@ public uint GetValidPathsFromFiles(ref StringCollection validPaths)
         {
             Debug.Assert(_hDataSource != null && !_hDataSource.IsInvalid, "Call ConnectToDataSource before GetValidPathsFromFiles");
 
-            StringCollection machineNames = new StringCollection();
+            StringCollection machineNames = new();
             uint res = this.EnumBlgFilesMachines(ref machineNames);
             if (res != PdhResults.PDH_CSTATUS_VALID_DATA)
             {
@@ -755,7 +755,7 @@ public uint GetValidPathsFromFiles(ref StringCollection validPaths)
 
             foreach (string machine in machineNames)
             {
-                StringCollection counterSets = new StringCollection();
+                StringCollection counterSets = new();
                 res = this.EnumObjects(machine, ref counterSets);
                 if (res != PdhResults.PDH_CSTATUS_VALID_DATA)
                 {
@@ -766,8 +766,8 @@ public uint GetValidPathsFromFiles(ref StringCollection validPaths)
                 {
                     // Console.WriteLine("Counter set " + counterSet);
 
-                    StringCollection counterSetCounters = new StringCollection();
-                    StringCollection counterSetInstances = new StringCollection();
+                    StringCollection counterSetCounters = new();
+                    StringCollection counterSetInstances = new();
 
                     res = this.EnumObjectItems(machine, counterSet, ref counterSetCounters, ref counterSetInstances);
                     if (res != PdhResults.PDH_CSTATUS_VALID_DATA)
@@ -790,7 +790,7 @@ private bool IsPathValid(ref PDH_COUNTER_PATH_ELEMENTS pathElts, out string outP
         {
             bool ret = false;
             outPath = string.Empty;
-            IntPtr pPathBufferSize = new IntPtr(0);
+            IntPtr pPathBufferSize = new(0);
 
             uint res = PdhMakeCounterPath(ref pathElts, IntPtr.Zero, ref pPathBufferSize, 0);
             if (res != PdhResults.PDH_MORE_DATA)
@@ -824,10 +824,10 @@ public bool IsPathValid(string path)
             return (PdhValidatePathEx(_hDataSource, path) == PdhResults.PDH_CSTATUS_VALID_DATA);
         }
 
-        private uint MakePath(PDH_COUNTER_PATH_ELEMENTS pathElts, out string outPath, bool bWildcardInstances)
+        private static uint MakePath(PDH_COUNTER_PATH_ELEMENTS pathElts, out string outPath, bool bWildcardInstances)
         {
             outPath = string.Empty;
-            IntPtr pPathBufferSize = new IntPtr(0);
+            IntPtr pPathBufferSize = new(0);
 
             if (bWildcardInstances)
             {
@@ -861,11 +861,11 @@ private uint MakePath(PDH_COUNTER_PATH_ELEMENTS pathElts, out string outPath, bo
             return res;
         }
 
-        private uint MakeAllInstancePath(string origPath, out string unifiedPath)
+        private static uint MakeAllInstancePath(string origPath, out string unifiedPath)
         {
             unifiedPath = origPath;
 
-            PDH_COUNTER_PATH_ELEMENTS elts = new PDH_COUNTER_PATH_ELEMENTS();
+            PDH_COUNTER_PATH_ELEMENTS elts = new();
 
             uint res = ParsePath(origPath, ref elts);
             if (res != PdhResults.PDH_CSTATUS_VALID_DATA)
@@ -876,9 +876,9 @@ private uint MakeAllInstancePath(string origPath, out string unifiedPath)
             return MakePath(elts, out unifiedPath, true);
         }
 
-        private uint ParsePath(string fullPath, ref PDH_COUNTER_PATH_ELEMENTS pCounterPathElements)
+        private static uint ParsePath(string fullPath, ref PDH_COUNTER_PATH_ELEMENTS pCounterPathElements)
         {
-            IntPtr bufSize = new IntPtr(0);
+            IntPtr bufSize = new(0);
 
             uint res = PdhParseCounterPath(fullPath,
                                            IntPtr.Zero,
@@ -931,7 +931,7 @@ public uint TranslateLocalCounterPath(string englishPath, out string localizedPa
         {
             uint res = PdhResults.PDH_CSTATUS_VALID_DATA;
             localizedPath = string.Empty;
-            PDH_COUNTER_PATH_ELEMENTS pathElts = new PDH_COUNTER_PATH_ELEMENTS();
+            PDH_COUNTER_PATH_ELEMENTS pathElts = new();
             res = ParsePath(englishPath, ref pathElts);
             if (res != PdhResults.PDH_CSTATUS_VALID_DATA)
             {
@@ -1057,9 +1057,7 @@ public uint GetValidPaths(string machineName,
                                    ref StringCollection instances,
                                    ref StringCollection validPaths)
         {
-            uint res = PdhResults.PDH_CSTATUS_VALID_DATA;
-
-            PDH_COUNTER_PATH_ELEMENTS pathElts = new PDH_COUNTER_PATH_ELEMENTS();
+            PDH_COUNTER_PATH_ELEMENTS pathElts = new();
             pathElts.MachineName = machineName;
             pathElts.ObjectName = objectName;
 
@@ -1091,7 +1089,7 @@ public uint GetValidPaths(string machineName,
                 }
             }
 
-            return res;
+            return PdhResults.PDH_CSTATUS_VALID_DATA;
         }
 
         public uint AddCounters(ref StringCollection validPaths, bool bFlushOldCounters)
@@ -1112,11 +1110,11 @@ public uint AddCounters(ref StringCollection validPaths, bool bFlushOldCounters)
                 res = PdhAddCounter(_hQuery, counterPath, IntPtr.Zero, out counterHandle);
                 if (res == PdhResults.PDH_CSTATUS_VALID_DATA)
                 {
-                    CounterHandleNInstance chi = new CounterHandleNInstance();
+                    CounterHandleNInstance chi = new();
                     chi.hCounter = counterHandle;
                     chi.InstanceName = null;
 
-                    PDH_COUNTER_PATH_ELEMENTS pathElts = new PDH_COUNTER_PATH_ELEMENTS();
+                    PDH_COUNTER_PATH_ELEMENTS pathElts = new();
                     res = ParsePath(counterPath, ref pathElts);
                     if (res == PdhResults.PDH_CSTATUS_VALID_DATA && pathElts.InstanceName != null)
                     {
@@ -1180,7 +1178,7 @@ public uint ReadNextSet(out PerformanceCounterSampleSet nextSet, bool bSkipReadi
 
             foreach (string path in _consumerPathToHandleAndInstanceMap.Keys)
             {
-                IntPtr counterTypePtr = new IntPtr(0);
+                IntPtr counterTypePtr = new(0);
                 UInt32 counterType = (UInt32)PerformanceCounterType.RawBase;
                 UInt32 defaultScale = 0;
                 UInt64 timeBase = 0;
@@ -1219,7 +1217,7 @@ public uint ReadNextSet(out PerformanceCounterSampleSet nextSet, bool bSkipReadi
                 long dtFT = (((long)rawValue.TimeStamp.dwHighDateTime) << 32) +
                                      (uint)rawValue.TimeStamp.dwLowDateTime;
 
-                DateTime dt = new DateTime(DateTime.FromFileTimeUtc(dtFT).Ticks, DateTimeKind.Local);
+                DateTime dt = new(DateTime.FromFileTimeUtc(dtFT).Ticks, DateTimeKind.Local);
 
                 PDH_FMT_COUNTERVALUE_DOUBLE fmtValueDouble;
                 res = PdhGetFormattedCounterValue(hCounter,
@@ -1281,7 +1279,7 @@ public uint ReadNextSet(out PerformanceCounterSampleSet nextSet, bool bSkipReadi
         public uint ExpandWildCardPath(string path, out StringCollection expandedPaths)
         {
             expandedPaths = new StringCollection();
-            IntPtr pcchPathListLength = new IntPtr(0);
+            IntPtr pcchPathListLength = new(0);
 
             uint res = PdhExpandWildCardPathH(_hDataSource,
                                              path,
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/SessionBasedWrapper.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/SessionBasedWrapper.cs
index 24b142a5081..79fc1dd0461 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/SessionBasedWrapper.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/SessionBasedWrapper.cs
@@ -75,7 +75,7 @@ protected virtual void Dispose(bool disposing)
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         protected TSession[] Session
         {
-            get { return _session ?? (_session = new TSession[] { this.DefaultSession }); }
+            get { return _session ??= new TSession[] { this.DefaultSession }; }
 
             set
             {
@@ -126,9 +126,9 @@ public SwitchParameter AsJob
         /// Doing so will interfere with ThrottleLimit functionality.
         /// </para>
         /// <para>
-        /// <see cref="Job.WriteObject" /> (and other methods returning job results) will block to support throttling and flow-control.
+        /// <see cref="Job.WriteObject"/> (and other methods returning job results) will block to support throttling and flow-control.
         /// Implementations of Job instance returned from this method should make sure that implementation-specific flow-control mechanism pauses further processing,
-        /// until calls from <see cref="Job.WriteObject" /> (and other methods returning job results) return.
+        /// until calls from <see cref="Job.WriteObject"/> (and other methods returning job results) return.
         /// </para>
         /// </remarks>
         internal abstract StartableJob CreateQueryJob(TSession session, QueryBuilder query);
@@ -171,16 +171,16 @@ private StartableJob DoCreateQueryJob(TSession sessionForJob, QueryBuilder query
         /// <param name="session">Remote session to invoke the method in.</param>
         /// <param name="objectInstance">The object on which to invoke the method.</param>
         /// <param name="methodInvocationInfo">Method invocation details.</param>
-        /// <param name="passThru"><c>true</c> if successful method invocations should emit downstream the <paramref name="objectInstance"/> being operated on.</param>
+        /// <param name="passThru"><see langword="true"/> if successful method invocations should emit downstream the <paramref name="objectInstance"/> being operated on.</param>
         /// <remarks>
         /// <para>
         /// This method shouldn't do any processing or interact with the remote session.
         /// Doing so will interfere with ThrottleLimit functionality.
         /// </para>
         /// <para>
-        /// <see cref="Job.WriteObject" /> (and other methods returning job results) will block to support throttling and flow-control.
+        /// <see cref="Job.WriteObject"/> (and other methods returning job results) will block to support throttling and flow-control.
         /// Implementations of Job instance returned from this method should make sure that implementation-specific flow-control mechanism pauses further processing,
-        /// until calls from <see cref="Job.WriteObject" /> (and other methods returning job results) return.
+        /// until calls from <see cref="Job.WriteObject"/> (and other methods returning job results) return.
         /// </para>
         /// </remarks>
         internal abstract StartableJob CreateInstanceMethodInvocationJob(TSession session, TObjectInstance objectInstance, MethodInvocationInfo methodInvocationInfo, bool passThru);
@@ -213,9 +213,9 @@ private StartableJob DoCreateInstanceMethodInvocationJob(TSession sessionForJob,
         /// Doing so will interfere with ThrottleLimit functionality.
         /// </para>
         /// <para>
-        /// <see cref="Job.WriteObject" /> (and other methods returning job results) will block to support throttling and flow-control.
+        /// <see cref="Job.WriteObject"/> (and other methods returning job results) will block to support throttling and flow-control.
         /// Implementations of Job instance returned from this method should make sure that implementation-specific flow-control mechanism pauses further processing,
-        /// until calls from <see cref="Job.WriteObject" /> (and other methods returning job results) return.
+        /// until calls from <see cref="Job.WriteObject"/> (and other methods returning job results) return.
         /// </para>
         /// </remarks>
         internal abstract StartableJob CreateStaticMethodInvocationJob(TSession session, MethodInvocationInfo methodInvocationInfo);
@@ -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) =>
@@ -325,37 +325,37 @@ private enum JobOutputs
 
         private static void DiscardJobOutputs(Job job, JobOutputs jobOutputsToDiscard)
         {
-            if (JobOutputs.Output == (jobOutputsToDiscard & JobOutputs.Output))
+            if ((jobOutputsToDiscard & JobOutputs.Output) == JobOutputs.Output)
             {
                 DiscardJobOutputs(job.Output);
             }
 
-            if (JobOutputs.Error == (jobOutputsToDiscard & JobOutputs.Error))
+            if ((jobOutputsToDiscard & JobOutputs.Error) == JobOutputs.Error)
             {
                 DiscardJobOutputs(job.Error);
             }
 
-            if (JobOutputs.Warning == (jobOutputsToDiscard & JobOutputs.Warning))
+            if ((jobOutputsToDiscard & JobOutputs.Warning) == JobOutputs.Warning)
             {
                 DiscardJobOutputs(job.Warning);
             }
 
-            if (JobOutputs.Verbose == (jobOutputsToDiscard & JobOutputs.Verbose))
+            if ((jobOutputsToDiscard & JobOutputs.Verbose) == JobOutputs.Verbose)
             {
                 DiscardJobOutputs(job.Verbose);
             }
 
-            if (JobOutputs.Debug == (jobOutputsToDiscard & JobOutputs.Debug))
+            if ((jobOutputsToDiscard & JobOutputs.Debug) == JobOutputs.Debug)
             {
                 DiscardJobOutputs(job.Debug);
             }
 
-            if (JobOutputs.Progress == (jobOutputsToDiscard & JobOutputs.Progress))
+            if ((jobOutputsToDiscard & JobOutputs.Progress) == JobOutputs.Progress)
             {
                 DiscardJobOutputs(job.Progress);
             }
 
-            if (JobOutputs.Results == (jobOutputsToDiscard & JobOutputs.Results))
+            if ((jobOutputsToDiscard & JobOutputs.Results) == JobOutputs.Results)
             {
                 DiscardJobOutputs(job.Results);
             }
@@ -397,7 +397,7 @@ public override void ProcessRecord(QueryBuilder query)
         /// </summary>
         /// <param name="query">Query parameters.</param>
         /// <param name="methodInvocationInfo">Method invocation details.</param>
-        /// <param name="passThru"><c>true</c> if successful method invocations should emit downstream the object instance being operated on.</param>
+        /// <param name="passThru"><see langword="true"/> if successful method invocations should emit downstream the object instance being operated on.</param>
         public override void ProcessRecord(QueryBuilder query, MethodInvocationInfo methodInvocationInfo, bool passThru)
         {
             _parentJob.DisableFlowControlForPendingJobsQueue();
@@ -576,7 +576,7 @@ private TSession GetImpliedSession()
         /// </summary>
         /// <param name="objectInstance">The object on which to invoke the method.</param>
         /// <param name="methodInvocationInfo">Method invocation details.</param>
-        /// <param name="passThru"><c>true</c> if successful method invocations should emit downstream the <paramref name="objectInstance"/> being operated on.</param>
+        /// <param name="passThru"><see langword="true"/> if successful method invocations should emit downstream the <paramref name="objectInstance"/> being operated on.</param>
         public override void ProcessRecord(TObjectInstance objectInstance, MethodInvocationInfo methodInvocationInfo, bool passThru)
         {
             if (objectInstance == null) throw new ArgumentNullException(nameof(objectInstance));
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/CimJobException.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/CimJobException.cs
index 092103d6fe7..808ca1a4de9 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/CimJobException.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/CimJobException.cs
@@ -90,7 +90,7 @@ internal static CimJobException CreateFromCimException(
             Dbg.Assert(cimException != null, "Caller should verify cimException != null");
 
             string message = BuildErrorMessage(jobDescription, jobContext, cimException.Message);
-            CimJobException cimJobException = new CimJobException(message, cimException);
+            CimJobException cimJobException = new(message, cimException);
             cimJobException.InitializeErrorRecord(jobContext, cimException);
             return cimJobException;
         }
@@ -111,7 +111,7 @@ internal static CimJobException CreateFromAnyException(
             }
 
             string message = BuildErrorMessage(jobDescription, jobContext, inner.Message);
-            CimJobException cimJobException = new CimJobException(message, inner);
+            CimJobException cimJobException = new(message, inner);
             var containsErrorRecord = inner as IContainsErrorRecord;
             if (containsErrorRecord != null)
             {
@@ -142,7 +142,7 @@ internal static CimJobException CreateWithFullControl(
             Dbg.Assert(!string.IsNullOrEmpty(message), "Caller should verify message != null");
             Dbg.Assert(!string.IsNullOrEmpty(errorId), "Caller should verify errorId != null");
 
-            CimJobException cimJobException = new CimJobException(jobContext.PrependComputerNameToMessage(message), inner);
+            CimJobException cimJobException = new(jobContext.PrependComputerNameToMessage(message), inner);
             cimJobException.InitializeErrorRecord(jobContext, errorId, errorCategory);
             return cimJobException;
         }
@@ -156,7 +156,7 @@ internal static CimJobException CreateWithoutJobContext(
             Dbg.Assert(!string.IsNullOrEmpty(message), "Caller should verify message != null");
             Dbg.Assert(!string.IsNullOrEmpty(errorId), "Caller should verify errorId != null");
 
-            CimJobException cimJobException = new CimJobException(message, inner);
+            CimJobException cimJobException = new(message, inner);
             cimJobException.InitializeErrorRecord(null, errorId, errorCategory);
             return cimJobException;
         }
@@ -170,7 +170,7 @@ internal static CimJobException CreateFromMethodErrorCode(string jobDescription,
 
             string errorMessage = BuildErrorMessage(jobDescription, jobContext, rawErrorMessage);
 
-            CimJobException cje = new CimJobException(errorMessage);
+            CimJobException cje = new(errorMessage);
             cje.InitializeErrorRecord(jobContext, "CimJob_" + methodName + "_" + errorCodeFromMethod, ErrorCategory.InvalidResult);
 
             return cje;
@@ -197,15 +197,15 @@ private static string BuildErrorMessage(string jobDescription, CimJobContext job
 
         private void InitializeErrorRecordCore(CimJobContext jobContext, Exception exception, string errorId, ErrorCategory errorCategory)
         {
-            ErrorRecord coreErrorRecord = new ErrorRecord(
+            ErrorRecord coreErrorRecord = new(
                 exception: exception,
                 errorId: errorId,
                 errorCategory: errorCategory,
-                targetObject: jobContext != null ? jobContext.TargetObject : null);
+                targetObject: jobContext?.TargetObject);
 
             if (jobContext != null)
             {
-                System.Management.Automation.Remoting.OriginInfo originInfo = new System.Management.Automation.Remoting.OriginInfo(
+                System.Management.Automation.Remoting.OriginInfo originInfo = new(
                     jobContext.Session.ComputerName,
                     Guid.Empty);
 
@@ -242,7 +242,7 @@ private void InitializeErrorRecord(CimJobContext jobContext, CimException cimExc
             if (cimException.ErrorData != null)
             {
                 _errorRecord.CategoryInfo.TargetName = cimException.ErrorSource;
-                _errorRecord.CategoryInfo.TargetType = jobContext != null ? jobContext.CmdletizationClassName : null;
+                _errorRecord.CategoryInfo.TargetType = jobContext?.CmdletizationClassName;
             }
         }
 
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/ExtrinsicMethodInvocationJob.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/ExtrinsicMethodInvocationJob.cs
index 990c31c73a5..1194da4ab0f 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/ExtrinsicMethodInvocationJob.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/ExtrinsicMethodInvocationJob.cs
@@ -58,10 +58,10 @@ private void ProcessOutParameter(CimMethodResult methodResult, MethodParameter m
             Dbg.Assert(this.MethodSubject != null, "MethodSubject property should be initialized before starting main job processing");
 
             CimMethodParameter outParameter = methodResult.OutParameters[methodParameter.Name];
-            object valueReturnedFromMethod = (outParameter == null) ? null : outParameter.Value;
+            object valueReturnedFromMethod = outParameter?.Value;
 
             object dotNetValue = CimValueConverter.ConvertFromCimToDotNet(valueReturnedFromMethod, methodParameter.ParameterType);
-            if (MethodParameterBindings.Out == (methodParameter.Bindings & MethodParameterBindings.Out))
+            if ((methodParameter.Bindings & MethodParameterBindings.Out) == MethodParameterBindings.Out)
             {
                 methodParameter.Value = dotNetValue;
                 cmdletOutput.Add(methodParameter.Name, methodParameter);
@@ -81,7 +81,7 @@ private void ProcessOutParameter(CimMethodResult methodResult, MethodParameter m
                     CimCmdletAdapter.AssociateSessionOfOriginWithInstance(cimInstance, this.JobContext.Session);
                 }
             }
-            else if (MethodParameterBindings.Error == (methodParameter.Bindings & MethodParameterBindings.Error))
+            else if ((methodParameter.Bindings & MethodParameterBindings.Error) == MethodParameterBindings.Error)
             {
                 var gotError = (bool)LanguagePrimitives.ConvertTo(dotNetValue, typeof(bool), CultureInfo.InvariantCulture);
                 if (gotError)
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/TerminatingErrorTracker.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/TerminatingErrorTracker.cs
index 73b8d0f3015..515e19f895c 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/TerminatingErrorTracker.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/TerminatingErrorTracker.cs
@@ -24,7 +24,7 @@ internal class TerminatingErrorTracker
         #region Getting tracker for a given cmdlet invocation
 
         private static readonly ConditionalWeakTable<InvocationInfo, TerminatingErrorTracker> s_invocationToTracker =
-            new ConditionalWeakTable<InvocationInfo, TerminatingErrorTracker>();
+            new();
 
         private static int GetNumberOfSessions(InvocationInfo invocationInfo)
         {
@@ -100,7 +100,7 @@ private TerminatingErrorTracker(int numberOfSessions)
 
         #region Tracking session's "connectivity" status
 
-        private readonly ConcurrentDictionary<CimSession, bool> _sessionToIsConnected = new ConcurrentDictionary<CimSession, bool>();
+        private readonly ConcurrentDictionary<CimSession, bool> _sessionToIsConnected = new();
 
         internal void MarkSessionAsConnected(CimSession connectedSession)
         {
@@ -166,7 +166,7 @@ internal Exception GetExceptionIfBrokenSession(
 
         #region Tracking session's "terminated" status
 
-        private readonly ConcurrentDictionary<CimSession, bool> _sessionToIsTerminated = new ConcurrentDictionary<CimSession, bool>();
+        private readonly ConcurrentDictionary<CimSession, bool> _sessionToIsTerminated = new();
 
         internal void MarkSessionAsTerminated(CimSession terminatedSession, out bool sessionWasAlreadyTerminated)
         {
@@ -196,8 +196,8 @@ internal bool IsSessionTerminated(CimSession session)
 
         internal CmdletMethodInvoker<bool> GetErrorReportingDelegate(ErrorRecord errorRecord)
         {
-            ManualResetEventSlim manualResetEventSlim = new ManualResetEventSlim();
-            object lockObject = new object();
+            ManualResetEventSlim manualResetEventSlim = new();
+            object lockObject = new();
             Func<Cmdlet, bool> action = (Cmdlet cmdlet) =>
             {
                 _numberOfReportedSessionTerminatingErrors++;
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimChildJobBase.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimChildJobBase.cs
index 3e885cf60ce..6dc65424f50 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimChildJobBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimChildJobBase.cs
@@ -57,7 +57,7 @@ internal CimChildJobBase(CimJobContext jobContext)
             _jobSpecificCustomOptions = new Lazy<CimCustomOptionsDictionary>(this.CalculateJobSpecificCustomOptions);
         }
 
-        private readonly CimSensitiveValueConverter _cimSensitiveValueConverter = new CimSensitiveValueConverter();
+        private readonly CimSensitiveValueConverter _cimSensitiveValueConverter = new();
 
         internal CimSensitiveValueConverter CimSensitiveValueConverter { get { return _cimSensitiveValueConverter; } }
 
@@ -158,7 +158,7 @@ public virtual void OnCompleted()
                     });
         }
 
-        private static readonly Random s_globalRandom = new Random();
+        private static readonly Random s_globalRandom = new();
         private readonly Random _random;
         private int _sleepAndRetryDelayRangeMs = 1000;
         private int _sleepAndRetryExtraDelayMs = 0;
@@ -543,7 +543,7 @@ private CimCustomOptionsDictionary GetJobSpecificCustomOptions()
 
         #region Controlling job state
 
-        private readonly CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
+        private readonly CancellationTokenSource _cancellationTokenSource = new();
 
         /// <summary>
         /// Stops this job.
@@ -578,7 +578,7 @@ public override void StopJob()
             _cancellationTokenSource.Cancel();
         }
 
-        private readonly object _jobStateLock = new object();
+        private readonly object _jobStateLock = new();
         private bool _jobHadErrors;
         private bool _jobWasStarted;
         private bool _jobWasStopped;
@@ -730,7 +730,7 @@ internal void SetCompletedJobState(JobState state, Exception reason)
 
         #region Support for progress reporting
 
-        private readonly ConcurrentDictionary<int, ProgressRecord> _activityIdToLastProgressRecord = new ConcurrentDictionary<int, ProgressRecord>();
+        private readonly ConcurrentDictionary<int, ProgressRecord> _activityIdToLastProgressRecord = new();
 
         internal override void WriteProgress(ProgressRecord progressRecord)
         {
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimCmdletInvocationContext.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimCmdletInvocationContext.cs
index dd7b6ad8d7d..c876184c141 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimCmdletInvocationContext.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimCmdletInvocationContext.cs
@@ -76,7 +76,7 @@ private static void WarnAboutUnsupportedActionPreferences(
             if (actionPreferenceComesFromCommandLineParameter)
             {
                 Exception exception = new ArgumentException(message);
-                ErrorRecord errorRecord = new ErrorRecord(exception, "ActionPreferenceNotSupportedByCimCmdletAdapter", ErrorCategory.NotImplemented, null);
+                ErrorRecord errorRecord = new(exception, "ActionPreferenceNotSupportedByCimCmdletAdapter", ErrorCategory.NotImplemented, null);
                 cmdlet.ThrowTerminatingError(errorRecord);
             }
         }
@@ -113,7 +113,7 @@ public bool ShowComputerName
             }
         }
 
-        private readonly Lazy<CimSession> _defaultCimSession = new Lazy<CimSession>(CreateDefaultCimSession);
+        private readonly Lazy<CimSession> _defaultCimSession = new(CreateDefaultCimSession);
 
         private static CimSession CreateDefaultCimSession()
         {
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimConverter.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimConverter.cs
index 915fb02e495..91500758a06 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimConverter.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimConverter.cs
@@ -129,7 +129,7 @@ private void Dispose(bool disposing)
             }
         }
 
-        private readonly List<IDisposable> _trackedDisposables = new List<IDisposable>();
+        private readonly List<IDisposable> _trackedDisposables = new();
 
         /// <summary>
         /// Releases resources associated with this object.
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimOperationOptionsHelper.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimOperationOptionsHelper.cs
index 17801923bf0..1445ed17a14 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimOperationOptionsHelper.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimOperationOptionsHelper.cs
@@ -17,7 +17,7 @@ namespace Microsoft.PowerShell.Cmdletization.Cim
     internal class CimCustomOptionsDictionary
     {
         private readonly IDictionary<string, object> _dict;
-        private readonly object _dictModificationLock = new object();
+        private readonly object _dictModificationLock = new();
 
         private CimCustomOptionsDictionary(IEnumerable<KeyValuePair<string, object>> wrappedDictionary)
         {
@@ -42,7 +42,7 @@ internal static CimCustomOptionsDictionary Create(IEnumerable<KeyValuePair<strin
             return new CimCustomOptionsDictionary(wrappedDictionary);
         }
 
-        private static readonly ConditionalWeakTable<CimInstance, CimCustomOptionsDictionary> s_cimInstanceToCustomOptions = new ConditionalWeakTable<CimInstance, CimCustomOptionsDictionary>();
+        private static readonly ConditionalWeakTable<CimInstance, CimCustomOptionsDictionary> s_cimInstanceToCustomOptions = new();
 
         internal static void AssociateCimInstanceWithCustomOptions(CimInstance cimInstance, CimCustomOptionsDictionary newCustomOptions)
         {
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimQuery.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimQuery.cs
index 34b1cc8ba54..a6f5b9616b9 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimQuery.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimQuery.cs
@@ -27,7 +27,7 @@ internal class CimQuery : QueryBuilder, ISessionBoundQueryBuilder<CimSession>
         private string _resultRole;
         private string _sourceRole;
 
-        internal readonly Dictionary<string, object> queryOptions = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+        internal readonly Dictionary<string, object> queryOptions = new(StringComparer.OrdinalIgnoreCase);
 
         internal ClientSideQuery ClientSideQuery { get; }
 
@@ -196,8 +196,8 @@ private static string GetMatchCondition(string propertyName, IEnumerable propert
         /// <param name="propertyName">Property name to query on.</param>
         /// <param name="allowedPropertyValues">Property values to accept in the query.</param>
         /// <param name="wildcardsEnabled">
-        ///   <c>true</c> if <paramref name="allowedPropertyValues"/> should be treated as a <see cref="System.String"/> containing a wildcard pattern;
-        ///   <c>false otherwise</c>
+        ///   <see langword="true"/> if <paramref name="allowedPropertyValues"/> should be treated as a <see cref="System.String"/> containing a wildcard pattern;
+        ///   <see langword="false"/> otherwise.
         /// </param>
         /// <param name="behaviorOnNoMatch">
         /// Describes how to handle filters that didn't match any objects
@@ -219,8 +219,8 @@ public override void FilterByProperty(string propertyName, IEnumerable allowedPr
         /// <param name="propertyName">Property name to query on.</param>
         /// <param name="excludedPropertyValues">Property values to reject in the query.</param>
         /// <param name="wildcardsEnabled">
-        /// <c>true</c> if <paramref name="excludedPropertyValues"/> should be treated as a <see cref="System.String"/> containing a wildcard pattern;
-        /// <c>false otherwise</c>
+        /// <see langword="true"/> if <paramref name="excludedPropertyValues"/> should be treated as a <see cref="System.String"/> containing a wildcard pattern;
+        /// <see langword="false"/> otherwise.
         /// </param>
         /// <param name="behaviorOnNoMatch">
         /// Describes how to handle filters that didn't match any objects
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimWrapper.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimWrapper.cs
index 7bddc46b312..7052b16c768 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimWrapper.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/cimWrapper.cs
@@ -94,11 +94,10 @@ internal CimCmdletInvocationContext CmdletInvocationContext
         {
             get
             {
-                return _cmdletInvocationContext ??
-                    (_cmdletInvocationContext = new CimCmdletInvocationContext(
-                        this.CmdletDefinitionContext,
-                        this.Cmdlet,
-                        this.GetDynamicNamespace()));
+                return _cmdletInvocationContext ??= new CimCmdletInvocationContext(
+                    this.CmdletDefinitionContext,
+                    this.Cmdlet,
+                    this.GetDynamicNamespace());
             }
         }
 
@@ -200,7 +199,7 @@ internal override StartableJob CreateQueryJob(CimSession session, QueryBuilder b
         /// <param name="session">Remote session to invoke the method in.</param>
         /// <param name="objectInstance">The object on which to invoke the method.</param>
         /// <param name="methodInvocationInfo">Method invocation details.</param>
-        /// <param name="passThru"><c>true</c> if successful method invocations should emit downstream the <paramref name="objectInstance"/> being operated on.</param>
+        /// <param name="passThru"><see langword="true"/> if successful method invocations should emit downstream the <paramref name="objectInstance"/> being operated on.</param>
         /// <returns></returns>
         internal override StartableJob CreateInstanceMethodInvocationJob(CimSession session, CimInstance objectInstance, MethodInvocationInfo methodInvocationInfo, bool passThru)
         {
@@ -282,7 +281,7 @@ private bool IsSupportedSession(CimSession cimSession, TerminatingErrorTracker t
                                 cimSession.ComputerName,
                                 nameOfUnsupportedSwitch);
                             Exception exception = new NotSupportedException(errorMessage);
-                            ErrorRecord errorRecord = new ErrorRecord(
+                            ErrorRecord errorRecord = new(
                                 exception,
                                 "NoExtendedSemanticsSupportInRemoteDcomProtocol",
                                 ErrorCategory.NotImplemented,
@@ -339,7 +338,7 @@ internal override StartableJob CreateStaticMethodInvocationJob(CimSession sessio
 
         #region Session affinity management
 
-        private static readonly ConditionalWeakTable<CimInstance, CimSession> s_cimInstanceToSessionOfOrigin = new ConditionalWeakTable<CimInstance, CimSession>();
+        private static readonly ConditionalWeakTable<CimInstance, CimSession> s_cimInstanceToSessionOfOrigin = new();
 
         internal static void AssociateSessionOfOriginWithInstance(CimInstance cimInstance, CimSession sessionOfOrigin)
         {
@@ -395,10 +394,10 @@ object IDynamicParameters.GetDynamicParameters()
 
                 if (this.CmdletDefinitionContext.ExposeCimNamespaceParameter)
                 {
-                    Collection<Attribute> namespaceAttributes = new Collection<Attribute>();
+                    Collection<Attribute> namespaceAttributes = new();
                     namespaceAttributes.Add(new ValidateNotNullOrEmptyAttribute());
                     namespaceAttributes.Add(new ParameterAttribute());
-                    RuntimeDefinedParameter namespaceRuntimeParameter = new RuntimeDefinedParameter(
+                    RuntimeDefinedParameter namespaceRuntimeParameter = new(
                         CimNamespaceParameter,
                         typeof(string),
                         namespaceAttributes);
diff --git a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/clientSideQuery.cs b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/clientSideQuery.cs
index 4159cc07685..39d1a5bc441 100644
--- a/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/clientSideQuery.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/cimSupport/cmdletization/cim/clientSideQuery.cs
@@ -153,7 +153,7 @@ public virtual IEnumerable<NotFoundError> GetNotFoundErrors_IfThisIsTheOnlyFilte
 
         private abstract class CimInstancePropertyBasedFilter : CimInstanceFilterBase
         {
-            private readonly List<PropertyValueFilter> _propertyValueFilters = new List<PropertyValueFilter>();
+            private readonly List<PropertyValueFilter> _propertyValueFilters = new();
 
             protected IEnumerable<PropertyValueFilter> PropertyValueFilters { get { return _propertyValueFilters; } }
 
@@ -624,8 +624,8 @@ private static bool ActualValueLessThanOrEqualToExpectedValue(string propertyNam
         private int _numberOfResultsFromMi;
         private int _numberOfMatchingResults;
 
-        private readonly List<CimInstanceFilterBase> _filters = new List<CimInstanceFilterBase>();
-        private readonly object _myLock = new object();
+        private readonly List<CimInstanceFilterBase> _filters = new();
+        private readonly object _myLock = new();
 
         #region "Public" interface for client-side filtering
 
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/AddContentCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/AddContentCommand.cs
index e56af5aa9cd..0f9762084d5 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/AddContentCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/AddContentCommand.cs
@@ -40,7 +40,7 @@ internal override void SeekContentPosition(List<ContentHolder> contentHolders)
                     catch (Exception e) // Catch-all OK, 3rd party callout
                     {
                         ProviderInvocationException providerException =
-                            new ProviderInvocationException(
+                            new(
                                 "ProviderSeekError",
                                 SessionStateStrings.ProviderSeekError,
                                 holder.PathInfo.Provider,
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/CIMHelper.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/CIMHelper.cs
index 559af13127b..1b10bbfe7ab 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/CIMHelper.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/CIMHelper.cs
@@ -85,8 +85,8 @@ internal static string WqlQueryAll(string from)
             try
             {
                 var type = typeof(T);
-                var binding = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
-                T rv = new T();
+                const BindingFlags binding = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
+                T rv = new();
 
                 using (var instance = session.QueryFirstInstance(nameSpace, CIMHelper.WqlQueryAll(wmiClassName)))
                 {
@@ -144,11 +144,11 @@ internal static string WqlQueryAll(string from)
                 if (instances != null)
                 {
                     var type = typeof(T);
-                    var binding = BindingFlags.Public | BindingFlags.Instance;
+                    const BindingFlags binding = BindingFlags.Public | BindingFlags.Instance;
 
                     foreach (var instance in instances)
                     {
-                        T objT = new T();
+                        T objT = new();
 
                         using (instance)
                         {
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/ClearPropertyCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/ClearPropertyCommand.cs
index b5febde067b..f63eb8eed91 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/ClearPropertyCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/ClearPropertyCommand.cs
@@ -84,7 +84,7 @@ public string Name
         /// </returns>
         internal override object GetDynamicParameters(CmdletProviderContext context)
         {
-            Collection<string> propertyCollection = new Collection<string>();
+            Collection<string> propertyCollection = new();
             propertyCollection.Add(_property);
 
             if (Path != null && Path.Length > 0)
@@ -124,7 +124,7 @@ protected override void ProcessRecord()
             CmdletProviderContext currentContext = CmdletProviderContext;
             currentContext.PassThru = PassThru;
 
-            Collection<string> propertyCollection = new Collection<string>();
+            Collection<string> propertyCollection = new();
             propertyCollection.Add(_property);
 
             foreach (string path in Path)
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/ClearRecycleBinCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/ClearRecycleBinCommand.cs
index db89c34f5a6..78be89b90da 100644
--- 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))
@@ -220,7 +220,7 @@ private void EmptyRecycleBin(string drivePath)
                     statusDescription = string.Format(CultureInfo.InvariantCulture, ClearRecycleBinResources.ClearRecycleBinStatusDescriptionByDrive, drivePath);
                 }
 
-                ProgressRecord progress = new ProgressRecord(0, activity, statusDescription);
+                ProgressRecord progress = new(0, activity, statusDescription);
                 progress.PercentComplete = 30;
                 progress.RecordType = ProgressRecordType.Processing;
                 WriteProgress(progress);
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Clipboard.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Clipboard.cs
index 38a1b5c48a6..5ce64350fbd 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Clipboard.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Clipboard.cs
@@ -21,7 +21,7 @@ private static string StartProcess(
             string args,
             string stdin = "")
         {
-            ProcessStartInfo startInfo = new ProcessStartInfo();
+            ProcessStartInfo startInfo = new();
             startInfo.UseShellExecute = false;
             startInfo.RedirectStandardInput = true;
             startInfo.RedirectStandardOutput = true;
@@ -30,7 +30,7 @@ private static string StartProcess(
             startInfo.Arguments = args;
             string stdout;
 
-            using (Process process = new Process())
+            using (Process process = new())
             {
                 process.StartInfo = startInfo;
                 try
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
index 6b52d547591..9d30f5b3a08 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Computer.cs
@@ -194,9 +194,9 @@ public class RestartComputerCommand : PSCmdlet, IDisposable
         [Alias("CN", "__SERVER", "Server", "IPAddress")]
         public string[] ComputerName { get; set; } = new string[] { "." };
 
-        private List<string> _validatedComputerNames = new List<string>();
-        private readonly List<string> _waitOnComputers = new List<string>();
-        private readonly HashSet<string> _uniqueComputerNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        private List<string> _validatedComputerNames = new();
+        private readonly List<string> _waitOnComputers = new();
+        private readonly HashSet<string> _uniqueComputerNames = new(StringComparer.OrdinalIgnoreCase);
 
         /// <summary>
         /// The following is the definition of the input parameter "Credential".
@@ -336,13 +336,13 @@ public Int16 Delay
         /// Indicate to exit.
         /// </summary>
         private bool _exit, _timeUp;
-        private readonly CancellationTokenSource _cancel = new CancellationTokenSource();
+        private readonly CancellationTokenSource _cancel = new();
 
         /// <summary>
         /// A waithandler to wait on. Current thread will wait on it during the delay interval.
         /// </summary>
-        private readonly ManualResetEventSlim _waitHandler = new ManualResetEventSlim(false);
-        private readonly Dictionary<string, ComputerInfo> _computerInfos = new Dictionary<string, ComputerInfo>(StringComparer.OrdinalIgnoreCase);
+        private readonly ManualResetEventSlim _waitHandler = new(false);
+        private readonly Dictionary<string, ComputerInfo> _computerInfos = new(StringComparer.OrdinalIgnoreCase);
 
         // CLR 4.0 Port note - use https://msdn.microsoft.com/library/system.net.networkinformation.ipglobalproperties.hostname(v=vs.110).aspx
         private readonly string _shortLocalMachineName = Dns.GetHostName();
@@ -441,7 +441,7 @@ private void ValidateComputerNames()
             if (!InternalTestHooks.TestWaitStopComputer && Wait && containLocalhost)
             {
                 // The local machine will be ignored, and an error will be emitted.
-                InvalidOperationException ex = new InvalidOperationException(ComputerResources.CannotWaitLocalComputer);
+                InvalidOperationException ex = new(ComputerResources.CannotWaitLocalComputer);
                 WriteError(new ErrorRecord(ex, "CannotWaitLocalComputer", ErrorCategory.InvalidOperation, null));
                 containLocalhost = false;
             }
@@ -463,7 +463,7 @@ private void ValidateComputerNames()
         /// <param name="progressRecordType"></param>
         private void WriteProgress(string activity, string status, int percent, ProgressRecordType progressRecordType)
         {
-            ProgressRecord progress = new ProgressRecord(_activityId, activity, status);
+            ProgressRecord progress = new(_activityId, activity, status);
             progress.PercentComplete = percent;
             progress.RecordType = progressRecordType;
             WriteProgress(progress);
@@ -725,7 +725,7 @@ internal static List<string> TestWmiConnectionUsingWsman(List<string> computerNa
         /// <returns></returns>
         internal static List<string> TestPowerShell(List<string> computerNames, List<string> nextTestList, System.Management.Automation.PowerShell powershell, PSCredential credential)
         {
-            List<string> psList = new List<string>();
+            List<string> psList = new();
 
             try
             {
@@ -783,7 +783,7 @@ protected override void BeginProcessing()
             // Timeout, For, Delay, Progress cannot be present if Wait is not present
             if ((_timeoutSpecified || _waitForSpecified || _delaySpecified) && !Wait)
             {
-                InvalidOperationException ex = new InvalidOperationException(ComputerResources.RestartComputerInvalidParameter);
+                InvalidOperationException ex = new(ComputerResources.RestartComputerInvalidParameter);
                 ThrowTerminatingError(new ErrorRecord(ex, "RestartComputerInvalidParameter", ErrorCategory.InvalidOperation, null));
             }
 
@@ -810,8 +810,8 @@ protected override void BeginProcessing()
                         _powershell.AddScript(TestPowershellScript);
                         break;
                     default:
-                        InvalidOperationException ex = new InvalidOperationException(ComputerResources.NoSupportForCombinedServiceType);
-                        ErrorRecord error = new ErrorRecord(ex, "NoSupportForCombinedServiceType", ErrorCategory.InvalidOperation, (int)_waitFor);
+                        InvalidOperationException ex = new(ComputerResources.NoSupportForCombinedServiceType);
+                        ErrorRecord error = new(ex, "NoSupportForCombinedServiceType", ErrorCategory.InvalidOperation, (int)_waitFor);
                         ThrowTerminatingError(error);
                         break;
                 }
@@ -1117,7 +1117,7 @@ public sealed class StopComputerCommand : PSCmdlet, IDisposable
     {
         #region Private Members
 
-        private readonly CancellationTokenSource _cancel = new CancellationTokenSource();
+        private readonly CancellationTokenSource _cancel = new();
 
         private const int forcedShutdown = 5; // See https://msdn.microsoft.com/library/aa394058(v=vs.85).aspx
 
@@ -1388,7 +1388,7 @@ private string ValidateComputerName()
             {
                 bool isLocalhost = targetComputer.Equals(ComputerWMIHelper.localhostStr, StringComparison.OrdinalIgnoreCase);
                 string errMsg = StringUtil.Format(ComputerResources.InvalidNewName, isLocalhost ? _shortLocalMachineName : targetComputer, NewName);
-                ErrorRecord error = new ErrorRecord(
+                ErrorRecord error = new(
                         new InvalidOperationException(errMsg), "InvalidNewName",
                         ErrorCategory.InvalidArgument, NewName);
                 WriteError(error);
@@ -1430,7 +1430,7 @@ private void DoRenameComputerWsman(string computer, string computerName, string
 
             try
             {
-                using (CancellationTokenSource cancelTokenSource = new CancellationTokenSource())
+                using (CancellationTokenSource cancelTokenSource = new())
                 using (CimSession cimSession = RemoteDiscoveryHelper.CreateCimSession(computer, credToUse, WsmanAuthentication, isLocalhost, this, cancelTokenSource.Token))
                 {
                     var operationOptions = new CimOperationOptions
@@ -1453,7 +1453,7 @@ private void DoRenameComputerWsman(string computer, string computerName, string
                         if (oldName.Equals(newName, StringComparison.OrdinalIgnoreCase))
                         {
                             string errMsg = StringUtil.Format(ComputerResources.NewNameIsOldName, computerName, newName);
-                            ErrorRecord error = new ErrorRecord(
+                            ErrorRecord error = new(
                                     new InvalidOperationException(errMsg), "NewNameIsOldName",
                                     ErrorCategory.InvalidArgument, newName);
                             WriteError(error);
@@ -1512,7 +1512,7 @@ private void DoRenameComputerWsman(string computer, string computerName, string
                         {
                             var ex = new Win32Exception(retVal);
                             string errMsg = StringUtil.Format(ComputerResources.FailToRename, computerName, newName, ex.Message);
-                            ErrorRecord error = new ErrorRecord(new InvalidOperationException(errMsg), "FailToRenameComputer", ErrorCategory.OperationStopped, computerName);
+                            ErrorRecord error = new(new InvalidOperationException(errMsg), "FailToRenameComputer", ErrorCategory.OperationStopped, computerName);
                             WriteError(error);
                         }
                         else
@@ -1553,14 +1553,14 @@ private void DoRenameComputerWsman(string computer, string computerName, string
             catch (CimException ex)
             {
                 string errMsg = StringUtil.Format(ComputerResources.FailToConnectToComputer, computerName, ex.Message);
-                ErrorRecord error = new ErrorRecord(new InvalidOperationException(errMsg), "RenameComputerException",
+                ErrorRecord error = new(new InvalidOperationException(errMsg), "RenameComputerException",
                                                     ErrorCategory.OperationStopped, computerName);
                 WriteError(error);
             }
             catch (Exception ex)
             {
                 string errMsg = StringUtil.Format(ComputerResources.FailToConnectToComputer, computerName, ex.Message);
-                ErrorRecord error = new ErrorRecord(new InvalidOperationException(errMsg), "RenameComputerException",
+                ErrorRecord error = new(new InvalidOperationException(errMsg), "RenameComputerException",
                                                     ErrorCategory.OperationStopped, computerName);
                 WriteError(error);
             }
@@ -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);
         }
@@ -1806,7 +1806,7 @@ internal static string GetLocalAdminUserName(string computerName, PSCredential p
                 }
                 else
                 {
-                    localUserName = string.Concat(computerName.AsSpan().Slice(0, dotIndex), "\\", psLocalCredential.UserName);
+                    localUserName = string.Concat(computerName.AsSpan(0, dotIndex), "\\", psLocalCredential.UserName);
                 }
             }
 
@@ -1844,7 +1844,7 @@ internal static string GetRandomPassword(int passwordLength)
         /// <returns></returns>
         internal static string GetScopeString(string computer, string namespaceParameter)
         {
-            StringBuilder returnValue = new StringBuilder("\\\\");
+            StringBuilder returnValue = new("\\\\");
             if (computer.Equals("::1", StringComparison.OrdinalIgnoreCase) || computer.Equals("[::1]", StringComparison.OrdinalIgnoreCase))
             {
                 returnValue.Append("localhost");
@@ -1920,7 +1920,7 @@ internal static string GetMachineNames(string[] computerNames)
             }
 
             string compname = string.Empty;
-            StringBuilder strComputers = new StringBuilder();
+            StringBuilder strComputers = new();
             int i = 0;
             foreach (string computer in computerNames)
             {
@@ -1950,7 +1950,7 @@ internal static string GetMachineNames(string[] computerNames)
 
         internal static ComputerChangeInfo GetComputerStatusObject(int errorcode, string computername)
         {
-            ComputerChangeInfo computerchangeinfo = new ComputerChangeInfo();
+            ComputerChangeInfo computerchangeinfo = new();
             computerchangeinfo.ComputerName = computername;
             if (errorcode != 0)
             {
@@ -1966,7 +1966,7 @@ internal static ComputerChangeInfo GetComputerStatusObject(int errorcode, string
 
         internal static RenameComputerChangeInfo GetRenameComputerStatusObject(int errorcode, string newcomputername, string oldcomputername)
         {
-            RenameComputerChangeInfo renamecomputerchangeinfo = new RenameComputerChangeInfo();
+            RenameComputerChangeInfo renamecomputerchangeinfo = new();
             renamecomputerchangeinfo.OldComputerName = oldcomputername;
             renamecomputerchangeinfo.NewComputerName = newcomputername;
             if (errorcode != 0)
@@ -1983,7 +1983,7 @@ internal static RenameComputerChangeInfo GetRenameComputerStatusObject(int error
 
         internal static void WriteNonTerminatingError(int errorcode, PSCmdlet cmdlet, string computername)
         {
-            Win32Exception ex = new Win32Exception(errorcode);
+            Win32Exception ex = new(errorcode);
             string additionalmessage = string.Empty;
             if (ex.NativeErrorCode.Equals(0x00000035))
             {
@@ -1991,7 +1991,7 @@ internal static void WriteNonTerminatingError(int errorcode, PSCmdlet cmdlet, st
             }
 
             string message = StringUtil.Format(ComputerResources.OperationFailed, ex.Message, computername, additionalmessage);
-            ErrorRecord er = new ErrorRecord(new InvalidOperationException(message), "InvalidOperationException", ErrorCategory.InvalidOperation, computername);
+            ErrorRecord er = new(new InvalidOperationException(message), "InvalidOperationException", ErrorCategory.InvalidOperation, computername);
             cmdlet.WriteError(er);
         }
 
@@ -2101,7 +2101,7 @@ internal static bool InvokeWin32ShutdownUsingWsman(
                     string message =
                         StringUtil.Format(ComputerResources.PrivilegeNotEnabled, computerName,
                             isLocalhost ? ComputerWMIHelper.SE_SHUTDOWN_NAME : ComputerWMIHelper.SE_REMOTE_SHUTDOWN_NAME);
-                    ErrorRecord errorRecord = new ErrorRecord(new InvalidOperationException(message), "PrivilegeNotEnabled", ErrorCategory.InvalidOperation, null);
+                    ErrorRecord errorRecord = new(new InvalidOperationException(message), "PrivilegeNotEnabled", ErrorCategory.InvalidOperation, null);
                     cmdlet.WriteError(errorRecord);
                     return false;
                 }
@@ -2159,7 +2159,7 @@ internal static bool InvokeWin32ShutdownUsingWsman(
                     {
                         var ex = new Win32Exception(retVal);
                         string errMsg = StringUtil.Format(formatErrorMessage, computerName, ex.Message);
-                        ErrorRecord error = new ErrorRecord(
+                        ErrorRecord error = new(
                             new InvalidOperationException(errMsg), ErrorFQEID, ErrorCategory.OperationStopped, computerName);
                         cmdlet.WriteError(error);
                     }
@@ -2172,14 +2172,14 @@ internal static bool InvokeWin32ShutdownUsingWsman(
             catch (CimException ex)
             {
                 string errMsg = StringUtil.Format(formatErrorMessage, computerName, ex.Message);
-                ErrorRecord error = new ErrorRecord(new InvalidOperationException(errMsg), ErrorFQEID,
+                ErrorRecord error = new(new InvalidOperationException(errMsg), ErrorFQEID,
                                                     ErrorCategory.OperationStopped, computerName);
                 cmdlet.WriteError(error);
             }
             catch (Exception ex)
             {
                 string errMsg = StringUtil.Format(formatErrorMessage, computerName, ex.Message);
-                ErrorRecord error = new ErrorRecord(new InvalidOperationException(errMsg), ErrorFQEID,
+                ErrorRecord error = new(new InvalidOperationException(errMsg), ErrorFQEID,
                                                     ErrorCategory.OperationStopped, computerName);
                 cmdlet.WriteError(error);
             }
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/ComputerUnix.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/ComputerUnix.cs
index 023fc1d0501..fb01823790f 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/ComputerUnix.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/ComputerUnix.cs
@@ -101,11 +101,28 @@ public class CommandLineCmdletBase : PSCmdlet, IDisposable
 #region "IDisposable Members"
 
         /// <summary>
-        /// Dispose Method.
+        /// Releases all resources used by the <see cref="CommandLineCmdletBase"/>.
         /// </summary>
         public void Dispose()
         {
-            _process?.Dispose();
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Releases the unmanaged resources used by the <see cref="CommandLineCmdletBase"/>
+        /// and optionally releases the managed resources.
+        /// </summary>
+        /// <param name="disposing">
+        /// <see langword="true"/> to release both managed and unmanaged resources;
+        /// <see langword="false"/> to release only unmanaged resources.
+        /// </param>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                _process?.Dispose();
+            }
         }
 
 #endregion "IDisposable Members"
@@ -137,14 +154,12 @@ protected override void StopProcessing()
         /// Run a command.
         /// </summary>
         protected void RunCommand(String command, String args) {
-            String cmd = "";
-
             _process = new Process()
             {
                 StartInfo = new ProcessStartInfo
                 {
                     FileName = "/sbin/shutdown",
-                    Arguments = cmd,
+                    Arguments = string.Empty,
                     RedirectStandardOutput = false,
                     UseShellExecute = false,
                     CreateNoWindow = true,
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/ContentCommandBase.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/ContentCommandBase.cs
index b595c0195f9..b591e05f7de 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/ContentCommandBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/ContentCommandBase.cs
@@ -108,7 +108,7 @@ public override SwitchParameter Force
         /// An array of content holder objects that contain the path information
         /// and content readers/writers for the item represented by the path information.
         /// </summary>
-        internal List<ContentHolder> contentStreams = new List<ContentHolder>();
+        internal List<ContentHolder> contentStreams = new();
 
         /// <summary>
         /// Wraps the content into a PSObject and adds context information as notes.
@@ -297,7 +297,7 @@ public PSObject AttachNotes(PSObject content)
             {
                 // Construct a provider qualified path as the Path note
 
-                PSNoteProperty note = new PSNoteProperty("PSPath", PSPath);
+                PSNoteProperty note = new("PSPath", PSPath);
                 content.Properties.Add(note, true);
                 tracer.WriteLine("Attaching {0} = {1}", "PSPath", PSPath);
 
@@ -336,7 +336,7 @@ public PSObject AttachNotes(PSObject content)
         /// A struct to hold the path information and the content readers/writers
         /// for an item.
         /// </summary>
-        internal struct ContentHolder
+        internal readonly struct ContentHolder
         {
             internal ContentHolder(
                 PathInfo pathInfo,
@@ -385,7 +385,7 @@ internal void CloseContent(List<ContentHolder> contentHolders, bool disposing)
                     // and write out an error.
 
                     ProviderInvocationException providerException =
-                        new ProviderInvocationException(
+                        new(
                             "ProviderContentCloseError",
                             SessionStateStrings.ProviderContentCloseError,
                             holder.PathInfo.Provider,
@@ -422,7 +422,7 @@ internal void CloseContent(List<ContentHolder> contentHolders, bool disposing)
                     // and write out an error.
 
                     ProviderInvocationException providerException =
-                        new ProviderInvocationException(
+                        new(
                             "ProviderContentCloseError",
                             SessionStateStrings.ProviderContentCloseError,
                             holder.PathInfo.Provider,
@@ -480,7 +480,7 @@ internal List<ContentHolder> GetContentReaders(
 
             // Create the results array
 
-            List<ContentHolder> results = new List<ContentHolder>();
+            List<ContentHolder> results = new();
 
             foreach (PathInfo pathInfo in pathInfos)
             {
@@ -538,7 +538,7 @@ internal List<ContentHolder> GetContentReaders(
                     if (readers.Count == 1 && readers[0] != null)
                     {
                         ContentHolder holder =
-                            new ContentHolder(pathInfo, readers[0], null);
+                            new(pathInfo, readers[0], null);
 
                         results.Add(holder);
                     }
@@ -573,7 +573,7 @@ internal Collection<PathInfo> ResolvePaths(
             bool allowEmptyResult,
             CmdletProviderContext currentCommandContext)
         {
-            Collection<PathInfo> results = new Collection<PathInfo>();
+            Collection<PathInfo> results = new();
 
             foreach (string path in pathsToResolve)
             {
@@ -653,7 +653,7 @@ internal Collection<PathInfo> ResolvePaths(
                                 out drive);
 
                         PathInfo pathInfo =
-                            new PathInfo(
+                            new(
                                 drive,
                                 provider,
                                 unresolvedPath,
@@ -666,7 +666,7 @@ internal Collection<PathInfo> ResolvePaths(
                         {
                             // Detect if the path resolution failed to resolve to a file.
                             string error = StringUtil.Format(NavigationResources.ItemNotFound, Path);
-                            Exception e = new Exception(error);
+                            Exception e = new(error);
 
                             pathNotFoundErrorRecord = new ErrorRecord(
                                 e,
@@ -705,14 +705,6 @@ public void Dispose()
             GC.SuppressFinalize(this);
         }
 
-        /// <summary>
-        /// Finalizer.
-        /// </summary>
-        ~ContentCommandBase()
-        {
-            Dispose(false);
-        }
         #endregion IDisposable
-
     }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs
index f478a18e421..4c8a95dddeb 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs
@@ -225,7 +225,7 @@ protected override void ProcessRecord()
         /// </param>
         private void UpdateProgress(string status)
         {
-            ProgressRecord progress = new ProgressRecord(0, activity, status ?? ComputerResources.ProgressStatusCompleted);
+            ProgressRecord progress = new(0, activity, status ?? ComputerResources.ProgressStatusCompleted);
             progress.RecordType = status == null ? ProgressRecordType.Completed : ProgressRecordType.Processing;
 
             WriteProgress(progress);
@@ -486,7 +486,7 @@ private static DeviceGuardInfo GetDeviceGuard(CimSession session)
         /// </returns>
         private static HyperVInfo GetHyperVisorInfo(CimSession session)
         {
-            HyperVInfo info = new HyperVInfo();
+            HyperVInfo info = new();
             bool ok = false;
             CimInstance instance = null;
 
@@ -1142,7 +1142,7 @@ internal static string GetLocaleName(string locale)
                 }
             }
 
-            return culture == null ? null : culture.Name;
+            return culture?.Name;
         }
 
         /// <summary>
@@ -1335,6 +1335,7 @@ protected static string GetLanguageName(uint? lcid)
             return null;
         }
     }
+
 #pragma warning disable 649 // fields and properties in these class are assigned dynamically
     [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Class is instantiated directly from a CIM instance")]
     internal class WmiBaseBoard
@@ -1884,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/GetContentCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetContentCommand.cs
index 964ebd947d1..f01645544bb 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/GetContentCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/GetContentCommand.cs
@@ -116,7 +116,7 @@ protected override void ProcessRecord()
             if (_totalCountSpecified && _tailSpecified)
             {
                 string errMsg = StringUtil.Format(SessionStateStrings.GetContent_TailAndHeadCannotCoexist, "TotalCount", "Tail");
-                ErrorRecord error = new ErrorRecord(new InvalidOperationException(errMsg), "TailAndHeadCannotCoexist", ErrorCategory.InvalidOperation, null);
+                ErrorRecord error = new(new InvalidOperationException(errMsg), "TailAndHeadCannotCoexist", ErrorCategory.InvalidOperation, null);
                 WriteError(error);
                 return;
             }
@@ -145,7 +145,7 @@ protected override void ProcessRecord()
                     if (_tailSpecified && holder.Reader is not FileSystemContentReaderWriter)
                     {
                         string errMsg = SessionStateStrings.GetContent_TailNotSupported;
-                        ErrorRecord error = new ErrorRecord(new InvalidOperationException(errMsg), "TailNotSupported", ErrorCategory.InvalidOperation, Tail);
+                        ErrorRecord error = new(new InvalidOperationException(errMsg), "TailNotSupported", ErrorCategory.InvalidOperation, Tail);
                         WriteError(error);
                         continue;
                     }
@@ -165,7 +165,7 @@ protected override void ProcessRecord()
                         catch (Exception e)
                         {
                             ProviderInvocationException providerException =
-                                new ProviderInvocationException(
+                                new(
                                     "ProviderContentReadError",
                                     SessionStateStrings.ProviderContentReadError,
                                     holder.PathInfo.Provider,
@@ -218,7 +218,7 @@ protected override void ProcessRecord()
                             catch (Exception e) // Catch-all OK. 3rd party callout
                             {
                                 ProviderInvocationException providerException =
-                                    new ProviderInvocationException(
+                                    new(
                                         "ProviderContentReadError",
                                         SessionStateStrings.ProviderContentReadError,
                                         holder.PathInfo.Provider,
@@ -277,7 +277,7 @@ protected override void ProcessRecord()
         /// true if no error occured
         /// false if there was an error
         /// </returns>
-        private bool ScanForwardsForTail(ContentHolder holder, CmdletProviderContext currentContext)
+        private bool ScanForwardsForTail(in ContentHolder holder, CmdletProviderContext currentContext)
         {
             var fsReader = holder.Reader as FileSystemContentReaderWriter;
             Dbg.Diagnostics.Assert(fsReader != null, "Tail is only supported for FileSystemContentReaderWriter");
@@ -294,7 +294,7 @@ private bool ScanForwardsForTail(ContentHolder holder, CmdletProviderContext cur
                 catch (Exception e)
                 {
                     ProviderInvocationException providerException =
-                        new ProviderInvocationException(
+                        new(
                             "ProviderContentReadError",
                             SessionStateStrings.ProviderContentReadError,
                             holder.PathInfo.Provider,
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Hotfix.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Hotfix.cs
index 3c65ecb35c6..d6768a1315e 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Hotfix.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Hotfix.cs
@@ -66,7 +66,7 @@ public sealed class GetHotFixCommand : PSCmdlet, IDisposable
         private ManagementObjectSearcher _searchProcess;
 
         private bool _inputContainsWildcard = false;
-        private readonly ConnectionOptions _connectionOptions = new ConnectionOptions();
+        private readonly ConnectionOptions _connectionOptions = new();
 
         /// <summary>
         /// Sets connection options.
@@ -87,8 +87,8 @@ protected override void ProcessRecord()
             foreach (string computer in ComputerName)
             {
                 bool foundRecord = false;
-                StringBuilder queryString = new StringBuilder();
-                ManagementScope scope = new ManagementScope(ComputerWMIHelper.GetScopeString(computer, ComputerWMIHelper.WMI_Path_CIM), _connectionOptions);
+                StringBuilder queryString = new();
+                ManagementScope scope = new(ComputerWMIHelper.GetScopeString(computer, ComputerWMIHelper.WMI_Path_CIM), _connectionOptions);
                 scope.Connect();
                 if (Id != null)
                 {
@@ -134,7 +134,7 @@ protected override void ProcessRecord()
                     {
                         try
                         {
-                            SecurityIdentifier secObj = new SecurityIdentifier(installed);
+                            SecurityIdentifier secObj = new(installed);
                             obj["InstalledBy"] = secObj.Translate(typeof(NTAccount));
                         }
                         catch (IdentityNotMappedException)
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Navigation.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Navigation.cs
index 859a6dd03f3..6528e8394c2 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Navigation.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Navigation.cs
@@ -39,7 +39,7 @@ internal virtual CmdletProviderContext CmdletProviderContext
         {
             get
             {
-                CmdletProviderContext coreCommandContext = new CmdletProviderContext(this);
+                CmdletProviderContext coreCommandContext = new(this);
 
                 coreCommandContext.Force = Force;
 
@@ -165,7 +165,7 @@ protected override void StopProcessing()
         }
 
         internal Collection<CmdletProviderContext> stopContextCollection =
-            new Collection<CmdletProviderContext>();
+            new();
 
         /// <summary>
         /// Gets or sets the filter property.
@@ -301,7 +301,7 @@ internal override CmdletProviderContext CmdletProviderContext
         {
             get
             {
-                CmdletProviderContext coreCommandContext = new CmdletProviderContext(this, Credential);
+                CmdletProviderContext coreCommandContext = new(this, Credential);
                 coreCommandContext.Force = Force;
 
                 Collection<string> includeFilter =
@@ -447,7 +447,7 @@ protected override void ProcessRecord()
                             catch (DriveNotFoundException e)
                             {
                                 ErrorRecord errorRecord =
-                                    new ErrorRecord(
+                                    new(
                                         e,
                                         "GetLocationNoMatchingDrive",
                                         ErrorCategory.ObjectNotFound,
@@ -458,7 +458,7 @@ protected override void ProcessRecord()
                             catch (ProviderNotFoundException e)
                             {
                                 ErrorRecord errorRecord =
-                                    new ErrorRecord(
+                                    new(
                                         e,
                                         "GetLocationNoMatchingProvider",
                                         ErrorCategory.ObjectNotFound,
@@ -469,7 +469,7 @@ protected override void ProcessRecord()
                             catch (ArgumentException argException)
                             {
                                 ErrorRecord errorRecord =
-                                    new ErrorRecord(
+                                    new(
                                         argException,
                                         "GetLocationNoMatchingDrive",
                                         ErrorCategory.ObjectNotFound,
@@ -523,7 +523,7 @@ protected override void ProcessRecord()
                                 catch (ProviderNotFoundException e)
                                 {
                                     ErrorRecord errorRecord =
-                                        new ErrorRecord(
+                                        new(
                                             e,
                                             "GetLocationNoMatchingProvider",
                                             ErrorCategory.ObjectNotFound,
@@ -1237,7 +1237,7 @@ protected override void ProcessRecord()
                     // -Persist switch parameter is supported only for FileSystem provider.
                     if (Persist && !provider.Name.Equals(FileSystemProvider.ProviderName, StringComparison.OrdinalIgnoreCase))
                     {
-                        ErrorRecord er = new ErrorRecord(new NotSupportedException(FileSystemProviderStrings.PersistNotSupported), "DriveRootNotNetworkPath", ErrorCategory.InvalidArgument, this);
+                        ErrorRecord er = new(new NotSupportedException(FileSystemProviderStrings.PersistNotSupported), "DriveRootNotNetworkPath", ErrorCategory.InvalidArgument, this);
                         ThrowTerminatingError(er);
                     }
 
@@ -1249,7 +1249,7 @@ protected override void ProcessRecord()
 
                     // Create the new drive
                     PSDriveInfo newDrive =
-                        new PSDriveInfo(
+                        new(
                             Name,
                             provider,
                             Root,
@@ -1368,7 +1368,7 @@ internal List<PSDriveInfo> GetMatchingDrives(
             string[] providerNames,
             string scope)
         {
-            List<PSDriveInfo> results = new List<PSDriveInfo>();
+            List<PSDriveInfo> results = new();
 
             if (providerNames == null || providerNames.Length == 0)
             {
@@ -1637,7 +1637,7 @@ protected override void ProcessRecord()
 
                 if (verifyMatch && !foundMatch)
                 {
-                    DriveNotFoundException e = new DriveNotFoundException(
+                    DriveNotFoundException e = new(
                         driveName,
                         "DriveNotFound",
                         SessionStateStrings.DriveNotFound);
@@ -1776,7 +1776,7 @@ protected override void ProcessRecord()
                         if (!WildcardPattern.ContainsWildcardCharacters(driveName))
                         {
                             DriveNotFoundException driveNotFound =
-                                new DriveNotFoundException(
+                                new(
                                     driveName,
                                     "DriveNotFound",
                                     SessionStateStrings.DriveNotFound);
@@ -1793,7 +1793,7 @@ protected override void ProcessRecord()
                 catch (DriveNotFoundException driveNotFound)
                 {
                     ErrorRecord errorRecord =
-                        new ErrorRecord(
+                        new(
                             driveNotFound,
                             "GetLocationNoMatchingDrive",
                             ErrorCategory.ObjectNotFound,
@@ -1803,7 +1803,7 @@ protected override void ProcessRecord()
                 catch (ProviderNotFoundException providerNotFound)
                 {
                     ErrorRecord errorRecord =
-                        new ErrorRecord(
+                        new(
                             providerNotFound,
                             "GetLocationNoMatchingDrive",
                             ErrorCategory.ObjectNotFound,
@@ -2539,7 +2539,7 @@ protected override void ProcessRecord()
                         if (SuppressWildcardExpansion == true && resolvedPSPaths.Count == 0)
                         {
                             ItemNotFoundException pathNotFound =
-                                new ItemNotFoundException(
+                                new(
                                     path,
                                     "PathNotFound",
                                     SessionStateStrings.PathNotFound);
@@ -2700,7 +2700,7 @@ protected override void ProcessRecord()
                     {
                         try
                         {
-                            System.IO.DirectoryInfo di = new System.IO.DirectoryInfo(providerPath);
+                            System.IO.DirectoryInfo di = new(providerPath);
                             if (di != null && (di.Attributes & System.IO.FileAttributes.ReparsePoint) != 0)
                             {
                                 shouldRecurse = false;
@@ -2941,7 +2941,7 @@ internal override object GetDynamicParameters(CmdletProviderContext context)
 
         private Collection<PathInfo> GetResolvedPaths(string path)
         {
-            Collection<PathInfo> results = new Collection<PathInfo>();
+            Collection<PathInfo> results = new();
             try
             {
                 results = SessionState.Path.GetResolvedPSPathFromPSPath(path, CmdletProviderContext);
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/ParsePathCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/ParsePathCommand.cs
index a1dd7895fc1..d56a20faba0 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/ParsePathCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/ParsePathCommand.cs
@@ -184,7 +184,7 @@ public string[] LiteralPath
         /// </summary>
         protected override void ProcessRecord()
         {
-            StringCollection pathsToParse = new StringCollection();
+            StringCollection pathsToParse = new();
 
             if (Resolve)
             {
@@ -305,7 +305,7 @@ protected override void ProcessRecord()
                         if (separatorIndex < 0)
                         {
                             FormatException e =
-                                new FormatException(
+                                new(
                                     StringUtil.Format(NavigationResources.ParsePathFormatError, pathsToParse[index]));
                             WriteError(
                                 new ErrorRecord(
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Process.cs
index 32e33d59d6a..c6eb4327471 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 @@ internal enum MatchMode
             /// Select the processes specified as input.
             /// </summary>
             ByInput
-        };
+        }
         /// <summary>
         /// The current process selection mode.
         /// </summary>
@@ -103,8 +103,8 @@ public virtual Process[] InputObject
 
         // We use a Dictionary to optimize the check whether the object
         // is already in the list.
-        private List<Process> _matchingProcesses = new List<Process>();
-        private readonly Dictionary<int, Process> _keys = new Dictionary<int, Process>();
+        private List<Process> _matchingProcesses = new();
+        private readonly Dictionary<int, Process> _keys = new();
 
         /// <summary>
         /// Retrieve the list of all processes matching the Name, Id
@@ -233,7 +233,7 @@ private void RetrieveMatchingProcessesById()
                 catch (ArgumentException)
                 {
                     WriteNonTerminatingError(
-                        "",
+                        string.Empty,
                         processId,
                         processId,
                         null,
@@ -280,7 +280,7 @@ internal Process[] AllProcesses
             {
                 if (_allProcesses == null)
                 {
-                    List<Process> processes = new List<Process>();
+                    List<Process> processes = new();
                     processes.AddRange(Process.GetProcesses());
                     _allProcesses = processes.ToArray();
                 }
@@ -358,7 +358,7 @@ internal void WriteNonTerminatingError(
                 processId,
                 (innerException == null) ? string.Empty : innerException.Message);
             ProcessCommandException exception =
-                new ProcessCommandException(message, innerException);
+                new(message, innerException);
             exception.ProcessName = processName;
 
             WriteError(new ErrorRecord(
@@ -723,7 +723,7 @@ private static PSObject AddUserNameToProcess(Process process)
             string userName = RetrieveProcessUserName(process);
 
             PSObject processAsPsobj = PSObject.AsPSObject(process);
-            PSNoteProperty noteProperty = new PSNoteProperty("UserName", userName);
+            PSNoteProperty noteProperty = new("UserName", userName);
 
             processAsPsobj.Properties.Add(noteProperty, true);
             processAsPsobj.TypeNames.Insert(0, TypeNameForProcessWithUserName);
@@ -952,7 +952,7 @@ private void myProcess_Exited(object sender, System.EventArgs e)
 
         #region Overrides
 
-        private readonly List<Process> _processList = new List<Process>();
+        private readonly List<Process> _processList = new();
 
         // Wait handle which is used by thread to sleep.
         private ManualResetEvent _waitHandle;
@@ -1029,7 +1029,7 @@ protected override void EndProcessing()
                     if (!process.HasExited)
                     {
                         string message = StringUtil.Format(ProcessResources.ProcessNotTerminated, new object[] { process.ProcessName, process.Id });
-                        ErrorRecord errorRecord = new ErrorRecord(new TimeoutException(message), "ProcessNotTerminated", ErrorCategory.CloseError, process);
+                        ErrorRecord errorRecord = new(new TimeoutException(message), "ProcessNotTerminated", ErrorCategory.CloseError, process);
                         WriteError(errorRecord);
                     }
                 }
@@ -1387,9 +1387,9 @@ private void StopDependentService(Process process)
 
         /// <summary>
         /// Stops the given process throws non terminating error if can't.
-        /// <param name="process" >Process to be stopped.</param>
-        /// <returns>True if process stopped successfully else false.</returns>
         /// </summary>
+        /// <param name="process">Process to be stopped.</param>
+        /// <returns>True if process stopped successfully else false.</returns>
         private void StopProcess(Process process)
         {
             Exception exception = null;
@@ -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)
@@ -1822,7 +1822,7 @@ protected override void BeginProcessing()
                 if (_nonewwindow && _windowstyleSpecified)
                 {
                     message = StringUtil.Format(ProcessResources.ContradictParametersSpecified, "-NoNewWindow", "-WindowStyle");
-                    ErrorRecord er = new ErrorRecord(new InvalidOperationException(message), "InvalidOperationException", ErrorCategory.InvalidOperation, null);
+                    ErrorRecord er = new(new InvalidOperationException(message), "InvalidOperationException", ErrorCategory.InvalidOperation, null);
                     WriteError(er);
                     return;
                 }
@@ -1840,12 +1840,12 @@ protected override void BeginProcessing()
 
                 if (!string.IsNullOrEmpty(message))
                 {
-                    ErrorRecord er = new ErrorRecord(new NotSupportedException(message), "NotSupportedException", ErrorCategory.NotImplemented, null);
+                    ErrorRecord er = new(new NotSupportedException(message), "NotSupportedException", ErrorCategory.NotImplemented, null);
                     ThrowTerminatingError(er);
                 }
             }
 
-            ProcessStartInfo startInfo = new ProcessStartInfo();
+            ProcessStartInfo startInfo = new();
             // Use ShellExecute by default if we are running on full windows SKUs
             startInfo.UseShellExecute = Platform.IsWindowsDesktop;
 
@@ -1883,7 +1883,7 @@ protected override void BeginProcessing()
                 if (!Directory.Exists(WorkingDirectory))
                 {
                     message = StringUtil.Format(ProcessResources.InvalidInput, "WorkingDirectory");
-                    ErrorRecord er = new ErrorRecord(new DirectoryNotFoundException(message), "DirectoryNotFoundException", ErrorCategory.InvalidOperation, null);
+                    ErrorRecord er = new(new DirectoryNotFoundException(message), "DirectoryNotFoundException", ErrorCategory.InvalidOperation, null);
                     WriteError(er);
                     return;
                 }
@@ -1942,7 +1942,7 @@ protected override void BeginProcessing()
                     if (!File.Exists(_redirectstandardinput))
                     {
                         message = StringUtil.Format(ProcessResources.InvalidInput, "RedirectStandardInput '" + this.RedirectStandardInput + "'");
-                        ErrorRecord er = new ErrorRecord(new FileNotFoundException(message), "FileNotFoundException", ErrorCategory.InvalidOperation, null);
+                        ErrorRecord er = new(new FileNotFoundException(message), "FileNotFoundException", ErrorCategory.InvalidOperation, null);
                         WriteError(er);
                         return;
                     }
@@ -1956,7 +1956,7 @@ protected override void BeginProcessing()
                     if (_redirectstandardinput.Equals(_redirectstandardoutput, StringComparison.OrdinalIgnoreCase))
                     {
                         message = StringUtil.Format(ProcessResources.DuplicateEntry, "RedirectStandardInput", "RedirectStandardOutput");
-                        ErrorRecord er = new ErrorRecord(new InvalidOperationException(message), "InvalidOperationException", ErrorCategory.InvalidOperation, null);
+                        ErrorRecord er = new(new InvalidOperationException(message), "InvalidOperationException", ErrorCategory.InvalidOperation, null);
                         WriteError(er);
                         return;
                     }
@@ -1970,7 +1970,7 @@ protected override void BeginProcessing()
                     if (_redirectstandardinput.Equals(_redirectstandarderror, StringComparison.OrdinalIgnoreCase))
                     {
                         message = StringUtil.Format(ProcessResources.DuplicateEntry, "RedirectStandardInput", "RedirectStandardError");
-                        ErrorRecord er = new ErrorRecord(new InvalidOperationException(message), "InvalidOperationException", ErrorCategory.InvalidOperation, null);
+                        ErrorRecord er = new(new InvalidOperationException(message), "InvalidOperationException", ErrorCategory.InvalidOperation, null);
                         WriteError(er);
                         return;
                     }
@@ -1984,7 +1984,7 @@ protected override void BeginProcessing()
                     if (_redirectstandardoutput.Equals(_redirectstandarderror, StringComparison.OrdinalIgnoreCase))
                     {
                         message = StringUtil.Format(ProcessResources.DuplicateEntry, "RedirectStandardOutput", "RedirectStandardError");
-                        ErrorRecord er = new ErrorRecord(new InvalidOperationException(message), "InvalidOperationException", ErrorCategory.InvalidOperation, null);
+                        ErrorRecord er = new(new InvalidOperationException(message), "InvalidOperationException", ErrorCategory.InvalidOperation, null);
                         WriteError(er);
                         return;
                     }
@@ -2011,7 +2011,7 @@ protected override void BeginProcessing()
                 else
                 {
                     message = StringUtil.Format(ProcessResources.CannotStarttheProcess);
-                    ErrorRecord er = new ErrorRecord(new InvalidOperationException(message), "InvalidOperationException", ErrorCategory.InvalidOperation, null);
+                    ErrorRecord er = new(new InvalidOperationException(message), "InvalidOperationException", ErrorCategory.InvalidOperation, null);
                     ThrowTerminatingError(er);
                 }
             }
@@ -2028,7 +2028,7 @@ protected override void BeginProcessing()
                         _waithandle = new ManualResetEvent(false);
 
                         // Create and start the job object
-                        ProcessCollection jobObject = new ProcessCollection();
+                        ProcessCollection jobObject = new();
                         if (jobObject.AssignProcessToJobObject(process))
                         {
                             // Wait for the job object to finish
@@ -2047,7 +2047,7 @@ protected override void BeginProcessing()
                 else
                 {
                     message = StringUtil.Format(ProcessResources.CannotStarttheProcess);
-                    ErrorRecord er = new ErrorRecord(new InvalidOperationException(message), "InvalidOperationException", ErrorCategory.InvalidOperation, null);
+                    ErrorRecord er = new(new InvalidOperationException(message), "InvalidOperationException", ErrorCategory.InvalidOperation, null);
                     ThrowTerminatingError(er);
                 }
             }
@@ -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)
@@ -2269,7 +2269,7 @@ private void WriteToStandardInput(Process p)
         private SafeFileHandle GetSafeFileHandleForRedirection(string RedirectionPath, uint dwCreationDisposition)
         {
             System.IntPtr hFileHandle = System.IntPtr.Zero;
-            ProcessNativeMethods.SECURITY_ATTRIBUTES lpSecurityAttributes = new ProcessNativeMethods.SECURITY_ATTRIBUTES();
+            ProcessNativeMethods.SECURITY_ATTRIBUTES lpSecurityAttributes = new();
 
             hFileHandle = ProcessNativeMethods.CreateFileW(RedirectionPath,
                 ProcessNativeMethods.GENERIC_READ | ProcessNativeMethods.GENERIC_WRITE,
@@ -2281,19 +2281,19 @@ private SafeFileHandle GetSafeFileHandleForRedirection(string RedirectionPath, u
             if (hFileHandle == System.IntPtr.Zero)
             {
                 int error = Marshal.GetLastWin32Error();
-                Win32Exception win32ex = new Win32Exception(error);
+                Win32Exception win32ex = new(error);
                 string message = StringUtil.Format(ProcessResources.InvalidStartProcess, win32ex.Message);
-                ErrorRecord er = new ErrorRecord(new InvalidOperationException(message), "InvalidOperationException", ErrorCategory.InvalidOperation, null);
+                ErrorRecord er = new(new InvalidOperationException(message), "InvalidOperationException", ErrorCategory.InvalidOperation, null);
                 ThrowTerminatingError(er);
             }
 
-            SafeFileHandle sf = new SafeFileHandle(hFileHandle, true);
+            SafeFileHandle sf = new(hFileHandle, true);
             return sf;
         }
 
         private static StringBuilder BuildCommandLine(string executableFileName, string arguments)
         {
-            StringBuilder builder = new StringBuilder();
+            StringBuilder builder = new();
             string str = executableFileName.Trim();
             bool flag = str.StartsWith('"') && str.EndsWith('"');
             if (!flag)
@@ -2324,10 +2324,10 @@ private static byte[] ConvertEnvVarsToByteArray(StringDictionary sd)
             string[] strArray2 = new string[sd.Count];
             sd.Values.CopyTo(strArray2, 0);
             Array.Sort(array, strArray2, StringComparer.OrdinalIgnoreCase);
-            StringBuilder builder = new StringBuilder();
+            StringBuilder builder = new();
             for (int i = 0; i < sd.Count; i++)
             {
-                builder.Append(array[i]);//
+                builder.Append(array[i]);
                 builder.Append('=');
                 builder.Append(strArray2[i]);
                 builder.Append('\0');
@@ -2430,10 +2430,10 @@ private void SetStartupInfo(ProcessStartInfo startinfo, ref ProcessNativeMethods
         /// </summary>
         private Process StartWithCreateProcess(ProcessStartInfo startinfo)
         {
-            ProcessNativeMethods.STARTUPINFO lpStartupInfo = new ProcessNativeMethods.STARTUPINFO();
-            SafeNativeMethods.PROCESS_INFORMATION lpProcessInformation = new SafeNativeMethods.PROCESS_INFORMATION();
+            ProcessNativeMethods.STARTUPINFO lpStartupInfo = new();
+            SafeNativeMethods.PROCESS_INFORMATION lpProcessInformation = new();
             int error = 0;
-            GCHandle pinnedEnvironmentBlock = new GCHandle();
+            GCHandle pinnedEnvironmentBlock = new();
             IntPtr AddressOfEnvironmentBlock = IntPtr.Zero;
             string message = string.Empty;
 
@@ -2497,7 +2497,7 @@ private Process StartWithCreateProcess(ProcessStartInfo startinfo)
                             }
                             else
                             {
-                                Win32Exception win32ex = new Win32Exception(error);
+                                Win32Exception win32ex = new(error);
                                 message = StringUtil.Format(ProcessResources.InvalidStartProcess, win32ex.Message);
                             }
 
@@ -2525,23 +2525,23 @@ private Process StartWithCreateProcess(ProcessStartInfo startinfo)
                     IntPtr token = WindowsIdentity.GetCurrent().Token;
                     if (!ProcessNativeMethods.CreateEnvironmentBlock(out AddressOfEnvironmentBlock, token, false))
                     {
-                        Win32Exception win32ex = new Win32Exception(error);
+                        Win32Exception win32ex = new(error);
                         message = StringUtil.Format(ProcessResources.InvalidStartProcess, win32ex.Message);
                         var errorRecord = new ErrorRecord(new InvalidOperationException(message), "InvalidOperationException", ErrorCategory.InvalidOperation, null);
                         ThrowTerminatingError(errorRecord);
                     }
                 }
 
-                ProcessNativeMethods.SECURITY_ATTRIBUTES lpProcessAttributes = new ProcessNativeMethods.SECURITY_ATTRIBUTES();
-                ProcessNativeMethods.SECURITY_ATTRIBUTES lpThreadAttributes = new ProcessNativeMethods.SECURITY_ATTRIBUTES();
+                ProcessNativeMethods.SECURITY_ATTRIBUTES lpProcessAttributes = new();
+                ProcessNativeMethods.SECURITY_ATTRIBUTES lpThreadAttributes = new();
                 flag = ProcessNativeMethods.CreateProcess(null, cmdLine, lpProcessAttributes, lpThreadAttributes, true, creationFlags, AddressOfEnvironmentBlock, startinfo.WorkingDirectory, lpStartupInfo, lpProcessInformation);
                 if (!flag)
                 {
                     error = Marshal.GetLastWin32Error();
 
-                    Win32Exception win32ex = new Win32Exception(error);
+                    Win32Exception win32ex = new(error);
                     message = StringUtil.Format(ProcessResources.InvalidStartProcess, win32ex.Message);
-                    ErrorRecord er = new ErrorRecord(new InvalidOperationException(message), "InvalidOperationException", ErrorCategory.InvalidOperation, null);
+                    ErrorRecord er = new(new InvalidOperationException(message), "InvalidOperationException", ErrorCategory.InvalidOperation, null);
                     ThrowTerminatingError(er);
                 }
 
@@ -2583,7 +2583,7 @@ private Process StartWithShellExecute(ProcessStartInfo startInfo)
             catch (Win32Exception ex)
             {
                 string message = StringUtil.Format(ProcessResources.InvalidStartProcess, ex.Message);
-                ErrorRecord er = new ErrorRecord(new InvalidOperationException(message), "InvalidOperationException", ErrorCategory.InvalidOperation, null);
+                ErrorRecord er = new(new InvalidOperationException(message), "InvalidOperationException", ErrorCategory.InvalidOperation, null);
                 ThrowTerminatingError(er);
             }
 
@@ -2634,7 +2634,7 @@ internal void CheckJobStatus(object stateInfo)
             ManualResetEvent emptyJobAutoEvent = (ManualResetEvent)stateInfo;
             int dwSize = 0;
             const int JOB_OBJECT_BASIC_PROCESS_ID_LIST = 3;
-            JOBOBJECT_BASIC_PROCESS_ID_LIST JobList = new JOBOBJECT_BASIC_PROCESS_ID_LIST();
+            JOBOBJECT_BASIC_PROCESS_ID_LIST JobList = new();
 
             dwSize = Marshal.SizeOf(JobList);
             if (NativeMethods.QueryInformationJobObject(_jobObjectHandle,
@@ -2659,7 +2659,7 @@ internal void CheckJobStatus(object stateInfo)
         internal void WaitOne(ManualResetEvent waitHandleToUse)
         {
             TimerCallback jobObjectStatusCb = this.CheckJobStatus;
-            using (Timer stateTimer = new Timer(jobObjectStatusCb, waitHandleToUse, 0, 1000))
+            using (Timer stateTimer = new(jobObjectStatusCb, waitHandleToUse, 0, 1000))
             {
                 waitHandleToUse.WaitOne();
             }
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/Service.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/Service.cs
index 0f442b5e5e2..a4471699922 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/Service.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/Service.cs
@@ -134,7 +134,7 @@ internal void SetServiceSecurityDescriptor(
             if (!status)
             {
                 int lastError = Marshal.GetLastWin32Error();
-                Win32Exception exception = new Win32Exception(lastError);
+                Win32Exception exception = new(lastError);
                 bool accessDenied = exception.NativeErrorCode == NativeMethods.ERROR_ACCESS_DENIED;
                 WriteNonTerminatingError(
                     service,
@@ -179,7 +179,7 @@ internal enum SelectionMode
             /// Select services by Service name.
             /// </summary>
             ServiceName = 3
-        };
+        }
         /// <summary>
         /// Holds the selection mode setting.
         /// </summary>
@@ -380,7 +380,7 @@ private static int ServiceComparison(ServiceController x, ServiceController y)
         /// </remarks>
         private List<ServiceController> MatchingServicesByServiceName()
         {
-            List<ServiceController> matchingServices = new List<ServiceController>();
+            List<ServiceController> matchingServices = new();
 
             if (serviceNames == null)
             {
@@ -443,7 +443,7 @@ private List<ServiceController> MatchingServicesByServiceName()
         /// <returns></returns>
         private List<ServiceController> MatchingServicesByDisplayName()
         {
-            List<ServiceController> matchingServices = new List<ServiceController>();
+            List<ServiceController> matchingServices = new();
             if (DisplayName == null)
             {
                 Diagnostics.Assert(false, "null DisplayName");
@@ -486,7 +486,7 @@ private List<ServiceController> MatchingServicesByDisplayName()
         /// <returns></returns>
         private List<ServiceController> MatchingServicesByInput()
         {
-            List<ServiceController> matchingServices = new List<ServiceController>();
+            List<ServiceController> matchingServices = new();
             if (InputObject == null)
             {
                 Diagnostics.Assert(false, "null InputObject");
@@ -666,10 +666,10 @@ private PSObject AddProperties(ServiceController service)
                     lpDatabaseName: null,
                     dwDesiredAccess: NativeMethods.SC_MANAGER_CONNECT
                 );
-                if (IntPtr.Zero == hScManager)
+                if (hScManager == IntPtr.Zero)
                 {
                     lastError = Marshal.GetLastWin32Error();
-                    Win32Exception exception = new Win32Exception(lastError);
+                    Win32Exception exception = new(lastError);
                     WriteNonTerminatingError(
                         service,
                         exception,
@@ -683,10 +683,10 @@ private PSObject AddProperties(ServiceController service)
                     service.ServiceName,
                     NativeMethods.SERVICE_QUERY_CONFIG
                 );
-                if (IntPtr.Zero == hService)
+                if (hService == IntPtr.Zero)
                 {
                     lastError = Marshal.GetLastWin32Error();
-                    Win32Exception exception = new Win32Exception(lastError);
+                    Win32Exception exception = new(lastError);
                     WriteNonTerminatingError(
                         service,
                         exception,
@@ -695,13 +695,13 @@ private PSObject AddProperties(ServiceController service)
                         ErrorCategory.PermissionDenied);
                 }
 
-                NativeMethods.SERVICE_DESCRIPTIONW description = new NativeMethods.SERVICE_DESCRIPTIONW();
+                NativeMethods.SERVICE_DESCRIPTIONW description = new();
                 bool querySuccessful = NativeMethods.QueryServiceConfig2<NativeMethods.SERVICE_DESCRIPTIONW>(hService, NativeMethods.SERVICE_CONFIG_DESCRIPTION, out description);
 
-                NativeMethods.SERVICE_DELAYED_AUTO_START_INFO autostartInfo = new NativeMethods.SERVICE_DELAYED_AUTO_START_INFO();
+                NativeMethods.SERVICE_DELAYED_AUTO_START_INFO autostartInfo = new();
                 querySuccessful = querySuccessful && NativeMethods.QueryServiceConfig2<NativeMethods.SERVICE_DELAYED_AUTO_START_INFO>(hService, NativeMethods.SERVICE_CONFIG_DELAYED_AUTO_START_INFO, out autostartInfo);
 
-                NativeMethods.QUERY_SERVICE_CONFIG serviceInfo = new NativeMethods.QUERY_SERVICE_CONFIG();
+                NativeMethods.QUERY_SERVICE_CONFIG serviceInfo = new();
                 querySuccessful = querySuccessful && NativeMethods.QueryServiceConfig(hService, out serviceInfo);
 
                 if (!querySuccessful)
@@ -715,7 +715,7 @@ private PSObject AddProperties(ServiceController service)
                         );
                 }
 
-                PSProperty noteProperty = new PSProperty("UserName", serviceInfo.lpServiceStartName);
+                PSProperty noteProperty = new("UserName", serviceInfo.lpServiceStartName);
                 serviceAsPSObj.Properties.Add(noteProperty, true);
                 serviceAsPSObj.TypeNames.Insert(0, "System.Service.ServiceController#UserName");
 
@@ -737,7 +737,7 @@ private PSObject AddProperties(ServiceController service)
             }
             finally
             {
-                if (IntPtr.Zero != hService)
+                if (hService != IntPtr.Zero)
                 {
                     bool succeeded = NativeMethods.CloseServiceHandle(hService);
                     if (!succeeded)
@@ -746,7 +746,7 @@ private PSObject AddProperties(ServiceController service)
                     }
                 }
 
-                if (IntPtr.Zero != hScManager)
+                if (hScManager != IntPtr.Zero)
                 {
                     bool succeeded = NativeMethods.CloseServiceHandle(hScManager);
                     if (!succeeded)
@@ -907,14 +907,14 @@ internal bool DoStartService(ServiceController serviceController)
             }
             catch (Win32Exception e)
             {
-                if (NativeMethods.ERROR_SERVICE_ALREADY_RUNNING != e.NativeErrorCode)
+                if (e.NativeErrorCode != NativeMethods.ERROR_SERVICE_ALREADY_RUNNING)
                     exception = e;
             }
             catch (InvalidOperationException e)
             {
                 Win32Exception eInner = e.InnerException as Win32Exception;
                 if (eInner == null
-                    || NativeMethods.ERROR_SERVICE_ALREADY_RUNNING != eInner.NativeErrorCode)
+                    || eInner.NativeErrorCode != NativeMethods.ERROR_SERVICE_ALREADY_RUNNING)
                 {
                     exception = e;
                 }
@@ -960,7 +960,7 @@ internal List<ServiceController> DoStopService(ServiceController serviceControll
             // Ignore ServiceController.CanStop.  CanStop will be set false
             // if the service is not running, but this is not an error.
 
-            List<ServiceController> stoppedServices = new List<ServiceController>();
+            List<ServiceController> stoppedServices = new();
             ServiceController[] dependentServices = null;
 
             try
@@ -1024,7 +1024,7 @@ internal List<ServiceController> DoStopService(ServiceController serviceControll
             }
             catch (Win32Exception e)
             {
-                if (NativeMethods.ERROR_SERVICE_NOT_ACTIVE != e.NativeErrorCode)
+                if (e.NativeErrorCode != NativeMethods.ERROR_SERVICE_NOT_ACTIVE)
                     exception = e;
             }
             catch (InvalidOperationException e)
@@ -1032,7 +1032,7 @@ internal List<ServiceController> DoStopService(ServiceController serviceControll
                 Win32Exception eInner =
                     e.InnerException as Win32Exception;
                 if (eInner == null
-                    || NativeMethods.ERROR_SERVICE_NOT_ACTIVE != eInner.NativeErrorCode)
+                    || eInner.NativeErrorCode != NativeMethods.ERROR_SERVICE_NOT_ACTIVE)
                 {
                     exception = e;
                 }
@@ -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);
         }
@@ -1117,7 +1117,7 @@ internal bool DoPauseService(ServiceController serviceController)
             }
             catch (Win32Exception e)
             {
-                if (NativeMethods.ERROR_SERVICE_NOT_ACTIVE == e.NativeErrorCode)
+                if (e.NativeErrorCode == NativeMethods.ERROR_SERVICE_NOT_ACTIVE)
                 {
                     serviceNotRunning = true;
                 }
@@ -1128,7 +1128,7 @@ internal bool DoPauseService(ServiceController serviceController)
             {
                 Win32Exception eInner = e.InnerException as Win32Exception;
                 if (eInner != null
-                    && NativeMethods.ERROR_SERVICE_NOT_ACTIVE == eInner.NativeErrorCode)
+                    && eInner.NativeErrorCode == NativeMethods.ERROR_SERVICE_NOT_ACTIVE)
                 {
                     serviceNotRunning = true;
                 }
@@ -1198,7 +1198,7 @@ internal bool DoResumeService(ServiceController serviceController)
             }
             catch (Win32Exception e)
             {
-                if (NativeMethods.ERROR_SERVICE_NOT_ACTIVE == e.NativeErrorCode)
+                if (e.NativeErrorCode == NativeMethods.ERROR_SERVICE_NOT_ACTIVE)
                 {
                     serviceNotRunning = true;
                 }
@@ -1209,7 +1209,7 @@ internal bool DoResumeService(ServiceController serviceController)
             {
                 Win32Exception eInner = e.InnerException as Win32Exception;
                 if (eInner != null
-                    && NativeMethods.ERROR_SERVICE_NOT_ACTIVE == eInner.NativeErrorCode)
+                    && eInner.NativeErrorCode == NativeMethods.ERROR_SERVICE_NOT_ACTIVE)
                 {
                     serviceNotRunning = true;
                 }
@@ -1705,14 +1705,14 @@ protected override void ProcessRecord()
             catch (ArgumentException ex)
             {
                 // cannot use WriteNonterminatingError as service is null
-                ErrorRecord er = new ErrorRecord(ex, "ArgumentException", ErrorCategory.ObjectNotFound, Name);
+                ErrorRecord er = new(ex, "ArgumentException", ErrorCategory.ObjectNotFound, Name);
                 WriteError(er);
                 return;
             }
             catch (InvalidOperationException ex)
             {
                 // cannot use WriteNonterminatingError as service is null
-                ErrorRecord er = new ErrorRecord(ex, "InvalidOperationException", ErrorCategory.ObjectNotFound, Name);
+                ErrorRecord er = new(ex, "InvalidOperationException", ErrorCategory.ObjectNotFound, Name);
                 WriteError(er);
                 return;
             }
@@ -1737,10 +1737,10 @@ protected override void ProcessRecord()
                         NativeMethods.SC_MANAGER_CONNECT
                         );
 
-                    if (IntPtr.Zero == hScManager)
+                    if (hScManager == IntPtr.Zero)
                     {
                         int lastError = Marshal.GetLastWin32Error();
-                        Win32Exception exception = new Win32Exception(lastError);
+                        Win32Exception exception = new(lastError);
                         WriteNonTerminatingError(
                             service,
                             exception,
@@ -1756,10 +1756,10 @@ protected override void ProcessRecord()
                         NativeMethods.SERVICE_CHANGE_CONFIG | NativeMethods.WRITE_DAC | NativeMethods.WRITE_OWNER
                         );
 
-                    if (IntPtr.Zero == hService)
+                    if (hService == IntPtr.Zero)
                     {
                         int lastError = Marshal.GetLastWin32Error();
-                        Win32Exception exception = new Win32Exception(lastError);
+                        Win32Exception exception = new(lastError);
                         WriteNonTerminatingError(
                             service,
                             exception,
@@ -1770,7 +1770,7 @@ protected override void ProcessRecord()
                     }
                     // Modify startup type or display name or credential
                     if (!string.IsNullOrEmpty(DisplayName)
-                        || ServiceStartupType.InvalidValue != StartupType || Credential != null)
+                        || StartupType != ServiceStartupType.InvalidValue || Credential != null)
                     {
                         DWORD dwStartType = NativeMethods.SERVICE_NO_CHANGE;
                         if (!NativeMethods.TryGetNativeStartupType(StartupType, out dwStartType))
@@ -1805,7 +1805,7 @@ protected override void ProcessRecord()
                         if (!succeeded)
                         {
                             int lastError = Marshal.GetLastWin32Error();
-                            Win32Exception exception = new Win32Exception(lastError);
+                            Win32Exception exception = new(lastError);
                             WriteNonTerminatingError(
                                 service,
                                 exception,
@@ -1816,7 +1816,7 @@ protected override void ProcessRecord()
                         }
                     }
 
-                    NativeMethods.SERVICE_DESCRIPTIONW sd = new NativeMethods.SERVICE_DESCRIPTIONW();
+                    NativeMethods.SERVICE_DESCRIPTIONW sd = new();
                     sd.lpDescription = Description;
                     int size = Marshal.SizeOf(sd);
                     IntPtr buffer = Marshal.AllocCoTaskMem(size);
@@ -1830,7 +1830,7 @@ protected override void ProcessRecord()
                     if (!status)
                     {
                         int lastError = Marshal.GetLastWin32Error();
-                        Win32Exception exception = new Win32Exception(lastError);
+                        Win32Exception exception = new(lastError);
                         WriteNonTerminatingError(
                             service,
                             exception,
@@ -1840,7 +1840,7 @@ protected override void ProcessRecord()
                     }
 
                     // Set the delayed auto start
-                    NativeMethods.SERVICE_DELAYED_AUTO_START_INFO ds = new NativeMethods.SERVICE_DELAYED_AUTO_START_INFO();
+                    NativeMethods.SERVICE_DELAYED_AUTO_START_INFO ds = new();
                     ds.fDelayedAutostart = StartupType == ServiceStartupType.AutomaticDelayedStart;
                     size = Marshal.SizeOf(ds);
                     delayedAutoStartInfoBuffer = Marshal.AllocCoTaskMem(size);
@@ -1854,7 +1854,7 @@ protected override void ProcessRecord()
                     if (!status)
                     {
                         int lastError = Marshal.GetLastWin32Error();
-                        Win32Exception exception = new Win32Exception(lastError);
+                        Win32Exception exception = new(lastError);
                         WriteNonTerminatingError(
                             Name,
                             DisplayName,
@@ -1914,24 +1914,24 @@ protected override void ProcessRecord()
                     if (PassThru.IsPresent)
                     {
                         // To display the service, refreshing the service would not show the display name after updating
-                        ServiceController displayservice = new ServiceController(Name);
+                        ServiceController displayservice = new(Name);
                         WriteObject(displayservice);
                     }
                 }
                 finally
                 {
-                    if (IntPtr.Zero != delayedAutoStartInfoBuffer)
+                    if (delayedAutoStartInfoBuffer != IntPtr.Zero)
                     {
                         Marshal.FreeCoTaskMem(delayedAutoStartInfoBuffer);
                     }
 
-                    if (IntPtr.Zero != hService)
+                    if (hService != IntPtr.Zero)
                     {
                         bool succeeded = NativeMethods.CloseServiceHandle(hService);
                         if (!succeeded)
                         {
                             int lastError = Marshal.GetLastWin32Error();
-                            Win32Exception exception = new Win32Exception(lastError);
+                            Win32Exception exception = new(lastError);
                             WriteNonTerminatingError(
                                 service,
                                 exception,
@@ -1941,13 +1941,13 @@ protected override void ProcessRecord()
                         }
                     }
 
-                    if (IntPtr.Zero != hScManager)
+                    if (hScManager != IntPtr.Zero)
                     {
                         bool succeeded = NativeMethods.CloseServiceHandle(hScManager);
                         if (!succeeded)
                         {
                             int lastError = Marshal.GetLastWin32Error();
-                            Win32Exception exception = new Win32Exception(lastError);
+                            Win32Exception exception = new(lastError);
                             WriteNonTerminatingError(
                                 service,
                                 exception,
@@ -1960,7 +1960,7 @@ protected override void ProcessRecord()
             }
             finally
             {
-                if (IntPtr.Zero != password)
+                if (password != IntPtr.Zero)
                 {
                     Marshal.ZeroFreeCoTaskMemUnicode(password);
                 }
@@ -2133,10 +2133,10 @@ protected override void BeginProcessing()
                     null,
                     NativeMethods.SC_MANAGER_CONNECT | NativeMethods.SC_MANAGER_CREATE_SERVICE
                     );
-                if (IntPtr.Zero == hScManager)
+                if (hScManager == IntPtr.Zero)
                 {
                     int lastError = Marshal.GetLastWin32Error();
-                    Win32Exception exception = new Win32Exception(lastError);
+                    Win32Exception exception = new(lastError);
                     WriteNonTerminatingError(
                         Name,
                         DisplayName,
@@ -2210,10 +2210,10 @@ protected override void BeginProcessing()
                     username,
                     password
                     );
-                if (IntPtr.Zero == hService)
+                if (hService == IntPtr.Zero)
                 {
                     int lastError = Marshal.GetLastWin32Error();
-                    Win32Exception exception = new Win32Exception(lastError);
+                    Win32Exception exception = new(lastError);
                     WriteNonTerminatingError(
                         Name,
                         DisplayName,
@@ -2226,7 +2226,7 @@ protected override void BeginProcessing()
                 }
 
                 // Set the service description
-                NativeMethods.SERVICE_DESCRIPTIONW sd = new NativeMethods.SERVICE_DESCRIPTIONW();
+                NativeMethods.SERVICE_DESCRIPTIONW sd = new();
                 sd.lpDescription = Description;
                 int size = Marshal.SizeOf(sd);
                 IntPtr buffer = Marshal.AllocCoTaskMem(size);
@@ -2240,7 +2240,7 @@ protected override void BeginProcessing()
                 if (!succeeded)
                 {
                     int lastError = Marshal.GetLastWin32Error();
-                    Win32Exception exception = new Win32Exception(lastError);
+                    Win32Exception exception = new(lastError);
                     WriteNonTerminatingError(
                         Name,
                         DisplayName,
@@ -2254,7 +2254,7 @@ protected override void BeginProcessing()
                 // Set the delayed auto start
                 if (StartupType == ServiceStartupType.AutomaticDelayedStart)
                 {
-                    NativeMethods.SERVICE_DELAYED_AUTO_START_INFO ds = new NativeMethods.SERVICE_DELAYED_AUTO_START_INFO();
+                    NativeMethods.SERVICE_DELAYED_AUTO_START_INFO ds = new();
                     ds.fDelayedAutostart = true;
                     size = Marshal.SizeOf(ds);
                     delayedAutoStartInfoBuffer = Marshal.AllocCoTaskMem(size);
@@ -2268,7 +2268,7 @@ protected override void BeginProcessing()
                     if (!succeeded)
                     {
                         int lastError = Marshal.GetLastWin32Error();
-                        Win32Exception exception = new Win32Exception(lastError);
+                        Win32Exception exception = new(lastError);
                         WriteNonTerminatingError(
                             Name,
                             DisplayName,
@@ -2292,23 +2292,23 @@ protected override void BeginProcessing()
             }
             finally
             {
-                if (IntPtr.Zero != delayedAutoStartInfoBuffer)
+                if (delayedAutoStartInfoBuffer != IntPtr.Zero)
                 {
                     Marshal.FreeCoTaskMem(delayedAutoStartInfoBuffer);
                 }
 
-                if (IntPtr.Zero != password)
+                if (password != IntPtr.Zero)
                 {
                     Marshal.ZeroFreeCoTaskMemUnicode(password);
                 }
 
-                if (IntPtr.Zero != hService)
+                if (hService != IntPtr.Zero)
                 {
                     bool succeeded = NativeMethods.CloseServiceHandle(hService);
                     if (!succeeded)
                     {
                         int lastError = Marshal.GetLastWin32Error();
-                        Win32Exception exception = new Win32Exception(lastError);
+                        Win32Exception exception = new(lastError);
                         WriteNonTerminatingError(
                             Name,
                             DisplayName,
@@ -2320,13 +2320,13 @@ protected override void BeginProcessing()
                     }
                 }
 
-                if (IntPtr.Zero != hScManager)
+                if (hScManager != IntPtr.Zero)
                 {
                     bool succeeded = NativeMethods.CloseServiceHandle(hScManager);
                     if (!succeeded)
                     {
                         int lastError = Marshal.GetLastWin32Error();
-                        Win32Exception exception = new Win32Exception(lastError);
+                        Win32Exception exception = new(lastError);
                         WriteNonTerminatingError(
                             Name,
                             DisplayName,
@@ -2402,14 +2402,14 @@ protected override void ProcessRecord()
             catch (ArgumentException ex)
             {
                 // Cannot use WriteNonterminatingError as service is null
-                ErrorRecord er = new ErrorRecord(ex, "ArgumentException", ErrorCategory.ObjectNotFound, Name);
+                ErrorRecord er = new(ex, "ArgumentException", ErrorCategory.ObjectNotFound, Name);
                 WriteError(er);
                 return;
             }
             catch (InvalidOperationException ex)
             {
                 // Cannot use WriteNonterminatingError as service is null
-                ErrorRecord er = new ErrorRecord(ex, "InvalidOperationException", ErrorCategory.ObjectNotFound, Name);
+                ErrorRecord er = new(ex, "InvalidOperationException", ErrorCategory.ObjectNotFound, Name);
                 WriteError(er);
                 return;
             }
@@ -2432,10 +2432,10 @@ protected override void ProcessRecord()
                         lpDatabaseName: null,
                         dwDesiredAccess: NativeMethods.SC_MANAGER_ALL_ACCESS
                         );
-                    if (IntPtr.Zero == hScManager)
+                    if (hScManager == IntPtr.Zero)
                     {
                         int lastError = Marshal.GetLastWin32Error();
-                        Win32Exception exception = new Win32Exception(lastError);
+                        Win32Exception exception = new(lastError);
                         WriteObject(exception);
                         WriteNonTerminatingError(
                             service,
@@ -2451,10 +2451,10 @@ protected override void ProcessRecord()
                         Name,
                         NativeMethods.SERVICE_DELETE
                         );
-                    if (IntPtr.Zero == hService)
+                    if (hService == IntPtr.Zero)
                     {
                         int lastError = Marshal.GetLastWin32Error();
-                        Win32Exception exception = new Win32Exception(lastError);
+                        Win32Exception exception = new(lastError);
                         WriteNonTerminatingError(
                             service,
                             exception,
@@ -2469,7 +2469,7 @@ protected override void ProcessRecord()
                     if (!status)
                     {
                         int lastError = Marshal.GetLastWin32Error();
-                        Win32Exception exception = new Win32Exception(lastError);
+                        Win32Exception exception = new(lastError);
                         WriteNonTerminatingError(
                             service,
                             exception,
@@ -2480,7 +2480,7 @@ protected override void ProcessRecord()
                 }
                 finally
                 {
-                    if (IntPtr.Zero != hService)
+                    if (hService != IntPtr.Zero)
                     {
                         bool succeeded = NativeMethods.CloseServiceHandle(hService);
                         if (!succeeded)
@@ -2490,7 +2490,7 @@ protected override void ProcessRecord()
                         }
                     }
 
-                    if (IntPtr.Zero != hScManager)
+                    if (hScManager != IntPtr.Zero)
                     {
                         bool succeeded = NativeMethods.CloseServiceHandle(hScManager);
                         if (!succeeded)
@@ -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.Management/commands/management/SetClipboardCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/SetClipboardCommand.cs
index 42a4624d5dd..b53ffeb01b3 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/SetClipboardCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/SetClipboardCommand.cs
@@ -19,7 +19,7 @@ namespace Microsoft.PowerShell.Commands
     [Alias("scb")]
     public class SetClipboardCommand : PSCmdlet
     {
-        private readonly List<string> _contentList = new List<string>();
+        private readonly List<string> _contentList = new();
 
         /// <summary>
         /// Property that sets clipboard content.
@@ -84,7 +84,7 @@ private void SetClipboardContent(List<string> contentList, bool append)
                 return;
             }
 
-            StringBuilder content = new StringBuilder();
+            StringBuilder content = new();
             if (append)
             {
                 content.AppendLine(Clipboard.GetText());
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/SetContentCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/SetContentCommand.cs
index c92db09507d..44f4d904d33 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/SetContentCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/SetContentCommand.cs
@@ -29,7 +29,7 @@ internal override void BeforeOpenStreams(string[] paths)
                 throw PSTraceSource.NewArgumentNullException(nameof(paths));
             }
 
-            CmdletProviderContext context = new CmdletProviderContext(GetCurrentContext());
+            CmdletProviderContext context = new(GetCurrentContext());
 
             foreach (string path in paths)
             {
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/TestConnectionCommand.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/TestConnectionCommand.cs
index a59458dfd99..e6b33142457 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/TestConnectionCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/TestConnectionCommand.cs
@@ -57,7 +57,7 @@ public class TestConnectionCommand : PSCmdlet, IDisposable
 
         private static byte[]? s_DefaultSendBuffer;
 
-        private readonly CancellationTokenSource _dnsLookupCancel = new CancellationTokenSource();
+        private readonly CancellationTokenSource _dnsLookupCancel = new();
 
         private bool _disposed;
 
@@ -293,7 +293,7 @@ private void ProcessConnectionByTCPPort(string targetNameOrAddress)
                 return;
             }
 
-            TcpClient client = new TcpClient();
+            TcpClient client = new();
 
             try
             {
@@ -350,11 +350,11 @@ private void ProcessTraceroute(string targetNameOrAddress)
             }
 
             int currentHop = 1;
-            PingOptions pingOptions = new PingOptions(currentHop, DontFragment.IsPresent);
+            PingOptions pingOptions = new(currentHop, DontFragment.IsPresent);
             PingReply reply;
             PingReply discoveryReply;
             int timeout = TimeoutSeconds * 1000;
-            Stopwatch timer = new Stopwatch();
+            Stopwatch timer = new();
 
             IPAddress hopAddress;
             do
@@ -436,7 +436,7 @@ private void ProcessTraceroute(string targetNameOrAddress)
                             resolvedTargetName,
                             ex.Message);
                         Exception pingException = new PingException(message, ex.InnerException);
-                        ErrorRecord errorRecord = new ErrorRecord(
+                        ErrorRecord errorRecord = new(
                             pingException,
                             TestConnectionExceptionId,
                             ErrorCategory.ResourceUnavailable,
@@ -499,7 +499,7 @@ private void ProcessMTUSize(string targetNameOrAddress)
 
             try
             {
-                PingOptions pingOptions = new PingOptions(MaxHops, true);
+                PingOptions pingOptions = new(MaxHops, true);
                 int retry = 1;
 
                 while (LowMTUSize < (HighMTUSize - 1))
@@ -535,7 +535,7 @@ private void ProcessMTUSize(string targetNameOrAddress)
                                 targetAddress,
                                 reply.Status.ToString());
                             Exception pingException = new PingException(message);
-                            ErrorRecord errorRecord = new ErrorRecord(
+                            ErrorRecord errorRecord = new(
                                 pingException,
                                 TestConnectionExceptionId,
                                 ErrorCategory.ResourceUnavailable,
@@ -560,7 +560,7 @@ private void ProcessMTUSize(string targetNameOrAddress)
             {
                 string message = StringUtil.Format(TestConnectionResources.NoPingResult, targetAddress, ex.Message);
                 Exception pingException = new PingException(message, ex.InnerException);
-                ErrorRecord errorRecord = new ErrorRecord(
+                ErrorRecord errorRecord = new(
                     pingException,
                     TestConnectionExceptionId,
                     ErrorCategory.ResourceUnavailable,
@@ -603,7 +603,7 @@ private void ProcessPing(string targetNameOrAddress)
             byte[] buffer = GetSendBuffer(BufferSize);
 
             PingReply reply;
-            PingOptions pingOptions = new PingOptions(MaxHops, DontFragment.IsPresent);
+            PingOptions pingOptions = new(MaxHops, DontFragment.IsPresent);
             int timeout = TimeoutSeconds * 1000;
             int delay = Delay * 1000;
 
@@ -617,7 +617,7 @@ private void ProcessPing(string targetNameOrAddress)
                 {
                     string message = StringUtil.Format(TestConnectionResources.NoPingResult, resolvedTargetName, ex.Message);
                     Exception pingException = new PingException(message, ex.InnerException);
-                    ErrorRecord errorRecord = new ErrorRecord(
+                    ErrorRecord errorRecord = new(
                         pingException,
                         TestConnectionExceptionId,
                         ErrorCategory.ResourceUnavailable,
@@ -678,7 +678,7 @@ private bool TryResolveNameOrAddress(
                         resolvedTargetName,
                         TestConnectionResources.TargetAddressAbsent);
                     Exception pingException = new PingException(message, null);
-                    ErrorRecord errorRecord = new ErrorRecord(
+                    ErrorRecord errorRecord = new(
                         pingException,
                         TestConnectionExceptionId,
                         ErrorCategory.ResourceUnavailable,
@@ -722,7 +722,7 @@ private bool TryResolveNameOrAddress(
                             resolvedTargetName,
                             TestConnectionResources.CannotResolveTargetName);
                         Exception pingException = new PingException(message, ex);
-                        ErrorRecord errorRecord = new ErrorRecord(
+                        ErrorRecord errorRecord = new(
                             pingException,
                             TestConnectionExceptionId,
                             ErrorCategory.ResourceUnavailable,
@@ -744,7 +744,7 @@ private bool TryResolveNameOrAddress(
                             resolvedTargetName,
                             TestConnectionResources.TargetAddressAbsent);
                         Exception pingException = new PingException(message, null);
-                        ErrorRecord errorRecord = new ErrorRecord(
+                        ErrorRecord errorRecord = new(
                             pingException,
                             TestConnectionExceptionId,
                             ErrorCategory.ResourceUnavailable,
@@ -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)
             {
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/TimeZoneCommands.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/TimeZoneCommands.cs
index 62c6bc104ea..0289e885e65 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/TimeZoneCommands.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/TimeZoneCommands.cs
@@ -82,7 +82,7 @@ protected override void ProcessRecord()
                     foreach (string tzname in Name)
                     {
                         TimeZoneInfo[] timeZones = TimeZoneHelper.LookupSystemTimeZoneInfoByName(tzname);
-                        if (0 < timeZones.Length)
+                        if (timeZones.Length > 0)
                         {
                             // manually process each object in the array, so if there is only a single
                             // entry then the returned type is TimeZoneInfo and not TimeZoneInfo[], and
@@ -198,7 +198,7 @@ protected override void ProcessRecord()
                         ErrorCategory.InvalidArgument,
                         "Name"));
                 }
-                else if (1 < timeZones.Length)
+                else if (timeZones.Length > 1)
                 {
                     string message = string.Format(CultureInfo.InvariantCulture,
                         TimeZoneResources.MultipleMatchingTimeZones, Name);
@@ -254,14 +254,14 @@ protected override void ProcessRecord()
                 try
                 {
                     // construct and populate a new DYNAMIC_TIME_ZONE_INFORMATION structure
-                    NativeMethods.DYNAMIC_TIME_ZONE_INFORMATION dtzi = new NativeMethods.DYNAMIC_TIME_ZONE_INFORMATION();
+                    NativeMethods.DYNAMIC_TIME_ZONE_INFORMATION dtzi = new();
                     dtzi.Bias -= (int)InputObject.BaseUtcOffset.TotalMinutes;
                     dtzi.StandardName = InputObject.StandardName;
                     dtzi.DaylightName = InputObject.DaylightName;
                     dtzi.TimeZoneKeyName = InputObject.Id;
 
                     // Request time zone transition information for the current year
-                    NativeMethods.TIME_ZONE_INFORMATION tzi = new NativeMethods.TIME_ZONE_INFORMATION();
+                    NativeMethods.TIME_ZONE_INFORMATION tzi = new();
                     if (!NativeMethods.GetTimeZoneInformationForYear((ushort)DateTime.Now.Year, ref dtzi, ref tzi))
                     {
                         ThrowWin32Error();
@@ -343,7 +343,7 @@ protected bool HasAccess
                 try
                 {
                     // setup the privileges being checked
-                    NativeMethods.PRIVILEGE_SET ps = new NativeMethods.PRIVILEGE_SET()
+                    NativeMethods.PRIVILEGE_SET ps = new()
                     {
                         PrivilegeCount = 1,
                         Control = 1,
@@ -390,7 +390,7 @@ protected void SetAccessToken(bool enable)
             try
             {
                 // setup the privileges being requested
-                NativeMethods.TOKEN_PRIVILEGES tp = new NativeMethods.TOKEN_PRIVILEGES()
+                NativeMethods.TOKEN_PRIVILEGES tp = new()
                 {
                     PrivilegeCount = 1,
                     Luid = 0,
@@ -779,8 +779,8 @@ internal static class TimeZoneHelper
         /// <returns>A TimeZoneInfo object array containing information about the specified system time zones.</returns>
         internal static TimeZoneInfo[] LookupSystemTimeZoneInfoByName(string name)
         {
-            WildcardPattern namePattern = new WildcardPattern(name, WildcardOptions.IgnoreCase);
-            List<TimeZoneInfo> tzi = new List<TimeZoneInfo>();
+            WildcardPattern namePattern = new(name, WildcardOptions.IgnoreCase);
+            List<TimeZoneInfo> tzi = new();
 
             // get the available system time zones
             ReadOnlyCollection<TimeZoneInfo> zones = TimeZoneInfo.GetSystemTimeZones();
diff --git a/src/Microsoft.PowerShell.Commands.Management/commands/management/WriteContentCommandBase.cs b/src/Microsoft.PowerShell.Commands.Management/commands/management/WriteContentCommandBase.cs
index 90b55c0474e..25ecd672c4c 100644
--- a/src/Microsoft.PowerShell.Commands.Management/commands/management/WriteContentCommandBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Management/commands/management/WriteContentCommandBase.cs
@@ -143,7 +143,7 @@ protected override void ProcessRecord()
                         catch (Exception e) // Catch-all OK. 3rd party callout
                         {
                             ProviderInvocationException providerException =
-                               new ProviderInvocationException(
+                               new(
                                    "ProviderContentWriteError",
                                    SessionStateStrings.ProviderContentWriteError,
                                    holder.PathInfo.Provider,
@@ -258,7 +258,7 @@ internal List<ContentHolder> GetContentWriters(
 
             // Create the results array
 
-            List<ContentHolder> results = new List<ContentHolder>();
+            List<ContentHolder> results = new();
 
             foreach (PathInfo pathInfo in pathInfos)
             {
@@ -311,7 +311,7 @@ internal List<ContentHolder> GetContentWriters(
                     if (writers.Count == 1 && writers[0] != null)
                     {
                         ContentHolder holder =
-                            new ContentHolder(pathInfo, null, writers[0]);
+                            new(pathInfo, null, writers[0]);
 
                         results.Add(holder);
                     }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 9fcfdea2ae7..b6f1bbaf636 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
-    <ProjectReference Include="..\Microsoft.PowerShell.MarkdownRender\Microsoft.PowerShell.MarkdownRender.csproj" />
+    <PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0-preview.2" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -34,7 +34,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" />
     <PackageReference Include="System.Threading.AccessControl" Version="5.0.0" />
     <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
-    <PackageReference Include="NJsonSchema" Version="10.2.2" />
+    <PackageReference Include="NJsonSchema" Version="10.3.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddMember.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddMember.cs
index 4fda5a09dd8..efb035b7785 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddMember.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddMember.cs
@@ -20,7 +20,7 @@ namespace Microsoft.PowerShell.Commands
         HelpUri = "https://go.microsoft.com/fwlink/?LinkID=2097109", RemotingCapability = RemotingCapability.None)]
     public class AddMemberCommand : PSCmdlet
     {
-        private static readonly object s_notSpecified = new object();
+        private static readonly object s_notSpecified = new();
 
         private static bool HasBeenSpecified(object obj)
         {
@@ -221,7 +221,7 @@ private void EnsureValue1HasBeenSpecified()
         {
             if (!HasBeenSpecified(_value1))
             {
-                Collection<FieldDescription> fdc = new Collection<FieldDescription>();
+                Collection<FieldDescription> fdc = new();
                 fdc.Add(new FieldDescription("Value"));
                 string prompt = StringUtil.Format(AddMember.Value1Prompt, _memberType);
                 Dictionary<string, PSObject> result = this.Host.UI.Prompt(prompt, null, fdc);
@@ -531,9 +531,9 @@ private void UpdateTypeNames()
 
         private ErrorRecord NewError(string errorId, string resourceId, object targetObject, params object[] args)
         {
-            ErrorDetails details = new ErrorDetails(this.GetType().GetTypeInfo().Assembly,
+            ErrorDetails details = new(this.GetType().GetTypeInfo().Assembly,
                 "Microsoft.PowerShell.Commands.Utility.resources.AddMember", resourceId, args);
-            ErrorRecord errorRecord = new ErrorRecord(
+            ErrorRecord errorRecord = new(
                 new InvalidOperationException(details.Message),
                 errorId,
                 ErrorCategory.InvalidOperation,
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
index d3c61582de9..a54094ea464 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
@@ -153,7 +153,7 @@ public string[] Path
 
                 string[] pathValue = value;
 
-                List<string> resolvedPaths = new List<string>();
+                List<string> resolvedPaths = new();
 
                 // Verify that the paths are resolved and valid
                 foreach (string path in pathValue)
@@ -198,7 +198,7 @@ public string[] LiteralPath
                     return;
                 }
 
-                List<string> resolvedPaths = new List<string>();
+                List<string> resolvedPaths = new();
                 foreach (string path in value)
                 {
                     string literalPath = SessionState.Path.GetUnresolvedProviderPathFromPSPath(path);
@@ -230,7 +230,7 @@ private void ProcessPaths(List<string> resolvedPaths)
 
                     // Throw an error if it is an unrecognized extension
                     default:
-                        ErrorRecord errorRecord = new ErrorRecord(
+                        ErrorRecord errorRecord = new(
                             new Exception(
                                 StringUtil.Format(AddTypeStrings.FileExtensionNotSupported, currentExtension)),
                             "EXTENSION_NOT_SUPPORTED",
@@ -248,7 +248,7 @@ private void ProcessPaths(List<string> resolvedPaths)
                 else if (!string.Equals(activeExtension, currentExtension, StringComparison.OrdinalIgnoreCase))
                 {
                     // All files must have the same extension otherwise throw.
-                    ErrorRecord errorRecord = new ErrorRecord(
+                    ErrorRecord errorRecord = new(
                         new Exception(
                             StringUtil.Format(AddTypeStrings.MultipleExtensionsNotSupported)),
                         "MULTIPLE_EXTENSION_NOT_SUPPORTED",
@@ -327,7 +327,7 @@ public string OutputAssembly
 
                     // Try to resolve the path
                     ProviderInfo provider = null;
-                    Collection<string> newPaths = new Collection<string>();
+                    Collection<string> newPaths = new();
 
                     try
                     {
@@ -336,7 +336,7 @@ public string OutputAssembly
                     // Ignore the ItemNotFound -- we handle it.
                     catch (ItemNotFoundException) { }
 
-                    ErrorRecord errorRecord = new ErrorRecord(
+                    ErrorRecord errorRecord = new(
                         new Exception(
                             StringUtil.Format(AddTypeStrings.OutputAssemblyDidNotResolve, _outputAssembly)),
                         "INVALID_OUTPUT_ASSEMBLY",
@@ -470,7 +470,7 @@ private string GenerateTypeSource(string typeNamespace, string typeName, string
         }
 
         // Get the -FromMember template for a given language
-        private string GetMethodTemplate(Language language)
+        private static string GetMethodTemplate(Language language)
         {
             switch (language)
             {
@@ -486,7 +486,7 @@ private string GetMethodTemplate(Language language)
         }
 
         // Get the -FromMember namespace template for a given language
-        private string GetNamespaceTemplate(Language language)
+        private static string GetNamespaceTemplate(Language language)
         {
             switch (language)
             {
@@ -502,7 +502,7 @@ private string GetNamespaceTemplate(Language language)
         }
 
         // Get the -FromMember namespace template for a given language
-        private string GetUsingTemplate(Language language)
+        private static string GetUsingTemplate(Language language)
         {
             switch (language)
             {
@@ -520,7 +520,7 @@ private string GetUsingTemplate(Language language)
         // Generate the code for the using statements
         private string GetUsingSet(Language language)
         {
-            StringBuilder usingNamespaceSet = new StringBuilder();
+            StringBuilder usingNamespaceSet = new();
 
             switch (language)
             {
@@ -578,7 +578,7 @@ protected override void EndProcessing()
             // assembly type without an output assembly
             if (string.IsNullOrEmpty(_outputAssembly) && this.MyInvocation.BoundParameters.ContainsKey(nameof(OutputType)))
             {
-                ErrorRecord errorRecord = new ErrorRecord(
+                ErrorRecord errorRecord = new(
                     new Exception(
                         string.Format(
                             CultureInfo.CurrentCulture,
@@ -630,21 +630,21 @@ protected override void EndProcessing()
         private static readonly string s_frameworkFolder = PathType.GetDirectoryName(typeof(object).Assembly.Location);
 
         // These assemblies are always automatically added to ReferencedAssemblies.
-        private static readonly Lazy<PortableExecutableReference[]> s_autoReferencedAssemblies = new Lazy<PortableExecutableReference[]>(InitAutoIncludedRefAssemblies);
+        private static readonly Lazy<PortableExecutableReference[]> s_autoReferencedAssemblies = new(InitAutoIncludedRefAssemblies);
 
         // A HashSet of assembly names to be ignored if they are specified in '-ReferencedAssemblies'
-        private static readonly Lazy<HashSet<string>> s_refAssemblyNamesToIgnore = new Lazy<HashSet<string>>(InitRefAssemblyNamesToIgnore);
+        private static readonly Lazy<HashSet<string>> s_refAssemblyNamesToIgnore = new(InitRefAssemblyNamesToIgnore);
 
         // These assemblies are used, when ReferencedAssemblies parameter is not specified.
-        private static readonly Lazy<IEnumerable<PortableExecutableReference>> s_defaultAssemblies = new Lazy<IEnumerable<PortableExecutableReference>>(InitDefaultRefAssemblies);
+        private static readonly Lazy<IEnumerable<PortableExecutableReference>> s_defaultAssemblies = new(InitDefaultRefAssemblies);
 
         private bool InMemory { get { return string.IsNullOrEmpty(_outputAssembly); } }
 
         // These dictionaries prevent reloading already loaded and unchanged code.
         // We don't worry about unbounded growing of the cache because in .Net Core 2.0 we can not unload assemblies.
         // TODO: review if we will be able to unload assemblies after migrating to .Net Core 2.1.
-        private static readonly HashSet<string> s_sourceTypesCache = new HashSet<string>();
-        private static readonly Dictionary<int, Assembly> s_sourceAssemblyCache = new Dictionary<int, Assembly>();
+        private static readonly HashSet<string> s_sourceTypesCache = new();
+        private static readonly Dictionary<int, Assembly> s_sourceAssemblyCache = new();
 
         private static readonly string s_defaultSdkDirectory = Utils.DefaultPowerShellAppBase;
 
@@ -840,7 +840,7 @@ private string ResolveAssemblyName(string assembly, bool isForReferenceAssembly)
         // However, this does give us a massive usability improvement, as users can just say
         // Add-Type -AssemblyName Forms (instead of System.Windows.Forms)
         // This is just long, not unmaintainable.
-        private Assembly LoadAssemblyHelper(string assemblyName)
+        private static Assembly LoadAssemblyHelper(string assemblyName)
         {
             Assembly loadedAssembly = null;
 
@@ -898,7 +898,7 @@ private void WriteTypes(Assembly assembly)
 
         #region SourceCodeProcessing
 
-        private OutputKind OutputAssemblyTypeToOutputKind(OutputAssemblyType outputType)
+        private static OutputKind OutputAssemblyTypeToOutputKind(OutputAssemblyType outputType)
         {
             switch (outputType)
             {
@@ -914,12 +914,11 @@ private CommandLineArguments ParseCompilerOption(IEnumerable<string> args)
         {
             string sdkDirectory = s_defaultSdkDirectory;
             string baseDirectory = this.SessionState.Path.CurrentLocation.Path;
-            string additionalReferenceDirectories = null;
 
             switch (Language)
             {
                 case Language.CSharp:
-                    return CSharpCommandLineParser.Default.Parse(args, baseDirectory, sdkDirectory, additionalReferenceDirectories);
+                    return CSharpCommandLineParser.Default.Parse(args, baseDirectory, sdkDirectory);
 
                 default:
                     throw PSTraceSource.NewNotSupportedException();
@@ -996,7 +995,7 @@ private void SourceCodeProcessing()
             }
 
             SourceText sourceText;
-            List<SyntaxTree> syntaxTrees = new List<SyntaxTree>();
+            List<SyntaxTree> syntaxTrees = new();
 
             switch (ParameterSetName)
             {
@@ -1075,12 +1074,12 @@ private void CompileToAssembly(List<SyntaxTree> syntaxTrees, CompilationOptions
 
         private void CheckDuplicateTypes(Compilation compilation, out ConcurrentBag<string> newTypes)
         {
-            AllNamedTypeSymbolsVisitor visitor = new AllNamedTypeSymbolsVisitor();
+            AllNamedTypeSymbolsVisitor visitor = new();
             visitor.Visit(compilation.Assembly.GlobalNamespace);
 
             foreach (var symbolName in visitor.DuplicateSymbols)
             {
-                ErrorRecord errorRecord = new ErrorRecord(
+                ErrorRecord errorRecord = new(
                     new Exception(
                         string.Format(AddTypeStrings.TypeAlreadyExists, symbolName)),
                     "TYPE_ALREADY_EXISTS",
@@ -1091,7 +1090,7 @@ private void CheckDuplicateTypes(Compilation compilation, out ConcurrentBag<stri
 
             if (!visitor.DuplicateSymbols.IsEmpty)
             {
-                ErrorRecord errorRecord = new ErrorRecord(
+                ErrorRecord errorRecord = new(
                     new InvalidOperationException(AddTypeStrings.CompilerErrors),
                     "COMPILER_ERRORS",
                     ErrorCategory.InvalidData,
@@ -1107,8 +1106,8 @@ private void CheckDuplicateTypes(Compilation compilation, out ConcurrentBag<stri
         // Visit symbols in all namespaces and collect duplicates.
         private class AllNamedTypeSymbolsVisitor : SymbolVisitor
         {
-            public readonly ConcurrentBag<string> DuplicateSymbols = new ConcurrentBag<string>();
-            public readonly ConcurrentBag<string> UniqueSymbols = new ConcurrentBag<string>();
+            public readonly ConcurrentBag<string> DuplicateSymbols = new();
+            public readonly ConcurrentBag<string> UniqueSymbols = new();
 
             public override void VisitNamespace(INamespaceSymbol symbol)
             {
@@ -1136,7 +1135,7 @@ public override void VisitNamedType(INamedTypeSymbol symbol)
             }
         }
 
-        private void CacheNewTypes(ConcurrentBag<string> newTypes)
+        private static void CacheNewTypes(ConcurrentBag<string> newTypes)
         {
             foreach (var typeName in newTypes)
             {
@@ -1244,7 +1243,7 @@ private void HandleCompilerErrors(ImmutableArray<Diagnostic> compilerDiagnostics
                     }
                     else
                     {
-                        ErrorRecord errorRecord = new ErrorRecord(
+                        ErrorRecord errorRecord = new(
                             new Exception(errorText),
                             "SOURCE_CODE_ERROR",
                             ErrorCategory.InvalidData,
@@ -1256,7 +1255,7 @@ private void HandleCompilerErrors(ImmutableArray<Diagnostic> compilerDiagnostics
 
                 if (IsError)
                 {
-                    ErrorRecord errorRecord = new ErrorRecord(
+                    ErrorRecord errorRecord = new(
                         new InvalidOperationException(AddTypeStrings.CompilerErrors),
                         "COMPILER_ERRORS",
                         ErrorCategory.InvalidData,
@@ -1266,7 +1265,7 @@ private void HandleCompilerErrors(ImmutableArray<Diagnostic> compilerDiagnostics
             }
         }
 
-        private string BuildErrorMessage(Diagnostic diagnisticRecord)
+        private static string BuildErrorMessage(Diagnostic diagnisticRecord)
         {
             var location = diagnisticRecord.Location;
 
@@ -1289,7 +1288,7 @@ private string BuildErrorMessage(Diagnostic diagnisticRecord)
                 var errorLineString = textLines[errorLineNumber].ToString();
                 var errorPosition = lineSpan.StartLinePosition.Character;
 
-                StringBuilder sb = new StringBuilder(diagnisticMessage.Length + errorLineString.Length * 2 + 4);
+                StringBuilder sb = new(diagnisticMessage.Length + errorLineString.Length * 2 + 4);
 
                 sb.AppendLine(diagnisticMessage);
                 sb.AppendLine(errorLineString);
@@ -1315,7 +1314,7 @@ private string BuildErrorMessage(Diagnostic diagnisticRecord)
         private static int SyntaxTreeArrayGetHashCode(IEnumerable<SyntaxTree> sts)
         {
             // We use our extension method EnumerableExtensions.SequenceGetHashCode<T>().
-            List<int> stHashes = new List<int>();
+            List<int> stHashes = new();
             foreach (var st in sts)
             {
                 stHashes.Add(SyntaxTreeGetHashCode(st));
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Compare-Object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Compare-Object.cs
index 7181bbeadaf..714054275d0 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Compare-Object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Compare-Object.cs
@@ -101,10 +101,10 @@ public SwitchParameter PassThru
         private List<OrderByPropertyEntry> _referenceEntries;
 
         private readonly List<OrderByPropertyEntry> _referenceEntryBacklog
-            = new List<OrderByPropertyEntry>();
+            = new();
 
         private readonly List<OrderByPropertyEntry> _differenceEntryBacklog
-            = new List<OrderByPropertyEntry>();
+            = new();
 
         private OrderByProperty _orderByProperty = null;
         private OrderByPropertyComparer _comparer = null;
@@ -208,7 +208,7 @@ private void Process(OrderByPropertyEntry differenceEntry)
             //     Add differenceEntry to differenceEntryBacklog
             if (differenceEntry != null)
             {
-                if (0 < SyncWindow)
+                if (SyncWindow > 0)
                 {
                     while (_differenceEntryBacklog.Count >= SyncWindow)
                     {
@@ -234,7 +234,7 @@ private void Process(OrderByPropertyEntry differenceEntry)
             //     Add referenceEntry to referenceEntryBacklog
             if (referenceEntry != null)
             {
-                if (0 < SyncWindow)
+                if (SyncWindow > 0)
                 {
                     while (_referenceEntryBacklog.Count >= SyncWindow)
                     {
@@ -256,7 +256,7 @@ private void InitComparer()
             if (_comparer != null)
                 return;
 
-            List<PSObject> referenceObjectList = new List<PSObject>(ReferenceObject);
+            List<PSObject> referenceObjectList = new(ReferenceObject);
             _orderByProperty = new OrderByProperty(
                 this, referenceObjectList, Property, true, _cultureInfo, CaseSensitive);
             Diagnostics.Assert(_orderByProperty.Comparer != null, "no comparer");
@@ -327,7 +327,7 @@ private void Emit(OrderByPropertyEntry entry, string sideIndicator)
                 mshobj = new PSObject();
                 if (Property == null || Property.Length == 0)
                 {
-                    PSNoteProperty inputNote = new PSNoteProperty(
+                    PSNoteProperty inputNote = new(
                         InputObjectPropertyName, entry.inputObject);
                     mshobj.Properties.Add(inputNote);
                 }
@@ -348,7 +348,7 @@ private void Emit(OrderByPropertyEntry entry, string sideIndicator)
                         object prop = hash[FormatParameterDefinitionKeys.ExpressionEntryKey];
                         Diagnostics.Assert(prop != null, "null prop");
                         string propName = prop.ToString();
-                        PSNoteProperty propertyNote = new PSNoteProperty(
+                        PSNoteProperty propertyNote = new(
                             propName,
                             entry.orderValues[i].PropertyValue);
                         try
@@ -364,7 +364,7 @@ private void Emit(OrderByPropertyEntry entry, string sideIndicator)
             }
 
             mshobj.Properties.Remove(SideIndicatorPropertyName);
-            PSNoteProperty sideNote = new PSNoteProperty(
+            PSNoteProperty sideNote = new(
                 SideIndicatorPropertyName, sideIndicator);
             mshobj.Properties.Add(sideNote);
             WriteObject(mshobj);
@@ -406,12 +406,12 @@ protected override void ProcessRecord()
                 return;
             }
 
-            if (_comparer == null && 0 < DifferenceObject.Length)
+            if (_comparer == null && DifferenceObject.Length > 0)
             {
                 InitComparer();
             }
 
-            List<PSObject> differenceList = new List<PSObject>(DifferenceObject);
+            List<PSObject> differenceList = new(DifferenceObject);
             List<OrderByPropertyEntry> differenceEntries =
                 OrderByProperty.CreateOrderMatrix(
                 this, differenceList, _orderByProperty.MshParameterList);
@@ -459,7 +459,7 @@ private void HandleDifferenceObjectOnly()
                 return;
             }
 
-            List<PSObject> differenceList = new List<PSObject>(DifferenceObject);
+            List<PSObject> differenceList = new(DifferenceObject);
             _orderByProperty = new OrderByProperty(
                 this, differenceList, Property, true, _cultureInfo, CaseSensitive);
             List<OrderByPropertyEntry> differenceEntries =
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConsoleColorCmdlet.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConsoleColorCmdlet.cs
index 778c9b3573f..e4d36c66106 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConsoleColorCmdlet.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConsoleColorCmdlet.cs
@@ -14,7 +14,7 @@ namespace Microsoft.PowerShell.Commands
     class ConsoleColorCmdlet : PSCmdlet
     {
         /// <summary>
-        /// Default ctor.
+        /// Initializes a new instance of the <see cref="ConsoleColorCmdlet"/> class.
         /// </summary>
         public ConsoleColorCmdlet()
         {
@@ -92,7 +92,7 @@ public ConsoleColorCmdlet()
         private static ErrorRecord BuildOutOfRangeErrorRecord(object val, string errorId)
         {
             string msg = StringUtil.Format(HostStrings.InvalidColorErrorTemplate, val.ToString());
-            ArgumentOutOfRangeException e = new ArgumentOutOfRangeException("value", val, msg);
+            ArgumentOutOfRangeException e = new("value", val, msg);
             return new ErrorRecord(e, errorId, ErrorCategory.InvalidArgument, null);
         }
         #endregion helper
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-SddlString.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-SddlString.cs
index 1e64dfe7754..013f9079d63 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-SddlString.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-SddlString.cs
@@ -5,8 +5,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
 using System.Management.Automation;
 using System.Security.AccessControl;
 using System.Security.Principal;
@@ -45,7 +43,7 @@ public AccessRightTypeNames Type
         private AccessRightTypeNames _type;
         private bool _isTypeSet = false;
 
-        private string ConvertToNTAccount(SecurityIdentifier securityIdentifier)
+        private static string ConvertToNTAccount(SecurityIdentifier securityIdentifier)
         {
             try
             {
@@ -57,11 +55,11 @@ private string ConvertToNTAccount(SecurityIdentifier securityIdentifier)
             }
         }
 
-        private List<string> GetApplicableAccessRights(int accessMask, AccessRightTypeNames? typeName)
+        private static List<string> GetApplicableAccessRights(int accessMask, AccessRightTypeNames? typeName)
         {
-            List<Type> typesToExamine = new List<Type>();
-            List<string> foundAccessRightNames = new List<string>();
-            HashSet<int> foundAccessRightValues = new HashSet<int>();
+            List<Type> typesToExamine = new();
+            List<string> foundAccessRightNames = new();
+            HashSet<int> foundAccessRightValues = new();
 
             if (typeName != null)
             {
@@ -95,7 +93,7 @@ private List<string> GetApplicableAccessRights(int accessMask, AccessRightTypeNa
             return foundAccessRightNames;
         }
 
-        private Type GetRealAccessRightType(AccessRightTypeNames typeName)
+        private static Type GetRealAccessRightType(AccessRightTypeNames typeName)
         {
             switch (typeName)
             {
@@ -116,17 +114,17 @@ private Type GetRealAccessRightType(AccessRightTypeNames typeName)
             }
         }
 
-        private string[] ConvertAccessControlListToStrings(CommonAcl acl, AccessRightTypeNames? typeName)
+        private static string[] ConvertAccessControlListToStrings(CommonAcl acl, AccessRightTypeNames? typeName)
         {
             if (acl == null || acl.Count == 0)
             {
                 return Array.Empty<string>();
             }
 
-            List<string> aceStringList = new List<string>(acl.Count);
+            List<string> aceStringList = new(acl.Count);
             foreach (CommonAce ace in acl)
             {
-                StringBuilder aceString = new StringBuilder();
+                StringBuilder aceString = new();
                 string ntAccount = ConvertToNTAccount(ace.SecurityIdentifier);
                 aceString.Append($"{ntAccount}: {ace.AceQualifier}");
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-StringData.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-StringData.cs
index adf91785673..16bb4be012d 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-StringData.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-StringData.cs
@@ -47,7 +47,7 @@ public string StringData
         /// </summary>
         protected override void ProcessRecord()
         {
-            Hashtable result = new Hashtable(StringComparer.OrdinalIgnoreCase);
+            Hashtable result = new(StringComparer.OrdinalIgnoreCase);
 
             if (string.IsNullOrEmpty(_stringData))
             {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFromMarkdownCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFromMarkdownCommand.cs
index dfa6bd6c4b0..28d117f639f 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFromMarkdownCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFromMarkdownCommand.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.IO;
 using System.Management.Automation;
 using System.Management.Automation.Internal;
@@ -12,8 +11,6 @@
 
 using Microsoft.PowerShell.MarkdownRender;
 
-using Dbg = System.Management.Automation;
-
 namespace Microsoft.PowerShell.Commands
 {
     /// <summary>
@@ -109,7 +106,7 @@ protected override void ProcessRecord()
                     else
                     {
                         string errorMessage = StringUtil.Format(ConvertMarkdownStrings.InvalidInputObjectType, baseObj.GetType());
-                        ErrorRecord errorRecord = new ErrorRecord(
+                        ErrorRecord errorRecord = new(
                             new InvalidDataException(errorMessage),
                             "InvalidInputObject",
                             ErrorCategory.InvalidData,
@@ -153,7 +150,7 @@ private async Task<string> ReadContentFromFile(string filePath)
 
             try
             {
-                using (StreamReader reader = new StreamReader(new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read)))
+                using (StreamReader reader = new(new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read)))
                 {
                     string mdContent = await reader.ReadToEndAsync();
                     return mdContent;
@@ -192,7 +189,7 @@ private List<string> ResolvePath(string path, bool isLiteral)
         {
             ProviderInfo provider = null;
             PSDriveInfo drive = null;
-            List<string> resolvedPaths = new List<string>();
+            List<string> resolvedPaths = new();
 
             try
             {
@@ -219,7 +216,7 @@ private List<string> ResolvePath(string path, bool isLiteral)
             if (!provider.Name.Equals("FileSystem", StringComparison.OrdinalIgnoreCase))
             {
                 string errorMessage = StringUtil.Format(ConvertMarkdownStrings.FileSystemPathsOnly, path);
-                ErrorRecord errorRecord = new ErrorRecord(
+                ErrorRecord errorRecord = new(
                     new ArgumentException(),
                     "OnlyFileSystemPathsSupported",
                     ErrorCategory.InvalidArgument,
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertTo-Html.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertTo-Html.cs
index e118aeaf41b..e72fc825e7c 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertTo-Html.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertTo-Html.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Diagnostics.CodeAnalysis;
 using System.Management.Automation;
 using System.Management.Automation.Internal;
@@ -341,9 +340,9 @@ protected override void SetEntries()
         /// <returns></returns>
         private List<MshParameter> ProcessParameter(object[] properties)
         {
-            TerminatingErrorContext invocationContext = new TerminatingErrorContext(this);
+            TerminatingErrorContext invocationContext = new(this);
             ParameterProcessor processor =
-                new ParameterProcessor(new ConvertHTMLExpressionParameterDefinition());
+                new(new ConvertHTMLExpressionParameterDefinition());
             if (properties == null)
             {
                 properties = new object[] { "*" };
@@ -395,7 +394,7 @@ private static Hashtable CreateAuxPropertyHT(
             string alignment,
             string width)
         {
-            Hashtable ht = new Hashtable();
+            Hashtable ht = new();
             if (label != null)
             {
                 ht.Add(ConvertHTMLParameterDefinitionKeys.LabelEntryKey, label);
@@ -445,8 +444,8 @@ protected override void BeginProcessing()
             // ValidateNotNullOrEmpty attribute is not working for System.Uri datatype, so handling it here
             if ((_cssuriSpecified) && (string.IsNullOrEmpty(_cssuri.OriginalString.Trim())))
             {
-                ArgumentException ex = new ArgumentException(StringUtil.Format(UtilityCommonStrings.EmptyCSSUri, "CSSUri"));
-                ErrorRecord er = new ErrorRecord(ex, "ArgumentException", ErrorCategory.InvalidArgument, "CSSUri");
+                ArgumentException ex = new(StringUtil.Format(UtilityCommonStrings.EmptyCSSUri, "CSSUri"));
+                ErrorRecord er = new(ex, "ArgumentException", ErrorCategory.InvalidArgument, "CSSUri");
                 ThrowTerminatingError(er);
             }
 
@@ -481,7 +480,7 @@ protected override void BeginProcessing()
 
                 if (_metaSpecified)
                 {
-                    List<string> useditems = new List<string>();
+                    List<string> useditems = new();
                     foreach (string s in _meta.Keys)
                     {
                         if (!useditems.Contains(s))
@@ -504,7 +503,7 @@ protected override void BeginProcessing()
                                 default:
                                     MshCommandRuntime mshCommandRuntime = this.CommandRuntime as MshCommandRuntime;
                                     string Message = StringUtil.Format(ConvertHTMLStrings.MetaPropertyNotFound, s, _meta[s]);
-                                    WarningRecord record = new WarningRecord(Message);
+                                    WarningRecord record = new(Message);
                                     InvocationInfo invocationInfo = GetVariableValue(SpecialVariables.MyInvocation) as InvocationInfo;
 
                                     if (invocationInfo != null)
@@ -550,7 +549,7 @@ protected override void BeginProcessing()
         /// <param name="mshParams"></param>
         private void WriteColumns(List<MshParameter> mshParams)
         {
-            StringBuilder COLTag = new StringBuilder();
+            StringBuilder COLTag = new();
 
             COLTag.Append("<colgroup>");
             foreach (MshParameter p in mshParams)
@@ -588,7 +587,7 @@ private void WriteListEntry()
         {
             foreach (MshParameter p in _resolvedNameMshParameters)
             {
-                StringBuilder Listtag = new StringBuilder();
+                StringBuilder Listtag = new();
                 Listtag.Append("<tr><td>");
 
                 // for writing the property name
@@ -608,7 +607,7 @@ private void WriteListEntry()
         /// <summary>
         /// To write the Property name.
         /// </summary>
-        private void WritePropertyName(StringBuilder Listtag, MshParameter p)
+        private static void WritePropertyName(StringBuilder Listtag, MshParameter p)
         {
             // for writing the property name
             string label = p.GetEntry(ConvertHTMLParameterDefinitionKeys.LabelEntryKey) as string;
@@ -653,7 +652,7 @@ private void WritePropertyValue(StringBuilder Listtag, MshParameter p)
         /// <summary>
         /// To write the Table header for the object property names.
         /// </summary>
-        private void WriteTableHeader(StringBuilder THtag, List<MshParameter> resolvedNameMshParameters)
+        private static void WriteTableHeader(StringBuilder THtag, List<MshParameter> resolvedNameMshParameters)
         {
             // write the property names
             foreach (MshParameter p in resolvedNameMshParameters)
@@ -714,7 +713,7 @@ protected override void ProcessRecord()
                 {
                     WriteColumns(_resolvedNameMshParameters);
 
-                    StringBuilder THtag = new StringBuilder("<tr>");
+                    StringBuilder THtag = new("<tr>");
 
                     // write the table header
                     WriteTableHeader(THtag, _resolvedNameMshParameters);
@@ -727,7 +726,7 @@ protected override void ProcessRecord()
             // if the As parameter is Table, write the property values
             if (_as.Equals("Table", StringComparison.OrdinalIgnoreCase))
             {
-                StringBuilder TRtag = new StringBuilder("<tr>");
+                StringBuilder TRtag = new("<tr>");
 
                 // write the table row
                 WriteTableRow(TRtag, _resolvedNameMshParameters);
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Csv.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Csv.cs
index 3bb626ca06e..9590cd7c771 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Csv.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Csv.cs
@@ -28,7 +28,7 @@ internal CSVHelper(char delimiter)
         /// </param>
         internal Collection<string> ParseCsv(string csv)
         {
-            Collection<string> result = new Collection<string>();
+            Collection<string> result = new();
             string tempString = string.Empty;
             csv = csv.Trim();
             if (csv.Length == 0 || csv[0] == '#')
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CsvCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CsvCommands.cs
index 0f414433191..cbd9d4c36b4 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CsvCommands.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CsvCommands.cs
@@ -11,8 +11,6 @@
 using System.Management.Automation;
 using System.Text;
 
-using Dbg = System.Management.Automation.Diagnostics;
-
 #pragma warning disable 1634, 1691 // Stops compiler from warning about unknown warnings
 
 namespace Microsoft.PowerShell.Commands
@@ -110,15 +108,15 @@ protected override void BeginProcessing()
         {
             if (this.MyInvocation.BoundParameters.ContainsKey(nameof(QuoteFields)) && this.MyInvocation.BoundParameters.ContainsKey(nameof(UseQuotes)))
             {
-                InvalidOperationException exception = new InvalidOperationException(CsvCommandStrings.CannotSpecifyQuoteFieldsAndUseQuotes);
-                ErrorRecord errorRecord = new ErrorRecord(exception, "CannotSpecifyQuoteFieldsAndUseQuotes", ErrorCategory.InvalidData, null);
+                InvalidOperationException exception = new(CsvCommandStrings.CannotSpecifyQuoteFieldsAndUseQuotes);
+                ErrorRecord errorRecord = new(exception, "CannotSpecifyQuoteFieldsAndUseQuotes", ErrorCategory.InvalidData, null);
                 this.ThrowTerminatingError(errorRecord);
             }
 
             if (this.MyInvocation.BoundParameters.ContainsKey(nameof(IncludeTypeInformation)) && this.MyInvocation.BoundParameters.ContainsKey(nameof(NoTypeInformation)))
             {
-                InvalidOperationException exception = new InvalidOperationException(CsvCommandStrings.CannotSpecifyIncludeTypeInformationAndNoTypeInformation);
-                ErrorRecord errorRecord = new ErrorRecord(exception, "CannotSpecifyIncludeTypeInformationAndNoTypeInformation", ErrorCategory.InvalidData, null);
+                InvalidOperationException exception = new(CsvCommandStrings.CannotSpecifyIncludeTypeInformationAndNoTypeInformation);
+                ErrorRecord errorRecord = new(exception, "CannotSpecifyIncludeTypeInformationAndNoTypeInformation", ErrorCategory.InvalidData, null);
                 this.ThrowTerminatingError(errorRecord);
             }
 
@@ -260,8 +258,8 @@ protected override void BeginProcessing()
             // Validate that they don't provide both Path and LiteralPath, but have provided at least one.
             if (!(_specifiedPath ^ _isLiteralPath))
             {
-                InvalidOperationException exception = new InvalidOperationException(CsvCommandStrings.CannotSpecifyPathAndLiteralPath);
-                ErrorRecord errorRecord = new ErrorRecord(exception, "CannotSpecifyPathAndLiteralPath", ErrorCategory.InvalidData, null);
+                InvalidOperationException exception = new(CsvCommandStrings.CannotSpecifyPathAndLiteralPath);
+                ErrorRecord errorRecord = new(exception, "CannotSpecifyPathAndLiteralPath", ErrorCategory.InvalidData, null);
                 this.ThrowTerminatingError(errorRecord);
             }
 
@@ -360,7 +358,7 @@ private void CreateFileStream()
             {
                 using (StreamReader streamReader = PathUtils.OpenStreamReader(this, this.Path, Encoding, _isLiteralPath))
                 {
-                    isCsvFileEmpty = streamReader.Peek() == -1 ? true : false;
+                    isCsvFileEmpty = streamReader.Peek() == -1;
                 }
             }
 
@@ -373,7 +371,7 @@ private void CreateFileStream()
 
                 using (StreamReader streamReader = PathUtils.OpenStreamReader(this, this.Path, Encoding, _isLiteralPath))
                 {
-                    ImportCsvHelper readingHelper = new ImportCsvHelper(
+                    ImportCsvHelper readingHelper = new(
                         this, this.Delimiter, null /* header */, null /* typeName */, streamReader);
                     readingHelper.ReadHeader();
                     _preexistingPropertyNames = readingHelper.Header;
@@ -448,7 +446,7 @@ private void ReconcilePreexistingPropertyNames()
                 throw new InvalidOperationException(CsvCommandStrings.ReconcilePreexistingPropertyNamesMethodShouldOnlyGetCalledWhenPreexistingPropertyNamesHaveBeenReadSuccessfully);
             }
 
-            HashSet<string> appendedPropertyNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            HashSet<string> appendedPropertyNames = new(StringComparer.OrdinalIgnoreCase);
             foreach (string appendedPropertyName in _propertyNames)
             {
                 appendedPropertyNames.Add(appendedPropertyName);
@@ -465,8 +463,8 @@ private void ReconcilePreexistingPropertyNames()
                             CsvCommandStrings.CannotAppendCsvWithMismatchedPropertyNames,
                             preexistingPropertyName,
                             this.Path);
-                        InvalidOperationException exception = new InvalidOperationException(errorMessage);
-                        ErrorRecord errorRecord = new ErrorRecord(exception, "CannotAppendCsvWithMismatchedPropertyNames", ErrorCategory.InvalidData, preexistingPropertyName);
+                        InvalidOperationException exception = new(errorMessage);
+                        ErrorRecord errorRecord = new(exception, "CannotAppendCsvWithMismatchedPropertyNames", ErrorCategory.InvalidData, preexistingPropertyName);
                         this.ThrowTerminatingError(errorRecord);
                     }
                 }
@@ -646,8 +644,8 @@ protected override void ProcessRecord()
             // Validate that they don't provide both Path and LiteralPath, but have provided at least one.
             if (!(_specifiedPath ^ _isLiteralPath))
             {
-                InvalidOperationException exception = new InvalidOperationException(CsvCommandStrings.CannotSpecifyPathAndLiteralPath);
-                ErrorRecord errorRecord = new ErrorRecord(exception, "CannotSpecifyPathAndLiteralPath", ErrorCategory.InvalidData, null);
+                InvalidOperationException exception = new(CsvCommandStrings.CannotSpecifyPathAndLiteralPath);
+                ErrorRecord errorRecord = new(exception, "CannotSpecifyPathAndLiteralPath", ErrorCategory.InvalidData, null);
                 this.ThrowTerminatingError(errorRecord);
             }
 
@@ -657,7 +655,7 @@ protected override void ProcessRecord()
                 {
                     using (StreamReader streamReader = PathUtils.OpenStreamReader(this, path, this.Encoding, _isLiteralPath))
                     {
-                        ImportCsvHelper helper = new ImportCsvHelper(this, Delimiter, Header, null /* typeName */, streamReader);
+                        ImportCsvHelper helper = new(this, Delimiter, Header, null /* typeName */, streamReader);
 
                         try
                         {
@@ -665,7 +663,7 @@ protected override void ProcessRecord()
                         }
                         catch (ExtendedTypeSystemException exception)
                         {
-                            ErrorRecord errorRecord = new ErrorRecord(exception, "AlreadyPresentPSMemberInfoInternalCollectionAdd", ErrorCategory.NotSpecified, null);
+                            ErrorRecord errorRecord = new(exception, "AlreadyPresentPSMemberInfoInternalCollectionAdd", ErrorCategory.NotSpecified, null);
                             this.ThrowTerminatingError(errorRecord);
                         }
                     }
@@ -835,10 +833,10 @@ protected override void ProcessRecord()
         {
             foreach (PSObject inputObject in InputObject)
             {
-                using (MemoryStream memoryStream = new MemoryStream(Encoding.Unicode.GetBytes(inputObject.ToString())))
-                using (StreamReader streamReader = new StreamReader(memoryStream, System.Text.Encoding.Unicode))
+                using (MemoryStream memoryStream = new(Encoding.Unicode.GetBytes(inputObject.ToString())))
+                using (StreamReader streamReader = new(memoryStream, System.Text.Encoding.Unicode))
                 {
-                    ImportCsvHelper helper = new ImportCsvHelper(this, Delimiter, Header, _typeName, streamReader);
+                    ImportCsvHelper helper = new(this, Delimiter, Header, _typeName, streamReader);
 
                     try
                     {
@@ -846,7 +844,7 @@ protected override void ProcessRecord()
                     }
                     catch (ExtendedTypeSystemException exception)
                     {
-                        ErrorRecord errorRecord = new ErrorRecord(exception, "AlreadyPresentPSMemberInfoInternalCollectionAdd", ErrorCategory.NotSpecified, null);
+                        ErrorRecord errorRecord = new(exception, "AlreadyPresentPSMemberInfoInternalCollectionAdd", ErrorCategory.NotSpecified, null);
                         this.ThrowTerminatingError(errorRecord);
                     }
 
@@ -885,7 +883,7 @@ internal class ExportCsvHelper : IDisposable
         private readonly StringBuilder _outputString;
 
         /// <summary>
-        /// Create ExportCsvHelper instance.
+        /// Initializes a new instance of the <see cref="ExportCsvHelper"/> class.
         /// </summary>
         /// <param name="delimiter">Delimiter char.</param>
         /// <param name="quoteKind">Kind of quoting.</param>
@@ -1386,7 +1384,7 @@ private static void ValidatePropertyNames(IList<string> names)
                 }
                 else
                 {
-                    HashSet<string> headers = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+                    HashSet<string> headers = new(StringComparer.OrdinalIgnoreCase);
                     foreach (string currentHeader in names)
                     {
                         if (!string.IsNullOrEmpty(currentHeader))
@@ -1404,7 +1402,7 @@ private static void ValidatePropertyNames(IList<string> names)
                                         ExtendedTypeSystem.MemberAlreadyPresent,
                                         currentHeader);
 
-                                ExtendedTypeSystemException exception = new ExtendedTypeSystemException(memberAlreadyPresentMsg);
+                                ExtendedTypeSystemException exception = new(memberAlreadyPresentMsg);
                                 throw exception;
                             }
                         }
@@ -1638,7 +1636,7 @@ private bool IsNewLine(char ch, out string newLine)
         /// </param>
         private void ReadTillNextDelimiter(StringBuilder current, ref bool endOfRecord, bool eatTrailingBlanks)
         {
-            StringBuilder temp = new StringBuilder();
+            StringBuilder temp = new();
 
             // Did we see any non-whitespace character
             bool nonWhiteSpace = false;
@@ -1686,7 +1684,7 @@ private void ReadTillNextDelimiter(StringBuilder current, ref bool endOfRecord,
 
         private PSObject BuildMshobject(string type, IList<string> names, List<string> values, char delimiter, bool preValidated = false)
         {
-            PSObject result = new PSObject(names.Count);
+            PSObject result = new(names.Count);
             char delimiterlocal = delimiter;
             int unspecifiedNameIndex = 1;
             for (int i = 0; i <= names.Count - 1; i++)
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CustomSerialization.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CustomSerialization.cs
index bb9de345b5b..6ad8b02a558 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CustomSerialization.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CustomSerialization.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Management.Automation.Internal;
@@ -39,7 +38,7 @@ internal class CustomSerialization
         private CustomInternalSerializer _serializer;
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="CustomSerialization"/> class.
         /// </summary>
         /// <param name="writer">
         /// writer to be used for serialization.
@@ -75,7 +74,7 @@ internal CustomSerialization(XmlWriter writer, bool notypeinformation, int depth
         public static int MshDefaultSerializationDepth { get; } = 1;
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="CustomSerialization"/> class.
         /// </summary>
         /// <param name="writer">
         /// writer to be used for serialization.
@@ -209,7 +208,7 @@ internal class
         private bool _firstobjectcall = true;
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="CustomInternalSerializer"/> class.
         /// </summary>
         /// <param name="writer">
         /// Xml writer to be used.
@@ -442,7 +441,7 @@ private bool HandleKnownContainerTypes(object source, string property, int depth
         /// <param name="ct"></param>
         /// <param name="dictionary"></param>
         /// <param name="enumerable"></param>
-        private void GetKnownContainerTypeInfo(
+        private static void GetKnownContainerTypeInfo(
             object source, out ContainerType ct, out IDictionary dictionary, out IEnumerable enumerable)
         {
             Dbg.Assert(source != null, "caller should validate the parameter");
@@ -676,7 +675,7 @@ private void WriteStartOfPSObject(
         /// <param name="source"></param>
         /// <returns>
         /// </returns>
-        private bool PSObjectHasNotes(PSObject source)
+        private static bool PSObjectHasNotes(PSObject source)
         {
             if (source.InstanceMembers != null && source.InstanceMembers.Count > 0)
             {
@@ -742,7 +741,7 @@ private void WritePSObjectProperties(PSObject source, int depth)
             Dbg.Assert(depth >= 0, "depth should be greater or equal to zero");
             if (source.GetSerializationMethod(null) == SerializationMethod.SpecificProperties)
             {
-                PSMemberInfoInternalCollection<PSPropertyInfo> specificProperties = new PSMemberInfoInternalCollection<PSPropertyInfo>();
+                PSMemberInfoInternalCollection<PSPropertyInfo> specificProperties = new();
                 foreach (string propertyName in source.GetSpecificPropertiesToSerialize(null))
                 {
                     PSPropertyInfo property = source.Properties[propertyName];
@@ -955,7 +954,7 @@ private void HandlePSObjectAsString(PSObject source, string property, int depth)
         /// <returns>
         /// string value to use for serializing this PSObject.
         /// </returns>
-        private string GetStringFromPSObject(PSObject source)
+        private static string GetStringFromPSObject(PSObject source)
         {
             Dbg.Assert(source != null, "caller should have validated the information");
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/DebugRunspaceCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/DebugRunspaceCommand.cs
index 1a560a0010d..aa370c12ba1 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/DebugRunspaceCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/DebugRunspaceCommand.cs
@@ -43,7 +43,7 @@ public sealed class DebugRunspaceCommand : PSCmdlet
 
         // Debugging to persist until Ctrl+C or Debugger 'Exit' stops cmdlet.
         private bool _debugging;
-        private readonly ManualResetEventSlim _newRunningScriptEvent = new ManualResetEventSlim(true);
+        private readonly ManualResetEventSlim _newRunningScriptEvent = new(true);
         private RunspaceAvailability _previousRunspaceAvailability = RunspaceAvailability.None;
 
         #endregion
@@ -549,7 +549,7 @@ private void EnableHostDebugger(Runspace runspace, bool enabled)
             }
         }
 
-        private void SetLocalMode(System.Management.Automation.Debugger debugger, bool localMode)
+        private static void SetLocalMode(System.Management.Automation.Debugger debugger, bool localMode)
         {
             ServerRemoteDebugger remoteDebugger = debugger as ServerRemoteDebugger;
             if (remoteDebugger != null)
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/EnableDisableRunspaceDebugCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/EnableDisableRunspaceDebugCommand.cs
index 62e7b4a8d0f..c37d83ecf84 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/EnableDisableRunspaceDebugCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/EnableDisableRunspaceDebugCommand.cs
@@ -51,7 +51,7 @@ public sealed class PSRunspaceDebug
         #region Constructors
 
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="PSRunspaceDebug"/> class.
         /// </summary>
         /// <param name="enabled">Enable debugger option.</param>
         /// <param name="breakAll">BreakAll option.</param>
@@ -291,7 +291,7 @@ protected void SetDebugPreferenceHelper(string processName, string[] appDomainNa
             }
             catch (Exception ex)
             {
-                ErrorRecord errorRecord = new ErrorRecord(
+                ErrorRecord errorRecord = new(
                 new PSInvalidOperationException(string.Format(CultureInfo.InvariantCulture, Debugger.PersistDebugPreferenceFailure, processName), ex),
                 fullyQualifiedErrorId,
                 ErrorCategory.InvalidOperation,
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ExportAliasCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ExportAliasCommand.cs
index 431f30a3dcc..7260bc51d95 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ExportAliasCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ExportAliasCommand.cs
@@ -244,7 +244,7 @@ protected override void ProcessRecord()
                     // that doesn't exist and they are not globbing.
 
                     ItemNotFoundException itemNotFound =
-                        new ItemNotFoundException(
+                        new(
                             aliasName,
                             "AliasNotFound",
                             SessionStateStrings.AliasNotFound);
@@ -310,7 +310,7 @@ protected override void EndProcessing()
         /// <summary>
         /// Holds all the matching aliases for writing to the file.
         /// </summary>
-        private readonly Collection<AliasInfo> _matchingAliases = new Collection<AliasInfo>();
+        private readonly Collection<AliasInfo> _matchingAliases = new();
 
         private static string GetAliasLine(AliasInfo alias, string formatString)
         {
@@ -406,7 +406,7 @@ private void ThrowFileOpenError(Exception e, string pathWithError)
         {
             string message = StringUtil.Format(AliasCommandStrings.ExportAliasFileOpenFailed, pathWithError, e.Message);
 
-            ErrorRecord errorRecord = new ErrorRecord(
+            ErrorRecord errorRecord = new(
                 e,
                 "FileOpenFailure",
                 ErrorCategory.OpenError,
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ExpressionColumnInfo.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ExpressionColumnInfo.cs
index 0e529004aec..e905f5d64b6 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ExpressionColumnInfo.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ExpressionColumnInfo.cs
@@ -1,12 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
 using System.Collections.Generic;
 using System.Management.Automation;
 
-using Microsoft.PowerShell.Commands.Internal.Format;
-
 namespace Microsoft.PowerShell.Commands
 {
     internal class ExpressionColumnInfo : ColumnInfo
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/HeaderInfo.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/HeaderInfo.cs
index c88cdd0bcb0..d811ce32303 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/HeaderInfo.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/HeaderInfo.cs
@@ -9,7 +9,7 @@ namespace Microsoft.PowerShell.Commands
 {
     internal class HeaderInfo
     {
-        private readonly List<ColumnInfo> _columns = new List<ColumnInfo>();
+        private readonly List<ColumnInfo> _columns = new();
 
         internal void AddColumn(ColumnInfo col)
         {
@@ -18,7 +18,7 @@ internal void AddColumn(ColumnInfo col)
 
         internal PSObject AddColumnsToWindow(OutWindowProxy windowProxy, PSObject liveObject)
         {
-            PSObject staleObject = new PSObject();
+            PSObject staleObject = new();
 
             // Initiate arrays to be of the same size.
             int count = _columns.Count;
@@ -47,7 +47,7 @@ internal PSObject AddColumnsToWindow(OutWindowProxy windowProxy, PSObject liveOb
 
         internal PSObject CreateStalePSObject(PSObject liveObject)
         {
-            PSObject staleObject = new PSObject();
+            PSObject staleObject = new();
             foreach (ColumnInfo column in _columns)
             {
                 // Add a property to the stale PSObject.
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutGridViewCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutGridViewCommand.cs
index e5c418044fe..e606e58e9e4 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutGridViewCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutGridViewCommand.cs
@@ -54,7 +54,7 @@ public class OutGridViewCommand : PSCmdlet, IDisposable
         #region Constructors
 
         /// <summary>
-        /// Constructor for OutGridView.
+        /// Initializes a new instance of the <see cref="OutGridViewCommand"/> class.
         /// </summary>
         public OutGridViewCommand()
         {
@@ -212,7 +212,7 @@ protected override void StopProcessing()
         /// <param name="liveObject">PSObject to be converted to a string.</param>
         internal string ConvertToString(PSObject liveObject)
         {
-            StringFormatError formatErrorObject = new StringFormatError();
+            StringFormatError formatErrorObject = new();
             string smartToString = PSObjectHelper.SmartToString(liveObject,
                                                                 _expressionFactory,
                                                                 InnerFormatShapeCommand.FormatEnumerationLimit(),
@@ -265,7 +265,7 @@ baseObject is PSReference ||
                 baseObject is FormatInfoData ||
                 baseObject is PSObject)
             {
-                ErrorRecord error = new ErrorRecord(
+                ErrorRecord error = new(
                     new FormatException(StringUtil.Format(FormatAndOut_out_gridview.DataNotQualifiedForGridView)),
                     DataNotQualifiedForGridView,
                     ErrorCategory.InvalidType,
@@ -289,7 +289,7 @@ baseObject is FormatInfoData ||
             Exception exception = _windowProxy.GetLastException();
             if (exception != null)
             {
-                ErrorRecord error = new ErrorRecord(
+                ErrorRecord error = new(
                     exception,
                     "ManagementListInvocationException",
                     ErrorCategory.OperationStopped,
@@ -357,7 +357,7 @@ internal class NonscalarTypeHeader : GridHeader
             internal NonscalarTypeHeader(OutGridViewCommand parentCmd, PSObject input) : base(parentCmd)
             {
                 // Prepare a table view.
-                TableView tableView = new TableView();
+                TableView tableView = new();
                 tableView.Initialize(parentCmd._expressionFactory, parentCmd._typeInfoDataBase);
 
                 // Request a view definition from the type database.
@@ -492,13 +492,5 @@ public void Dispose()
             this.Dispose(true);
             GC.SuppressFinalize(this);
         }
-
-        /// <summary>
-        /// Finalizer.
-        /// </summary>
-        ~OutGridViewCommand()
-        {
-            Dispose(false);
-        }
     }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutWindowProxy.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutWindowProxy.cs
index 446b2f2568f..3f22caf1e7b 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutWindowProxy.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutWindowProxy.cs
@@ -39,7 +39,7 @@ internal class OutWindowProxy : IDisposable
         private readonly GraphicalHostReflectionWrapper _graphicalHostReflectionWrapper;
 
         /// <summary>
-        /// Initializes a new instance of the OutWindowProxy class.
+        /// Initializes a new instance of the <see cref="OutWindowProxy"/> class.
         /// </summary>
         internal OutWindowProxy(string title, OutputModeOption outPutMode, OutGridViewCommand parentCmdlet)
         {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/TableView.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/TableView.cs
index dc967889e69..216d9121d54 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/TableView.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/TableView.cs
@@ -25,7 +25,7 @@ internal void Initialize(PSPropertyExpressionFactory expressionFactory,
             _typeInfoDatabase = db;
 
             // Initialize Format Error Manager.
-            FormatErrorPolicy formatErrorPolicy = new FormatErrorPolicy();
+            FormatErrorPolicy formatErrorPolicy = new();
 
             formatErrorPolicy.ShowErrorsAsMessages = _typeInfoDatabase.defaultSettingsSection.formatErrorPolicy.ShowErrorsAsMessages;
             formatErrorPolicy.ShowErrorsInFormattedOutput = _typeInfoDatabase.defaultSettingsSection.formatErrorPolicy.ShowErrorsInFormattedOutput;
@@ -35,7 +35,7 @@ internal void Initialize(PSPropertyExpressionFactory expressionFactory,
 
         internal HeaderInfo GenerateHeaderInfo(PSObject input, TableControlBody tableBody, OutGridViewCommand parentCmdlet)
         {
-            HeaderInfo headerInfo = new HeaderInfo();
+            HeaderInfo headerInfo = new();
 
             // This verification is needed because the database returns "LastWriteTime" value for file system objects
             // as strings and it is used to detect this situation and use the actual field value.
@@ -124,7 +124,7 @@ internal HeaderInfo GenerateHeaderInfo(PSObject input, TableControlBody tableBod
 
         internal HeaderInfo GenerateHeaderInfo(PSObject input, OutGridViewCommand parentCmdlet)
         {
-            HeaderInfo headerInfo = new HeaderInfo();
+            HeaderInfo headerInfo = new();
             List<MshResolvedExpressionParameterAssociation> activeAssociationList;
 
             // Get properties from the default property set of the object
@@ -191,17 +191,17 @@ internal HeaderInfo GenerateHeaderInfo(PSObject input, OutGridViewCommand parent
         /// </summary>
         /// <returns>None.</returns>
         /// <remarks>This method updates "activeAssociationList" instance property.</remarks>
-        private void FilterActiveAssociationList(List<MshResolvedExpressionParameterAssociation> activeAssociationList)
+        private static void FilterActiveAssociationList(List<MshResolvedExpressionParameterAssociation> activeAssociationList)
         {
             // we got a valid set of properties from the default property set
             // make sure we do not have too many properties
 
             // NOTE: this is an arbitrary number, chosen to be a sensitive default
-            int nMax = 256;
+            const int nMax = 256;
 
             if (activeAssociationList.Count > nMax)
             {
-                List<MshResolvedExpressionParameterAssociation> tmp = new List<MshResolvedExpressionParameterAssociation>(activeAssociationList);
+                List<MshResolvedExpressionParameterAssociation> tmp = new(activeAssociationList);
                 activeAssociationList.Clear();
                 for (int k = 0; k < nMax; k++)
                     activeAssociationList.Add(tmp[k]);
@@ -222,7 +222,7 @@ private List<TableRowItemDefinition> GetActiveTableRowDefinition(TableControlBod
             TableRowDefinition matchingRowDefinition = null;
 
             var typeNames = so.InternalTypeNames;
-            TypeMatch match = new TypeMatch(_expressionFactory, _typeInfoDatabase, typeNames);
+            TypeMatch match = new(_expressionFactory, _typeInfoDatabase, typeNames);
 
             foreach (TableRowDefinition x in tableBody.optionalDefinitionList)
             {
@@ -268,7 +268,7 @@ private List<TableRowItemDefinition> GetActiveTableRowDefinition(TableControlBod
             }
 
             // we have an override, we need to compute the merge of the active cells
-            List<TableRowItemDefinition> activeRowItemDefinitionList = new List<TableRowItemDefinition>();
+            List<TableRowItemDefinition> activeRowItemDefinitionList = new();
             int col = 0;
             foreach (TableRowItemDefinition rowItem in matchingRowDefinition.rowItemDefinitionList)
             {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/common/WriteFormatDataCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/common/WriteFormatDataCommand.cs
index 457418b30fc..3ccbe942829 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/common/WriteFormatDataCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/common/WriteFormatDataCommand.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Management.Automation;
@@ -75,7 +74,7 @@ public string LiteralPath
 
         private bool _isLiteralPath = false;
 
-        private readonly List<ExtendedTypeDefinition> _typeDefinitions = new List<ExtendedTypeDefinition>();
+        private readonly List<ExtendedTypeDefinition> _typeDefinitions = new();
 
         private bool _force;
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-hex/Format-Hex.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-hex/Format-Hex.cs
index d370110b8f2..091903f011a 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-hex/Format-Hex.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-hex/Format-Hex.cs
@@ -27,7 +27,7 @@ public sealed class FormatHex : PSCmdlet
         /// For cases where a homogenous collection of bytes or other items are directly piped in, we collect all the
         /// bytes in a List&lt;byte&gt; and then output the formatted result all at once in EndProcessing().
         /// </summary>
-        private readonly List<byte> _inputBuffer = new List<byte>();
+        private readonly List<byte> _inputBuffer = new();
 
         /// <summary>
         /// Expect to group <see cref="InputObject"/>s by default. When receiving input that should not be grouped,
@@ -77,6 +77,7 @@ public Encoding Encoding
             {
                 return _encoding;
             }
+
             set
             {
                 EncodingConversion.WarnIfObsolete(this, value);
@@ -152,12 +153,12 @@ protected override void EndProcessing()
         /// <returns></returns>
         private List<string> ResolvePaths(string[] path, bool literalPath)
         {
-            List<string> pathsToProcess = new List<string>();
+            List<string> pathsToProcess = new();
             ProviderInfo provider = null;
 
             foreach (string currentPath in path)
             {
-                List<string> newPaths = new List<string>();
+                List<string> newPaths = new();
 
                 if (literalPath)
                 {
@@ -173,7 +174,7 @@ private List<string> ResolvePaths(string[] path, bool literalPath)
                     {
                         if (!WildcardPattern.ContainsWildcardCharacters(currentPath))
                         {
-                            ErrorRecord errorRecord = new ErrorRecord(e, "FileNotFound", ErrorCategory.ObjectNotFound, path);
+                            ErrorRecord errorRecord = new(e, "FileNotFound", ErrorCategory.ObjectNotFound, path);
                             WriteError(errorRecord);
                             continue;
                         }
@@ -184,7 +185,7 @@ private List<string> ResolvePaths(string[] path, bool literalPath)
                 {
                     // Write a non-terminating error message indicating that path specified is not supported.
                     string errorMessage = StringUtil.Format(UtilityCommonStrings.FormatHexOnlySupportsFileSystemPaths, currentPath);
-                    ErrorRecord errorRecord = new ErrorRecord(
+                    ErrorRecord errorRecord = new(
                         new ArgumentException(errorMessage),
                         "FormatHexOnlySupportsFileSystemPaths",
                         ErrorCategory.InvalidArgument,
@@ -292,7 +293,7 @@ private void ProcessString(string originalString)
             }
         }
 
-        private static readonly Random _idGenerator = new Random();
+        private static readonly Random _idGenerator = new();
 
         private static string GetGroupLabel(Type inputType)
             => string.Format("{0} ({1}) <{2:X8}>", inputType.Name, inputType.FullName, _idGenerator.Next());
@@ -369,7 +370,7 @@ private void ProcessInputObjects(PSObject inputObject)
             else
             {
                 string errorMessage = StringUtil.Format(UtilityCommonStrings.FormatHexTypeNotSupported, obj.GetType());
-                ErrorRecord errorRecord = new ErrorRecord(
+                ErrorRecord errorRecord = new(
                     new ArgumentException(errorMessage),
                     "FormatHexTypeNotSupported",
                     ErrorCategory.InvalidArgument,
@@ -485,7 +486,7 @@ private byte[] ConvertToBytes(object inputObject)
         /// <param name="offset">Offset in the file.</param>
         private void WriteHexadecimal(Span<byte> inputBytes, string path, long offset)
         {
-            var bytesPerObject = 16;
+            const int bytesPerObject = 16;
             for (int index = 0; index < inputBytes.Length; index += bytesPerObject)
             {
                 var count = inputBytes.Length - index < bytesPerObject
@@ -507,7 +508,7 @@ private void WriteHexadecimal(Span<byte> inputBytes, string path, long offset)
         /// </param>
         private void WriteHexadecimal(Span<byte> inputBytes, long offset, string label)
         {
-            var bytesPerObject = 16;
+            const int bytesPerObject = 16;
             for (int index = 0; index < inputBytes.Length; index += bytesPerObject)
             {
                 var count = inputBytes.Length - index < bytesPerObject
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-list/Format-List.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-list/Format-List.cs
index f258d807345..7237cd46834 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-list/Format-List.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-list/Format-List.cs
@@ -14,7 +14,8 @@ namespace Microsoft.PowerShell.Commands
     public class FormatListCommand : OuterFormatTableAndListBase
     {
         /// <summary>
-        /// Constructor to set the inner command.
+        /// Initializes a new instance of the <see cref="FormatListCommand"/> class
+        /// and sets the inner command.
         /// </summary>
         public FormatListCommand()
         {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-object/Format-Object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-object/Format-Object.cs
index 6bff32403f3..9e064ba37db 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-object/Format-Object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-object/Format-Object.cs
@@ -14,7 +14,8 @@ namespace Microsoft.PowerShell.Commands
     public class FormatCustomCommand : OuterFormatShapeCommandBase
     {
         /// <summary>
-        /// Constructor to se the inner command.
+        /// Initializes a new instance of the <see cref="FormatCustomCommand"/> class
+        /// and sets the inner command.
         /// </summary>
         public FormatCustomCommand()
         {
@@ -57,12 +58,12 @@ public int Depth
 
         internal override FormattingCommandLineParameters GetCommandLineParameters()
         {
-            FormattingCommandLineParameters parameters = new FormattingCommandLineParameters();
+            FormattingCommandLineParameters parameters = new();
 
             if (_props != null)
             {
-                ParameterProcessor processor = new ParameterProcessor(new FormatObjectParameterDefinition());
-                TerminatingErrorContext invocationContext = new TerminatingErrorContext(this);
+                ParameterProcessor processor = new(new FormatObjectParameterDefinition());
+                TerminatingErrorContext invocationContext = new(this);
                 parameters.mshParameterList = processor.ProcessParameters(_props, invocationContext);
             }
 
@@ -86,7 +87,7 @@ internal override FormattingCommandLineParameters GetCommandLineParameters()
 
             parameters.expansion = ProcessExpandParameter();
 
-            ComplexSpecificParameters csp = new ComplexSpecificParameters();
+            ComplexSpecificParameters csp = new();
             csp.maxDepth = _depth;
             parameters.shapeParameters = csp;
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-table/Format-Table.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-table/Format-Table.cs
index 43991282c25..e831981568e 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-table/Format-Table.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-table/Format-Table.cs
@@ -14,7 +14,8 @@ namespace Microsoft.PowerShell.Commands
     public class FormatTableCommand : OuterFormatTableBase
     {
         /// <summary>
-        /// Constructor to set the inner command.
+        /// Initializes a new instance of the <see cref="FormatTableCommand"/> class
+        /// and sets the inner command.
         /// </summary>
         public FormatTableCommand()
         {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-wide/Format-Wide.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-wide/Format-Wide.cs
index fe9a9f687ad..7a8613ac032 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-wide/Format-Wide.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-wide/Format-Wide.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
 using System.IO;
 using System.Management.Automation;
 using System.Management.Automation.Internal;
@@ -17,7 +16,8 @@ namespace Microsoft.PowerShell.Commands
     public class FormatWideCommand : OuterFormatShapeCommandBase
     {
         /// <summary>
-        /// Constructor to se the inner command.
+        /// Initializes a new instance of the <see cref="FormatWideCommand"/> class
+        /// and sets the inner command.
         /// </summary>
         public FormatWideCommand()
         {
@@ -83,12 +83,12 @@ public int Column
 
         internal override FormattingCommandLineParameters GetCommandLineParameters()
         {
-            FormattingCommandLineParameters parameters = new FormattingCommandLineParameters();
+            FormattingCommandLineParameters parameters = new();
 
             if (_prop != null)
             {
-                ParameterProcessor processor = new ParameterProcessor(new FormatWideParameterDefinition());
-                TerminatingErrorContext invocationContext = new TerminatingErrorContext(this);
+                ParameterProcessor processor = new(new FormatWideParameterDefinition());
+                TerminatingErrorContext invocationContext = new(this);
                 parameters.mshParameterList = processor.ProcessParameters(new object[] { _prop }, invocationContext);
             }
 
@@ -111,7 +111,7 @@ internal override FormattingCommandLineParameters GetCommandLineParameters()
                     // the user specified -autosize:true AND a column number
                     string msg = StringUtil.Format(FormatAndOut_format_xxx.CannotSpecifyAutosizeAndColumnsError);
 
-                    ErrorRecord errorRecord = new ErrorRecord(
+                    ErrorRecord errorRecord = new(
                         new InvalidDataException(),
                         "FormatCannotSpecifyAutosizeAndColumns",
                         ErrorCategory.InvalidArgument,
@@ -134,7 +134,7 @@ internal override FormattingCommandLineParameters GetCommandLineParameters()
             if (_autosize.HasValue)
                 parameters.autosize = _autosize.Value;
 
-            WideSpecificParameters wideSpecific = new WideSpecificParameters();
+            WideSpecificParameters wideSpecific = new();
             parameters.shapeParameters = wideSpecific;
             if (_column.HasValue)
             {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-file/Out-File.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-file/Out-File.cs
index 9885cbcaa47..2fbdb73dc9c 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-file/Out-File.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-file/Out-File.cs
@@ -1,10 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
 using System.IO;
 using System.Management.Automation;
-using System.Management.Automation.Host;
 using System.Management.Automation.Internal;
 using System.Text;
 
@@ -27,7 +25,8 @@ internal static FileMode Convert(OpenMode openMode)
     public class OutFileCommand : FrontEndCommandBase
     {
         /// <summary>
-        /// Set inner command.
+        /// Initializes a new instance of the <see cref="OutFileCommand"/> class
+        /// and sets the inner command.
         /// </summary>
         public OutFileCommand()
         {
@@ -229,7 +228,7 @@ private LineOutput InstantiateLineOutputInterface()
             }
 
             // use the stream writer to create and initialize the Line Output writer
-            TextWriterLineOutput twlo = new TextWriterLineOutput(_sw, computedWidth, _suppressNewline);
+            TextWriterLineOutput twlo = new(_sw, computedWidth, _suppressNewline);
 
             // finally have the ILineOutput interface extracted
             return (LineOutput)twlo;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-printer/Out-Printer.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-printer/Out-Printer.cs
index 33416cdea0a..58342172906 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-printer/Out-Printer.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-printer/Out-Printer.cs
@@ -14,7 +14,8 @@ namespace Microsoft.PowerShell.Commands
     public class OutPrinterCommand : FrontEndCommandBase
     {
         /// <summary>
-        /// Set inner command.
+        /// Initializes a new instance of the <see cref="OutPrinterCommand"/> class
+        /// and sets the inner command.
         /// </summary>
         public OutPrinterCommand()
         {
@@ -55,7 +56,7 @@ protected override void BeginProcessing()
         /// </summary>
         private LineOutput InstantiateLineOutputInterface()
         {
-            PrinterLineOutput printOutput = new PrinterLineOutput(_printerName);
+            PrinterLineOutput printOutput = new(_printerName);
             return (LineOutput)printOutput;
         }
     }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-printer/PrinterLineOutput.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-printer/PrinterLineOutput.cs
index 4eecbb5d859..cbd19a17f4f 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-printer/PrinterLineOutput.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-printer/PrinterLineOutput.cs
@@ -70,6 +70,7 @@ internal override void WriteLine(string s)
         #endregion
 
         /// <summary>
+        /// Initializes static members of the <see cref="PrinterLineOutput"/> class.
         /// Used for static initializations like DefaultPrintFontName.
         /// </summary>
         static PrinterLineOutput()
@@ -81,7 +82,7 @@ static PrinterLineOutput()
         }
 
         /// <summary>
-        /// Constructor for the class.
+        /// Initializes a new instance of the <see cref="PrinterLineOutput"/> class.
         /// </summary>
         /// <param name="printerName">Name of printer, if null use default printer.</param>
         internal PrinterLineOutput(string printerName)
@@ -89,8 +90,8 @@ internal PrinterLineOutput(string printerName)
             _printerName = printerName;
 
             // instantiate the helper to do the line processing when LineOutput.WriteXXX() is called
-            WriteLineHelper.WriteCallback wl = new WriteLineHelper.WriteCallback(this.OnWriteLine);
-            WriteLineHelper.WriteCallback w = new WriteLineHelper.WriteCallback(this.OnWrite);
+            WriteLineHelper.WriteCallback wl = new(this.OnWriteLine);
+            WriteLineHelper.WriteCallback w = new(this.OnWrite);
 
             _writeLineHelper = new WriteLineHelper(true, wl, w, this.DisplayCells);
         }
@@ -123,7 +124,7 @@ private void DoPrint()
             try
             {
                 // create a new print document object and set the printer name, if available
-                PrintDocument pd = new PrintDocument();
+                PrintDocument pd = new();
 
                 if (!string.IsNullOrEmpty(_printerName))
                 {
@@ -187,9 +188,9 @@ private void VerifyFont(Graphics g)
             // we compute the length of two strings, one made of "large" characters
             // one made of "narrow" ones. If they are the same length, we assume that
             // the font is fixed pitch.
-            string large = "ABCDEF";
+            const string large = "ABCDEF";
             float wLarge = g.MeasureString(large, _printFont).Width / large.Length;
-            string narrow = ".;'}l|";
+            const string narrow = ".;'}l|";
             float wNarrow = g.MeasureString(narrow, _printFont).Width / narrow.Length;
 
             if (Math.Abs((float)(wLarge - wNarrow)) < 0.001F)
@@ -229,7 +230,7 @@ private void pd_PrintPage(object sender, PrintPageEventArgs ev)
                 // on the first page we have to initialize the metrics for LineOutput
 
                 // work out the number of columns per page assuming fixed pitch font
-                string s = "ABCDEF";
+                const string s = "ABCDEF";
                 float w = ev.Graphics.MeasureString(s, _printFont).Width / s.Length;
                 float columnsPerPage = ev.MarginBounds.Width / w;
 
@@ -315,7 +316,7 @@ private void pd_PrintPage(object sender, PrintPageEventArgs ev)
         /// <summary>
         /// Text lines ready to print (after output cache playback).
         /// </summary>
-        private readonly Queue<string> _lines = new Queue<string>();
+        private readonly Queue<string> _lines = new();
 
         /// <summary>
         /// Cached font object.
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-string/Out-String.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-string/Out-String.cs
index e76d90af8b5..512bf1048e0 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-string/Out-String.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-string/Out-String.cs
@@ -1,9 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
 using System.Management.Automation;
-using System.Management.Automation.Host;
 using System.Text;
 
 using Microsoft.PowerShell.Commands.Internal.Format;
@@ -63,7 +61,8 @@ public SwitchParameter NoNewline
         #endregion
 
         /// <summary>
-        /// Set inner command.
+        /// Initializes a new instance of the <see cref="OutStringCommand"/> class
+        /// and sets the inner command.
         /// </summary>
         public OutStringCommand()
         {
@@ -91,7 +90,7 @@ protected override void BeginProcessing()
         private LineOutput InstantiateLineOutputInterface()
         {
             // set up the streaming text writer
-            StreamingTextWriter.WriteLineCallback callback = new StreamingTextWriter.WriteLineCallback(this.OnWriteLine);
+            StreamingTextWriter.WriteLineCallback callback = new(this.OnWriteLine);
 
             _writer = new StreamingTextWriter(callback, Host.CurrentCulture);
 
@@ -105,7 +104,7 @@ private LineOutput InstantiateLineOutputInterface()
             }
 
             // use it to create and initialize the Line Output writer
-            TextWriterLineOutput twlo = new TextWriterLineOutput(_writer, computedWidth);
+            TextWriterLineOutput twlo = new(_writer, computedWidth);
 
             // finally have the LineOutput interface extracted
             return (LineOutput)twlo;
@@ -166,6 +165,6 @@ protected override void EndProcessing()
         /// <summary>
         /// Buffer used when buffering until the end.
         /// </summary>
-        private readonly StringBuilder _buffer = new StringBuilder();
+        private readonly StringBuilder _buffer = new();
     }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Get-Error.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Get-Error.cs
index 7c2fdbe0c14..053f99f897d 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Get-Error.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Get-Error.cs
@@ -72,7 +72,7 @@ protected override void ProcessRecord()
             }
 
             index = 0;
-            bool addErrorIdentifier = errorRecords.Count > 1 ? true : false;
+            bool addErrorIdentifier = errorRecords.Count > 1;
 
             foreach (object errorRecord in errorRecords)
             {
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 133c03646f8..469e18926d8 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 @@ public enum BreakpointType
 
         /// <summary>Breakpoint on a command</summary>
         Command
-    };
+    }
 
     /// <summary>
     /// This class implements Get-PSBreakpoint.
@@ -222,9 +222,9 @@ protected override void ProcessRecord()
         /// Returns the items in the input list that match an item in the filter array according to
         /// the given selection criterion.
         /// </summary>
-        private List<Breakpoint> Filter<T>(List<Breakpoint> input, T[] filter, FilterSelector<T> selector)
+        private static List<Breakpoint> Filter<T>(List<Breakpoint> input, T[] filter, FilterSelector<T> selector)
         {
-            List<Breakpoint> output = new List<Breakpoint>();
+            List<Breakpoint> output = new();
 
             for (int i = 0; i < input.Count; i++)
             {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetAliasCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetAliasCommand.cs
index e44179440c1..fee8b3ab27c 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetAliasCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetAliasCommand.cs
@@ -118,7 +118,7 @@ private void WriteMatches(string value, string parametersetname)
                           _excludes,
                           WildcardOptions.IgnoreCase);
 
-            List<AliasInfo> results = new List<AliasInfo>();
+            List<AliasInfo> results = new();
             foreach (KeyValuePair<string, AliasInfo> tableEntry in aliasTable)
             {
                 if (parametersetname.Equals("Definition", StringComparison.OrdinalIgnoreCase))
@@ -192,8 +192,8 @@ private void WriteMatches(string value, string parametersetname)
                 // Need to write an error if the user tries to get an alias
                 // tat doesn't exist and they are not globbing.
 
-                ItemNotFoundException itemNotFound = new ItemNotFoundException(StringUtil.Format(AliasCommandStrings.NoAliasFound, displayString, value));
-                ErrorRecord er = new ErrorRecord(itemNotFound, "ItemNotFoundException", ErrorCategory.ObjectNotFound, value);
+                ItemNotFoundException itemNotFound = new(StringUtil.Format(AliasCommandStrings.NoAliasFound, displayString, value));
+                ErrorRecord er = new(itemNotFound, "ItemNotFoundException", ErrorCategory.ObjectNotFound, value);
                 WriteError(er);
             }
         }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetDateCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetDateCommand.cs
index 0e78e182f57..241c49a989f 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetDateCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetDateCommand.cs
@@ -368,15 +368,15 @@ protected override void ProcessRecord()
             else
             {
                 // output DateTime object wrapped in an PSObject with DisplayHint attached
-                PSObject outputObj = new PSObject(dateToUse);
-                PSNoteProperty note = new PSNoteProperty("DisplayHint", DisplayHint);
+                PSObject outputObj = new(dateToUse);
+                PSNoteProperty note = new("DisplayHint", DisplayHint);
                 outputObj.Properties.Add(note);
 
                 WriteObject(outputObj);
             }
         }
 
-        private static readonly DateTime s_epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+        private static readonly DateTime s_epoch = new(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
 
         /// <summary>
         /// This is more an implementation of the UNIX strftime.
@@ -384,7 +384,7 @@ protected override void ProcessRecord()
         private string UFormatDateString(DateTime dateTime)
         {
             int offset = 0;
-            StringBuilder sb = new StringBuilder();
+            StringBuilder sb = new();
 
             // folks may include the "+" as part of the format string
             if (UFormat[0] == '+')
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetEventCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetEventCommand.cs
index faf16d384f7..42360983c4e 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetEventCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetEventCommand.cs
@@ -124,7 +124,7 @@ protected override void EndProcessing()
                         error = EventingStrings.EventIdentifierNotFound;
                     }
 
-                    ErrorRecord errorRecord = new ErrorRecord(
+                    ErrorRecord errorRecord = new(
                         new ArgumentException(string.Format(System.Globalization.CultureInfo.CurrentCulture, error, identifier)),
                         "INVALID_SOURCE_IDENTIFIER",
                         ErrorCategory.InvalidArgument,
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetEventSubscriberCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetEventSubscriberCommand.cs
index cde73b2914d..b3bd99b7bdf 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetEventSubscriberCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetEventSubscriberCommand.cs
@@ -67,7 +67,7 @@ protected override void ProcessRecord()
 
             // Go through all the received events and write them to the output
             // pipeline
-            List<PSEventSubscriber> subscribers = new List<PSEventSubscriber>(Events.Subscribers);
+            List<PSEventSubscriber> subscribers = new(Events.Subscribers);
             foreach (PSEventSubscriber subscriber in subscribers)
             {
                 // If they specified a event identifier and we don't match, continue
@@ -118,7 +118,7 @@ protected override void ProcessRecord()
                         error = EventingStrings.EventSubscriptionNotFound;
                     }
 
-                    ErrorRecord errorRecord = new ErrorRecord(
+                    ErrorRecord errorRecord = new(
                         new ArgumentException(string.Format(System.Globalization.CultureInfo.CurrentCulture, error, identifier)),
                         "INVALID_SOURCE_IDENTIFIER",
                         ErrorCategory.InvalidArgument,
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetHash.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetHash.cs
index 65e55a86ab1..40ea1d187d5 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetHash.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetHash.cs
@@ -83,7 +83,7 @@ protected override void BeginProcessing()
         /// </summary>
         protected override void ProcessRecord()
         {
-            List<string> pathsToProcess = new List<string>();
+            List<string> pathsToProcess = new();
             ProviderInfo provider = null;
 
             switch (ParameterSetName)
@@ -104,7 +104,7 @@ protected override void ProcessRecord()
                         {
                             if (!WildcardPattern.ContainsWildcardCharacters(path))
                             {
-                                ErrorRecord errorRecord = new ErrorRecord(e,
+                                ErrorRecord errorRecord = new(e,
                                     "FileNotFound",
                                     ErrorCategory.ObjectNotFound,
                                     path);
@@ -211,7 +211,7 @@ private bool ComputeFileHash(string path, out string hash)
         /// </summary>
         private void WriteHashResult(string Algorithm, string hash, string path)
         {
-            FileHashInfo result = new FileHashInfo();
+            FileHashInfo result = new();
             result.Algorithm = Algorithm;
             result.Hash = hash;
             result.Path = path;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetHostCmdlet.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetHostCmdlet.cs
index 444e085591f..fec8bafe34a 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetHostCmdlet.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetHostCmdlet.cs
@@ -3,8 +3,6 @@
 
 using System.Management.Automation;
 
-using Dbg = System.Management.Automation.Diagnostics;
-
 namespace Microsoft.PowerShell.Commands
 {
     /// <summary>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetMember.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetMember.cs
index 2789aaafe61..2fd9a499012 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetMember.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetMember.cs
@@ -6,7 +6,6 @@
 using System.Collections.Specialized;
 using System.Management.Automation;
 using System.Management.Automation.Internal;
-using System.Reflection;
 
 namespace Microsoft.PowerShell.Commands
 {
@@ -23,7 +22,7 @@ public override string ToString()
             return Definition;
         }
         /// <summary>
-        /// Initializes a new instance of this class.
+        /// Initializes a new instance of the <see cref="MemberDefinition"/> class.
         /// </summary>
         public MemberDefinition(string typeName, string name, PSMemberTypes memberType, string definition)
         {
@@ -132,7 +131,7 @@ public SwitchParameter Force
 
         private MshMemberMatchOptions _matchOptions = MshMemberMatchOptions.None;
 
-        private readonly HybridDictionary _typesAlreadyDisplayed = new HybridDictionary();
+        private readonly HybridDictionary _typesAlreadyDisplayed = new();
 
         /// <summary>
         /// This method implements the ProcessRecord method for get-member command.
@@ -272,7 +271,7 @@ protected override void EndProcessing()
         {
             if (_typesAlreadyDisplayed.Count == 0)
             {
-                ErrorRecord errorRecord = new ErrorRecord(
+                ErrorRecord errorRecord = new(
                     new InvalidOperationException(GetMember.NoObjectSpecified),
                     "NoObjectInGetMember",
                     ErrorCategory.CloseError,
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetRandomCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetRandomCommand.cs
index 8830a6793eb..7d02713d801 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetRandomCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetRandomCommand.cs
@@ -95,7 +95,7 @@ private void ThrowMinGreaterThanOrEqualMax(object minValue, object maxValue)
                 throw PSTraceSource.NewArgumentNullException("max");
             }
 
-            ErrorRecord errorRecord = new ErrorRecord(
+            ErrorRecord errorRecord = new(
                 new ArgumentException(string.Format(
                     CultureInfo.InvariantCulture, GetRandomCommandStrings.MinGreaterThanOrEqualMax, minValue, maxValue)),
                 "MinGreaterThanOrEqualMax",
@@ -109,10 +109,10 @@ private void ThrowMinGreaterThanOrEqualMax(object minValue, object maxValue)
 
         #region Random generator state
 
-        private static readonly ReaderWriterLockSlim s_runspaceGeneratorMapLock = new ReaderWriterLockSlim();
+        private static readonly ReaderWriterLockSlim s_runspaceGeneratorMapLock = new();
 
         // 1-to-1 mapping of runspaces and random number generators
-        private static readonly Dictionary<Guid, PolymorphicRandomNumberGenerator> s_runspaceGeneratorMap = new Dictionary<Guid, PolymorphicRandomNumberGenerator>();
+        private static readonly Dictionary<Guid, PolymorphicRandomNumberGenerator> s_runspaceGeneratorMap = new();
 
         private static void CurrentRunspace_StateChanged(object sender, RunspaceStateEventArgs e)
         {
@@ -217,7 +217,7 @@ private PolymorphicRandomNumberGenerator Generator
         [Parameter(ParameterSetName = RandomNumberParameterSet)]
         public object Minimum { get; set; }
 
-        private bool IsInt(object o)
+        private static bool IsInt(object o)
         {
             if (o == null || o is int)
             {
@@ -227,7 +227,7 @@ private bool IsInt(object o)
             return false;
         }
 
-        private bool IsInt64(object o)
+        private static bool IsInt64(object o)
         {
             if (o == null || o is Int64)
             {
@@ -237,7 +237,7 @@ private bool IsInt64(object o)
             return false;
         }
 
-        private object ProcessOperand(object o)
+        private static object ProcessOperand(object o)
         {
             if (o == null)
             {
@@ -257,7 +257,7 @@ private object ProcessOperand(object o)
             return baseObject;
         }
 
-        private double ConvertToDouble(object o, double defaultIfNull)
+        private static double ConvertToDouble(object o, double defaultIfNull)
         {
             if (o == null)
             {
@@ -583,7 +583,7 @@ protected override void EndProcessing()
     internal class PolymorphicRandomNumberGenerator
     {
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="PolymorphicRandomNumberGenerator"/> class.
         /// </summary>
         public PolymorphicRandomNumberGenerator()
         {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetRunspaceCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetRunspaceCommand.cs
index 0aedd4c9d06..10c050a4562 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetRunspaceCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetRunspaceCommand.cs
@@ -126,7 +126,7 @@ internal static IReadOnlyList<Runspace> GetAllRunspaces()
 
         internal static IReadOnlyList<Runspace> GetRunspacesByName(string[] names)
         {
-            List<Runspace> rtnRunspaces = new List<Runspace>();
+            List<Runspace> rtnRunspaces = new();
             IReadOnlyList<Runspace> runspaces = Runspace.RunspaceList;
 
             foreach (string name in names)
@@ -146,7 +146,7 @@ internal static IReadOnlyList<Runspace> GetRunspacesByName(string[] names)
 
         internal static IReadOnlyList<Runspace> GetRunspacesById(int[] ids)
         {
-            List<Runspace> rtnRunspaces = new List<Runspace>();
+            List<Runspace> rtnRunspaces = new();
 
             foreach (int id in ids)
             {
@@ -167,7 +167,7 @@ internal static IReadOnlyList<Runspace> GetRunspacesById(int[] ids)
 
         internal static IReadOnlyList<Runspace> GetRunspacesByInstanceId(Guid[] instanceIds)
         {
-            List<Runspace> rtnRunspaces = new List<Runspace>();
+            List<Runspace> rtnRunspaces = new();
             IReadOnlyList<Runspace> runspaces = Runspace.RunspaceList;
 
             foreach (Guid instanceId in instanceIds)
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetVerbCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetVerbCommand.cs
index 766b38116c0..1ec93b0f1d7 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetVerbCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetVerbCommand.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Management.Automation;
 using System.Reflection;
@@ -71,7 +70,7 @@ protected override void ProcessRecord()
                             }
                         }
 
-                        VerbInfo verb = new VerbInfo();
+                        VerbInfo verb = new();
                         verb.Verb = field.Name;
                         verb.AliasPrefix = VerbAliasPrefixes.GetVerbAliasPrefix(field.Name);
                         verb.Group = groupName;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Group-Object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Group-Object.cs
index 131c27e417e..d63ff694281 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Group-Object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Group-Object.cs
@@ -5,7 +5,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
@@ -141,7 +140,7 @@ internal virtual void Add(PSObject groupValue)
 
         private static string BuildName(List<ObjectCommandPropertyValue> propValues)
         {
-            StringBuilder sb = new StringBuilder();
+            StringBuilder sb = new();
             foreach (ObjectCommandPropertyValue propValue in propValues)
             {
                 var propValuePropertyValue = propValue?.PropertyValue;
@@ -177,7 +176,7 @@ public ArrayList Values
         {
             get
             {
-                ArrayList values = new ArrayList();
+                ArrayList values = new();
                 foreach (ObjectCommandPropertyValue propValue in GroupValue.orderValues)
                 {
                     values.Add(propValue.PropertyValue);
@@ -249,10 +248,10 @@ public class GroupObjectCommand : ObjectBase
         [Parameter(ParameterSetName = "HashTable")]
         public SwitchParameter AsString { get; set; }
 
-        private readonly List<GroupInfo> _groups = new List<GroupInfo>();
-        private readonly OrderByProperty _orderByProperty = new OrderByProperty();
-        private readonly Dictionary<object, GroupInfo> _tupleToGroupInfoMappingDictionary = new Dictionary<object, GroupInfo>();
-        private readonly List<OrderByPropertyEntry> _entriesToOrder = new List<OrderByPropertyEntry>();
+        private readonly List<GroupInfo> _groups = new();
+        private readonly OrderByProperty _orderByProperty = new();
+        private readonly Dictionary<object, GroupInfo> _tupleToGroupInfoMappingDictionary = new();
+        private readonly List<OrderByPropertyEntry> _entriesToOrder = new();
         private OrderByPropertyComparer _orderByPropertyComparer;
         private bool _hasProcessedFirstInputObject;
         private bool _hasDifferentValueTypes;
@@ -376,7 +375,7 @@ private static void DoOrderedGrouping(
 
         private void WriteNonTerminatingError(Exception exception, string resourceIdAndErrorId, ErrorCategory category)
         {
-            Exception ex = new Exception(StringUtil.Format(resourceIdAndErrorId), exception);
+            Exception ex = new(StringUtil.Format(resourceIdAndErrorId), exception);
             WriteError(new ErrorRecord(ex, resourceIdAndErrorId, category, null));
         }
 
@@ -402,15 +401,15 @@ protected override void ProcessRecord()
 
                     if (AsString && !AsHashTable)
                     {
-                        ArgumentException ex = new ArgumentException(UtilityCommonStrings.GroupObjectWithHashTable);
-                        ErrorRecord er = new ErrorRecord(ex, "ArgumentException", ErrorCategory.InvalidArgument, AsString);
+                        ArgumentException ex = new(UtilityCommonStrings.GroupObjectWithHashTable);
+                        ErrorRecord er = new(ex, "ArgumentException", ErrorCategory.InvalidArgument, AsString);
                         ThrowTerminatingError(er);
                     }
 
                     if (AsHashTable && !AsString && (Property != null && (Property.Length > 1 || _orderByProperty.MshParameterList.Count > 1)))
                     {
-                        ArgumentException ex = new ArgumentException(UtilityCommonStrings.GroupObjectSingleProperty);
-                        ErrorRecord er = new ErrorRecord(ex, "ArgumentException", ErrorCategory.InvalidArgument, Property);
+                        ArgumentException ex = new(UtilityCommonStrings.GroupObjectSingleProperty);
+                        ErrorRecord er = new(ex, "ArgumentException", ErrorCategory.InvalidArgument, Property);
                         ThrowTerminatingError(er);
                     }
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs
index 4aa59024439..d5d283062b9 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs
@@ -127,7 +127,7 @@ protected override void BeginProcessing()
             if (IsModuleSpecified && IsFullyQualifiedModuleSpecified)
             {
                 string errMsg = StringUtil.Format(SessionStateStrings.GetContent_TailAndHeadCannotCoexist, nameof(Module), nameof(FullyQualifiedModule));
-                ErrorRecord error = new ErrorRecord(new InvalidOperationException(errMsg), "ModuleAndFullyQualifiedModuleCannotBeSpecifiedTogether", ErrorCategory.InvalidOperation, null);
+                ErrorRecord error = new(new InvalidOperationException(errMsg), "ModuleAndFullyQualifiedModuleCannotBeSpecifiedTogether", ErrorCategory.InvalidOperation, null);
                 ThrowTerminatingError(error);
             }
 
@@ -289,7 +289,7 @@ protected override void BeginProcessing()
             if (IsModuleSpecified && IsFullyQualifiedModuleSpecified)
             {
                 string errMsg = StringUtil.Format(SessionStateStrings.GetContent_TailAndHeadCannotCoexist, nameof(Module), nameof(FullyQualifiedModule));
-                ErrorRecord error = new ErrorRecord(new InvalidOperationException(errMsg), "ModuleAndFullyQualifiedModuleCannotBeSpecifiedTogether", ErrorCategory.InvalidOperation, null);
+                ErrorRecord error = new(new InvalidOperationException(errMsg), "ModuleAndFullyQualifiedModuleCannotBeSpecifiedTogether", ErrorCategory.InvalidOperation, null);
                 ThrowTerminatingError(error);
             }
 
@@ -559,11 +559,11 @@ internal ErrorDetails GetErrorDetails(string errorId, params object[] args)
 
         private ErrorRecord GetErrorNoCommandsImportedBecauseOfSkipping()
         {
-            string errorId = "ErrorNoCommandsImportedBecauseOfSkipping";
+            const string errorId = "ErrorNoCommandsImportedBecauseOfSkipping";
 
             ErrorDetails details = this.GetErrorDetails(errorId);
 
-            ErrorRecord errorRecord = new ErrorRecord(
+            ErrorRecord errorRecord = new(
                 new ArgumentException(details.Message),
                 errorId,
                 ErrorCategory.InvalidResult,
@@ -580,11 +580,11 @@ private ErrorRecord GetErrorMalformedDataFromRemoteCommand(string commandName)
                 throw PSTraceSource.NewArgumentNullException(nameof(commandName));
             }
 
-            string errorId = "ErrorMalformedDataFromRemoteCommand";
+            const string errorId = "ErrorMalformedDataFromRemoteCommand";
 
             ErrorDetails details = this.GetErrorDetails(errorId, commandName);
 
-            ErrorRecord errorRecord = new ErrorRecord(
+            ErrorRecord errorRecord = new(
                 new ArgumentException(details.Message),
                 errorId,
                 ErrorCategory.InvalidResult,
@@ -601,11 +601,11 @@ private ErrorRecord GetErrorCommandSkippedBecauseOfShadowing(string commandNames
                 throw PSTraceSource.NewArgumentNullException(nameof(commandNames));
             }
 
-            string errorId = "ErrorCommandSkippedBecauseOfShadowing";
+            const string errorId = "ErrorCommandSkippedBecauseOfShadowing";
 
             ErrorDetails details = this.GetErrorDetails(errorId, commandNames);
 
-            ErrorRecord errorRecord = new ErrorRecord(
+            ErrorRecord errorRecord = new(
                 new InvalidOperationException(details.Message),
                 errorId,
                 ErrorCategory.InvalidData,
@@ -622,11 +622,11 @@ private ErrorRecord GetErrorSkippedNonRequestedCommand(string commandName)
                 throw PSTraceSource.NewArgumentNullException(nameof(commandName));
             }
 
-            string errorId = "ErrorSkippedNonRequestedCommand";
+            const string errorId = "ErrorSkippedNonRequestedCommand";
 
             ErrorDetails details = this.GetErrorDetails(errorId, commandName);
 
-            ErrorRecord errorRecord = new ErrorRecord(
+            ErrorRecord errorRecord = new(
                 new InvalidOperationException(details.Message),
                 errorId,
                 ErrorCategory.ResourceExists,
@@ -643,11 +643,11 @@ private ErrorRecord GetErrorSkippedNonRequestedTypeDefinition(string typeName)
                 throw PSTraceSource.NewArgumentNullException(nameof(typeName));
             }
 
-            string errorId = "ErrorSkippedNonRequestedTypeDefinition";
+            const string errorId = "ErrorSkippedNonRequestedTypeDefinition";
 
             ErrorDetails details = this.GetErrorDetails(errorId, typeName);
 
-            ErrorRecord errorRecord = new ErrorRecord(
+            ErrorRecord errorRecord = new(
                 new InvalidOperationException(details.Message),
                 errorId,
                 ErrorCategory.ResourceExists,
@@ -664,11 +664,11 @@ private ErrorRecord GetErrorSkippedUnsafeCommandName(string commandName)
                 throw PSTraceSource.NewArgumentNullException(nameof(commandName));
             }
 
-            string errorId = "ErrorSkippedUnsafeCommandName";
+            const string errorId = "ErrorSkippedUnsafeCommandName";
 
             ErrorDetails details = this.GetErrorDetails(errorId, commandName);
 
-            ErrorRecord errorRecord = new ErrorRecord(
+            ErrorRecord errorRecord = new(
                 new InvalidOperationException(details.Message),
                 errorId,
                 ErrorCategory.InvalidData,
@@ -700,7 +700,7 @@ private ErrorRecord GetErrorSkippedUnsafeNameInMetadata(string commandName, stri
 
             ErrorDetails details = this.GetErrorDetails(errorId, commandName, name);
 
-            ErrorRecord errorRecord = new ErrorRecord(
+            ErrorRecord errorRecord = new(
                 new InvalidOperationException(details.Message),
                 errorId,
                 ErrorCategory.InvalidData,
@@ -771,11 +771,11 @@ private ErrorRecord GetErrorCouldntResolvedAlias(string aliasName)
                 throw PSTraceSource.NewArgumentNullException(nameof(aliasName));
             }
 
-            string errorId = "ErrorCouldntResolveAlias";
+            const string errorId = "ErrorCouldntResolveAlias";
 
             ErrorDetails details = this.GetErrorDetails(errorId, aliasName);
 
-            ErrorRecord errorRecord = new ErrorRecord(
+            ErrorRecord errorRecord = new(
                 new ArgumentException(details.Message),
                 errorId,
                 ErrorCategory.OperationTimeout,
@@ -792,11 +792,11 @@ private ErrorRecord GetErrorNoResultsFromRemoteEnd(string commandName)
                 throw PSTraceSource.NewArgumentNullException(nameof(commandName));
             }
 
-            string errorId = "ErrorNoResultsFromRemoteEnd";
+            const string errorId = "ErrorNoResultsFromRemoteEnd";
 
             ErrorDetails details = this.GetErrorDetails(errorId, commandName);
 
-            ErrorRecord errorRecord = new ErrorRecord(
+            ErrorRecord errorRecord = new(
                 new ArgumentException(details.Message),
                 errorId,
                 ErrorCategory.InvalidResult,
@@ -806,7 +806,7 @@ private ErrorRecord GetErrorNoResultsFromRemoteEnd(string commandName)
             return errorRecord;
         }
 
-        private readonly List<string> _commandsSkippedBecauseOfShadowing = new List<string>();
+        private readonly List<string> _commandsSkippedBecauseOfShadowing = new();
 
         private void ReportSkippedCommands()
         {
@@ -847,7 +847,7 @@ private Dictionary<string, object> ExistingCommands
                 if (_existingCommands == null)
                 {
                     _existingCommands = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
-                    CommandSearcher searcher = new CommandSearcher(
+                    CommandSearcher searcher = new(
                         "*",
                         SearchResolutionOptions.CommandNameIsPattern | SearchResolutionOptions.ResolveAliasPatterns | SearchResolutionOptions.ResolveFunctionPatterns,
                         CommandTypes.All,
@@ -866,7 +866,7 @@ private bool IsShadowingExistingCommands(string commandName)
         {
             commandName = ModuleCmdletBase.AddPrefixToCommandName(commandName, this.Prefix);
 
-            CommandSearcher searcher = new CommandSearcher(commandName, SearchResolutionOptions.None, CommandTypes.All, this.Context);
+            CommandSearcher searcher = new(commandName, SearchResolutionOptions.None, CommandTypes.All, this.Context);
             foreach (string expandedCommandName in searcher.ConstructSearchPatternsFromName(commandName))
             {
                 if (this.ExistingCommands.ContainsKey(expandedCommandName))
@@ -1076,7 +1076,7 @@ private Dictionary<K, V> RehydrateDictionary<K, V>(string commandName, PSObject
                 valueRehydrator = (PSObject pso) => ConvertTo<V>(commandName, pso);
             }
 
-            Dictionary<K, V> result = new Dictionary<K, V>();
+            Dictionary<K, V> result = new();
             PSPropertyInfo deserializedDictionaryProperty = deserializedObject.Properties[propertyName];
             if (deserializedDictionaryProperty != null)
             {
@@ -1107,7 +1107,7 @@ private Dictionary<K, V> RehydrateDictionary<K, V>(string commandName, PSObject
         /// (i.e. it can't be used for code injection attacks).
         /// </summary>
         /// <param name="name">Name to validate.</param>
-        /// <returns><c>true</c> if the name is safe; <c>false</c> otherwise.</returns>
+        /// <returns><see langword="true"/> if the name is safe; <see langword="false"/> otherwise.</returns>
         private static bool IsSafeNameOrIdentifier(string name)
         {
             // '.' is needed for stuff like net.exe
@@ -1125,7 +1125,7 @@ private static bool IsSafeNameOrIdentifier(string name)
         /// (i.e. it can't be used for code injection attacks).
         /// </summary>
         /// <param name="parameterName">Parameter name to validate.</param>
-        /// <returns><c>true</c> if the name is safe; <c>false</c> otherwise.</returns>
+        /// <returns><see langword="true"/> if the name is safe; <see langword="false"/> otherwise.</returns>
         private static bool IsSafeParameterName(string parameterName)
         {
             return IsSafeNameOrIdentifier(parameterName) && !parameterName.Contains(":");
@@ -1136,7 +1136,7 @@ private static bool IsSafeParameterName(string parameterName)
         /// (i.e. it doesn't introduce any side effects on the client).
         /// </summary>
         /// <param name="type">Type to validate.</param>
-        /// <returns><c>true</c> if the type is safe; <c>false</c> otherwise.</returns>
+        /// <returns><see langword="true"/> if the type is safe; <see langword="false"/> otherwise.</returns>
         private static bool IsSafeTypeConstraint(Type type)
         {
             if (type == null)
@@ -1179,7 +1179,7 @@ private static bool IsSafeTypeConstraint(Type type)
         /// Writes error messages if necessary.  Modifies command metadata to make it safe if necessary.
         /// </summary>
         /// <param name="commandMetadata">Command metadata to verify.</param>
-        /// <returns><c>true</c> if the command metadata is safe; <c>false</c> otherwise.</returns>
+        /// <returns><see langword="true"/> if the command metadata is safe; <see langword="false"/> otherwise.</returns>
         private bool IsSafeCommandMetadata(CommandMetadata commandMetadata)
         {
             if (!IsCommandNameMatchingParameters(commandMetadata.Name))
@@ -1294,8 +1294,8 @@ private ParameterMetadata RehydrateParameterMetadata(PSObject deserializedParame
             Type parameterType = RehydrateParameterType(deserializedParameterMetadata);
             List<string> aliases = RehydrateList<string>("Get-Command", deserializedParameterMetadata, "Aliases", null);
 
-            ParameterSetMetadata parameterSetMetadata = new ParameterSetMetadata(int.MinValue, 0, null);
-            Dictionary<string, ParameterSetMetadata> parameterSets = new Dictionary<string, ParameterSetMetadata>(StringComparer.OrdinalIgnoreCase);
+            ParameterSetMetadata parameterSetMetadata = new(int.MinValue, 0, null);
+            Dictionary<string, ParameterSetMetadata> parameterSets = new(StringComparer.OrdinalIgnoreCase);
             parameterSets.Add(ParameterAttribute.AllParameterSets, parameterSetMetadata);
 
             return new ParameterMetadata(
@@ -1306,7 +1306,7 @@ private ParameterMetadata RehydrateParameterMetadata(PSObject deserializedParame
                 parameterType);
         }
 
-        private bool IsProxyForCmdlet(Dictionary<string, ParameterMetadata> parameters)
+        private static bool IsProxyForCmdlet(Dictionary<string, ParameterMetadata> parameters)
         {
             // we are not sending CmdletBinding/DefaultParameterSet over the wire anymore
             // we need to infer IsProxyForCmdlet from presence of all common parameters
@@ -1349,13 +1349,13 @@ private CommandMetadata RehydrateCommandMetadata(PSObject deserializedCommandInf
 
             // add client-side AsJob parameter
             parameters.Remove("AsJob");
-            ParameterMetadata asJobParameter = new ParameterMetadata("AsJob", typeof(SwitchParameter));
+            ParameterMetadata asJobParameter = new("AsJob", typeof(SwitchParameter));
             parameters.Add(asJobParameter.Name, asJobParameter);
 
             return new CommandMetadata(
                                    name: name,
                             commandType: commandType,
-                       isProxyForCmdlet: this.IsProxyForCmdlet(parameters),
+                       isProxyForCmdlet: IsProxyForCmdlet(parameters),
                 defaultParameterSetName: ParameterAttribute.AllParameterSets,
                   supportsShouldProcess: false,
                           confirmImpact: ConfirmImpact.None,
@@ -1365,7 +1365,7 @@ private CommandMetadata RehydrateCommandMetadata(PSObject deserializedCommandInf
                              parameters: parameters);
         }
 
-        private int GetCommandTypePriority(CommandTypes commandType)
+        private static int GetCommandTypePriority(CommandTypes commandType)
         {
             switch (commandType)
             {
@@ -1434,8 +1434,8 @@ private void AddRemoteCommandMetadata(
             CommandMetadata previousCommandWithSameName;
             if (name2commandMetadata.TryGetValue(commandMetadata.Name, out previousCommandWithSameName))
             {
-                int previousCommandPriority = this.GetCommandTypePriority(previousCommandWithSameName.WrappedCommandType);
-                int currentCommandPriority = this.GetCommandTypePriority(commandMetadata.WrappedCommandType);
+                int previousCommandPriority = GetCommandTypePriority(previousCommandWithSameName.WrappedCommandType);
+                int currentCommandPriority = GetCommandTypePriority(commandMetadata.WrappedCommandType);
                 if (previousCommandPriority < currentCommandPriority)
                 {
                     return;
@@ -1622,12 +1622,12 @@ internal List<ExtendedTypeDefinition> GetRemoteFormatData()
                     {
                         DateTime startTime = DateTime.UtcNow;
 
-                        PSDataCollection<PSObject> asyncOutput = new PSDataCollection<PSObject>();
+                        PSDataCollection<PSObject> asyncOutput = new();
 
                         // process output and errors as soon as possible
                         asyncResult = powerShell.BeginInvoke<PSObject, PSObject>(null, asyncOutput);
                         int numberOfReceivedObjects = 0;
-                        List<ExtendedTypeDefinition> result = new List<ExtendedTypeDefinition>();
+                        List<ExtendedTypeDefinition> result = new();
                         foreach (PSObject deserializedFormatData in asyncOutput)
                         {
                             AddRemoteTypeDefinition(result, deserializedFormatData);
@@ -1733,14 +1733,14 @@ internal List<CommandMetadata> GetRemoteCommandMetadata(out Dictionary<string, s
                     }
 
                     Dictionary<string, CommandMetadata> name2commandMetadata =
-                        new Dictionary<string, CommandMetadata>(StringComparer.OrdinalIgnoreCase);
+                        new(StringComparer.OrdinalIgnoreCase);
 
                     // invoke
                     using (new PowerShellStopper(this.Context, powerShell))
                     {
                         DateTime startTime = DateTime.UtcNow;
 
-                        PSDataCollection<PSObject> asyncOutput = new PSDataCollection<PSObject>();
+                        PSDataCollection<PSObject> asyncOutput = new();
 
                         // process output and errors as soon as possible
                         asyncResult = powerShell.BeginInvoke<PSObject, PSObject>(null, asyncOutput);
@@ -1793,8 +1793,8 @@ internal List<CommandMetadata> GetRemoteCommandMetadata(out Dictionary<string, s
         private void WriteProgress(string statusDescription, int? percentComplete, int? secondsRemaining)
         {
             ProgressRecordType recordType;
-            if (secondsRemaining.HasValue && secondsRemaining.GetValueOrDefault() == 0 &&
-                percentComplete.HasValue && percentComplete.GetValueOrDefault() == 100)
+            if (secondsRemaining.HasValue && secondsRemaining.Value == 0 &&
+                percentComplete.HasValue && percentComplete.Value == 100)
             {
                 recordType = ProgressRecordType.Completed;
             }
@@ -1815,7 +1815,7 @@ private void WriteProgress(string statusDescription, int? percentComplete, int?
             _lastTimeProgressWasWritten = DateTime.UtcNow;
 
             string activityDescription = StringUtil.Format(ImplicitRemotingStrings.ProgressActivity);
-            ProgressRecord progressRecord = new ProgressRecord(
+            ProgressRecord progressRecord = new(
                 1905347799, // unique id for ImplicitRemoting (I just picked a random number)
                 activityDescription,
                 statusDescription);
@@ -1890,7 +1890,7 @@ internal List<string> GenerateProxyModule(
                 }
             }
 
-            ImplicitRemotingCodeGenerator codeGenerator = new ImplicitRemotingCodeGenerator(
+            ImplicitRemotingCodeGenerator codeGenerator = new(
                 this.Session,
                 this.ModuleGuid,
                 this.MyInvocation);
@@ -1915,7 +1915,7 @@ internal List<string> GenerateProxyModule(
 
     internal class ImplicitRemotingCodeGenerator
     {
-        internal static readonly Version VersionOfScriptWriter = new Version(1, 0);
+        internal static readonly Version VersionOfScriptWriter = new(1, 0);
 
         #region Constructor and shared private data
 
@@ -1975,14 +1975,14 @@ private string GetConnectionString()
             return null;
         }
 
-        private string EscapeFunctionNameForRemoteHelp(string name)
+        private static string EscapeFunctionNameForRemoteHelp(string name)
         {
             if (name == null)
             {
                 throw PSTraceSource.NewArgumentNullException(nameof(name));
             }
 
-            StringBuilder result = new StringBuilder(name.Length);
+            StringBuilder result = new(name.Length);
             foreach (char c in name)
             {
                 if (("\"'`$".IndexOf(c) == (-1)) &&
@@ -2000,7 +2000,7 @@ private string EscapeFunctionNameForRemoteHelp(string name)
 ##############################################################################
 ";
 
-        private void GenerateSectionSeparator(TextWriter writer)
+        private static void GenerateSectionSeparator(TextWriter writer)
         {
             writer.Write(SectionSeparator);
         }
@@ -2135,7 +2135,7 @@ function Write-PSImplicitRemotingMessage
 }
 ";
 
-        private void GenerateHelperFunctionsWriteMessage(TextWriter writer)
+        private static void GenerateHelperFunctionsWriteMessage(TextWriter writer)
         {
             if (writer == null)
             {
@@ -2190,7 +2190,7 @@ function Set-PSImplicitRemotingSession
 if ($PSSessionOverride) {{ Set-PSImplicitRemotingSession $PSSessionOverride }}
 ";
 
-        private void GenerateHelperFunctionsSetImplicitRunspace(TextWriter writer)
+        private static void GenerateHelperFunctionsSetImplicitRunspace(TextWriter writer)
         {
             if (writer == null)
             {
@@ -2247,7 +2247,7 @@ private PSPrimitiveDictionary GetApplicationArguments()
 
         private string GenerateNewPSSessionOption()
         {
-            StringBuilder result = new StringBuilder("& $script:NewPSSessionOption ");
+            StringBuilder result = new("& $script:NewPSSessionOption ");
 
             RunspaceConnectionInfo runspaceConnectionInfo = _remoteRunspaceInfo.Runspace.ConnectionInfo as RunspaceConnectionInfo;
             if (runspaceConnectionInfo != null)
@@ -2455,7 +2455,7 @@ private void GenerateHelperFunctionsGetImplicitRunspace(TextWriter writer)
 
         private string GenerateReimportingOfModules()
         {
-            StringBuilder result = new StringBuilder();
+            StringBuilder result = new();
 
             if (_invocationInfo.BoundParameters.ContainsKey(nameof(Module)))
             {
@@ -2767,7 +2767,7 @@ function Get-PSImplicitRemotingClientSideParameters
 }
 ";
 
-        private void GenerateHelperFunctionsClientSideParameters(TextWriter writer)
+        private static void GenerateHelperFunctionsClientSideParameters(TextWriter writer)
         {
             if (writer == null)
             {
@@ -2781,12 +2781,12 @@ private void GenerateHelperFunctionsClientSideParameters(TextWriter writer)
 
         private void GenerateHelperFunctions(TextWriter writer)
         {
-            this.GenerateSectionSeparator(writer);
-            this.GenerateHelperFunctionsWriteMessage(writer);
+            GenerateSectionSeparator(writer);
+            GenerateHelperFunctionsWriteMessage(writer);
             this.GenerateHelperFunctionsGetSessionOption(writer);
-            this.GenerateHelperFunctionsSetImplicitRunspace(writer);
+            GenerateHelperFunctionsSetImplicitRunspace(writer);
             this.GenerateHelperFunctionsGetImplicitRunspace(writer);
-            this.GenerateHelperFunctionsClientSideParameters(writer);
+            GenerateHelperFunctionsClientSideParameters(writer);
         }
 
         #endregion
@@ -2846,7 +2846,7 @@ private void GenerateHelperFunctions(TextWriter writer)
 }}
         ";
 
-        private void GenerateCommandProxy(TextWriter writer, CommandMetadata commandMetadata)
+        private static void GenerateCommandProxy(TextWriter writer, CommandMetadata commandMetadata)
         {
             if (writer == null)
             {
@@ -2854,7 +2854,7 @@ private void GenerateCommandProxy(TextWriter writer, CommandMetadata commandMeta
             }
 
             string functionNameForString = CodeGeneration.EscapeSingleQuotedStringContent(commandMetadata.Name);
-            string functionNameForHelp = this.EscapeFunctionNameForRemoteHelp(commandMetadata.Name);
+            string functionNameForHelp = EscapeFunctionNameForRemoteHelp(commandMetadata.Name);
             writer.Write(
                 CommandProxyTemplate,
                 /* 0 */ functionNameForString,
@@ -2868,7 +2868,7 @@ private void GenerateCommandProxy(TextWriter writer, CommandMetadata commandMeta
                 /* 8 */ commandMetadata.WrappedAnyCmdlet);
         }
 
-        private void GenerateCommandProxy(TextWriter writer, IEnumerable<CommandMetadata> listOfCommandMetadata)
+        private static void GenerateCommandProxy(TextWriter writer, IEnumerable<CommandMetadata> listOfCommandMetadata)
         {
             if (writer == null)
             {
@@ -2880,7 +2880,7 @@ private void GenerateCommandProxy(TextWriter writer, IEnumerable<CommandMetadata
                 throw PSTraceSource.NewArgumentNullException(nameof(listOfCommandMetadata));
             }
 
-            this.GenerateSectionSeparator(writer);
+            GenerateSectionSeparator(writer);
             foreach (CommandMetadata commandMetadata in listOfCommandMetadata)
             {
                 GenerateCommandProxy(writer, commandMetadata);
@@ -2895,7 +2895,7 @@ private void GenerateCommandProxy(TextWriter writer, IEnumerable<CommandMetadata
 & $script:ExportModuleMember -Function {0}
         ";
 
-        private void GenerateExportDeclaration(TextWriter writer, IEnumerable<CommandMetadata> listOfCommandMetadata)
+        private static void GenerateExportDeclaration(TextWriter writer, IEnumerable<CommandMetadata> listOfCommandMetadata)
         {
             if (writer == null)
             {
@@ -2907,21 +2907,21 @@ private void GenerateExportDeclaration(TextWriter writer, IEnumerable<CommandMet
                 throw PSTraceSource.NewArgumentNullException(nameof(listOfCommandMetadata));
             }
 
-            this.GenerateSectionSeparator(writer);
+            GenerateSectionSeparator(writer);
 
             List<string> listOfCommandNames = GetListOfCommandNames(listOfCommandMetadata);
             string exportString = GenerateArrayString(listOfCommandNames);
             writer.Write(ExportFunctionsTemplate, exportString);
         }
 
-        private List<string> GetListOfCommandNames(IEnumerable<CommandMetadata> listOfCommandMetadata)
+        private static List<string> GetListOfCommandNames(IEnumerable<CommandMetadata> listOfCommandMetadata)
         {
             if (listOfCommandMetadata == null)
             {
                 throw PSTraceSource.NewArgumentNullException(nameof(listOfCommandMetadata));
             }
 
-            List<string> listOfCommandNames = new List<string>();
+            List<string> listOfCommandNames = new();
             foreach (CommandMetadata commandMetadata in listOfCommandMetadata)
             {
                 listOfCommandNames.Add(commandMetadata.Name);
@@ -2930,14 +2930,14 @@ private List<string> GetListOfCommandNames(IEnumerable<CommandMetadata> listOfCo
             return listOfCommandNames;
         }
 
-        private string GenerateArrayString(IEnumerable<string> listOfStrings)
+        private static string GenerateArrayString(IEnumerable<string> listOfStrings)
         {
             if (listOfStrings == null)
             {
                 throw PSTraceSource.NewArgumentNullException(nameof(listOfStrings));
             }
 
-            StringBuilder arrayString = new StringBuilder();
+            StringBuilder arrayString = new();
             foreach (string s in listOfStrings)
             {
                 if (arrayString.Length != 0)
@@ -2968,9 +2968,9 @@ private string GenerateArrayString(IEnumerable<string> listOfStrings)
 & $script:ExportModuleMember -Alias {0}
         ";
 
-        private void GenerateAliases(TextWriter writer, Dictionary<string, string> alias2resolvedCommandName)
+        private static void GenerateAliases(TextWriter writer, Dictionary<string, string> alias2resolvedCommandName)
         {
-            this.GenerateSectionSeparator(writer);
+            GenerateSectionSeparator(writer);
 
             foreach (KeyValuePair<string, string> pair in alias2resolvedCommandName)
             {
@@ -2991,7 +2991,7 @@ private void GenerateAliases(TextWriter writer, Dictionary<string, string> alias
 
         #region Generating format.ps1xml file
 
-        private void GenerateFormatFile(TextWriter writer, List<ExtendedTypeDefinition> listOfFormatData)
+        private static void GenerateFormatFile(TextWriter writer, List<ExtendedTypeDefinition> listOfFormatData)
         {
             if (writer == null)
             {
@@ -3003,7 +3003,7 @@ private void GenerateFormatFile(TextWriter writer, List<ExtendedTypeDefinition>
                 throw PSTraceSource.NewArgumentNullException(nameof(listOfFormatData));
             }
 
-            XmlWriterSettings settings = new XmlWriterSettings();
+            XmlWriterSettings settings = new();
             settings.CloseOutput = false;
             settings.ConformanceLevel = ConformanceLevel.Document;
             settings.Encoding = writer.Encoding;
@@ -3038,7 +3038,7 @@ internal List<string> GenerateProxyModule(
             List<ExtendedTypeDefinition> listOfFormatData,
             X509Certificate2 certificate)
         {
-            List<string> result = new List<string>();
+            List<string> result = new();
 
             Dbg.Assert(moduleRootDirectory != null, "Caller should validate moduleRootDirectory != null");
             Dbg.Assert(Directory.Exists(moduleRootDirectory.FullName), "Caller should validate moduleRootDirectory exists");
@@ -3048,7 +3048,7 @@ internal List<string> GenerateProxyModule(
             FileMode fileMode = force ? FileMode.OpenOrCreate : FileMode.CreateNew;
 
             result.Add(baseName + ".psm1");
-            FileStream psm1 = new FileStream(
+            FileStream psm1 = new(
                 baseName + ".psm1",
                 fileMode,
                 FileAccess.Write,
@@ -3069,7 +3069,7 @@ internal List<string> GenerateProxyModule(
             }
 
             result.Add(baseName + ".format.ps1xml");
-            FileStream formatPs1xml = new FileStream(
+            FileStream formatPs1xml = new(
                 baseName + ".format.ps1xml",
                 fileMode,
                 FileAccess.Write,
@@ -3114,8 +3114,8 @@ internal List<string> GenerateProxyModule(
             }
 
             result.Add(baseName + ".psd1");
-            FileInfo manifestFile = new FileInfo(baseName + ".psd1");
-            FileStream psd1 = new FileStream(
+            FileInfo manifestFile = new(baseName + ".psd1");
+            FileStream psd1 = new(
                 manifestFile.FullName,
                 fileMode,
                 FileAccess.Write,
@@ -3135,7 +3135,7 @@ internal List<string> GenerateProxyModule(
                 using (var stream = new FileStream(applicationArgumentsFile, FileMode.Create, FileAccess.Write, FileShare.Read))
                 using (var xmlWriter = XmlWriter.Create(stream))
                 {
-                    Serializer serializer = new Serializer(xmlWriter);
+                    Serializer serializer = new(xmlWriter);
                     serializer.Serialize(applicationArguments);
                     serializer.Done();
                 }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Import-LocalizedData.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Import-LocalizedData.cs
index 4749d28322c..53ab8d32c2f 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Import-LocalizedData.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Import-LocalizedData.cs
@@ -186,7 +186,7 @@ protected override void ProcessRecord()
 
                 if (_bindingVariable != null)
                 {
-                    VariablePath variablePath = new VariablePath(_bindingVariable);
+                    VariablePath variablePath = new(_bindingVariable);
                     if (variablePath.IsUnscopedVariable)
                     {
                         variablePath = variablePath.CloneAndSetLocal();
@@ -340,8 +340,8 @@ private string GetScript(string filePath)
                 // 197751: WR BUG BASH: Powershell: localized text display as garbage
                 // leaving the encoding to be decided by the StreamReader. StreamReader
                 // will read the preamble and decide proper encoding.
-                using (FileStream scriptStream = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read))
-                using (StreamReader scriptReader = new StreamReader(scriptStream))
+                using (FileStream scriptStream = new(filePath, FileMode.Open, FileAccess.Read, FileShare.Read))
+                using (StreamReader scriptReader = new(scriptStream))
                 {
                     return scriptReader.ReadToEnd();
                 }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImportAliasCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImportAliasCommand.cs
index 3da62e88d25..4252a1623d6 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImportAliasCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImportAliasCommand.cs
@@ -154,7 +154,7 @@ protected override void ProcessRecord()
                         // Since the alias already exists, write an error.
 
                         SessionStateException aliasExists =
-                            new SessionStateException(
+                            new(
                                 alias.Name,
                                 SessionStateCategory.Alias,
                                 "AliasAlreadyExists",
@@ -233,7 +233,7 @@ private Dictionary<string, CommandTypes> ExistingCommands
                 if (_existingCommands == null)
                 {
                     _existingCommands = new Dictionary<string, CommandTypes>(StringComparer.OrdinalIgnoreCase);
-                    CommandSearcher searcher = new CommandSearcher(
+                    CommandSearcher searcher = new(
                         "*",
                         SearchResolutionOptions.CommandNameIsPattern | SearchResolutionOptions.ResolveAliasPatterns | SearchResolutionOptions.ResolveFunctionPatterns,
                         CommandTypes.All ^ CommandTypes.Alias,
@@ -260,7 +260,7 @@ private Dictionary<string, CommandTypes> ExistingCommands
 
         private bool VerifyShadowingExistingCommandsAndWriteError(string aliasName)
         {
-            CommandSearcher searcher = new CommandSearcher(aliasName, SearchResolutionOptions.None, CommandTypes.All ^ CommandTypes.Alias, this.Context);
+            CommandSearcher searcher = new(aliasName, SearchResolutionOptions.None, CommandTypes.All ^ CommandTypes.Alias, this.Context);
             foreach (string expandedCommandName in searcher.ConstructSearchPatternsFromName(aliasName))
             {
                 CommandTypes commandTypeOfExistingCommand;
@@ -268,7 +268,7 @@ private bool VerifyShadowingExistingCommandsAndWriteError(string aliasName)
                 {
                     // Since the alias already exists, write an error.
                     SessionStateException aliasExists =
-                        new SessionStateException(
+                        new(
                             aliasName,
                             SessionStateCategory.Alias,
                             "AliasAlreadyExists",
@@ -289,12 +289,12 @@ private bool VerifyShadowingExistingCommandsAndWriteError(string aliasName)
 
         private Collection<AliasInfo> GetAliasesFromFile(bool isLiteralPath)
         {
-            Collection<AliasInfo> result = new Collection<AliasInfo>();
+            Collection<AliasInfo> result = new();
 
             string filePath = null;
             using (StreamReader reader = OpenFile(out filePath, isLiteralPath))
             {
-                CSVHelper csvHelper = new CSVHelper(',');
+                CSVHelper csvHelper = new(',');
 
                 Int64 lineNumber = 0;
                 string line = null;
@@ -327,10 +327,10 @@ private Collection<AliasInfo> GetAliasesFromFile(bool isLiteralPath)
                         string message = StringUtil.Format(AliasCommandStrings.ImportAliasFileInvalidFormat, filePath, lineNumber);
 
                         FormatException formatException =
-                            new FormatException(message);
+                            new(message);
 
                         ErrorRecord errorRecord =
-                            new ErrorRecord(
+                            new(
                                 formatException,
                                 "ImportAliasFileFormatError",
                                 ErrorCategory.ReadError,
@@ -352,7 +352,7 @@ private Collection<AliasInfo> GetAliasesFromFile(bool isLiteralPath)
                         string message = StringUtil.Format(AliasCommandStrings.ImportAliasOptionsError, filePath, lineNumber);
 
                         ErrorRecord errorRecord =
-                            new ErrorRecord(
+                            new(
                                 argException,
                                 "ImportAliasOptionsError",
                                 ErrorCategory.ReadError,
@@ -364,7 +364,7 @@ private Collection<AliasInfo> GetAliasesFromFile(bool isLiteralPath)
                     }
 
                     AliasInfo newAlias =
-                        new AliasInfo(
+                        new(
                             values[0],
                             values[1],
                             Context,
@@ -427,7 +427,7 @@ private StreamReader OpenFile(out string filePath, bool isLiteralPath)
 
             try
             {
-                FileStream file = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.Read);
+                FileStream file = new(filePath, FileMode.Open, FileAccess.Read, FileShare.Read);
                 result = new StreamReader(file);
             }
             catch (IOException ioException)
@@ -451,7 +451,7 @@ private void ThrowFileOpenError(Exception e, string pathWithError)
             string message =
                 StringUtil.Format(AliasCommandStrings.ImportAliasFileOpenFailed, pathWithError, e.Message);
 
-            ErrorRecord errorRecord = new ErrorRecord(
+            ErrorRecord errorRecord = new(
                 e,
                 "FileOpenFailure",
                 ErrorCategory.OpenError,
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImportPowerShellDataFile.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImportPowerShellDataFile.cs
index 694e82686be..53dc461dfb2 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImportPowerShellDataFile.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImportPowerShellDataFile.cs
@@ -39,6 +39,13 @@ public string[] LiteralPath
             set { _isLiteralPath = true; Path = value; }
         }
 
+        /// <summary>
+        /// Gets or sets switch that determines if built-in limits are applied to the data.
+        /// </summary>
+        [Experimental("Microsoft.PowerShell.Utility.PSImportPSDataFileSkipLimitCheck", ExperimentAction.Show)]
+        [Parameter]
+        public SwitchParameter SkipLimitCheck { get; set; }
+
         /// <summary>
         /// For each path, resolve it, parse it and write all hashtables to the output stream.
         /// </summary>
@@ -61,7 +68,7 @@ protected override void ProcessRecord()
                         var data = ast.Find(a => a is HashtableAst, false);
                         if (data != null)
                         {
-                            WriteObject(data.SafeGetValue());
+                            WriteObject(data.SafeGetValue(SkipLimitCheck));
                         }
                         else
                         {
@@ -78,8 +85,8 @@ protected override void ProcessRecord()
 
         private void WritePathNotFoundError(string path)
         {
-            var errorId = "PathNotFound";
-            var errorCategory = ErrorCategory.InvalidArgument;
+            const string errorId = "PathNotFound";
+            const ErrorCategory errorCategory = ErrorCategory.InvalidArgument;
             var errorMessage = string.Format(UtilityCommonStrings.PathDoesNotExist, path);
             var exception = new ArgumentException(errorMessage);
             var errorRecord = new ErrorRecord(exception, errorId, errorCategory, path);
@@ -88,7 +95,7 @@ private void WritePathNotFoundError(string path)
 
         private void WriteInvalidDataFileError(string resolvedPath, string errorId)
         {
-            var errorCategory = ErrorCategory.InvalidData;
+            const ErrorCategory errorCategory = ErrorCategory.InvalidData;
             var errorMessage = string.Format(UtilityCommonStrings.CouldNotParseAsPowerShellDataFile, resolvedPath);
             var exception = new InvalidOperationException(errorMessage);
             var errorRecord = new ErrorRecord(exception, errorId, errorCategory, resolvedPath);
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Join-String.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Join-String.cs
index 652e32652ce..16243fcf6ae 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Join-String.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Join-String.cs
@@ -23,7 +23,7 @@ public sealed class JoinStringCommand : PSCmdlet
         /// <summary>A bigger default to not get re-allocations in common use cases.</summary>
         private const int DefaultOutputStringCapacity = 256;
 
-        private readonly StringBuilder _outputBuilder = new StringBuilder(DefaultOutputStringCapacity);
+        private readonly StringBuilder _outputBuilder = new(DefaultOutputStringCapacity);
         private CultureInfo _cultureInfo = CultureInfo.InvariantCulture;
         private string _separator;
         private char _quoteChar;
@@ -93,7 +93,7 @@ public string Separator
         [Parameter(ValueFromPipeline = true)]
         public PSObject[] InputObject { get; set; }
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         protected override void BeginProcessing()
         {
             _quoteChar = SingleQuote ? '\'' : DoubleQuote ? '"' : char.MinValue;
@@ -104,7 +104,7 @@ protected override void BeginProcessing()
             }
         }
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         protected override void ProcessRecord()
         {
             if (InputObject != null)
@@ -151,7 +151,7 @@ protected override void ProcessRecord()
             }
         }
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         protected override void EndProcessing()
         {
             _outputBuilder.Append(OutputSuffix);
@@ -177,7 +177,7 @@ public IEnumerable<CompletionResult> CompleteArgument(
             return null;
         }
 
-        private IEnumerable<CompletionResult> CompleteFormatString(string wordToComplete)
+        private static IEnumerable<CompletionResult> CompleteFormatString(string wordToComplete)
         {
             var res = new List<CompletionResult>();
             void AddMatching(string completionText)
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/MarkdownOptionCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/MarkdownOptionCommands.cs
index 57a3bd59653..cd18f33c41d 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/MarkdownOptionCommands.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/MarkdownOptionCommands.cs
@@ -3,13 +3,9 @@
 
 using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
 using System.Management.Automation;
 using System.Management.Automation.Internal;
 using System.Management.Automation.Runspaces;
-using System.Threading.Tasks;
 
 using Microsoft.PowerShell.MarkdownRender;
 
@@ -159,7 +155,7 @@ protected override void EndProcessing()
                     {
                         var errorMessage = StringUtil.Format(ConvertMarkdownStrings.InvalidInputObjectType, baseObj.GetType());
 
-                        ErrorRecord errorRecord = new ErrorRecord(
+                        ErrorRecord errorRecord = new(
                             new ArgumentException(errorMessage),
                             "InvalidObject",
                             ErrorCategory.InvalidArgument,
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/MatchString.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/MatchString.cs
index 155a134ca7b..6271e6f57b6 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/MatchString.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/MatchString.cs
@@ -142,7 +142,7 @@ public string Filename
                     return s_inputStream;
                 }
 
-                return _filename ?? (_filename = System.IO.Path.GetFileName(_path));
+                return _filename ??= System.IO.Path.GetFileName(_path);
             }
         }
 
@@ -275,7 +275,7 @@ private string ToString(string directory, string line)
             }
 
             // Otherwise, render the full context.
-            List<string> lines = new List<string>(Context.DisplayPreContext.Length + Context.DisplayPostContext.Length + 1);
+            List<string> lines = new(Context.DisplayPreContext.Length + Context.DisplayPostContext.Length + 1);
 
             int displayLineNumber = this.LineNumber - Context.DisplayPreContext.Length;
             foreach (string contextLine in Context.DisplayPreContext)
@@ -425,7 +425,7 @@ private class CircularBuffer<T> : ICollection<T>
             /// Initializes a new instance of the <see cref="CircularBuffer{T}"/> class.
             /// </summary>
             /// <param name="capacity">The maximum capacity of the buffer.</param>
-            /// <exception cref="ArgumentOutOfRangeException">If <paramref name="capacity" /> is negative.</exception>
+            /// <exception cref="ArgumentOutOfRangeException">If <paramref name="capacity"/> is negative.</exception>
             public CircularBuffer(int capacity)
             {
                 if (capacity < 0)
@@ -455,9 +455,9 @@ public CircularBuffer(int capacity)
             /// has been properly offset and wrapped.
             /// </summary>
             /// <param name="zeroBasedIndex">The index to wrap.</param>
-            /// <exception cref="ArgumentOutOfRangeException">If <paramref name="zeroBasedIndex" /> is out of range.</exception>
+            /// <exception cref="ArgumentOutOfRangeException">If <paramref name="zeroBasedIndex"/> is out of range.</exception>
             /// <returns>
-            /// The actual index that <param ref="zeroBasedIndex" />
+            /// The actual index that <paramref name="zeroBasedIndex"/>
             /// maps to.
             /// </returns>
             private int WrapIndex(int zeroBasedIndex)
@@ -851,14 +851,14 @@ public LogicalContextTracker(int preContext, int postContext)
 
             public void TrackLine(string line)
             {
-                ContextEntry entry = new ContextEntry(line);
+                ContextEntry entry = new(line);
                 _collectedContext.Add(entry);
                 UpdateQueue();
             }
 
             public void TrackMatch(MatchInfo match)
             {
-                ContextEntry entry = new ContextEntry(match);
+                ContextEntry entry = new(match);
                 _collectedContext.Add(entry);
                 UpdateQueue();
             }
@@ -1436,8 +1436,8 @@ protected override void BeginProcessing()
         {
             if (this.MyInvocation.BoundParameters.ContainsKey(nameof(Culture)) && !this.MyInvocation.BoundParameters.ContainsKey(nameof(SimpleMatch)))
             {
-                InvalidOperationException exception = new InvalidOperationException(MatchStringStrings.CannotSpecifyCultureWithoutSimpleMatch);
-                ErrorRecord errorRecord = new ErrorRecord(exception, "CannotSpecifyCultureWithoutSimpleMatch", ErrorCategory.InvalidData, null);
+                InvalidOperationException exception = new(MatchStringStrings.CannotSpecifyCultureWithoutSimpleMatch);
+                ErrorRecord errorRecord = new(exception, "CannotSpecifyCultureWithoutSimpleMatch", ErrorCategory.InvalidData, null);
                 this.ThrowTerminatingError(errorRecord);
             }
 
@@ -1471,7 +1471,7 @@ protected override void BeginProcessing()
             _globalContextTracker = GetContextTracker();
         }
 
-        private readonly List<string> _inputObjectFileList = new List<string>(1) { string.Empty };
+        private readonly List<string> _inputObjectFileList = new(1) { string.Empty };
 
         /// <summary>
         /// Process the input.
@@ -1600,9 +1600,9 @@ private bool ProcessFile(string filename)
                     return false;
                 }
 
-                using (FileStream fs = new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                using (FileStream fs = new(filename, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
                 {
-                    using (StreamReader sr = new StreamReader(fs, Encoding))
+                    using (StreamReader sr = new(fs, Encoding))
                     {
                         string line;
                         int lineNo = 0;
@@ -1940,7 +1940,7 @@ private bool DoMatchWorker(string operandString, MatchInfo matchInfo, out MatchI
         /// <returns>The resolved (absolute) paths.</returns>
         private List<string> ResolveFilePaths(string[] filePaths, bool isLiteralPath)
         {
-            List<string> allPaths = new List<string>();
+            List<string> allPaths = new();
 
             foreach (string path in filePaths)
             {
@@ -1983,7 +1983,7 @@ private static ErrorRecord BuildErrorRecord(string messageId, string arg0, strin
         private static ErrorRecord BuildErrorRecord(string messageId, object[] arguments, string errorId, Exception innerException)
         {
             string fmtedMsg = StringUtil.Format(messageId, arguments);
-            ArgumentException e = new ArgumentException(fmtedMsg, innerException);
+            ArgumentException e = new(fmtedMsg, innerException);
             return new ErrorRecord(e, errorId, ErrorCategory.InvalidArgument, null);
         }
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Measure-Object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Measure-Object.cs
index 46c1f7062c7..4bc6a3b42e0 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Measure-Object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Measure-Object.cs
@@ -8,8 +8,6 @@
 using System.Management.Automation;
 using System.Management.Automation.Internal;
 
-using Microsoft.PowerShell.Commands.Internal.Format;
-
 namespace Microsoft.PowerShell.Commands
 {
     /// <summary>
@@ -20,7 +18,7 @@ public abstract class MeasureInfo
         /// <summary>
         /// Property name.
         /// </summary>
-        public string Property { get; set; } = null;
+        public string Property { get; set; }
     }
 
     /// <summary>
@@ -29,7 +27,7 @@ public abstract class MeasureInfo
     public sealed class GenericMeasureInfo : MeasureInfo
     {
         /// <summary>
-        /// Default ctor.
+        /// Initializes a new instance of the <see cref="GenericMeasureInfo"/> class.
         /// </summary>
         public GenericMeasureInfo()
         {
@@ -79,6 +77,7 @@ public GenericMeasureInfo()
     public sealed class GenericObjectMeasureInfo : MeasureInfo
     {
         /// <summary>
+        /// Initializes a new instance of the <see cref="GenericObjectMeasureInfo"/> class.
         /// Default ctor.
         /// </summary>
         public GenericObjectMeasureInfo()
@@ -124,6 +123,7 @@ public GenericObjectMeasureInfo()
     public sealed class TextMeasureInfo : MeasureInfo
     {
         /// <summary>
+        /// Initializes a new instance of the <see cref="TextMeasureInfo"/> class.
         /// Default ctor.
         /// </summary>
         public TextMeasureInfo()
@@ -164,6 +164,7 @@ private class MeasureObjectDictionary<V> : Dictionary<string, V>
             where V : new()
         {
             /// <summary>
+            /// Initializes a new instance of the <see cref="MeasureObjectDictionary{V}"/> class.
             /// Default ctor.
             /// </summary>
             internal MeasureObjectDictionary() : base(StringComparer.OrdinalIgnoreCase)
@@ -218,6 +219,7 @@ private class Statistics
         }
 
         /// <summary>
+        /// Initializes a new instance of the <see cref="MeasureObjectCommand"/> class.
         /// Default constructor.
         /// </summary>
         public MeasureObjectCommand()
@@ -242,7 +244,7 @@ public MeasureObjectCommand()
         /// <value></value>
         [ValidateNotNullOrEmpty]
         [Parameter(Position = 0)]
-        public PSPropertyExpression[] Property { get; set; } = null;
+        public PSPropertyExpression[] Property { get; set; }
 
         #endregion Common parameters in both sets
 
@@ -494,14 +496,14 @@ protected override void ProcessRecord()
         /// Analyze an object on a property-by-property basis instead
         /// of as a simple value.
         /// Side effects: Updates statistics.
-        /// <param name="inObj">The object to analyze.</param>
         /// </summary>
+        /// <param name="inObj">The object to analyze.</param>
         private void AnalyzeObjectProperties(PSObject inObj)
         {
             // Keep track of which properties are counted for an
             // input object so that repeated properties won't be
             // counted twice.
-            MeasureObjectDictionary<object> countedProperties = new MeasureObjectDictionary<object>();
+            MeasureObjectDictionary<object> countedProperties = new();
 
             // First iterate over the user-specified list of
             // properties...
@@ -554,9 +556,9 @@ private void AnalyzeObjectProperties(PSObject inObj)
         /// <summary>
         /// Analyze a value for generic/text statistics.
         /// Side effects: Updates statistics. May set nonNumericError.
+        /// </summary>
         /// <param name="propertyName">The property this value corresponds to.</param>
         /// <param name="objValue">The value to analyze.</param>
-        /// </summary>
         private void AnalyzeValue(string propertyName, object objValue)
         {
             if (propertyName == null)
@@ -579,7 +581,7 @@ private void AnalyzeValue(string propertyName, object objValue)
                 if (!LanguagePrimitives.TryConvertTo(objValue, out numValue))
                 {
                     _nonNumericError = true;
-                    ErrorRecord errorRecord = new ErrorRecord(
+                    ErrorRecord errorRecord = new(
                         PSTraceSource.NewInvalidOperationException(MeasureObjectStrings.NonNumericInputObject, objValue),
                         "NonNumericInputObject",
                         ErrorCategory.InvalidType,
@@ -617,11 +619,10 @@ private void AnalyzeValue(string propertyName, object objValue)
         /// If true is passed in then the minimum of the two values would be returned.
         /// If false is passed in then maximum of the two values will be returned.</param>
         /// <returns></returns>
-        private object Compare(object objValue, object statMinOrMaxValue, bool isMin)
+        private static object Compare(object objValue, object statMinOrMaxValue, bool isMin)
         {
             object currentValue = objValue;
             object statValue = statMinOrMaxValue;
-            int factor = isMin ? 1 : -1;
 
             double temp;
             currentValue = ((objValue != null) && LanguagePrimitives.TryConvertTo<double>(objValue, out temp)) ? temp : currentValue;
@@ -633,13 +634,15 @@ private object Compare(object objValue, object statMinOrMaxValue, bool isMin)
                 statValue = PSObject.AsPSObject(statValue).ToString();
             }
 
-            if ((statValue == null) ||
-                ((LanguagePrimitives.Compare(statValue, currentValue, false, CultureInfo.CurrentCulture) * factor) > 0))
+            if (statValue == null)
             {
                 return objValue;
             }
 
-            return statMinOrMaxValue;
+            int comparisonResult = LanguagePrimitives.Compare(statValue, currentValue, ignoreCase: false, CultureInfo.CurrentCulture);
+            return (isMin ? comparisonResult : -comparisonResult) > 0
+                ? objValue
+                : statMinOrMaxValue;
         }
 
         /// <summary>
@@ -744,9 +747,9 @@ internal static int CountLine(string inStr)
 
         /// <summary>
         /// Update text statistics.
+        /// </summary>
         /// <param name="strValue">The text to analyze.</param>
         /// <param name="stat">The Statistics object to update.</param>
-        /// </summary>
         private void AnalyzeString(string strValue, Statistics stat)
         {
             if (_measureCharacters)
@@ -759,9 +762,9 @@ private void AnalyzeString(string strValue, Statistics stat)
 
         /// <summary>
         /// Update number statistics.
+        /// </summary>
         /// <param name="numValue">The number to analyze.</param>
         /// <param name="stat">The Statistics object to update.</param>
-        /// </summary>
         private void AnalyzeNumber(double numValue, Statistics stat)
         {
             if (_measureSum || _measureAverage || _measureStandardDeviation)
@@ -788,7 +791,7 @@ private void AnalyzeNumber(double numValue, Statistics stat)
         private void WritePropertyNotFoundError(string propertyName, string errorId)
         {
             Diagnostics.Assert(Property != null, "no property and no InputObject should have been addressed");
-            ErrorRecord errorRecord = new ErrorRecord(
+            ErrorRecord errorRecord = new(
                     PSTraceSource.NewArgumentException("Property"),
                     errorId,
                     ErrorCategory.InvalidArgument,
@@ -850,10 +853,10 @@ protected override void EndProcessing()
 
         /// <summary>
         /// Create a MeasureInfo object for generic stats.
-        /// <param name="stat">The statistics to use.</param>
-        /// <returns>A new GenericMeasureInfo object.</returns>
         /// </summary>
+        /// <param name="stat">The statistics to use.</param>
         /// <param name="shouldUseGenericMeasureInfo"></param>
+        /// <returns>A new GenericMeasureInfo object.</returns>
         private MeasureInfo CreateGenericMeasureInfo(Statistics stat, bool shouldUseGenericMeasureInfo)
         {
             double? sum = null;
@@ -906,7 +909,7 @@ private MeasureInfo CreateGenericMeasureInfo(Statistics stat, bool shouldUseGene
 
             if (shouldUseGenericMeasureInfo)
             {
-                GenericMeasureInfo gmi = new GenericMeasureInfo();
+                GenericMeasureInfo gmi = new();
                 gmi.Count = stat.count;
                 gmi.Sum = sum;
                 gmi.Average = average;
@@ -925,7 +928,7 @@ private MeasureInfo CreateGenericMeasureInfo(Statistics stat, bool shouldUseGene
             }
             else
             {
-                GenericObjectMeasureInfo gomi = new GenericObjectMeasureInfo();
+                GenericObjectMeasureInfo gomi = new();
                 gomi.Count = stat.count;
                 gomi.Sum = sum;
                 gomi.Average = average;
@@ -938,12 +941,12 @@ private MeasureInfo CreateGenericMeasureInfo(Statistics stat, bool shouldUseGene
 
         /// <summary>
         /// Create a MeasureInfo object for text stats.
+        /// </summary>
         /// <param name="stat">The statistics to use.</param>
         /// <returns>A new TextMeasureInfo object.</returns>
-        /// </summary>
         private TextMeasureInfo CreateTextMeasureInfo(Statistics stat)
         {
-            TextMeasureInfo tmi = new TextMeasureInfo();
+            TextMeasureInfo tmi = new();
 
             if (_measureCharacters)
                 tmi.Characters = stat.characters;
@@ -959,7 +962,7 @@ private TextMeasureInfo CreateTextMeasureInfo(Statistics stat)
         /// The observed statistics keyed by property name.
         /// If Property is not set, then the key used will be the value of thisObject.
         /// </summary>
-        private readonly MeasureObjectDictionary<Statistics> _statistics = new MeasureObjectDictionary<Statistics>();
+        private readonly MeasureObjectDictionary<Statistics> _statistics = new();
 
         /// <summary>
         /// Whether or not a numeric conversion error occurred.
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/New-Object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/New-Object.cs
index a8b4b69aa1f..54e323dfac8 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/New-Object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/New-Object.cs
@@ -13,7 +13,9 @@
 using System.Management.Automation.Security;
 using System.Reflection;
 using System.Runtime.InteropServices;
+#if !UNIX
 using System.Threading;
+#endif
 
 using Dbg = System.Management.Automation.Diagnostics;
 
@@ -30,7 +32,7 @@ public sealed class NewObjectCommand : PSCmdlet
         /// <summary> the number</summary>
         [Parameter(ParameterSetName = netSetName, Mandatory = true, Position = 0)]
         [ValidateTrustedData]
-        public string TypeName { get; set; } = null;
+        public string TypeName { get; set; }
 
 #if !UNIX
         private Guid _comObjectClsId = Guid.Empty;
@@ -39,7 +41,7 @@ public sealed class NewObjectCommand : PSCmdlet
         /// </summary>
         [Parameter(ParameterSetName = "Com", Mandatory = true, Position = 0)]
         [ValidateTrustedData]
-        public string ComObject { get; set; } = null;
+        public string ComObject { get; set; }
 #endif
 
         /// <summary>
@@ -49,7 +51,7 @@ public sealed class NewObjectCommand : PSCmdlet
         [Parameter(ParameterSetName = netSetName, Mandatory = false, Position = 1)]
         [ValidateTrustedData]
         [Alias("Args")]
-        public object[] ArgumentList { get; set; } = null;
+        public object[] ArgumentList { get; set; }
 
         /// <summary>
         /// True if we should have an error when Com objects will use an interop assembly.
@@ -102,7 +104,7 @@ private void CreateMemberNotFoundError(PSObject pso, DictionaryEntry property, T
 
         private void CreateMemberSetValueError(SetValueException e)
         {
-            Exception ex = new Exception(StringUtil.Format(NewObjectStrings.InvalidValue, e));
+            Exception ex = new(StringUtil.Format(NewObjectStrings.InvalidValue, e));
             ThrowTerminatingError(
                 new ErrorRecord(ex, "SetValueException", ErrorCategory.InvalidData, null));
         }
@@ -195,6 +197,25 @@ protected override void BeginProcessing()
                     }
                 }
 
+                switch (Context.LanguageMode)
+                {
+                    case PSLanguageMode.NoLanguage:
+                    case PSLanguageMode.RestrictedLanguage:
+                        if (SystemPolicy.GetSystemLockdownPolicy() == SystemEnforcementMode.Enforce
+                            && !CoreTypes.Contains(type))
+                        {
+                            ThrowTerminatingError(
+                                new ErrorRecord(
+                                    new PSNotSupportedException(
+                                        string.Format(NewObjectStrings.CannotCreateTypeLanguageMode, Context.LanguageMode.ToString())),
+                                    nameof(NewObjectStrings.CannotCreateTypeLanguageMode),
+                                    ErrorCategory.PermissionDenied,
+                                    targetObject: null));
+                        }
+
+                    break;
+                }
+
                 // WinRT does not support creating instances of attribute & delegate WinRT types.
                 if (WinRTHelper.IsWinRTType(type) && ((typeof(System.Attribute)).IsAssignableFrom(type) || (typeof(System.Delegate)).IsAssignableFrom(type)))
                 {
@@ -459,7 +480,7 @@ private object CreateComObject()
                 {
                     createInfo = new ComCreateInfo();
 
-                    Thread thread = new Thread(new ParameterizedThreadStart(STAComCreateThreadProc));
+                    Thread thread = new(new ParameterizedThreadStart(STAComCreateThreadProc));
                     thread.SetApartmentState(ApartmentState.STA);
                     thread.Start(createInfo);
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewAliasCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewAliasCommand.cs
index 3c95ebbc7de..8ae43a6e4fd 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewAliasCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewAliasCommand.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
 using System.Management.Automation;
 using System.Management.Automation.Internal;
 
@@ -44,7 +43,7 @@ protected override void ProcessRecord()
                     // Since the alias already exists, write an error.
 
                     SessionStateException aliasExists =
-                        new SessionStateException(
+                        new(
                             Name,
                             SessionStateCategory.Alias,
                             "AliasAlreadyExists",
@@ -62,7 +61,7 @@ protected override void ProcessRecord()
             // Create the alias info
 
             AliasInfo newAlias =
-                new AliasInfo(
+                new(
                     Name,
                     Value,
                     Context,
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewTemporaryFileCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewTemporaryFileCommand.cs
index f8bb3d4e6ea..93b3eb209af 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewTemporaryFileCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewTemporaryFileCommand.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
 using System.IO;
 using System.Management.Automation;
 
@@ -41,7 +40,7 @@ protected override void EndProcessing()
 
                 if (!string.IsNullOrEmpty(filePath))
                 {
-                    FileInfo file = new FileInfo(filePath);
+                    FileInfo file = new(filePath);
                     WriteObject(file);
                 }
             }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewTimeSpanCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewTimeSpanCommand.cs
index 0e633ca5b2e..53c39250763 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewTimeSpanCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewTimeSpanCommand.cs
@@ -68,25 +68,25 @@ public DateTime End
         /// Allows the user to override the day.
         /// </summary>
         [Parameter(ParameterSetName = "Time")]
-        public int Days { get; set; } = 0;
+        public int Days { get; set; }
 
         /// <summary>
         /// Allows the user to override the hour.
         /// </summary>
         [Parameter(ParameterSetName = "Time")]
-        public int Hours { get; set; } = 0;
+        public int Hours { get; set; }
 
         /// <summary>
         /// Allows the user to override the minute.
         /// </summary>
         [Parameter(ParameterSetName = "Time")]
-        public int Minutes { get; set; } = 0;
+        public int Minutes { get; set; }
 
         /// <summary>
         /// Allows the user to override the second.
         /// </summary>
         [Parameter(ParameterSetName = "Time")]
-        public int Seconds { get; set; } = 0;
+        public int Seconds { get; set; }
 
         #endregion
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ObjectCommandComparer.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ObjectCommandComparer.cs
index 75ed294294d..39986943c99 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ObjectCommandComparer.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ObjectCommandComparer.cs
@@ -30,7 +30,7 @@ internal ObjectCommandPropertyValue(object propVal)
         }
 
         /// <summary>
-        /// ObjectCommandPropertyValue constructor.
+        /// Initializes a new instance of the <see cref="ObjectCommandPropertyValue"/> class.
         /// </summary>
         /// <param name="propVal">Property Value.</param>
         /// <param name="isCaseSensitive">Indicates if the Property value comparison has to be case sensitive or not.</param>
@@ -65,8 +65,8 @@ internal CultureInfo Culture
             }
         }
 
-        internal static readonly ObjectCommandPropertyValue NonExistingProperty = new ObjectCommandPropertyValue();
-        internal static readonly ObjectCommandPropertyValue ExistingNullProperty = new ObjectCommandPropertyValue(null);
+        internal static readonly ObjectCommandPropertyValue NonExistingProperty = new();
+        internal static readonly ObjectCommandPropertyValue ExistingNullProperty = new(null);
         private readonly bool _caseSensitive;
         internal CultureInfo cultureInfo = null;
 
@@ -139,6 +139,7 @@ public override int GetHashCode()
     internal class ObjectCommandComparer : IComparer
     {
         /// <summary>
+        /// Initializes a new instance of the <see cref="ObjectCommandComparer"/> class.
         /// Constructor that doesn't set any private field.
         /// Necessary because compareTo can compare two objects by calling
         /// ((ICompare)obj1).CompareTo(obj2) without using a key.
@@ -209,19 +210,19 @@ public int Compare(object first, object second)
                 second = secondMsh.BaseObject;
             }
 
-            if (LanguagePrimitives.TryCompare(first, second, !_caseSensitive, _cultureInfo, out int result))
+            if (!LanguagePrimitives.TryCompare(first, second, !_caseSensitive, _cultureInfo, out int result))
             {
-                return result * (_ascendingOrder ? 1 : -1);
-            }
+                // Note that this will occur if the objects do not support
+                // IComparable.  We fall back to comparing as strings.
 
-            // Note that this will occur if the objects do not support
-            // IComparable.  We fall back to comparing as strings.
+                // being here means the first object doesn't support ICompare
+                string firstString = PSObject.AsPSObject(first).ToString();
+                string secondString = PSObject.AsPSObject(second).ToString();
 
-            // being here means the first object doesn't support ICompare
-            string firstString = PSObject.AsPSObject(first).ToString();
-            string secondString = PSObject.AsPSObject(second).ToString();
+                result = _cultureInfo.CompareInfo.Compare(firstString, secondString, _caseSensitive ? CompareOptions.None : CompareOptions.IgnoreCase);
+            }
 
-            return _cultureInfo.CompareInfo.Compare(firstString, secondString, _caseSensitive ? CompareOptions.None : CompareOptions.IgnoreCase) * (_ascendingOrder ? 1 : -1);
+            return _ascendingOrder ? result : -result;
         }
 
         private readonly CultureInfo _cultureInfo = null;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/OrderObjectBase.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/OrderObjectBase.cs
index 75fc816abf2..7a6bcc6bc1b 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/OrderObjectBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/OrderObjectBase.cs
@@ -57,7 +57,7 @@ public class ObjectCmdletBase : PSCmdlet
         [System.Diagnostics.CodeAnalysis.SuppressMessage("GoldMan", "#pw17903:UseOfLCID", Justification = "The CultureNumber is only used if the property has been set with a hex string starting with 0x")]
         public string Culture
         {
-            get { return _cultureInfo != null ? _cultureInfo.ToString() : null; }
+            get { return _cultureInfo?.ToString(); }
 
             set
             {
@@ -182,9 +182,9 @@ internal sealed class OrderByProperty
         /// <summary>
         /// A logical matrix where each row is an input object and its property values specified by Properties.
         /// </summary>
-        internal List<OrderByPropertyEntry> OrderMatrix { get; } = null;
+        internal List<OrderByPropertyEntry> OrderMatrix { get; }
 
-        internal OrderByPropertyComparer Comparer { get; } = null;
+        internal OrderByPropertyComparer Comparer { get; }
 
         internal List<MshParameter> MshParameterList
         {
@@ -211,7 +211,7 @@ private static void ProcessExpressionParameter(
             out List<MshParameter> mshParameterList)
         {
             mshParameterList = null;
-            TerminatingErrorContext invocationContext = new TerminatingErrorContext(cmdlet);
+            TerminatingErrorContext invocationContext = new(cmdlet);
             // compare-object and group-object use the same definition here
             ParameterProcessor processor = cmdlet is SortObjectCommand ?
                 new ParameterProcessor(new SortObjectExpressionParameterDefinition()) :
@@ -235,7 +235,7 @@ internal void ProcessExpressionParameter(
             PSCmdlet cmdlet,
             object[] expr)
         {
-            TerminatingErrorContext invocationContext = new TerminatingErrorContext(cmdlet);
+            TerminatingErrorContext invocationContext = new(cmdlet);
             // compare-object and group-object use the same definition here
             ParameterProcessor processor = cmdlet is SortObjectCommand ?
                 new ParameterProcessor(new SortObjectExpressionParameterDefinition()) :
@@ -272,7 +272,7 @@ internal void ProcessExpressionParameter(
         // match property names on the incoming objects.
         private static List<MshParameter> ExpandExpressions(List<PSObject> inputObjects, List<MshParameter> unexpandedParameterList)
         {
-            List<MshParameter> expandedParameterList = new List<MshParameter>();
+            List<MshParameter> expandedParameterList = new();
 
             if (unexpandedParameterList != null)
             {
@@ -285,7 +285,7 @@ private static List<MshParameter> ExpandExpressions(List<PSObject> inputObjects,
                     }
                     else
                     {
-                        SortedDictionary<string, PSPropertyExpression> expandedPropertyNames = new SortedDictionary<string, PSPropertyExpression>(StringComparer.OrdinalIgnoreCase);
+                        SortedDictionary<string, PSPropertyExpression> expandedPropertyNames = new(StringComparer.OrdinalIgnoreCase);
                         if (inputObjects != null)
                         {
                             foreach (object inputObject in inputObjects)
@@ -304,7 +304,7 @@ private static List<MshParameter> ExpandExpressions(List<PSObject> inputObjects,
 
                         foreach (PSPropertyExpression expandedExpression in expandedPropertyNames.Values)
                         {
-                            MshParameter expandedParameter = new MshParameter();
+                            MshParameter expandedParameter = new();
                             expandedParameter.hash = (Hashtable)unexpandedParameter.hash.Clone();
                             expandedParameter.hash[FormatParameterDefinitionKeys.ExpressionEntryKey] = expandedExpression;
 
@@ -327,7 +327,7 @@ private static void ExpandExpressions(PSObject inputObject, List<MshParameter> U
                 {
                     PSPropertyExpression ex = (PSPropertyExpression)unexpandedParameter.GetEntry(FormatParameterDefinitionKeys.ExpressionEntryKey);
 
-                    SortedDictionary<string, PSPropertyExpression> expandedPropertyNames = new SortedDictionary<string, PSPropertyExpression>(StringComparer.OrdinalIgnoreCase);
+                    SortedDictionary<string, PSPropertyExpression> expandedPropertyNames = new(StringComparer.OrdinalIgnoreCase);
                     if (inputObject == null)
                     {
                         continue;
@@ -340,7 +340,7 @@ private static void ExpandExpressions(PSObject inputObject, List<MshParameter> U
 
                     foreach (PSPropertyExpression expandedExpression in expandedPropertyNames.Values)
                     {
-                        MshParameter expandedParameter = new MshParameter();
+                        MshParameter expandedParameter = new();
                         expandedParameter.hash = (Hashtable)unexpandedParameter.hash.Clone();
                         expandedParameter.hash[FormatParameterDefinitionKeys.ExpressionEntryKey] = expandedExpression;
 
@@ -376,14 +376,14 @@ internal static List<OrderByPropertyEntry> CreateOrderMatrix(
             List<MshParameter> mshParameterList
             )
         {
-            List<OrderByPropertyEntry> orderMatrixToCreate = new List<OrderByPropertyEntry>();
+            List<OrderByPropertyEntry> orderMatrixToCreate = new();
             for (int index = 0; index < inputObjects.Count; index++)
             {
                 PSObject so = inputObjects[index];
                 if (so == null || so == AutomationNull.Value)
                     continue;
-                List<ErrorRecord> evaluationErrors = new List<ErrorRecord>();
-                List<string> propertyNotFoundMsgs = new List<string>();
+                List<ErrorRecord> evaluationErrors = new();
+                List<string> propertyNotFoundMsgs = new();
                 OrderByPropertyEntry result =
                     OrderByPropertyEntryEvaluationHelper.ProcessObject(so, mshParameterList, evaluationErrors, propertyNotFoundMsgs, originalIndex: index);
                 foreach (ErrorRecord err in evaluationErrors)
@@ -478,7 +478,7 @@ bool caseSensitive
         }
 
         /// <summary>
-        /// OrderByProperty constructor.
+        /// Initializes a new instance of the <see cref="OrderByProperty"/> class.
         /// </summary>
         internal OrderByProperty()
         {
@@ -507,8 +507,8 @@ internal OrderByPropertyEntry CreateOrderByPropertyEntry(
                 ExpandExpressions(inputObject, _unExpandedParametersWithWildCardPattern, _mshParameterList);
             }
 
-            List<ErrorRecord> evaluationErrors = new List<ErrorRecord>();
-            List<string> propertyNotFoundMsgs = new List<string>();
+            List<ErrorRecord> evaluationErrors = new();
+            List<string> propertyNotFoundMsgs = new();
             OrderByPropertyEntry result =
                 OrderByPropertyEntryEvaluationHelper.ProcessObject(inputObject, _mshParameterList, evaluationErrors, propertyNotFoundMsgs, isCaseSensitive, cultureInfo);
             foreach (ErrorRecord err in evaluationErrors)
@@ -543,7 +543,7 @@ internal static OrderByPropertyEntry ProcessObject(PSObject inputObject, List<Ms
         {
             Diagnostics.Assert(errors != null, "errors cannot be null!");
             Diagnostics.Assert(propertyNotFoundMsgs != null, "propertyNotFoundMsgs cannot be null!");
-            OrderByPropertyEntry entry = new OrderByPropertyEntry();
+            OrderByPropertyEntry entry = new();
             entry.inputObject = inputObject;
             entry.originalIndex = originalIndex;
 
@@ -602,7 +602,7 @@ private static void EvaluateSortingExpression(
                 }
                 else
                 {
-                    ErrorRecord errorRecord = new ErrorRecord(
+                    ErrorRecord errorRecord = new(
                         r.Exception,
                         "ExpressionEvaluation",
                         ErrorCategory.InvalidResult,
@@ -622,7 +622,7 @@ private static void EvaluateSortingExpression(
     internal sealed class OrderByPropertyEntry
     {
         internal PSObject inputObject = null;
-        internal List<ObjectCommandPropertyValue> orderValues = new List<ObjectCommandPropertyValue>();
+        internal List<ObjectCommandPropertyValue> orderValues = new();
         // The originalIndex field was added to enable stable heap-sorts (Top N/Bottom N)
         internal int originalIndex = -1;
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/PSBreakpointAccessorCommandBase.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/PSBreakpointAccessorCommandBase.cs
index 88b3cde9acf..d3dfd30f9e5 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/PSBreakpointAccessorCommandBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/PSBreakpointAccessorCommandBase.cs
@@ -1,9 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System.Management.Automation;
-using System.Management.Automation.Runspaces;
-
 namespace Microsoft.PowerShell.Commands
 {
     /// <summary>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/PSBreakpointUpdaterCommandBase.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/PSBreakpointUpdaterCommandBase.cs
index 0b1452b0709..f186fbe1baa 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/PSBreakpointUpdaterCommandBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/PSBreakpointUpdaterCommandBase.cs
@@ -88,7 +88,7 @@ protected override void ProcessRecord()
 
         #region private data
 
-        private readonly Dictionary<Guid, Runspace> runspaces = new Dictionary<Guid, Runspace>();
+        private readonly Dictionary<Guid, Runspace> runspaces = new();
 
         #endregion private data
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ReadConsoleCmdlet.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ReadConsoleCmdlet.cs
index 2eb71f1ca5d..3fabe75de24 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ReadConsoleCmdlet.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ReadConsoleCmdlet.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -21,7 +20,7 @@ namespace Microsoft.PowerShell.Commands
     public sealed class ReadHostCommand : PSCmdlet
     {
         /// <summary>
-        /// Constructs a new instance.
+        /// Initializes a new instance of the <see cref="ReadHostCommand"/> class.
         /// </summary>
         public
         ReadHostCommand()
@@ -98,7 +97,7 @@ protected override void BeginProcessing()
                 IEnumerator e = LanguagePrimitives.GetEnumerator(_prompt);
                 if (e != null)
                 {
-                    StringBuilder sb = new StringBuilder();
+                    StringBuilder sb = new();
 
                     while (e.MoveNext())
                     {
@@ -126,7 +125,7 @@ protected override void BeginProcessing()
                     promptString = (string)LanguagePrimitives.ConvertTo(_prompt, typeof(string), CultureInfo.InvariantCulture);
                 }
 
-                FieldDescription fd = new FieldDescription(promptString);
+                FieldDescription fd = new(promptString);
                 if (AsSecureString || MaskInput)
                 {
                     fd.SetParameterType(typeof(SecureString));
@@ -136,7 +135,7 @@ protected override void BeginProcessing()
                     fd.SetParameterType(typeof(string));
                 }
 
-                Collection<FieldDescription> fdc = new Collection<FieldDescription>();
+                Collection<FieldDescription> fdc = new();
                 fdc.Add(fd);
 
                 Dictionary<string, PSObject> result = Host.UI.Prompt(string.Empty, string.Empty, fdc);
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/RegisterObjectEventCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/RegisterObjectEventCommand.cs
index ce72dac51fe..d4e7dc784c1 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/RegisterObjectEventCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/RegisterObjectEventCommand.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
 using System.Management.Automation;
 
 namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/RegisterPSEventCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/RegisterPSEventCommand.cs
index f04124e9a4c..6e4ced90760 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/RegisterPSEventCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/RegisterPSEventCommand.cs
@@ -42,7 +42,7 @@ protected override object GetSourceObject()
                 (!(bool)Forward)
                )
             {
-                ErrorRecord errorRecord = new ErrorRecord(
+                ErrorRecord errorRecord = new(
                     new ArgumentException(EventingStrings.ActionMandatoryForLocal),
                     "ACTION_MANDATORY_FOR_LOCAL",
                     ErrorCategory.InvalidArgument,
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/RemoveAliasCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/RemoveAliasCommand.cs
index 7b44a0c2664..7cec08e1b10 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/RemoveAliasCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/RemoveAliasCommand.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
 using System.Management.Automation;
 using System.Management.Automation.Internal;
 
@@ -62,8 +61,8 @@ protected override void ProcessRecord()
                 }
                 else
                 {
-                    ItemNotFoundException notAliasFound = new ItemNotFoundException(StringUtil.Format(AliasCommandStrings.NoAliasFound, "name", aliasName));
-                    ErrorRecord error = new ErrorRecord(notAliasFound, "ItemNotFoundException", ErrorCategory.ObjectNotFound, aliasName);
+                    ItemNotFoundException notAliasFound = new(StringUtil.Format(AliasCommandStrings.NoAliasFound, "name", aliasName));
+                    ErrorRecord error = new(notAliasFound, "ItemNotFoundException", ErrorCategory.ObjectNotFound, aliasName);
                     WriteError(error);
                 }
             }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/RemoveEventCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/RemoveEventCommand.cs
index 14acbbdf6af..4b8ade4a94a 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/RemoveEventCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/RemoveEventCommand.cs
@@ -111,7 +111,7 @@ protected override void ProcessRecord()
                (!WildcardPattern.ContainsWildcardCharacters(_sourceIdentifier)) &&
                (!foundMatch))
             {
-                ErrorRecord errorRecord = new ErrorRecord(
+                ErrorRecord errorRecord = new(
                     new ArgumentException(
                         string.Format(
                             System.Globalization.CultureInfo.CurrentCulture,
@@ -124,7 +124,7 @@ protected override void ProcessRecord()
             }
             else if ((_eventIdentifier >= 0) && (!foundMatch))
             {
-                ErrorRecord errorRecord = new ErrorRecord(
+                ErrorRecord errorRecord = new(
                     new ArgumentException(
                         string.Format(
                             System.Globalization.CultureInfo.CurrentCulture,
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Select-Object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Select-Object.cs
index a7df66cf128..efdd82d79de 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Select-Object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Select-Object.cs
@@ -18,7 +18,8 @@ namespace Microsoft.PowerShell.Commands
     internal sealed class PSPropertyExpressionFilter
     {
         /// <summary>
-        /// Construct the class, using an array of patterns.
+        /// Initializes a new instance of the <see cref="PSPropertyExpressionFilter"/> class
+        /// with the specified array of patterns.
         /// </summary>
         /// <param name="wildcardPatternsStrings">Array of pattern strings to use.</param>
         internal PSPropertyExpressionFilter(string[] wildcardPatternsStrings)
@@ -90,14 +91,14 @@ public sealed class SelectObjectCommand : PSCmdlet
         /// <value></value>
         [Parameter(ParameterSetName = "DefaultParameter")]
         [Parameter(ParameterSetName = "SkipLastParameter")]
-        public string[] ExcludeProperty { get; set; } = null;
+        public string[] ExcludeProperty { get; set; }
 
         /// <summary>
         /// </summary>
         /// <value></value>
         [Parameter(ParameterSetName = "DefaultParameter")]
         [Parameter(ParameterSetName = "SkipLastParameter")]
-        public string ExpandProperty { get; set; } = null;
+        public string ExpandProperty { get; set; }
 
         /// <summary>
         /// </summary>
@@ -151,14 +152,14 @@ public int First
         /// <value></value>
         [Parameter(ParameterSetName = "DefaultParameter")]
         [ValidateRange(0, int.MaxValue)]
-        public int Skip { get; set; } = 0;
+        public int Skip { get; set; }
 
         /// <summary>
         /// Skip the specified number of items from end.
         /// </summary>
         [Parameter(ParameterSetName = "SkipLastParameter")]
         [ValidateRange(0, int.MaxValue)]
-        public int SkipLast { get; set; } = 0;
+        public int SkipLast { get; set; }
 
         /// <summary>
         /// With this switch present, the cmdlet won't "short-circuit"
@@ -340,9 +341,9 @@ internal UniquePSObjectHelper(PSObject o, int notePropertyCount)
 
         private void ProcessExpressionParameter()
         {
-            TerminatingErrorContext invocationContext = new TerminatingErrorContext(this);
+            TerminatingErrorContext invocationContext = new(this);
             ParameterProcessor processor =
-                new ParameterProcessor(new SelectObjectExpressionParameterDefinition());
+                new(new SelectObjectExpressionParameterDefinition());
             if ((Property != null) && (Property.Length != 0))
             {
                 // Build property list taking into account the wildcards and @{name=;expression=}
@@ -381,7 +382,7 @@ private void ProcessObject(PSObject inputObject)
             }
 
             // If property parameter is mentioned
-            List<PSNoteProperty> matchedProperties = new List<PSNoteProperty>();
+            List<PSNoteProperty> matchedProperties = new();
             foreach (MshParameter p in _propertyMshParameterList)
             {
                 ProcessParameter(p, inputObject, matchedProperties);
@@ -389,10 +390,10 @@ private void ProcessObject(PSObject inputObject)
 
             if (string.IsNullOrEmpty(ExpandProperty))
             {
-                PSObject result = new PSObject();
+                PSObject result = new();
                 if (matchedProperties.Count != 0)
                 {
-                    HashSet<string> propertyNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+                    HashSet<string> propertyNames = new(StringComparer.OrdinalIgnoreCase);
 
                     foreach (PSNoteProperty noteProperty in matchedProperties)
                     {
@@ -430,7 +431,7 @@ private void ProcessParameter(MshParameter p, PSObject inputObject, List<PSNoteP
             string name = p.GetEntry(NameEntryDefinition.NameEntryKey) as string;
 
             PSPropertyExpression ex = p.GetEntry(FormatParameterDefinitionKeys.ExpressionEntryKey) as PSPropertyExpression;
-            List<PSPropertyExpressionResult> expressionResults = new List<PSPropertyExpressionResult>();
+            List<PSPropertyExpressionResult> expressionResults = new();
             foreach (PSPropertyExpression resolvedName in ex.ResolveNames(inputObject))
             {
                 if (_exclusionFilter == null || !_exclusionFilter.IsMatch(resolvedName))
@@ -455,7 +456,7 @@ private void ProcessParameter(MshParameter p, PSObject inputObject, List<PSNoteP
             else if (!string.IsNullOrEmpty(name) && expressionResults.Count > 1)
             {
                 string errorMsg = SelectObjectStrings.RenamingMultipleResults;
-                ErrorRecord errorRecord = new ErrorRecord(
+                ErrorRecord errorRecord = new(
                     new InvalidOperationException(errorMsg),
                     "RenamingMultipleResults",
                     ErrorCategory.InvalidOperation,
@@ -505,7 +506,7 @@ private void ProcessExpandParameter(MshParameter p, PSObject inputObject,
 
             if (expressionResults.Count == 0)
             {
-                ErrorRecord errorRecord = new ErrorRecord(
+                ErrorRecord errorRecord = new(
                     PSTraceSource.NewArgumentException("ExpandProperty", SelectObjectStrings.PropertyNotFound, ExpandProperty),
                     "ExpandPropertyNotFound",
                      ErrorCategory.InvalidArgument,
@@ -515,7 +516,7 @@ private void ProcessExpandParameter(MshParameter p, PSObject inputObject,
 
             if (expressionResults.Count > 1)
             {
-                ErrorRecord errorRecord = new ErrorRecord(
+                ErrorRecord errorRecord = new(
                     PSTraceSource.NewArgumentException("ExpandProperty", SelectObjectStrings.MutlipleExpandProperties, ExpandProperty),
                     "MutlipleExpandProperties",
                     ErrorCategory.InvalidArgument,
@@ -562,7 +563,7 @@ private void ProcessExpandParameter(MshParameter p, PSObject inputObject,
             }
             else
             {
-                ErrorRecord errorRecord = new ErrorRecord(
+                ErrorRecord errorRecord = new(
                     r.Exception,
                     "PropertyEvaluationExpand",
                     ErrorCategory.InvalidResult,
@@ -595,7 +596,7 @@ private void AddNoteProperties(PSObject expandedObject, PSObject inputObject, IE
 
         private void WriteAlreadyExistingPropertyError(string name, object inputObject, string errorId)
         {
-            ErrorRecord errorRecord = new ErrorRecord(
+            ErrorRecord errorRecord = new(
                 PSTraceSource.NewArgumentException("Property", SelectObjectStrings.AlreadyExistingProperty, name),
                 errorId,
                 ErrorCategory.InvalidOperation,
@@ -623,7 +624,7 @@ private void FilteredWriteObject(PSObject obj, List<PSNoteProperty> addedNotePro
                 bool isObjUnique = true;
                 foreach (UniquePSObjectHelper uniqueObj in _uniques)
                 {
-                    ObjectCommandComparer comparer = new ObjectCommandComparer(true, CultureInfo.CurrentCulture, true);
+                    ObjectCommandComparer comparer = new(true, CultureInfo.CurrentCulture, true);
                     if ((comparer.Compare(obj.BaseObject, uniqueObj.WrittenObject.BaseObject) == 0) &&
                         (uniqueObj.NotePropertyCount == addedNoteProperties.Count))
                     {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Send-MailMessage.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Send-MailMessage.cs
index 90d34be2ff3..975fd68ebfa 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Send-MailMessage.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Send-MailMessage.cs
@@ -173,7 +173,7 @@ public Encoding Encoding
         #region Private variables and methods
 
         // Instantiate a new instance of MailMessage
-        private readonly MailMessage _mMailMessage = new MailMessage();
+        private readonly MailMessage _mMailMessage = new();
 
         private SmtpClient _mSmtpClient = null;
 
@@ -216,7 +216,7 @@ private void AddAddressesToMailMessage(object address, string param)
                 }
                 catch (FormatException e)
                 {
-                    ErrorRecord er = new ErrorRecord(e, "FormatException", ErrorCategory.InvalidType, null);
+                    ErrorRecord er = new(e, "FormatException", ErrorCategory.InvalidType, null);
                     WriteError(er);
                     continue;
                 }
@@ -239,7 +239,7 @@ protected override void BeginProcessing()
             }
             catch (FormatException e)
             {
-                ErrorRecord er = new ErrorRecord(e, "FormatException", ErrorCategory.InvalidType, From);
+                ErrorRecord er = new(e, "FormatException", ErrorCategory.InvalidType, From);
                 ThrowTerminatingError(er);
             }
 
@@ -294,7 +294,7 @@ protected override void BeginProcessing()
 
             if (string.IsNullOrEmpty(SmtpServer))
             {
-                ErrorRecord er = new ErrorRecord(new InvalidOperationException(SendMailMessageStrings.HostNameValue), null, ErrorCategory.InvalidArgument, null);
+                ErrorRecord er = new(new InvalidOperationException(SendMailMessageStrings.HostNameValue), null, ErrorCategory.InvalidArgument, null);
                 this.ThrowTerminatingError(er);
             }
 
@@ -344,7 +344,7 @@ protected override void ProcessRecord()
                         PathUtils.ReportFileOpenFailure(this, filepath, e);
                     }
 
-                    Attachment mailAttachment = new Attachment(filepath);
+                    Attachment mailAttachment = new(filepath);
                     _mMailMessage.Attachments.Add(mailAttachment);
                 }
             }
@@ -362,30 +362,30 @@ protected override void EndProcessing()
             }
             catch (SmtpFailedRecipientsException ex)
             {
-                ErrorRecord er = new ErrorRecord(ex, "SmtpFailedRecipientsException", ErrorCategory.InvalidOperation, _mSmtpClient);
+                ErrorRecord er = new(ex, "SmtpFailedRecipientsException", ErrorCategory.InvalidOperation, _mSmtpClient);
                 WriteError(er);
             }
             catch (SmtpException ex)
             {
                 if (ex.InnerException != null)
                 {
-                    ErrorRecord er = new ErrorRecord(new SmtpException(ex.InnerException.Message), "SmtpException", ErrorCategory.InvalidOperation, _mSmtpClient);
+                    ErrorRecord er = new(new SmtpException(ex.InnerException.Message), "SmtpException", ErrorCategory.InvalidOperation, _mSmtpClient);
                     WriteError(er);
                 }
                 else
                 {
-                    ErrorRecord er = new ErrorRecord(ex, "SmtpException", ErrorCategory.InvalidOperation, _mSmtpClient);
+                    ErrorRecord er = new(ex, "SmtpException", ErrorCategory.InvalidOperation, _mSmtpClient);
                     WriteError(er);
                 }
             }
             catch (InvalidOperationException ex)
             {
-                ErrorRecord er = new ErrorRecord(ex, "InvalidOperationException", ErrorCategory.InvalidOperation, _mSmtpClient);
+                ErrorRecord er = new(ex, "InvalidOperationException", ErrorCategory.InvalidOperation, _mSmtpClient);
                 WriteError(er);
             }
             catch (System.Security.Authentication.AuthenticationException ex)
             {
-                ErrorRecord er = new ErrorRecord(ex, "AuthenticationException", ErrorCategory.InvalidOperation, _mSmtpClient);
+                ErrorRecord er = new(ex, "AuthenticationException", ErrorCategory.InvalidOperation, _mSmtpClient);
                 WriteError(er);
             }
             finally
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Set-PSBreakpoint.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Set-PSBreakpoint.cs
index e628da48244..ccf17652c79 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Set-PSBreakpoint.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Set-PSBreakpoint.cs
@@ -123,7 +123,7 @@ protected override void BeginProcessing()
         protected override void ProcessRecord()
         {
             // If there is a script, resolve its path
-            Collection<string> scripts = new Collection<string>();
+            Collection<string> scripts = new();
 
             if (Script != null)
             {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetAliasCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetAliasCommand.cs
index b2746625375..6c0007fa2a2 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetAliasCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetAliasCommand.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
 using System.Management.Automation;
 using System.Management.Automation.Internal;
 
@@ -24,7 +23,7 @@ protected override void ProcessRecord()
             // Create the alias info
 
             AliasInfo aliasToSet =
-                new AliasInfo(
+                new(
                     Name,
                     Value,
                     Context,
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetDateCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetDateCommand.cs
index e00a3bda2d9..77b0dce3470 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetDateCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetDateCommand.cs
@@ -77,7 +77,7 @@ protected override void ProcessRecord()
                 }
 #else
                 // build up the SystemTime struct to pass to SetSystemTime
-                NativeMethods.SystemTime systemTime = new NativeMethods.SystemTime();
+                NativeMethods.SystemTime systemTime = new();
                 systemTime.Year = (UInt16)dateToUse.Year;
                 systemTime.Month = (UInt16)dateToUse.Month;
                 systemTime.Day = (UInt16)dateToUse.Day;
@@ -102,8 +102,8 @@ protected override void ProcessRecord()
             }
 
             // output DateTime object wrapped in an PSObject with DisplayHint attached
-            PSObject outputObj = new PSObject(dateToUse);
-            PSNoteProperty note = new PSNoteProperty("DisplayHint", DisplayHint);
+            PSObject outputObj = new(dateToUse);
+            PSNoteProperty note = new("DisplayHint", DisplayHint);
             outputObj.Properties.Add(note);
 
             WriteObject(outputObj);
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommand.cs
index d9556753fb1..330716af151 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommand.cs
@@ -50,7 +50,7 @@ public class ShowCommandCommand : PSCmdlet, IDisposable
         /// <summary>
         /// Record the EndProcessing error.
         /// </summary>
-        private PSDataCollection<ErrorRecord> _errors = new PSDataCollection<ErrorRecord>();
+        private PSDataCollection<ErrorRecord> _errors = new();
 
         /// <summary>
         /// Field used for the NoCommonParameter parameter.
@@ -63,14 +63,6 @@ public class ShowCommandCommand : PSCmdlet, IDisposable
         private object _commandViewModelObj;
         #endregion
 
-        /// <summary>
-        /// Finalizes an instance of the ShowCommandCommand class.
-        /// </summary>
-        ~ShowCommandCommand()
-        {
-            this.Dispose(false);
-        }
-
         #region Input Cmdlet Parameter
         /// <summary>
         /// Gets or sets the command name.
@@ -182,7 +174,7 @@ protected override void BeginProcessing()
 
             if (_showCommandProxy.ScreenHeight < this.Height)
             {
-                ErrorRecord error = new ErrorRecord(
+                ErrorRecord error = new(
                                     new NotSupportedException(string.Format(CultureInfo.CurrentUICulture, FormatAndOut_out_gridview.PropertyValidate, "Height", _showCommandProxy.ScreenHeight)),
                                     "PARAMETER_DATA_ERROR",
                                     ErrorCategory.InvalidData,
@@ -192,7 +184,7 @@ protected override void BeginProcessing()
 
             if (_showCommandProxy.ScreenWidth < this.Width)
             {
-                ErrorRecord error = new ErrorRecord(
+                ErrorRecord error = new(
                                     new NotSupportedException(string.Format(CultureInfo.CurrentUICulture, FormatAndOut_out_gridview.PropertyValidate, "Width", _showCommandProxy.ScreenWidth)),
                                     "PARAMETER_DATA_ERROR",
                                     ErrorCategory.InvalidData,
@@ -241,7 +233,7 @@ protected override void EndProcessing()
                 return;
             }
 
-            StringBuilder errorString = new StringBuilder();
+            StringBuilder errorString = new();
 
             for (int i = 0; i < _errors.Count; i++)
             {
@@ -276,7 +268,7 @@ protected override void StopProcessing()
         private void RunScriptSilentlyAndWithErrorHookup(string script)
         {
             // errors are not created here, because there is a field for it used in the final pop up
-            PSDataCollection<object> output = new PSDataCollection<object>();
+            PSDataCollection<object> output = new();
 
             output.DataAdded += this.Output_DataAdded;
             _errors.DataAdded += this.Error_DataAdded;
@@ -294,7 +286,7 @@ private void RunScriptSilentlyAndWithErrorHookup(string script)
         /// </summary>
         private void IssueErrorForNoCommand()
         {
-            InvalidOperationException errorException = new InvalidOperationException(
+            InvalidOperationException errorException = new(
                 string.Format(
                     CultureInfo.CurrentUICulture,
                     FormatAndOut_out_gridview.CommandNotFound,
@@ -307,7 +299,7 @@ private void IssueErrorForNoCommand()
         /// </summary>
         private void IssueErrorForMoreThanOneCommand()
         {
-            InvalidOperationException errorException = new InvalidOperationException(
+            InvalidOperationException errorException = new(
                 string.Format(
                     CultureInfo.CurrentUICulture,
                     FormatAndOut_out_gridview.MoreThanOneCommand,
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandCommandInfo.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandCommandInfo.cs
index 1450555d8d7..e3de5cac296 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandCommandInfo.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandCommandInfo.cs
@@ -14,7 +14,8 @@ namespace Microsoft.PowerShell.Commands.ShowCommandExtension
     public class ShowCommandCommandInfo
     {
         /// <summary>
-        /// Creates an instance of the ShowCommandCommandInfo class based on a CommandInfo object.
+        /// Initializes a new instance of the <see cref="ShowCommandCommandInfo"/> class
+        /// with the specified <see cref="CommandInfo"/>.
         /// </summary>
         /// <param name="other">
         /// The object to wrap.
@@ -62,7 +63,8 @@ public ShowCommandCommandInfo(CommandInfo other)
         }
 
         /// <summary>
-        /// Creates an instance of the ShowCommandCommandInfo class based on a PSObject object.
+        /// Initializes a new instance of the <see cref="ShowCommandCommandInfo"/> class
+        /// with the specified <see cref="PSObject"/>.
         /// </summary>
         /// <param name="other">
         /// The object to wrap.
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandModuleInfo.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandModuleInfo.cs
index 6e0f7c97012..b12cc5651f4 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandModuleInfo.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandModuleInfo.cs
@@ -12,7 +12,8 @@ namespace Microsoft.PowerShell.Commands.ShowCommandExtension
     public class ShowCommandModuleInfo
     {
         /// <summary>
-        /// Creates an instance of the ShowCommandModuleInfo class based on a CommandInfo object.
+        /// Initializes a new instance of the <see cref="ShowCommandModuleInfo"/> class
+        /// with the specified <see cref="CommandInfo"/>.
         /// </summary>
         /// <param name="other">
         /// The object to wrap.
@@ -28,7 +29,8 @@ public ShowCommandModuleInfo(PSModuleInfo other)
         }
 
         /// <summary>
-        /// Creates an instance of the ShowCommandModuleInfo class based on a PSObject object.
+        /// Initializes a new instance of the <see cref="ShowCommandModuleInfo"/> class
+        /// with the specified <see cref="PSObject"/>.
         /// </summary>
         /// <param name="other">
         /// The object to wrap.
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandParameterInfo.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandParameterInfo.cs
index 22b3f692694..04a74b4fc45 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandParameterInfo.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandParameterInfo.cs
@@ -14,7 +14,8 @@ namespace Microsoft.PowerShell.Commands.ShowCommandExtension
     public class ShowCommandParameterInfo
     {
         /// <summary>
-        /// Creates an instance of the ShowCommandParameterInfo class based on a CommandParameterInfo object.
+        /// Initializes a new instance of the <see cref="ShowCommandParameterInfo"/> class
+        /// with the specified <see cref="CommandParameterInfo"/>.
         /// </summary>
         /// <param name="other">
         /// The object to wrap.
@@ -41,6 +42,7 @@ public ShowCommandParameterInfo(CommandParameterInfo other)
         }
 
         /// <summary>
+        /// Initializes a new instance of the <see cref="ShowCommandParameterInfo"/> class.
         /// Creates an instance of the ShowCommandParameterInfo class based on a PSObject object.
         /// </summary>
         /// <param name="other">
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandParameterSetInfo.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandParameterSetInfo.cs
index b8c906a2266..fb25e2e4745 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandParameterSetInfo.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandParameterSetInfo.cs
@@ -14,7 +14,8 @@ namespace Microsoft.PowerShell.Commands.ShowCommandExtension
     public class ShowCommandParameterSetInfo
     {
         /// <summary>
-        /// Creates an instance of the ShowCommandParameterSetInfo class based on a CommandParameterSetInfo object.
+        /// Initializes a new instance of the <see cref="ShowCommandParameterSetInfo"/> class
+        /// with the specified <see cref="CommandParameterSetInfo"/>.
         /// </summary>
         /// <param name="other">
         /// The object to wrap.
@@ -32,7 +33,8 @@ public ShowCommandParameterSetInfo(CommandParameterSetInfo other)
         }
 
         /// <summary>
-        /// Creates an instance of the ShowCommandParameterSetInfo class based on a PSObject object.
+        /// Initializes a new instance of the <see cref="ShowCommandParameterSetInfo"/> class
+        /// with the specified <see cref="PSObject"/>.
         /// </summary>
         /// <param name="other">
         /// The object to wrap.
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandParameterType.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandParameterType.cs
index c0bbb644d3c..1daf0350dbc 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandParameterType.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandParameterType.cs
@@ -13,7 +13,8 @@ namespace Microsoft.PowerShell.Commands.ShowCommandExtension
     public class ShowCommandParameterType
     {
         /// <summary>
-        /// Creates an instance of the ShowCommandParameterType class based on a Type object.
+        /// Initializes a new instance of the <see cref="ShowCommandParameterType"/> class
+        /// with the specified <see cref="Type"/>.
         /// </summary>
         /// <param name="other">
         /// The object to wrap.
@@ -42,7 +43,8 @@ public ShowCommandParameterType(Type other)
         }
 
         /// <summary>
-        /// Creates an instance of the ShowCommandParameterType class based on a Type object.
+        /// Initializes a new instance of the <see cref="ShowCommandParameterType"/> class
+        /// with the specified <see cref="Type"/>.
         /// </summary>
         /// <param name="other">
         /// The object to wrap.
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowMarkdownCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowMarkdownCommand.cs
index 2203fbb20a7..63ee15f6f59 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowMarkdownCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowMarkdownCommand.cs
@@ -2,8 +2,6 @@
 // Licensed under the MIT License.
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Globalization;
@@ -170,7 +168,7 @@ private void ProcessMarkdownInfo(MarkdownInfo markdownInfo)
 
                     try
                     {
-                        ProcessStartInfo startInfo = new ProcessStartInfo();
+                        ProcessStartInfo startInfo = new();
                         startInfo.FileName = tmpFilePath;
                         startInfo.UseShellExecute = true;
                         Process.Start(startInfo);
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Sort-Object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Sort-Object.cs
index 5f66b39753f..06f5ebfffad 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Sort-Object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Sort-Object.cs
@@ -53,14 +53,14 @@ public SwitchParameter Descending
         /// </summary>
         [Parameter(ParameterSetName = "Top", Mandatory = true)]
         [ValidateRange(1, int.MaxValue)]
-        public int Top { get; set; } = 0;
+        public int Top { get; set; }
 
         /// <summary>
         /// Gets or sets the number of items to return in a Bottom N sort.
         /// </summary>
         [Parameter(ParameterSetName = "Bottom", Mandatory = true)]
         [ValidateRange(1, int.MaxValue)]
-        public int Bottom { get; set; } = 0;
+        public int Bottom { get; set; }
 
         /// <summary>
         /// Moves unique entries to the front of the list.
@@ -239,7 +239,7 @@ private int Heapify(List<OrderByPropertyEntry> dataToSort, OrderByPropertyCompar
         /// </summary>
         protected override void EndProcessing()
         {
-            OrderByProperty orderByProperty = new OrderByProperty(
+            OrderByProperty orderByProperty = new(
                 this, InputObjects, Property, !Descending, ConvertedCulture, CaseSensitive);
 
             var dataToProcess = orderByProperty.OrderMatrix;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs
index da65c683616..a57d635f3eb 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs
@@ -64,7 +64,7 @@ public void Dispose()
 
         // object used for synchronizes pipeline thread and stop thread
         // access to waitHandle
-        private readonly object _syncObject = new object();
+        private readonly object _syncObject = new();
 
         // this is set to true by stopProcessing
         private bool _stopping = false;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Tee-Object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Tee-Object.cs
index 32048362b06..78ca964d408 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Tee-Object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Tee-Object.cs
@@ -111,6 +111,7 @@ protected override void BeginProcessing()
                 // the values to be written
             }
         }
+
         /// <summary>
         /// </summary>
         protected override void ProcessRecord()
@@ -148,13 +149,6 @@ public void Dispose()
             GC.SuppressFinalize(this);
         }
 
-        /// <summary>
-        /// Finalizer.
-        /// </summary>
-        ~TeeObjectCommand()
-        {
-            Dispose(false);
-        }
         #region private
         private CommandWrapper _commandWrapper;
         private bool _alreadyDisposed;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TestJsonCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TestJsonCommand.cs
index 3b9655cadc8..c8ba1e7ea48 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TestJsonCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TestJsonCommand.cs
@@ -115,7 +115,7 @@ e is NotSupportedException ||
                 e is SecurityException
             )
             {
-                Exception exception = new Exception(
+                Exception exception = new(
                     string.Format(
                         CultureInfo.CurrentUICulture,
                         TestJsonCmdletStrings.JsonSchemaFileOpenFailure,
@@ -125,7 +125,7 @@ e is SecurityException
             }
             catch (Exception e)
             {
-                Exception exception = new Exception(TestJsonCmdletStrings.InvalidJsonSchema, e);
+                Exception exception = new(TestJsonCmdletStrings.InvalidJsonSchema, e);
                 ThrowTerminatingError(new ErrorRecord(exception, "InvalidJsonSchema", ErrorCategory.InvalidData, resolvedpath));
             }
         }
@@ -149,11 +149,11 @@ protected override void ProcessRecord()
                     {
                         result = false;
 
-                        Exception exception = new Exception(TestJsonCmdletStrings.InvalidJsonAgainstSchema);
+                        Exception exception = new(TestJsonCmdletStrings.InvalidJsonAgainstSchema);
 
                         foreach (var message in errorMessages)
                         {
-                            ErrorRecord errorRecord = new ErrorRecord(exception, "InvalidJsonAgainstSchema", ErrorCategory.InvalidData, null);
+                            ErrorRecord errorRecord = new(exception, "InvalidJsonAgainstSchema", ErrorCategory.InvalidData, null);
                             errorRecord.ErrorDetails = new ErrorDetails(message.ToString());
                             WriteError(errorRecord);
                         }
@@ -164,7 +164,7 @@ protected override void ProcessRecord()
             {
                 result = false;
 
-                Exception exception = new Exception(TestJsonCmdletStrings.InvalidJson, exc);
+                Exception exception = new(TestJsonCmdletStrings.InvalidJson, exc);
                 WriteError(new ErrorRecord(exception, "InvalidJson", ErrorCategory.InvalidData, Json));
             }
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TimeExpressionCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TimeExpressionCommand.cs
index 655598e9036..24ed81995d1 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TimeExpressionCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/TimeExpressionCommand.cs
@@ -37,7 +37,7 @@ public sealed class MeasureCommandCommand : PSCmdlet
 
         #region private members
 
-        private readonly System.Diagnostics.Stopwatch _stopWatch = new System.Diagnostics.Stopwatch();
+        private readonly System.Diagnostics.Stopwatch _stopWatch = new();
 
         #endregion
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/UnblockFile.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/UnblockFile.cs
index fad330212ed..5c297ed86d5 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/UnblockFile.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/UnblockFile.cs
@@ -6,14 +6,15 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
+#if UNIX
 using System.Globalization;
-using System.IO;
 using System.Management.Automation;
-using System.Management.Automation.Internal;
 using System.Runtime.InteropServices;
+#else
+using System.Management.Automation;
+using System.Management.Automation.Internal;
+#endif
 
 #endregion
 
@@ -73,7 +74,7 @@ public string[] LiteralPath
         /// </summary>
         protected override void ProcessRecord()
         {
-            List<string> pathsToProcess = new List<string>();
+            List<string> pathsToProcess = new();
             ProviderInfo provider = null;
 
             if (string.Equals(this.ParameterSetName, "ByLiteralPath", StringComparison.OrdinalIgnoreCase))
@@ -109,7 +110,7 @@ protected override void ProcessRecord()
                     {
                         if (!WildcardPattern.ContainsWildcardCharacters(path))
                         {
-                            ErrorRecord errorRecord = new ErrorRecord(e,
+                            ErrorRecord errorRecord = new(e,
                                 "FileNotFound",
                                 ErrorCategory.ObjectNotFound,
                                 path);
@@ -146,10 +147,10 @@ protected override void ProcessRecord()
 
             foreach (string path in pathsToProcess)
             {
-                if(IsBlocked(path))
+                if (IsBlocked(path))
                 {
                     UInt32 result = RemoveXattr(path, MacBlockAttribute, RemovexattrFollowSymLink);
-                    if(result != 0)
+                    if (result != 0)
                     {
                         string errorMessage = string.Format(CultureInfo.CurrentUICulture, UnblockFileStrings.UnblockError, path);
                         Exception e = new InvalidOperationException(errorMessage);
@@ -179,7 +180,7 @@ private bool IsValidFileForUnblocking(string resolvedpath)
             {
                 if (!System.IO.File.Exists(resolvedpath))
                 {
-                    ErrorRecord errorRecord = new ErrorRecord(
+                    ErrorRecord errorRecord = new(
                         new System.IO.FileNotFoundException(resolvedpath),
                         "FileNotFound",
                         ErrorCategory.ObjectNotFound,
@@ -196,9 +197,9 @@ private bool IsValidFileForUnblocking(string resolvedpath)
         }
 
 #if UNIX
-        private bool IsBlocked(string path)
+        private static bool IsBlocked(string path)
         {
-            uint valueSize = 1024;
+            const uint valueSize = 1024;
             IntPtr value = Marshal.AllocHGlobal((int)valueSize);
             try
             {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/UnregisterEventCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/UnregisterEventCommand.cs
index f89b3d6e4cc..f0f87eb9f66 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/UnregisterEventCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/UnregisterEventCommand.cs
@@ -97,7 +97,7 @@ protected override void ProcessRecord()
                (!WildcardPattern.ContainsWildcardCharacters(_sourceIdentifier)) &&
                (!_foundMatch))
             {
-                ErrorRecord errorRecord = new ErrorRecord(
+                ErrorRecord errorRecord = new(
                     new ArgumentException(
                         string.Format(
                             System.Globalization.CultureInfo.CurrentCulture,
@@ -111,7 +111,7 @@ protected override void ProcessRecord()
             else if ((SubscriptionId >= 0) &&
                (!_foundMatch))
             {
-                ErrorRecord errorRecord = new ErrorRecord(
+                ErrorRecord errorRecord = new(
                     new ArgumentException(
                         string.Format(
                             System.Globalization.CultureInfo.CurrentCulture,
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-Data.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-Data.cs
index 0565d6d7d41..4a3198d2911 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-Data.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-Data.cs
@@ -35,7 +35,7 @@ public class UpdateData : PSCmdlet
 
         private static void ReportWrongExtension(string file, string errorId, PSCmdlet cmdlet)
         {
-            ErrorRecord errorRecord = new ErrorRecord(
+            ErrorRecord errorRecord = new(
                 PSTraceSource.NewInvalidOperationException(UpdateDataStrings.UpdateData_WrongExtension, file, "ps1xml"),
                 errorId,
                 ErrorCategory.InvalidArgument,
@@ -45,7 +45,7 @@ private static void ReportWrongExtension(string file, string errorId, PSCmdlet c
 
         private static void ReportWrongProviderType(string providerId, string errorId, PSCmdlet cmdlet)
         {
-            ErrorRecord errorRecord = new ErrorRecord(
+            ErrorRecord errorRecord = new(
                 PSTraceSource.NewInvalidOperationException(UpdateDataStrings.UpdateData_WrongProviderError, providerId),
                 errorId,
                 ErrorCategory.InvalidArgument,
@@ -61,7 +61,7 @@ private static void ReportWrongProviderType(string providerId, string errorId, P
         /// <returns></returns>
         internal static Collection<string> Glob(string[] files, string errorId, PSCmdlet cmdlet)
         {
-            Collection<string> retValue = new Collection<string>();
+            Collection<string> retValue = new();
             foreach (string file in files)
             {
                 Collection<string> providerPaths;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-List.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-List.cs
index dbff09ef36a..5850eaca7db 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-List.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-List.cs
@@ -129,7 +129,7 @@ protected override void EndProcessing()
 
         private Hashtable CreateHashtable()
         {
-            Hashtable hash = new Hashtable(2);
+            Hashtable hash = new(2);
             if (Add != null)
             {
                 hash.Add("Add", Add);
@@ -150,7 +150,7 @@ private Hashtable CreateHashtable()
 
         private PSListModifier CreatePSListModifier()
         {
-            PSListModifier listModifier = new PSListModifier();
+            PSListModifier listModifier = new();
             if (Add != null)
             {
                 foreach (object obj in Add)
@@ -180,8 +180,8 @@ private PSListModifier CreatePSListModifier()
 
         private ErrorRecord NewError(string errorId, string resourceId, object targetObject, params object[] args)
         {
-            ErrorDetails details = new ErrorDetails(this.GetType().Assembly, "UpdateListStrings", resourceId, args);
-            ErrorRecord errorRecord = new ErrorRecord(
+            ErrorDetails details = new(this.GetType().Assembly, "UpdateListStrings", resourceId, args);
+            ErrorRecord errorRecord = new(
                 new InvalidOperationException(details.Message),
                 errorId,
                 ErrorCategory.InvalidOperation,
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-TypeData.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-TypeData.cs
index 603aeb6000c..7ada7d4b947 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-TypeData.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-TypeData.cs
@@ -28,7 +28,7 @@ public class UpdateTypeDataCommand : UpdateData
         private const string DynamicTypeSet = "DynamicTypeSet";
         private const string TypeDataSet = "TypeDataSet";
 
-        private static readonly object s_notSpecified = new object();
+        private static readonly object s_notSpecified = new();
 
         private static bool HasBeenSpecified(object obj)
         {
@@ -372,7 +372,7 @@ private void ProcessStrongTypeData()
                         {
                             foreach (string s in errors)
                             {
-                                RuntimeException rte = new RuntimeException(s);
+                                RuntimeException rte = new(s);
                                 this.WriteError(new ErrorRecord(rte, "TypesDynamicUpdateException", ErrorCategory.InvalidOperation, null));
                             }
                         }
@@ -411,7 +411,7 @@ private void ProcessDynamicType()
                 ThrowTerminatingError(NewError("TargetTypeNameEmpty", UpdateDataStrings.TargetTypeNameEmpty, _typeName));
             }
 
-            TypeData type = new TypeData(_typeName) { IsOverride = _force };
+            TypeData type = new(_typeName) { IsOverride = _force };
 
             GetMembers(type.Members);
 
@@ -457,19 +457,19 @@ private void ProcessDynamicType()
 
             if (_defaultDisplayPropertySet != null)
             {
-                PropertySetData defaultDisplayPropertySet = new PropertySetData(_defaultDisplayPropertySet);
+                PropertySetData defaultDisplayPropertySet = new(_defaultDisplayPropertySet);
                 type.DefaultDisplayPropertySet = defaultDisplayPropertySet;
             }
 
             if (_defaultKeyPropertySet != null)
             {
-                PropertySetData defaultKeyPropertySet = new PropertySetData(_defaultKeyPropertySet);
+                PropertySetData defaultKeyPropertySet = new(_defaultKeyPropertySet);
                 type.DefaultKeyPropertySet = defaultKeyPropertySet;
             }
 
             if (_propertySerializationSet != null)
             {
-                PropertySetData propertySerializationSet = new PropertySetData(_propertySerializationSet);
+                PropertySetData propertySerializationSet = new(_propertySerializationSet);
                 type.PropertySerializationSet = propertySerializationSet;
             }
 
@@ -496,7 +496,7 @@ private void ProcessDynamicType()
                     {
                         foreach (string s in errors)
                         {
-                            RuntimeException rte = new RuntimeException(s);
+                            RuntimeException rte = new(s);
                             this.WriteError(new ErrorRecord(rte, "TypesDynamicUpdateException", ErrorCategory.InvalidOperation, null));
                         }
                     }
@@ -570,7 +570,7 @@ private void GetMembers(Dictionary<string, TypeMemberData> members)
             }
         }
 
-        private T GetParameterType<T>(object sourceValue)
+        private static T GetParameterType<T>(object sourceValue)
         {
             return (T)LanguagePrimitives.ConvertTo(sourceValue, typeof(T), CultureInfo.InvariantCulture);
         }
@@ -690,7 +690,7 @@ private ScriptPropertyData GetScriptProperty()
                 value2ScriptBlock = GetParameterType<ScriptBlock>(_value2);
             }
 
-            ScriptPropertyData scriptProperty = new ScriptPropertyData(_memberName, value1ScriptBlock, value2ScriptBlock);
+            ScriptPropertyData scriptProperty = new(_memberName, value1ScriptBlock, value2ScriptBlock);
             return scriptProperty;
         }
 
@@ -712,7 +712,7 @@ private CodePropertyData GetCodeProperty()
                 value2CodeReference = GetParameterType<MethodInfo>(_value2);
             }
 
-            CodePropertyData codeProperty = new CodePropertyData(_memberName, value1CodeReference, value2CodeReference);
+            CodePropertyData codeProperty = new(_memberName, value1CodeReference, value2CodeReference);
             return codeProperty;
         }
 
@@ -723,7 +723,7 @@ private ScriptMethodData GetScriptMethod()
             EnsureValue2HasNotBeenSpecified();
 
             ScriptBlock method = GetParameterType<ScriptBlock>(_value1);
-            ScriptMethodData scriptMethod = new ScriptMethodData(_memberName, method);
+            ScriptMethodData scriptMethod = new(_memberName, method);
             return scriptMethod;
         }
 
@@ -734,7 +734,7 @@ private CodeMethodData GetCodeMethod()
             EnsureValue2HasNotBeenSpecified();
 
             MethodInfo codeReference = GetParameterType<MethodInfo>(_value1);
-            CodeMethodData codeMethod = new CodeMethodData(_memberName, codeReference);
+            CodeMethodData codeMethod = new(_memberName, codeReference);
             return codeMethod;
         }
 
@@ -746,10 +746,10 @@ private CodeMethodData GetCodeMethod()
         /// <param name="targetObject"></param>
         /// <param name="args"></param>
         /// <returns></returns>
-        private ErrorRecord NewError(string errorId, string template, object targetObject, params object[] args)
+        private static ErrorRecord NewError(string errorId, string template, object targetObject, params object[] args)
         {
             string message = string.Format(CultureInfo.CurrentCulture, template, args);
-            ErrorRecord errorRecord = new ErrorRecord(
+            ErrorRecord errorRecord = new(
                 new InvalidOperationException(message),
                 errorId,
                 ErrorCategory.InvalidOperation,
@@ -866,7 +866,7 @@ private void ProcessTypeFiles()
                     {
                         foreach (string s in errors)
                         {
-                            RuntimeException rte = new RuntimeException(s);
+                            RuntimeException rte = new(s);
                             this.WriteError(new ErrorRecord(rte, "TypesXmlUpdateException", ErrorCategory.InvalidOperation, null));
                         }
 
@@ -1119,8 +1119,8 @@ protected override void ProcessRecord()
 
                 // Key of the map is the name of the file that is in the cache. Value of the map is a index list. Duplicate files might
                 // exist in the cache because the user can add arbitrary files to the cache by $host.Runspace.InitialSessionState.Types.Add()
-                Dictionary<string, List<int>> fileToIndexMap = new Dictionary<string, List<int>>(StringComparer.OrdinalIgnoreCase);
-                List<int> indicesToRemove = new List<int>();
+                Dictionary<string, List<int>> fileToIndexMap = new(StringComparer.OrdinalIgnoreCase);
+                List<int> indicesToRemove = new();
 
                 if (Context.InitialSessionState != null)
                 {
@@ -1209,7 +1209,7 @@ protected override void ProcessRecord()
             }
 
             Dbg.Assert(!string.IsNullOrEmpty(typeNameToRemove), "TypeNameToRemove should be not null and not empty at this point");
-            TypeData type = new TypeData(typeNameToRemove);
+            TypeData type = new(typeNameToRemove);
             string removeTypeFormattedTarget = string.Format(CultureInfo.InvariantCulture, removeTypeTarget, typeNameToRemove);
 
             if (ShouldProcess(removeTypeFormattedTarget, removeTypeAction))
@@ -1223,7 +1223,7 @@ protected override void ProcessRecord()
                     {
                         foreach (string s in errors)
                         {
-                            RuntimeException rte = new RuntimeException(s);
+                            RuntimeException rte = new(s);
                             this.WriteError(new ErrorRecord(rte, "TypesDynamicRemoveException", ErrorCategory.InvalidOperation, null));
                         }
                     }
@@ -1255,10 +1255,10 @@ protected override void EndProcessing()
             this.Context.TypeTable.ClearConsolidatedMembers();
         }
 
-        private ErrorRecord NewError(string errorId, string template, object targetObject, params object[] args)
+        private static ErrorRecord NewError(string errorId, string template, object targetObject, params object[] args)
         {
             string message = string.Format(CultureInfo.CurrentCulture, template, args);
-            ErrorRecord errorRecord = new ErrorRecord(
+            ErrorRecord errorRecord = new(
                 new InvalidOperationException(message),
                 errorId,
                 ErrorCategory.InvalidOperation,
@@ -1334,7 +1334,7 @@ protected override void ProcessRecord()
             ValidateTypeName();
 
             Dictionary<string, TypeData> alltypes = Context.TypeTable.GetAllTypeData();
-            Collection<TypeData> typedefs = new Collection<TypeData>();
+            Collection<TypeData> typedefs = new();
 
             foreach (string type in alltypes.Keys)
             {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/UtilityCommon.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/UtilityCommon.cs
index 37a18ef1080..0658c7014c4 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/UtilityCommon.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/UtilityCommon.cs
@@ -5,7 +5,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Management.Automation;
-using System.Management.Automation.Runspaces;
 using System.Text;
 
 [module: SuppressMessage("Microsoft.Naming", "CA1711:IdentifiersShouldNotHaveIncorrectSuffix", Scope = "type", Target = "Microsoft.PowerShell.Commands.ByteCollection")]
@@ -242,7 +241,7 @@ public string HexBytes
             {
                 if (_hexBytes == string.Empty)
                 {
-                    StringBuilder line = new StringBuilder(BytesPerLine * 3);
+                    StringBuilder line = new(BytesPerLine * 3);
 
                     foreach (var currentByte in Bytes)
                     {
@@ -268,7 +267,7 @@ public string Ascii
             {
                 if (_ascii == string.Empty)
                 {
-                    StringBuilder ascii = new StringBuilder(BytesPerLine);
+                    StringBuilder ascii = new(BytesPerLine);
 
                     foreach (var currentByte in Bytes)
                     {
@@ -305,11 +304,11 @@ public override string ToString()
 
             // '16 + 3' comes from format "{0:X16}   ".
             // '16' comes from '[Uint64]::MaxValue.ToString("X").Length'.
-            StringBuilder nextLine = new StringBuilder(16 + 3 + (BytesPerLine * 3));
-            StringBuilder asciiEnd = new StringBuilder(BytesPerLine);
+            StringBuilder nextLine = new(16 + 3 + (BytesPerLine * 3));
+            StringBuilder asciiEnd = new(BytesPerLine);
 
             // '+1' comes from 'result.Append(nextLine.ToString() + " " + asciiEnd.ToString());' below.
-            StringBuilder result = new StringBuilder(nextLine.Capacity + asciiEnd.Capacity + 1);
+            StringBuilder result = new(nextLine.Capacity + asciiEnd.Capacity + 1);
 
             if (Bytes.Length > 0)
             {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Var.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Var.cs
index 1f18ee1b954..20f8f847475 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Var.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Var.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Management.Automation;
@@ -100,7 +99,7 @@ internal List<PSVariable> GetMatchingVariables(string name, string lookupScope,
         {
             wasFiltered = false;
 
-            List<PSVariable> result = new List<PSVariable>();
+            List<PSVariable> result = new();
 
             if (string.IsNullOrEmpty(name))
             {
@@ -356,7 +355,7 @@ protected override void ProcessRecord()
                 if (!matchFound && !wasFiltered)
                 {
                     ItemNotFoundException itemNotFound =
-                        new ItemNotFoundException(
+                        new(
                             varName,
                             "VariableNotFound",
                             SessionStateStrings.VariableNotFound);
@@ -491,7 +490,7 @@ protected override void ProcessRecord()
                 if (varFound != null)
                 {
                     SessionStateException sessionStateException =
-                        new SessionStateException(
+                        new(
                             Name,
                             SessionStateCategory.Variable,
                             "VariableAlreadyExists",
@@ -515,7 +514,7 @@ protected override void ProcessRecord()
 
             if (ShouldProcess(target, action))
             {
-                PSVariable newVariable = new PSVariable(Name, Value, Option);
+                PSVariable newVariable = new(Name, Value, Option);
 
                 if (_visibility != null)
                 {
@@ -811,7 +810,7 @@ private void SetVariable(string[] varNames, object varValue)
             {
                 // First look for existing variables to set.
 
-                List<PSVariable> matchingVariables = new List<PSVariable>();
+                List<PSVariable> matchingVariables = new();
 
                 bool wasFiltered = false;
 
@@ -866,7 +865,7 @@ private void SetVariable(string[] varNames, object varValue)
                         }
 
                         PSVariable varToSet =
-                            new PSVariable(
+                            new(
                                 varName,
                                 newVarValue,
                                 newOptions);
@@ -1122,7 +1121,7 @@ protected override void ProcessRecord()
                     // characters were specified, write an error.
 
                     ItemNotFoundException itemNotFound =
-                        new ItemNotFoundException(
+                        new(
                             varName,
                             "VariableNotFound",
                             SessionStateStrings.VariableNotFound);
@@ -1284,7 +1283,7 @@ protected override void ProcessRecord()
                     // characters were specified, write an error.
 
                     ItemNotFoundException itemNotFound =
-                        new ItemNotFoundException(
+                        new(
                             varName,
                             "VariableNotFound",
                             SessionStateStrings.VariableNotFound);
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WaitEventCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WaitEventCommand.cs
index 77f6283f9fb..70ac9e4ae95 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WaitEventCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WaitEventCommand.cs
@@ -60,9 +60,9 @@ public int Timeout
 
         #endregion parameters
 
-        private readonly AutoResetEvent _eventArrived = new AutoResetEvent(false);
+        private readonly AutoResetEvent _eventArrived = new(false);
         private PSEventArgs _receivedEvent = null;
-        private readonly object _receivedEventLock = new object();
+        private readonly object _receivedEventLock = new();
         private WildcardPattern _matchPattern;
 
         /// <summary>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/BasicHtmlWebResponseObject.Common.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/BasicHtmlWebResponseObject.Common.cs
index 1d33957d624..969dd8231c8 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/BasicHtmlWebResponseObject.Common.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/BasicHtmlWebResponseObject.Common.cs
@@ -1,12 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Management.Automation;
-using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -32,7 +30,7 @@ public class BasicHtmlWebResponseObject : WebResponseObject
         #region Constructors
 
         /// <summary>
-        /// Constructor for BasicHtmlWebResponseObject.
+        /// Initializes a new instance of the <see cref="BasicHtmlWebResponseObject"/> class.
         /// </summary>
         /// <param name="response"></param>
         public BasicHtmlWebResponseObject(HttpResponseMessage response)
@@ -40,7 +38,8 @@ public BasicHtmlWebResponseObject(HttpResponseMessage response)
         { }
 
         /// <summary>
-        /// Constructor for HtmlWebResponseObject with memory stream.
+        /// Initializes a new instance of the <see cref="BasicHtmlWebResponseObject"/> class
+        /// with the specified <paramref name="contentStream"/>.
         /// </summary>
         /// <param name="response"></param>
         /// <param name="contentStream"></param>
@@ -62,7 +61,7 @@ public BasicHtmlWebResponseObject(HttpResponseMessage response, Stream contentSt
         /// <value>
         /// Content of the response body, decoded using <see cref="Encoding"/>,
         /// if the <c>Content-Type</c> response header is a recognized text
-        /// type.  Otherwise <c>null</c>.
+        /// type.  Otherwise <see langword="null"/>.
         /// </value>
         public new string Content { get; private set; }
 
@@ -71,7 +70,7 @@ public BasicHtmlWebResponseObject(HttpResponseMessage response, Stream contentSt
         /// </summary>
         /// <value>
         /// Encoding of the response body from the <c>Content-Type</c> header,
-        /// or <c>null</c> if the encoding could not be determined.
+        /// or <see langword="null"/> if the encoding could not be determined.
         /// </value>
         public Encoding Encoding { get; private set; }
 
@@ -88,7 +87,7 @@ public WebCmdletElementCollection InputFields
                 {
                     EnsureHtmlParser();
 
-                    List<PSObject> parsedFields = new List<PSObject>();
+                    List<PSObject> parsedFields = new();
                     MatchCollection fieldMatch = s_inputFieldRegex.Matches(Content);
                     foreach (Match field in fieldMatch)
                     {
@@ -115,7 +114,7 @@ public WebCmdletElementCollection Links
                 {
                     EnsureHtmlParser();
 
-                    List<PSObject> parsedLinks = new List<PSObject>();
+                    List<PSObject> parsedLinks = new();
                     MatchCollection linkMatch = s_linkRegex.Matches(Content);
                     foreach (Match link in linkMatch)
                     {
@@ -142,7 +141,7 @@ public WebCmdletElementCollection Images
                 {
                     EnsureHtmlParser();
 
-                    List<PSObject> parsedImages = new List<PSObject>();
+                    List<PSObject> parsedImages = new();
                     MatchCollection imageMatch = s_imageRegex.Matches(Content);
                     foreach (Match image in imageMatch)
                     {
@@ -186,9 +185,9 @@ protected void InitializeContent()
             }
         }
 
-        private PSObject CreateHtmlObject(string html, string tagName)
+        private static PSObject CreateHtmlObject(string html, string tagName)
         {
-            PSObject elementObject = new PSObject();
+            PSObject elementObject = new();
 
             elementObject.Properties.Add(new PSNoteProperty("outerHTML", html));
             elementObject.Properties.Add(new PSNoteProperty("tagName", tagName));
@@ -198,7 +197,7 @@ private PSObject CreateHtmlObject(string html, string tagName)
             return elementObject;
         }
 
-        private void EnsureHtmlParser()
+        private static void EnsureHtmlParser()
         {
             if (s_tagRegex == null)
             {
@@ -244,7 +243,7 @@ private void InitializeRawContent(HttpResponseMessage baseResponse)
             this.RawContent = raw.ToString();
         }
 
-        private void ParseAttributes(string outerHtml, PSObject elementObject)
+        private static void ParseAttributes(string outerHtml, PSObject elementObject)
         {
             // We might get an empty input for a directive from the HTML file
             if (!string.IsNullOrEmpty(outerHtml))
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/ContentHelper.Common.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/ContentHelper.Common.cs
index 8e28c630e17..f16ad99d2a1 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/ContentHelper.Common.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/ContentHelper.Common.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT License.
 
 using System;
-using System.Linq;
 using System.Management.Automation;
 using System.Net.Http;
 using System.Net.Http.Headers;
@@ -69,7 +68,7 @@ internal static Encoding GetEncodingOrDefault(string characterSet)
 
         internal static StringBuilder GetRawContentHeader(HttpResponseMessage response)
         {
-            StringBuilder raw = new StringBuilder();
+            StringBuilder raw = new();
 
             string protocol = WebResponseHelper.GetProtocol(response);
             if (!string.IsNullOrEmpty(protocol))
@@ -83,7 +82,7 @@ internal static StringBuilder GetRawContentHeader(HttpResponseMessage response)
             HttpHeaders[] headerCollections =
             {
                 response.Headers,
-                response.Content == null ? null : response.Content.Headers
+                response.Content?.Headers
             };
 
             foreach (var headerCollection in headerCollections)
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/InvokeRestMethodCommand.Common.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/InvokeRestMethodCommand.Common.cs
index ba1e69c080f..235aaf82773 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/InvokeRestMethodCommand.Common.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/InvokeRestMethodCommand.Common.cs
@@ -110,7 +110,7 @@ private bool TryProcessFeedStream(Stream responseStream)
 
                 if (isRssOrFeed)
                 {
-                    XmlDocument workingDocument = new XmlDocument();
+                    XmlDocument workingDocument = new();
                     // performing a Read() here to avoid rrechecking
                     // "rss" or "feed" items
                     reader.Read();
@@ -143,9 +143,9 @@ private bool TryProcessFeedStream(Stream responseStream)
         }
 
         // Mostly cribbed from Serialization.cs#GetXmlReaderSettingsForCliXml()
-        private XmlReaderSettings GetSecureXmlReaderSettings()
+        private static XmlReaderSettings GetSecureXmlReaderSettings()
         {
-            XmlReaderSettings xrs = new XmlReaderSettings();
+            XmlReaderSettings xrs = new();
 
             xrs.CheckCharacters = false;
             xrs.CloseInput = false;
@@ -159,7 +159,7 @@ private XmlReaderSettings GetSecureXmlReaderSettings()
             return xrs;
         }
 
-        private bool TryConvertToXml(string xml, out object doc, ref Exception exRef)
+        private static bool TryConvertToXml(string xml, out object doc, ref Exception exRef)
         {
             try
             {
@@ -181,7 +181,7 @@ private bool TryConvertToXml(string xml, out object doc, ref Exception exRef)
             return (doc != null);
         }
 
-        private bool TryConvertToJson(string json, out object obj, ref Exception exRef)
+        private static bool TryConvertToJson(string json, out object obj, ref Exception exRef)
         {
             bool converted = false;
             try
@@ -478,7 +478,7 @@ internal override void ProcessResponse(HttpResponseMessage response)
 
         #region Helper Methods
 
-        private RestReturnType CheckReturnType(HttpResponseMessage response)
+        private static RestReturnType CheckReturnType(HttpResponseMessage response)
         {
             if (response == null) { throw new ArgumentNullException(nameof(response)); }
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
index 0809b686e1b..13f7ea6f999 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
@@ -7,7 +7,6 @@
 using System.Collections.ObjectModel;
 using System.Globalization;
 using System.IO;
-using System.Linq;
 using System.Management.Automation;
 using System.Net;
 using System.Net.Http;
@@ -22,8 +21,6 @@
 using System.Threading.Tasks;
 using System.Xml;
 
-using Microsoft.Win32;
-
 namespace Microsoft.PowerShell.Commands
 {
     /// <summary>
@@ -242,7 +239,7 @@ public virtual int MaximumRedirection
         /// </summary>
         [Parameter]
         [ValidateRange(0, Int32.MaxValue)]
-        public virtual int MaximumRetryCount { get; set; } = 0;
+        public virtual int MaximumRetryCount { get; set; }
 
         /// <summary>
         /// Gets or sets the RetryIntervalSec property, which determines the number seconds between retries.
@@ -609,13 +606,13 @@ internal virtual void PrepareSession()
 
             if (CertificateThumbprint != null)
             {
-                X509Store store = new X509Store(StoreName.My, StoreLocation.CurrentUser);
+                X509Store store = new(StoreName.My, StoreLocation.CurrentUser);
                 store.Open(OpenFlags.ReadOnly | OpenFlags.OpenExistingOnly);
                 X509Certificate2Collection collection = (X509Certificate2Collection)store.Certificates;
                 X509Certificate2Collection tbCollection = (X509Certificate2Collection)collection.Find(X509FindType.FindByThumbprint, CertificateThumbprint, false);
                 if (tbCollection.Count == 0)
                 {
-                    CryptographicException ex = new CryptographicException(WebCmdletStrings.ThumbprintNotFound);
+                    CryptographicException ex = new(WebCmdletStrings.ThumbprintNotFound);
                     throw ex;
                 }
 
@@ -642,7 +639,7 @@ internal virtual void PrepareSession()
 
             if (Proxy != null)
             {
-                WebProxy webProxy = new WebProxy(Proxy);
+                WebProxy webProxy = new(Proxy);
                 webProxy.BypassProxyOnLocal = false;
                 if (ProxyCredential != null)
                 {
@@ -658,7 +655,7 @@ internal virtual void PrepareSession()
                 WebSession.Proxy = webProxy;
             }
 
-            if (-1 < MaximumRedirection)
+            if (MaximumRedirection > -1)
             {
                 WebSession.MaximumRedirection = MaximumRedirection;
             }
@@ -736,10 +733,10 @@ private Uri PrepareUri(Uri uri)
                 && ((IsStandardMethodSet() && (Method == WebRequestMethod.Default || Method == WebRequestMethod.Get))
                      || (IsCustomMethodSet() && CustomMethod.ToUpperInvariant() == "GET")))
             {
-                UriBuilder uriBuilder = new UriBuilder(uri);
+                UriBuilder uriBuilder = new(uri);
                 if (uriBuilder.Query != null && uriBuilder.Query.Length > 1)
                 {
-                    uriBuilder.Query = string.Concat(uriBuilder.Query.AsSpan().Slice(1), "&", FormatDictionary(bodyAsDictionary));
+                    uriBuilder.Query = string.Concat(uriBuilder.Query.AsSpan(1), "&", FormatDictionary(bodyAsDictionary));
                 }
                 else
                 {
@@ -754,7 +751,7 @@ private Uri PrepareUri(Uri uri)
             return uri;
         }
 
-        private Uri CheckProtocol(Uri uri)
+        private static Uri CheckProtocol(Uri uri)
         {
             if (uri == null) { throw new ArgumentNullException(nameof(uri)); }
 
@@ -772,15 +769,15 @@ private string QualifyFilePath(string path)
             return resolvedFilePath;
         }
 
-        private string FormatDictionary(IDictionary content)
+        private static string FormatDictionary(IDictionary content)
         {
             if (content == null)
                 throw new ArgumentNullException(nameof(content));
 
-            StringBuilder bodyBuilder = new StringBuilder();
+            StringBuilder bodyBuilder = new();
             foreach (string key in content.Keys)
             {
-                if (0 < bodyBuilder.Length)
+                if (bodyBuilder.Length > 0)
                 {
                     bodyBuilder.Append('&');
                 }
@@ -866,7 +863,7 @@ private void ProcessAuthentication()
     public sealed class HttpResponseException : HttpRequestException
     {
         /// <summary>
-        /// Constructor for HttpResponseException.
+        /// Initializes a new instance of the <see cref="HttpResponseException"/> class.
         /// </summary>
         /// <param name="message">Message for the exception.</param>
         /// <param name="response">Response from the HTTP server.</param>
@@ -987,7 +984,7 @@ private HttpMethod GetHttpMethod(WebRequestMethod method)
         internal virtual HttpClient GetHttpClient(bool handleRedirect)
         {
             // By default the HttpClientHandler will automatically decompress GZip and Deflate content
-            HttpClientHandler handler = new HttpClientHandler();
+            HttpClientHandler handler = new();
             handler.CookieContainer = WebSession.Cookies;
 
             // set the credentials used by this request
@@ -1040,7 +1037,7 @@ internal virtual HttpClient GetHttpClient(bool handleRedirect)
 
             handler.SslProtocols = (SslProtocols)SslProtocol;
 
-            HttpClient httpClient = new HttpClient(handler);
+            HttpClient httpClient = new(handler);
 
             // check timeout setting (in seconds instead of milliseconds as in HttpWebRequest)
             if (TimeoutSec == 0)
@@ -1287,7 +1284,7 @@ internal virtual void FillRequestStream(HttpRequestMessage request)
                         catch (FormatException ex)
                         {
                             var outerEx = new ValidationMetadataException(WebCmdletStrings.ContentTypeException, ex);
-                            ErrorRecord er = new ErrorRecord(outerEx, "WebCmdletContentTypeException", ErrorCategory.InvalidArgument, ContentType);
+                            ErrorRecord er = new(outerEx, "WebCmdletContentTypeException", ErrorCategory.InvalidArgument, ContentType);
                             ThrowTerminatingError(er);
                         }
                     }
@@ -1543,8 +1540,8 @@ protected override void ProcessRecord()
                                 {
                                     string message = string.Format(CultureInfo.CurrentCulture, WebCmdletStrings.ResponseStatusCodeFailure,
                                         (int)response.StatusCode, response.ReasonPhrase);
-                                    HttpResponseException httpEx = new HttpResponseException(message, response);
-                                    ErrorRecord er = new ErrorRecord(httpEx, "WebCmdletWebResponseException", ErrorCategory.InvalidOperation, request);
+                                    HttpResponseException httpEx = new(message, response);
+                                    ErrorRecord er = new(httpEx, "WebCmdletWebResponseException", ErrorCategory.InvalidOperation, request);
                                     string detailMsg = string.Empty;
                                     StreamReader reader = null;
                                     try
@@ -1591,7 +1588,7 @@ protected override void ProcessRecord()
                                         response.StatusCode == HttpStatusCode.Moved ||
                                         response.StatusCode == HttpStatusCode.MovedPermanently)
                                     {
-                                        ErrorRecord er = new ErrorRecord(new InvalidOperationException(), "MaximumRedirectExceeded", ErrorCategory.InvalidOperation, request);
+                                        ErrorRecord er = new(new InvalidOperationException(), "MaximumRedirectExceeded", ErrorCategory.InvalidOperation, request);
                                         er.ErrorDetails = new ErrorDetails(WebCmdletStrings.MaximumRedirectionCountExceeded);
                                         WriteError(er);
                                     }
@@ -1599,7 +1596,7 @@ protected override void ProcessRecord()
                             }
                             catch (HttpRequestException ex)
                             {
-                                ErrorRecord er = new ErrorRecord(ex, "WebCmdletWebResponseException", ErrorCategory.InvalidOperation, request);
+                                ErrorRecord er = new(ex, "WebCmdletWebResponseException", ErrorCategory.InvalidOperation, request);
                                 if (ex.InnerException != null)
                                 {
                                     er.ErrorDetails = new ErrorDetails(ex.InnerException.Message);
@@ -1625,12 +1622,12 @@ protected override void ProcessRecord()
             }
             catch (CryptographicException ex)
             {
-                ErrorRecord er = new ErrorRecord(ex, "WebCmdletCertificateException", ErrorCategory.SecurityError, null);
+                ErrorRecord er = new(ex, "WebCmdletCertificateException", ErrorCategory.SecurityError, null);
                 ThrowTerminatingError(er);
             }
             catch (NotSupportedException ex)
             {
-                ErrorRecord er = new ErrorRecord(ex, "WebCmdletIEDomNotSupportedException", ErrorCategory.NotImplemented, null);
+                ErrorRecord er = new(ex, "WebCmdletIEDomNotSupportedException", ErrorCategory.NotImplemented, null);
                 ThrowTerminatingError(er);
             }
         }
@@ -1710,7 +1707,7 @@ internal long SetRequestContent(HttpRequestMessage request, string content)
                     if (!SkipHeaderValidation)
                     {
                         var outerEx = new ValidationMetadataException(WebCmdletStrings.ContentTypeException, ex);
-                        ErrorRecord er = new ErrorRecord(outerEx, "WebCmdletContentTypeException", ErrorCategory.InvalidArgument, ContentType);
+                        ErrorRecord er = new(outerEx, "WebCmdletContentTypeException", ErrorCategory.InvalidArgument, ContentType);
                         ThrowTerminatingError(er);
                     }
                 }
@@ -1719,7 +1716,7 @@ internal long SetRequestContent(HttpRequestMessage request, string content)
                     if (!SkipHeaderValidation)
                     {
                         var outerEx = new ValidationMetadataException(WebCmdletStrings.ContentTypeException, ex);
-                        ErrorRecord er = new ErrorRecord(outerEx, "WebCmdletContentTypeException", ErrorCategory.InvalidArgument, ContentType);
+                        ErrorRecord er = new(outerEx, "WebCmdletContentTypeException", ErrorCategory.InvalidArgument, ContentType);
                         ThrowTerminatingError(er);
                     }
                 }
@@ -1834,7 +1831,7 @@ internal void ParseLinkHeader(HttpResponseMessage response, System.Uri requestUr
 
             // we only support the URL in angle brackets and `rel`, other attributes are ignored
             // user can still parse it themselves via the Headers property
-            string pattern = "<(?<url>.*?)>;\\s*rel=(\"?)(?<rel>.*?)\\1[^\\w -.]?";
+            const string pattern = "<(?<url>.*?)>;\\s*rel=(\"?)(?<rel>.*?)\\1[^\\w -.]?";
             IEnumerable<string> links;
             if (response.Headers.TryGetValues("Link", out links))
             {
@@ -1849,7 +1846,7 @@ internal void ParseLinkHeader(HttpResponseMessage response, System.Uri requestUr
                             string rel = match.Groups["rel"].Value;
                             if (url != string.Empty && rel != string.Empty && !_relationLink.ContainsKey(rel))
                             {
-                                Uri absoluteUri = new Uri(requestUri, url);
+                                Uri absoluteUri = new(requestUri, url);
                                 _relationLink.Add(rel, absoluteUri.AbsoluteUri);
                             }
                         }
@@ -1859,12 +1856,12 @@ internal void ParseLinkHeader(HttpResponseMessage response, System.Uri requestUr
         }
 
         /// <summary>
-        /// Adds content to a <see cref="MultipartFormDataContent" />. Object type detection is used to determine if the value is string, File, or Collection.
+        /// Adds content to a <see cref="MultipartFormDataContent"/>. Object type detection is used to determine if the value is string, File, or Collection.
         /// </summary>
         /// <param name="fieldName">The Field Name to use.</param>
         /// <param name="fieldValue">The Field Value to use.</param>
-        /// <param name="formData">The <see cref="MultipartFormDataContent" />> to update.</param>
-        /// <param name="enumerate">If true, collection types in <paramref name="fieldValue" /> will be enumerated. If false, collections will be treated as single value.</param>
+        /// <param name="formData">The <see cref="MultipartFormDataContent"/>> to update.</param>
+        /// <param name="enumerate">If true, collection types in <paramref name="fieldValue"/> will be enumerated. If false, collections will be treated as single value.</param>
         private void AddMultipartContent(object fieldName, object fieldValue, MultipartFormDataContent formData, bool enumerate)
         {
             if (formData == null)
@@ -1915,11 +1912,11 @@ private void AddMultipartContent(object fieldName, object fieldValue, MultipartF
         }
 
         /// <summary>
-        /// Gets a <see cref="StringContent" /> from the supplied field name and field value. Uses <see cref="ConvertTo<T>(object)" /> to convert the objects to strings.
+        /// Gets a <see cref="StringContent"/> from the supplied field name and field value. Uses <see cref="LanguagePrimitives.ConvertTo{T}(object)"/> to convert the objects to strings.
         /// </summary>
-        /// <param name="fieldName">The Field Name to use for the <see cref="StringContent" /></param>
-        /// <param name="fieldValue">The Field Value to use for the <see cref="StringContent" /></param>
-        private StringContent GetMultipartStringContent(object fieldName, object fieldValue)
+        /// <param name="fieldName">The Field Name to use for the <see cref="StringContent"/></param>
+        /// <param name="fieldValue">The Field Value to use for the <see cref="StringContent"/></param>
+        private static StringContent GetMultipartStringContent(object fieldName, object fieldValue)
         {
             var contentDisposition = new ContentDispositionHeaderValue("form-data");
             // .NET does not enclose field names in quotes, however, modern browsers and curl do.
@@ -1932,11 +1929,11 @@ private StringContent GetMultipartStringContent(object fieldName, object fieldVa
         }
 
         /// <summary>
-        /// Gets a <see cref="StreamContent" /> from the supplied field name and <see cref="Stream" />. Uses <see cref="ConvertTo<T>(object)" /> to convert the fieldname to a string.
+        /// Gets a <see cref="StreamContent"/> from the supplied field name and <see cref="Stream"/>. Uses <see cref="LanguagePrimitives.ConvertTo{T}(object)"/> to convert the fieldname to a string.
         /// </summary>
-        /// <param name="fieldName">The Field Name to use for the <see cref="StreamContent" /></param>
-        /// <param name="stream">The <see cref="Stream" /> to use for the <see cref="StreamContent" /></param>
-        private StreamContent GetMultipartStreamContent(object fieldName, Stream stream)
+        /// <param name="fieldName">The Field Name to use for the <see cref="StreamContent"/></param>
+        /// <param name="stream">The <see cref="Stream"/> to use for the <see cref="StreamContent"/></param>
+        private static StreamContent GetMultipartStreamContent(object fieldName, Stream stream)
         {
             var contentDisposition = new ContentDispositionHeaderValue("form-data");
             // .NET does not enclose field names in quotes, however, modern browsers and curl do.
@@ -1950,11 +1947,11 @@ private StreamContent GetMultipartStreamContent(object fieldName, Stream stream)
         }
 
         /// <summary>
-        /// Gets a <see cref="StreamContent" /> from the supplied field name and file. Calls <see cref="GetMultipartStreamContent(object, Stream)" /> to create the <see cref="StreamContent" /> and then sets the file name.
+        /// Gets a <see cref="StreamContent"/> from the supplied field name and file. Calls <see cref="GetMultipartStreamContent(object, Stream)"/> to create the <see cref="StreamContent"/> and then sets the file name.
         /// </summary>
-        /// <param name="fieldName">The Field Name to use for the <see cref="StreamContent" /></param>
-        /// <param name="file">The file to use for the <see cref="StreamContent" /></param>
-        private StreamContent GetMultipartFileContent(object fieldName, FileInfo file)
+        /// <param name="fieldName">The Field Name to use for the <see cref="StreamContent"/></param>
+        /// <param name="file">The file to use for the <see cref="StreamContent"/></param>
+        private static StreamContent GetMultipartFileContent(object fieldName, FileInfo file)
         {
             var result = GetMultipartStreamContent(fieldName: fieldName, stream: new FileStream(file.FullName, FileMode.Open));
             // .NET does not enclose field names in quotes, however, modern browsers and curl do.
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebResponseObject.Common.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebResponseObject.Common.cs
index 70c5721dbc1..98e7c397e45 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebResponseObject.Common.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebResponseObject.Common.cs
@@ -76,7 +76,7 @@ private void InitializeContent()
             this.Content = this.RawContentStream.ToArray();
         }
 
-        private bool IsPrintable(char c)
+        private static bool IsPrintable(char c)
         {
             return (char.IsLetterOrDigit(c) || char.IsPunctuation(c) || char.IsSeparator(c) || char.IsSymbol(c) || char.IsWhiteSpace(c));
         }
@@ -144,7 +144,7 @@ public Dictionary<string, IEnumerable<string>> Headers
         #region Constructors
 
         /// <summary>
-        /// Constructor for WebResponseObject.
+        /// Initializes a new instance of the <see cref="WebResponseObject"/> class.
         /// </summary>
         /// <param name="response"></param>
         public WebResponseObject(HttpResponseMessage response)
@@ -152,7 +152,8 @@ public WebResponseObject(HttpResponseMessage response)
         { }
 
         /// <summary>
-        /// Constructor for WebResponseObject with contentStream.
+        /// Initializes a new instance of the <see cref="WebResponseObject"/> class
+        /// with the specified <paramref name="contentStream"/>.
         /// </summary>
         /// <param name="response"></param>
         /// <param name="contentStream"></param>
@@ -200,7 +201,7 @@ private void SetResponse(HttpResponseMessage response, Stream contentStream)
                 }
 
                 long contentLength = response.Content.Headers.ContentLength.Value;
-                if (0 >= contentLength)
+                if (contentLength <= 0)
                 {
                     contentLength = StreamHelper.DefaultReadBuffer;
                 }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertFromJsonCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertFromJsonCommand.cs
index e0c60ca8f3e..0af97b061a9 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertFromJsonCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertFromJsonCommand.cs
@@ -27,7 +27,7 @@ public class ConvertFromJsonCommand : Cmdlet
         /// <summary>
         /// InputObjectBuffer buffers all InputObject contents available in the pipeline.
         /// </summary>
-        private readonly List<string> _inputObjectBuffer = new List<string>();
+        private readonly List<string> _inputObjectBuffer = new();
 
         /// <summary>
         /// Returned data structure is a Hashtable instead a CustomPSObject.
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertToJsonCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertToJsonCommand.cs
index 3d35cc3c7ce..d15303557eb 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertToJsonCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertToJsonCommand.cs
@@ -29,7 +29,7 @@ public class ConvertToJsonCommand : PSCmdlet
 
         private const int maxDepthAllowed = 100;
 
-        private readonly CancellationTokenSource _cancellationSource = new CancellationTokenSource();
+        private readonly CancellationTokenSource _cancellationSource = new();
 
         /// <summary>
         /// Gets or sets the Depth property.
@@ -72,7 +72,7 @@ public int Depth
         /// <summary>
         /// Specifies how strings are escaped when writing JSON text.
         /// If the EscapeHandling property is set to EscapeHtml, the result JSON string will
-        /// be returned with HTML (<, >, &, ', ") and control characters (e.g. newline) are escaped.
+        /// be returned with HTML (&lt;, &gt;, &amp;, ', ") and control characters (e.g. newline) are escaped.
         /// </summary>
         [Parameter]
         public StringEscapeHandling EscapeHandling { get; set; } = StringEscapeHandling.Default;
@@ -93,7 +93,7 @@ protected override void BeginProcessing()
             }
         }
 
-        private readonly List<object> _inputObjects = new List<object>();
+        private readonly List<object> _inputObjects = new();
 
         /// <summary>
         /// Caching the input objects for the command.
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/InvokeWebRequestCommand.CoreClr.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/InvokeWebRequestCommand.CoreClr.cs
index b0f849490cd..dafcf3b4295 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/InvokeWebRequestCommand.CoreClr.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/InvokeWebRequestCommand.CoreClr.cs
@@ -18,7 +18,7 @@ public class InvokeWebRequestCommand : WebRequestPSCmdlet
         #region Virtual Method Overrides
 
         /// <summary>
-        /// Default constructor for InvokeWebRequestCommand.
+        /// Initializes a new instance of the <see cref="InvokeWebRequestCommand"/> class.
         /// </summary>
         public InvokeWebRequestCommand() : base()
         {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/FormObject.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/FormObject.cs
index ff9122dc395..b8f7d252711 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/FormObject.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/FormObject.cs
@@ -31,7 +31,7 @@ public class FormObject
         public Dictionary<string, string> Fields { get; }
 
         /// <summary>
-        /// Constructor for FormObject.
+        /// Initializes a new instance of the <see cref="FormObject"/> class.
         /// </summary>
         /// <param name="id"></param>
         /// <param name="method"></param>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonObject.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonObject.cs
index 7e5a4ba6d63..9f1d2b1c8a2 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonObject.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonObject.cs
@@ -344,7 +344,7 @@ private static ICollection<object> PopulateFromJArray(JArray list, out ErrorReco
         private static Hashtable PopulateHashTableFromJDictionary(JObject entries, out ErrorRecord error)
         {
             error = null;
-            Hashtable result = new Hashtable(entries.Count);
+            Hashtable result = new(entries.Count);
             foreach (var entry in entries)
             {
                 // Case sensitive duplicates should normally not occur since JsonConvert.DeserializeObject
@@ -708,7 +708,7 @@ private static void AppendPsProperties(PSObject psObj, IDictionary receiver, int
         /// </summary>
         private static object ProcessDictionary(IDictionary dict, int depth, in ConvertToJsonContext context)
         {
-            Dictionary<string, object> result = new Dictionary<string, object>(dict.Count);
+            Dictionary<string, object> result = new(dict.Count);
 
             foreach (DictionaryEntry entry in dict)
             {
@@ -745,7 +745,7 @@ private static object ProcessDictionary(IDictionary dict, int depth, in ConvertT
         /// </summary>
         private static object ProcessEnumerable(IEnumerable enumerable, int depth, in ConvertToJsonContext context)
         {
-            List<object> result = new List<object>();
+            List<object> result = new();
 
             foreach (object o in enumerable)
             {
@@ -765,7 +765,7 @@ private static object ProcessEnumerable(IEnumerable enumerable, int depth, in Co
         /// </summary>
         private static object ProcessCustomObject<T>(object o, int depth, in ConvertToJsonContext context)
         {
-            Dictionary<string, object> result = new Dictionary<string, object>();
+            Dictionary<string, object> result = new();
             Type t = o.GetType();
 
             foreach (FieldInfo info in t.GetFields(BindingFlags.Public | BindingFlags.Instance))
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/PSUserAgent.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/PSUserAgent.cs
index a730c043216..2ea29e73fa3 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/PSUserAgent.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/PSUserAgent.cs
@@ -131,9 +131,9 @@ internal static string PlatformName
                     if (s_windowsUserAgent == null)
                     {
                         // find the version in the windows operating system description
-                        Regex pattern = new Regex(@"\d+(\.\d+)+");
+                        Regex pattern = new(@"\d+(\.\d+)+");
                         string versionText = pattern.Match(OS).Value;
-                        Version windowsPlatformversion = new Version(versionText);
+                        Version windowsPlatformversion = new(versionText);
                         s_windowsUserAgent = $"Windows NT {windowsPlatformversion.Major}.{windowsPlatformversion.Minor}";
                     }
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/StreamHelper.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/StreamHelper.cs
index 7d2eaefcfc1..43b625311b9 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/StreamHelper.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/StreamHelper.cs
@@ -32,6 +32,7 @@ internal class WebResponseContentMemoryStream : MemoryStream
 
         #region Constructors
         /// <summary>
+        /// Initializes a new instance of the <see cref="WebResponseContentMemoryStream"/> class.
         /// </summary>
         /// <param name="stream"></param>
         /// <param name="initialCapacity"></param>
@@ -219,8 +220,8 @@ private void Initialize()
             {
                 long totalLength = 0;
                 byte[] buffer = new byte[StreamHelper.ChunkSize];
-                ProgressRecord record = new ProgressRecord(StreamHelper.ActivityId, WebCmdletStrings.ReadResponseProgressActivity, "statusDescriptionPlaceholder");
-                for (int read = 1; 0 < read; totalLength += read)
+                ProgressRecord record = new(StreamHelper.ActivityId, WebCmdletStrings.ReadResponseProgressActivity, "statusDescriptionPlaceholder");
+                for (int read = 1; read > 0; totalLength += read)
                 {
                     if (_ownerCmdlet != null)
                     {
@@ -235,7 +236,7 @@ private void Initialize()
 
                     read = _originalStreamToProxy.Read(buffer, 0, buffer.Length);
 
-                    if (0 < read)
+                    if (read > 0)
                     {
                         base.Write(buffer, 0, read);
                     }
@@ -284,7 +285,7 @@ internal static void WriteToStream(Stream input, Stream output, PSCmdlet cmdlet,
 
             Task copyTask = input.CopyToAsync(output, cancellationToken);
 
-            ProgressRecord record = new ProgressRecord(
+            ProgressRecord record = new(
                 ActivityId,
                 WebCmdletStrings.WriteRequestProgressActivity,
                 WebCmdletStrings.WriteRequestProgressStatus);
@@ -322,13 +323,13 @@ internal static void SaveStreamToFile(Stream stream, string filePath, PSCmdlet c
         {
             // If the web cmdlet should resume, append the file instead of overwriting.
             FileMode fileMode = cmdlet is WebRequestPSCmdlet webCmdlet && webCmdlet.ShouldResume ? FileMode.Append : FileMode.Create;
-            using FileStream output = new FileStream(filePath, fileMode, FileAccess.Write, FileShare.Read);
+            using FileStream output = new(filePath, fileMode, FileAccess.Write, FileShare.Read);
             WriteToStream(stream, output, cmdlet, cancellationToken);
         }
 
         private static string StreamToString(Stream stream, Encoding encoding)
         {
-            StringBuilder result = new StringBuilder(capacity: ChunkSize);
+            StringBuilder result = new(capacity: ChunkSize);
             Decoder decoder = encoding.GetDecoder();
 
             int useBufferSize = 64;
@@ -410,7 +411,7 @@ internal static bool TryGetEncoding(string characterSet, out Encoding encoding)
             return result;
         }
 
-        private static readonly Regex s_metaexp = new Regex(
+        private static readonly Regex s_metaexp = new(
                 @"<meta\s.*[^.><]*charset\s*=\s*[""'\n]?(?<charset>[A-Za-z].[^\s""'\n<>]*)[\s""'\n>]",
                 RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.ExplicitCapture | RegexOptions.CultureInvariant | RegexOptions.IgnoreCase
             );
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/WebRequestSession.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/WebRequestSession.cs
index a28f07c842c..ae08babe17f 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/WebRequestSession.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/WebRequestSession.cs
@@ -75,7 +75,7 @@ public class WebRequestSession
         public int RetryIntervalInSeconds { get; set; }
 
         /// <summary>
-        /// Construct a new instance of a WebRequestSession object.
+        /// Initializes a new instance of the <see cref="WebRequestSession"/> class.
         /// </summary>
         public WebRequestSession()
         {
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Write.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Write.cs
index 6f374336da5..bf907203544 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Write.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Write.cs
@@ -21,7 +21,7 @@ public sealed class WriteDebugCommand : PSCmdlet
         [Parameter(Position = 0, Mandatory = true, ValueFromPipeline = true)]
         [AllowEmptyString]
         [Alias("Msg")]
-        public string Message { get; set; } = null;
+        public string Message { get; set; }
 
         /// <summary>
         /// This method implements the ProcessRecord method for Write-Debug command.
@@ -37,7 +37,7 @@ protected override void ProcessRecord()
 
             if (mshCommandRuntime != null)
             {
-                DebugRecord record = new DebugRecord(Message);
+                DebugRecord record = new(Message);
 
                 InvocationInfo invocationInfo = GetVariableValue(SpecialVariables.MyInvocation) as InvocationInfo;
 
@@ -69,7 +69,7 @@ public sealed class WriteVerboseCommand : PSCmdlet
         [Parameter(Position = 0, Mandatory = true, ValueFromPipeline = true)]
         [AllowEmptyString]
         [Alias("Msg")]
-        public string Message { get; set; } = null;
+        public string Message { get; set; }
 
         /// <summary>
         /// This method implements the ProcessRecord method for Write-verbose command.
@@ -85,7 +85,7 @@ protected override void ProcessRecord()
 
             if (mshCommandRuntime != null)
             {
-                VerboseRecord record = new VerboseRecord(Message);
+                VerboseRecord record = new(Message);
 
                 InvocationInfo invocationInfo = GetVariableValue(SpecialVariables.MyInvocation) as InvocationInfo;
 
@@ -117,7 +117,7 @@ public sealed class WriteWarningCommand : PSCmdlet
         [Parameter(Position = 0, Mandatory = true, ValueFromPipeline = true)]
         [AllowEmptyString]
         [Alias("Msg")]
-        public string Message { get; set; } = null;
+        public string Message { get; set; }
 
         /// <summary>
         /// This method implements the ProcessRecord method for Write-Warning command.
@@ -133,7 +133,7 @@ protected override void ProcessRecord()
 
             if (mshCommandRuntime != null)
             {
-                WarningRecord record = new WarningRecord(Message);
+                WarningRecord record = new(Message);
 
                 InvocationInfo invocationInfo = GetVariableValue(SpecialVariables.MyInvocation) as InvocationInfo;
 
@@ -184,7 +184,7 @@ protected override void BeginProcessing()
                 {
                     if (tag.StartsWith("PS", StringComparison.OrdinalIgnoreCase))
                     {
-                        ErrorRecord er = new ErrorRecord(
+                        ErrorRecord er = new(
                             new InvalidOperationException(StringUtil.Format(UtilityCommonStrings.PSPrefixReservedInInformationTag, tag)),
                             "PSPrefixReservedInInformationTag", ErrorCategory.InvalidArgument, tag);
                         ThrowTerminatingError(er);
@@ -215,7 +215,7 @@ public class WriteOrThrowErrorCommand : PSCmdlet
         /// ErrorRecord.Exception -- if not specified, ErrorRecord.Exception is System.Exception.
         /// </summary>
         [Parameter(ParameterSetName = "WithException", Mandatory = true)]
-        public Exception Exception { get; set; } = null;
+        public Exception Exception { get; set; }
 
         /// <summary>
         /// If Exception is specified, this is ErrorRecord.ErrorDetails.Message;
@@ -226,14 +226,14 @@ public class WriteOrThrowErrorCommand : PSCmdlet
         [AllowNull]
         [AllowEmptyString]
         [Alias("Msg")]
-        public string Message { get; set; } = null;
+        public string Message { get; set; }
 
         /// <summary>
         /// If Exception is specified, this is ErrorRecord.ErrorDetails.Message;
         /// otherwise, the Exception is System.Exception, and this is Exception.Message.
         /// </summary>
         [Parameter(ParameterSetName = "ErrorRecord", Mandatory = true)]
-        public ErrorRecord ErrorRecord { get; set; } = null;
+        public ErrorRecord ErrorRecord { get; set; }
 
         /// <summary>
         /// ErrorRecord.CategoryInfo.Category.
@@ -254,7 +254,7 @@ public class WriteOrThrowErrorCommand : PSCmdlet
         /// </summary>
         [Parameter(ParameterSetName = "NoException")]
         [Parameter(ParameterSetName = "WithException")]
-        public object TargetObject { get; set; } = null;
+        public object TargetObject { get; set; }
 
         /// <summary>
         /// ErrorRecord.ErrorDetails.RecommendedAction.
@@ -393,7 +393,7 @@ protected override void ProcessRecord()
     public sealed class WriteErrorCommand : WriteOrThrowErrorCommand
     {
         /// <summary>
-        /// Constructor.
+        /// Initializes a new instance of the <see cref="WriteErrorCommand"/> class.
         /// </summary>
         public WriteErrorCommand()
         {
@@ -433,7 +433,7 @@ public class WriteErrorException : SystemException
     {
         #region ctor
         /// <summary>
-        /// Constructor for class WriteErrorException.
+        /// Initializes a new instance of the <see cref="WriteErrorException"/> class.
         /// </summary>
         /// <returns>Constructed object.</returns>
         public WriteErrorException()
@@ -442,7 +442,7 @@ public WriteErrorException()
         }
 
         /// <summary>
-        /// Constructor for class WriteErrorException.
+        /// Initializes a new instance of the <see cref="WriteErrorException"/> class.
         /// </summary>
         /// <param name="message"></param>
         /// <returns>Constructed object.</returns>
@@ -452,7 +452,7 @@ public WriteErrorException(string message)
         }
 
         /// <summary>
-        /// Constructor for class WriteErrorException.
+        /// Initializes a new instance of the <see cref="WriteErrorException"/> class.
         /// </summary>
         /// <param name="message"></param>
         /// <param name="innerException"></param>
@@ -466,7 +466,7 @@ public WriteErrorException(string message,
 
         #region Serialization
         /// <summary>
-        /// Serialization constructor for class WriteErrorException.
+        /// Initializes a new instance of the <see cref="WriteErrorException"/> class for serialization.
         /// </summary>
         /// <param name="info">Serialization information.</param>
         /// <param name="context">Streaming context.</param>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteAliasCommandBase.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteAliasCommandBase.cs
index 3dbb2e378ad..82c9c9f6557 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteAliasCommandBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteAliasCommandBase.cs
@@ -1,11 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
 using System.Management.Automation;
 
-using Dbg = System.Management.Automation;
-
 namespace Microsoft.PowerShell.Commands
 {
     /// <summary>
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteConsoleCmdlet.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteConsoleCmdlet.cs
index 7c2f2e44bf9..2d2009e56bc 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteConsoleCmdlet.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteConsoleCmdlet.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
 using System.Collections;
 using System.Management.Automation;
 using System.Text;
@@ -19,7 +18,7 @@ public sealed class WriteHostCommand : ConsoleColorCmdlet
         /// </summary>
         [Parameter(Position = 0, ValueFromRemainingArguments = true, ValueFromPipeline = true)]
         [Alias("Msg", "Message")]
-        public object Object { get; set; } = null;
+        public object Object { get; set; }
 
         /// <summary>
         /// False to add a newline to the end of the output string, true if not.
@@ -67,7 +66,7 @@ private string ProcessObject(object o)
                     // unroll enumerables, including arrays.
 
                     bool printSeparator = false;
-                    StringBuilder result = new StringBuilder();
+                    StringBuilder result = new();
 
                     foreach (object element in enumerable)
                     {
@@ -103,7 +102,7 @@ protected override void ProcessRecord()
         {
             string result = ProcessObject(Object) ?? string.Empty;
 
-            HostInformationMessage informationMessage = new HostInformationMessage();
+            HostInformationMessage informationMessage = new();
             informationMessage.Message = result;
             informationMessage.NoNewLine = NoNewline.IsPresent;
 
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteProgressCmdlet.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteProgressCmdlet.cs
index 070c1275aa8..fe8fccb6e1a 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteProgressCmdlet.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteProgressCmdlet.cs
@@ -4,8 +4,6 @@
 using System;
 using System.Management.Automation;
 
-using Dbg = System.Management.Automation.Diagnostics;
-
 namespace Microsoft.PowerShell.Commands
 {
     /// <summary>
@@ -39,7 +37,7 @@ public sealed class WriteProgressCommand : PSCmdlet
         /// </summary>
         [Parameter(Position = 2)]
         [ValidateRange(0, Int32.MaxValue)]
-        public int Id { get; set; } = 0;
+        public int Id { get; set; }
 
         /// <summary>
         /// Percentage completion of the activity, or -1 if n/a.
@@ -98,7 +96,7 @@ protected override
         void
         ProcessRecord()
         {
-            ProgressRecord pr = new ProgressRecord(Id, Activity, Status);
+            ProgressRecord pr = new(Id, Activity, Status);
             pr.ParentActivityId = ParentId;
             pr.PercentComplete = PercentComplete;
             pr.SecondsRemaining = SecondsRemaining;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs
index 0e86cdbfa18..cfd216edc41 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs
@@ -32,7 +32,7 @@ public sealed class ExportClixmlCommand : PSCmdlet, IDisposable
         /// </summary>
         [Parameter]
         [ValidateRange(1, int.MaxValue)]
-        public int Depth { get; set; } = 0;
+        public int Depth { get; set; }
 
         /// <summary>
         /// Mandatory file name to write to.
@@ -226,7 +226,7 @@ private void CreateFileStream()
                 );
 
             // create xml writer
-            XmlWriterSettings xmlSettings = new XmlWriterSettings();
+            XmlWriterSettings xmlSettings = new();
             xmlSettings.CloseOutput = true;
             xmlSettings.Encoding = sw.Encoding;
             xmlSettings.Indent = true;
@@ -388,7 +388,7 @@ public sealed class ConvertToXmlCommand : PSCmdlet, IDisposable
         /// </summary>
         [Parameter(HelpMessage = "Specifies how many levels of contained objects should be included in the XML representation")]
         [ValidateRange(1, int.MaxValue)]
-        public int Depth { get; set; } = 0;
+        public int Depth { get; set; }
 
         /// <summary>
         /// Input Object which is written to XML format.
@@ -463,7 +463,7 @@ protected override void ProcessRecord()
                 }
                 // Loading to the XML Document
                 _ms.Position = 0;
-                StreamReader read = new StreamReader(_ms);
+                StreamReader read = new(_ms);
                 string data = read.ReadToEnd();
                 WriteObject(data);
 
@@ -498,13 +498,13 @@ protected override void EndProcessing()
                 if (As.Equals("Document", StringComparison.OrdinalIgnoreCase))
                 {
                     // this is a trusted xml doc - the cmdlet generated the doc into a private memory stream
-                    XmlDocument xmldoc = new XmlDocument();
+                    XmlDocument xmldoc = new();
                     xmldoc.Load(_ms);
                     WriteObject(xmldoc);
                 }
                 else if (As.Equals("String", StringComparison.OrdinalIgnoreCase))
                 {
-                    StreamReader read = new StreamReader(_ms);
+                    StreamReader read = new(_ms);
                     string data = read.ReadToEnd();
                     WriteObject(data);
                 }
@@ -892,7 +892,7 @@ private void WriteResults(XmlNodeList foundXmlNodes, string filePath)
 
             foreach (XmlNode foundXmlNode in foundXmlNodes)
             {
-                SelectXmlInfo selectXmlInfo = new SelectXmlInfo();
+                SelectXmlInfo selectXmlInfo = new();
                 selectXmlInfo.Node = foundXmlNode;
                 selectXmlInfo.Pattern = XPath;
                 selectXmlInfo.Path = filePath;
@@ -968,8 +968,8 @@ private void WriteFileReadError(string filePath, Exception exception)
                 filePath,
                 exception.Message);
 
-            ArgumentException argumentException = new ArgumentException(errorMessage, exception);
-            ErrorRecord errorRecord = new ErrorRecord(argumentException, "ProcessingFile", ErrorCategory.InvalidArgument, filePath);
+            ArgumentException argumentException = new(errorMessage, exception);
+            ErrorRecord errorRecord = new(argumentException, "ProcessingFile", ErrorCategory.InvalidArgument, filePath);
 
             this.WriteError(errorRecord);
         }
@@ -996,15 +996,15 @@ private XmlNamespaceManager AddNameSpaceTable(string parametersetname, XmlDocume
                 catch (NullReferenceException)
                 {
                     string message = StringUtil.Format(UtilityCommonStrings.SearchXMLPrefixNullError);
-                    InvalidOperationException e = new InvalidOperationException(message);
-                    ErrorRecord er = new ErrorRecord(e, "PrefixError", ErrorCategory.InvalidOperation, namespacetable);
+                    InvalidOperationException e = new(message);
+                    ErrorRecord er = new(e, "PrefixError", ErrorCategory.InvalidOperation, namespacetable);
                     WriteError(er);
                 }
                 catch (ArgumentNullException)
                 {
                     string message = StringUtil.Format(UtilityCommonStrings.SearchXMLPrefixNullError);
-                    InvalidOperationException e = new InvalidOperationException(message);
-                    ErrorRecord er = new ErrorRecord(e, "PrefixError", ErrorCategory.InvalidOperation, namespacetable);
+                    InvalidOperationException e = new(message);
+                    ErrorRecord er = new(e, "PrefixError", ErrorCategory.InvalidOperation, namespacetable);
                     WriteError(er);
                 }
             }
@@ -1033,7 +1033,7 @@ protected override void ProcessRecord()
                 (ParameterSetName.Equals("LiteralPath", StringComparison.OrdinalIgnoreCase))))
             {
                 // If any file not resolved, execution stops. this is to make consistent with select-string.
-                List<string> fullresolvedPaths = new List<string>();
+                List<string> fullresolvedPaths = new();
                 foreach (string fpath in Path)
                 {
                     if (_isLiteralPath)
@@ -1049,8 +1049,8 @@ protected override void ProcessRecord()
                         {
                             // Cannot open File error
                             string message = StringUtil.Format(UtilityCommonStrings.FileOpenError, provider.FullName);
-                            InvalidOperationException e = new InvalidOperationException(message);
-                            ErrorRecord er = new ErrorRecord(e, "ProcessingFile", ErrorCategory.InvalidOperation, fpath);
+                            InvalidOperationException e = new(message);
+                            ErrorRecord er = new(e, "ProcessingFile", ErrorCategory.InvalidOperation, fpath);
                             WriteError(er);
                             continue;
                         }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/MshHostTraceListener.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/MshHostTraceListener.cs
index d479b4d32c0..357e0222b6d 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/MshHostTraceListener.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/MshHostTraceListener.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Management.Automation;
 using System.Management.Automation.Internal.Host;
-using System.Security.Permissions;
 using System.Text;
 
 namespace Microsoft.PowerShell.Commands
@@ -24,7 +23,7 @@ internal class PSHostTraceListener
         #region TraceListener constructors and disposer
 
         /// <summary>
-        /// Default constructor used if no.
+        /// Initializes a new instance of the <see cref="PSHostTraceListener"/> class.
         /// </summary>
         internal PSHostTraceListener(PSCmdlet cmdlet)
             : base(string.Empty)
@@ -88,7 +87,7 @@ public override void Write(string output)
             }
         }
 
-        private readonly StringBuilder _cachedWrite = new StringBuilder();
+        private readonly StringBuilder _cachedWrite = new();
 
         /// <summary>
         /// Sends the given output string to the host for processing.
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceCommandBase.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceCommandBase.cs
index a2e04f79ae1..9118fd773fd 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceCommandBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceCommandBase.cs
@@ -1,13 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Management.Automation;
 
-using Dbg = System.Management.Automation.Diagnostics;
-
 namespace Microsoft.PowerShell.Commands
 {
     /// <summary>
@@ -59,7 +56,7 @@ internal Collection<PSTraceSource> GetMatchingTraceSource(
         {
             notMatched = new Collection<string>();
 
-            Collection<PSTraceSource> results = new Collection<PSTraceSource>();
+            Collection<PSTraceSource> results = new();
             foreach (string patternToMatch in patternsToMatch)
             {
                 bool matchFound = false;
@@ -105,12 +102,12 @@ internal Collection<PSTraceSource> GetMatchingTraceSource(
                         !WildcardPattern.ContainsWildcardCharacters(patternToMatch))
                     {
                         ItemNotFoundException itemNotFound =
-                            new ItemNotFoundException(
+                            new(
                                 patternToMatch,
                                 "TraceSourceNotFound",
                                 SessionStateStrings.TraceSourceNotFound);
 
-                        ErrorRecord errorRecord = new ErrorRecord(itemNotFound.ErrorRecord, itemNotFound);
+                        ErrorRecord errorRecord = new(itemNotFound.ErrorRecord, itemNotFound);
                         WriteError(errorRecord);
                     }
                 }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs
index f6677752a91..8179b9179d1 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs
@@ -10,8 +10,6 @@
 using System.Management.Automation.Runspaces;
 using System.Threading;
 
-using Dbg = System.Management.Automation.Diagnostics;
-
 namespace Microsoft.PowerShell.Commands
 {
     /// <summary>
@@ -543,6 +541,6 @@ private static ErrorRecord ConvertToErrorRecord(object obj)
         private readonly TraceListenerCommandBase _cmdlet;
         private readonly bool _writeError;
         private bool _isOpen = true;
-        private readonly Collection<PSTraceSource> _matchingSources = new Collection<PSTraceSource>();
+        private readonly Collection<PSTraceSource> _matchingSources = new();
     }
 }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceListenerCommandBase.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceListenerCommandBase.cs
index 984ce18c731..abdb6ae17bc 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceListenerCommandBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceListenerCommandBase.cs
@@ -10,8 +10,6 @@
 using System.Management.Automation.Internal;
 using System.Security;
 
-using Dbg = System.Management.Automation.Diagnostics;
-
 namespace Microsoft.PowerShell.Commands
 {
     /// <summary>
@@ -231,7 +229,7 @@ internal void AddTraceListenersToSources(Collection<PSTraceSource> matchingSourc
 
                     try
                     {
-                        Collection<string> resolvedPaths = new Collection<string>();
+                        Collection<string> resolvedPaths = new();
                         try
                         {
                             // Resolve the file path
@@ -289,7 +287,7 @@ internal void AddTraceListenersToSources(Collection<PSTraceSource> matchingSourc
                             if (ForceWrite && System.IO.File.Exists(resolvedPath))
                             {
                                 // remove readonly attributes on the file
-                                System.IO.FileInfo fInfo = new System.IO.FileInfo(resolvedPath);
+                                System.IO.FileInfo fInfo = new(resolvedPath);
                                 if (fInfo != null)
                                 {
                                     // Save some disk write time by checking whether file is readonly..
@@ -302,13 +300,13 @@ internal void AddTraceListenersToSources(Collection<PSTraceSource> matchingSourc
                             }
 
                             // Trace commands always append..So there is no need to set overwrite with force..
-                            FileStream fileStream = new FileStream(resolvedPath, FileMode.Append, FileAccess.Write, FileShare.ReadWrite);
+                            FileStream fileStream = new(resolvedPath, FileMode.Append, FileAccess.Write, FileShare.ReadWrite);
                             FileStreams.Add(fileStream);
 
                             // Open the file stream
 
                             TextWriterTraceListener fileListener =
-                                    new TextWriterTraceListener(fileStream, resolvedPath);
+                                    new(fileStream, resolvedPath);
 
                             fileListener.Name = FileListener;
 
@@ -330,7 +328,7 @@ internal void AddTraceListenersToSources(Collection<PSTraceSource> matchingSourc
                         if (fileOpenError != null)
                         {
                             ErrorRecord errorRecord =
-                                new ErrorRecord(
+                                new(
                                     fileOpenError,
                                     "FileListenerPathResolutionFailed",
                                     ErrorCategory.OpenError,
@@ -355,7 +353,7 @@ internal void AddTraceListenersToSources(Collection<PSTraceSource> matchingSourc
                     if (error != null)
                     {
                         ErrorRecord errorRecord =
-                            new ErrorRecord(
+                            new(
                                 error,
                                 "FileListenerPathResolutionFailed",
                                 ErrorCategory.InvalidArgument,
@@ -493,7 +491,7 @@ internal void TurnOnTracing(Collection<PSTraceSource> matchingSources, bool preC
                 {
                     // Copy the listeners into a different collection
 
-                    Collection<TraceListener> listenerCollection = new Collection<TraceListener>();
+                    Collection<TraceListener> listenerCollection = new();
                     foreach (TraceListener listener in source.Listeners)
                     {
                         listenerCollection.Add(listener);
@@ -598,7 +596,7 @@ protected void ClearStoredState()
         }
 
         private readonly Dictionary<PSTraceSource, KeyValuePair<PSTraceSourceOptions, Collection<TraceListener>>> _storedTraceSourceState =
-            new Dictionary<PSTraceSource, KeyValuePair<PSTraceSourceOptions, Collection<TraceListener>>>();
+            new();
 
         #endregion stored state
     }
diff --git a/src/Microsoft.PowerShell.Commands.Utility/resources/NewObjectStrings.resx b/src/Microsoft.PowerShell.Commands.Utility/resources/NewObjectStrings.resx
index 63b4271c382..07c2a6d8c9e 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/resources/NewObjectStrings.resx
+++ b/src/Microsoft.PowerShell.Commands.Utility/resources/NewObjectStrings.resx
@@ -144,6 +144,9 @@
   <data name="CannotCreateTypeConstrainedLanguage" xml:space="preserve">
     <value>Cannot create type. Only core types are supported in this language mode.</value>
   </data>
+  <data name="CannotCreateTypeLanguageMode" xml:space="preserve">
+    <value>Cannot create type. Only core types are supported in {0} language mode on a policy locked down machine.</value>
+  </data>
   <data name="ApartmentNotSupported" xml:space="preserve">
     <value>{0} Please note that Single-Threaded Apartment is not supported in PowerShell.</value>
   </data>
diff --git a/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/ComInterfaces.cs b/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/ComInterfaces.cs
index 51efc6c2564..f5903ded5bc 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/ComInterfaces.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/ComInterfaces.cs
@@ -18,7 +18,7 @@ internal static class ComInterfaces
         /// string fields at all, nothing is lost.
         /// </remarks>
         [StructLayout(LayoutKind.Sequential)]
-        internal struct StartUpInfo
+        internal readonly struct StartUpInfo
         {
             public readonly UInt32 cb;
             private readonly IntPtr lpReserved;
@@ -57,6 +57,7 @@ void GetPath(
                 uint fFlags);
 
             void GetIDList(out IntPtr ppidl);
+
             void SetIDList(IntPtr pidl);
 
             void GetDescription(
@@ -82,8 +83,11 @@ void SetArguments(
                 [MarshalAs(UnmanagedType.LPWStr)] string pszArgs);
 
             void GetHotKey(out short wHotKey);
+
             void SetHotKey(short wHotKey);
+
             void GetShowCmd(out uint iShowCmd);
+
             void SetShowCmd(uint iShowCmd);
 
             void GetIconLocation(
@@ -137,7 +141,7 @@ internal interface IPropertyStore
             /// <param name="pv"></param>
             /// <returns></returns>
             [PreserveSig]
-            HResult GetValue([In] ref PropertyKey key, [Out] PropVariant pv);
+            HResult GetValue([In] in PropertyKey key, [Out] PropVariant pv);
 
             /// <summary>
             /// Sets the value of a property in the store.
@@ -146,7 +150,7 @@ internal interface IPropertyStore
             /// <param name="pv"></param>
             /// <returns></returns>
             [PreserveSig]
-            HResult SetValue([In] ref PropertyKey key, [In] PropVariant pv);
+            HResult SetValue([In] in PropertyKey key, [In] PropVariant pv);
 
             /// <summary>
             /// Commits the changes.
@@ -234,6 +238,7 @@ void AddFromArray(
                 [MarshalAs(UnmanagedType.Interface)] IObjectArray poaSource);
 
             void RemoveObject(uint uiIndex);
+
             void Clear();
         }
 
@@ -252,6 +257,7 @@ internal interface IShellLinkDataListW
             Int32 RemoveDataBlock(UInt32 dwSig);
 
             void GetFlags(out uint pdwFlags);
+
             void SetFlags(uint dwFlags);
         }
 
diff --git a/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/PropVariant.cs b/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/PropVariant.cs
index ac1e6dfd139..90148ca7e25 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/PropVariant.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/PropVariant.cs
@@ -51,7 +51,7 @@ public void Dispose()
         }
 
         /// <summary>
-        /// Finalizer.
+        /// Finalizes an instance of the <see cref="PropVariant"/> class.
         /// </summary>
         ~PropVariant()
         {
diff --git a/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/PropertyKey.cs b/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/PropertyKey.cs
index 6e12fcb0f63..ecd1918492b 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/PropertyKey.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/PropertyKey.cs
@@ -10,7 +10,7 @@ namespace Microsoft.PowerShell
     /// Defines a unique key for a Shell Property.
     /// </summary>
     [StructLayout(LayoutKind.Sequential, Pack = 4)]
-    internal struct PropertyKey : IEquatable<PropertyKey>
+    internal readonly struct PropertyKey : IEquatable<PropertyKey>
     {
         #region Public Properties
         /// <summary>
diff --git a/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/TaskbarJumpList.cs b/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/TaskbarJumpList.cs
index 5b7572c94b2..90c6c811bb1 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/TaskbarJumpList.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/WindowsTaskbarJumpList/TaskbarJumpList.cs
@@ -59,8 +59,8 @@ private static void CreateElevatedEntry(string title)
             // Check startupInfo first to know if the current shell is interactive and owns a window before proceeding
             // This check is fast (less than 1ms) and allows for quick-exit
             GetStartupInfo(out StartUpInfo startupInfo);
-            var STARTF_USESHOWWINDOW = 0x00000001;
-            var SW_HIDE = 0;
+            const uint STARTF_USESHOWWINDOW = 0x00000001;
+            const ushort SW_HIDE = 0;
             if (((startupInfo.dwFlags & STARTF_USESHOWWINDOW) == 1) && (startupInfo.wShowWindow != SW_HIDE))
             {
                 string cmdPath = Assembly.GetEntryAssembly().Location.Replace(".dll", ".exe");
@@ -97,7 +97,7 @@ private static void CreateElevatedEntry(string title)
                     flags |= 0x00002000; // SLDF_RUNAS_USER
                     shellLinkDataList.SetFlags(flags);
                     var PKEY_TITLE = new PropertyKey(new Guid("{F29F85E0-4FF9-1068-AB91-08002B27B3D9}"), 2);
-                    hResult = nativePropertyStore.SetValue(ref PKEY_TITLE, new PropVariant(title));
+                    hResult = nativePropertyStore.SetValue(in PKEY_TITLE, new PropVariant(title));
                     if (hResult < 0)
                     {
                         pCustDestList.AbortList();
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
index a7514976fa3..ad809b70982 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/CommandLineParameterParser.cs
@@ -327,6 +327,7 @@ internal string? ConfigurationName
                 AssertArgumentsParsed();
                 return _configurationName;
             }
+
             set
             {
                 if (!string.IsNullOrEmpty(value))
@@ -601,7 +602,7 @@ internal static string GetConfigurationNameFromGroupPolicy()
         /// </returns>
         private (string switchKey, bool shouldBreak) GetSwitchKey(string[] args, ref int argIndex, ref bool noexitSeen)
         {
-            string switchKey = args[argIndex].Trim().ToLowerInvariant();
+            string switchKey = args[argIndex].Trim();
             if (string.IsNullOrEmpty(switchKey))
             {
                 return (switchKey: string.Empty, shouldBreak: false);
@@ -647,7 +648,7 @@ private static bool MatchSwitch(string switchKey, string match, string smallestU
             Dbg.Assert(match.Contains(smallestUnambiguousMatch), "sUM should be a substring of match");
 
             return (switchKey.Length >= smallestUnambiguousMatch.Length
-                    && match.IndexOf(switchKey, StringComparison.Ordinal) == 0);
+                    && match.StartsWith(switchKey, StringComparison.OrdinalIgnoreCase));
         }
 
         #endregion
@@ -1076,7 +1077,7 @@ private bool ParseFile(string[] args, ref int i, bool noexitSeen)
             static object ConvertToBoolIfPossible(string arg)
             {
                 // Before parsing we skip '$' if present.
-                return arg.Length > 0 && bool.TryParse(arg.AsSpan().Slice(arg[0] == '$' ? 1 : 0), out bool boolValue)
+                return arg.Length > 0 && bool.TryParse(arg.AsSpan(arg[0] == '$' ? 1 : 0), out bool boolValue)
                     ? (object)boolValue
                     : (object)arg;
             }
@@ -1130,11 +1131,11 @@ static object ConvertToBoolIfPossible(string arg)
                 {
                     if (args[i].StartsWith('-') && args[i].Length > 1)
                     {
-                        string param = args[i].Substring(1, args[i].Length - 1).ToLower();
+                        string param = args[i].Substring(1, args[i].Length - 1);
                         StringBuilder possibleParameters = new StringBuilder();
                         foreach (string validParameter in s_validParameters)
                         {
-                            if (validParameter.Contains(param))
+                            if (validParameter.Contains(param, StringComparison.OrdinalIgnoreCase))
                             {
                                 possibleParameters.Append("\n  -");
                                 possibleParameters.Append(validParameter);
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs
index 448bcb5f586..c2458fabb5e 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleControl.cs
@@ -2477,7 +2477,7 @@ internal static Size GetLargestConsoleWindowSize(ConsoleHandle consoleHandle)
         internal static string GetConsoleWindowTitle()
         {
             const int MaxWindowTitleLength = 1024;
-            DWORD bufferSize = MaxWindowTitleLength;
+            const DWORD bufferSize = MaxWindowTitleLength;
             DWORD result;
             StringBuilder consoleTitle = new StringBuilder((int)bufferSize);
 
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
index 98e5ff2b1b4..d12f4385eaa 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs
@@ -116,7 +116,7 @@ internal static int Start(string bannerText, string helpText)
             {
                 Environment.SetEnvironmentVariable("PATH", pshome);
             }
-            else if (!path.StartsWith(pshome))
+            else if (!path.StartsWith(pshome, StringComparison.Ordinal))
             {
                 Environment.SetEnvironmentVariable("PATH", pshome + path);
             }
@@ -224,7 +224,7 @@ internal static int Start(string bannerText, string helpText)
                         throw hostException;
                     }
 
-                    if (s_theConsoleHost.LoadPSReadline())
+                    if (LoadPSReadline())
                     {
                         ProfileOptimization.StartProfile("StartupProfileData-Interactive");
 
@@ -935,7 +935,7 @@ public override PSObject PrivateData
             get
             {
                 if (ui == null) return null;
-                return _consoleColorProxy ?? (_consoleColorProxy = PSObject.AsPSObject(new ConsoleColorProxy(ui)));
+                return _consoleColorProxy ??= PSObject.AsPSObject(new ConsoleColorProxy(ui));
             }
         }
 
@@ -1156,6 +1156,10 @@ internal ConsoleHost()
             AppDomain.CurrentDomain.UnhandledException += handler;
         }
 
+        [System.Diagnostics.CodeAnalysis.SuppressMessage(
+            "Performance",
+            "CA1822:Mark members as static",
+            Justification = "Accesses instance members in preprocessor branch.")]
         private void BindBreakHandler()
         {
 #if UNIX
@@ -1190,14 +1194,6 @@ private void UnhandledExceptionHandler(object sender, UnhandledExceptionEventArg
             ui.WriteLine();
         }
 
-        /// <summary>
-        /// Finalizes the instance.
-        /// </summary>
-        ~ConsoleHost()
-        {
-            Dispose(false);
-        }
-
         /// <summary>
         /// Disposes of this instance, per the IDisposable pattern.
         /// </summary>
@@ -1256,6 +1252,14 @@ private void Dispose(bool isDisposingNotFinalizing)
             _isDisposed = true;
         }
 
+        /// <summary>
+        /// Finalizes an instance of the <see cref="ConsoleHost"/> class.
+        /// </summary>
+        ~ConsoleHost()
+        {
+            Dispose(false);
+        }
+
         /// <summary>
         /// Indicates if the session should be terminated or not.  Typically set by the break handler for Close, Logoff, and
         /// Shutdown events.  Note that the only valid transition for this property is from false to true: it is not legal to
@@ -1598,7 +1602,7 @@ private bool IsScreenReaderActive()
             return _screenReaderActive.Value;
         }
 
-        private bool LoadPSReadline()
+        private static bool LoadPSReadline()
         {
             // Don't load PSReadline if:
             //   * we don't think the process will be interactive, e.g. -command or -file
@@ -1706,7 +1710,7 @@ private void DoCreateRunspace(string initialCommand, bool skipProfiles, bool sta
             DoRunspaceInitialization(skipProfiles, initialCommand, configurationName, initialCommandArgs);
         }
 
-        private void OpenConsoleRunspace(Runspace runspace, bool staMode)
+        private static void OpenConsoleRunspace(Runspace runspace, bool staMode)
         {
             if (staMode && Platform.IsWindowsDesktop)
             {
@@ -1775,7 +1779,7 @@ private void DoRunspaceInitialization(bool skipProfiles, string initialCommand,
             }
             else
             {
-                string shellId = "Microsoft.PowerShell";
+                const string shellId = "Microsoft.PowerShell";
 
                 // If the system lockdown policy says "Enforce", do so. Do this after types / formatting, default functions, etc
                 // are loaded so that they are trusted. (Validation of their signatures is done in F&O)
@@ -2025,7 +2029,7 @@ internal static string EscapeSingleQuotes(string str)
 
         private void WriteErrorLine(string line)
         {
-            ConsoleColor fg = ConsoleColor.Red;
+            const ConsoleColor fg = ConsoleColor.Red;
             ConsoleColor bg = UI.RawUI.BackgroundColor;
 
             UI.WriteLine(fg, bg, line);
@@ -2726,7 +2730,7 @@ private DebuggerCommandResults ProcessDebugCommand(string cmd, out Exception e)
                 return results ?? new DebuggerCommandResults(DebuggerResumeAction.Continue, false);
             }
 
-            private bool IsIncompleteParseException(Exception e)
+            private static bool IsIncompleteParseException(Exception e)
             {
                 // Check e's type.
                 if (e is IncompleteParseException)
@@ -2741,7 +2745,7 @@ private bool IsIncompleteParseException(Exception e)
                     return false;
                 }
 
-                return remoteException.ErrorRecord.CategoryInfo.Reason == typeof(IncompleteParseException).Name;
+                return remoteException.ErrorRecord.CategoryInfo.Reason == nameof(IncompleteParseException);
             }
 
             private void EvaluateSuggestions(ConsoleHostUserInterface ui)
@@ -2986,9 +2990,13 @@ internal RunspaceCreationEventArgs(
         }
 
         internal string InitialCommand { get; set; }
+
         internal bool SkipProfiles { get; set; }
+
         internal bool StaMode { get; set; }
+
         internal string ConfigurationName { get; set; }
+
         internal Collection<CommandParameter> InitialCommandArgs { get; set; }
     }
 }   // namespace
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostRawUserInterface.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostRawUserInterface.cs
index c4946b5431e..a189481ce98 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostRawUserInterface.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostRawUserInterface.cs
@@ -548,7 +548,7 @@ public override
         /// Helper method to create and trace PipelineStoppedException.
         /// </summary>
         /// <returns></returns>
-        private PipelineStoppedException NewPipelineStoppedException()
+        private static PipelineStoppedException NewPipelineStoppedException()
         {
             PipelineStoppedException e = new PipelineStoppedException();
             return e;
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs
index bbe0a82bb15..7485306c14e 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs
@@ -315,7 +315,7 @@ private object ReadLineSafe(bool isSecureString, char? printToken)
                     // Handle Ctrl-C ending input
                     if (keyInfo.Key == ConsoleKey.C && keyInfo.Modifiers.HasFlag(ConsoleModifiers.Control))
 #else
-                    if (string.IsNullOrEmpty(key) || (char)3 == key[0])
+                    if (string.IsNullOrEmpty(key) || key[0] == (char)3)
 #endif
                     {
                         PipelineStoppedException e = new PipelineStoppedException();
@@ -324,7 +324,7 @@ private object ReadLineSafe(bool isSecureString, char? printToken)
 #if UNIX
                     if (keyInfo.Key == ConsoleKey.Enter)
 #else
-                    if ((char)13 == key[0])
+                    if (key[0] == (char)13)
 #endif
                     {
                         //
@@ -335,7 +335,7 @@ private object ReadLineSafe(bool isSecureString, char? printToken)
 #if UNIX
                     if (keyInfo.Key == ConsoleKey.Backspace)
 #else
-                    if ((char)8 == key[0])
+                    if (key[0] == (char)8)
 #endif
                     {
                         //
@@ -619,7 +619,7 @@ private void WriteToConsole(ConsoleColor foregroundColor, ConsoleColor backgroun
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void ConsoleOutWriteHelper(ReadOnlySpan<char> value, bool newLine)
+        private static void ConsoleOutWriteHelper(ReadOnlySpan<char> value, bool newLine)
         {
             if (newLine)
             {
@@ -696,6 +696,7 @@ private void WriteImpl(string value, bool newLine)
             }
 
             TextWriter writer = Console.IsOutputRedirected ? Console.Out : _parent.ConsoleTextWriter;
+            value = Utils.GetOutputString(value, isHost: true, SupportsVirtualTerminal, Console.IsOutputRedirected);
 
             if (_parent.IsRunningAsync)
             {
@@ -1179,11 +1180,17 @@ public override void WriteDebugLine(string message)
             }
             else
             {
-                // NTRAID#Windows OS Bugs-1061752-2004/12/15-sburns should read a skin setting here...
-                WriteLine(
-                    DebugForegroundColor,
-                    DebugBackgroundColor,
-                    StringUtil.Format(ConsoleHostUserInterfaceStrings.DebugFormatString, message));
+                if (SupportsVirtualTerminal && ExperimentalFeature.IsEnabled("PSAnsiRendering"))
+                {
+                    WriteLine(Utils.GetFormatStyleString(Utils.FormatStyle.Debug) + StringUtil.Format(ConsoleHostUserInterfaceStrings.DebugFormatString, message));
+                }
+                else
+                {
+                    WriteLine(
+                        DebugForegroundColor,
+                        DebugBackgroundColor,
+                        StringUtil.Format(ConsoleHostUserInterfaceStrings.DebugFormatString, message));
+                }
             }
         }
 
@@ -1234,10 +1241,17 @@ public override void WriteVerboseLine(string message)
             }
             else
             {
-                WriteLine(
-                    VerboseForegroundColor,
-                    VerboseBackgroundColor,
-                    StringUtil.Format(ConsoleHostUserInterfaceStrings.VerboseFormatString, message));
+                if (SupportsVirtualTerminal && ExperimentalFeature.IsEnabled("PSAnsiRendering"))
+                {
+                    WriteLine(Utils.GetFormatStyleString(Utils.FormatStyle.Verbose) + StringUtil.Format(ConsoleHostUserInterfaceStrings.VerboseFormatString, message));
+                }
+                else
+                {
+                    WriteLine(
+                        VerboseForegroundColor,
+                        VerboseBackgroundColor,
+                        StringUtil.Format(ConsoleHostUserInterfaceStrings.VerboseFormatString, message));
+                }
             }
         }
 
@@ -1271,10 +1285,17 @@ public override void WriteWarningLine(string message)
             }
             else
             {
-                WriteLine(
-                    WarningForegroundColor,
-                    WarningBackgroundColor,
-                    StringUtil.Format(ConsoleHostUserInterfaceStrings.WarningFormatString, message));
+                if (SupportsVirtualTerminal && ExperimentalFeature.IsEnabled("PSAnsiRendering"))
+                {
+                    WriteLine(Utils.GetFormatStyleString(Utils.FormatStyle.Warning) + StringUtil.Format(ConsoleHostUserInterfaceStrings.WarningFormatString, message));
+                }
+                else
+                {
+                    WriteLine(
+                        WarningForegroundColor,
+                        WarningBackgroundColor,
+                        StringUtil.Format(ConsoleHostUserInterfaceStrings.WarningFormatString, message));
+                }
             }
         }
 
@@ -1334,34 +1355,45 @@ public override void WriteErrorLine(string value)
             else
             {
                 if (writer == _parent.ConsoleTextWriter)
-                    WriteLine(ErrorForegroundColor, ErrorBackgroundColor, value);
+                {
+                    if (SupportsVirtualTerminal && ExperimentalFeature.IsEnabled("PSAnsiRendering"))
+                    {
+                        WriteLine(value);
+                    }
+                    else
+                    {
+                        WriteLine(ErrorForegroundColor, ErrorBackgroundColor, value);
+                    }
+                }
                 else
+                {
                     Console.Error.WriteLine(value);
+                }
             }
         }
 
-        // Format colors
         public ConsoleColor FormatAccentColor { get; set; } = ConsoleColor.Green;
 
-        // Error colors
         public ConsoleColor ErrorAccentColor { get; set; } = ConsoleColor.Cyan;
+
         public ConsoleColor ErrorForegroundColor { get; set; } = ConsoleColor.Red;
+
         public ConsoleColor ErrorBackgroundColor { get; set; } = Console.BackgroundColor;
 
-        // Warning colors
         public ConsoleColor WarningForegroundColor { get; set; } = ConsoleColor.Yellow;
+
         public ConsoleColor WarningBackgroundColor { get; set; } = Console.BackgroundColor;
 
-        // Debug colors
         public ConsoleColor DebugForegroundColor { get; set; } = ConsoleColor.Yellow;
+
         public ConsoleColor DebugBackgroundColor { get; set; } = Console.BackgroundColor;
 
-        // Verbose colors
         public ConsoleColor VerboseForegroundColor { get; set; } = ConsoleColor.Yellow;
+
         public ConsoleColor VerboseBackgroundColor { get; set; } = Console.BackgroundColor;
 
-        // Progress colors
         public ConsoleColor ProgressForegroundColor { get; set; } = ConsoleColor.Black;
+
         public ConsoleColor ProgressBackgroundColor { get; set; } = ConsoleColor.Yellow;
 
         #endregion Line-oriented interaction
@@ -1847,7 +1879,7 @@ private char GetCharacterUnderCursor(Coordinates cursorPosition)
         /// </summary>
         /// <param name="input">The string to process.</param>
         /// <returns>The string with any \0 characters removed...</returns>
-        private string RemoveNulls(string input)
+        private static string RemoveNulls(string input)
         {
             if (input.Contains('\0'))
             {
@@ -2042,7 +2074,7 @@ internal string ReadLineWithTabCompletion(Executor exec)
         }
 
 #if !UNIX
-        private void SendLeftArrows(int length)
+        private static void SendLeftArrows(int length)
         {
             var inputs = new ConsoleControl.INPUT[length * 2];
             for (int i = 0; i < length; i++)
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfacePrompt.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfacePrompt.cs
index 89b9303b856..6d7caefec36 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfacePrompt.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfacePrompt.cs
@@ -147,8 +147,6 @@ public override
                     string fieldPrompt = null;
                     fieldPrompt = desc.Name;
 
-                    bool fieldEchoOnPrompt = true;
-
                     // FieldDescription.ParameterAssemblyFullName never returns null. But this is
                     // defense in depth.
                     if (string.IsNullOrEmpty(desc.ParameterAssemblyFullName))
@@ -207,12 +205,22 @@ public override
                         {
                             fieldPromptList.Append(
                                 string.Format(CultureInfo.InvariantCulture, "{0}]: ", inputList.Count));
-                            bool inputListEnd = false;
+                            bool endListInput = false;
                             object convertedObj = null;
-                            string inputString = PromptForSingleItem(elementType, fieldPromptList.ToString(), fieldPrompt, caption, message,
-                                desc, fieldEchoOnPrompt, true, out inputListEnd, out cancelInput, out convertedObj);
-
-                            if (cancelInput || inputListEnd)
+                            _ = PromptForSingleItem(
+                                elementType,
+                                fieldPromptList.ToString(),
+                                fieldPrompt,
+                                caption,
+                                message,
+                                desc,
+                                fieldEchoOnPrompt: true,
+                                listInput: true,
+                                out endListInput,
+                                out cancelInput,
+                                out convertedObj);
+
+                            if (cancelInput || endListInput)
                             {
                                 break;
                             }
@@ -243,10 +251,20 @@ public override
                             fieldPrompt);
                         // field is not a list
                         object convertedObj = null;
-                        bool dummy = false;
 
-                        PromptForSingleItem(fieldType, printFieldPrompt, fieldPrompt, caption, message, desc,
-                                            fieldEchoOnPrompt, false, out dummy, out cancelInput, out convertedObj);
+                        _ = PromptForSingleItem(
+                            fieldType,
+                            printFieldPrompt,
+                            fieldPrompt,
+                            caption,
+                            message,
+                            desc,
+                            fieldEchoOnPrompt: true,
+                            listInput: false,
+                            endListInput: out _,
+                            out cancelInput,
+                            out convertedObj);
+
                         if (!cancelInput)
                         {
                             inputPSObject = PSObject.AsPSObject(convertedObj);
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfacePromptForChoice.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfacePromptForChoice.cs
index a3711200971..da9d5689105 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfacePromptForChoice.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterfacePromptForChoice.cs
@@ -297,7 +297,7 @@ private void WriteChoicePrompt(string[,] hotkeysAndPlainLabels,
             int lineLenMax = RawUI.WindowSize.Width - 1;
             int lineLen = 0;
 
-            string choiceTemplate = "[{0}] {1}  ";
+            const string choiceTemplate = "[{0}] {1}  ";
 
             for (int i = 0; i < hotkeysAndPlainLabels.GetLength(1); ++i)
             {
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/Executor.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/Executor.cs
index 266d078ee68..68df51be539 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/Executor.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/Executor.cs
@@ -342,7 +342,7 @@ internal Collection<PSObject> ExecuteCommand(string command, out Exception excep
             return ExecuteCommandHelper(tempPipeline, out exceptionThrown, options);
         }
 
-        private Command GetOutDefaultCommand(bool endOfStatement)
+        private static Command GetOutDefaultCommand(bool endOfStatement)
         {
             return new Command(command: "Out-Default",
                                isScript: false,
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/PendingProgress.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/PendingProgress.cs
index 31fdb49b35b..89901b18126 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/PendingProgress.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/PendingProgress.cs
@@ -298,6 +298,10 @@ internal override
             private int _oldestSoFar;
         }
 
+        [System.Diagnostics.CodeAnalysis.SuppressMessage(
+            "Performance",
+            "CA1822:Mark members as static",
+            Justification = "Accesses instance members in preprocessor branch.")]
         private
         ProgressNode
         FindOldestLeafmostNodeHelper(ArrayList treeToSearch, out ArrayList listWhereFound, out int indexWhereFound)
@@ -821,11 +825,9 @@ internal override
         {
             nodesCompressed = 0;
 
-            int age = 0;
-
             while (true)
             {
-                ProgressNode node = FindOldestNodeOfGivenStyle(_topLevelNodes, age, priorStyle);
+                ProgressNode node = FindOldestNodeOfGivenStyle(_topLevelNodes, oldestSoFar: 0, priorStyle);
                 if (node == null)
                 {
                     // We've compressed every node of the prior style already.
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ProgressNode.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ProgressNode.cs
index f9f666e9725..165d1993bef 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.ConsoleHost/host/msh/ProgressPane.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ProgressPane.cs
index 9edc44a0aab..65f0267d0ed 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ProgressPane.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ProgressPane.cs
@@ -102,9 +102,9 @@ class ProgressPane
 
                 // create cleared region to clear progress bar later
                 _savedRegion = tempProgressRegion;
-                for(int row = 0; row < rows; row++)
+                for (int row = 0; row < rows; row++)
                 {
-                    for(int col = 0; col < cols; col++)
+                    for (int col = 0; col < cols; col++)
                     {
                         _savedRegion[row, col].Character = ' ';
                     }
@@ -208,8 +208,7 @@ class ProgressPane
 
                 bool sizeChanged =
                         (newRegion.GetLength(0) != _progressRegion.GetLength(0))
-                    || (newRegion.GetLength(1) != _progressRegion.GetLength(1))
-                    ? true : false;
+                    || (newRegion.GetLength(1) != _progressRegion.GetLength(1));
 
                 _progressRegion = newRegion;
 
diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/UpdatesNotification.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/UpdatesNotification.cs
index 5c202eb32b1..08e0ed8e1ee 100644
--- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/UpdatesNotification.cs
+++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/UpdatesNotification.cs
@@ -315,7 +315,7 @@ private static bool TryParseUpdateFile(
             int dateStartIndex = updateFileName.LastIndexOf('_') + 1;
 
             if (!DateTime.TryParse(
-                    updateFileName.AsSpan().Slice(dateStartIndex),
+                    updateFileName.AsSpan(dateStartIndex),
                     CultureInfo.InvariantCulture,
                     DateTimeStyles.AssumeLocal,
                     out lastUpdateDate))
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/AssemblyInfo.cs b/src/Microsoft.PowerShell.CoreCLR.Eventing/AssemblyInfo.cs
index 561fdf7f70c..2a5b6533d18 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/AssemblyInfo.cs
+++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/AssemblyInfo.cs
@@ -2,4 +2,5 @@
 // Licensed under the MIT License.
 
 using System.Runtime.CompilerServices;
+
 [assembly: InternalsVisibleTo("System.Management.Automation,PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/EventDescriptor.cs b/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/EventDescriptor.cs
index f2329ae2fd6..723832979f8 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/EventDescriptor.cs
+++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/EventDescriptor.cs
@@ -8,7 +8,7 @@
 namespace System.Diagnostics.Eventing
 {
     [StructLayout(LayoutKind.Explicit, Size = 16)]
-    public struct EventDescriptor
+    public readonly struct EventDescriptor
     {
         [FieldOffset(0)]
         private readonly ushort _id;
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/EventProvider.cs b/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/EventProvider.cs
index 072e6935624..d4e566890f0 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/EventProvider.cs
+++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/EventProvider.cs
@@ -202,7 +202,7 @@ [In] void* callbackContext
         /// </summary>
         public bool IsEnabled()
         {
-            return (_enabled != 0) ? true : false;
+            return _enabled != 0;
         }
 
         /// <summary>
@@ -488,9 +488,9 @@ public bool WriteMessageEvent(string eventMessage)
         /// </param>
         /// <param name="eventPayload">
         /// </param>
-        public bool WriteEvent(ref EventDescriptor eventDescriptor, params object[] eventPayload)
+        public bool WriteEvent(in EventDescriptor eventDescriptor, params object[] eventPayload)
         {
-            return WriteTransferEvent(ref eventDescriptor, Guid.Empty, eventPayload);
+            return WriteTransferEvent(in eventDescriptor, Guid.Empty, eventPayload);
         }
 
         /// <summary>
@@ -504,7 +504,7 @@ public bool WriteEvent(ref EventDescriptor eventDescriptor, params object[] even
         /// </param>
         [System.Security.SecurityCritical]
         [SuppressMessage("Microsoft.Usage", "CA2208:InstantiateArgumentExceptionsCorrectly")]
-        public bool WriteEvent(ref EventDescriptor eventDescriptor, string data)
+        public bool WriteEvent(in EventDescriptor eventDescriptor, string data)
         {
             uint status = 0;
 
@@ -534,7 +534,7 @@ public bool WriteEvent(ref EventDescriptor eventDescriptor, string data)
                         userData.DataPointer = (ulong)pdata;
 
                         status = UnsafeNativeMethods.EventWriteTransfer(_regHandle,
-                                                                        ref eventDescriptor,
+                                                                        in eventDescriptor,
                                                                         (activityId == Guid.Empty) ? null : &activityId,
                                                                         null,
                                                                         1,
@@ -565,7 +565,7 @@ public bool WriteEvent(ref EventDescriptor eventDescriptor, string data)
         /// pointer do the event data
         /// </param>
         [System.Security.SecurityCritical]
-        protected bool WriteEvent(ref EventDescriptor eventDescriptor, int dataCount, IntPtr data)
+        protected bool WriteEvent(in EventDescriptor eventDescriptor, int dataCount, IntPtr data)
         {
             uint status = 0;
 
@@ -575,7 +575,7 @@ protected bool WriteEvent(ref EventDescriptor eventDescriptor, int dataCount, In
 
                 status = UnsafeNativeMethods.EventWriteTransfer(
                                     _regHandle,
-                                    ref eventDescriptor,
+                                    in eventDescriptor,
                                     (activityId == Guid.Empty) ? null : &activityId,
                                     null,
                                     (uint)dataCount,
@@ -602,7 +602,7 @@ protected bool WriteEvent(ref EventDescriptor eventDescriptor, int dataCount, In
         /// <param name="eventPayload">
         /// </param>
         [System.Security.SecurityCritical]
-        public bool WriteTransferEvent(ref EventDescriptor eventDescriptor, Guid relatedActivityId, params object[] eventPayload)
+        public bool WriteTransferEvent(in EventDescriptor eventDescriptor, Guid relatedActivityId, params object[] eventPayload)
         {
             uint status = 0;
 
@@ -719,7 +719,7 @@ public bool WriteTransferEvent(ref EventDescriptor eventDescriptor, Guid related
                     }
 
                     status = UnsafeNativeMethods.EventWriteTransfer(_regHandle,
-                                                                    ref eventDescriptor,
+                                                                    in eventDescriptor,
                                                                     (activityId == Guid.Empty) ? null : &activityId,
                                                                     (relatedActivityId == Guid.Empty) ? null : &relatedActivityId,
                                                                     (uint)argCount,
@@ -737,7 +737,7 @@ public bool WriteTransferEvent(ref EventDescriptor eventDescriptor, Guid related
         }
 
         [System.Security.SecurityCritical]
-        protected bool WriteTransferEvent(ref EventDescriptor eventDescriptor, Guid relatedActivityId, int dataCount, IntPtr data)
+        protected bool WriteTransferEvent(in EventDescriptor eventDescriptor, Guid relatedActivityId, int dataCount, IntPtr data)
         {
             uint status = 0;
 
@@ -747,7 +747,7 @@ protected bool WriteTransferEvent(ref EventDescriptor eventDescriptor, Guid rela
             {
                 status = UnsafeNativeMethods.EventWriteTransfer(
                                                 _regHandle,
-                                                ref eventDescriptor,
+                                                in eventDescriptor,
                                                 (activityId == Guid.Empty) ? null : &activityId,
                                                 &relatedActivityId,
                                                 (uint)dataCount,
@@ -779,7 +779,7 @@ public static void SetActivityId(ref Guid id)
         [System.Security.SecurityCritical]
         public static Guid CreateActivityId()
         {
-            Guid newId = new Guid();
+            Guid newId = new();
             UnsafeNativeMethods.EventActivityIdControl((int)ActivityControl.EVENT_ACTIVITY_CTRL_CREATE_ID, ref newId);
             return newId;
         }
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/EventProviderTraceListener.cs b/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/EventProviderTraceListener.cs
index 60ebad783c5..7264e485468 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/EventProviderTraceListener.cs
+++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/EventProviderTraceListener.cs
@@ -84,7 +84,7 @@ public EventProviderTraceListener(string providerId, string name, string delimit
 
         private void InitProvider(string providerId)
         {
-            Guid controlGuid = new Guid(providerId);
+            Guid controlGuid = new(providerId);
             //
             // Create The ETW TraceProvider
             //
@@ -148,7 +148,7 @@ public sealed override void TraceData(TraceEventCache eventCache, string source,
                 return;
             }
 
-            StringBuilder dataString = new StringBuilder(s_defaultPayloadSize);
+            StringBuilder dataString = new(s_defaultPayloadSize);
 
             if (data != null)
             {
@@ -177,7 +177,7 @@ public sealed override void TraceData(TraceEventCache eventCache, string source,
             }
 
             int index;
-            StringBuilder dataString = new StringBuilder(s_defaultPayloadSize);
+            StringBuilder dataString = new(s_defaultPayloadSize);
 
             if ((data != null) && (data.Length > 0))
             {
@@ -242,7 +242,7 @@ public sealed override void TraceEvent(TraceEventCache eventCache, string source
                 return;
             }
 
-            StringBuilder dataString = new StringBuilder(s_defaultPayloadSize);
+            StringBuilder dataString = new(s_defaultPayloadSize);
             dataString.Append(message);
 
             _provider.WriteMessageEvent(dataString.ToString(),
@@ -278,7 +278,7 @@ public sealed override void TraceEvent(TraceEventCache eventCache, string source
 
         public override void Fail(string message, string detailMessage)
         {
-            StringBuilder failMessage = new StringBuilder(message);
+            StringBuilder failMessage = new(message);
             if (detailMessage != null)
             {
                 failMessage.Append(' ');
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/Reader/NativeWrapper.cs b/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/Reader/NativeWrapper.cs
index 2286b6465a5..c9cd4d255eb 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/Reader/NativeWrapper.cs
+++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/Reader/NativeWrapper.cs
@@ -514,7 +514,7 @@ public static string EvtFormatMessage(EventLogHandle handle, uint msgId)
         {
             int bufferNeeded;
 
-            StringBuilder sb = new StringBuilder(null);
+            StringBuilder sb = new(null);
             bool status = UnsafeNativeMethods.EvtFormatMessage(handle, EventLogHandle.Zero, msgId, 0, null, UnsafeNativeMethods.EvtFormatMessageFlags.EvtFormatMessageId, 0, sb, out bufferNeeded);
             int error = Marshal.GetLastWin32Error();
 
@@ -672,9 +672,9 @@ public static object EvtGetChannelConfigProperty(EventLogHandle handle, UnsafeNa
         [System.Security.SecuritySafeCritical]
         public static void EvtSetChannelConfigProperty(EventLogHandle handle, UnsafeNativeMethods.EvtChannelConfigPropertyId enumType, object val)
         {
-            UnsafeNativeMethods.EvtVariant varVal = new UnsafeNativeMethods.EvtVariant();
+            UnsafeNativeMethods.EvtVariant varVal = new();
 
-            CoTaskMemSafeHandle taskMem = new CoTaskMemSafeHandle();
+            CoTaskMemSafeHandle taskMem = new();
 
             using (taskMem)
             {
@@ -762,7 +762,7 @@ public static void EvtSetChannelConfigProperty(EventLogHandle handle, UnsafeNati
         [System.Security.SecurityCritical]
         public static string EvtNextChannelPath(EventLogHandle handle, ref bool finish)
         {
-            StringBuilder sb = new StringBuilder(null);
+            StringBuilder sb = new(null);
             int channelNameNeeded;
 
             bool status = UnsafeNativeMethods.EvtNextChannelPath(handle, 0, sb, out channelNameNeeded);
@@ -791,7 +791,7 @@ public static string EvtNextChannelPath(EventLogHandle handle, ref bool finish)
         [System.Security.SecurityCritical]
         public static string EvtNextPublisherId(EventLogHandle handle, ref bool finish)
         {
-            StringBuilder sb = new StringBuilder(null);
+            StringBuilder sb = new(null);
             int ProviderIdNeeded;
 
             bool status = UnsafeNativeMethods.EvtNextPublisherId(handle, 0, sb, out ProviderIdNeeded);
@@ -958,7 +958,7 @@ public static IList<object> EvtRenderBufferWithContextUserOrValues(EventLogHandl
             IntPtr pointer = IntPtr.Zero;
             int bufferNeeded;
             int propCount;
-            UnsafeNativeMethods.EvtRenderFlags flag = UnsafeNativeMethods.EvtRenderFlags.EvtRenderEventValues;
+            const UnsafeNativeMethods.EvtRenderFlags flag = UnsafeNativeMethods.EvtRenderFlags.EvtRenderEventValues;
 
             try
             {
@@ -976,7 +976,7 @@ public static IList<object> EvtRenderBufferWithContextUserOrValues(EventLogHandl
                 if (!status)
                     ThrowEventLogException(win32Error);
 
-                List<object> valuesList = new List<object>(propCount);
+                List<object> valuesList = new(propCount);
                 if (propCount > 0)
                 {
                     pointer = buffer;
@@ -1001,7 +1001,7 @@ public static IList<object> EvtRenderBufferWithContextUserOrValues(EventLogHandl
         public static string EvtFormatMessageRenderName(EventLogHandle pmHandle, EventLogHandle eventHandle, UnsafeNativeMethods.EvtFormatMessageFlags flag)
         {
             int bufferNeeded;
-            StringBuilder sb = new StringBuilder(null);
+            StringBuilder sb = new(null);
 
             bool status = UnsafeNativeMethods.EvtFormatMessage(pmHandle, eventHandle, 0, 0, null, flag, 0, sb, out bufferNeeded);
             int error = Marshal.GetLastWin32Error();
@@ -1059,7 +1059,7 @@ public static IEnumerable<string> EvtFormatMessageRenderKeywords(EventLogHandle
 
             try
             {
-                List<string> keywordsList = new List<string>();
+                List<string> keywordsList = new();
                 bool status = UnsafeNativeMethods.EvtFormatMessageBuffer(pmHandle, eventHandle, 0, 0, IntPtr.Zero, flag, 0, IntPtr.Zero, out bufferNeeded);
                 int error = Marshal.GetLastWin32Error();
 
@@ -1124,7 +1124,7 @@ public static string EvtRenderBookmark(EventLogHandle eventHandle)
             IntPtr buffer = IntPtr.Zero;
             int bufferNeeded;
             int propCount;
-            UnsafeNativeMethods.EvtRenderFlags flag = UnsafeNativeMethods.EvtRenderFlags.EvtRenderBookmark;
+            const UnsafeNativeMethods.EvtRenderFlags flag = UnsafeNativeMethods.EvtRenderFlags.EvtRenderBookmark;
 
             try
             {
@@ -1164,7 +1164,7 @@ public static string EvtFormatMessageFormatDescription(EventLogHandle handle, Ev
                 stringVariants[i].StringVal = values[i];
             }
 
-            StringBuilder sb = new StringBuilder(null);
+            StringBuilder sb = new(null);
             bool status = UnsafeNativeMethods.EvtFormatMessage(handle, eventHandle, 0xffffffff, values.Length, stringVariants, UnsafeNativeMethods.EvtFormatMessageFlags.EvtFormatMessageEvent, 0, sb, out bufferNeeded);
             int error = Marshal.GetLastWin32Error();
 
@@ -1396,7 +1396,7 @@ public static Array ConvertToBoolArray(UnsafeNativeMethods.EvtVariant val)
                 bool[] array = new bool[val.Count];
                 for (int i = 0; i < val.Count; i++)
                 {
-                    bool value = (Marshal.ReadInt32(ptr) != 0) ? true : false;
+                    bool value = Marshal.ReadInt32(ptr) != 0;
                     array[i] = value;
                     ptr = new IntPtr((Int64)ptr + 4);
                 }
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/UnsafeNativeMethods.cs b/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/UnsafeNativeMethods.cs
index b42efba9119..38a3f4a60c7 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/UnsafeNativeMethods.cs
+++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/DotNetCode/Eventing/UnsafeNativeMethods.cs
@@ -84,7 +84,7 @@ internal static extern int FormatMessage(int dwFlags, IntPtr lpSource,
         [SecurityCritical]
         internal static string GetMessage(int errorCode)
         {
-            StringBuilder sb = new StringBuilder(512);
+            StringBuilder sb = new(512);
             int result = UnsafeNativeMethods.FormatMessage(FORMAT_MESSAGE_IGNORE_INSERTS |
                 FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY,
                 UnsafeNativeMethods.s_NULL, errorCode, 0, sb, sb.Capacity, UnsafeNativeMethods.s_NULL);
@@ -132,7 +132,7 @@ [In][Out] ref long registrationHandle
         // Control (Is Enabled) APIs
         [DllImport(EventProviderDllName, ExactSpelling = true, EntryPoint = "EventEnabled", CharSet = System.Runtime.InteropServices.CharSet.Unicode)]
         [SecurityCritical]
-        internal static extern int EventEnabled([In] long registrationHandle, [In] ref System.Diagnostics.Eventing.EventDescriptor eventDescriptor);
+        internal static extern int EventEnabled([In] long registrationHandle, [In] in System.Diagnostics.Eventing.EventDescriptor eventDescriptor);
 
         [DllImport(EventProviderDllName, ExactSpelling = true, EntryPoint = "EventProviderEnabled", CharSet = System.Runtime.InteropServices.CharSet.Unicode)]
         [SecurityCritical]
@@ -143,7 +143,7 @@ [In][Out] ref long registrationHandle
         [SecurityCritical]
         internal static extern unsafe uint EventWrite(
                 [In] long registrationHandle,
-                [In] ref EventDescriptor eventDescriptor,
+                [In] in EventDescriptor eventDescriptor,
                 [In] uint userDataCount,
                 [In] void* userData
                 );
@@ -162,7 +162,7 @@ [In] void* userData
         [SecurityCritical]
         internal static extern unsafe uint EventWriteTransfer(
                 [In] long registrationHandle,
-                [In] ref EventDescriptor eventDescriptor,
+                [In] in EventDescriptor eventDescriptor,
                 [In] Guid* activityId,
                 [In] Guid* relatedActivityId,
                 [In] uint userDataCount,
@@ -177,6 +177,7 @@ internal static extern unsafe uint EventWriteString(
                 [In] long keywords,
                 [In] char* message
                 );
+
         // ActivityId Control APIs
         [DllImport(EventProviderDllName, ExactSpelling = true, EntryPoint = "EventActivityIdControl", CharSet = System.Runtime.InteropServices.CharSet.Unicode)]
         [SecurityCritical]
@@ -865,7 +866,7 @@ internal struct EvtStringVariant
 
             [FieldOffset(12)]
             public UInt32 Type;
-        };
+        }
 
         [DllImport(WEVTAPI, CharSet = CharSet.Unicode, SetLastError = true)]
         [SecurityCritical]
diff --git a/src/Microsoft.PowerShell.MarkdownRender/CodeInlineRenderer.cs b/src/Microsoft.PowerShell.MarkdownRender/CodeInlineRenderer.cs
deleted file mode 100644
index f3dc651bd4c..00000000000
--- a/src/Microsoft.PowerShell.MarkdownRender/CodeInlineRenderer.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using Markdig.Syntax.Inlines;
-
-namespace Microsoft.PowerShell.MarkdownRender
-{
-    /// <summary>
-    /// Renderer for adding VT100 escape sequences for inline code elements.
-    /// </summary>
-    internal class CodeInlineRenderer : VT100ObjectRenderer<CodeInline>
-    {
-        protected override void Write(VT100Renderer renderer, CodeInline obj)
-        {
-            renderer.Write(renderer.EscapeSequences.FormatCode(obj.Content, isInline: true));
-        }
-    }
-}
diff --git a/src/Microsoft.PowerShell.MarkdownRender/EmphasisInlineRenderer.cs b/src/Microsoft.PowerShell.MarkdownRender/EmphasisInlineRenderer.cs
deleted file mode 100644
index b1c4777a194..00000000000
--- a/src/Microsoft.PowerShell.MarkdownRender/EmphasisInlineRenderer.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using Markdig.Syntax.Inlines;
-
-namespace Microsoft.PowerShell.MarkdownRender
-{
-    /// <summary>
-    /// Renderer for adding VT100 escape sequences for bold and italics elements.
-    /// </summary>
-    internal class EmphasisInlineRenderer : VT100ObjectRenderer<EmphasisInline>
-    {
-        protected override void Write(VT100Renderer renderer, EmphasisInline obj)
-        {
-            renderer.Write(renderer.EscapeSequences.FormatEmphasis(obj.FirstChild.ToString(), isBold: obj.DelimiterCount == 2 ? true : false));
-        }
-    }
-}
diff --git a/src/Microsoft.PowerShell.MarkdownRender/FencedCodeBlockRenderer.cs b/src/Microsoft.PowerShell.MarkdownRender/FencedCodeBlockRenderer.cs
deleted file mode 100644
index d878ae922d7..00000000000
--- a/src/Microsoft.PowerShell.MarkdownRender/FencedCodeBlockRenderer.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using Markdig.Helpers;
-using Markdig.Syntax;
-
-namespace Microsoft.PowerShell.MarkdownRender
-{
-    /// <summary>
-    /// Renderer for adding VT100 escape sequences for code blocks with language type.
-    /// </summary>
-    internal class FencedCodeBlockRenderer : VT100ObjectRenderer<FencedCodeBlock>
-    {
-        protected override void Write(VT100Renderer renderer, FencedCodeBlock obj)
-        {
-            if (obj?.Lines.Lines != null)
-            {
-                foreach (StringLine codeLine in obj.Lines.Lines)
-                {
-                    if (!string.IsNullOrWhiteSpace(codeLine.ToString()))
-                    {
-                        // If the code block is of type YAML, then tab to right to improve readability.
-                        // This specifically helps for parameters help content.
-                        if (string.Equals(obj.Info, "yaml", StringComparison.OrdinalIgnoreCase))
-                        {
-                            renderer.Write("\t").WriteLine(codeLine.ToString());
-                        }
-                        else
-                        {
-                            renderer.WriteLine(renderer.EscapeSequences.FormatCode(codeLine.ToString(), isInline: false));
-                        }
-                    }
-                }
-
-                // Add a blank line after the code block for better readability.
-                renderer.WriteLine();
-            }
-        }
-    }
-}
diff --git a/src/Microsoft.PowerShell.MarkdownRender/HeaderBlockRenderer.cs b/src/Microsoft.PowerShell.MarkdownRender/HeaderBlockRenderer.cs
deleted file mode 100644
index 454000acc54..00000000000
--- a/src/Microsoft.PowerShell.MarkdownRender/HeaderBlockRenderer.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using Markdig.Syntax;
-
-namespace Microsoft.PowerShell.MarkdownRender
-{
-    /// <summary>
-    /// Renderer for adding VT100 escape sequences for headings.
-    /// </summary>
-    internal class HeaderBlockRenderer : VT100ObjectRenderer<HeadingBlock>
-    {
-        protected override void Write(VT100Renderer renderer, HeadingBlock obj)
-        {
-            string headerText = obj?.Inline?.FirstChild?.ToString();
-
-            if (!string.IsNullOrEmpty(headerText))
-            {
-                // Format header and then add blank line to improve readability.
-                switch (obj.Level)
-                {
-                    case 1:
-                        renderer.WriteLine(renderer.EscapeSequences.FormatHeader1(headerText));
-                        renderer.WriteLine();
-                        break;
-
-                    case 2:
-                        renderer.WriteLine(renderer.EscapeSequences.FormatHeader2(headerText));
-                        renderer.WriteLine();
-                        break;
-
-                    case 3:
-                        renderer.WriteLine(renderer.EscapeSequences.FormatHeader3(headerText));
-                        renderer.WriteLine();
-                        break;
-
-                    case 4:
-                        renderer.WriteLine(renderer.EscapeSequences.FormatHeader4(headerText));
-                        renderer.WriteLine();
-                        break;
-
-                    case 5:
-                        renderer.WriteLine(renderer.EscapeSequences.FormatHeader5(headerText));
-                        renderer.WriteLine();
-                        break;
-
-                    case 6:
-                        renderer.WriteLine(renderer.EscapeSequences.FormatHeader6(headerText));
-                        renderer.WriteLine();
-                        break;
-                }
-            }
-        }
-    }
-}
diff --git a/src/Microsoft.PowerShell.MarkdownRender/LeafInlineRenderer.cs b/src/Microsoft.PowerShell.MarkdownRender/LeafInlineRenderer.cs
deleted file mode 100644
index d1af0348794..00000000000
--- a/src/Microsoft.PowerShell.MarkdownRender/LeafInlineRenderer.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using Markdig.Syntax.Inlines;
-
-namespace Microsoft.PowerShell.MarkdownRender
-{
-    /// <summary>
-    /// Renderer for adding VT100 escape sequences for leaf elements like plain text in paragraphs.
-    /// </summary>
-    internal class LeafInlineRenderer : VT100ObjectRenderer<LeafInline>
-    {
-        protected override void Write(VT100Renderer renderer, LeafInline obj)
-        {
-            // If the next sibling is null, then this is the last line in the paragraph.
-            // Add new line character at the end.
-            // Else just write without newline at the end.
-            if (obj.NextSibling == null)
-            {
-                renderer.WriteLine(obj.ToString());
-            }
-            else
-            {
-                renderer.Write(obj.ToString());
-            }
-        }
-    }
-}
diff --git a/src/Microsoft.PowerShell.MarkdownRender/LineBreakRenderer.cs b/src/Microsoft.PowerShell.MarkdownRender/LineBreakRenderer.cs
deleted file mode 100644
index 11f1cf08ecc..00000000000
--- a/src/Microsoft.PowerShell.MarkdownRender/LineBreakRenderer.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using Markdig.Syntax.Inlines;
-
-namespace Microsoft.PowerShell.MarkdownRender
-{
-    /// <summary>
-    /// Renderer for adding VT100 escape sequences for line breaks.
-    /// </summary>
-    internal class LineBreakRenderer : VT100ObjectRenderer<LineBreakInline>
-    {
-        protected override void Write(VT100Renderer renderer, LineBreakInline obj)
-        {
-            // If it is a hard line break add new line at the end.
-            // Else, add a space for after the last character to improve readability.
-            if (obj.IsHard)
-            {
-                renderer.WriteLine();
-            }
-            else
-            {
-                renderer.Write(" ");
-            }
-        }
-    }
-}
diff --git a/src/Microsoft.PowerShell.MarkdownRender/LinkInlineRenderer.cs b/src/Microsoft.PowerShell.MarkdownRender/LinkInlineRenderer.cs
deleted file mode 100644
index e4b11f13317..00000000000
--- a/src/Microsoft.PowerShell.MarkdownRender/LinkInlineRenderer.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using Markdig.Syntax.Inlines;
-
-namespace Microsoft.PowerShell.MarkdownRender
-{
-    /// <summary>
-    /// Renderer for adding VT100 escape sequences for links.
-    /// </summary>
-    internal class LinkInlineRenderer : VT100ObjectRenderer<LinkInline>
-    {
-        protected override void Write(VT100Renderer renderer, LinkInline obj)
-        {
-            string text = obj.FirstChild?.ToString();
-
-            // Format link as image or link.
-            if (obj.IsImage)
-            {
-                renderer.Write(renderer.EscapeSequences.FormatImage(text));
-            }
-            else
-            {
-                renderer.Write(renderer.EscapeSequences.FormatLink(text, obj.Url));
-            }
-        }
-    }
-}
diff --git a/src/Microsoft.PowerShell.MarkdownRender/ListBlockRenderer.cs b/src/Microsoft.PowerShell.MarkdownRender/ListBlockRenderer.cs
deleted file mode 100644
index eac9c9c6982..00000000000
--- a/src/Microsoft.PowerShell.MarkdownRender/ListBlockRenderer.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using Markdig.Syntax;
-
-namespace Microsoft.PowerShell.MarkdownRender
-{
-    /// <summary>
-    /// Renderer for adding VT100 escape sequences for list blocks.
-    /// </summary>
-    internal class ListBlockRenderer : VT100ObjectRenderer<ListBlock>
-    {
-        protected override void Write(VT100Renderer renderer, ListBlock obj)
-        {
-            // start index of a numbered block.
-            int index = 1;
-
-            foreach (var item in obj)
-            {
-                if (item is ListItemBlock listItem)
-                {
-                    if (obj.IsOrdered)
-                    {
-                        RenderNumberedList(renderer, listItem, index++);
-                    }
-                    else
-                    {
-                        renderer.Write(listItem);
-                    }
-                }
-            }
-
-            renderer.WriteLine();
-        }
-
-        private 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)
-            {
-                if (line is ParagraphBlock paragraphBlock)
-                {
-                    renderer.Write(index.ToString()).Write(". ").Write(paragraphBlock.Inline);
-                }
-            }
-        }
-    }
-}
diff --git a/src/Microsoft.PowerShell.MarkdownRender/ListItemBlockRenderer.cs b/src/Microsoft.PowerShell.MarkdownRender/ListItemBlockRenderer.cs
deleted file mode 100644
index 6eb356b3dba..00000000000
--- a/src/Microsoft.PowerShell.MarkdownRender/ListItemBlockRenderer.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System.Threading;
-using Markdig.Syntax;
-
-namespace Microsoft.PowerShell.MarkdownRender
-{
-    /// <summary>
-    /// Renderer for adding VT100 escape sequences for items in a list block.
-    /// </summary>
-    internal class ListItemBlockRenderer : VT100ObjectRenderer<ListItemBlock>
-    {
-        protected override void Write(VT100Renderer renderer, ListItemBlock obj)
-        {
-            if (obj.Parent is ListBlock parent)
-            {
-                if (!parent.IsOrdered)
-                {
-                    foreach (var line in obj)
-                    {
-                        RenderWithIndent(renderer, line, parent.BulletType, 0);
-                    }
-                }
-            }
-        }
-
-        private void RenderWithIndent(VT100Renderer renderer, MarkdownObject block, char listBullet, int indentLevel)
-        {
-            // Indent left by 2 for each level on list.
-            string indent = Padding(indentLevel * 2);
-
-            if (block is ParagraphBlock paragraphBlock)
-            {
-                renderer.Write(indent).Write(listBullet).Write(" ").Write(paragraphBlock.Inline);
-            }
-            else
-            {
-                // If there is a sublist, the block is a ListBlock instead of ParagraphBlock.
-                if (block is ListBlock subList)
-                {
-                    foreach (var subListItem in subList)
-                    {
-                        if (subListItem is ListItemBlock subListItemBlock)
-                        {
-                            foreach (var line in subListItemBlock)
-                            {
-                                // Increment indent level for sub list.
-                                RenderWithIndent(renderer, line, listBullet, indentLevel + 1);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        // Typical padding is at most a screen's width, any more than that and we won't bother caching.
-        private const int IndentCacheMax = 120;
-
-        private static readonly string[] IndentCache = new string[IndentCacheMax];
-
-        internal static string Padding(int countOfSpaces)
-        {
-            if (countOfSpaces >= IndentCacheMax)
-            {
-                return new string(' ', countOfSpaces);
-            }
-
-            var result = IndentCache[countOfSpaces];
-
-            if (result == null)
-            {
-                Interlocked.CompareExchange(ref IndentCache[countOfSpaces], new string(' ', countOfSpaces), comparand: null);
-                result = IndentCache[countOfSpaces];
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/src/Microsoft.PowerShell.MarkdownRender/MarkdownConverter.cs b/src/Microsoft.PowerShell.MarkdownRender/MarkdownConverter.cs
deleted file mode 100644
index bb4a3e8a84f..00000000000
--- a/src/Microsoft.PowerShell.MarkdownRender/MarkdownConverter.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.IO;
-
-using Markdig;
-
-namespace Microsoft.PowerShell.MarkdownRender
-{
-    /// <summary>
-    /// Type of conversion from Markdown.
-    /// </summary>
-    [Flags]
-    public enum MarkdownConversionType
-    {
-        /// <summary>
-        /// Convert to HTML.
-        /// </summary>
-        HTML = 1,
-
-        /// <summary>
-        /// Convert to VT100 encoded string.
-        /// </summary>
-        VT100 = 2
-    }
-
-    /// <summary>
-    /// Object representing the conversion from Markdown.
-    /// </summary>
-    public class MarkdownInfo
-    {
-        /// <summary>
-        /// Gets the Html content after conversion.
-        /// </summary>
-        public string Html { get; internal set; }
-
-        /// <summary>
-        /// Gets the VT100 encoded string after conversion.
-        /// </summary>
-        public string VT100EncodedString { get; internal set; }
-
-        /// <summary>
-        /// Gets the AST of the Markdown string.
-        /// </summary>
-        public Markdig.Syntax.MarkdownDocument Tokens { get; internal set; }
-    }
-
-    /// <summary>
-    /// Class to convert a Markdown string to VT100, HTML or AST.
-    /// </summary>
-    public sealed class MarkdownConverter
-    {
-        /// <summary>
-        /// Convert from Markdown string to VT100 encoded string or HTML. Returns MarkdownInfo object.
-        /// </summary>
-        /// <param name="markdownString">String with Markdown content to be converted.</param>
-        /// <param name="conversionType">Specifies type of conversion, either VT100 or HTML.</param>
-        /// <param name="optionInfo">Specifies the rendering options for VT100 rendering.</param>
-        /// <returns>MarkdownInfo object with the converted output.</returns>
-        public static MarkdownInfo Convert(string markdownString, MarkdownConversionType conversionType, PSMarkdownOptionInfo optionInfo)
-        {
-            var renderInfo = new MarkdownInfo();
-            var writer = new StringWriter();
-            MarkdownPipeline pipeline = null;
-
-            if (conversionType.HasFlag(MarkdownConversionType.HTML))
-            {
-                pipeline = new MarkdownPipelineBuilder().UseAdvancedExtensions().Build();
-                var renderer = new Markdig.Renderers.HtmlRenderer(writer);
-                renderInfo.Html = Markdig.Markdown.Convert(markdownString, renderer, pipeline).ToString();
-            }
-
-            if (conversionType.HasFlag(MarkdownConversionType.VT100))
-            {
-                pipeline = new MarkdownPipelineBuilder().Build();
-
-                // Use the VT100 renderer.
-                var renderer = new VT100Renderer(writer, optionInfo);
-                renderInfo.VT100EncodedString = Markdig.Markdown.Convert(markdownString, renderer, pipeline).ToString();
-            }
-
-            // Always have AST available.
-            var parsed = Markdig.Markdown.Parse(markdownString, pipeline);
-            renderInfo.Tokens = parsed;
-
-            return renderInfo;
-        }
-    }
-}
diff --git a/src/Microsoft.PowerShell.MarkdownRender/Microsoft.PowerShell.MarkdownRender.csproj b/src/Microsoft.PowerShell.MarkdownRender/Microsoft.PowerShell.MarkdownRender.csproj
deleted file mode 100644
index cc89f95d6c6..00000000000
--- a/src/Microsoft.PowerShell.MarkdownRender/Microsoft.PowerShell.MarkdownRender.csproj
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-  <Import Project="..\..\PowerShell.Common.props" />
-
-  <PropertyGroup>
-    <Description>PowerShell's Markdown Rendering project</Description>
-    <AssemblyName>Microsoft.PowerShell.MarkdownRender</AssemblyName>
-  </PropertyGroup>
-
-  <ItemGroup>
-  <!-- Source: https://github.com/lunet-io/markdig/ -->
-    <ProjectReference Include="../System.Management.Automation/System.Management.Automation.csproj" />
-    <PackageReference Include="Markdig.Signed" Version="0.22.0" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Microsoft.PowerShell.MarkdownRender/ParagraphBlockRenderer.cs b/src/Microsoft.PowerShell.MarkdownRender/ParagraphBlockRenderer.cs
deleted file mode 100644
index 3b854cb2189..00000000000
--- a/src/Microsoft.PowerShell.MarkdownRender/ParagraphBlockRenderer.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using Markdig.Syntax;
-
-namespace Microsoft.PowerShell.MarkdownRender
-{
-    /// <summary>
-    /// Renderer for adding VT100 escape sequences for paragraphs.
-    /// </summary>
-    internal class ParagraphBlockRenderer : VT100ObjectRenderer<ParagraphBlock>
-    {
-        protected override void Write(VT100Renderer renderer, ParagraphBlock obj)
-        {
-            // Call the renderer for children, leaf inline or line breaks.
-            renderer.WriteChildren(obj.Inline);
-
-            // Add new line at the end of the paragraph.
-            renderer.WriteLine();
-        }
-    }
-}
diff --git a/src/Microsoft.PowerShell.MarkdownRender/QuoteBlockRenderer.cs b/src/Microsoft.PowerShell.MarkdownRender/QuoteBlockRenderer.cs
deleted file mode 100644
index 7e0bda6bda8..00000000000
--- a/src/Microsoft.PowerShell.MarkdownRender/QuoteBlockRenderer.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using Markdig.Syntax;
-
-namespace Microsoft.PowerShell.MarkdownRender
-{
-    /// <summary>
-    /// Renderer for adding VT100 escape sequences for quote blocks.
-    /// </summary>
-    internal class QuoteBlockRenderer : VT100ObjectRenderer<QuoteBlock>
-    {
-        protected override void Write(VT100Renderer renderer, QuoteBlock obj)
-        {
-            // Iterate through each item and add the quote character before the content.
-            foreach (var item in obj)
-            {
-                renderer.Write(obj.QuoteChar).Write(" ").Write(item);
-            }
-
-            // Add blank line after the quote block.
-            renderer.WriteLine();
-        }
-    }
-}
diff --git a/src/Microsoft.PowerShell.MarkdownRender/VT100EscapeSequences.cs b/src/Microsoft.PowerShell.MarkdownRender/VT100EscapeSequences.cs
deleted file mode 100644
index 311522ac0aa..00000000000
--- a/src/Microsoft.PowerShell.MarkdownRender/VT100EscapeSequences.cs
+++ /dev/null
@@ -1,478 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Management.Automation;
-
-namespace Microsoft.PowerShell.MarkdownRender
-{
-    /// <summary>
-    /// Enum to name all the properties of PSMarkdownOptionInfo.
-    /// </summary>
-    public enum MarkdownOptionInfoProperty
-    {
-        /// <summary>
-        /// Property name Header1.
-        /// </summary>
-        Header1,
-
-        /// <summary>
-        /// Property name Header2.
-        /// </summary>
-        Header2,
-
-        /// <summary>
-        /// Property name Header3.
-        /// </summary>
-        Header3,
-
-        /// <summary>
-        /// Property name Header4.
-        /// </summary>
-        Header4,
-
-        /// <summary>
-        /// Property name Header5.
-        /// </summary>
-        Header5,
-
-        /// <summary>
-        /// Property name Header6.
-        /// </summary>
-        Header6,
-
-        /// <summary>
-        /// Property name Code.
-        /// </summary>
-        Code,
-
-        /// <summary>
-        /// Property name Link.
-        /// </summary>
-        Link,
-
-        /// <summary>
-        /// Property name Image.
-        /// </summary>
-        Image,
-
-        /// <summary>
-        /// Property name EmphasisBold.
-        /// </summary>
-        EmphasisBold,
-
-        /// <summary>
-        /// Property name EmphasisItalics.
-        /// </summary>
-        EmphasisItalics
-    }
-
-    /// <summary>
-    /// Class to represent color preference options for various Markdown elements.
-    /// </summary>
-    public sealed class PSMarkdownOptionInfo
-    {
-        private const char Esc = (char)0x1b;
-        private const string EndSequence = "[0m";
-
-        /// <summary>
-        /// Gets or sets current VT100 escape sequence for header 1.
-        /// </summary>
-        public string Header1 { get; set; }
-
-        /// <summary>
-        /// Gets or sets current VT100 escape sequence for header 2.
-        /// </summary>
-        public string Header2 { get; set; }
-
-        /// <summary>
-        /// Gets or sets current VT100 escape sequence for header 3.
-        /// </summary>
-        public string Header3 { get; set; }
-
-        /// <summary>
-        /// Gets or sets current VT100 escape sequence for header 4.
-        /// </summary>
-        public string Header4 { get; set; }
-
-        /// <summary>
-        /// Gets or sets current VT100 escape sequence for header 5.
-        /// </summary>
-        public string Header5 { get; set; }
-
-        /// <summary>
-        /// Gets or sets current VT100 escape sequence for header 6.
-        /// </summary>
-        public string Header6 { get; set; }
-
-        /// <summary>
-        /// Gets or sets current VT100 escape sequence for code inline and code blocks.
-        /// </summary>
-        public string Code { get; set; }
-
-        /// <summary>
-        /// Gets or sets current VT100 escape sequence for links.
-        /// </summary>
-        public string Link { get; set; }
-
-        /// <summary>
-        /// Gets or sets current VT100 escape sequence for images.
-        /// </summary>
-        public string Image { get; set; }
-
-        /// <summary>
-        /// Gets or sets current VT100 escape sequence for bold text.
-        /// </summary>
-        public string EmphasisBold { get; set; }
-
-        /// <summary>
-        /// Gets or sets current VT100 escape sequence for italics text.
-        /// </summary>
-        public string EmphasisItalics { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether VT100 escape sequences should be added. Default it true.
-        /// </summary>
-        public bool EnableVT100Encoding { get; set; }
-
-        /// <summary>
-        /// Get the property as an rendered escape sequence.
-        /// This is used by formatting system for displaying.
-        /// </summary>
-        /// <param name="propertyName">Name of the property to get as escape sequence.</param>
-        /// <returns>Specified property name as escape sequence.</returns>
-        public string AsEscapeSequence(MarkdownOptionInfoProperty propertyName)
-        {
-            switch (propertyName)
-            {
-                case MarkdownOptionInfoProperty.Header1:
-                    return string.Concat(Esc, Header1, Header1, Esc, EndSequence);
-
-                case MarkdownOptionInfoProperty.Header2:
-                    return string.Concat(Esc, Header2, Header2, Esc, EndSequence);
-
-                case MarkdownOptionInfoProperty.Header3:
-                    return string.Concat(Esc, Header3, Header3, Esc, EndSequence);
-
-                case MarkdownOptionInfoProperty.Header4:
-                    return string.Concat(Esc, Header4, Header4, Esc, EndSequence);
-
-                case MarkdownOptionInfoProperty.Header5:
-                    return string.Concat(Esc, Header5, Header5, Esc, EndSequence);
-
-                case MarkdownOptionInfoProperty.Header6:
-                    return string.Concat(Esc, Header6, Header6, Esc, EndSequence);
-
-                case MarkdownOptionInfoProperty.Code:
-                    return string.Concat(Esc, Code, Code, Esc, EndSequence);
-
-                case MarkdownOptionInfoProperty.Link:
-                    return string.Concat(Esc, Link, Link, Esc, EndSequence);
-
-                case MarkdownOptionInfoProperty.Image:
-                    return string.Concat(Esc, Image, Image, Esc, EndSequence);
-
-                case MarkdownOptionInfoProperty.EmphasisBold:
-                    return string.Concat(Esc, EmphasisBold, EmphasisBold, Esc, EndSequence);
-
-                case MarkdownOptionInfoProperty.EmphasisItalics:
-                    return string.Concat(Esc, EmphasisItalics, EmphasisItalics, Esc, EndSequence);
-
-                default:
-                    break;
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PSMarkdownOptionInfo"/> class and sets dark as the default theme.
-        /// </summary>
-        public PSMarkdownOptionInfo()
-        {
-            SetDarkTheme();
-            EnableVT100Encoding = true;
-        }
-
-        private const string Header1Dark = "[7m";
-        private const string Header2Dark = "[4;93m";
-        private const string Header3Dark = "[4;94m";
-        private const string Header4Dark = "[4;95m";
-        private const string Header5Dark = "[4;96m";
-        private const string Header6Dark = "[4;97m";
-        private const string CodeDark = "[48;2;155;155;155;38;2;30;30;30m";
-        private const string CodeMacOS = "[107;95m";
-        private const string LinkDark = "[4;38;5;117m";
-        private const string ImageDark = "[33m";
-        private const string EmphasisBoldDark = "[1m";
-        private const string EmphasisItalicsDark = "[36m";
-
-        private const string Header1Light = "[7m";
-        private const string Header2Light = "[4;33m";
-        private const string Header3Light = "[4;34m";
-        private const string Header4Light = "[4;35m";
-        private const string Header5Light = "[4;36m";
-        private const string Header6Light = "[4;30m";
-        private const string CodeLight = "[48;2;155;155;155;38;2;30;30;30m";
-        private const string LinkLight = "[4;38;5;117m";
-        private const string ImageLight = "[33m";
-        private const string EmphasisBoldLight = "[1m";
-        private const string EmphasisItalicsLight = "[36m";
-
-        /// <summary>
-        /// Set all preference for dark theme.
-        /// </summary>
-        public void SetDarkTheme()
-        {
-            Header1 = Header1Dark;
-            Header2 = Header2Dark;
-            Header3 = Header3Dark;
-            Header4 = Header4Dark;
-            Header5 = Header5Dark;
-            Header6 = Header6Dark;
-            Link = LinkDark;
-            Image = ImageDark;
-            EmphasisBold = EmphasisBoldDark;
-            EmphasisItalics = EmphasisItalicsDark;
-            SetCodeColor(isDarkTheme: true);
-        }
-
-        /// <summary>
-        /// Set all preference for light theme.
-        /// </summary>
-        public void SetLightTheme()
-        {
-            Header1 = Header1Light;
-            Header2 = Header2Light;
-            Header3 = Header3Light;
-            Header4 = Header4Light;
-            Header5 = Header5Light;
-            Header6 = Header6Light;
-            Link = LinkLight;
-            Image = ImageLight;
-            EmphasisBold = EmphasisBoldLight;
-            EmphasisItalics = EmphasisItalicsLight;
-            SetCodeColor(isDarkTheme: false);
-        }
-
-        private void SetCodeColor(bool isDarkTheme)
-        {
-            // MacOS terminal app does not support extended colors for VT100, so we special case for it.
-            Code = Platform.IsMacOS ? CodeMacOS : isDarkTheme ? CodeDark : CodeLight;
-        }
-    }
-
-    /// <summary>
-    /// Class to represent default VT100 escape sequences.
-    /// </summary>
-    public class VT100EscapeSequences
-    {
-        private const char Esc = (char)0x1B;
-
-        private readonly string endSequence = Esc + "[0m";
-
-        // For code blocks, [500@ make sure that the whole line has background color.
-        private const string LongBackgroundCodeBlock = "[500@";
-
-        private readonly PSMarkdownOptionInfo options;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VT100EscapeSequences"/> class.
-        /// </summary>
-        /// <param name="optionInfo">PSMarkdownOptionInfo object to initialize with.</param>
-        public VT100EscapeSequences(PSMarkdownOptionInfo optionInfo)
-        {
-            if (optionInfo == null)
-            {
-                throw new ArgumentNullException(nameof(optionInfo));
-            }
-
-            options = optionInfo;
-        }
-
-        /// <summary>
-        /// Class to represent default VT100 escape sequences.
-        /// </summary>
-        /// <param name="headerText">Text of the header to format.</param>
-        /// <returns>Formatted Header 1 string.</returns>
-        public string FormatHeader1(string headerText)
-        {
-            return FormatHeader(headerText, options.Header1);
-        }
-
-        /// <summary>
-        /// Class to represent default VT100 escape sequences.
-        /// </summary>
-        /// <param name="headerText">Text of the header to format.</param>
-        /// <returns>Formatted Header 2 string.</returns>
-        public string FormatHeader2(string headerText)
-        {
-            return FormatHeader(headerText, options.Header2);
-        }
-
-        /// <summary>
-        /// Class to represent default VT100 escape sequences.
-        /// </summary>
-        /// <param name="headerText">Text of the header to format.</param>
-        /// <returns>Formatted Header 3 string.</returns>
-        public string FormatHeader3(string headerText)
-        {
-            return FormatHeader(headerText, options.Header3);
-        }
-
-        /// <summary>
-        /// Class to represent default VT100 escape sequences.
-        /// </summary>
-        /// <param name="headerText">Text of the header to format.</param>
-        /// <returns>Formatted Header 4 string.</returns>
-        public string FormatHeader4(string headerText)
-        {
-            return FormatHeader(headerText, options.Header4);
-        }
-
-        /// <summary>
-        /// Class to represent default VT100 escape sequences.
-        /// </summary>
-        /// <param name="headerText">Text of the header to format.</param>
-        /// <returns>Formatted Header 5 string.</returns>
-        public string FormatHeader5(string headerText)
-        {
-            return FormatHeader(headerText, options.Header5);
-        }
-
-        /// <summary>
-        /// Class to represent default VT100 escape sequences.
-        /// </summary>
-        /// <param name="headerText">Text of the header to format.</param>
-        /// <returns>Formatted Header 6 string.</returns>
-        public string FormatHeader6(string headerText)
-        {
-            return FormatHeader(headerText, options.Header6);
-        }
-
-        /// <summary>
-        /// Class to represent default VT100 escape sequences.
-        /// </summary>
-        /// <param name="codeText">Text of the code block to format.</param>
-        /// <param name="isInline">True if it is a inline code block, false otherwise.</param>
-        /// <returns>Formatted code block string.</returns>
-        public string FormatCode(string codeText, bool isInline)
-        {
-            bool isVT100Enabled = options.EnableVT100Encoding;
-
-            if (isInline)
-            {
-                if (isVT100Enabled)
-                {
-                    return string.Concat(Esc, options.Code, codeText, endSequence);
-                }
-                else
-                {
-                    return codeText;
-                }
-            }
-            else
-            {
-                if (isVT100Enabled)
-                {
-                    return string.Concat(Esc, options.Code, codeText, Esc, LongBackgroundCodeBlock, endSequence);
-                }
-                else
-                {
-                    return codeText;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Class to represent default VT100 escape sequences.
-        /// </summary>
-        /// <param name="linkText">Text of the link to format.</param>
-        /// <param name="url">URL of the link.</param>
-        /// <param name="hideUrl">True url should be hidden, false otherwise. Default is true.</param>
-        /// <returns>Formatted link string.</returns>
-        public string FormatLink(string linkText, string url, bool hideUrl = true)
-        {
-            bool isVT100Enabled = options.EnableVT100Encoding;
-
-            if (hideUrl)
-            {
-                if (isVT100Enabled)
-                {
-                    return string.Concat(Esc, options.Link, "\"", linkText, "\"", endSequence);
-                }
-                else
-                {
-                    return string.Concat("\"", linkText, "\"");
-                }
-            }
-            else
-            {
-                if (isVT100Enabled)
-                {
-                    return string.Concat("\"", linkText, "\" (", Esc, options.Link, url, endSequence, ")");
-                }
-                else
-                {
-                    return string.Concat("\"", linkText, "\" (", url, ")");
-                }
-            }
-        }
-
-        /// <summary>
-        /// Class to represent default VT100 escape sequences.
-        /// </summary>
-        /// <param name="emphasisText">Text to format as emphasis.</param>
-        /// <param name="isBold">True if it is to be formatted as bold, false to format it as italics.</param>
-        /// <returns>Formatted emphasis string.</returns>
-        public string FormatEmphasis(string emphasisText, bool isBold)
-        {
-            var sequence = isBold ? options.EmphasisBold : options.EmphasisItalics;
-
-            if (options.EnableVT100Encoding)
-            {
-                return string.Concat(Esc, sequence, emphasisText, endSequence);
-            }
-            else
-            {
-                return emphasisText;
-            }
-        }
-
-        /// <summary>
-        /// Class to represent default VT100 escape sequences.
-        /// </summary>
-        /// <param name="altText">Text of the image to format.</param>
-        /// <returns>Formatted image string.</returns>
-        public string FormatImage(string altText)
-        {
-            var text = altText;
-
-            if (string.IsNullOrEmpty(altText))
-            {
-                text = "Image";
-            }
-
-            if (options.EnableVT100Encoding)
-            {
-                return string.Concat(Esc, options.Image, "[", text, "]", endSequence);
-            }
-            else
-            {
-                return string.Concat("[", text, "]");
-            }
-        }
-
-        private string FormatHeader(string headerText, string headerEscapeSequence)
-        {
-            if (options.EnableVT100Encoding)
-            {
-                return string.Concat(Esc, headerEscapeSequence, headerText, endSequence);
-            }
-            else
-            {
-                return headerText;
-            }
-        }
-    }
-}
diff --git a/src/Microsoft.PowerShell.MarkdownRender/VT100ObjectRenderer.cs b/src/Microsoft.PowerShell.MarkdownRender/VT100ObjectRenderer.cs
deleted file mode 100644
index 916999ecf77..00000000000
--- a/src/Microsoft.PowerShell.MarkdownRender/VT100ObjectRenderer.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using Markdig.Renderers;
-using Markdig.Syntax;
-
-namespace Microsoft.PowerShell.MarkdownRender
-{
-    /// <summary>
-    /// Implement the MarkdownObjectRenderer with VT100Renderer.
-    /// </summary>
-    /// <typeparam name="T">The element type of the renderer.</typeparam>
-    public abstract class VT100ObjectRenderer<T> : MarkdownObjectRenderer<VT100Renderer, T> where T : MarkdownObject
-    {
-    }
-}
diff --git a/src/Microsoft.PowerShell.MarkdownRender/VT100Renderer.cs b/src/Microsoft.PowerShell.MarkdownRender/VT100Renderer.cs
deleted file mode 100644
index 1f5da6270dc..00000000000
--- a/src/Microsoft.PowerShell.MarkdownRender/VT100Renderer.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System.IO;
-using Markdig.Renderers;
-
-namespace Microsoft.PowerShell.MarkdownRender
-{
-    /// <summary>
-    /// Initializes an instance of the VT100 renderer.
-    /// </summary>
-    public sealed class VT100Renderer : TextRendererBase<VT100Renderer>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="VT100Renderer"/> class.
-        /// </summary>
-        /// <param name="writer">TextWriter to write to.</param>
-        /// <param name="optionInfo">PSMarkdownOptionInfo object with options.</param>
-        public VT100Renderer(TextWriter writer, PSMarkdownOptionInfo optionInfo) : base(writer)
-        {
-            EscapeSequences = new VT100EscapeSequences(optionInfo);
-
-            // Add the various element renderers.
-            ObjectRenderers.Add(new HeaderBlockRenderer());
-            ObjectRenderers.Add(new LineBreakRenderer());
-            ObjectRenderers.Add(new CodeInlineRenderer());
-            ObjectRenderers.Add(new FencedCodeBlockRenderer());
-            ObjectRenderers.Add(new EmphasisInlineRenderer());
-            ObjectRenderers.Add(new ParagraphBlockRenderer());
-            ObjectRenderers.Add(new LeafInlineRenderer());
-            ObjectRenderers.Add(new LinkInlineRenderer());
-            ObjectRenderers.Add(new ListBlockRenderer());
-            ObjectRenderers.Add(new ListItemBlockRenderer());
-            ObjectRenderers.Add(new QuoteBlockRenderer());
-        }
-
-        /// <summary>
-        /// Gets the current escape sequences.
-        /// </summary>
-        public VT100EscapeSequences EscapeSequences { get; }
-    }
-}
diff --git a/src/Microsoft.PowerShell.Security/security/AclCommands.cs b/src/Microsoft.PowerShell.Security/security/AclCommands.cs
index 7fa42b31424..beda593b70b 100644
--- a/src/Microsoft.PowerShell.Security/security/AclCommands.cs
+++ b/src/Microsoft.PowerShell.Security/security/AclCommands.cs
@@ -5,18 +5,18 @@
 #pragma warning disable 56506
 
 using System;
-using System.Management.Automation;
-using Dbg = System.Management.Automation;
-using System.Management.Automation.Security;
-using System.Security.AccessControl;
-using System.Security.Principal;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
-using System.Runtime.InteropServices;
 using System.Globalization;
-using System.ComponentModel;
-using System.Reflection;
+using System.Management.Automation;
+using System.Management.Automation.Security;
+using System.Runtime.InteropServices;
+using System.Security.AccessControl;
+using System.Security.Principal;
+
+using Dbg = System.Management.Automation;
 
 namespace Microsoft.PowerShell.Commands
 {
@@ -292,20 +292,17 @@ public static AuthorizationRuleCollection GetAccess(PSObject instance)
             }
 
             // Get DACL
-            AuthorizationRuleCollection dacl;
             CommonObjectSecurity cos = sd as CommonObjectSecurity;
             if (cos != null)
             {
-                dacl = cos.GetAccessRules(true, true, typeof(NTAccount));
+                return cos.GetAccessRules(true, true, typeof(NTAccount));
             }
             else
             {
                 DirectoryObjectSecurity dos = sd as DirectoryObjectSecurity;
                 Dbg.Diagnostics.Assert(dos != null, "Acl should be of type CommonObjectSecurity or DirectoryObjectSecurity");
-                dacl = dos.GetAccessRules(true, true, typeof(NTAccount));
+                return dos.GetAccessRules(true, true, typeof(NTAccount));
             }
-
-            return dacl;
         }
 
         /// <summary>
@@ -330,20 +327,17 @@ public static AuthorizationRuleCollection GetAudit(PSObject instance)
                 PSTraceSource.NewArgumentException(nameof(instance));
             }
 
-            AuthorizationRuleCollection sacl;
             CommonObjectSecurity cos = sd as CommonObjectSecurity;
             if (cos != null)
             {
-                sacl = cos.GetAuditRules(true, true, typeof(NTAccount));
+                return cos.GetAuditRules(true, true, typeof(NTAccount));
             }
             else
             {
                 DirectoryObjectSecurity dos = sd as DirectoryObjectSecurity;
                 Dbg.Diagnostics.Assert(dos != null, "Acl should be of type CommonObjectSecurity or DirectoryObjectSecurity");
-                sacl = dos.GetAuditRules(true, true, typeof(NTAccount));
+                return dos.GetAuditRules(true, true, typeof(NTAccount));
             }
-
-            return sacl;
         }
 
         /// <summary>
@@ -360,8 +354,7 @@ public static SecurityIdentifier GetCentralAccessPolicyId(PSObject instance)
             SessionState sessionState = new SessionState();
             string path = sessionState.Path.GetUnresolvedProviderPathFromPSPath(
                 GetPath(instance));
-            IntPtr pOwner = IntPtr.Zero, pGroup = IntPtr.Zero;
-            IntPtr pDacl = IntPtr.Zero, pSacl = IntPtr.Zero, pSd = IntPtr.Zero;
+            IntPtr pSd = IntPtr.Zero;
 
             try
             {
@@ -370,10 +363,10 @@ public static SecurityIdentifier GetCentralAccessPolicyId(PSObject instance)
                     path,
                     NativeMethods.SeObjectType.SE_FILE_OBJECT,
                     NativeMethods.SecurityInformation.SCOPE_SECURITY_INFORMATION,
-                    out pOwner,
-                    out pGroup,
-                    out pDacl,
-                    out pSacl,
+                    out IntPtr pOwner,
+                    out IntPtr pGroup,
+                    out IntPtr pDacl,
+                    out IntPtr pSacl,
                     out pSd);
                 if (rs != NativeMethods.ERROR_SUCCESS)
                 {
@@ -385,8 +378,7 @@ public static SecurityIdentifier GetCentralAccessPolicyId(PSObject instance)
                     return null;
                 }
 
-                NativeMethods.ACL sacl = new NativeMethods.ACL();
-                sacl = Marshal.PtrToStructure<NativeMethods.ACL>(pSacl);
+                NativeMethods.ACL sacl = Marshal.PtrToStructure<NativeMethods.ACL>(pSacl);
                 if (sacl.AceCount == 0)
                 {
                     return null;
@@ -396,8 +388,7 @@ public static SecurityIdentifier GetCentralAccessPolicyId(PSObject instance)
                 IntPtr pAce = pSacl + Marshal.SizeOf(new NativeMethods.ACL());
                 for (ushort aceIdx = 0; aceIdx < sacl.AceCount; aceIdx++)
                 {
-                    NativeMethods.ACE_HEADER ace = new NativeMethods.ACE_HEADER();
-                    ace = Marshal.PtrToStructure<NativeMethods.ACE_HEADER>(pAce);
+                    NativeMethods.ACE_HEADER ace = Marshal.PtrToStructure<NativeMethods.ACE_HEADER>(pAce);
                     Dbg.Diagnostics.Assert(ace.AceType ==
                         NativeMethods.SYSTEM_SCOPED_POLICY_ID_ACE_TYPE,
                         "Unexpected ACE type: " + ace.AceType.ToString(CultureInfo.CurrentCulture));
@@ -458,12 +449,11 @@ public static string GetCentralAccessPolicyName(PSObject instance)
                 Marshal.Copy(capIdArray, 0, pCapId, capIdSize);
                 IntPtr[] ppCapId = new IntPtr[1];
                 ppCapId[0] = pCapId;
-                uint capCount = 0;
                 uint rs = NativeMethods.LsaQueryCAPs(
                     ppCapId,
                     1,
                     out caps,
-                    out capCount);
+                    out uint capCount);
                 if (rs != NativeMethods.STATUS_SUCCESS)
                 {
                     throw new Win32Exception((int)rs);
@@ -475,8 +465,7 @@ public static string GetCentralAccessPolicyName(PSObject instance)
                 }
 
                 // Get the CAP name.
-                NativeMethods.CENTRAL_ACCESS_POLICY cap = new NativeMethods.CENTRAL_ACCESS_POLICY();
-                cap = Marshal.PtrToStructure<NativeMethods.CENTRAL_ACCESS_POLICY>(caps);
+                NativeMethods.CENTRAL_ACCESS_POLICY cap = Marshal.PtrToStructure<NativeMethods.CENTRAL_ACCESS_POLICY>(caps);
                 // LSA_UNICODE_STRING is composed of WCHARs, but its length is given in bytes.
                 return Marshal.PtrToStringUni(cap.Name.Buffer, cap.Name.Length / 2);
             }
@@ -508,12 +497,11 @@ public static string[] GetAllCentralAccessPolicies(PSObject instance)
             try
             {
                 // Retrieve all CAPs.
-                uint capCount = 0;
                 uint rs = NativeMethods.LsaQueryCAPs(
                     null,
                     0,
                     out caps,
-                    out capCount);
+                    out uint capCount);
                 if (rs != NativeMethods.STATUS_SUCCESS)
                 {
                     throw new Win32Exception((int)rs);
@@ -528,14 +516,13 @@ public static string[] GetAllCentralAccessPolicies(PSObject instance)
 
                 // Add CAP names and IDs to a string array.
                 string[] policies = new string[capCount];
-                NativeMethods.CENTRAL_ACCESS_POLICY cap = new NativeMethods.CENTRAL_ACCESS_POLICY();
                 IntPtr capPtr = caps;
                 for (uint capIdx = 0; capIdx < capCount; capIdx++)
                 {
                     // Retrieve CAP name.
                     Dbg.Diagnostics.Assert(capPtr != IntPtr.Zero,
                         "Invalid central access policies array");
-                    cap = Marshal.PtrToStructure<NativeMethods.CENTRAL_ACCESS_POLICY>(capPtr);
+                    NativeMethods.CENTRAL_ACCESS_POLICY cap = Marshal.PtrToStructure<NativeMethods.CENTRAL_ACCESS_POLICY>(capPtr);
                     // LSA_UNICODE_STRING is composed of WCHARs, but its length is given in bytes.
                     policies[capIdx] = "\"" + Marshal.PtrToStringUni(
                         cap.Name.Buffer,
@@ -653,7 +640,7 @@ public string[] Path
             }
         }
 
-        private PSObject _inputObject = null;
+        private PSObject _inputObject;
 
         /// <summary>
         /// InputObject Parameter
@@ -695,7 +682,7 @@ public string[] LiteralPath
             }
         }
 
-        private bool _isLiteralPath = false;
+        private bool _isLiteralPath;
 
         /// <summary>
         /// Gets or sets the audit flag of the command.  This flag
@@ -758,7 +745,6 @@ public SwitchParameter AllCentralAccessPolicies
         /// </summary>
         protected override void ProcessRecord()
         {
-            Collection<PSObject> sd = null;
             AccessControlSections sections =
                 AccessControlSections.Owner |
                 AccessControlSections.Group |
@@ -855,7 +841,7 @@ protected override void ProcessRecord()
 
                             InvokeProvider.SecurityDescriptor.Get(rp, sections, context);
 
-                            sd = context.GetAccumulatedObjects();
+                            Collection<PSObject> sd = context.GetAccumulatedObjects();
                             if (sd != null)
                             {
                                 AddBrokeredProperties(
@@ -921,7 +907,7 @@ public string[] Path
             }
         }
 
-        private PSObject _inputObject = null;
+        private PSObject _inputObject;
 
         /// <summary>
         /// InputObject Parameter
@@ -962,7 +948,7 @@ public string[] LiteralPath
             }
         }
 
-        private bool _isLiteralPath = false;
+        private bool _isLiteralPath;
 
         private object _securityDescriptor;
 
@@ -1060,7 +1046,7 @@ public SwitchParameter Passthru
         /// Returns a newly allocated SACL with no ACEs in it.
         /// Free the returned SACL by calling Marshal.FreeHGlobal.
         /// </summary>
-        private IntPtr GetEmptySacl()
+        private static IntPtr GetEmptySacl()
         {
             IntPtr pSacl = IntPtr.Zero;
             bool ret = true;
@@ -1125,12 +1111,11 @@ private IntPtr GetSaclWithCapId(string capStr)
                     // be deallocated separately (but with the entire buffer
                     // returned by LsaQueryCAPs).
                     freeCapId = false;
-                    uint capCount = 0;
                     rs = NativeMethods.LsaQueryCAPs(
                         null,
                         0,
                         out caps,
-                        out capCount);
+                        out uint capCount);
                     if (rs != NativeMethods.STATUS_SUCCESS)
                     {
                         throw new Win32Exception((int)rs);
@@ -1144,13 +1129,12 @@ private IntPtr GetSaclWithCapId(string capStr)
                     }
 
                     // Find the supplied string among available CAP names, use the corresponding CAPID.
-                    NativeMethods.CENTRAL_ACCESS_POLICY cap = new NativeMethods.CENTRAL_ACCESS_POLICY();
                     IntPtr capPtr = caps;
                     for (uint capIdx = 0; capIdx < capCount; capIdx++)
                     {
                         Dbg.Diagnostics.Assert(capPtr != IntPtr.Zero,
                             "Invalid central access policies array");
-                        cap = Marshal.PtrToStructure<NativeMethods.CENTRAL_ACCESS_POLICY>(capPtr);
+                        NativeMethods.CENTRAL_ACCESS_POLICY cap = Marshal.PtrToStructure<NativeMethods.CENTRAL_ACCESS_POLICY>(capPtr);
                         // LSA_UNICODE_STRING is composed of WCHARs, but its length is given in bytes.
                         string capName = Marshal.PtrToStringUni(
                             cap.Name.Buffer,
@@ -1246,7 +1230,7 @@ private IntPtr GetSaclWithCapId(string capStr)
         /// and the previous state of this privilege. Free the returned token
         /// by calling NativeMethods.CloseHandle.
         /// </summary>
-        private IntPtr GetTokenWithEnabledPrivilege(
+        private static IntPtr GetTokenWithEnabledPrivilege(
             string privilege,
             NativeMethods.TOKEN_PRIVILEGE previousState)
         {
@@ -1334,14 +1318,13 @@ protected override void ProcessRecord()
 
                 if (methodInfo != null)
                 {
-                    CommonSecurityDescriptor aclCommonSD = _securityDescriptor as CommonSecurityDescriptor;
                     string sddl;
 
                     if (aclObjectSecurity != null)
                     {
                         sddl = aclObjectSecurity.GetSecurityDescriptorSddlForm(AccessControlSections.All);
                     }
-                    else if (aclCommonSD != null)
+                    else if (_securityDescriptor is CommonSecurityDescriptor aclCommonSD)
                     {
                         sddl = aclCommonSD.GetSddlForm(AccessControlSections.All);
                     }
@@ -1476,9 +1459,8 @@ protected override void ProcessRecord()
                         context.PassThru = Passthru;
                         if (_isLiteralPath)
                         {
-                            ProviderInfo Provider = null;
-                            PSDriveInfo Drive = null;
-                            string pathStr = SessionState.Path.GetUnresolvedProviderPathFromPSPath(p, out Provider, out Drive);
+                            string pathStr = SessionState.Path.GetUnresolvedProviderPathFromPSPath(
+                                p, out ProviderInfo Provider, out PSDriveInfo Drive);
                             pathsToProcess.Add(new PathInfo(Drive, Provider, pathStr, SessionState));
                             context.SuppressWildcardExpansion = true;
                         }
@@ -1588,4 +1570,3 @@ protected override void ProcessRecord()
 }
 
 #pragma warning restore 56506
-
diff --git a/src/Microsoft.PowerShell.Security/security/CatalogCommands.cs b/src/Microsoft.PowerShell.Security/security/CatalogCommands.cs
index 895a551e057..5b542da92c2 100644
--- a/src/Microsoft.PowerShell.Security/security/CatalogCommands.cs
+++ b/src/Microsoft.PowerShell.Security/security/CatalogCommands.cs
@@ -4,14 +4,10 @@
 #if !UNIX
 
 using System;
+using System.Collections.ObjectModel;
+using System.IO;
 using System.Management.Automation;
 using Dbg = System.Management.Automation.Diagnostics;
-using System.Collections;
-using System.IO;
-using System.Management.Automation.Provider;
-using System.Runtime.InteropServices;
-using System.Collections.ObjectModel;
-using System.Diagnostics.CodeAnalysis;
 
 namespace Microsoft.PowerShell.Commands
 {
diff --git a/src/Microsoft.PowerShell.Security/security/CertificateCommands.cs b/src/Microsoft.PowerShell.Security/security/CertificateCommands.cs
index 0da1112f5e3..46ab49ee0ab 100644
--- a/src/Microsoft.PowerShell.Security/security/CertificateCommands.cs
+++ b/src/Microsoft.PowerShell.Security/security/CertificateCommands.cs
@@ -1,11 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.IO;
 using System.Management.Automation;
 using System.Security;
 using System.Security.Cryptography;
diff --git a/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs b/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs
index e60b817d4ec..79e3eac1971 100644
--- a/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs
+++ b/src/Microsoft.PowerShell.Security/security/CertificateProvider.cs
@@ -4,28 +4,29 @@
 #if !UNIX
 
 using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.IO;
 using System.Management.Automation;
 using System.Management.Automation.Host;
 using System.Management.Automation.Internal;
-using Runspaces = System.Management.Automation.Runspaces;
-using Dbg = System.Management.Automation;
-using Security = System.Management.Automation.Security;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections;
-using System.Runtime.InteropServices;
 using System.Management.Automation.Provider;
+using System.Runtime.InteropServices;
+using System.Security;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Text.RegularExpressions;
-using System.Globalization;
-using System.IO;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
 using System.Xml;
 using System.Xml.XPath;
-using System.Security;
+
+using Dbg = System.Management.Automation;
 using DWORD = System.UInt32;
+using Runspaces = System.Management.Automation.Runspaces;
+using Security = System.Management.Automation.Security;
 
 namespace Microsoft.PowerShell.Commands
 {
@@ -122,7 +123,7 @@ public int ExpiringInDays
     /// The structure contains punycode name and unicode name.
     /// </summary>
     [SuppressMessage("Microsoft.Performance", "CA1815:OverrideEqualsAndOperatorEqualsOnValueTypes")]
-    public struct DnsNameRepresentation
+    public readonly struct DnsNameRepresentation
     {
         /// <summary>
         /// Punycode version of DNS name.
@@ -272,7 +273,7 @@ protected override bool ReleaseHandle()
         {
             bool fResult = false;
 
-            if (IntPtr.Zero != handle)
+            if (handle != IntPtr.Zero)
             {
                 fResult = Security.NativeMethods.CertCloseStore(handle, 0);
                 handle = IntPtr.Zero;
@@ -349,7 +350,7 @@ public void Open(bool includeArchivedCerts)
                                 IntPtr.Zero,  // hCryptProv
                                 StoreFlags,
                                 _storeName);
-                if (IntPtr.Zero == hCertStore)
+                if (hCertStore == IntPtr.Zero)
                 {
                     throw new System.ComponentModel.Win32Exception(Marshal.GetLastWin32Error());
                 }
@@ -441,7 +442,7 @@ public IntPtr GetCertByName(string Name)
                     while (true)
                     {
                         certContext = GetNextCert(certContext);
-                        if (IntPtr.Zero == certContext)
+                        if (certContext == IntPtr.Zero)
                         {
                             break;
                         }
@@ -634,7 +635,7 @@ private static Regex CertPathRegex
                 {
                     if (s_certPathRegex == null)
                     {
-                        RegexOptions options = RegexOptions.IgnoreCase | RegexOptions.Compiled;
+                        const RegexOptions options = RegexOptions.IgnoreCase | RegexOptions.Compiled;
                         s_certPathRegex = new Regex(certPathPattern, options);
                     }
                 }
@@ -720,7 +721,7 @@ protected override void RemoveItem(
                  string.Equals(pathElements[1], "ROOT", StringComparison.OrdinalIgnoreCase))
             {
                 string message = CertificateProviderStrings.UINotAllowed;
-                string errorId = "UINotAllowed";
+                const string errorId = "UINotAllowed";
                 ThrowInvalidOperation(errorId, message);
             }
 
@@ -745,7 +746,7 @@ protected override void RemoveItem(
                     if (fUserContext)
                     {
                         string message = CertificateProviderStrings.CannotDeleteUserStore;
-                        string errorId = "CannotDeleteUserStore";
+                        const string errorId = "CannotDeleteUserStore";
                         ThrowInvalidOperation(errorId, message);
                     }
 
@@ -755,7 +756,7 @@ protected override void RemoveItem(
                 else // other container than a store
                 {
                     string message = CertificateProviderStrings.CannotRemoveContainer;
-                    string errorId = "CannotRemoveContainer";
+                    const string errorId = "CannotRemoveContainer";
                     ThrowInvalidOperation(errorId, message);
                 }
             }
@@ -826,7 +827,7 @@ protected override void MoveItem(
             if (isContainer)
             {
                 string message = CertificateProviderStrings.CannotMoveContainer;
-                string errorId = "CannotMoveContainer";
+                const string errorId = "CannotMoveContainer";
                 ThrowInvalidOperation(errorId, message);
             }
 
@@ -843,7 +844,7 @@ protected override void MoveItem(
                 else
                 {
                     string message = CertificateProviderStrings.InvalidDestStore;
-                    string errorId = "InvalidDestStore";
+                    const string errorId = "InvalidDestStore";
                     ThrowInvalidOperation(errorId, message);
                 }
             }
@@ -855,14 +856,14 @@ protected override void MoveItem(
             if (!string.Equals(pathElements[0], destElements[0], StringComparison.OrdinalIgnoreCase))
             {
                 string message = CertificateProviderStrings.CannotMoveCrossContext;
-                string errorId = "CannotMoveCrossContext";
+                const string errorId = "CannotMoveCrossContext";
                 ThrowInvalidOperation(errorId, message);
             }
 
             if (string.Equals(pathElements[1], destElements[1], StringComparison.OrdinalIgnoreCase))
             {
                 string message = CertificateProviderStrings.CannotMoveToSameStore;
-                string errorId = "CannotMoveToSameStore";
+                const string errorId = "CannotMoveToSameStore";
                 ThrowInvalidOperation(errorId, message);
             }
 
@@ -876,7 +877,7 @@ protected override void MoveItem(
                      string.Equals(destElements[1], "ROOT", StringComparison.OrdinalIgnoreCase)))
                 {
                     string message = CertificateProviderStrings.UINotAllowed;
-                    string errorId = "UINotAllowed";
+                    const string errorId = "UINotAllowed";
                     ThrowInvalidOperation(errorId, message);
                 }
             }
@@ -960,7 +961,7 @@ protected override void NewItem(
             if (pathElements.Length != 2)
             {
                 string message = CertificateProviderStrings.CannotCreateItem;
-                string errorId = "CannotCreateItem";
+                const string errorId = "CannotCreateItem";
                 ThrowInvalidOperation(errorId, message);
             }
 
@@ -970,11 +971,11 @@ protected override void NewItem(
             if (fUserContext)
             {
                 string message = CertificateProviderStrings.CannotCreateUserStore;
-                string errorId = "CannotCreateUserStore";
+                const string errorId = "CannotCreateUserStore";
                 ThrowInvalidOperation(errorId, message);
             }
 
-            Security.NativeMethods.CertOpenStoreFlags StoreFlags =
+            const Security.NativeMethods.CertOpenStoreFlags StoreFlags =
                     Security.NativeMethods.CertOpenStoreFlags.CERT_STORE_CREATE_NEW_FLAG |
                     Security.NativeMethods.CertOpenStoreFlags.CERT_STORE_MAXIMUM_ALLOWED_FLAG |
                     Security.NativeMethods.CertOpenStoreFlags.CERT_SYSTEM_STORE_LOCAL_MACHINE;
@@ -986,7 +987,7 @@ protected override void NewItem(
                                 IntPtr.Zero,  // hCryptProv
                                 StoreFlags,
                                 pathElements[1]);
-            if (IntPtr.Zero == hCertStore)
+            if (hCertStore == IntPtr.Zero)
             {
                 throw new System.ComponentModel.Win32Exception(Marshal.GetLastWin32Error());
             }
@@ -1083,7 +1084,7 @@ protected override bool HasChildItems(string path)
                     {
                         store.Open(IncludeArchivedCerts());
                         IntPtr certContext = store.GetFirstCert();
-                        if (IntPtr.Zero != certContext)
+                        if (certContext != IntPtr.Zero)
                         {
                             store.FreeCert(certContext);
                             result = true;
@@ -1373,7 +1374,7 @@ private void AttemptToImportPkiModule()
             _hasAttemptedToLoadPkiModule = true;
         }
 
-        private string MyGetChildName(string path)
+        private static string MyGetChildName(string path)
         {
             // Verify the parameters
 
@@ -1414,7 +1415,7 @@ protected override void InvokeDefaultAction(string path)
         {
             path = NormalizePath(path);
             string action = CertificateProviderStrings.Action_Invoke;
-            string certmgr = "certmgr.msc";
+            const string certmgr = "certmgr.msc";
             string certPath = System.IO.Path.Combine(
                 System.Environment.ExpandEnvironmentVariables("%windir%"), "system32");
 
@@ -1749,7 +1750,7 @@ private void RemoveCertStore(string storeName, bool fDeleteKey, string sourcePat
             // if recurse is true, remove every cert in the store
             IntPtr localName = Security.NativeMethods.CryptFindLocalizedName(storeName);
             string[] pathElements = GetPathElements(sourcePath);
-            if (IntPtr.Zero == localName)//not find, we can remove
+            if (localName == IntPtr.Zero)//not find, we can remove
             {
                 X509NativeStore store = null;
 
@@ -1763,7 +1764,7 @@ private void RemoveCertStore(string storeName, bool fDeleteKey, string sourcePat
                 // enumerate over each cert and remove it
                 //
                 IntPtr certContext = store.GetFirstCert();
-                while (IntPtr.Zero != certContext)
+                while (certContext != IntPtr.Zero)
                 {
                     X509Certificate2 cert = new X509Certificate2(certContext);
                     string certPath = sourcePath + cert.Thumbprint;
@@ -1772,7 +1773,7 @@ private void RemoveCertStore(string storeName, bool fDeleteKey, string sourcePat
                     certContext = store.GetNextCert(certContext);
                 }
                 // remove the cert store
-                Security.NativeMethods.CertOpenStoreFlags StoreFlags =
+                const Security.NativeMethods.CertOpenStoreFlags StoreFlags =
                         Security.NativeMethods.CertOpenStoreFlags.CERT_STORE_READONLY_FLAG |
                         Security.NativeMethods.CertOpenStoreFlags.CERT_STORE_OPEN_EXISTING_FLAG |
                         Security.NativeMethods.CertOpenStoreFlags.CERT_STORE_DEFER_CLOSE_UNTIL_LAST_FREE_FLAG |
@@ -1793,7 +1794,7 @@ private void RemoveCertStore(string storeName, bool fDeleteKey, string sourcePat
                                         CultureInfo.CurrentCulture,
                                         CertificateProviderStrings.RemoveStoreTemplate,
                                         storeName);
-                string errorId = "CannotRemoveSystemStore";
+                const string errorId = "CannotRemoveSystemStore";
                 ThrowInvalidOperation(errorId, message);
             }
         }
@@ -1919,7 +1920,7 @@ private void DoRemove(X509Certificate2 cert, bool fDeleteKey, bool fMachine, str
         /// </summary>
         /// <param name="storeHandle">An IntPtr for store handle.</param>
         /// <returns>No return.</returns>
-        private void CommitUserDS(IntPtr storeHandle)
+        private static void CommitUserDS(IntPtr storeHandle)
         {
             if (!Security.NativeMethods.CertControlStore(
                                         storeHandle,
@@ -2098,7 +2099,7 @@ private object GetItemAtPath(string path, bool test, out bool isContainer)
                         store.Open(IncludeArchivedCerts());
 
                         IntPtr certContext = store.GetCertByName(pathElements[2]);
-                        if (IntPtr.Zero == certContext)
+                        if (certContext == IntPtr.Zero)
                         {
                             if (test)
                             {
@@ -2449,7 +2450,7 @@ private void GetCertificatesOrNames(string path,
             //
             IntPtr certContext = store.GetFirstCert();
 
-            while (IntPtr.Zero != certContext)
+            while (certContext != IntPtr.Zero)
             {
                 X509Certificate2 cert = new X509Certificate2(certContext);
 
@@ -2827,7 +2828,7 @@ internal static bool CertContainsEku(X509Certificate2 cert, List<WildcardPattern
                     OidCollection enhancedKeyUsages = eku.EnhancedKeyUsages;
                     foreach (WildcardPattern ekuPattern in ekuPatterns)
                     {
-                        bool patternPassed = false;
+                        const bool patternPassed = false;
                         foreach (var usage in enhancedKeyUsages)
                         {
                             if (ekuPattern.IsMatch(usage.Value) || ekuPattern.IsMatch(usage.FriendlyName))
@@ -3009,7 +3010,7 @@ public string LocationName
 
         /// <summary>
         /// Gets the location as a
-        /// <see cref="System.Security.Cryptography.X509Certificates.StoreLocation" />
+        /// <see cref="System.Security.Cryptography.X509Certificates.StoreLocation"/>
         /// </summary>
         public StoreLocation Location
         {
@@ -3063,7 +3064,7 @@ public X509StoreLocation(StoreLocation location)
     /// The structure contains friendly name and EKU oid.
     /// </summary>
     [SuppressMessage("Microsoft.Performance", "CA1815:OverrideEqualsAndOperatorEqualsOnValueTypes")]
-    public struct EnhancedKeyUsageRepresentation
+    public readonly struct EnhancedKeyUsageRepresentation
     {
         /// <summary>
         /// Localized friendly name of EKU.
diff --git a/src/Microsoft.PowerShell.Security/security/SecureStringCommands.cs b/src/Microsoft.PowerShell.Security/security/SecureStringCommands.cs
index 36316364c82..6333541e242 100644
--- a/src/Microsoft.PowerShell.Security/security/SecureStringCommands.cs
+++ b/src/Microsoft.PowerShell.Security/security/SecureStringCommands.cs
@@ -2,8 +2,6 @@
 // Licensed under the MIT License.
 
 using System;
-using System.Globalization;
-using System.IO;
 using System.Management.Automation;
 using System.Runtime.InteropServices;
 using System.Security;
diff --git a/src/Microsoft.PowerShell.Security/security/SignatureCommands.cs b/src/Microsoft.PowerShell.Security/security/SignatureCommands.cs
index 3fa7c054a20..49a37d06c78 100644
--- a/src/Microsoft.PowerShell.Security/security/SignatureCommands.cs
+++ b/src/Microsoft.PowerShell.Security/security/SignatureCommands.cs
@@ -2,22 +2,15 @@
 // Licensed under the MIT License.
 
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Management.Automation;
 using System.Management.Automation.Internal;
-using System.Management.Automation.Provider;
-using System.Runtime.InteropServices;
-using System.Security;
 using System.Security.Cryptography.X509Certificates;
 
 using Dbg = System.Management.Automation.Diagnostics;
 
-using DWORD = System.UInt32;
-
 namespace Microsoft.PowerShell.Commands
 {
     /// <summary>
diff --git a/src/Microsoft.WSMan.Management/ConfigProvider.cs b/src/Microsoft.WSMan.Management/ConfigProvider.cs
index 7054766373d..208303d9b88 100644
--- a/src/Microsoft.WSMan.Management/ConfigProvider.cs
+++ b/src/Microsoft.WSMan.Management/ConfigProvider.cs
@@ -856,7 +856,7 @@ protected override void GetItem(string path)
                             }
                         }
                     }
-                    catch (PSArgumentNullException) { return;/*Leaving this known exception for no value found. Not Throwing error.*/}
+                    catch (PSArgumentNullException) { return; /*Leaving this known exception for no value found. Not Throwing error.*/}
                     catch (NullReferenceException) { return; /*Leaving this known exception for no value found. Not Throwing error.*/}
                 }
             }
@@ -1033,7 +1033,7 @@ protected override void SetItem(string path, object value)
                                     pluginConfiguration.UpdateOneConfiguration(
                                         ".",
                                         WSManStringLiterals.ConfigRunAsPasswordName,
-                                        this.GetStringFromSecureString(runAsCredentials.Password));
+                                        GetStringFromSecureString(runAsCredentials.Password));
                                 }
                             }
 
@@ -1050,7 +1050,7 @@ protected override void SetItem(string path, object value)
                                     AssertError(helper.GetResourceMsgFromResourcetext("SetItemOnRunAsPasswordNoRunAsUser"), false);
                                 }
 
-                                value = this.GetStringFromSecureString(value);
+                                value = GetStringFromSecureString(value);
                             }
 
                             pluginConfiguration.UpdateOneConfiguration(".", ChildName, value.ToString());
@@ -1284,7 +1284,7 @@ protected override void SetItem(string path, object value)
                             {
                                 if (!Force)
                                 {
-                                    string query = "";
+                                    string query = string.Empty;
                                     string caption = helper.GetResourceMsgFromResourcetext("SetItemGeneralSecurityCaption");
                                     if (ChildName.Equals("TrustedHosts", StringComparison.OrdinalIgnoreCase))
                                     {
@@ -2290,7 +2290,7 @@ private void NewItemPluginOrPluginChild(object sessionobj, string path, string h
         /// <param name="WSManElementObjectType"></param>
         /// <param name="input"></param>
         /// <returns></returns>
-        private PSObject GetItemPSObjectWithTypeName(string Name, string TypeNameOfElement, object Value, string[] keys, string ExtendedTypeName, WsManElementObjectTypes WSManElementObjectType, PSObject input = null)
+        private static PSObject GetItemPSObjectWithTypeName(string Name, string TypeNameOfElement, object Value, string[] keys, string ExtendedTypeName, WsManElementObjectTypes WSManElementObjectType, PSObject input = null)
         {
             PSObject mshObject = null;
             if (WSManElementObjectType.Equals(WsManElementObjectTypes.WSManConfigElement))
@@ -2410,7 +2410,7 @@ private void SetItemListenerOrClientCertificate(object sessionObj, string Resour
         /// <param name="value"></param>
         /// <param name="host"></param>
         /// <returns></returns>
-        private string GetInputStringForCreate(string ResourceURI, Hashtable value, string host)
+        private static string GetInputStringForCreate(string ResourceURI, Hashtable value, string host)
         {
             string putstr = string.Empty;
             string nilns = string.Empty;
@@ -2523,7 +2523,7 @@ private string GetHostName(string path)
             return sHostname;
         }
 
-        private string GetRootNodeName(string ResourceURI)
+        private static string GetRootNodeName(string ResourceURI)
         {
             string tempuri = string.Empty;
             if (ResourceURI.Contains('?'))
@@ -2531,7 +2531,7 @@ private string GetRootNodeName(string ResourceURI)
                 ResourceURI = ResourceURI.Split('?').GetValue(0).ToString();
             }
 
-            string PTRN_URI_LAST = "([a-z_][-a-z0-9._]*)$";
+            const string PTRN_URI_LAST = "([a-z_][-a-z0-9._]*)$";
             Regex objregex = new Regex(PTRN_URI_LAST, RegexOptions.IgnoreCase);
             MatchCollection regexmatch = objregex.Matches(ResourceURI);
             if (regexmatch.Count > 0)
@@ -2542,7 +2542,7 @@ private string GetRootNodeName(string ResourceURI)
             return tempuri;
         }
 
-        private string EscapeValuesForXML(string value)
+        private static string EscapeValuesForXML(string value)
         {
             StringBuilder esc_str = new StringBuilder();
             for (int i = 0; i <= value.Length - 1; i++)
@@ -2585,7 +2585,7 @@ private string EscapeValuesForXML(string value)
             return esc_str.ToString();
         }
 
-        private bool IsItemContainer(XmlNodeList nodes)
+        private static bool IsItemContainer(XmlNodeList nodes)
         {
             bool result = false;
             if (nodes.Count != 0)
@@ -2935,7 +2935,7 @@ private bool ContainResourceValue(object sessionobj, string ResourceURI, string
 
         #endregion "WsMan linking Operations"
 
-        private string GetURIWithFilter(string uri, Hashtable cmdlinevalues)
+        private static string GetURIWithFilter(string uri, Hashtable cmdlinevalues)
         {
             StringBuilder sburi = new StringBuilder(uri);
             if (cmdlinevalues != null)
@@ -2960,7 +2960,7 @@ private string GetURIWithFilter(string uri, Hashtable cmdlinevalues)
             return sburi.ToString();
         }
 
-        private string GetFilterString(Hashtable cmdlinevalues, string[] pkey)
+        private static string GetFilterString(Hashtable cmdlinevalues, string[] pkey)
         {
             StringBuilder filter = new StringBuilder();
             foreach (string key in pkey)
@@ -2979,7 +2979,7 @@ private string GetFilterString(Hashtable cmdlinevalues, string[] pkey)
             return filter.ToString();
         }
 
-        private bool IsPKey(string value, string ResourceURI)
+        private static bool IsPKey(string value, string ResourceURI)
         {
             bool result = false;
             if (ResourceURI.Contains(WSManStringLiterals.containerListener))
@@ -2998,7 +2998,7 @@ private bool IsPKey(string value, string ResourceURI)
             return result;
         }
 
-        private bool CheckPkeysArray(Hashtable values, string value, string[] pkeys)
+        private static bool CheckPkeysArray(Hashtable values, string value, string[] pkeys)
         {
             bool result = false;
             if (values != null)
@@ -3239,7 +3239,7 @@ private PSObject BuildHostLevelPSObjectArrayList(object objSessionObject, string
         /// </summary>
         /// <param name="xmlnode"></param>
         /// <returns></returns>
-        private PSObject ConvertToPSObject(XmlNode xmlnode)
+        private static PSObject ConvertToPSObject(XmlNode xmlnode)
         {
             PSObject mshObject = new PSObject();
             foreach (XmlNode node in xmlnode.ChildNodes)
@@ -3275,7 +3275,7 @@ private PSObject ConvertToPSObject(XmlNode xmlnode)
             return mshObject;
         }
 
-        private string SetXPathString(string uri)
+        private static string SetXPathString(string uri)
         {
             string parent = uri.Substring(uri.LastIndexOf(WSManStringLiterals.WinrmPathSeparator.ToString(), StringComparison.OrdinalIgnoreCase) + 1);
             if (parent.Equals(WSManStringLiterals.containerWinrs, StringComparison.OrdinalIgnoreCase))
@@ -3307,7 +3307,7 @@ private string SetXPathString(string uri)
             return parent;
         }
 
-        private string SetSchemaPath(string uri)
+        private static string SetSchemaPath(string uri)
         {
             string schemapath = string.Empty;
             uri = uri.Remove(0, WinrmRootName[0].Length);
@@ -3334,7 +3334,7 @@ private string SetSchemaPath(string uri)
         /// <param name="path"></param>
         /// <param name="host"></param>
         /// <returns></returns>
-        private string NormalizePath(string path, string host)
+        private static string NormalizePath(string path, string host)
         {
             string uri = string.Empty;
             if (path.StartsWith(host, StringComparison.OrdinalIgnoreCase))
@@ -3647,20 +3647,20 @@ private string GetCorrectCaseOfName(string ChildName, string hostname, string pa
                 else
                 {
                     if (ChildName.StartsWith(WSManStringLiterals.containerListener, StringComparison.OrdinalIgnoreCase))
-                        result = string.Concat(WSManStringLiterals.containerListener, "_", ChildName.AsSpan().Slice(ChildName.IndexOf('_') + 1));
+                        result = string.Concat(WSManStringLiterals.containerListener, "_", ChildName.AsSpan(ChildName.IndexOf('_') + 1));
                     if (ChildName.StartsWith(WSManStringLiterals.containerSingleResource, StringComparison.OrdinalIgnoreCase))
-                        result = string.Concat(WSManStringLiterals.containerSingleResource, "_", ChildName.AsSpan().Slice(ChildName.IndexOf('_') + 1));
+                        result = string.Concat(WSManStringLiterals.containerSingleResource, "_", ChildName.AsSpan(ChildName.IndexOf('_') + 1));
                     if (ChildName.StartsWith(WSManStringLiterals.containerSecurity, StringComparison.OrdinalIgnoreCase))
-                        result = string.Concat(WSManStringLiterals.containerSecurity, "_", ChildName.AsSpan().Slice(ChildName.IndexOf('_') + 1));
+                        result = string.Concat(WSManStringLiterals.containerSecurity, "_", ChildName.AsSpan(ChildName.IndexOf('_') + 1));
                     if (ChildName.StartsWith(WSManStringLiterals.containerClientCertificate, StringComparison.OrdinalIgnoreCase))
-                        result = string.Concat(WSManStringLiterals.containerClientCertificate, "_", ChildName.AsSpan().Slice(ChildName.IndexOf('_') + 1));
+                        result = string.Concat(WSManStringLiterals.containerClientCertificate, "_", ChildName.AsSpan(ChildName.IndexOf('_') + 1));
                 }
             }
 
             return result;
         }
 
-        private ArrayList RemoveItemfromResourceArray(ArrayList resourceArray, string ChildName, string type, string property)
+        private static ArrayList RemoveItemfromResourceArray(ArrayList resourceArray, string ChildName, string type, string property)
         {
             if (resourceArray != null)
             {
@@ -4519,7 +4519,7 @@ private void GetChildItemsOrNames(string path, ProviderMethods methodname, bool
         /// <param name="CurrentPluginName"></param>
         /// <param name="path"></param>
         /// <returns></returns>
-        private int GetPluginNames(XmlDocument xmlPlugins, out PSObject PluginNames, out string CurrentPluginName, string path)
+        private static int GetPluginNames(XmlDocument xmlPlugins, out PSObject PluginNames, out string CurrentPluginName, string path)
         {
             PluginNames = new PSObject();
             CurrentPluginName = string.Empty;
@@ -4627,7 +4627,7 @@ private void StartWSManService(bool force)
         /// </summary>
         /// <param name="host"></param>
         /// <returns></returns>
-        private bool IsPathLocalMachine(string host)
+        private static bool IsPathLocalMachine(string host)
         {
             bool hostfound = false;
             // Check is Localhost
@@ -4684,7 +4684,7 @@ private bool IsPathLocalMachine(string host)
 
         #region Plugin private functions
 
-        private void GenerateObjectNameAndKeys(Hashtable InputAttributes, string ResourceURI, string ContainerItem, out string ItemName, out string[] keys)
+        private static void GenerateObjectNameAndKeys(Hashtable InputAttributes, string ResourceURI, string ContainerItem, out string ItemName, out string[] keys)
         {
             StringBuilder sbHashKey = new StringBuilder();
             string keysColumns = string.Empty;
@@ -4717,7 +4717,7 @@ private void GenerateObjectNameAndKeys(Hashtable InputAttributes, string Resourc
             keys = keysColumns.Split('|');
         }
 
-        private void ProcessCertMappingObjects(XmlDocument xmlCerts, out Hashtable Certcache, out Hashtable Keyscache)
+        private static void ProcessCertMappingObjects(XmlDocument xmlCerts, out Hashtable Certcache, out Hashtable Keyscache)
         {
             Hashtable lCache = new Hashtable();
             Hashtable kCache = new Hashtable();
@@ -4775,7 +4775,7 @@ private void ProcessCertMappingObjects(XmlDocument xmlCerts, out Hashtable Certc
             Keyscache = kCache;
         }
 
-        private void ProcessListenerObjects(XmlDocument xmlListeners, out Hashtable listenercache, out Hashtable Keyscache)
+        private static void ProcessListenerObjects(XmlDocument xmlListeners, out Hashtable listenercache, out Hashtable Keyscache)
         {
             Hashtable lCache = new Hashtable();
             Hashtable kCache = new Hashtable();
@@ -4836,7 +4836,7 @@ private void ProcessListenerObjects(XmlDocument xmlListeners, out Hashtable list
             Keyscache = kCache;
         }
 
-        private PSObject ProcessPluginConfigurationLevel(XmlDocument xmldoc, bool setRunasPasswordAsSecureString = false)
+        private static PSObject ProcessPluginConfigurationLevel(XmlDocument xmldoc, bool setRunasPasswordAsSecureString = false)
         {
             PSObject objConfiglvl = null;
 
@@ -4877,7 +4877,7 @@ private PSObject ProcessPluginConfigurationLevel(XmlDocument xmldoc, bool setRun
             return objConfiglvl;
         }
 
-        private ArrayList ProcessPluginResourceLevel(XmlDocument xmldoc, out ArrayList arrSecurity)
+        private static ArrayList ProcessPluginResourceLevel(XmlDocument xmldoc, out ArrayList arrSecurity)
         {
             ArrayList Resources = null;
             ArrayList nSecurity = null;
@@ -4963,7 +4963,7 @@ private ArrayList ProcessPluginResourceLevel(XmlDocument xmldoc, out ArrayList a
             return Resources;
         }
 
-        private ArrayList ProcessPluginInitParamLevel(XmlDocument xmldoc)
+        private static ArrayList ProcessPluginInitParamLevel(XmlDocument xmldoc)
         {
             ArrayList InitParamLvl = null;
             if (xmldoc != null)
@@ -5001,7 +5001,7 @@ private ArrayList ProcessPluginInitParamLevel(XmlDocument xmldoc)
             return InitParamLvl;
         }
 
-        private ArrayList ProcessPluginSecurityLevel(ArrayList arrSecurity, XmlDocument xmlSecurity, string UniqueResourceID, string ParentResourceUri)
+        private static ArrayList ProcessPluginSecurityLevel(ArrayList arrSecurity, XmlDocument xmlSecurity, string UniqueResourceID, string ParentResourceUri)
         {
             // ArrayList SecurityLvl = null;
             if (xmlSecurity != null)
@@ -5063,7 +5063,7 @@ private ArrayList ProcessPluginSecurityLevel(ArrayList arrSecurity, XmlDocument
         ///<param name="securities">List of Securities</param>
         ///<param name="initParams">List of initialization parameters.</param>
         /// <returns>An Configuration XML, ready to send to server.</returns>
-        private string ConstructPluginXml(PSObject objinputparam, string ResourceURI, string host, string Operation, ArrayList resources, ArrayList securities, ArrayList initParams)
+        private static string ConstructPluginXml(PSObject objinputparam, string ResourceURI, string host, string Operation, ArrayList resources, ArrayList securities, ArrayList initParams)
         {
             StringBuilder sbvalues = new StringBuilder();
             sbvalues.Append("<PlugInConfiguration ");
@@ -5089,7 +5089,7 @@ private string ConstructPluginXml(PSObject objinputparam, string ResourceURI, st
 
                         if (WSManStringLiterals.ConfigRunAsPasswordName.Equals(prop.Name, StringComparison.OrdinalIgnoreCase))
                         {
-                            prop.Value = this.GetStringFromSecureString(prop.Value);
+                            prop.Value = GetStringFromSecureString(prop.Value);
                         }
 
                         // ... Name="Value"
@@ -5191,7 +5191,7 @@ private object ValidateAndGetUserObject(string configurationName, object value)
         /// if the propertyValue provided is not SecureString appends empty string.
         /// </summary>
         /// <param name="propertyValue">Value to append.</param>
-        private string GetStringFromSecureString(object propertyValue)
+        private static string GetStringFromSecureString(object propertyValue)
         {
             SecureString value = propertyValue as SecureString;
             string passwordValueToAdd = string.Empty;
@@ -5206,7 +5206,7 @@ private string GetStringFromSecureString(object propertyValue)
             return passwordValueToAdd;
         }
 
-        private string ConstructResourceXml(PSObject objinputparams, ArrayList resources, ArrayList securities)
+        private static string ConstructResourceXml(PSObject objinputparams, ArrayList resources, ArrayList securities)
         {
             StringBuilder sbvalues = new StringBuilder(string.Empty);
             if (objinputparams == null && resources == null)
@@ -5293,7 +5293,7 @@ private string ConstructResourceXml(PSObject objinputparams, ArrayList resources
             return sbvalues.ToString();
         }
 
-        private string ConstructSecurityXml(PSObject objinputparams, ArrayList securities, string strResourceIdentity)
+        private static string ConstructSecurityXml(PSObject objinputparams, ArrayList securities, string strResourceIdentity)
         {
             // <Security Uri="" ExactMatch="false" Sddl="O:NSG:BAD:P(A;;GA;;;BA)(A;;GR;;;ER)S:P(AU;FA;GA;;;WD)(AU;SA;GXGW;;;WD)"/>
             StringBuilder sbvalues = new StringBuilder(string.Empty);
@@ -5320,7 +5320,7 @@ private string ConstructSecurityXml(PSObject objinputparams, ArrayList securitie
             return sbvalues.ToString();
         }
 
-        private void AddSecurityProperties(
+        private static void AddSecurityProperties(
             PSMemberInfoCollection<PSPropertyInfo> properties,
             StringBuilder sbValues)
         {
@@ -5345,7 +5345,7 @@ private void AddSecurityProperties(
             sbValues.Append("</Security>");
         }
 
-        private string ConstructInitParamsXml(PSObject objinputparams, ArrayList initparams)
+        private static string ConstructInitParamsXml(PSObject objinputparams, ArrayList initparams)
         {
             // <InitializationParameters>
             // <Param Name="Param1" Value="Value1" />
@@ -5397,7 +5397,7 @@ private string ConstructInitParamsXml(PSObject objinputparams, ArrayList initpar
             return sbvalues.ToString();
         }
 
-        private string ConstructCapabilityXml(object[] capabilities)
+        private static string ConstructCapabilityXml(object[] capabilities)
         {
             StringBuilder sbvalues = new StringBuilder(string.Empty);
             foreach (object cap in capabilities)
@@ -5413,7 +5413,7 @@ private string ConstructCapabilityXml(object[] capabilities)
             return sbvalues.ToString();
         }
 
-        private bool IsValueOfParamList(string name, string[] paramcontainer)
+        private static bool IsValueOfParamList(string name, string[] paramcontainer)
         {
             bool result = false;
             foreach (string value in paramcontainer)
@@ -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/CredSSP.cs b/src/Microsoft.WSMan.Management/CredSSP.cs
index 60d8795ac54..cd5e6d3fc4d 100644
--- a/src/Microsoft.WSMan.Management/CredSSP.cs
+++ b/src/Microsoft.WSMan.Management/CredSSP.cs
@@ -227,7 +227,7 @@ private void DeleteUserDelegateSettings()
             GPO.OpenLocalMachineGPO(1);
             KeyHandle = GPO.GetRegistryKey(2);
             RegistryKey rootKey = Registry.CurrentUser;
-            string GPOpath = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Group Policy Objects";
+            const string GPOpath = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Group Policy Objects";
             RegistryKey GPOKey = rootKey.OpenSubKey(GPOpath, true);
             foreach (string keyname in GPOKey.GetSubKeyNames())
             {
@@ -508,7 +508,7 @@ private void EnableClientSideSettings()
                     return;
                 }
 
-                string newxmlcontent = @"<cfg:Auth xmlns:cfg=""http://schemas.microsoft.com/wbem/wsman/1/config/client/auth""><cfg:CredSSP>true</cfg:CredSSP></cfg:Auth>";
+                const string newxmlcontent = @"<cfg:Auth xmlns:cfg=""http://schemas.microsoft.com/wbem/wsman/1/config/client/auth""><cfg:CredSSP>true</cfg:CredSSP></cfg:Auth>";
                 try
                 {
                     XmlDocument xmldoc = new XmlDocument();
@@ -626,7 +626,7 @@ private void UpdateCurrentUserRegistrySettings()
             GPO.OpenLocalMachineGPO(1);
             KeyHandle = GPO.GetRegistryKey(2);
             RegistryKey rootKey = Registry.CurrentUser;
-            string GPOpath = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Group Policy Objects";
+            const string GPOpath = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Group Policy Objects";
             RegistryKey GPOKey = rootKey.OpenSubKey(GPOpath, true);
             foreach (string keyname in GPOKey.GetSubKeyNames())
             {
@@ -827,7 +827,7 @@ protected override void BeginProcessing()
                 }
                 // The application name MUST be "wsman" as wsman got approval from security
                 // folks who suggested to register the SPN with name "wsman".
-                string applicationname = "wsman";
+                const string applicationname = "wsman";
                 string credsspResult = GetDelegateSettings(applicationname);
                 if (string.IsNullOrEmpty(credsspResult))
                 {
diff --git a/src/Microsoft.WSMan.Management/CurrentConfigurations.cs b/src/Microsoft.WSMan.Management/CurrentConfigurations.cs
index 783bfe1ef0b..0129554c30b 100644
--- a/src/Microsoft.WSMan.Management/CurrentConfigurations.cs
+++ b/src/Microsoft.WSMan.Management/CurrentConfigurations.cs
@@ -131,7 +131,7 @@ public void RemoveOneConfiguration(string pathToNodeFromRoot)
             {
                 if (nodeToRemove is XmlAttribute)
                 {
-                    this.RemoveAttribute(nodeToRemove as XmlAttribute);
+                    RemoveAttribute(nodeToRemove as XmlAttribute);
                 }
             }
             else
@@ -217,7 +217,7 @@ public string GetOneConfiguration(string pathFromRoot)
         /// Removes the attribute from OwnerNode.
         /// </summary>
         /// <param name="attributeToRemove">Attribute to Remove.</param>
-        private void RemoveAttribute(XmlAttribute attributeToRemove)
+        private static void RemoveAttribute(XmlAttribute attributeToRemove)
         {
             XmlElement ownerElement = attributeToRemove.OwnerElement;
             ownerElement.RemoveAttribute(attributeToRemove.Name);
diff --git a/src/Microsoft.WSMan.Management/Interop.cs b/src/Microsoft.WSMan.Management/Interop.cs
index 7084a111f2d..6685770b0ef 100644
--- 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/Microsoft.WSMan.Management/WSManInstance.cs b/src/Microsoft.WSMan.Management/WSManInstance.cs
index a8eaad6ab9a..b4fb9ed955c 100644
--- a/src/Microsoft.WSMan.Management/WSManInstance.cs
+++ b/src/Microsoft.WSMan.Management/WSManInstance.cs
@@ -391,7 +391,7 @@ public SwitchParameter UseSSL
 
         #endregion parameter
 
-        #  region private
+        #region private
         private WSManHelper helper;
 
         private string GetFilter()
diff --git a/src/Microsoft.WSMan.Management/WsManHelper.cs b/src/Microsoft.WSMan.Management/WsManHelper.cs
index ef29cb1a5c2..2c423fd2b13 100644
--- a/src/Microsoft.WSMan.Management/WsManHelper.cs
+++ b/src/Microsoft.WSMan.Management/WsManHelper.cs
@@ -467,7 +467,7 @@ internal string ProcessInput(IWSManEx wsman, string filepath, string operation,
                                     }
                                     else
                                     {
-                                        XmlNode tmpNode = node.ChildNodes[0];//.Item[0];
+                                        XmlNode tmpNode = node.ChildNodes[0]; //.Item[0];
                                         if (!tmpNode.NodeType.ToString().Equals("text", StringComparison.OrdinalIgnoreCase))
                                         {
                                             throw new ArgumentException(_resourceMgr.GetString("NOAttributeMatch"));
diff --git a/src/Microsoft.WSMan.Runtime/WSManSessionOption.cs b/src/Microsoft.WSMan.Runtime/WSManSessionOption.cs
index d8681a54618..13dc8bbea2c 100644
--- a/src/Microsoft.WSMan.Runtime/WSManSessionOption.cs
+++ b/src/Microsoft.WSMan.Runtime/WSManSessionOption.cs
@@ -2,19 +2,8 @@
 // Licensed under the MIT License.
 
 using System;
-using System.ComponentModel;
-using System.IO;
-using System.Net;
-using System.Reflection;
-using System.Resources;
-using System.Xml;
-
-using System.Collections;
-using System.Collections.Generic;
-
-using System.Runtime.InteropServices;
 using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
+using System.Net;
 
 [assembly: CLSCompliant(true)]
 
@@ -28,153 +17,53 @@ public sealed class SessionOption
         /// <summary>
         /// Property.
         /// </summary>
-        public bool SkipCACheck
-        {
-            get { return _SkipCACheck; }
-
-            set
-            {
-                _SkipCACheck = value;
-            }
-        }
-
-        private bool _SkipCACheck;
+        public bool SkipCACheck { get; set; }
 
         /// <summary>
         /// Property.
         /// </summary>
-        public bool SkipCNCheck
-        {
-            get { return _SkipCNCheck; }
-
-            set
-            {
-                _SkipCNCheck = value;
-            }
-        }
-
-        private bool _SkipCNCheck;
+        public bool SkipCNCheck { get; set; }
 
         /// <summary>
         /// Property.
         /// </summary>
-        public bool SkipRevocationCheck
-        {
-            get { return _SkipRevocationCheck; }
-
-            set
-            {
-                _SkipRevocationCheck = value;
-            }
-        }
-
-        private bool _SkipRevocationCheck;
+        public bool SkipRevocationCheck { get; set; }
 
         /// <summary>
         /// Property.
         /// </summary>
-        public bool UseEncryption
-        {
-            get { return _useencryption; }
-
-            set
-            {
-                _useencryption = value;
-            }
-        }
-
-        private bool _useencryption = true;
+        public bool UseEncryption { get; set; } = true;
 
         /// <summary>
         /// Property.
         /// </summary>
-        public bool UseUtf16
-        {
-            get { return _UTF16; }
-
-            set
-            {
-                _UTF16 = value;
-            }
-        }
-
-        private bool _UTF16;
+        public bool UseUtf16 { get; set; }
 
         /// <summary>
         /// Property.
         /// </summary>
-        public ProxyAuthentication ProxyAuthentication
-        {
-            get { return _ProxyAuthentication; }
-
-            set
-            {
-                _ProxyAuthentication = value;
-            }
-        }
-
-        private ProxyAuthentication _ProxyAuthentication;
+        public ProxyAuthentication ProxyAuthentication { get; set; }
 
         /// <summary>
         /// Property.
         /// </summary>
         [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "SPN")]
-        public int SPNPort
-        {
-            get { return _SPNPort; }
-
-            set
-            {
-                _SPNPort = value;
-            }
-        }
-
-        private int _SPNPort;
+        public int SPNPort { get; set; }
 
         /// <summary>
         /// Property.
         /// </summary>
-        public int OperationTimeout
-        {
-            get { return _OperationTimeout; }
-
-            set
-            {
-                _OperationTimeout = value;
-            }
-        }
-
-        private int _OperationTimeout;
+        public int OperationTimeout { get; set; }
 
         /// <summary>
         /// Property.
         /// </summary>
-        public NetworkCredential ProxyCredential
-        {
-            get { return _ProxyCredential; }
-
-            set
-            {
-                _ProxyCredential = value;
-            }
-        }
-
-        private NetworkCredential _ProxyCredential;
+        public NetworkCredential ProxyCredential { get; set; }
 
         /// <summary>
         /// Property.
         /// </summary>
-        public ProxyAccessType ProxyAccessType
-        {
-            get { return _proxyaccesstype; }
-
-            set
-            {
-                _proxyaccesstype = value;
-            }
-        }
-
-        private ProxyAccessType _proxyaccesstype;
+        public ProxyAccessType ProxyAccessType { get; set; }
     }
 
     /// <summary>
diff --git a/src/Modules/PSGalleryModules.csproj b/src/Modules/PSGalleryModules.csproj
index 3f7b71a07a3..63807dc1e50 100644
--- a/src/Modules/PSGalleryModules.csproj
+++ b/src/Modules/PSGalleryModules.csproj
@@ -1,6 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
 
-  <Import Project="..\..\PowerShell.Common.props" />
+  <PropertyGroup>
+    <Product>PowerShell</Product>
+    <Company>Microsoft Corporation</Company>
+    <Copyright>(c) Microsoft Corporation.</Copyright>
+
+    <TargetFramework>net5.0</TargetFramework>
+
+    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
+  </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="PowerShellGet" Version="2.2.5" />
diff --git a/src/Modules/Unix/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1 b/src/Modules/Unix/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
index 1ef5f3328e0..b883acdd0d6 100644
--- a/src/Modules/Unix/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
+++ b/src/Modules/Unix/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
@@ -38,6 +38,10 @@ PrivateData = @{
         Name        = 'Microsoft.PowerShell.Utility.PSManageBreakpointsInRunspace'
         Description = 'Enables -BreakAll parameter on Debug-Runspace and Debug-Job cmdlets to allow users to decide if they want PowerShell to break immediately in the current location when they attach a debugger. Enables -Runspace parameter on *-PSBreakpoint cmdlets to support management of breakpoints in another runspace.'
       }
+      @{
+        Name        = 'Microsoft.PowerShell.Utility.PSImportPSDataFileSkipLimitCheck'
+        Description = 'Enable -SkipLimitCheck switch for Import-PowerShellDataFile to not enforce built-in hashtable limits'
+      }
     )
   }
 }
diff --git a/src/Modules/Windows/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1 b/src/Modules/Windows/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
index 3b401f039e9..5ea504197fa 100644
--- a/src/Modules/Windows/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
+++ b/src/Modules/Windows/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1
@@ -37,6 +37,10 @@ PrivateData = @{
         Name        = 'Microsoft.PowerShell.Utility.PSManageBreakpointsInRunspace'
         Description = 'Enables -BreakAll parameter on Debug-Runspace and Debug-Job cmdlets to allow users to decide if they want PowerShell to break immediately in the current location when they attach a debugger. Enables -Runspace parameter on *-PSBreakpoint cmdlets to support management of breakpoints in another runspace.'
       }
+      @{
+        Name        = 'Microsoft.PowerShell.Utility.PSImportPSDataFileSkipLimitCheck'
+        Description = 'Enable -NoLimit switch for Import-PowerShellDataFile to not enforce built-in hashtable limits'
+      }
     )
   }
 }
diff --git a/src/Modules/nuget.config b/src/Modules/nuget.config
new file mode 100644
index 00000000000..f5a7f806a36
--- /dev/null
+++ b/src/Modules/nuget.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="PSGallery" value="https://www.powershellgallery.com/api/v2/" />
+    <add key="powershell_nuget" value="https://powershell.pkgs.visualstudio.com/PowerShell/_packaging/powershell/nuget/v3/index.json" />
+  </packageSources>
+  <disabledPackageSources>
+    <clear />
+  </disabledPackageSources>
+</configuration>
diff --git a/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs b/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
index 12f575b5175..5bd9be5c62b 100644
--- a/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
+++ b/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs
@@ -105,7 +105,7 @@ private PowerShellAssemblyLoadContext(string basePaths)
 
         #region Fields
 
-        private static readonly object s_syncObj = new object();
+        private static readonly object s_syncObj = new();
         private readonly string[] _probingPaths;
         private readonly string[] _extensions = new string[] { ".ni.dll", ".dll" };
         // CoreCLR type catalog dictionary
@@ -114,9 +114,8 @@ private PowerShellAssemblyLoadContext(string basePaths)
         private readonly Dictionary<string, string> _coreClrTypeCatalog;
         private readonly Lazy<HashSet<string>> _availableDotNetAssemblyNames;
 
-        private readonly HashSet<string> _denyListedAssemblies = new HashSet<string>(StringComparer.OrdinalIgnoreCase){
-                "System.Windows.Forms"
-            };
+        private readonly HashSet<string> _denyListedAssemblies =
+            new(StringComparer.OrdinalIgnoreCase) { "System.Windows.Forms" };
 
 #if !UNIX
         private string _winDir;
@@ -140,7 +139,7 @@ private PowerShellAssemblyLoadContext(string basePaths)
         /// Therefore, there is no need to use the full assembly name as the key. Short assembly name is sufficient.
         /// </remarks>
         private static readonly ConcurrentDictionary<string, Assembly> s_assemblyCache =
-            new ConcurrentDictionary<string, Assembly>(StringComparer.OrdinalIgnoreCase);
+            new(StringComparer.OrdinalIgnoreCase);
 
         #endregion Fields
 
@@ -393,7 +392,7 @@ private bool TryFindInGAC(AssemblyName assemblyName, out string assemblyFilePath
         }
 
         // Find the assembly under 'gacRoot' and select the latest version.
-        private bool FindInGac(string gacRoot, AssemblyName assemblyName, out string assemblyPath)
+        private static bool FindInGac(string gacRoot, AssemblyName assemblyName, out string assemblyPath)
         {
             bool assemblyFound = false;
             assemblyPath = null;
@@ -404,12 +403,12 @@ private bool FindInGac(string gacRoot, AssemblyName assemblyName, out string ass
             if (Directory.Exists(tempAssemblyDirPath))
             {
                 // Enumerate all directories, sort by name and select the last. This selects the latest version.
-                var chosenVersionDirectory = Directory.GetDirectories(tempAssemblyDirPath).OrderBy(d => d).LastOrDefault();
+                var chosenVersionDirectory = Directory.EnumerateDirectories(tempAssemblyDirPath).OrderBy(d => d).LastOrDefault();
 
                 if (!string.IsNullOrEmpty(chosenVersionDirectory))
                 {
                     // Select first or default as the directory will contain only one assembly. If nothing then default is null;
-                    var foundAssemblyPath = Directory.GetFiles(chosenVersionDirectory, $"{assemblyName.Name}*").FirstOrDefault();
+                    var foundAssemblyPath = Directory.EnumerateFiles(chosenVersionDirectory, $"{assemblyName.Name}*").FirstOrDefault();
 
                     if (!string.IsNullOrEmpty(foundAssemblyPath))
                     {
@@ -430,7 +429,7 @@ private bool FindInGac(string gacRoot, AssemblyName assemblyName, out string ass
         /// <summary>
         /// Try to get the specified assembly from cache.
         /// </summary>
-        private bool TryGetAssemblyFromCache(AssemblyName assemblyName, out Assembly asmLoaded)
+        private static bool TryGetAssemblyFromCache(AssemblyName assemblyName, out Assembly asmLoaded)
         {
             if (s_assemblyCache.TryGetValue(assemblyName.Name, out asmLoaded))
             {
@@ -454,7 +453,7 @@ private bool TryGetAssemblyFromCache(AssemblyName assemblyName, out Assembly asm
         /// <param name="requestedAssembly">AssemblyName of the requested assembly.</param>
         /// <param name="loadedAssembly">AssemblyName of the loaded assembly.</param>
         /// <returns></returns>
-        private bool IsAssemblyMatching(AssemblyName requestedAssembly, AssemblyName loadedAssembly)
+        private static bool IsAssemblyMatching(AssemblyName requestedAssembly, AssemblyName loadedAssembly)
         {
             //
             // We use the same rules as CoreCLR loader to compare the requested assembly and loaded assembly:
@@ -501,7 +500,7 @@ private bool IsAssemblyMatching(AssemblyName requestedAssembly, AssemblyName loa
         /// <param name="tpaStrongName">
         /// The assembly strong name of a CoreCLR Trusted_Platform_Assembly
         /// </param>
-        private Assembly GetTrustedPlatformAssembly(string tpaStrongName)
+        private static Assembly GetTrustedPlatformAssembly(string tpaStrongName)
         {
             // We always depend on the default context to load the TPAs that are recorded in
             // the type catalog.
@@ -509,7 +508,7 @@ private Assembly GetTrustedPlatformAssembly(string tpaStrongName)
             //     it back from the cache of default context.
             //   - If the requested TPA is not loaded yet, then 'Assembly.Load' will make the
             //     default context to load it
-            AssemblyName assemblyName = new AssemblyName(tpaStrongName);
+            AssemblyName assemblyName = new(tpaStrongName);
             Assembly asmLoaded = Assembly.Load(assemblyName);
             return asmLoaded;
         }
@@ -517,7 +516,7 @@ private Assembly GetTrustedPlatformAssembly(string tpaStrongName)
         /// <summary>
         /// Throw FileLoadException.
         /// </summary>
-        private void ThrowFileLoadException(string errorTemplate, params object[] args)
+        private static void ThrowFileLoadException(string errorTemplate, params object[] args)
         {
             string message = string.Format(CultureInfo.CurrentCulture, errorTemplate, args);
             throw new FileLoadException(message);
@@ -526,7 +525,7 @@ private void ThrowFileLoadException(string errorTemplate, params object[] args)
         /// <summary>
         /// Throw FileNotFoundException.
         /// </summary>
-        private void ThrowFileNotFoundException(string errorTemplate, params object[] args)
+        private static void ThrowFileNotFoundException(string errorTemplate, params object[] args)
         {
             string message = string.Format(CultureInfo.CurrentCulture, errorTemplate, args);
             throw new FileNotFoundException(message);
diff --git a/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs b/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
index 981d6bfb088..b5e657d497f 100644
--- a/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
+++ b/src/System.Management.Automation/CoreCLR/CorePsPlatform.cs
@@ -155,20 +155,20 @@ public static bool IsWindowsDesktop
 #endif
 
         // format files
-        internal static readonly List<string> FormatFileNames = new List<string>
-            {
-                "Certificate.format.ps1xml",
-                "Diagnostics.format.ps1xml",
-                "DotNetTypes.format.ps1xml",
-                "Event.format.ps1xml",
-                "FileSystem.format.ps1xml",
-                "Help.format.ps1xml",
-                "HelpV3.format.ps1xml",
-                "PowerShellCore.format.ps1xml",
-                "PowerShellTrace.format.ps1xml",
-                "Registry.format.ps1xml",
-                "WSMan.format.ps1xml"
-            };
+        internal static readonly List<string> FormatFileNames = new()
+        {
+            "Certificate.format.ps1xml",
+            "Diagnostics.format.ps1xml",
+            "DotNetTypes.format.ps1xml",
+            "Event.format.ps1xml",
+            "FileSystem.format.ps1xml",
+            "Help.format.ps1xml",
+            "HelpV3.format.ps1xml",
+            "PowerShellCore.format.ps1xml",
+            "PowerShellTrace.format.ps1xml",
+            "Registry.format.ps1xml",
+            "WSMan.format.ps1xml"
+        };
 
         /// <summary>
         /// Some common environment variables used in PS have different
@@ -566,8 +566,8 @@ internal static int NonWindowsGetProcessParentPid(int pid)
         /// <summary>Unix specific implementations of required functionality.</summary>
         internal static class Unix
         {
-            private static Dictionary<int, string> usernameCache = new Dictionary<int, string>();
-            private static Dictionary<int, string> groupnameCache = new Dictionary<int, string>();
+            private static Dictionary<int, string> usernameCache = new();
+            private static Dictionary<int, string> groupnameCache = new();
 
             /// <summary>The type of a Unix file system item.</summary>
             public enum ItemType
@@ -699,7 +699,7 @@ public class CommonStat
                 private const char CanExecute = 'x';
 
                 // helper for getting unix mode
-                private Dictionary<StatMask, char> modeMap = new Dictionary<StatMask, char>()
+                private Dictionary<StatMask, char> modeMap = new()
                 {
                         { StatMask.OwnerRead, CanRead },
                         { StatMask.OwnerWrite, CanWrite },
@@ -726,7 +726,7 @@ public class CommonStat
                 };
 
                 // The item type and the character representation for the first element in the stat string
-                private Dictionary<ItemType, char> itemTypeTable = new Dictionary<ItemType, char>()
+                private Dictionary<ItemType, char> itemTypeTable = new()
                 {
                     { ItemType.BlockDevice, 'b' },
                     { ItemType.CharacterDevice, 'c' },
@@ -860,7 +860,7 @@ public static bool IsHardLink(FileSystemInfo fs)
             /// <returns>A managed common stat class instance.</returns>
             private static CommonStat CopyStatStruct(NativeMethods.CommonStatStruct css)
             {
-                CommonStat cs = new CommonStat();
+                CommonStat cs = new();
                 cs.Inode = css.Inode;
                 cs.Mode = css.Mode;
                 cs.UserId = css.UserId;
diff --git a/src/System.Management.Automation/DscSupport/CimDSCParser.cs b/src/System.Management.Automation/DscSupport/CimDSCParser.cs
index 1d6ff12f270..78f778b944b 100644
--- a/src/System.Management.Automation/DscSupport/CimDSCParser.cs
+++ b/src/System.Management.Automation/DscSupport/CimDSCParser.cs
@@ -41,7 +41,7 @@ public static object ConvertCimInstanceToObject(Type targetType, CimInstance ins
 
             using (System.Management.Automation.PowerShell powerShell = System.Management.Automation.PowerShell.Create(RunspaceMode.CurrentRunspace))
             {
-                string script = "param($targetType,$moduleName) & (Microsoft.PowerShell.Core\\Get-Module $moduleName) { New-Object $targetType } ";
+                const string script = "param($targetType,$moduleName) & (Microsoft.PowerShell.Core\\Get-Module $moduleName) { New-Object $targetType } ";
 
                 powerShell.AddScript(script);
                 powerShell.AddArgument(targetType);
@@ -324,6 +324,7 @@ internal class CimDSCParser
     {
         private CimMofDeserializer _deserializer;
         private CimMofDeserializer.OnClassNeeded _onClassNeeded;
+
         /// <summary>
         /// </summary>
         internal CimDSCParser(CimMofDeserializer.OnClassNeeded onClassNeeded)
@@ -543,19 +544,19 @@ public static class DscClassCache
 
         // Create a list of classes which are not actual DSC resources similar to what we do inside PSDesiredStateConfiguration.psm1
         private static readonly string[] s_hiddenResourceList =
-    {
-        "MSFT_BaseConfigurationProviderRegistration",
-        "MSFT_CimConfigurationProviderRegistration",
-        "MSFT_PSConfigurationProviderRegistration",
-    };
+        {
+            "MSFT_BaseConfigurationProviderRegistration",
+            "MSFT_CimConfigurationProviderRegistration",
+            "MSFT_PSConfigurationProviderRegistration",
+        };
 
         // Create a HashSet for fast lookup. According to MSDN, the time complexity of search for an element in a HashSet is O(1)
-        private static readonly HashSet<string> s_hiddenResourceCache = new HashSet<string>(s_hiddenResourceList,
-            StringComparer.OrdinalIgnoreCase);
+        private static readonly HashSet<string> s_hiddenResourceCache =
+            new(s_hiddenResourceList, StringComparer.OrdinalIgnoreCase);
 
         // a collection to hold current importing script based resource file
         // this prevent circular importing case when the script resource existing in the same module with resources it import-dscresource
-        private static readonly HashSet<string> s_currentImportingScriptFiles = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        private static readonly HashSet<string> s_currentImportingScriptFiles = new(StringComparer.OrdinalIgnoreCase);
 
         /// <summary>
         /// DSC class cache for this runspace.
@@ -637,18 +638,20 @@ private static HashSet<string> ScriptKeywordFileCache
         /// <summary>
         /// Default ModuleName and ModuleVersion to use.
         /// </summary>
-        private static readonly Tuple<string, Version> s_defaultModuleInfoForResource = new Tuple<string, Version>("PSDesiredStateConfiguration", new Version("1.1"));
+        private static readonly Tuple<string, Version> s_defaultModuleInfoForResource =
+            new("PSDesiredStateConfiguration", new Version("1.1"));
 
         /// <summary>
         /// Default ModuleName and ModuleVersion to use for meta configuration resources.
         /// </summary>
-        internal static readonly Tuple<string, Version> DefaultModuleInfoForMetaConfigResource = new Tuple<string, Version>("PSDesiredStateConfigurationEngine", new Version("2.0"));
+        internal static readonly Tuple<string, Version> DefaultModuleInfoForMetaConfigResource =
+            new("PSDesiredStateConfigurationEngine", new Version("2.0"));
 
         /// <summary>
         /// A set of dynamic keywords that can be used in both configuration and meta configuration.
         /// </summary>
         internal static readonly HashSet<string> SystemResourceNames =
-            new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "Node", "OMI_ConfigurationDocument" };
+            new(StringComparer.OrdinalIgnoreCase) { "Node", "OMI_ConfigurationDocument" };
 
         /// <summary>
         /// When this property is set to true, DSC Cache will cache multiple versions of a resource.
@@ -783,7 +786,7 @@ public static void Initialize(Collection<Exception> errors, List<string> moduleP
 
                 // Load Regular and DSC PS modules
                 bool importInBoxResourcesImplicitly = false;
-                List<string> modulePaths = new List<string>();
+                List<string> modulePaths = new();
                 if (modulePathList == null || modulePathList.Count == 0)
                 {
                     modulePaths.Add(Path.Combine(configSystemPath, inboxModulePath));
@@ -1130,7 +1133,7 @@ private static List<DscClassCacheEntry> GetCachedClasses()
         /// <returns>List of cached cim classes.</returns>
         public static List<Microsoft.Management.Infrastructure.CimClass> GetCachedClassesForModule(PSModuleInfo module)
         {
-            List<Microsoft.Management.Infrastructure.CimClass> cachedClasses = new List<Microsoft.Management.Infrastructure.CimClass>();
+            List<Microsoft.Management.Infrastructure.CimClass> cachedClasses = new();
             var moduleQualifiedName = string.Format(CultureInfo.InvariantCulture, "{0}\\{1}", module.Name, module.Version.ToString());
             foreach (var dscClassCacheEntry in ClassCache)
             {
@@ -1150,7 +1153,7 @@ private static List<DscClassCacheEntry> GetCachedClasses()
         /// <returns></returns>
         public static List<string> GetFileDefiningClass(string className)
         {
-            List<string> files = new List<string>();
+            List<string> files = new();
             foreach (var pair in ByFileClassCache)
             {
                 var file = pair.Key;
@@ -1297,7 +1300,7 @@ private static string GetFriendlyName(CimClass cimClass)
         /// </summary>
         public static Collection<DynamicKeyword> GetCachedKeywords()
         {
-            Collection<DynamicKeyword> keywords = new Collection<DynamicKeyword>();
+            Collection<DynamicKeyword> keywords = new();
 
             foreach (KeyValuePair<string, DscClassCacheEntry> cachedClass in ClassCache)
             {
@@ -1908,7 +1911,7 @@ private static ParseError[] ImportResourceCheckSemantics(DynamicKeywordStatement
         // This function performs semantic checks for all DSC Resources keywords.
         private static ParseError[] CheckMandatoryPropertiesPresent(DynamicKeywordStatementAst kwAst)
         {
-            HashSet<string> mandatoryPropertiesNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            HashSet<string> mandatoryPropertiesNames = new(StringComparer.OrdinalIgnoreCase);
             foreach (var pair in kwAst.Keyword.Properties)
             {
                 if (pair.Value.Mandatory)
@@ -2360,7 +2363,7 @@ private static void GenerateMofForAst(TypeDefinitionAst typeAst, StringBuilder s
 
             ProcessMembers(sb, embeddedInstanceTypes, typeAst, className);
 
-            Queue<object> bases = new Queue<object>();
+            Queue<object> bases = new();
             foreach (var b in typeAst.BaseTypes)
             {
                 bases.Enqueue(b);
@@ -2458,7 +2461,7 @@ public static bool GetResourceMethodsLinePosition(PSModuleInfo moduleInfo, strin
             }
 
             IEnumerable<Ast> resourceDefinitions;
-            List<string> moduleFiles = new List<string>();
+            List<string> moduleFiles = new();
             if (moduleInfo.RootModule != null)
             {
                 moduleFiles.Add(moduleInfo.Path);
@@ -2592,7 +2595,7 @@ private static bool GetResourceDefinitionsFromModule(string fileName, out IEnume
             {
                 if (errorList != null && extent != null)
                 {
-                    List<string> errorMessages = new List<string>();
+                    List<string> errorMessages = new();
                     foreach (var error in errors)
                     {
                         errorMessages.Add(error.ToString());
@@ -2697,7 +2700,7 @@ private static bool ImportKeywordsFromScriptFile(string fileName, PSModuleInfo m
             return result;
         }
 
-        private static readonly Dictionary<Type, string> s_mapPrimitiveDotNetTypeToMof = new Dictionary<Type, string>()
+        private static readonly Dictionary<Type, string> s_mapPrimitiveDotNetTypeToMof = new()
         {
             { typeof(sbyte), "sint8" },
             { typeof(byte) , "uint8"},
@@ -2945,7 +2948,7 @@ private static string MapAttributesToMof(string[] enumNames, IEnumerable<object>
                 if (validateSet != null)
                 {
                     bool valueMapComma = false;
-                    StringBuilder sbValues = new StringBuilder(", Values{");
+                    StringBuilder sbValues = new(", Values{");
                     sb.AppendFormat(CultureInfo.InvariantCulture, "{0}ValueMap{{", needComma ? ", " : string.Empty);
                     needComma = true;
 
@@ -3661,7 +3664,7 @@ public static string GetDSCResourceUsageString(DynamicKeyword keyword)
         private static StringBuilder FormatCimPropertyType(DynamicKeywordProperty prop, bool isOptionalProperty)
         {
             string cimTypeName = prop.TypeConstraint;
-            StringBuilder formattedTypeString = new StringBuilder();
+            StringBuilder formattedTypeString = new();
 
             if (string.Equals(cimTypeName, "MSFT_Credential", StringComparison.OrdinalIgnoreCase))
             {
@@ -3709,8 +3712,7 @@ private static ScriptBlock CimKeywordImplementationFunction
             get
             {
                 // The scriptblock cache will handle mutual exclusion
-                return s_cimKeywordImplementationFunction ??
-                       (s_cimKeywordImplementationFunction = ScriptBlock.Create(CimKeywordImplementationFunctionText));
+                return s_cimKeywordImplementationFunction ??= ScriptBlock.Create(CimKeywordImplementationFunctionText);
             }
         }
 
diff --git a/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs
index 0400d3488b5..dbb8d3a2085 100644
--- a/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs
+++ b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs
@@ -263,6 +263,22 @@ internal static IEnumerable<ExtendedTypeDefinition> GetFormatData()
             yield return new ExtendedTypeDefinition(
                 "Microsoft.PowerShell.Commands.ByteCollection",
                 ViewsOf_Microsoft_PowerShell_Commands_ByteCollection());
+
+            yield return new ExtendedTypeDefinition(
+                "System.Management.Automation.PSStyle",
+                ViewsOf_System_Management_Automation_PSStyle());
+
+            yield return new ExtendedTypeDefinition(
+                "System.Management.Automation.PSStyle+FormattingData",
+                ViewsOf_System_Management_Automation_PSStyleFormattingData());
+
+            yield return new ExtendedTypeDefinition(
+                "System.Management.Automation.PSStyle+ForegroundColor",
+                ViewsOf_System_Management_Automation_PSStyleForegroundColor());
+
+            yield return new ExtendedTypeDefinition(
+                "System.Management.Automation.PSStyle+BackgroundColor",
+                ViewsOf_System_Management_Automation_PSStyleBackgroundColor());
         }
 
         private static IEnumerable<FormatViewDefinition> ViewsOf_System_RuntimeType()
@@ -1317,7 +1333,7 @@ function Get-ConciseViewPositionMessage {
                                             $err.CategoryInfo.GetMessage()
                                         }
                                         elseif (! $err.ErrorDetails -or ! $err.ErrorDetails.Message) {
-                                            $err.Exception.Message + $posmsg + $newline
+                                            $err.Exception.Message + $posmsg
                                         } else {
                                             $err.ErrorDetails.Message + $posmsg
                                         }
@@ -2004,5 +2020,131 @@ private static IEnumerable<FormatViewDefinition> ViewsOf_Microsoft_PowerShell_Co
                     .GroupByProperty("Label")
                 .EndTable());
         }
+
+        private static IEnumerable<FormatViewDefinition> ViewsOf_System_Management_Automation_PSStyle()
+        {
+            yield return new FormatViewDefinition("System.Management.Automation.PSStyle",
+                ListControl.Create()
+                    .StartEntry()
+                        .AddItemScriptBlock(@"""$($_.Reset)$($_.Reset.Replace(""""`e"""",'`e'))""", label: "Reset")
+                        .AddItemScriptBlock(@"""$($_.BlinkOff)$($_.BlinkOff.Replace(""""`e"""",'`e'))$($_.Reset)""", label: "BlinkOff")
+                        .AddItemScriptBlock(@"""$($_.Blink)$($_.Blink.Replace(""""`e"""",'`e'))$($_.Reset)""", label: "Blink")
+                        .AddItemScriptBlock(@"""$($_.BoldOff)$($_.BoldOff.Replace(""""`e"""",'`e'))$($_.Reset)""", label: "BoldOff")
+                        .AddItemScriptBlock(@"""$($_.Bold)$($_.Bold.Replace(""""`e"""",'`e'))$($_.Reset)""", label: "Bold")
+                        .AddItemScriptBlock(@"""$($_.Hidden)$($_.Hidden.Replace(""""`e"""",'`e'))$($_.Reset)""", label: "Hidden")
+                        .AddItemScriptBlock(@"""$($_.HiddenOff)$($_.HiddenOff.Replace(""""`e"""",'`e'))$($_.Reset)""", label: "HiddenOff")
+                        .AddItemScriptBlock(@"""$($_.Reverse)$($_.Reverse.Replace(""""`e"""",'`e'))$($_.Reset)""", label: "Reverse")
+                        .AddItemScriptBlock(@"""$($_.ReverseOff)$($_.ReverseOff.Replace(""""`e"""",'`e'))$($_.Reset)""", label: "ReverseOff")
+                        .AddItemScriptBlock(@"""$($_.ItalicOff)$($_.ItalicOff.Replace(""""`e"""",'`e'))$($_.Reset)""", label: "ItalicOff")
+                        .AddItemScriptBlock(@"""$($_.Italic)$($_.Italic.Replace(""""`e"""",'`e'))$($_.Reset)""", label: "Italic")
+                        .AddItemScriptBlock(@"""$($_.UnderlineOff)$($_.UnderlineOff.Replace(""""`e"""",'`e'))$($_.Reset)""", label: "UnderlineOff")
+                        .AddItemScriptBlock(@"""$($_.Underline)$($_.Underline.Replace(""""`e"""",'`e'))$($_.Reset)""", label: "Underline")
+                        .AddItemProperty(@"OutputRendering")
+                        .AddItemScriptBlock(@"""$($_.Formatting.FormatAccent)$($_.Formatting.FormatAccent.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Formatting.FormatAccent")
+                        .AddItemScriptBlock(@"""$($_.Formatting.ErrorAccent)$($_.Formatting.ErrorAccent.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Formatting.ErrorAccent")
+                        .AddItemScriptBlock(@"""$($_.Formatting.Error)$($_.Formatting.Error.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Formatting.Error")
+                        .AddItemScriptBlock(@"""$($_.Formatting.Warning)$($_.Formatting.Warning.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Formatting.Warning")
+                        .AddItemScriptBlock(@"""$($_.Formatting.Verbose)$($_.Formatting.Verbose.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Formatting.Verbose")
+                        .AddItemScriptBlock(@"""$($_.Formatting.Debug)$($_.Formatting.Debug.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Formatting.Debug")
+                        .AddItemScriptBlock(@"""$($_.Foreground.Black)$($_.Foreground.Black.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Black")
+                        .AddItemScriptBlock(@"""$($_.Foreground.White)$($_.Foreground.White.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.White")
+                        .AddItemScriptBlock(@"""$($_.Foreground.DarkGray)$($_.Foreground.DarkGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.DarkGray")
+                        .AddItemScriptBlock(@"""$($_.Foreground.LightGray)$($_.Foreground.LightGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightGray")
+                        .AddItemScriptBlock(@"""$($_.Foreground.Red)$($_.Foreground.Red.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Red")
+                        .AddItemScriptBlock(@"""$($_.Foreground.LightRed)$($_.Foreground.LightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightRed")
+                        .AddItemScriptBlock(@"""$($_.Foreground.Magenta)$($_.Foreground.Magenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Magenta")
+                        .AddItemScriptBlock(@"""$($_.Foreground.LightMagenta)$($_.Foreground.LightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightMagenta")
+                        .AddItemScriptBlock(@"""$($_.Foreground.Blue)$($_.Foreground.Blue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Blue")
+                        .AddItemScriptBlock(@"""$($_.Foreground.LightBlue)$($_.Foreground.LightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightBlue")
+                        .AddItemScriptBlock(@"""$($_.Foreground.Cyan)$($_.Foreground.Cyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Cyan")
+                        .AddItemScriptBlock(@"""$($_.Foreground.LightCyan)$($_.Foreground.LightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightCyan")
+                        .AddItemScriptBlock(@"""$($_.Foreground.Green)$($_.Foreground.Green.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Green")
+                        .AddItemScriptBlock(@"""$($_.Foreground.LightGreen)$($_.Foreground.LightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightGreen")
+                        .AddItemScriptBlock(@"""$($_.Foreground.Yellow)$($_.Foreground.Yellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Yellow")
+                        .AddItemScriptBlock(@"""$($_.Foreground.LightYellow)$($_.Foreground.LightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightYellow")
+                        .AddItemScriptBlock(@"""$($_.Background.Black)$($_.Background.Black.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Black")
+                        .AddItemScriptBlock(@"""$($_.Background.White)$($_.Background.White.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.White")
+                        .AddItemScriptBlock(@"""$($_.Background.DarkGray)$($_.Background.DarkGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.DarkGray")
+                        .AddItemScriptBlock(@"""$($_.Background.LightGray)$($_.Background.LightGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightGray")
+                        .AddItemScriptBlock(@"""$($_.Background.Red)$($_.Background.Red.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Red")
+                        .AddItemScriptBlock(@"""$($_.Background.LightRed)$($_.Background.LightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightRed")
+                        .AddItemScriptBlock(@"""$($_.Background.Magenta)$($_.Background.Magenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Magenta")
+                        .AddItemScriptBlock(@"""$($_.Background.LightMagenta)$($_.Background.LightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightMagenta")
+                        .AddItemScriptBlock(@"""$($_.Background.Blue)$($_.Background.Blue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Blue")
+                        .AddItemScriptBlock(@"""$($_.Background.LightBlue)$($_.Background.LightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightBlue")
+                        .AddItemScriptBlock(@"""$($_.Background.Cyan)$($_.Background.Cyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Cyan")
+                        .AddItemScriptBlock(@"""$($_.Background.LightCyan)$($_.Background.LightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightCyan")
+                        .AddItemScriptBlock(@"""$($_.Background.Green)$($_.Background.Green.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Green")
+                        .AddItemScriptBlock(@"""$($_.Background.LightGreen)$($_.Background.LightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightGreen")
+                        .AddItemScriptBlock(@"""$($_.Background.Yellow)$($_.Background.Yellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Yellow")
+                        .AddItemScriptBlock(@"""$($_.Background.LightYellow)$($_.Background.LightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightYellow")
+                        .EndEntry()
+                .EndList());
+        }
+
+        private static IEnumerable<FormatViewDefinition> ViewsOf_System_Management_Automation_PSStyleFormattingData()
+        {
+            yield return new FormatViewDefinition("System.Management.Automation.PSStyle+FormattingData",
+                ListControl.Create()
+                    .StartEntry()
+                        .AddItemScriptBlock(@"""$($_.FormatAccent)$($_.FormatAccent.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "FormatAccent")
+                        .AddItemScriptBlock(@"""$($_.ErrorAccent)$($_.ErrorAccent.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "ErrorAccent")
+                        .AddItemScriptBlock(@"""$($_.Error)$($_.Error.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Error")
+                        .AddItemScriptBlock(@"""$($_.Warning)$($_.Warning.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Warning")
+                        .AddItemScriptBlock(@"""$($_.Verbose)$($_.Verbose.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Formatting.Verbose")
+                        .AddItemScriptBlock(@"""$($_.Debug)$($_.Debug.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Debug")
+                    .EndEntry()
+                .EndList());
+        }
+
+        private static IEnumerable<FormatViewDefinition> ViewsOf_System_Management_Automation_PSStyleForegroundColor()
+        {
+            yield return new FormatViewDefinition("System.Management.Automation.PSStyle+ForegroundColor",
+                ListControl.Create()
+                    .StartEntry()
+                        .AddItemScriptBlock(@"""$($_.Black)$($_.Black.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Black")
+                        .AddItemScriptBlock(@"""$($_.White)$($_.White.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "White")
+                        .AddItemScriptBlock(@"""$($_.DarkGray)$($_.DarkGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "DarkGray")
+                        .AddItemScriptBlock(@"""$($_.LightGray)$($_.LightGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightGray")
+                        .AddItemScriptBlock(@"""$($_.Red)$($_.Red.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Red")
+                        .AddItemScriptBlock(@"""$($_.LightRed)$($_.LightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightRed")
+                        .AddItemScriptBlock(@"""$($_.Magenta)$($_.Magenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Magenta")
+                        .AddItemScriptBlock(@"""$($_.LightMagenta)$($_.LightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightMagenta")
+                        .AddItemScriptBlock(@"""$($_.Blue)$($_.Blue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Blue")
+                        .AddItemScriptBlock(@"""$($_.LightBlue)$($_.LightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightBlue")
+                        .AddItemScriptBlock(@"""$($_.Cyan)$($_.Cyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Cyan")
+                        .AddItemScriptBlock(@"""$($_.LightCyan)$($_.LightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightCyan")
+                        .AddItemScriptBlock(@"""$($_.Green)$($_.Green.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Green")
+                        .AddItemScriptBlock(@"""$($_.LightGreen)$($_.LightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightGreen")
+                        .AddItemScriptBlock(@"""$($_.Yellow)$($_.Yellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Yellow")
+                        .AddItemScriptBlock(@"""$($_.LightYellow)$($_.LightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightYellow")
+                    .EndEntry()
+                .EndList());
+        }
+
+        private static IEnumerable<FormatViewDefinition> ViewsOf_System_Management_Automation_PSStyleBackgroundColor()
+        {
+            yield return new FormatViewDefinition("System.Management.Automation.PSStyle+ForegroundColor",
+                ListControl.Create()
+                    .StartEntry()
+                        .AddItemScriptBlock(@"""$($_.Black)$($_.Black.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Black")
+                        .AddItemScriptBlock(@"""$($_.White)$($_.White.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "White")
+                        .AddItemScriptBlock(@"""$($_.DarkGray)$($_.DarkGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "DarkGray")
+                        .AddItemScriptBlock(@"""$($_.LightGray)$($_.LightGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightGray")
+                        .AddItemScriptBlock(@"""$($_.Red)$($_.Red.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Red")
+                        .AddItemScriptBlock(@"""$($_.LightRed)$($_.LightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightRed")
+                        .AddItemScriptBlock(@"""$($_.Magenta)$($_.Magenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Magenta")
+                        .AddItemScriptBlock(@"""$($_.LightMagenta)$($_.LightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightMagenta")
+                        .AddItemScriptBlock(@"""$($_.Blue)$($_.Blue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Blue")
+                        .AddItemScriptBlock(@"""$($_.LightBlue)$($_.LightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightBlue")
+                        .AddItemScriptBlock(@"""$($_.Cyan)$($_.Cyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Cyan")
+                        .AddItemScriptBlock(@"""$($_.LightCyan)$($_.LightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightCyan")
+                        .AddItemScriptBlock(@"""$($_.Green)$($_.Green.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Green")
+                        .AddItemScriptBlock(@"""$($_.LightGreen)$($_.LightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightGreen")
+                        .AddItemScriptBlock(@"""$($_.Yellow)$($_.Yellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Yellow")
+                        .AddItemScriptBlock(@"""$($_.LightYellow)$($_.LightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightYellow")
+                    .EndEntry()
+                .EndList());
+        }
     }
 }
diff --git a/src/System.Management.Automation/FormatAndOutput/common/BaseOutputtingCommand.cs b/src/System.Management.Automation/FormatAndOutput/common/BaseOutputtingCommand.cs
index e3ff3608b9d..48ab1307681 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/BaseOutputtingCommand.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/BaseOutputtingCommand.cs
@@ -181,7 +181,7 @@ private FormatShape ActiveFormattingShape
             {
                 // we assume that the format context
                 // contains the information
-                FormatShape shape = FormatShape.Table; // default
+                const FormatShape shape = FormatShape.Table; // default
                 FormatOutputContext foc = this.FormatContext;
 
                 if (foc == null || foc.Data.shapeInfo == null)
diff --git a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/XmlLoaderBase.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/XmlLoaderBase.cs
index 773eb9d3777..a7e7df0a5d7 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 @@ internal class TooManyErrorsException : TypeInfoDataBaseLoaderException
     /// </summary>
     internal class XmlLoaderLoggerEntry
     {
-        internal enum EntryType { Error, Trace };
+        internal enum EntryType { Error, Trace }
 
         /// <summary>
         /// Type of information being logged.
@@ -100,7 +100,7 @@ internal void LogEntry(XmlLoaderLoggerEntry entry)
                 WriteToTracer(entry);
         }
 
-        private void WriteToTracer(XmlLoaderLoggerEntry entry)
+        private static void WriteToTracer(XmlLoaderLoggerEntry entry)
         {
             if (entry.entryType == XmlLoaderLoggerEntry.EntryType.Error)
             {
@@ -378,7 +378,7 @@ private bool MatchNodeNameHelper(XmlNode n, string s, bool allowAttributes)
                 // we differ only in case: flag this as an ERROR for the time being
                 // and accept the comparison
 
-                string fmtString = "XML tag differ in case only {0} {1}";
+                const string fmtString = "XML tag differ in case only {0} {1}";
                 ReportTrace(string.Format(CultureInfo.InvariantCulture, fmtString, n.Name, s));
 
                 match = true;
@@ -420,7 +420,7 @@ internal bool MatchAttributeName(XmlAttribute a, string s)
                 // we differ only in case: flag this as an ERROR for the time being
                 // and accept the comparison
 
-                string fmtString = "XML attribute differ in case only {0} {1}";
+                const string fmtString = "XML attribute differ in case only {0} {1}";
                 ReportTrace(string.Format(CultureInfo.InvariantCulture, fmtString, a.Name, s));
                 return true;
             }
diff --git a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData.cs
index 717ea07bdcd..f126dddcadc 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData.cs
@@ -774,7 +774,7 @@ internal static PSControlGroupBy Get(GroupBy groupBy)
                 return new PSControlGroupBy
                 {
                     Expression = new DisplayEntry(expressionToken),
-                    Label = (groupBy.startGroup.labelTextToken != null) ? groupBy.startGroup.labelTextToken.text : null
+                    Label = groupBy.startGroup.labelTextToken?.text
                 };
             }
 
diff --git a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayResourceManagerCache.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayResourceManagerCache.cs
index aafd09cc255..fbdd1287a02 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 @@ 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)
         {
@@ -176,7 +176,7 @@ internal Assembly ResolveAssemblyName(string assemblyName)
                 return retVal;
             }
 
-            private Assembly ResolveAssemblyNameInLoadedAssemblies(string assemblyName, bool fullName)
+            private static Assembly ResolveAssemblyNameInLoadedAssemblies(string assemblyName, bool fullName)
             {
                 Assembly result = null;
 
diff --git a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataManager.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataManager.cs
index 51be05505e6..c42bd21adc7 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataManager.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataManager.cs
@@ -57,7 +57,7 @@ internal TypeInfoDataBaseManager()
         /// <param name="host">
         /// Host passed to <paramref name="authorizationManager"/>.  Can be null if no interactive questions should be asked.
         /// </param>
-        /// <exception cref="ArgumentNullException" />
+        /// <exception cref="ArgumentNullException"/>
         /// <exception cref="ArgumentException">
         /// 1. FormatFile is not rooted.
         /// </exception>
diff --git a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataQuery.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataQuery.cs
index 9547ac1e072..60953d22c26 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataQuery.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataQuery.cs
@@ -219,7 +219,7 @@ private int MatchTypeIndex(string typeName, PSObject currentObject, PSPropertyEx
             return BestMatchIndexUndefined;
         }
 
-        private bool MatchCondition(PSObject currentObject, PSPropertyExpression ex)
+        private static bool MatchCondition(PSObject currentObject, PSPropertyExpression ex)
         {
             if (ex == null)
                 return true;
diff --git a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader.cs
index 90a44c848b2..b68288ff9ab 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader.cs
@@ -586,7 +586,7 @@ private ControlBase LoadTableControlFromObjectModel(TableControl table, int view
         /// </summary>
         /// <param name="tableBody"></param>
         /// <param name="headers"></param>
-        private void LoadHeadersSectionFromObjectModel(TableControlBody tableBody, List<TableControlColumnHeader> headers)
+        private static void LoadHeadersSectionFromObjectModel(TableControlBody tableBody, List<TableControlColumnHeader> headers)
         {
             foreach (TableControlColumnHeader header in headers)
             {
@@ -746,7 +746,7 @@ private ExpressionToken LoadExpressionFromObjectModel(DisplayEntry displayEntry,
         /// Load EntrySelectedBy (TypeName) into AppliesTo.
         /// </summary>
         /// <returns></returns>
-        private AppliesTo LoadAppliesToSectionFromObjectModel(List<string> selectedBy, List<DisplayEntry> condition)
+        private static AppliesTo LoadAppliesToSectionFromObjectModel(List<string> selectedBy, List<DisplayEntry> condition)
         {
             AppliesTo appliesTo = new AppliesTo();
 
diff --git a/src/System.Management.Automation/FormatAndOutput/common/FormatMsgCtxManager.cs b/src/System.Management.Automation/FormatAndOutput/common/FormatMsgCtxManager.cs
index 5ccfada75fa..3eabcc975a0 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/FormatMsgCtxManager.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/FormatMsgCtxManager.cs
@@ -19,10 +19,15 @@ internal class FormatMessagesContextManager
     {
         // callbacks declarations
         internal delegate OutputContext FormatContextCreationCallback(OutputContext parentContext, FormatInfoData formatData);
+
         internal delegate void FormatStartCallback(OutputContext c);
+
         internal delegate void FormatEndCallback(FormatEndData fe, OutputContext c);
+
         internal delegate void GroupStartCallback(OutputContext c);
+
         internal delegate void GroupEndCallback(GroupEndData fe, OutputContext c);
+
         internal delegate void PayloadCallback(FormatEntryData formatEntryData, OutputContext c);
 
         // callback instances
diff --git a/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Table.cs b/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Table.cs
index 7394589bb95..bfd3291dd46 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Table.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Table.cs
@@ -137,7 +137,7 @@ private void FilterActiveAssociationList()
             // make sure we do not have too many properties
 
             // NOTE: this is an arbitrary number, chosen to be a sensitive default
-            int nMax = 10;
+            const int nMax = 10;
 
             if (activeAssociationList.Count > nMax)
             {
diff --git a/src/System.Management.Automation/FormatAndOutput/common/FormatViewManager.cs b/src/System.Management.Automation/FormatAndOutput/common/FormatViewManager.cs
index c158583e25b..0737e43476e 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/FormatViewManager.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/FormatViewManager.cs
@@ -234,7 +234,7 @@ private static void ProcessUnknownViewName(TerminatingErrorContext errorContext,
             string msg = null;
             bool foundValidViews = false;
             string formatTypeName = null;
-            string separator = ", ";
+            const string separator = ", ";
             StringBuilder validViewFormats = new StringBuilder();
 
             if (so != null && so.BaseObject != null &&
diff --git a/src/System.Management.Automation/FormatAndOutput/common/FormattingObjectsDeserializer.cs b/src/System.Management.Automation/FormatAndOutput/common/FormattingObjectsDeserializer.cs
index d1b9523138b..285e4d4c02b 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/FormattingObjectsDeserializer.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/FormattingObjectsDeserializer.cs
@@ -290,7 +290,7 @@ internal int DeserializeIntMemberVariable(PSObject so, string property)
         internal bool DeserializeBoolMemberVariable(PSObject so, string property, bool cannotBeNull = true)
         {
             var val = DeserializeMemberVariable(so, property, typeof(bool), cannotBeNull);
-            return (val == null) ? false : (bool)val;
+            return val != null && (bool)val;
         }
 
         internal WriteStreamType DeserializeWriteStreamTypeMemberVariable(PSObject so)
diff --git a/src/System.Management.Automation/FormatAndOutput/common/ILineOutput.cs b/src/System.Management.Automation/FormatAndOutput/common/ILineOutput.cs
index 83e39c4dd5d..32d4565da5d 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/ILineOutput.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/ILineOutput.cs
@@ -4,6 +4,7 @@
 using System.Globalization;
 using System.IO;
 using System.Management.Automation;
+using System.Management.Automation.Internal;
 using System.Text;
 
 // interfaces for host interaction
@@ -411,6 +412,9 @@ internal override int RowNumber
         internal override void WriteLine(string s)
         {
             CheckStopProcessing();
+
+            s = Utils.GetOutputString(s, isHost: false);
+
             if (_suppressNewline)
             {
                 _writer.Write(s);
diff --git a/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs b/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs
new file mode 100644
index 00000000000..f27a5b89da9
--- /dev/null
+++ b/src/System.Management.Automation/FormatAndOutput/common/PSStyle.cs
@@ -0,0 +1,404 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+namespace System.Management.Automation
+{
+    #region OutputRendering
+    /// <summary>
+    /// Defines the options for output rendering.
+    /// </summary>
+    public enum OutputRendering
+    {
+        /// <summary>Automatic by PowerShell.</summary>
+        Automatic = 0,
+
+        /// <summary>Render as plaintext.</summary>
+        PlainText = 1,
+
+        /// <summary>Render as ANSI.</summary>
+        Ansi = 2,
+
+        /// <summary>Render ANSI only to host.</summary>
+        Host = 3,
+    }
+    #endregion OutputRendering
+
+    #region PSStyle
+    /// <summary>
+    /// Contains configuration for how PowerShell renders text.
+    /// </summary>
+    public class PSStyle
+    {
+        /// <summary>
+        /// Contains foreground colors.
+        /// </summary>
+        public class ForegroundColor
+        {
+            /// <summary>
+            /// Gets the color black.
+            /// </summary>
+            public string Black { get; } = "\x1b[30m";
+
+            /// <summary>
+            /// Gets the color blue.
+            /// </summary>
+            public string Blue { get; } = "\x1b[34m";
+
+            /// <summary>
+            /// Gets the color cyan.
+            /// </summary>
+            public string Cyan { get; } = "\x1b[36m";
+
+            /// <summary>
+            /// Gets the color dark gray.
+            /// </summary>
+            public string DarkGray { get; } = "\x1b[90m";
+
+            /// <summary>
+            /// Gets the color green.
+            /// </summary>
+            public string Green { get; } = "\x1b[32m";
+
+            /// <summary>
+            /// Gets the color light blue.
+            /// </summary>
+            public string LightBlue { get; } = "\x1b[94m";
+
+            /// <summary>
+            /// Gets the color light cyan.
+            /// </summary>
+            public string LightCyan { get; } = "\x1b[96m";
+
+            /// <summary>
+            /// Gets the color light gray.
+            /// </summary>
+            public string LightGray { get; } = "\x1b[97m";
+
+            /// <summary>
+            /// Gets the color light green.
+            /// </summary>
+            public string LightGreen { get; } = "\x1b[92m";
+
+            /// <summary>
+            /// Gets the color light magenta.
+            /// </summary>
+            public string LightMagenta { get; } = "\x1b[95m";
+
+            /// <summary>
+            /// Gets the color light red.
+            /// </summary>
+            public string LightRed { get; } = "\x1b[91m";
+
+            /// <summary>
+            /// Gets the color light yellow.
+            /// </summary>
+            public string LightYellow { get; } = "\x1b[93m";
+
+            /// <summary>
+            /// Gets the color magenta.
+            /// </summary>
+            public string Magenta { get; } = "\x1b[35m";
+
+            /// <summary>
+            /// Gets the color read.
+            /// </summary>
+            public string Red { get; } = "\x1b[31m";
+
+            /// <summary>
+            /// Gets the color white.
+            /// </summary>
+            public string White { get; } = "\x1b[37m";
+
+            /// <summary>
+            /// Gets the color yellow.
+            /// </summary>
+            public string Yellow { get; } = "\x1b[33m";
+
+            /// <summary>
+            /// Set as RGB (Red, Green, Blue).
+            /// </summary>
+            /// <param name="red">Byte value representing red.</param>
+            /// <param name="green">Byte value representing green.</param>
+            /// <param name="blue">Byte value representing blue.</param>
+            /// <returns>String representing ANSI code for RGB value.</returns>
+            public string FromRgb(byte red, byte green, byte blue)
+            {
+                return $"\x1b[38;2;{red};{green};{blue}m";
+            }
+
+            /// <summary>
+            /// The color set as RGB as a single number.
+            /// </summary>
+            /// <param name="rgb">RGB value specified as an integer.</param>
+            /// <returns>String representing ANSI code for RGB value.</returns>
+            public string FromRgb(int rgb)
+            {
+                byte red, green, blue;
+                blue = (byte)(rgb & 0xFF);
+                rgb >>= 8;
+                green = (byte)(rgb & 0xFF);
+                rgb >>= 8;
+                red = (byte)(rgb & 0xFF);
+
+                return FromRgb(red, green, blue);
+            }
+        }
+
+        /// <summary>
+        /// Contains background colors.
+        /// </summary>
+        public class BackgroundColor
+        {
+            /// <summary>
+            /// Gets the color black.
+            /// </summary>
+            public string Black { get; } = "\x1b[40m";
+
+            /// <summary>
+            /// Gets the color blue.
+            /// </summary>
+            public string Blue { get; } = "\x1b[44m";
+
+            /// <summary>
+            /// Gets the color cyan.
+            /// </summary>
+            public string Cyan { get; } = "\x1b[46m";
+
+            /// <summary>
+            /// Gets the color dark gray.
+            /// </summary>
+            public string DarkGray { get; } = "\x1b[100m";
+
+            /// <summary>
+            /// Gets the color green.
+            /// </summary>
+            public string Green { get; } = "\x1b[42m";
+
+            /// <summary>
+            /// Gets the color light blue.
+            /// </summary>
+            public string LightBlue { get; } = "\x1b[104m";
+
+            /// <summary>
+            /// Gets the color light cyan.
+            /// </summary>
+            public string LightCyan { get; } = "\x1b[106m";
+
+            /// <summary>
+            /// Gets the color light gray.
+            /// </summary>
+            public string LightGray { get; } = "\x1b[107m";
+
+            /// <summary>
+            /// Gets the color light green.
+            /// </summary>
+            public string LightGreen { get; } = "\x1b[102m";
+
+            /// <summary>
+            /// Gets the color light magenta.
+            /// </summary>
+            public string LightMagenta { get; } = "\x1b[105m";
+
+            /// <summary>
+            /// Gets the color light red.
+            /// </summary>
+            public string LightRed { get; } = "\x1b[101m";
+
+            /// <summary>
+            /// Gets the color light yellow.
+            /// </summary>
+            public string LightYellow { get; } = "\x1b[103m";
+
+            /// <summary>
+            /// Gets the color magenta.
+            /// </summary>
+            public string Magenta { get; } = "\x1b[45m";
+
+            /// <summary>
+            /// Gets the color read.
+            /// </summary>
+            public string Red { get; } = "\x1b[41m";
+
+            /// <summary>
+            /// Gets the color white.
+            /// </summary>
+            public string White { get; } = "\x1b[47m";
+
+            /// <summary>
+            /// Gets the color yellow.
+            /// </summary>
+            public string Yellow { get; } = "\x1b[43m";
+
+            /// <summary>
+            /// The color set as RGB (Red, Green, Blue).
+            /// </summary>
+            /// <param name="red">Byte value representing red.</param>
+            /// <param name="green">Byte value representing green.</param>
+            /// <param name="blue">Byte value representing blue.</param>
+            /// <returns>String representing ANSI code for RGB value.</returns>
+            public string FromRgb(byte red, byte green, byte blue)
+            {
+                return $"\x1b[48;2;{red};{green};{blue}m";
+            }
+
+            /// <summary>
+            /// The color set as RGB as a single number.
+            /// </summary>
+            /// <param name="rgb">RGB value specified as an integer.</param>
+            /// <returns>String representing ANSI code for RGB value.</returns>
+            public string FromRgb(int rgb)
+            {
+                byte red, green, blue;
+                blue = (byte)(rgb & 0xFF);
+                rgb >>= 8;
+                green = (byte)(rgb & 0xFF);
+                rgb >>= 8;
+                red = (byte)(rgb & 0xFF);
+
+                return FromRgb(red, green, blue);
+            }
+        }
+
+        /// <summary>
+        /// Contains formatting styles for steams and objects.
+        /// </summary>
+        public class FormattingData
+        {
+            /// <summary>
+            /// Gets or sets the accent style for formatting.
+            /// </summary>
+            public string FormatAccent { get; set; } = "\x1b[32;1m";
+
+            /// <summary>
+            /// Gets or sets the accent style for errors.
+            /// </summary>
+            public string ErrorAccent { get; set; } = "\x1b[36;1m";
+
+            /// <summary>
+            /// Gets or sets the style for error messages.
+            /// </summary>
+            public string Error { get; set; } = "\x1b[31;1m";
+
+            /// <summary>
+            /// Gets or sets the style for warning messages.
+            /// </summary>
+            public string Warning { get; set; } = "\x1b[33;1m";
+
+            /// <summary>
+            /// Gets or sets the style for verbose messages.
+            /// </summary>
+            public string Verbose { get; set; } = "\x1b[33;1m";
+
+            /// <summary>
+            /// Gets or sets the style for debug messages.
+            /// </summary>
+            public string Debug { get; set; } = "\x1b[33;1m";
+        }
+
+        /// <summary>
+        /// Gets or sets the rendering mode for output.
+        /// </summary>
+        public OutputRendering OutputRendering { get; set; } = OutputRendering.Automatic;
+
+        /// <summary>
+        /// Gets value to turn off all attributes.
+        /// </summary>
+        public string Reset { get; } = "\x1b[0m";
+
+        /// <summary>
+        /// Gets value to turn off blink.
+        /// </summary>
+        public string BlinkOff { get; } = "\x1b[5m";
+
+        /// <summary>
+        /// Gets value to turn on blink.
+        /// </summary>
+        public string Blink { get; } = "\x1b[25m";
+
+        /// <summary>
+        /// Gets value to turn off bold.
+        /// </summary>
+        public string BoldOff { get; } = "\x1b[22m";
+
+        /// <summary>
+        /// Gets value to turn on blink.
+        /// </summary>
+        public string Bold { get; } = "\x1b[1m";
+
+        /// <summary>
+        /// Gets value to turn on hidden.
+        /// </summary>
+        public string Hidden { get; } = "\x1b[8m";
+
+        /// <summary>
+        /// Gets value to turn off hidden.
+        /// </summary>
+        public string HiddenOff { get; } = "\x1b[28m";
+
+        /// <summary>
+        /// Gets value to turn on reverse.
+        /// </summary>
+        public string Reverse { get; } = "\x1b[7m";
+
+        /// <summary>
+        /// Gets value to turn off reverse.
+        /// </summary>
+        public string ReverseOff { get; } = "\x1b[27m";
+
+        /// <summary>
+        /// Gets value to turn off standout.
+        /// </summary>
+        public string ItalicOff { get; } = "\x1b[23m";
+
+        /// <summary>
+        /// Gets value to turn on standout.
+        /// </summary>
+        public string Italic { get; } = "\x1b[3m";
+
+        /// <summary>
+        /// Gets value to turn off underlined.
+        /// </summary>
+        public string UnderlineOff { get; } = "\x1b[24m";
+
+        /// <summary>
+        /// Gets value to turn on underlined.
+        /// </summary>
+        public string Underline { get; } = "\x1b[4m";
+
+        /// <summary>
+        /// Gets the formatting rendering settings.
+        /// </summary>
+        public FormattingData Formatting { get; }
+
+        /// <summary>
+        /// Gets foreground colors.
+        /// </summary>
+        public ForegroundColor Foreground { get; }
+
+        /// <summary>
+        /// Gets background colors.
+        /// </summary>
+        public BackgroundColor Background { get; }
+
+        private static readonly PSStyle s_psstyle = new PSStyle();
+
+        private PSStyle()
+        {
+            Formatting = new FormattingData();
+            Foreground = new ForegroundColor();
+            Background = new BackgroundColor();
+        }
+
+        /// <summary>
+        /// Gets singleton instance.
+        /// </summary>
+        public static PSStyle Instance
+        {
+            get
+            {
+                return s_psstyle;
+            }
+        }
+    }
+    #endregion PSStyle
+}
diff --git a/src/System.Management.Automation/FormatAndOutput/common/StringDecorated.cs b/src/System.Management.Automation/FormatAndOutput/common/StringDecorated.cs
new file mode 100644
index 00000000000..3c1041f9c47
--- /dev/null
+++ b/src/System.Management.Automation/FormatAndOutput/common/StringDecorated.cs
@@ -0,0 +1,175 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#nullable enable
+
+using System.Text.RegularExpressions;
+
+namespace System.Management.Automation.Internal
+{
+    /// <summary>
+    /// Extensions to String type to calculate and render decorated content.
+    /// </summary>
+    public class StringDecorated
+    {
+        private readonly bool _isDecorated;
+        private readonly string _text;
+        private string? _plaintextcontent;
+
+        private string PlainText
+        {
+            get
+            {
+                if (_plaintextcontent == null)
+                {
+                    _plaintextcontent = ValueStringDecorated.AnsiRegex.Replace(_text, string.Empty);
+                }
+
+                return _plaintextcontent;
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StringDecorated"/> class.
+        /// </summary>
+        /// <param name="text">The input string.</param>
+        public StringDecorated(string text)
+        {
+            _text = text;
+            _isDecorated = text.Contains(ValueStringDecorated.ESC);
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the string contains decoration.
+        /// </summary>
+        /// <returns>Boolean if the string contains decoration.</returns>
+        public bool IsDecorated => _isDecorated;
+
+        /// <summary>
+        /// Gets the length of content sans escape sequences.
+        /// </summary>
+        /// <returns>Length of content sans escape sequences.</returns>
+        public int ContentLength => PlainText.Length;
+
+        /// <summary>
+        /// Render the decorarted string using automatic output rendering.
+        /// </summary>
+        /// <returns>Rendered string based on automatic output rendering.</returns>
+        public override string ToString() => _isDecorated ? ToString(OutputRendering.Automatic) : _text;
+
+        /// <summary>
+        /// Return string representation of content depending on output rendering mode.
+        /// </summary>
+        /// <param name="outputRendering">Specify how to render the text content.</param>
+        /// <returns>Rendered string based on outputRendering.</returns>
+        public string ToString(OutputRendering outputRendering)
+        {
+            if (!_isDecorated)
+            {
+                return _text;
+            }
+
+            if (outputRendering == OutputRendering.Automatic)
+            {
+                outputRendering = OutputRendering.Ansi;
+                if (PSStyle.Instance.OutputRendering == OutputRendering.PlainText)
+                {
+                    outputRendering = OutputRendering.PlainText;
+                }
+            }
+
+            if (outputRendering == OutputRendering.PlainText)
+            {
+                return PlainText;
+            }
+            else
+            {
+                return _text;
+            }
+        }
+    }
+
+    internal struct ValueStringDecorated
+    {
+        internal const char ESC = '\x1b';
+        private readonly bool _isDecorated;
+        private readonly string _text;
+        private string? _plaintextcontent;
+
+        private string PlainText
+        {
+            get
+            {
+                if (_plaintextcontent == null)
+                {
+                    _plaintextcontent = AnsiRegex.Replace(_text, string.Empty);
+                }
+
+                return _plaintextcontent;
+            }
+        }
+
+        // replace regex with .NET 6 API once available
+        internal static readonly Regex AnsiRegex = new Regex(@"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])", RegexOptions.Compiled);
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ValueStringDecorated"/> struct.
+        /// </summary>
+        /// <param name="text">The input string.</param>
+        public ValueStringDecorated(string text)
+        {
+            _text = text;
+            _isDecorated = text.Contains(ESC);
+            _plaintextcontent = null;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the string contains decoration.
+        /// </summary>
+        /// <returns>Boolean if the string contains decoration.</returns>
+        public bool IsDecorated => _isDecorated;
+
+        /// <summary>
+        /// Gets the length of content sans escape sequences.
+        /// </summary>
+        /// <returns>Length of content sans escape sequences.</returns>
+        public int ContentLength => PlainText.Length;
+
+        /// <summary>
+        /// Render the decorarted string using automatic output rendering.
+        /// </summary>
+        /// <returns>Rendered string based on automatic output rendering.</returns>
+        public override string ToString() => _isDecorated ? ToString(OutputRendering.Automatic) : _text;
+
+        /// <summary>
+        /// Return string representation of content depending on output rendering mode.
+        /// </summary>
+        /// <param name="outputRendering">Specify how to render the text content.</param>
+        /// <returns>Rendered string based on outputRendering.</returns>
+        public string ToString(OutputRendering outputRendering)
+        {
+            if (!_isDecorated)
+            {
+                return _text;
+            }
+
+            if (outputRendering == OutputRendering.Automatic)
+            {
+                outputRendering = OutputRendering.Ansi;
+                if (PSStyle.Instance.OutputRendering == OutputRendering.PlainText)
+                {
+                    outputRendering = OutputRendering.PlainText;
+                }
+            }
+
+            if (outputRendering == OutputRendering.PlainText)
+            {
+                return PlainText;
+            }
+            else
+            {
+                return _text;
+            }
+        }
+    }
+}
diff --git a/src/System.Management.Automation/FormatAndOutput/common/Utilities/Mshexpression.cs b/src/System.Management.Automation/FormatAndOutput/common/Utilities/Mshexpression.cs
index b9419c1ec0e..68921ddb0e8 100644
--- a/src/System.Management.Automation/FormatAndOutput/common/Utilities/Mshexpression.cs
+++ b/src/System.Management.Automation/FormatAndOutput/common/Utilities/Mshexpression.cs
@@ -66,7 +66,7 @@ public PSPropertyExpression(string s)
         /// Create a property expression with a wildcard pattern.
         /// </summary>
         /// <param name="s">Property name pattern to match.</param>
-        /// <param name="isResolved"><c>true</c> if no further attempts should be made to resolve wildcards.</param>
+        /// <param name="isResolved"><see langword="true"/> if no further attempts should be made to resolve wildcards.</param>
         /// <exception cref="ArgumentNullException"></exception>
         public PSPropertyExpression(string s, bool isResolved)
         {
@@ -354,7 +354,7 @@ private PSPropertyExpressionResult GetValue(PSObject target, bool eatExceptions)
             }
         }
 
-        private PSObject IfHashtableWrapAsPSCustomObject(PSObject target, out bool wrapped)
+        private static PSObject IfHashtableWrapAsPSCustomObject(PSObject target, out bool wrapped)
         {
             wrapped = false;
 
diff --git a/src/System.Management.Automation/FormatAndOutput/out-console/ConsoleLineOutput.cs b/src/System.Management.Automation/FormatAndOutput/out-console/ConsoleLineOutput.cs
index decceac5108..4750b099b01 100644
--- a/src/System.Management.Automation/FormatAndOutput/out-console/ConsoleLineOutput.cs
+++ b/src/System.Management.Automation/FormatAndOutput/out-console/ConsoleLineOutput.cs
@@ -222,6 +222,7 @@ internal override int RowNumber
         internal override void WriteLine(string s)
         {
             CheckStopProcessing();
+
             // delegate the action to the helper,
             // that will properly break the string into
             // screen lines
@@ -351,6 +352,7 @@ private void OnWrite(string s)
 #if TEST_MULTICELL_ON_SINGLE_CELL_LOCALE
             s = ((DisplayCellsTest)this._displayCellsPSHost).GenerateTestString(s);
 #endif
+
             switch (this.WriteStream)
             {
                 case WriteStreamType.Error:
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index e8d5ff5911d..562b98361ac 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -14,7 +14,7 @@
     <!-- the following package(s) are from https://github.com/JamesNK/Newtonsoft.Json -->
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <!-- the Application Insights package -->
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.15.0" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.16.0" />
     <!-- the following package(s) are from https://github.com/dotnet/corefx -->
     <PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="5.0.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
diff --git a/src/System.Management.Automation/cimSupport/cmdletization/EnumWriter.cs b/src/System.Management.Automation/cimSupport/cmdletization/EnumWriter.cs
index 23c7a09c4f2..66649420101 100644
--- a/src/System.Management.Automation/cimSupport/cmdletization/EnumWriter.cs
+++ b/src/System.Management.Automation/cimSupport/cmdletization/EnumWriter.cs
@@ -17,14 +17,14 @@ internal static class EnumWriter
 
         private static ModuleBuilder CreateModuleBuilder()
         {
-            AssemblyName aName = new AssemblyName(namespacePrefix);
+            AssemblyName aName = new(namespacePrefix);
             AssemblyBuilder ab = AssemblyBuilder.DefineDynamicAssembly(aName, AssemblyBuilderAccess.Run);
             ModuleBuilder mb = ab.DefineDynamicModule(aName.Name);
             return mb;
         }
 
-        private static Lazy<ModuleBuilder> s_moduleBuilder = new Lazy<ModuleBuilder>(CreateModuleBuilder, isThreadSafe: true);
-        private static object s_moduleBuilderUsageLock = new object();
+        private static Lazy<ModuleBuilder> s_moduleBuilder = new(CreateModuleBuilder, isThreadSafe: true);
+        private static object s_moduleBuilderUsageLock = new();
 
         internal static string GetEnumFullName(EnumMetadataEnum enumMetadata)
         {
diff --git a/src/System.Management.Automation/cimSupport/cmdletization/MethodInvocationInfo.cs b/src/System.Management.Automation/cimSupport/cmdletization/MethodInvocationInfo.cs
index 81a4c33062f..1640dec33b9 100644
--- a/src/System.Management.Automation/cimSupport/cmdletization/MethodInvocationInfo.cs
+++ b/src/System.Management.Automation/cimSupport/cmdletization/MethodInvocationInfo.cs
@@ -18,7 +18,7 @@ public sealed class MethodInvocationInfo
         /// </summary>
         /// <param name="name">Name of the method to invoke.</param>
         /// <param name="parameters">Method parameters.</param>
-        /// <param name="returnValue">Return value of the method (ok to pass <c>null</c> if the method doesn't return anything).</param>
+        /// <param name="returnValue">Return value of the method (ok to pass <see langword="null"/> if the method doesn't return anything).</param>
         public MethodInvocationInfo(string name, IEnumerable<MethodParameter> parameters, MethodParameter returnValue)
         {
             if (name == null) throw new ArgumentNullException(nameof(name));
@@ -48,16 +48,16 @@ public MethodInvocationInfo(string name, IEnumerable<MethodParameter> parameters
         public KeyedCollection<string, MethodParameter> Parameters { get; }
 
         /// <summary>
-        /// Return value of the method.  Can be <c>null</c> if the method doesn't return anything.
+        /// Return value of the method.  Can be <see langword="null"/> if the method doesn't return anything.
         /// </summary>
         public MethodParameter ReturnValue { get; }
 
         internal IEnumerable<T> GetArgumentsOfType<T>() where T : class
         {
-            List<T> result = new List<T>();
+            List<T> result = new();
             foreach (var methodParameter in this.Parameters)
             {
-                if (MethodParameterBindings.In != (methodParameter.Bindings & MethodParameterBindings.In))
+                if ((methodParameter.Bindings & MethodParameterBindings.In) != MethodParameterBindings.In)
                 {
                     continue;
                 }
diff --git a/src/System.Management.Automation/cimSupport/cmdletization/MethodParameter.cs b/src/System.Management.Automation/cimSupport/cmdletization/MethodParameter.cs
index d9b08b27179..f044d4d422f 100644
--- a/src/System.Management.Automation/cimSupport/cmdletization/MethodParameter.cs
+++ b/src/System.Management.Automation/cimSupport/cmdletization/MethodParameter.cs
@@ -43,7 +43,7 @@ public sealed class MethodParameter
         public Type ParameterType { get; set; }
 
         /// <summary>
-        /// Contents of the ETS type attribute in the CDXML file (or <c>null</c> if that attribute was not specified).
+        /// Contents of the ETS type attribute in the CDXML file (or <see langword="null"/> if that attribute was not specified).
         /// The expectation is that the CmdletAdapter will stamp this value onto PSTypeNames of emitted objects.
         /// </summary>
         public string ParameterTypeName { get; set; }
diff --git a/src/System.Management.Automation/cimSupport/cmdletization/ObjectModelWrapper.cs b/src/System.Management.Automation/cimSupport/cmdletization/ObjectModelWrapper.cs
index 289ad0c3a76..a840ca527fd 100644
--- a/src/System.Management.Automation/cimSupport/cmdletization/ObjectModelWrapper.cs
+++ b/src/System.Management.Automation/cimSupport/cmdletization/ObjectModelWrapper.cs
@@ -127,7 +127,7 @@ public virtual void StopProcessing()
         /// </summary>
         /// <param name="objectInstance">The object on which to invoke the method.</param>
         /// <param name="methodInvocationInfo">Method invocation details.</param>
-        /// <param name="passThru"><c>true</c> if successful method invocations should emit downstream the <paramref name="objectInstance"/> being operated on.</param>
+        /// <param name="passThru"><see langword="true"/> if successful method invocations should emit downstream the <paramref name="objectInstance"/> being operated on.</param>
         public virtual void ProcessRecord(TObjectInstance objectInstance, MethodInvocationInfo methodInvocationInfo, bool passThru)
         {
             throw new NotImplementedException();
@@ -138,7 +138,7 @@ public virtual void ProcessRecord(TObjectInstance objectInstance, MethodInvocati
         /// </summary>
         /// <param name="query">Query parameters.</param>
         /// <param name="methodInvocationInfo">Method invocation details.</param>
-        /// <param name="passThru"><c>true</c> if successful method invocations should emit downstream the object instance being operated on.</param>
+        /// <param name="passThru"><see langword="true"/> if successful method invocations should emit downstream the object instance being operated on.</param>
         public virtual void ProcessRecord(QueryBuilder query, MethodInvocationInfo methodInvocationInfo, bool passThru)
         {
             throw new NotImplementedException();
@@ -182,7 +182,7 @@ public string ClassName
 
         /// <summary>
         /// Name of the class (from the object model handled by this ObjectModelWrapper) that is wrapped by the currently executing cmdlet.
-        /// This value can be <c>null</c> (i.e. when ClassVersion attribute is omitted in the ps1xml)
+        /// This value can be <see langword="null"/> (i.e. when ClassVersion attribute is omitted in the ps1xml)
         /// </summary>
         public string ClassVersion
         {
diff --git a/src/System.Management.Automation/cimSupport/cmdletization/QueryBuilder.cs b/src/System.Management.Automation/cimSupport/cmdletization/QueryBuilder.cs
index a1ce1d726ec..36f781d98a0 100644
--- a/src/System.Management.Automation/cimSupport/cmdletization/QueryBuilder.cs
+++ b/src/System.Management.Automation/cimSupport/cmdletization/QueryBuilder.cs
@@ -52,8 +52,8 @@ public abstract class QueryBuilder
         /// <param name="propertyName">Property name to query on.</param>
         /// <param name="allowedPropertyValues">Property values to accept in the query.</param>
         /// <param name="wildcardsEnabled">
-        /// <c>true</c> if <paramref name="allowedPropertyValues"/> should be treated as a <see cref="System.String"/> containing a wildcard pattern;
-        /// <c>false otherwise</c>
+        /// <see langword="true"/> if <paramref name="allowedPropertyValues"/> should be treated as a <see cref="System.String"/> containing a wildcard pattern;
+        /// <see langword="false"/> otherwise.
         /// </param>
         /// <param name="behaviorOnNoMatch">
         /// Describes how to handle filters that didn't match any objects
@@ -69,8 +69,8 @@ public virtual void FilterByProperty(string propertyName, IEnumerable allowedPro
         /// <param name="propertyName">Property name to query on.</param>
         /// <param name="excludedPropertyValues">Property values to reject in the query.</param>
         /// <param name="wildcardsEnabled">
-        /// <c>true</c> if <paramref name="excludedPropertyValues"/> should be treated as a <see cref="System.String"/> containing a wildcard pattern;
-        /// <c>false otherwise</c>
+        /// <see langword="true"/> if <paramref name="excludedPropertyValues"/> should be treated as a <see cref="System.String"/> containing a wildcard pattern;
+        /// <see langword="false"/> otherwise.
         /// </param>
         /// <param name="behaviorOnNoMatch">
         /// Describes how to handle filters that didn't match any objects
diff --git a/src/System.Management.Automation/cimSupport/cmdletization/ScriptWriter.cs b/src/System.Management.Automation/cimSupport/cmdletization/ScriptWriter.cs
index 3757319c9ab..3197361faea 100644
--- a/src/System.Management.Automation/cimSupport/cmdletization/ScriptWriter.cs
+++ b/src/System.Management.Automation/cimSupport/cmdletization/ScriptWriter.cs
@@ -234,10 +234,10 @@ private string GetCmdletName(CommonCmdletMetadata cmdletMetadata)
             return verb + "-" + noun;
         }
 
-        private string GetCmdletAttributes(CommonCmdletMetadata cmdletMetadata)
+        private static string GetCmdletAttributes(CommonCmdletMetadata cmdletMetadata)
         {
             // Generate the script for the Alias and Obsolete Attribute if any is declared in CDXML
-            StringBuilder attributes = new StringBuilder(150);
+            StringBuilder attributes = new(150);
             if (cmdletMetadata.Aliases != null)
             {
                 attributes.Append("[Alias('" + string.Join("','", cmdletMetadata.Aliases.Select(alias => CodeGeneration.EscapeSingleQuotedStringContent(alias))) + "')]");
@@ -257,12 +257,12 @@ private string GetCmdletAttributes(CommonCmdletMetadata cmdletMetadata)
 
         private Dictionary<string, ParameterMetadata> GetCommonParameters()
         {
-            Dictionary<string, ParameterMetadata> commonParameters = new Dictionary<string, ParameterMetadata>(StringComparer.OrdinalIgnoreCase);
+            Dictionary<string, ParameterMetadata> commonParameters = new(StringComparer.OrdinalIgnoreCase);
 
-            InternalParameterMetadata internalParameterMetadata = new InternalParameterMetadata(_objectModelWrapper, false);
+            InternalParameterMetadata internalParameterMetadata = new(_objectModelWrapper, false);
             foreach (CompiledCommandParameter compiledCommandParameter in internalParameterMetadata.BindableParameters.Values)
             {
-                ParameterMetadata parameterMetadata = new ParameterMetadata(compiledCommandParameter);
+                ParameterMetadata parameterMetadata = new(compiledCommandParameter);
                 foreach (ParameterSetMetadata psetMetadata in parameterMetadata.ParameterSets.Values)
                 {
                     if (psetMetadata.ValueFromPipeline)
@@ -335,7 +335,7 @@ private Dictionary<string, ParameterMetadata> GetCommonParameters()
 
         private static List<string> GetCommonParameterSets(Dictionary<string, ParameterMetadata> commonParameters)
         {
-            Dictionary<string, object> parameterSetNames = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+            Dictionary<string, object> parameterSetNames = new(StringComparer.OrdinalIgnoreCase);
             foreach (ParameterMetadata parameter in commonParameters.Values)
             {
                 foreach (string parameterSetName in parameter.ParameterSets.Keys)
@@ -352,7 +352,7 @@ private static List<string> GetCommonParameterSets(Dictionary<string, ParameterM
                 parameterSetNames.Add(ParameterAttribute.AllParameterSets, null);
             }
 
-            List<string> result = new List<string>(parameterSetNames.Keys);
+            List<string> result = new(parameterSetNames.Keys);
             result.Sort(StringComparer.Ordinal); // to have a deterministic order of parameter sets (also means that Ordinal instead of OrdinalIgnoreCase is ok)
             return result;
         }
@@ -365,7 +365,7 @@ private string GetMethodParameterSet(StaticMethodMetadata staticMethod)
 
         private List<string> GetMethodParameterSets(StaticCmdletMetadata staticCmdlet)
         {
-            Dictionary<string, object> parameterSetNames = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+            Dictionary<string, object> parameterSetNames = new(StringComparer.OrdinalIgnoreCase);
 
             foreach (StaticMethodMetadata method in staticCmdlet.Method)
             {
@@ -386,7 +386,7 @@ private List<string> GetMethodParameterSets(StaticCmdletMetadata staticCmdlet)
             return new List<string>(parameterSetNames.Keys);
         }
 
-        private Dictionary<CommonMethodMetadata, int> _staticMethodMetadataToUniqueId = new Dictionary<CommonMethodMetadata, int>();
+        private Dictionary<CommonMethodMetadata, int> _staticMethodMetadataToUniqueId = new();
 
         private string GetMethodParameterSet(CommonMethodMetadata methodMetadata)
         {
@@ -404,7 +404,7 @@ private string GetMethodParameterSet(CommonMethodMetadata methodMetadata)
 
         private List<string> GetMethodParameterSets(InstanceCmdletMetadata instanceCmdlet)
         {
-            Dictionary<string, object> parameterSetNames = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+            Dictionary<string, object> parameterSetNames = new(StringComparer.OrdinalIgnoreCase);
 
             InstanceMethodMetadata method = instanceCmdlet.Method;
             string parameterSetName = GetMethodParameterSet(method);
@@ -436,7 +436,7 @@ private GetCmdletParameters GetGetCmdletParameters(InstanceCmdletMetadata instan
 
         private List<string> GetQueryParameterSets(InstanceCmdletMetadata instanceCmdlet)
         {
-            Dictionary<string, object> parameterSetNames = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
+            Dictionary<string, object> parameterSetNames = new(StringComparer.OrdinalIgnoreCase);
 
             var parameters = new List<CmdletParameterMetadataForGetCmdletParameter>();
             bool anyQueryParameters = false;
@@ -555,7 +555,7 @@ private ParameterMetadata GetParameter(
                 parameterName = objectModelParameterName;
             }
 
-            ParameterMetadata parameterMetadata = new ParameterMetadata(parameterName);
+            ParameterMetadata parameterMetadata = new(parameterName);
             parameterMetadata.ParameterType = GetDotNetType(parameterTypeMetadata);
             if (typeof(PSCredential).Equals(parameterMetadata.ParameterType))
             {
@@ -645,7 +645,7 @@ private ParameterMetadata GetParameter(
 
                 if (parameterCmdletization.ValidateSet != null)
                 {
-                    List<string> allowedValues = new List<string>();
+                    List<string> allowedValues = new();
                     foreach (string allowedValue in parameterCmdletization.ValidateSet)
                     {
                         allowedValues.Add(allowedValue);
@@ -803,9 +803,9 @@ private CommandMetadata GetCommandMetadata(CommonCmdletMetadata cmdletMetadata)
                 confirmImpact = (System.Management.Automation.ConfirmImpact)(int)cmdletMetadata.ConfirmImpact;
             }
 
-            Dictionary<string, ParameterMetadata> parameters = new Dictionary<string, ParameterMetadata>(StringComparer.OrdinalIgnoreCase);
+            Dictionary<string, ParameterMetadata> parameters = new(StringComparer.OrdinalIgnoreCase);
 
-            CommandMetadata commandMetadata = new CommandMetadata(
+            CommandMetadata commandMetadata = new(
                                    name: this.GetCmdletName(cmdletMetadata),
                             commandType: CommandTypes.Cmdlet,
                        isProxyForCmdlet: true,
@@ -829,7 +829,7 @@ private static string EscapeModuleNameForHelpComment(string name)
         {
             Dbg.Assert(name != null, "Caller should verify name != null");
 
-            StringBuilder result = new StringBuilder(name.Length);
+            StringBuilder result = new(name.Length);
             foreach (char c in name)
             {
                 if (("\"'`$#".IndexOf(c) == (-1)) &&
@@ -850,10 +850,10 @@ private static List<List<string>> GetCombinations(params IEnumerable<string>[] x
 
             if (x.Length == 1)
             {
-                List<List<string>> result = new List<List<string>>();
+                List<List<string>> result = new();
                 foreach (string s in x[0])
                 {
-                    List<string> subresult = new List<string>();
+                    List<string> subresult = new();
                     subresult.Add(s);
                     result.Add(subresult);
                 }
@@ -866,12 +866,12 @@ private static List<List<string>> GetCombinations(params IEnumerable<string>[] x
                 Array.Copy(x, 0, smallX, 0, smallX.Length);
                 List<List<string>> smallResult = GetCombinations(smallX);
 
-                List<List<string>> result = new List<List<string>>();
+                List<List<string>> result = new();
                 foreach (List<string> smallSubresult in smallResult)
                 {
                     foreach (string s in x[x.Length - 1])
                     {
-                        List<string> newsubresult = new List<string>(smallSubresult);
+                        List<string> newsubresult = new(smallSubresult);
                         newsubresult.Add(s);
                         result.Add(newsubresult);
                     }
@@ -941,7 +941,7 @@ private static void MultiplyParameterSets(
 
             foreach (ParameterMetadata parameter in parameters.Values)
             {
-                List<KeyValuePair<string, ParameterSetMetadata>> oldParameterSets = new List<KeyValuePair<string, ParameterSetMetadata>>(parameter.ParameterSets);
+                List<KeyValuePair<string, ParameterSetMetadata>> oldParameterSets = new(parameter.ParameterSets);
 
                 parameter.ParameterSets.Clear();
                 foreach (KeyValuePair<string, ParameterSetMetadata> oldParameterSet in oldParameterSets)
@@ -964,7 +964,7 @@ private static IEnumerable<string> MultiplyParameterSets(
             string parameterSetNameTemplate, // {0} is the original parameter set, other ones are taken from the otherParameterSets array
             params IEnumerable<string>[] otherParameterSets)
         {
-            List<string> result = new List<string>();
+            List<string> result = new();
 
             List<List<string>> combinations = GetCombinations(otherParameterSets);
             foreach (List<string> combination in combinations)
@@ -1086,7 +1086,7 @@ private static void GenerateSingleMethodParameterProcessing(
                     prefix);
             }
 
-            if (MethodParameterBindings.In == (methodParameterBindings & MethodParameterBindings.In))
+            if ((methodParameterBindings & MethodParameterBindings.In) == MethodParameterBindings.In)
             {
                 Dbg.Assert(cmdletParameterName != null, "Called should verify cmdletParameterName!=null for 'in' parameters");
 
@@ -1114,7 +1114,7 @@ private static void GenerateSingleMethodParameterProcessing(
                 CodeGeneration.EscapeSingleQuotedStringContent(cmdletParameterTypeName),
                 CodeGeneration.EscapeSingleQuotedStringContent(methodParameterBindings.ToString()));
 
-            if (MethodParameterBindings.In == (methodParameterBindings & MethodParameterBindings.In))
+            if ((methodParameterBindings & MethodParameterBindings.In) == MethodParameterBindings.In)
             {
                 output.WriteLine("{0}}}", prefix);
             }
@@ -1139,8 +1139,8 @@ private void GenerateMethodParametersProcessing(
             out string outputTypeAttributeDeclaration)
         {
             methodParameters = new Dictionary<string, ParameterMetadata>(StringComparer.OrdinalIgnoreCase);
-            StringBuilder outputTypeAttributeDeclarationBuilder = new StringBuilder();
-            StringWriter output = new StringWriter(CultureInfo.InvariantCulture);
+            StringBuilder outputTypeAttributeDeclarationBuilder = new();
+            StringWriter output = new(CultureInfo.InvariantCulture);
 
             output.WriteLine("      $__cmdletization_methodParameters = [System.Collections.Generic.List[Microsoft.PowerShell.Cmdletization.MethodParameter]]::new()");
             output.WriteLine();
@@ -1170,8 +1170,8 @@ string parameterSetName in
                     output.WriteLine(") -contains $_ } {");
                 }
 
-                List<Type> typesOfOutParameters = new List<Type>();
-                List<string> etsTypesOfOutParameters = new List<string>();
+                List<Type> typesOfOutParameters = new();
+                List<string> etsTypesOfOutParameters = new();
                 if (method.Parameters != null)
                 {
                     foreach (StaticMethodParameterMetadata methodParameter in method.Parameters)
@@ -1222,7 +1222,7 @@ string parameterSetName in
                             methodParameter.ParameterName,
                             methodParameterBindings);
 
-                        if (MethodParameterBindings.Out == (methodParameterBindings & MethodParameterBindings.Out))
+                        if ((methodParameterBindings & MethodParameterBindings.Out) == MethodParameterBindings.Out)
                         {
                             typesOfOutParameters.Add(dotNetTypeOfParameter);
                             etsTypesOfOutParameters.Add(methodParameter.Type.ETSType);
@@ -1246,7 +1246,7 @@ string parameterSetName in
                             CodeGeneration.EscapeSingleQuotedStringContent(method.ReturnValue.Type.ETSType));
                     }
 
-                    if (MethodParameterBindings.Out == (methodParameterBindings & MethodParameterBindings.Out))
+                    if ((methodParameterBindings & MethodParameterBindings.Out) == MethodParameterBindings.Out)
                     {
                         typesOfOutParameters.Add(dotNetTypeOfParameter);
                         etsTypesOfOutParameters.Add(method.ReturnValue.Type.ETSType);
@@ -1303,7 +1303,7 @@ private void GenerateMethodParametersProcessing(
         {
             methodParameters = new Dictionary<string, ParameterMetadata>(StringComparer.OrdinalIgnoreCase);
             outputTypeAttributeDeclaration = string.Empty;
-            StringWriter output = new StringWriter(CultureInfo.InvariantCulture);
+            StringWriter output = new(CultureInfo.InvariantCulture);
 
             output.WriteLine("    $__cmdletization_methodParameters = [System.Collections.Generic.List[Microsoft.PowerShell.Cmdletization.MethodParameter]]::new()");
             output.WriteLine("    switch -exact ($PSCmdlet.ParameterSetName) { ");
@@ -1320,8 +1320,8 @@ private void GenerateMethodParametersProcessing(
 
             output.WriteLine(") -contains $_ } {");
 
-            List<Type> typesOfOutParameters = new List<Type>();
-            List<string> etsTypesOfOutParameters = new List<string>();
+            List<Type> typesOfOutParameters = new();
+            List<string> etsTypesOfOutParameters = new();
             if (method.Parameters != null)
             {
                 foreach (InstanceMethodParameterMetadata methodParameter in method.Parameters)
@@ -1363,7 +1363,7 @@ private void GenerateMethodParametersProcessing(
                         methodParameter.ParameterName,
                         methodParameterBindings);
 
-                    if (MethodParameterBindings.Out == (methodParameterBindings & MethodParameterBindings.Out))
+                    if ((methodParameterBindings & MethodParameterBindings.Out) == MethodParameterBindings.Out)
                     {
                         typesOfOutParameters.Add(dotNetTypeOfParameter);
                         etsTypesOfOutParameters.Add(methodParameter.Type.ETSType);
@@ -1387,7 +1387,7 @@ private void GenerateMethodParametersProcessing(
                         CodeGeneration.EscapeSingleQuotedStringContent(method.ReturnValue.Type.ETSType));
                 }
 
-                if (MethodParameterBindings.Out == (methodParameterBindings & MethodParameterBindings.Out))
+                if ((methodParameterBindings & MethodParameterBindings.Out) == MethodParameterBindings.Out)
                 {
                     typesOfOutParameters.Add(dotNetTypeOfParameter);
                     etsTypesOfOutParameters.Add(method.ReturnValue.Type.ETSType);
@@ -1444,7 +1444,7 @@ private void GenerateMethodParametersProcessing(
             }
         }
 
-        private void GenerateIfBoundParameter(
+        private static void GenerateIfBoundParameter(
             IEnumerable<string> commonParameterSets,
             IEnumerable<string> methodParameterSets,
             ParameterMetadata cmdletParameterMetadata,
@@ -1615,7 +1615,7 @@ private void GenerateQueryParametersProcessing(
             out Dictionary<string, ParameterMetadata> queryParameters)
         {
             queryParameters = new Dictionary<string, ParameterMetadata>(StringComparer.OrdinalIgnoreCase);
-            StringWriter output = new StringWriter(CultureInfo.InvariantCulture);
+            StringWriter output = new(CultureInfo.InvariantCulture);
 
             output.WriteLine("    $__cmdletization_queryBuilder = $__cmdletization_objectModelWrapper.GetQueryBuilder()");
 
@@ -1725,7 +1725,7 @@ private void GenerateQueryParametersProcessing(
 
             if (instanceCmdlet != null)
             {
-                ParameterMetadata inputObjectParameter = new ParameterMetadata("InputObject", _objectInstanceType.MakeArrayType());
+                ParameterMetadata inputObjectParameter = new("InputObject", _objectInstanceType.MakeArrayType());
 
                 ParameterSetMetadata.ParameterFlags inputObjectFlags = ParameterSetMetadata.ParameterFlags.ValueFromPipeline;
                 if (queryParameters.Count > 0)
@@ -1761,10 +1761,10 @@ private void GenerateQueryParametersProcessing(
 
                 inputObjectParameter.Attributes.Add(new ValidateNotNullAttribute());
                 inputObjectParameter.ParameterSets.Clear();
-                ParameterSetMetadata inputObjectPSet = new ParameterSetMetadata(
+                ParameterSetMetadata inputObjectPSet = new(
                     int.MinValue, // non-positional
                     inputObjectFlags,
-                    null); // no help message
+                    helpMessage: null);
                 inputObjectParameter.ParameterSets.Add(ScriptWriter.InputObjectQueryParameterSetName, inputObjectPSet);
                 queryParameters.Add(inputObjectParameter.Name, inputObjectParameter);
             }
@@ -1859,9 +1859,9 @@ private void GenerateQueryParametersProcessing(
 
         private string GetHelpDirectiveForExternalHelp()
         {
-            StringBuilder output = new StringBuilder();
+            StringBuilder output = new();
 
-            if (GenerationOptions.HelpXml == (_generationOptions & GenerationOptions.HelpXml))
+            if ((_generationOptions & GenerationOptions.HelpXml) == GenerationOptions.HelpXml)
             {
                 output.AppendFormat(
                     CultureInfo.InvariantCulture,
@@ -1874,7 +1874,7 @@ private string GetHelpDirectiveForExternalHelp()
 
         private void WriteCmdlet(TextWriter output, StaticCmdletMetadata staticCmdlet)
         {
-            string attributeString = this.GetCmdletAttributes(staticCmdlet.CmdletMetadata);
+            string attributeString = GetCmdletAttributes(staticCmdlet.CmdletMetadata);
 
             Dictionary<string, ParameterMetadata> commonParameters = this.GetCommonParameters();
             List<string> commonParameterSets = GetCommonParameterSets(commonParameters);
@@ -1948,9 +1948,9 @@ private static void AddPassThruParameter(IDictionary<string, ParameterMetadata>
 
             if (!outParametersArePresent)
             {
-                ParameterMetadata passThruParameter = new ParameterMetadata("PassThru", typeof(SwitchParameter));
+                ParameterMetadata passThruParameter = new("PassThru", typeof(SwitchParameter));
                 passThruParameter.ParameterSets.Clear();
-                ParameterSetMetadata passThruPSet = new ParameterSetMetadata(int.MinValue, 0, null);
+                ParameterSetMetadata passThruPSet = new(int.MinValue, 0, null);
                 passThruParameter.ParameterSets.Add(ParameterAttribute.AllParameterSets, passThruPSet);
 
                 commonParameters.Add(passThruParameter.Name, passThruParameter);
@@ -1959,7 +1959,7 @@ private static void AddPassThruParameter(IDictionary<string, ParameterMetadata>
 
         private void WriteCmdlet(TextWriter output, InstanceCmdletMetadata instanceCmdlet)
         {
-            string attributeString = this.GetCmdletAttributes(instanceCmdlet.CmdletMetadata);
+            string attributeString = GetCmdletAttributes(instanceCmdlet.CmdletMetadata);
 
             Dictionary<string, ParameterMetadata> commonParameters = this.GetCommonParameters();
             List<string> commonParameterSets = GetCommonParameterSets(commonParameters);
@@ -2017,7 +2017,7 @@ private void WriteCmdlet(TextWriter output, InstanceCmdletMetadata instanceCmdle
 
         private string GetOutputAttributeForGetCmdlet()
         {
-            StringBuilder result = new StringBuilder();
+            StringBuilder result = new();
             result.AppendFormat(
                 CultureInfo.InvariantCulture,
                 "[OutputType([{0}])]",
@@ -2055,7 +2055,7 @@ private void WriteGetCmdlet(TextWriter output)
         {
             Dictionary<string, ParameterMetadata> commonParameters = this.GetCommonParameters();
             List<string> commonParameterSets = GetCommonParameterSets(commonParameters);
-            List<string> methodParameterSets = new List<string>();
+            List<string> methodParameterSets = new();
             methodParameterSets.Add(string.Empty);
             List<string> queryParameterSets = GetQueryParameterSets(null);
 
@@ -2066,7 +2066,7 @@ private void WriteGetCmdlet(TextWriter output)
             CommonCmdletMetadata cmdletMetadata = this.GetGetCmdletMetadata();
             Dbg.Assert(cmdletMetadata != null, "xsd should ensure that cmdlet metadata element is always present");
             CommandMetadata commandMetadata = this.GetCommandMetadata(cmdletMetadata);
-            string attributeString = this.GetCmdletAttributes(cmdletMetadata);
+            string attributeString = GetCmdletAttributes(cmdletMetadata);
 
             GetCmdletParameters getCmdletParameters = this.GetGetCmdletParameters(null);
             if (!string.IsNullOrEmpty(getCmdletParameters.DefaultCmdletParameterSet))
@@ -2100,7 +2100,7 @@ private void WriteGetCmdlet(TextWriter output)
                 /* 1 */ CodeGeneration.EscapeSingleQuotedStringContent(commandMetadata.Name));
         }
 
-        private static object s_enumCompilationLock = new object();
+        private static object s_enumCompilationLock = new();
 
         private static void CompileEnum(EnumMetadataEnum enumMetadata)
         {
@@ -2176,11 +2176,11 @@ internal void PopulatePSModuleInfo(PSModuleInfo moduleInfo)
             moduleInfo.SetModuleType(ModuleType.Cim);
             moduleInfo.SetVersion(new Version(_cmdletizationMetadata.Class.Version));
 
-            Hashtable cmdletizationData = new Hashtable(StringComparer.OrdinalIgnoreCase);
+            Hashtable cmdletizationData = new(StringComparer.OrdinalIgnoreCase);
             cmdletizationData.Add(PrivateDataKey_ClassName, _cmdletizationMetadata.Class.ClassName);
             cmdletizationData.Add(PrivateDataKey_ObjectModelWrapper, _objectModelWrapper);
 
-            Hashtable privateData = new Hashtable(StringComparer.OrdinalIgnoreCase);
+            Hashtable privateData = new(StringComparer.OrdinalIgnoreCase);
             privateData.Add(PrivateDataKey_CmdletsOverObjects, cmdletizationData);
             moduleInfo.PrivateData = privateData;
         }
diff --git a/src/System.Management.Automation/cimSupport/cmdletization/cim/WildcardPatternToCimQueryParser.cs b/src/System.Management.Automation/cimSupport/cmdletization/cim/WildcardPatternToCimQueryParser.cs
index 4ce8a854487..48a47da7289 100644
--- a/src/System.Management.Automation/cimSupport/cmdletization/cim/WildcardPatternToCimQueryParser.cs
+++ b/src/System.Management.Automation/cimSupport/cmdletization/cim/WildcardPatternToCimQueryParser.cs
@@ -20,7 +20,7 @@ namespace Microsoft.PowerShell.Cmdletization.Cim
     /// </remarks>
     internal class WildcardPatternToCimQueryParser : WildcardPatternParser
     {
-        private readonly StringBuilder _result = new StringBuilder();
+        private readonly StringBuilder _result = new();
         private bool _needClientSideFiltering;
 
         protected override void AppendLiteralCharacter(char c)
@@ -79,13 +79,13 @@ protected override void AppendCharacterRangeToBracketExpression(char startOfChar
             // 93 = ]
             // 94 = ^
             // 95 = _
-            if ((91 <= startOfCharacterRange) && (startOfCharacterRange <= 94))
+            if ((startOfCharacterRange >= 91) && (startOfCharacterRange <= 94))
             {
                 startOfCharacterRange = (char)90;
                 _needClientSideFiltering = true;
             }
 
-            if ((91 <= endOfCharacterRange) && (endOfCharacterRange <= 94))
+            if ((endOfCharacterRange >= 91) && (endOfCharacterRange <= 94))
             {
                 endOfCharacterRange = (char)95;
                 _needClientSideFiltering = true;
diff --git a/src/System.Management.Automation/cimSupport/other/ciminstancetypeadapter.cs b/src/System.Management.Automation/cimSupport/other/ciminstancetypeadapter.cs
index 81ccb73133b..f9aa9f9b73c 100644
--- a/src/System.Management.Automation/cimSupport/other/ciminstancetypeadapter.cs
+++ b/src/System.Management.Automation/cimSupport/other/ciminstancetypeadapter.cs
@@ -28,7 +28,7 @@ public sealed class CimInstanceAdapter : PSPropertyAdapter
     {
         private static PSAdaptedProperty GetCimPropertyAdapter(CimProperty property, object baseObject, string propertyName)
         {
-            PSAdaptedProperty propertyToAdd = new PSAdaptedProperty(propertyName, property);
+            PSAdaptedProperty propertyToAdd = new(propertyName, property);
             propertyToAdd.baseObject = baseObject;
             // propertyToAdd.adapter = this;
             return propertyToAdd;
@@ -50,7 +50,7 @@ private static PSAdaptedProperty GetCimPropertyAdapter(CimProperty property, obj
 
         private static PSAdaptedProperty GetPSComputerNameAdapter(CimInstance cimInstance)
         {
-            PSAdaptedProperty psComputerNameProperty = new PSAdaptedProperty(RemotingConstants.ComputerNameNoteProperty, cimInstance);
+            PSAdaptedProperty psComputerNameProperty = new(RemotingConstants.ComputerNameNoteProperty, cimInstance);
             psComputerNameProperty.baseObject = cimInstance;
             // psComputerNameProperty.adapter = this;
             return psComputerNameProperty;
@@ -73,7 +73,7 @@ public override System.Collections.ObjectModel.Collection<PSAdaptedProperty> Get
                 throw new PSInvalidOperationException(msg);
             }
 
-            Collection<PSAdaptedProperty> result = new Collection<PSAdaptedProperty>();
+            Collection<PSAdaptedProperty> result = new();
 
             if (cimInstance.CimInstanceProperties != null)
             {
@@ -135,7 +135,7 @@ public override PSAdaptedProperty GetProperty(object baseObject, string property
             return null;
         }
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         public override PSAdaptedProperty GetFirstPropertyOrDefault(object baseObject, MemberNamePredicate predicate)
         {
             if (predicate == null)
@@ -242,7 +242,7 @@ public override object GetPropertyValue(PSAdaptedProperty adaptedProperty)
             throw new ArgumentNullException(nameof(adaptedProperty));
         }
 
-        private void AddTypeNameHierarchy(IList<string> typeNamesWithNamespace, IList<string> typeNamesWithoutNamespace, string namespaceName, string className)
+        private static void AddTypeNameHierarchy(IList<string> typeNamesWithNamespace, IList<string> typeNamesWithoutNamespace, string namespaceName, string className)
         {
             if (!string.IsNullOrEmpty(namespaceName))
             {
@@ -258,9 +258,9 @@ private void AddTypeNameHierarchy(IList<string> typeNamesWithNamespace, IList<st
                                      className));
         }
 
-        private List<CimClass> GetInheritanceChain(CimInstance cimInstance)
+        private static List<CimClass> GetInheritanceChain(CimInstance cimInstance)
         {
-            List<CimClass> inheritanceChain = new List<CimClass>();
+            List<CimClass> inheritanceChain = new();
             CimClass cimClass = cimInstance.CimClass;
             Dbg.Assert(cimClass != null, "CimInstance should always have ClassDecl");
             while (cimClass != null)
@@ -366,7 +366,7 @@ public override bool IsSettable(PSAdaptedProperty adaptedProperty)
                 return false;
             }
 
-            bool isReadOnly = (CimFlags.ReadOnly == (cimProperty.Flags & CimFlags.ReadOnly));
+            bool isReadOnly = ((cimProperty.Flags & CimFlags.ReadOnly) == CimFlags.ReadOnly);
             bool isSettable = !isReadOnly;
             return isSettable;
         }
diff --git a/src/System.Management.Automation/engine/ArgumentTypeConverterAttribute.cs b/src/System.Management.Automation/engine/ArgumentTypeConverterAttribute.cs
index e4337ab26dc..a2c2cd8321e 100644
--- a/src/System.Management.Automation/engine/ArgumentTypeConverterAttribute.cs
+++ b/src/System.Management.Automation/engine/ArgumentTypeConverterAttribute.cs
@@ -31,9 +31,7 @@ internal Type TargetType
         {
             get
             {
-                return _convertTypes == null
-                           ? null
-                           : _convertTypes.LastOrDefault();
+                return _convertTypes?.LastOrDefault();
             }
         }
 
diff --git a/src/System.Management.Automation/engine/Attributes.cs b/src/System.Management.Automation/engine/Attributes.cs
index 347eb4c7cd5..19a7aa881e7 100644
--- a/src/System.Management.Automation/engine/Attributes.cs
+++ b/src/System.Management.Automation/engine/Attributes.cs
@@ -507,7 +507,7 @@ public OutputTypeAttribute(params string[] type)
         [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
         public string[] ParameterSetName
         {
-            get => _parameterSetName ?? (_parameterSetName = new[] { ParameterAttribute.AllParameterSets });
+            get => _parameterSetName ??= new[] { ParameterAttribute.AllParameterSets };
 
             set => _parameterSetName = value;
         }
@@ -607,6 +607,7 @@ public ParameterAttribute(string experimentName, ExperimentAction experimentActi
         public ExperimentAction ExperimentAction { get; }
 
         internal bool ToHide => EffectiveAction == ExperimentAction.Hide;
+
         internal bool ToShow => EffectiveAction == ExperimentAction.Show;
 
         /// <summary>
@@ -1082,7 +1083,7 @@ public ValidateRangeAttribute(ValidateRangeKind kind) : base()
             _rangeKind = kind;
         }
 
-        private void ValidateRange(object element, ValidateRangeKind rangeKind)
+        private static void ValidateRange(object element, ValidateRangeKind rangeKind)
         {
             Type commonType = GetCommonType(typeof(int), element.GetType());
             if (commonType == null)
@@ -1092,7 +1093,7 @@ private void ValidateRange(object element, ValidateRangeKind rangeKind)
                     innerException: null,
                     Metadata.ValidateRangeElementType,
                     element.GetType().Name,
-                    typeof(int).Name);
+                    nameof(Int32));
             }
 
             object resultValue;
@@ -1618,6 +1619,7 @@ public sealed class ValidateSetAttribute : ValidateEnumeratedArgumentsAttribute
         /// <summary>
         /// Gets the valid values in the set.
         /// </summary>
+        [SuppressMessage("Design", "CA1065:Do not raise exceptions in unexpected locations", Justification = "<Pending>")]
         public IList<string> ValidValues
         {
             get
diff --git a/src/System.Management.Automation/engine/CmdletInfo.cs b/src/System.Management.Automation/engine/CmdletInfo.cs
index 43e255b1549..05b7548f9fc 100644
--- a/src/System.Management.Automation/engine/CmdletInfo.cs
+++ b/src/System.Management.Automation/engine/CmdletInfo.cs
@@ -535,8 +535,7 @@ internal override CommandMetadata CommandMetadata
         {
             get
             {
-                return _cmdletMetadata ??
-                       (_cmdletMetadata = CommandMetadata.Get(this.Name, this.ImplementingType, Context));
+                return _cmdletMetadata ??= CommandMetadata.Get(this.Name, this.ImplementingType, Context);
             }
         }
 
@@ -548,7 +547,7 @@ internal override bool ImplementsDynamicParameters
             {
                 if (ImplementingType != null)
                 {
-                    return (ImplementingType.GetInterface(typeof(IDynamicParameters).Name, true) != null);
+                    return (ImplementingType.GetInterface(nameof(IDynamicParameters), true) != null);
                 }
                 else
                 {
diff --git a/src/System.Management.Automation/engine/CmdletParameterBinderController.cs b/src/System.Management.Automation/engine/CmdletParameterBinderController.cs
index cbfa29504aa..440b9ead537 100644
--- a/src/System.Management.Automation/engine/CmdletParameterBinderController.cs
+++ b/src/System.Management.Automation/engine/CmdletParameterBinderController.cs
@@ -2450,7 +2450,7 @@ private void IgnoreOtherMandatoryParameterSets(uint otherMandatorySetsToBeIgnore
             }
         }
 
-        private uint NewParameterSetPromptingData(
+        private static uint NewParameterSetPromptingData(
             Dictionary<uint, ParameterSetPromptingData> promptingData,
             MergedCompiledCommandParameter parameter,
             ParameterSetSpecificMetadata parameterSetMetadata,
@@ -3927,8 +3927,7 @@ private HashSet<string> BoundObsoleteParameterNames
         {
             get
             {
-                return _boundObsoleteParameterNames ??
-                       (_boundObsoleteParameterNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase));
+                return _boundObsoleteParameterNames ??= new HashSet<string>(StringComparer.OrdinalIgnoreCase);
             }
         }
 
@@ -4223,7 +4222,7 @@ private void RestoreDefaultParameterValues(IEnumerable<MergedCompiledCommandPara
 
                     if (error != null)
                     {
-                        Type specifiedType = (argumentToBind.ArgumentValue == null) ? null : argumentToBind.ArgumentValue.GetType();
+                        Type specifiedType = argumentToBind.ArgumentValue?.GetType();
                         ParameterBindingException bindingException =
                             new ParameterBindingException(
                                 error,
diff --git a/src/System.Management.Automation/engine/ComInterop/ComEventDesc.cs b/src/System.Management.Automation/engine/ComInterop/ComEventDesc.cs
index 13121b69698..961532a8a5e 100644
--- 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/CommandBase.cs b/src/System.Management.Automation/engine/CommandBase.cs
index 995009de639..3f477895bb5 100644
--- a/src/System.Management.Automation/engine/CommandBase.cs
+++ b/src/System.Management.Automation/engine/CommandBase.cs
@@ -76,7 +76,7 @@ internal InternalCommand()
         /// <value>The invocation object for this command.</value>
         internal InvocationInfo MyInvocation
         {
-            get { return _myInvocation ?? (_myInvocation = new InvocationInfo(this)); }
+            get { return _myInvocation ??= new InvocationInfo(this); }
         }
 
         /// <summary>
@@ -470,7 +470,7 @@ public ProviderIntrinsics InvokeProvider
             {
                 using (PSTransactionManager.GetEngineProtectionScope())
                 {
-                    return _invokeProvider ?? (_invokeProvider = new ProviderIntrinsics(this));
+                    return _invokeProvider ??= new ProviderIntrinsics(this);
                 }
             }
         }
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CommandCompletion.cs b/src/System.Management.Automation/engine/CommandCompletion/CommandCompletion.cs
index 8b124194881..4d89d87e51c 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CommandCompletion.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CommandCompletion.cs
@@ -157,7 +157,7 @@ public static CommandCompletion CompleteInput(string input, int cursorIndex, Has
             }
 
             // If we are in a debugger stop, let the debugger do the command completion.
-            var debugger = (powershell.Runspace != null) ? powershell.Runspace.Debugger : null;
+            var debugger = powershell.Runspace?.Debugger;
             if ((debugger != null) && debugger.InBreakpoint)
             {
                 return CompleteInputInDebugger(input, cursorIndex, options, debugger);
@@ -236,7 +236,7 @@ public static CommandCompletion CompleteInput(Ast ast, Token[] tokens, IScriptPo
             }
 
             // If we are in a debugger stop, let the debugger do the command completion.
-            var debugger = (powershell.Runspace != null) ? powershell.Runspace.Debugger : null;
+            var debugger = powershell.Runspace?.Debugger;
             if ((debugger != null) && debugger.InBreakpoint)
             {
                 return CompleteInputInDebugger(ast, tokens, cursorPosition, options, debugger);
@@ -740,7 +740,7 @@ private static bool PSv2IsCommandLikeCmdlet(string lastWord, out bool isSnapinSp
                 return false;
             }
 
-            private struct CommandAndName
+            private readonly struct CommandAndName
             {
                 internal readonly PSObject Command;
                 internal readonly PSSnapinQualifiedName CommandName;
@@ -1067,7 +1067,7 @@ private static bool PSv2ShouldFullyQualifyPathsPath(PowerShellExecutionHelper he
                 return isAbsolute;
             }
 
-            private struct PathItemAndConvertedPath
+            private readonly struct PathItemAndConvertedPath
             {
                 internal readonly string Path;
                 internal readonly PSObject Item;
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
index 9f4b3565115..95b26ff6907 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionAnalysis.cs
@@ -20,18 +20,29 @@ internal class CompletionContext
         // This is how we can tell if we're trying to complete part of something (like a member)
         // or complete an argument, where TokenBeforeCursor could be a parameter name.
         internal Token TokenAtCursor { get; set; }
+
         internal Token TokenBeforeCursor { get; set; }
+
         internal IScriptPosition CursorPosition { get; set; }
 
         internal PowerShellExecutionHelper Helper { get; set; }
+
         internal Hashtable Options { get; set; }
+
         internal Dictionary<string, ScriptBlock> CustomArgumentCompleters { get; set; }
+
         internal Dictionary<string, ScriptBlock> NativeArgumentCompleters { get; set; }
+
         internal string WordToComplete { get; set; }
+
         internal int ReplacementIndex { get; set; }
+
         internal int ReplacementLength { get; set; }
+
         internal ExecutionContext ExecutionContext { get; set; }
+
         internal PseudoBindingInfo PseudoBindingInfo { get; set; }
+
         internal TypeInferenceContext TypeInferenceContext { get; set; }
 
         internal bool GetOption(string option, bool @default)
@@ -925,7 +936,7 @@ internal List<CompletionResult> GetResultHelper(CompletionContext completionCont
         }
 
         // Helper method to auto complete hashtable key
-        private List<CompletionResult> GetResultForHashtable(CompletionContext completionContext)
+        private static List<CompletionResult> GetResultForHashtable(CompletionContext completionContext)
         {
             var lastAst = completionContext.RelatedAsts.Last();
             HashtableAst tempHashtableAst = null;
@@ -986,7 +997,7 @@ private List<CompletionResult> GetResultForHashtable(CompletionContext completio
         }
 
         // Helper method to look for an incomplete assignment pair in hash table.
-        private bool CheckForPendingAssignment(HashtableAst hashTableAst)
+        private static bool CheckForPendingAssignment(HashtableAst hashTableAst)
         {
             foreach (var keyValue in hashTableAst.KeyValuePairs)
             {
@@ -1054,7 +1065,7 @@ private static string GetFirstLineSubString(string stringToComplete, out bool ha
             return stringToComplete;
         }
 
-        private Tuple<ExpressionAst, StatementAst> GetHashEntryContainsCursor(
+        private static Tuple<ExpressionAst, StatementAst> GetHashEntryContainsCursor(
             IScriptPosition cursor,
             HashtableAst hashTableAst,
             bool isCursorInString)
@@ -1345,7 +1356,7 @@ private static List<CompletionResult> GetResultForEnum(
             return GetMatchedResults(allNames, completionContext);
         }
 
-        private List<CompletionResult> GetResultForEnumPropertyValueOfDSCResource(
+        private static List<CompletionResult> GetResultForEnumPropertyValueOfDSCResource(
             CompletionContext completionContext,
             string stringToComplete,
             ref int replacementIndex,
@@ -1632,7 +1643,7 @@ private List<CompletionResult> GetResultForString(CompletionContext completionCo
         /// <param name="ast"></param>
         /// <param name="keywordAst"></param>
         /// <returns></returns>
-        private ConfigurationDefinitionAst GetAncestorConfigurationAstAndKeywordAst(
+        private static ConfigurationDefinitionAst GetAncestorConfigurationAstAndKeywordAst(
             IScriptPosition cursorPosition,
             Ast ast,
             out DynamicKeywordStatementAst keywordAst)
@@ -1668,7 +1679,7 @@ private ConfigurationDefinitionAst GetAncestorConfigurationAstAndKeywordAst(
         /// <param name="keywordAst"></param>
         /// <param name="matched"></param>
         /// <returns></returns>
-        private List<CompletionResult> GetResultForIdentifierInConfiguration(
+        private static List<CompletionResult> GetResultForIdentifierInConfiguration(
             CompletionContext completionContext,
             ConfigurationDefinitionAst configureAst,
             DynamicKeywordStatementAst keywordAst,
@@ -2082,7 +2093,7 @@ private List<CompletionResult> GetResultForIdentifier(CompletionContext completi
             return result;
         }
 
-        private List<CompletionResult> GetResultForAttributeArgument(CompletionContext completionContext, ref int replacementIndex, ref int replacementLength)
+        private static List<CompletionResult> GetResultForAttributeArgument(CompletionContext completionContext, ref int replacementIndex, ref int replacementLength)
         {
             // Attribute member arguments
             Type attributeType = null;
diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
index e7c8ea0be9a..853b79e7843 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs
@@ -511,7 +511,7 @@ internal static List<CompletionResult> CompleteCommandParameter(CompletionContex
                 && !string.IsNullOrWhiteSpace(context.WordToComplete) && context.WordToComplete.StartsWith('-'))
             {
                 var lastAst = context.RelatedAsts.Last();
-                var wordToMatch = string.Concat(context.WordToComplete.AsSpan().Slice(1), "*");
+                var wordToMatch = string.Concat(context.WordToComplete.AsSpan(1), "*");
                 var pattern = WildcardPattern.Get(wordToMatch, WildcardOptions.IgnoreCase);
                 var parameterNames = keywordAst.CommandElements.Where(ast => ast is CommandParameterAst).Select(ast => (ast as CommandParameterAst).ParameterName);
                 foreach (var parameterName in s_parameterNamesOfImportDSCResource)
@@ -4086,7 +4086,9 @@ private static ArgumentLocation FindTargetArgumentLocation(Collection<AstParamet
         private sealed class ArgumentLocation
         {
             internal bool IsPositional { get; set; }
+
             internal int Position { get; set; }
+
             internal AstParameterArgumentPair Argument { get; set; }
         }
 
@@ -4705,7 +4707,7 @@ internal static List<CompletionResult> CompleteVariable(CompletionContext contex
                 provider = wordToComplete.Substring(0, colon + 1);
                 if (s_variableScopes.Contains(provider, StringComparer.OrdinalIgnoreCase))
                 {
-                    pattern = string.Concat("variable:", wordToComplete.AsSpan().Slice(colon + 1), "*");
+                    pattern = string.Concat("variable:", wordToComplete.AsSpan(colon + 1), "*");
                 }
                 else
                 {
@@ -4999,6 +5001,7 @@ internal static List<CompletionResult> CompleteComment(CompletionContext context
                     new Tuple<string, string>("Where", "Where({ expression } [, mode [, numberToReturn]])"),
                     new Tuple<string, string>("ForEach", "ForEach(expression [, arguments...])")
                 };
+
         // List of DSC collection-value variables
         private static readonly HashSet<string> s_dscCollectionVariables =
             new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "SelectedNodes", "AllNodes" };
@@ -5367,7 +5370,7 @@ private static string GetCimPropertyToString(CimPropertyDeclaration cimProperty)
                     break;
             }
 
-            bool isReadOnly = (CimFlags.ReadOnly == (cimProperty.Flags & CimFlags.ReadOnly));
+            bool isReadOnly = ((cimProperty.Flags & CimFlags.ReadOnly) == CimFlags.ReadOnly);
             return type + " " + cimProperty.Name + " { get; " + (isReadOnly ? "}" : "set; }");
         }
 
@@ -5440,6 +5443,7 @@ private static bool IsConstructor(object member)
         private abstract class TypeCompletionBase
         {
             internal abstract CompletionResult GetCompletionResult(string keyMatched, string prefix, string suffix);
+
             internal abstract CompletionResult GetCompletionResult(string keyMatched, string prefix, string suffix, string namespaceToRemove);
 
             internal static string RemoveBackTick(string typeName)
@@ -6092,7 +6096,7 @@ internal static List<CompletionResult> CompleteHelpTopics(CompletionContext cont
 
                 foreach (var dir in searchPaths)
                 {
-                    foreach (var file in Directory.GetFiles(dir))
+                    foreach (var file in Directory.EnumerateFiles(dir))
                     {
                         if (wildcardPattern.IsMatch(Path.GetFileName(file)))
                         {
@@ -6956,6 +6960,7 @@ internal static bool TrySafeEval(ExpressionAst ast, ExecutionContext executionCo
         public object VisitDoUntilStatement(DoUntilStatementAst doUntilStatementAst) { return false; }
 
         public object VisitAssignmentStatement(AssignmentStatementAst assignmentStatementAst) { return false; }
+
         // REVIEW: we could relax this to allow specific commands
         public object VisitCommand(CommandAst commandAst) { return false; }
 
diff --git a/src/System.Management.Automation/engine/CommandCompletion/ExtensibleCompletion.cs b/src/System.Management.Automation/engine/CommandCompletion/ExtensibleCompletion.cs
index 6905e39b165..777fc6c16f4 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/ExtensibleCompletion.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/ExtensibleCompletion.cs
@@ -58,6 +58,7 @@ public ArgumentCompleterAttribute(ScriptBlock scriptBlock)
     /// <summary>
     /// A type specified by the <see cref="ArgumentCompleterAttribute"/> must implement this interface.
     /// </summary>
+#nullable enable
     public interface IArgumentCompleter
     {
         /// <summary>
@@ -82,6 +83,7 @@ IEnumerable<CompletionResult> CompleteArgument(
             CommandAst commandAst,
             IDictionary fakeBoundParameters);
     }
+#nullable restore
 
     /// <summary>
     /// </summary>
@@ -129,7 +131,7 @@ protected override void EndProcessing()
 
             if (CommandName == null || CommandName.Length == 0)
             {
-                CommandName = new[] { "" };
+                CommandName = new[] { string.Empty };
             }
 
             for (int i = 0; i < CommandName.Length; i++)
diff --git a/src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs b/src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs
index 2872066e74d..c86fc34cfaf 100644
--- a/src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs
+++ b/src/System.Management.Automation/engine/CommandCompletion/PseudoParameterBinder.cs
@@ -201,9 +201,9 @@ internal AstPair(CommandParameterAst parameterAst, ExpressionAst argumentAst)
             ParameterArgumentType = AstParameterArgumentType.AstPair;
             ParameterSpecified = parameterAst != null;
             ArgumentSpecified = argumentAst != null;
-            ParameterName = parameterAst != null ? parameterAst.ParameterName : null;
-            ParameterText = parameterAst != null ? parameterAst.ParameterName : null;
-            ArgumentType = argumentAst != null ? argumentAst.StaticType : null;
+            ParameterName = parameterAst?.ParameterName;
+            ParameterText = parameterAst?.ParameterName;
+            ArgumentType = argumentAst?.StaticType;
 
             ParameterContainsArgument = false;
             Argument = argumentAst;
@@ -261,8 +261,7 @@ public static class StaticParameterBinder
         /// <returns>The StaticBindingResult that represents the binding.</returns>
         public static StaticBindingResult BindCommand(CommandAst commandAst)
         {
-            bool resolve = true;
-            return BindCommand(commandAst, resolve);
+            return BindCommand(commandAst, resolve: true);
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/CommandDiscovery.cs b/src/System.Management.Automation/engine/CommandDiscovery.cs
index 8749d5468ce..2b328767f4c 100644
--- a/src/System.Management.Automation/engine/CommandDiscovery.cs
+++ b/src/System.Management.Automation/engine/CommandDiscovery.cs
@@ -149,7 +149,7 @@ internal CommandDiscovery(ExecutionContext context)
         /// <returns>
         /// True if the cmdlet is a special cmdlet that shouldn't be part of the discovery list. Or false otherwise.
         /// </returns>
-        private bool IsSpecialCmdlet(Type implementingType)
+        private static bool IsSpecialCmdlet(Type implementingType)
         {
             // These commands should never be put in the discovery list.  They are an internal implementation
             // detail of the formatting and output component. That component uses these cmdlets by creating
@@ -1348,7 +1348,7 @@ internal LookupPathCollection GetLookupDirectoryPaths()
             }
 
             // Cache the new lookup paths
-            return _cachedLookupPaths ?? (_cachedLookupPaths = result);
+            return _cachedLookupPaths ??= result;
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/CommandInfo.cs b/src/System.Management.Automation/engine/CommandInfo.cs
index d1afb8b3b12..56e17ef0f5f 100644
--- a/src/System.Management.Automation/engine/CommandInfo.cs
+++ b/src/System.Management.Automation/engine/CommandInfo.cs
@@ -583,7 +583,7 @@ public virtual Dictionary<string, ParameterMetadata> Parameters
 
         internal CommandMetadata ExternalCommandMetadata
         {
-            get { return _externalCommandMetadata ?? (_externalCommandMetadata = new CommandMetadata(this, true)); }
+            get { return _externalCommandMetadata ??= new CommandMetadata(this, true); }
 
             set { _externalCommandMetadata = value; }
         }
@@ -904,7 +904,7 @@ public override string ToString()
     }
 
     [DebuggerDisplay("{PSTypeName} {Name}")]
-    internal struct PSMemberNameAndType
+    internal readonly struct PSMemberNameAndType
     {
         public readonly string Name;
 
@@ -960,7 +960,7 @@ private PSSyntheticTypeName(string typeName, Type type, IList<PSMemberNameAndTyp
             }
         }
 
-        private static bool IsPSTypeName(PSMemberNameAndType member) => member.Name.Equals(nameof(PSTypeName), StringComparison.OrdinalIgnoreCase);
+        private static bool IsPSTypeName(in PSMemberNameAndType member) => member.Name.Equals(nameof(PSTypeName), StringComparison.OrdinalIgnoreCase);
 
         private static string GetMemberTypeProjection(string typename, IList<PSMemberNameAndType> members)
         {
diff --git a/src/System.Management.Automation/engine/CommandMetadata.cs b/src/System.Management.Automation/engine/CommandMetadata.cs
index 5056f2afbb0..027373ec676 100644
--- a/src/System.Management.Automation/engine/CommandMetadata.cs
+++ b/src/System.Management.Automation/engine/CommandMetadata.cs
@@ -680,7 +680,7 @@ private void ConstructCmdletMetadataUsingReflection()
 
             // Determine if the cmdlet implements dynamic parameters by looking for the interface
 
-            Type dynamicParametersType = CommandType.GetInterface(typeof(IDynamicParameters).Name, true);
+            Type dynamicParametersType = CommandType.GetInterface(nameof(IDynamicParameters), true);
 
             if (dynamicParametersType != null)
             {
@@ -1316,7 +1316,7 @@ public static Dictionary<string, CommandMetadata> GetRestrictedCommands(SessionC
             List<CommandMetadata> restrictedCommands = new List<CommandMetadata>();
 
             // all remoting cmdlets need to be included for workflow scenarios as wel
-            if (SessionCapabilities.RemoteServer == (sessionCapabilities & SessionCapabilities.RemoteServer))
+            if ((sessionCapabilities & SessionCapabilities.RemoteServer) == SessionCapabilities.RemoteServer)
             {
                 restrictedCommands.AddRange(GetRestrictedRemotingCommands());
             }
diff --git a/src/System.Management.Automation/engine/CommandParameter.cs b/src/System.Management.Automation/engine/CommandParameter.cs
index b13cc94ad40..e6752ff023b 100644
--- a/src/System.Management.Automation/engine/CommandParameter.cs
+++ b/src/System.Management.Automation/engine/CommandParameter.cs
@@ -116,7 +116,7 @@ internal object ArgumentValue
         /// </summary>
         internal bool ArgumentToBeSplatted
         {
-            get { return _argument != null ? _argument.splatted : false; }
+            get { return _argument != null && _argument.splatted; }
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/CommandProcessor.cs b/src/System.Management.Automation/engine/CommandProcessor.cs
index 4a1414362a5..fb1fe81fc54 100644
--- a/src/System.Management.Automation/engine/CommandProcessor.cs
+++ b/src/System.Management.Automation/engine/CommandProcessor.cs
@@ -607,7 +607,7 @@ private void WriteInputObjectError(
             string errorId,
             params object[] args)
         {
-            Type inputObjectType = (inputObject == null) ? null : inputObject.GetType();
+            Type inputObjectType = inputObject?.GetType();
 
             ParameterBindingException bindingException = new ParameterBindingException(
                 ErrorCategory.InvalidArgument,
@@ -824,7 +824,7 @@ private void InitCommon()
         /// </summary>
         /// <param name="helpTarget">Help target to request.</param>
         /// <param name="helpCategory">Help category to request.</param>
-        /// <returns><c>true</c> if user requested help; <c>false</c> otherwise.</returns>
+        /// <returns><see langword="true"/> if user requested help; <see langword="false"/> otherwise.</returns>
         internal override bool IsHelpRequested(out string helpTarget, out HelpCategory helpCategory)
         {
             if (this.arguments != null)
diff --git a/src/System.Management.Automation/engine/CommandProcessorBase.cs b/src/System.Management.Automation/engine/CommandProcessorBase.cs
index 33804b69ae3..6ab07114652 100644
--- a/src/System.Management.Automation/engine/CommandProcessorBase.cs
+++ b/src/System.Management.Automation/engine/CommandProcessorBase.cs
@@ -149,6 +149,7 @@ internal virtual ObsoleteAttribute ObsoleteAttribute
         {
             get { return null; }
         }
+
         // Full Qualified ID for the obsolete command warning
         private const string FQIDCommandObsolete = "CommandObsolete";
 
@@ -256,7 +257,7 @@ internal ExecutionContext Context
         /// </summary>
         /// <param name="helpTarget">Help target to request.</param>
         /// <param name="helpCategory">Help category to request.</param>
-        /// <returns><c>true</c> if user requested help; <c>false</c> otherwise.</returns>
+        /// <returns><see langword="true"/> if user requested help; <see langword="false"/> otherwise.</returns>
         internal virtual bool IsHelpRequested(out string helpTarget, out HelpCategory helpCategory)
         {
             // by default we don't handle "-?" parameter at all
@@ -956,14 +957,6 @@ private void Dispose(bool disposing)
             _disposed = true;
         }
 
-        /// <summary>
-        /// Finalizer for class CommandProcessorBase.
-        /// </summary>
-        ~CommandProcessorBase()
-        {
-            Dispose(false);
-        }
-
         #endregion IDispose
     }
 }
diff --git a/src/System.Management.Automation/engine/CommandSearcher.cs b/src/System.Management.Automation/engine/CommandSearcher.cs
index d3a1033c932..b349255bab8 100644
--- a/src/System.Management.Automation/engine/CommandSearcher.cs
+++ b/src/System.Management.Automation/engine/CommandSearcher.cs
@@ -842,7 +842,7 @@ private static bool checkPath(string path, string commandName)
         // Don't return commands to the user if that might result in:
         //     - Trusted commands calling untrusted functions that the user has overridden
         //     - Debug prompts calling internal functions that are likely to have code injection
-        private bool ShouldSkipCommandResolutionForConstrainedLanguage(CommandInfo? result, ExecutionContext executionContext)
+        private static bool ShouldSkipCommandResolutionForConstrainedLanguage(CommandInfo? result, ExecutionContext executionContext)
         {
             if (result == null)
             {
diff --git a/src/System.Management.Automation/engine/CompiledCommandParameter.cs b/src/System.Management.Automation/engine/CompiledCommandParameter.cs
index 90011fbde74..dc74210bda5 100644
--- a/src/System.Management.Automation/engine/CompiledCommandParameter.cs
+++ b/src/System.Management.Automation/engine/CompiledCommandParameter.cs
@@ -625,7 +625,7 @@ internal ParameterCollectionTypeInformation(Type type)
                 return;
             }
 
-            bool implementsIList = (type.GetInterface(typeof(IList).Name) != null);
+            bool implementsIList = (type.GetInterface(nameof(IList)) != null);
 
             // Look for class Collection<T>.  Collection<T> implements IList, and also IList
             // is more efficient to bind than ICollection<T>.  This optimization
diff --git a/src/System.Management.Automation/engine/CoreAdapter.cs b/src/System.Management.Automation/engine/CoreAdapter.cs
index 673225b996b..48077bbafd4 100644
--- a/src/System.Management.Automation/engine/CoreAdapter.cs
+++ b/src/System.Management.Automation/engine/CoreAdapter.cs
@@ -2747,6 +2747,7 @@ internal ParameterizedPropertyCacheEntry(List<PropertyInfo> properties)
         internal class PropertyCacheEntry : CacheEntry
         {
             internal delegate object GetterDelegate(object instance);
+
             internal delegate void SetterDelegate(object instance, object setValue);
 
             internal PropertyCacheEntry(PropertyInfo property)
@@ -5939,7 +5940,7 @@ private static MethodInfo Infer(MethodInfo genericMethod, ICollection<Type> type
 
             using (s_tracer.TraceScope("Inferring type parameters for the following method: {0}", genericMethod))
             {
-                if (PSTraceSourceOptions.WriteLine == (s_tracer.Options & PSTraceSourceOptions.WriteLine))
+                if ((s_tracer.Options & PSTraceSourceOptions.WriteLine) == PSTraceSourceOptions.WriteLine)
                 {
                     s_tracer.WriteLine(
                         "Types of method arguments: {0}",
diff --git a/src/System.Management.Automation/engine/EngineIntrinsics.cs b/src/System.Management.Automation/engine/EngineIntrinsics.cs
index 9700a13f905..a492a5215fc 100644
--- a/src/System.Management.Automation/engine/EngineIntrinsics.cs
+++ b/src/System.Management.Automation/engine/EngineIntrinsics.cs
@@ -101,7 +101,7 @@ public SessionState SessionState
         /// </summary>
         public CommandInvocationIntrinsics InvokeCommand
         {
-            get { return _invokeCommand ?? (_invokeCommand = new CommandInvocationIntrinsics(_context)); }
+            get { return _invokeCommand ??= new CommandInvocationIntrinsics(_context); }
         }
 
         #endregion Public methods
diff --git a/src/System.Management.Automation/engine/EnumExpressionEvaluator.cs b/src/System.Management.Automation/engine/EnumExpressionEvaluator.cs
index 742a4a52fae..056372ac63e 100644
--- a/src/System.Management.Automation/engine/EnumExpressionEvaluator.cs
+++ b/src/System.Management.Automation/engine/EnumExpressionEvaluator.cs
@@ -157,6 +157,7 @@ internal abstract class Node
             public Node Operand1 { get; set; }
 
             internal abstract bool Eval(object val);
+
             internal abstract bool ExistEnum(object enumVal);
         }
 
@@ -308,7 +309,7 @@ internal override bool ExistEnum(object enumVal)
                 return exist;
             }
 
-            private bool isUnsigned(Type type)
+            private static bool isUnsigned(Type type)
             {
                 return (type == typeof(ulong) || type == typeof(uint) || type == typeof(ushort) || type == typeof(byte));
             }
@@ -385,7 +386,7 @@ internal bool ExistsInExpression(T flagName)
         /// <returns>
         /// A generic list of tokenized input.
         /// </returns>
-        private List<Token> TokenizeInput(string input)
+        private static List<Token> TokenizeInput(string input)
         {
             List<Token> tokenList = new List<Token>();
             int _offset = 0;
@@ -411,7 +412,7 @@ private List<Token> TokenizeInput(string input)
         /// <param name="_offset">
         /// Current offset position for the string parser.
         /// </param>
-        private void FindNextToken(string input, ref int _offset)
+        private static void FindNextToken(string input, ref int _offset)
         {
             while (_offset < input.Length)
             {
@@ -438,7 +439,7 @@ private void FindNextToken(string input, ref int _offset)
         /// <returns>
         /// The next token on the input string
         /// </returns>
-        private Token GetNextToken(string input, ref int _offset)
+        private static Token GetNextToken(string input, ref int _offset)
         {
             StringBuilder sb = new StringBuilder();
             // bool singleQuoted = false;
@@ -521,7 +522,7 @@ private Token GetNextToken(string input, ref int _offset)
         /// <param name="tokenList">
         /// A list of tokenized input.
         /// </param>
-        private void CheckSyntaxError(List<Token> tokenList)
+        private static void CheckSyntaxError(List<Token> tokenList)
         {
             // Initialize, assuming preceded by OR
             TokenKind previous = TokenKind.Or;
@@ -576,7 +577,7 @@ private void CheckSyntaxError(List<Token> tokenList)
         /// <param name="tokenList">
         /// Tokenized list of the input string.
         /// </param>
-        private Node ConstructExpressionTree(List<Token> tokenList)
+        private static Node ConstructExpressionTree(List<Token> tokenList)
         {
             bool notFlag = false;
             Queue<Node> andQueue = new Queue<Node>();
diff --git a/src/System.Management.Automation/engine/EnumMinimumDisambiguation.cs b/src/System.Management.Automation/engine/EnumMinimumDisambiguation.cs
index 18332cc37c6..5c166c69a63 100644
--- a/src/System.Management.Automation/engine/EnumMinimumDisambiguation.cs
+++ b/src/System.Management.Automation/engine/EnumMinimumDisambiguation.cs
@@ -85,7 +85,7 @@ internal static string EnumDisambiguate(string text, Type enumType)
                 }
                 // No special cases match, throw error for multiple matches.
                 StringBuilder matchListSB = new StringBuilder(namesWithMatchingPrefix[0]);
-                string separator = ", ";
+                const string separator = ", ";
                 for (int i = 1; i < namesWithMatchingPrefix.Count; i++)
                 {
                     matchListSB.Append(separator);
@@ -106,7 +106,7 @@ internal static string EnumDisambiguate(string text, Type enumType)
         internal static string EnumAllValues(Type enumType)
         {
             string[] names = Enum.GetNames(enumType);
-            string separator = ", ";
+            const string separator = ", ";
             StringBuilder returnValue = new StringBuilder();
             if (names.Length != 0)
             {
diff --git a/src/System.Management.Automation/engine/ErrorPackage.cs b/src/System.Management.Automation/engine/ErrorPackage.cs
index 4d1627dff93..6d7a6c8326a 100644
--- a/src/System.Management.Automation/engine/ErrorPackage.cs
+++ b/src/System.Management.Automation/engine/ErrorPackage.cs
@@ -495,7 +495,7 @@ public override string ToString()
         /// </remarks>
         internal static string Ellipsize(CultureInfo uiCultureInfo, string original)
         {
-            if (40 >= original.Length)
+            if (original.Length <= 40)
             {
                 return original;
             }
@@ -1480,7 +1480,7 @@ internal void SetTargetObject(object target)
         /// for that ErrorCategory.
         /// </summary>
         /// <value>never null</value>
-        public ErrorCategoryInfo CategoryInfo { get => _categoryInfo ?? (_categoryInfo = new ErrorCategoryInfo(this)); }
+        public ErrorCategoryInfo CategoryInfo { get => _categoryInfo ??= new ErrorCategoryInfo(this); }
 
         private ErrorCategoryInfo _categoryInfo;
 
diff --git a/src/System.Management.Automation/engine/EventManager.cs b/src/System.Management.Automation/engine/EventManager.cs
index f820aec608b..4afde8a9913 100644
--- a/src/System.Management.Automation/engine/EventManager.cs
+++ b/src/System.Management.Automation/engine/EventManager.cs
@@ -680,7 +680,7 @@ private void ProcessNewSubscriber(PSEventSubscriber subscriber, object source, s
                 }
 
                 // Retrieve the event from the object
-                BindingFlags bindingFlags = BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static | BindingFlags.IgnoreCase;
+                const BindingFlags bindingFlags = BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static | BindingFlags.IgnoreCase;
                 eventInfo = sourceType.GetEvent(eventName, bindingFlags);
 
                 // If we can't find the event, throw an exception
@@ -844,7 +844,7 @@ private void UnsubscribeEvent(PSEventSubscriber subscriber, bool skipDraining)
 
                 Type sourceType = subscriber.SourceObject as Type ?? subscriber.SourceObject.GetType();
 
-                BindingFlags bindingFlags = BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static | BindingFlags.IgnoreCase;
+                const BindingFlags bindingFlags = BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static | BindingFlags.IgnoreCase;
                 eventInfo = sourceType.GetEvent(subscriber.EventName, bindingFlags);
 
                 if ((eventInfo != null) && (existingSubscriber != null))
@@ -1510,14 +1510,6 @@ protected virtual void OnForwardEvent(PSEventArgs e)
             ForwardEvent?.Invoke(this, e);
         }
 
-        /// <summary>
-        /// Destructor for the EventManager class.
-        /// </summary>
-        ~PSLocalEventManager()
-        {
-            Dispose(false);
-        }
-
         /// <summary>
         /// Disposes the EventManager class.
         /// </summary>
@@ -1552,6 +1544,14 @@ public void Dispose(bool disposing)
                 }
             }
         }
+
+        /// <summary>
+        /// Finalizes an instance of the <see cref="PSLocalEventManager"/> class.
+        /// </summary>
+        ~PSLocalEventManager()
+        {
+            Dispose(false);
+        }
     }
 
     /// <summary>
@@ -2457,7 +2457,7 @@ public class PSEventJob : Job
         /// </param>
         /// </summary>
         public PSEventJob(PSEventManager eventManager, PSEventSubscriber subscriber, ScriptBlock action, string name) :
-            base(action == null ? null : action.ToString(), name)
+            base(action?.ToString(), name)
         {
             if (eventManager == null)
                 throw new ArgumentNullException(nameof(eventManager));
diff --git a/src/System.Management.Automation/engine/ExecutionContext.cs b/src/System.Management.Automation/engine/ExecutionContext.cs
index 3a726be8f73..9c484a7c56f 100644
--- a/src/System.Management.Automation/engine/ExecutionContext.cs
+++ b/src/System.Management.Automation/engine/ExecutionContext.cs
@@ -113,9 +113,7 @@ internal static bool IsStrictVersion(ExecutionContext context, int majorVersion)
                 context = LocalPipeline.GetExecutionContextFromTLS();
             }
 
-            return (context != null)
-                       ? context.IsStrictVersion(majorVersion)
-                       : false;
+            return (context != null) && context.IsStrictVersion(majorVersion);
         }
         /// <summary>
         /// Check to see a specific version of strict mode is enabled.  The check is always scoped,
@@ -488,7 +486,7 @@ internal bool UseFullLanguageModeInDebugger
         {
             get
             {
-                return InitialSessionState != null ? InitialSessionState.UseFullLanguageModeInDebugger : false;
+                return InitialSessionState != null && InitialSessionState.UseFullLanguageModeInDebugger;
             }
         }
 
@@ -666,7 +664,7 @@ internal bool GetBooleanPreference(VariablePath preferenceVariablePath, bool def
         /// <value></value>
         internal HelpSystem HelpSystem
         {
-            get { return _helpSystem ?? (_helpSystem = new HelpSystem(this)); }
+            get { return _helpSystem ??= new HelpSystem(this); }
         }
 
         private HelpSystem _helpSystem;
@@ -679,6 +677,7 @@ internal HelpSystem HelpSystem
         #endregion
 
         internal Dictionary<string, ScriptBlock> CustomArgumentCompleters { get; set; }
+
         internal Dictionary<string, ScriptBlock> NativeArgumentCompleters { get; set; }
 
         /// <summary>
@@ -744,7 +743,7 @@ internal InternalHost InternalHost
         /// </summary>
         internal EngineIntrinsics EngineIntrinsics
         {
-            get { return _engineIntrinsics ?? (_engineIntrinsics = new EngineIntrinsics(this)); }
+            get { return _engineIntrinsics ??= new EngineIntrinsics(this); }
         }
 
         private EngineIntrinsics _engineIntrinsics;
@@ -906,7 +905,7 @@ internal void AppendDollarError(object obj)
             const int maxErrorCount = 256;
 
             int numToErase = arraylist.Count - (maxErrorCount - 1);
-            if (0 < numToErase)
+            if (numToErase > 0)
             {
                 arraylist.RemoveRange(
                     maxErrorCount - 1,
@@ -1698,5 +1697,5 @@ internal enum EngineState
         /// Engine is stopped.
         /// </summary>
         Stopped = 4
-    };
+    }
 }
diff --git a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
index 4fd79fe7d7d..f1be0c5acc8 100644
--- a/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
+++ b/src/System.Management.Automation/engine/ExperimentalFeature/ExperimentalFeature.cs
@@ -126,6 +126,9 @@ static ExperimentalFeature()
                 new ExperimentalFeature(
                     name: "PSSubsystemPluginModel",
                     description: "A plugin model for registering and un-registering PowerShell subsystems"),
+                new ExperimentalFeature(
+                    name: "PSAnsiRendering",
+                    description: "Enable $PSStyle variable to control ANSI rendering of strings"),
             };
             EngineExperimentalFeatures = new ReadOnlyCollection<ExperimentalFeature>(engineFeatures);
 
@@ -345,20 +348,21 @@ internal static void ValidateArguments(string experimentName, ExperimentAction e
         {
             if (string.IsNullOrEmpty(experimentName))
             {
-                string paramName = nameof(experimentName);
+                const string paramName = nameof(experimentName);
                 throw PSTraceSource.NewArgumentNullException(paramName, Metadata.ArgumentNullOrEmpty, paramName);
             }
 
             if (experimentAction == ExperimentAction.None)
             {
-                string paramName = nameof(experimentAction);
-                string invalidMember = nameof(ExperimentAction.None);
+                const string paramName = nameof(experimentAction);
+                const string invalidMember = nameof(ExperimentAction.None);
                 string validMembers = StringUtil.Format("{0}, {1}", ExperimentAction.Hide, ExperimentAction.Show);
                 throw PSTraceSource.NewArgumentException(paramName, Metadata.InvalidEnumArgument, invalidMember, paramName, validMembers);
             }
         }
 
         internal bool ToHide => EffectiveAction == ExperimentAction.Hide;
+
         internal bool ToShow => EffectiveAction == ExperimentAction.Show;
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/ExternalScriptInfo.cs b/src/System.Management.Automation/engine/ExternalScriptInfo.cs
index c43177214ff..b97da3b9970 100644
--- a/src/System.Management.Automation/engine/ExternalScriptInfo.cs
+++ b/src/System.Management.Automation/engine/ExternalScriptInfo.cs
@@ -358,9 +358,8 @@ internal override CommandMetadata CommandMetadata
         {
             get
             {
-                return _commandMetadata ??
-                       (_commandMetadata =
-                        new CommandMetadata(this.ScriptBlock, this.Name, LocalPipeline.GetExecutionContextFromTLS()));
+                return _commandMetadata ??=
+                    new CommandMetadata(this.ScriptBlock, this.Name, LocalPipeline.GetExecutionContextFromTLS());
             }
         }
 
@@ -403,7 +402,7 @@ internal string RequiresApplicationID
             get
             {
                 var data = GetRequiresData();
-                return data == null ? null : data.RequiredApplicationId;
+                return data?.RequiredApplicationId;
             }
         }
 
@@ -417,7 +416,7 @@ internal Version RequiresPSVersion
             get
             {
                 var data = GetRequiresData();
-                return data == null ? null : data.RequiredPSVersion;
+                return data?.RequiredPSVersion;
             }
         }
 
@@ -426,7 +425,7 @@ internal IEnumerable<string> RequiresPSEditions
             get
             {
                 var data = GetRequiresData();
-                return data == null ? null : data.RequiredPSEditions;
+                return data?.RequiredPSEditions;
             }
         }
 
@@ -435,7 +434,7 @@ internal IEnumerable<ModuleSpecification> RequiresModules
             get
             {
                 var data = GetRequiresData();
-                return data == null ? null : data.RequiredModules;
+                return data?.RequiredModules;
             }
         }
 
@@ -444,7 +443,7 @@ internal bool RequiresElevation
             get
             {
                 var data = GetRequiresData();
-                return data == null ? false : data.IsElevationRequired;
+                return data != null && data.IsElevationRequired;
             }
         }
 
@@ -458,7 +457,7 @@ internal IEnumerable<PSSnapInSpecification> RequiresPSSnapIns
             get
             {
                 var data = GetRequiresData();
-                return data == null ? null : data.RequiresPSSnapIns;
+                return data?.RequiresPSSnapIns;
             }
         }
 
diff --git a/src/System.Management.Automation/engine/FunctionInfo.cs b/src/System.Management.Automation/engine/FunctionInfo.cs
index 8afe41ece15..70ab80e8ca4 100644
--- a/src/System.Management.Automation/engine/FunctionInfo.cs
+++ b/src/System.Management.Automation/engine/FunctionInfo.cs
@@ -265,7 +265,7 @@ internal void Update(ScriptBlock newFunction, bool force, ScopedItemOptions opti
         }
 
         /// <summary>
-        /// Returns <c>true</c> if this function uses cmdlet binding mode for its parameters; otherwise returns <c>false</c>.
+        /// Returns <see langword="true"/> if this function uses cmdlet binding mode for its parameters; otherwise returns <see langword="false"/>.
         /// </summary>
         public bool CmdletBinding
         {
@@ -277,7 +277,7 @@ public bool CmdletBinding
 
         /// <summary>
         /// Gets the name of the default parameter set.
-        /// Returns <c>null</c> if this function doesn't use cmdlet parameter binding or if the default parameter set wasn't specified.
+        /// Returns <see langword="null"/> if this function doesn't use cmdlet parameter binding or if the default parameter set wasn't specified.
         /// </summary>
         public string DefaultParameterSet
         {
@@ -479,9 +479,8 @@ internal override CommandMetadata CommandMetadata
         {
             get
             {
-                return _commandMetadata ??
-                       (_commandMetadata =
-                        new CommandMetadata(this.ScriptBlock, this.Name, LocalPipeline.GetExecutionContextFromTLS()));
+                return _commandMetadata ??=
+                    new CommandMetadata(this.ScriptBlock, this.Name, LocalPipeline.GetExecutionContextFromTLS());
             }
         }
 
diff --git a/src/System.Management.Automation/engine/GetCommandCommand.cs b/src/System.Management.Automation/engine/GetCommandCommand.cs
index 96be302f5e8..17efeb4ac73 100644
--- a/src/System.Management.Automation/engine/GetCommandCommand.cs
+++ b/src/System.Management.Automation/engine/GetCommandCommand.cs
@@ -1632,8 +1632,7 @@ private static PSObject GetParameterType(Type parameterType)
                 new ArrayList(Enum.GetValues(parameterType)) : new ArrayList();
             returnParameterType.Properties.Add(new PSNoteProperty("EnumValues", enumValues));
 
-            bool hasFlagAttribute = (isArray) ?
-                ((parameterType.GetCustomAttributes(typeof(FlagsAttribute), true)).Length > 0) : false;
+            bool hasFlagAttribute = (isArray) && ((parameterType.GetCustomAttributes(typeof(FlagsAttribute), true)).Length > 0);
             returnParameterType.Properties.Add(new PSNoteProperty("HasFlagAttribute", hasFlagAttribute));
 
             // Recurse into array elements.
diff --git a/src/System.Management.Automation/engine/ICommandRuntime.cs b/src/System.Management.Automation/engine/ICommandRuntime.cs
index cf5de2b20ab..6f0b3ce9d57 100644
--- a/src/System.Management.Automation/engine/ICommandRuntime.cs
+++ b/src/System.Management.Automation/engine/ICommandRuntime.cs
@@ -560,6 +560,7 @@ public interface ICommandRuntime
     /// execute an instance of a Cmdlet. ICommandRuntime2 extends the ICommandRuntime interface
     /// by adding support for the informational data stream.
     /// </summary>
+#nullable enable
     public interface ICommandRuntime2 : ICommandRuntime
     {
         /// <summary>
@@ -614,6 +615,6 @@ public interface ICommandRuntime2 : ICommandRuntime
         /// performed, and the Cmdlet should move on to the next target resource.
         /// </returns>
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1045:DoNotPassTypesByReference")]
-        bool ShouldContinue(string query, string caption, bool hasSecurityImpact, ref bool yesToAll, ref bool noToAll);
+        bool ShouldContinue(string? query, string? caption, bool hasSecurityImpact, ref bool yesToAll, ref bool noToAll);
     }
 }
diff --git a/src/System.Management.Automation/engine/InformationRecord.cs b/src/System.Management.Automation/engine/InformationRecord.cs
index 29d317e2c02..ad4aeeff5a9 100644
--- a/src/System.Management.Automation/engine/InformationRecord.cs
+++ b/src/System.Management.Automation/engine/InformationRecord.cs
@@ -81,7 +81,7 @@ internal InformationRecord(InformationRecord baseRecord)
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public List<string> Tags
         {
-            get { return _tags ?? (_tags = new List<string>()); }
+            get { return _tags ??= new List<string>(); }
 
             internal set { _tags = value; }
         }
@@ -120,7 +120,7 @@ public string User
         [DataMember]
         public string Computer
         {
-            get { return this._computerName ?? (this._computerName = PsUtils.GetHostName()); }
+            get { return this._computerName ??= PsUtils.GetHostName(); }
 
             set { this._computerName = value; }
         }
diff --git a/src/System.Management.Automation/engine/InitialSessionState.cs b/src/System.Management.Automation/engine/InitialSessionState.cs
index 8d9b01ad134..2495a4ac0fe 100644
--- a/src/System.Management.Automation/engine/InitialSessionState.cs
+++ b/src/System.Management.Automation/engine/InitialSessionState.cs
@@ -949,7 +949,7 @@ public override InitialSessionStateEntry Clone()
         /// </summary>
         public Collection<Attribute> Attributes
         {
-            get { return _attributes ?? (_attributes = new Collection<Attribute>()); }
+            get { return _attributes ??= new Collection<Attribute>(); }
         }
 
         private Collection<Attribute> _attributes;
@@ -1346,7 +1346,7 @@ public static InitialSessionState CreateFromSessionConfigurationFile(string path
         public static InitialSessionState CreateRestricted(SessionCapabilities sessionCapabilities)
         {
             // only remote server has been requested
-            if (SessionCapabilities.RemoteServer == sessionCapabilities)
+            if (sessionCapabilities == SessionCapabilities.RemoteServer)
             {
                 return CreateRestrictedForRemoteServer();
             }
@@ -2584,7 +2584,7 @@ HashSet<CommandInfo> GetPublicCommands()
             return null;
         }
 
-        private string[] GetModulesForUnResolvedCommands(IEnumerable<string> unresolvedCommands, ExecutionContext context)
+        private static string[] GetModulesForUnResolvedCommands(IEnumerable<string> unresolvedCommands, ExecutionContext context)
         {
             Collection<string> modulesToImport = new Collection<string>();
             HashSet<string> commandsToResolve = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
@@ -3072,7 +3072,7 @@ private RunspaceOpenModuleLoadException ProcessModulesToImport(
         /// <param name="moduleName"></param>
         /// <param name="context"></param>
         /// <returns></returns>
-        private IEnumerable<CommandInfo> LookupCommands(
+        private static IEnumerable<CommandInfo> LookupCommands(
             string commandPattern,
             string moduleName,
             ExecutionContext context)
@@ -4442,6 +4442,13 @@ .ForwardHelpCategory Cmdlet
             new SessionStateVariableEntry(SpecialVariables.FirstToken, null, string.Empty),
             new SessionStateVariableEntry(SpecialVariables.StackTrace, null, string.Empty),
 
+            // Variable which controls the output rendering
+            new SessionStateVariableEntry(
+                SpecialVariables.PSStyle,
+                PSStyle.Instance,
+                RunspaceInit.PSStyleDescription,
+                ScopedItemOptions.None),
+
             // Variable which controls the encoding for piping data to a NativeCommand
             new SessionStateVariableEntry(
                 SpecialVariables.OutputEncoding,
diff --git a/src/System.Management.Automation/engine/InvocationInfo.cs b/src/System.Management.Automation/engine/InvocationInfo.cs
index cae261aec7d..1ae22542c63 100644
--- a/src/System.Management.Automation/engine/InvocationInfo.cs
+++ b/src/System.Management.Automation/engine/InvocationInfo.cs
@@ -201,8 +201,7 @@ public Dictionary<string, object> BoundParameters
         {
             get
             {
-                return _boundParameters ??
-                       (_boundParameters = new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase));
+                return _boundParameters ??= new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
             }
 
             internal set { _boundParameters = value; }
@@ -213,7 +212,7 @@ public Dictionary<string, object> BoundParameters
         /// </summary>
         public List<object> UnboundArguments
         {
-            get { return _unboundArguments ?? (_unboundArguments = new List<object>()); }
+            get { return _unboundArguments ??= new List<object>(); }
 
             internal set { _unboundArguments = value; }
         }
diff --git a/src/System.Management.Automation/engine/LanguagePrimitives.cs b/src/System.Management.Automation/engine/LanguagePrimitives.cs
index 703fbcd46e4..c397385e557 100644
--- a/src/System.Management.Automation/engine/LanguagePrimitives.cs
+++ b/src/System.Management.Automation/engine/LanguagePrimitives.cs
@@ -4349,19 +4349,21 @@ internal delegate T PSConverter<T>(object valueToConvert,
 
         internal delegate object PSNullConverter(object nullOrAutomationNull);
 
+#nullable enable
         internal interface IConversionData
         {
             object Converter { get; }
 
             ConversionRank Rank { get; }
 
-            object Invoke(object valueToConvert,
+            object? Invoke(object? valueToConvert,
                           Type resultType,
                           bool recurse,
-                          PSObject originalValueToConvert,
-                          IFormatProvider formatProvider,
-                          TypeTable backupTable);
+                          PSObject? originalValueToConvert,
+                          IFormatProvider? formatProvider,
+                          TypeTable? backupTable);
         }
+#nullable restore
 
         [System.Diagnostics.DebuggerDisplay("{_converter.Method.Name}")]
         internal class ConversionData<T> : IConversionData
@@ -5104,7 +5106,7 @@ private static IConversionData FigureLanguageConversion(Type fromType, Type toTy
             return null;
         }
 
-        private struct SignatureComparator
+        private readonly struct SignatureComparator
         {
             private enum TypeMatchingContext
             {
@@ -5779,7 +5781,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/ManagementObjectAdapter.cs b/src/System.Management.Automation/engine/ManagementObjectAdapter.cs
index d1669bb4593..c591a6963ec 100644
--- a/src/System.Management.Automation/engine/ManagementObjectAdapter.cs
+++ b/src/System.Management.Automation/engine/ManagementObjectAdapter.cs
@@ -77,7 +77,7 @@ public WMIParameterInformation(string name, Type ty) : base(ty, true, null, fals
         /// <param name="dotnetBaseType"></param>
         /// <param name="shouldIncludeNamespace"></param>
         /// <returns></returns>
-        private IEnumerable<string> GetTypeNameHierarchyFromDerivation(ManagementBaseObject managementObj,
+        private static IEnumerable<string> GetTypeNameHierarchyFromDerivation(ManagementBaseObject managementObj,
             string dotnetBaseType, bool shouldIncludeNamespace)
         {
             StringBuilder type = new StringBuilder(200);
diff --git a/src/System.Management.Automation/engine/MinishellParameterBinderController.cs b/src/System.Management.Automation/engine/MinishellParameterBinderController.cs
index bd23408fcfa..e19defd57a7 100644
--- 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/Modules/GetModuleCommand.cs b/src/System.Management.Automation/engine/Modules/GetModuleCommand.cs
index 4651f0c79de..663e1f4b0fe 100644
--- a/src/System.Management.Automation/engine/Modules/GetModuleCommand.cs
+++ b/src/System.Management.Automation/engine/Modules/GetModuleCommand.cs
@@ -174,7 +174,7 @@ PSObject outputObject in
             }
         }
 
-        private PSModuleInfo GetModuleInfoForRemoteModuleWithoutManifest(RemoteDiscoveryHelper.CimModule cimModule)
+        private static PSModuleInfo GetModuleInfoForRemoteModuleWithoutManifest(RemoteDiscoveryHelper.CimModule cimModule)
         {
             return new PSModuleInfo(cimModule.ModuleName, null, null);
         }
diff --git a/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs b/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
index 2ddf17ff2b1..35e0b61ab20 100644
--- a/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
+++ b/src/System.Management.Automation/engine/Modules/ImportModuleCommand.cs
@@ -573,11 +573,19 @@ private void ImportModule_ViaAssembly(ImportModuleOptions importModuleOptions, A
 
             if (!moduleLoaded)
             {
-                bool found;
-                PSModuleInfo module = LoadBinaryModule(false, null, null, suppliedAssembly, null, null,
+                PSModuleInfo module = LoadBinaryModule(
+                    trySnapInName: false,
+                    moduleName: null,
+                    fileName: null,
+                    suppliedAssembly,
+                    moduleBase: null,
+                    ss: null,
                     importModuleOptions,
                     ManifestProcessingFlags.LoadElements | ManifestProcessingFlags.WriteErrors | ManifestProcessingFlags.NullOnFirstError,
-                    this.BasePrefix, false /* loadTypes */ , false /* loadFormats */, out found);
+                    this.BasePrefix,
+                    loadTypes: false,
+                    loadFormats: false,
+                    out bool found);
 
                 if (found && module != null)
                 {
@@ -1393,7 +1401,7 @@ private static bool IsCmdletizationFile(RemoteDiscoveryHelper.CimModuleFile cimM
             return cimModuleFile.FileCode == RemoteDiscoveryHelper.CimFileCode.CmdletizationV1;
         }
 
-        private IEnumerable<string> CreateCimModuleFiles(
+        private static IEnumerable<string> CreateCimModuleFiles(
             RemoteDiscoveryHelper.CimModule remoteCimModule,
             RemoteDiscoveryHelper.CimFileCode fileCode,
             Func<RemoteDiscoveryHelper.CimModuleFile, bool> filesFilter,
@@ -2068,7 +2076,7 @@ internal override IList<PSModuleInfo> ImportModulesUsingWinCompat(IEnumerable<st
             return moduleProxyList;
         }
 
-        private void SetModuleBaseForEngineModules(string moduleName, System.Management.Automation.ExecutionContext context)
+        private static void SetModuleBaseForEngineModules(string moduleName, System.Management.Automation.ExecutionContext context)
         {
             // Set modulebase of engine modules to point to $pshome
             // This is so that Get-Help can load the correct help.
diff --git a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
index 44d7a373395..f947e415a04 100644
--- a/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
+++ b/src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
@@ -334,7 +334,7 @@ internal bool LoadUsingModulePath(PSModuleInfo parentModule, bool found, IEnumer
                 foreach (string folder in Directory.EnumerateDirectories(path))
                 {
                     string moduleName = Path.GetFileName(folder);
-                    if (string.Compare(moduleName, fileBaseName, StringComparison.OrdinalIgnoreCase) == 0)
+                    if (string.Equals(moduleName, fileBaseName, StringComparison.OrdinalIgnoreCase))
                     {
                         fileBaseName = moduleName;
 #endif
@@ -644,8 +644,8 @@ private bool ValidateManifestHash(
         }
 
         private PSModuleInfo LoadModuleNamedInManifest(PSModuleInfo parentModule, ModuleSpecification moduleSpecification, string moduleBase, bool searchModulePath,
-            string prefix, SessionState ss, ImportModuleOptions options, ManifestProcessingFlags manifestProcessingFlags, bool loadTypesFiles,
-            bool loadFormatFiles, object privateData, out bool found, string shortModuleName, PSLanguageMode? manifestLanguageMode)
+            string prefix, SessionState ss, ImportModuleOptions options, ManifestProcessingFlags manifestProcessingFlags, bool loadTypes,
+            bool loadFormats, object privateData, out bool found, string shortModuleName, PSLanguageMode? manifestLanguageMode)
         {
             PSModuleInfo module = null;
             PSModuleInfo tempModuleInfoFromVerification = null;
@@ -878,19 +878,20 @@ private PSModuleInfo LoadModuleNamedInManifest(PSModuleInfo parentModule, Module
                             // At this point, we are already exhaust all possible ways to load the nested module. The last option is to load it as a binary module/snapin.
                             module = LoadBinaryModule(
                                 parentModule,
-                                true, // trySnapInName
+                                trySnapInName: true,
                                 moduleSpecification.Name,
-                                null, // fileName
-                                null, // assemblyToLoad
+                                fileName: null,
+                                assemblyToLoad: null,
                                 moduleBase,
                                 ss,
                                 options,
                                 manifestProcessingFlags,
                                 prefix,
-                                loadTypesFiles,
-                                loadFormatFiles,
+                                loadTypes,
+                                loadFormats,
                                 out found,
-                                shortModuleName, false);
+                                shortModuleName,
+                                disableFormatUpdates: false);
                         }
                         catch (FileNotFoundException)
                         {
@@ -1043,7 +1044,7 @@ private IEnumerable<PSModuleInfo> GetModuleForRootedPaths(List<string> modulePat
             }
         }
 
-        private ErrorRecord CreateModuleNotFoundError(string modulePath)
+        private static ErrorRecord CreateModuleNotFoundError(string modulePath)
         {
             string errorMessage = StringUtil.Format(Modules.ModuleNotFoundForGetModule, modulePath);
             FileNotFoundException fnf = new FileNotFoundException(errorMessage);
@@ -1140,7 +1141,7 @@ internal static Version GetMaximumVersion(string stringVersion)
             else
             {
                 // If first conversion fails, try to convert * to maximum version
-                string maxRange = "999999999";
+                const string maxRange = "999999999";
                 if (stringVersion[stringVersion.Length - 1] == '*')
                 {
                     stringVersion = stringVersion.Substring(0, stringVersion.Length - 1);
@@ -1421,7 +1422,7 @@ private IEnumerable<PSModuleInfo> CreateFakeModuleObject(IEnumerable<ModuleSpeci
             }
         }
 
-        private ErrorRecord GetErrorRecordIfUnsupportedRootCdxmlAndNestedModuleScenario(
+        private static ErrorRecord GetErrorRecordIfUnsupportedRootCdxmlAndNestedModuleScenario(
             Hashtable data,
             string moduleManifestPath,
             string rootModulePath)
@@ -2189,10 +2190,15 @@ internal PSModuleInfo LoadModuleManifest(
             }
 
             // Set up to load any types files that have been specified...
-            List<string> exportedTypeFiles;
-            if (
-                !GetListOfFilesFromData(data, moduleManifestPath, "TypesToProcess", manifestProcessingFlags, moduleBase,
-                    ".ps1xml", true, out exportedTypeFiles))
+            if (!GetListOfFilesFromData(
+                data,
+                moduleManifestPath,
+                key: "TypesToProcess",
+                manifestProcessingFlags,
+                moduleBase,
+                extension: ".ps1xml",
+                verifyFilesExist: true,
+                out List<string> exportedTypeFiles))
             {
                 containedErrors = true;
                 if (bailOnFirstError) return null;
@@ -2234,10 +2240,15 @@ internal PSModuleInfo LoadModuleManifest(
             }
 
             // Set up to load any format files that have been specified...
-            List<string> exportedFormatFiles;
-            if (
-                !GetListOfFilesFromData(data, moduleManifestPath, "FormatsToProcess", manifestProcessingFlags,
-                    moduleBase, ".ps1xml", true, out exportedFormatFiles))
+            if (!GetListOfFilesFromData(
+                data,
+                moduleManifestPath,
+                key: "FormatsToProcess",
+                manifestProcessingFlags,
+                moduleBase,
+                extension: ".ps1xml",
+                verifyFilesExist: true,
+                out List<string> exportedFormatFiles))
             {
                 containedErrors = true;
                 if (bailOnFirstError) return null;
@@ -2276,10 +2287,15 @@ internal PSModuleInfo LoadModuleManifest(
             }
 
             // scripts to process
-            List<string> scriptsToProcess;
-            if (
-                !GetListOfFilesFromData(data, moduleManifestPath, "ScriptsToProcess", manifestProcessingFlags,
-                    moduleBase, ".ps1", true, out scriptsToProcess))
+            if (!GetListOfFilesFromData(
+                data,
+                moduleManifestPath,
+                key: "ScriptsToProcess",
+                manifestProcessingFlags,
+                moduleBase,
+                extension: ".ps1",
+                verifyFilesExist: true,
+                out List<string> scriptsToProcess))
             {
                 containedErrors = true;
                 if (bailOnFirstError) return null;
@@ -2323,13 +2339,16 @@ internal PSModuleInfo LoadModuleManifest(
             }
 
             // Process "FileList"
-            List<string> fileList;
-            if (
-                !GetListOfFilesFromData(data, moduleManifestPath, "FileList", manifestProcessingFlags, moduleBase, ""
-                    /*extension*/,
-                    false
-                    /* don't check file existence - don't want to change current behavior without feature team discussion */,
-                    out fileList))
+            if (!GetListOfFilesFromData(
+                data,
+                moduleManifestPath,
+                key: "FileList",
+                manifestProcessingFlags,
+                moduleBase,
+                extension: string.Empty,
+                // Don't check file existence - don't want to change current behavior without feature team discussion.
+                verifyFilesExist: false,
+                out List<string> fileList))
             {
                 containedErrors = true;
                 if (bailOnFirstError) return null;
@@ -2927,8 +2946,8 @@ internal PSModuleInfo LoadModuleManifest(
                             ss: null,
                             options: nestedModuleOptions,
                             manifestProcessingFlags: manifestProcessingFlags,
-                            loadTypesFiles: true,
-                            loadFormatFiles: true,
+                            loadTypes: true,
+                            loadFormats: true,
                             privateData: privateData,
                             found: out found,
                             shortModuleName: null,
@@ -3030,8 +3049,8 @@ internal PSModuleInfo LoadModuleManifest(
                         ss: ss,
                         options: options,
                         manifestProcessingFlags: manifestProcessingFlags,
-                        loadTypesFiles: (exportedTypeFiles == null || exportedTypeFiles.Count == 0),        // If types files already loaded, don't load snapin files
-                        loadFormatFiles: (exportedFormatFiles == null || exportedFormatFiles.Count == 0),   // if format files already loaded, don't load snapin files
+                        loadTypes: (exportedTypeFiles == null || exportedTypeFiles.Count == 0),        // If types files already loaded, don't load snapin files
+                        loadFormats: (exportedFormatFiles == null || exportedFormatFiles.Count == 0),   // if format files already loaded, don't load snapin files
                         privateData: privateData,
                         found: out found,
                         shortModuleName: null,
@@ -3531,7 +3550,7 @@ private static void PropagateExportedTypesFromNestedModulesToRootModuleScope(Imp
                 if (nestedModule != null)
                 {
                     var exportedTypes = nestedModule.GetExportedTypeDefinitions();
-                    if (exportedTypes != null && exportedTypes.Count != 0)
+                    if (exportedTypes != null && exportedTypes.Count > 0)
                     {
                         foreach (var t in exportedTypes)
                         {
@@ -4203,7 +4222,7 @@ private static bool HasRequiredModulesCyclicReference(ModuleSpecification curren
         /// Search for a localized psd1 manifest file, using the same algorithm
         /// as Import-LocalizedData.
         /// </summary>
-        private ExternalScriptInfo FindLocalizedModuleManifest(string path)
+        private static ExternalScriptInfo FindLocalizedModuleManifest(string path)
         {
             string dir = Path.GetDirectoryName(path);
             string file = Path.GetFileName(path);
@@ -4242,7 +4261,7 @@ private ExternalScriptInfo FindLocalizedModuleManifest(string path)
         /// <summary>
         /// Checks to see if the module manifest contains the specified key.
         /// If it does and it's valid, it returns true otherwise it returns false.
-        /// If the key wasn't there or wasn't valid, then <paramref name="list"/> is set to <c>null</c>
+        /// If the key wasn't there or wasn't valid, then <paramref name="list"/> is set to <see langword="null"/>
         /// </summary>
         /// <param name="data">The hashtable to look for the key in.</param>
         /// <param name="moduleManifestPath">The manifest that generated the hashtable.</param>
@@ -4281,7 +4300,7 @@ internal bool GetListOfStringsFromData(
         /// <summary>
         /// Checks to see if the module manifest contains the specified key.
         /// If it does and it's valid, it returns true otherwise it returns false.
-        /// If the key wasn't there or wasn't valid, then <paramref name="list"/> is set to <c>null</c>.
+        /// If the key wasn't there or wasn't valid, then <paramref name="list"/> is set to <see langword="null"/>.
         /// </summary>
         /// <param name="data">The hashtable to look for the key in.</param>
         /// <param name="moduleManifestPath">The manifest that generated the hashtable.</param>
@@ -4334,7 +4353,7 @@ private bool GetListOfWildcardsFromData(
         /// <summary>
         /// Checks to see if the module manifest contains the specified key.
         /// If it does and it's valid, it returns true otherwise it returns false.
-        /// If the key wasn't there or wasn't valid, then <paramref name="list"/> is set to <c>null</c>
+        /// If the key wasn't there or wasn't valid, then <paramref name="list"/> is set to <see langword="null"/>
         /// </summary>
         /// <param name="data">The hashtable to look for the key in.</param>
         /// <param name="moduleManifestPath">The manifest that generated the hashtable.</param>
@@ -4342,7 +4361,7 @@ private bool GetListOfWildcardsFromData(
         /// <param name="manifestProcessingFlags">Specifies how to treat errors and whether to load elements.</param>
         /// <param name="moduleBase">Base directory of a module.</param>
         /// <param name="extension">Expected file extension (added to strings that didn't have an extension).</param>
-        /// <param name="verifyFilesExist">If <c>true</c> then we want to error out if the specified files don't exist.</param>
+        /// <param name="verifyFilesExist">If <see langword="true"/> then we want to error out if the specified files don't exist.</param>
         /// <param name="list">Returns the extracted version.</param>
         /// <returns></returns>
         private bool GetListOfFilesFromData(
@@ -4435,7 +4454,7 @@ internal void SetModuleLoggingInformation(PSModuleInfo m)
             }
         }
 
-        private void SetModuleLoggingInformation(ModuleLoggingGroupPolicyStatus status, PSModuleInfo m, IEnumerable<string> moduleNames)
+        private static void SetModuleLoggingInformation(ModuleLoggingGroupPolicyStatus status, PSModuleInfo m, IEnumerable<string> moduleNames)
         {
             // TODO, insivara : What happens when Enabled but none of the other options (DefaultSystemModules, NonDefaultSystemModule, NonSystemModule, SpecificModules) are set?
             // After input from GP team for this behavior, need to revisit the commented out part
@@ -4489,16 +4508,16 @@ internal static ModuleLoggingGroupPolicyStatus GetModuleLoggingInformation(out I
 
         /// <summary>
         /// Checks to see if the module manifest contains the specified key.
-        /// If it does and it can be converted to the expected type, then it returns <c>true</c> and sets <paramref name="result"/> to the value.
-        /// If the key is missing it returns <c>true</c> and sets <paramref name="result"/> to <c>default(<typeparam name="T"/>)</c>.
-        /// If the key is invalid then it returns <c>false</c>.
+        /// If it does and it can be converted to the expected type, then it returns <see langword="true"/> and sets <paramref name="result"/> to the value.
+        /// If the key is missing it returns <see langword="true"/> and sets <paramref name="result"/> to <c>default(<typeparam name="T"/>)</c>.
+        /// If the key is invalid then it returns <see langword="false"/>.
         /// </summary>
         /// <param name="data">The hashtable to look for the key in.</param>
         /// <param name="moduleManifestPath">The manifest that generated the hashtable.</param>
         /// <param name="key">The table key to use.</param>
         /// <param name="manifestProcessingFlags">Specifies how to treat errors and whether to load elements.</param>
         /// <param name="result">Value from the manifest converted to the right type.</param>
-        /// <returns><c>true</c> if success; <c>false</c> if there were errors.</returns>
+        /// <returns><see langword="true"/> if success; <see langword="false"/> if there were errors.</returns>
         internal bool GetScalarFromData<T>(
             Hashtable data,
             string moduleManifestPath,
@@ -5230,7 +5249,7 @@ internal bool DoesAlreadyLoadedModuleSatisfyConstraints(PSModuleInfo alreadyLoad
         /// <param name="options"></param>
         /// <returns>
         /// Returns PSModuleInfo of an already loaded module if that module can be simply reimported and there is no need to proceed with a regular import.
-        /// Returns <c>null</c> if the caller should proceed with a regular import (either because there is no previously loaded module, or because the -Force flag was specified and the previously loaded module has been removed by this method).
+        /// Returns <see langword="null"/> if the caller should proceed with a regular import (either because there is no previously loaded module, or because the -Force flag was specified and the previously loaded module has been removed by this method).
         /// </returns>
         internal PSModuleInfo IsModuleImportUnnecessaryBecauseModuleIsAlreadyLoaded(string modulePath, string prefix, ImportModuleOptions options)
         {
@@ -5872,8 +5891,20 @@ internal PSModuleInfo LoadModule(PSModuleInfo parentModule, string fileName, str
                          ext.Equals(StringLiterals.PowerShellNgenAssemblyExtension, StringComparison.OrdinalIgnoreCase) ||
                          ext.Equals(StringLiterals.PowerShellILExecutableExtension, StringComparison.OrdinalIgnoreCase))
                 {
-                    module = LoadBinaryModule(false, ModuleIntrinsics.GetModuleName(fileName), fileName, null,
-                        moduleBase, ss, options, manifestProcessingFlags, prefix, true, true, out found);
+                    module = LoadBinaryModule(
+                        trySnapInName: false,
+                        ModuleIntrinsics.GetModuleName(fileName),
+                        fileName,
+                        assemblyToLoad: null,
+                        moduleBase,
+                        ss,
+                        options,
+                        manifestProcessingFlags,
+                        prefix,
+                        loadTypes: true,
+                        loadFormats: true,
+                        out found);
+
                     if (found && module != null)
                     {
                         // LanguageMode does not apply to binary modules
@@ -6073,7 +6104,7 @@ private static bool ShouldProcessScriptModule(PSModuleInfo parentModule, ref boo
 
         private static readonly object s_lockObject = new object();
 
-        private void ClearAnalysisCaches()
+        private static void ClearAnalysisCaches()
         {
             lock (s_lockObject)
             {
@@ -6510,13 +6541,36 @@ private PSModuleInfo AnalyzeScriptFile(string filename, bool force, ExecutionCon
         /// <param name="prefix">Command name prefix.</param>
         /// <param name="found">Sets this to true if an assembly was found.</param>
         /// <returns>THe module info object that was created...</returns>
-        internal PSModuleInfo LoadBinaryModule(bool trySnapInName, string moduleName, string fileName,
-            Assembly assemblyToLoad, string moduleBase, SessionState ss, ImportModuleOptions options,
-            ManifestProcessingFlags manifestProcessingFlags, string prefix,
-            bool loadTypes, bool loadFormats, out bool found)
+        internal PSModuleInfo LoadBinaryModule(
+            bool trySnapInName,
+            string moduleName,
+            string fileName,
+            Assembly assemblyToLoad,
+            string moduleBase,
+            SessionState ss,
+            ImportModuleOptions options,
+            ManifestProcessingFlags manifestProcessingFlags,
+            string prefix,
+            bool loadTypes,
+            bool loadFormats,
+            out bool found)
         {
-            return LoadBinaryModule(null, trySnapInName, moduleName, fileName, assemblyToLoad, moduleBase, ss, options,
-                                    manifestProcessingFlags, prefix, loadTypes, loadFormats, out found, null, false);
+            return LoadBinaryModule(
+                parentModule: null,
+                trySnapInName,
+                moduleName,
+                fileName,
+                assemblyToLoad,
+                moduleBase,
+                ss,
+                options,
+                manifestProcessingFlags,
+                prefix,
+                loadTypes,
+                loadFormats,
+                out found,
+                shortModuleName: null,
+                disableFormatUpdates: false);
         }
 
         /// <summary>
@@ -6542,7 +6596,22 @@ internal PSModuleInfo LoadBinaryModule(bool trySnapInName, string moduleName, st
         /// <param name="shortModuleName">Short name for module.</param>
         /// <param name="disableFormatUpdates"></param>
         /// <returns>THe module info object that was created...</returns>
-        internal PSModuleInfo LoadBinaryModule(PSModuleInfo parentModule, bool trySnapInName, string moduleName, string fileName, Assembly assemblyToLoad, string moduleBase, SessionState ss, ImportModuleOptions options, ManifestProcessingFlags manifestProcessingFlags, string prefix, bool loadTypes, bool loadFormats, out bool found, string shortModuleName, bool disableFormatUpdates)
+        internal PSModuleInfo LoadBinaryModule(
+            PSModuleInfo parentModule,
+            bool trySnapInName,
+            string moduleName,
+            string fileName,
+            Assembly assemblyToLoad,
+            string moduleBase,
+            SessionState ss,
+            ImportModuleOptions options,
+            ManifestProcessingFlags manifestProcessingFlags,
+            string prefix,
+            bool loadTypes,
+            bool loadFormats,
+            out bool found,
+            string shortModuleName,
+            bool disableFormatUpdates)
         {
             PSModuleInfo module = null;
 
diff --git a/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs b/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
index 71f86332861..94ce2664703 100644
--- a/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
+++ b/src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
@@ -703,9 +703,9 @@ internal static bool MatchesModulePath(string modulePath, string requiredPath)
             }
 
 #if UNIX
-            StringComparison strcmp = StringComparison.Ordinal;
+            const StringComparison strcmp = StringComparison.Ordinal;
 #else
-            StringComparison strcmp = StringComparison.OrdinalIgnoreCase;
+            const StringComparison strcmp = StringComparison.OrdinalIgnoreCase;
 #endif
 
             // We must check modulePath (e.g. /path/to/module/module.psd1) against several possibilities:
@@ -1719,6 +1719,7 @@ internal enum ModuleMatchFailure
     /// Used by Modules/Snapins to provide a hook to the engine for startup initialization
     /// w.r.t compiled assembly loading.
     /// </summary>
+#nullable enable
     public interface IModuleAssemblyInitializer
     {
         /// <summary>
diff --git a/src/System.Management.Automation/engine/Modules/NewModuleManifestCommand.cs b/src/System.Management.Automation/engine/Modules/NewModuleManifestCommand.cs
index a1907a034ac..bf2e76501cc 100644
--- a/src/System.Management.Automation/engine/Modules/NewModuleManifestCommand.cs
+++ b/src/System.Management.Automation/engine/Modules/NewModuleManifestCommand.cs
@@ -534,7 +534,7 @@ public string DefaultCommandPrefix
         /// </summary>
         /// <param name="name">The string to quote.</param>
         /// <returns>The quoted string.</returns>
-        private string QuoteName(string name)
+        private static string QuoteName(string name)
         {
             if (name == null)
                 return "''";
@@ -546,7 +546,7 @@ private string QuoteName(string name)
         /// </summary>
         /// <param name="name">The Uri to quote.</param>
         /// <returns>The quoted AbsoluteUri.</returns>
-        private string QuoteName(Uri name)
+        private static string QuoteName(Uri name)
         {
             if (name == null)
                 return "''";
@@ -558,7 +558,7 @@ private string QuoteName(Uri name)
         /// </summary>
         /// <param name="name">The Version object to quote.</param>
         /// <returns>The quoted Version string.</returns>
-        private string QuoteName(Version name)
+        private static string QuoteName(Version name)
         {
             if (name == null)
                 return "''";
@@ -572,7 +572,7 @@ private string QuoteName(Version name)
         /// <param name="names">The list to quote.</param>
         /// <param name="streamWriter">Streamwriter to get end of line character from.</param>
         /// <returns>The quoted list.</returns>
-        private string QuoteNames(IEnumerable names, StreamWriter streamWriter)
+        private static string QuoteNames(IEnumerable names, StreamWriter streamWriter)
         {
             if (names == null)
                 return "@()";
@@ -622,7 +622,7 @@ private string QuoteNames(IEnumerable names, StreamWriter streamWriter)
         /// </summary>
         /// <param name="moduleSpecs"></param>
         /// <returns></returns>
-        private IEnumerable PreProcessModuleSpec(IEnumerable moduleSpecs)
+        private static IEnumerable PreProcessModuleSpec(IEnumerable moduleSpecs)
         {
             if (moduleSpecs != null)
             {
@@ -647,7 +647,7 @@ private IEnumerable PreProcessModuleSpec(IEnumerable moduleSpecs)
         /// <param name="moduleSpecs">The list to quote.</param>
         /// <param name="streamWriter">Streamwriter to get end of line character from.</param>
         /// <returns>The quoted list.</returns>
-        private string QuoteModules(IEnumerable moduleSpecs, StreamWriter streamWriter)
+        private static string QuoteModules(IEnumerable moduleSpecs, StreamWriter streamWriter)
         {
             StringBuilder result = new StringBuilder();
             result.Append("@(");
@@ -897,7 +897,7 @@ private string ManifestFragmentForNonSpecifiedManifestMember(string key, string
                 _indent, resourceString, streamWriter.NewLine, key, value);
         }
 
-        private string ManifestComment(string insert, StreamWriter streamWriter)
+        private static string ManifestComment(string insert, StreamWriter streamWriter)
         {
             // Prefix a non-empty string with a space for formatting reasons...
             if (!string.IsNullOrEmpty(insert))
diff --git a/src/System.Management.Automation/engine/Modules/PSModuleInfo.cs b/src/System.Management.Automation/engine/Modules/PSModuleInfo.cs
index caa4a5a666f..f2ab485aef0 100644
--- a/src/System.Management.Automation/engine/Modules/PSModuleInfo.cs
+++ b/src/System.Management.Automation/engine/Modules/PSModuleInfo.cs
@@ -299,8 +299,7 @@ public string ModuleBase
         {
             get
             {
-                return _moduleBase ??
-                       (_moduleBase = !string.IsNullOrEmpty(Path) ? IO.Path.GetDirectoryName(Path) : string.Empty);
+                return _moduleBase ??= !string.IsNullOrEmpty(Path) ? IO.Path.GetDirectoryName(Path) : string.Empty;
             }
         }
 
@@ -582,7 +581,7 @@ public Dictionary<string, FunctionInfo> ExportedFunctions
             }
         }
 
-        private bool IsScriptModuleFile(string path)
+        private static bool IsScriptModuleFile(string path)
         {
             var ext = System.IO.Path.GetExtension(path);
             return ext != null && s_scriptModuleExtensions.Contains(ext);
@@ -922,8 +921,7 @@ public ReadOnlyCollection<PSModuleInfo> NestedModules
         {
             get
             {
-                return _readonlyNestedModules ??
-                       (_readonlyNestedModules = new ReadOnlyCollection<PSModuleInfo>(_nestedModules));
+                return _readonlyNestedModules ??= new ReadOnlyCollection<PSModuleInfo>(_nestedModules);
             }
         }
 
@@ -1014,8 +1012,7 @@ public ReadOnlyCollection<PSModuleInfo> RequiredModules
         {
             get
             {
-                return _readonlyRequiredModules ??
-                       (_readonlyRequiredModules = new ReadOnlyCollection<PSModuleInfo>(_requiredModules));
+                return _readonlyRequiredModules ??= new ReadOnlyCollection<PSModuleInfo>(_requiredModules);
             }
         }
 
@@ -1040,8 +1037,7 @@ internal ReadOnlyCollection<ModuleSpecification> RequiredModulesSpecification
         {
             get
             {
-                return _readonlyRequiredModulesSpecification ??
-                       (_readonlyRequiredModulesSpecification = new ReadOnlyCollection<ModuleSpecification>(_requiredModulesSpecification));
+                return _readonlyRequiredModulesSpecification ??= new ReadOnlyCollection<ModuleSpecification>(_requiredModulesSpecification);
             }
         }
 
diff --git a/src/System.Management.Automation/engine/Modules/RemoteDiscoveryHelper.cs b/src/System.Management.Automation/engine/Modules/RemoteDiscoveryHelper.cs
index 65c2931db0f..9ece4af620f 100644
--- a/src/System.Management.Automation/engine/Modules/RemoteDiscoveryHelper.cs
+++ b/src/System.Management.Automation/engine/Modules/RemoteDiscoveryHelper.cs
@@ -31,7 +31,7 @@ internal class RemoteDiscoveryHelper
 
         private static Collection<string> RehydrateHashtableKeys(PSObject pso, string propertyName)
         {
-            var rehydrationFlags = DeserializingTypeConverter.RehydrationFlags.NullValueOk |
+            const DeserializingTypeConverter.RehydrationFlags rehydrationFlags = DeserializingTypeConverter.RehydrationFlags.NullValueOk |
                                    DeserializingTypeConverter.RehydrationFlags.MissingPropertyOk;
             Hashtable hashtable = DeserializingTypeConverter.GetPropertyValue<Hashtable>(pso, propertyName, rehydrationFlags);
             if (hashtable == null)
@@ -53,7 +53,7 @@ private static Collection<string> RehydrateHashtableKeys(PSObject pso, string pr
 
         internal static PSModuleInfo RehydratePSModuleInfo(PSObject deserializedModuleInfo)
         {
-            var rehydrationFlags = DeserializingTypeConverter.RehydrationFlags.NullValueOk |
+            const DeserializingTypeConverter.RehydrationFlags rehydrationFlags = DeserializingTypeConverter.RehydrationFlags.NullValueOk |
                                    DeserializingTypeConverter.RehydrationFlags.MissingPropertyOk;
             string name = DeserializingTypeConverter.GetPropertyValue<string>(deserializedModuleInfo, "Name", rehydrationFlags);
             string path = DeserializingTypeConverter.GetPropertyValue<string>(deserializedModuleInfo, "Path", rehydrationFlags);
@@ -360,7 +360,7 @@ private static ErrorRecord GetErrorRecordForRemotePipelineInvocation(Exception i
             Exception outerException = new InvalidOperationException(errorMessage, innerException);
 
             RemoteException remoteException = innerException as RemoteException;
-            ErrorRecord remoteErrorRecord = remoteException != null ? remoteException.ErrorRecord : null;
+            ErrorRecord remoteErrorRecord = remoteException?.ErrorRecord;
             string errorId = remoteErrorRecord != null ? remoteErrorRecord.FullyQualifiedErrorId : innerException.GetType().Name;
             ErrorCategory errorCategory = remoteErrorRecord != null ? remoteErrorRecord.CategoryInfo.Category : ErrorCategory.NotSpecified;
             ErrorRecord errorRecord = new ErrorRecord(outerException, errorId, errorCategory, null);
@@ -815,7 +815,7 @@ private static IEnumerable<CimModule> GetCimModules(
                     ErrorRecord errorRecord = GetErrorRecordForRemoteDiscoveryProvider(exception);
                     if (!cmdlet.MyInvocation.ExpectingInput)
                     {
-                        if (((-1) != errorRecord.FullyQualifiedErrorId.IndexOf(DiscoveryProviderNotFoundErrorId, StringComparison.OrdinalIgnoreCase)) ||
+                        if ((errorRecord.FullyQualifiedErrorId.IndexOf(DiscoveryProviderNotFoundErrorId, StringComparison.OrdinalIgnoreCase) != (-1)) ||
                             (cancellationToken.IsCancellationRequested || (exception is OperationCanceledException)) ||
                             (!cimSession.TestConnection()))
                         {
diff --git a/src/System.Management.Automation/engine/Modules/ScriptAnalysis.cs b/src/System.Management.Automation/engine/Modules/ScriptAnalysis.cs
index 4db13309f6b..f2005400c9d 100644
--- a/src/System.Management.Automation/engine/Modules/ScriptAnalysis.cs
+++ b/src/System.Management.Automation/engine/Modules/ScriptAnalysis.cs
@@ -105,10 +105,15 @@ internal static string ReadScript(string path)
         }
 
         internal List<string> DiscoveredExports { get; set; }
+
         internal Dictionary<string, string> DiscoveredAliases { get; set; }
+
         internal List<RequiredModuleInfo> DiscoveredModules { get; set; }
+
         internal List<string> DiscoveredCommandFilters { get; set; }
+
         internal bool AddsSelfToPath { get; set; }
+
         internal List<TypeDefinitionAst> DiscoveredClasses { get; set; }
     }
 
@@ -160,11 +165,17 @@ static ExportVisitor()
         private readonly bool _forCompletion;
 
         internal List<string> DiscoveredExports { get; set; }
+
         internal List<RequiredModuleInfo> DiscoveredModules { get; set; }
+
         internal Dictionary<string, FunctionDefinitionAst> DiscoveredFunctions { get; set; }
+
         internal Dictionary<string, string> DiscoveredAliases { get; set; }
+
         internal List<string> DiscoveredCommandFilters { get; set; }
+
         internal bool AddsSelfToPath { get; set; }
+
         internal List<TypeDefinitionAst> DiscoveredClasses { get; set; }
 
         public override AstVisitAction VisitTypeDefinition(TypeDefinitionAst typeDefinitionAst)
@@ -451,7 +462,7 @@ private void ProcessCmdletArguments(object value, Action<string> onEachArgument)
         //
         // It also only populates the bound parameters for a limited set of parameters needed
         // for module analysis.
-        private Hashtable DoPsuedoParameterBinding(CommandAst commandAst, string commandName)
+        private static Hashtable DoPsuedoParameterBinding(CommandAst commandAst, string commandName)
         {
             var result = new Hashtable(StringComparer.OrdinalIgnoreCase);
 
@@ -564,6 +575,7 @@ private struct ParameterInfo
     internal class RequiredModuleInfo
     {
         internal string Name { get; set; }
+
         internal List<string> CommandsToPostFilter { get; set; }
     }
 }
diff --git a/src/System.Management.Automation/engine/Modules/TestModuleManifestCommand.cs b/src/System.Management.Automation/engine/Modules/TestModuleManifestCommand.cs
index 06a5789d629..265287a010f 100644
--- a/src/System.Management.Automation/engine/Modules/TestModuleManifestCommand.cs
+++ b/src/System.Management.Automation/engine/Modules/TestModuleManifestCommand.cs
@@ -404,7 +404,7 @@ private bool IsValidFilePath(string path, PSModuleInfo module, bool verifyPathSc
         /// </summary>
         /// <param name="assemblyName"></param>
         /// <returns></returns>
-        private bool IsValidGacAssembly(string assemblyName)
+        private static bool IsValidGacAssembly(string assemblyName)
         {
 #if UNIX
             return false;
@@ -420,23 +420,13 @@ private bool IsValidGacAssembly(string assemblyName)
 
             try
             {
-                var allFiles = Directory.GetFiles(gacPath, assemblyFile, SearchOption.AllDirectories);
-
-                if (allFiles.Length == 0)
-                {
-                    var allNgenFiles = Directory.GetFiles(gacPath, ngenAssemblyFile, SearchOption.AllDirectories);
-                    if (allNgenFiles.Length == 0)
-                    {
-                        return false;
-                    }
-                }
+                return Directory.EnumerateFiles(gacPath, assemblyFile, SearchOption.AllDirectories).Any()
+                    || Directory.EnumerateFiles(gacPath, ngenAssemblyFile, SearchOption.AllDirectories).Any();
             }
             catch
             {
                 return false;
             }
-
-            return true;
 #endif
         }
     }
diff --git a/src/System.Management.Automation/engine/MshCmdlet.cs b/src/System.Management.Automation/engine/MshCmdlet.cs
index fe995d9096e..a2a7023b2d0 100644
--- a/src/System.Management.Automation/engine/MshCmdlet.cs
+++ b/src/System.Management.Automation/engine/MshCmdlet.cs
@@ -68,7 +68,7 @@ public interface IDynamicParameters
     /// Type used to define a parameter on a cmdlet script of function that
     /// can only be used as a switch.
     /// </summary>
-    public struct SwitchParameter
+    public readonly struct SwitchParameter
     {
         private readonly bool _isPresent;
         /// <summary>
@@ -956,7 +956,7 @@ public string ParameterSetName
         /// <summary>
         /// If the cmdlet declares paging support (via <see cref="CmdletCommonMetadataAttribute.SupportsPaging"/>),
         /// then <see cref="PagingParameters"/> property contains arguments of the paging parameters.
-        /// Otherwise <see cref="PagingParameters"/> property is <c>null</c>.
+        /// Otherwise <see cref="PagingParameters"/> property is <see langword="null"/>.
         /// </summary>
         public PagingParameters PagingParameters
         {
@@ -999,7 +999,7 @@ public CommandInvocationIntrinsics InvokeCommand
             {
                 using (PSTransactionManager.GetEngineProtectionScope())
                 {
-                    return _invokeCommand ?? (_invokeCommand = new CommandInvocationIntrinsics(Context, this));
+                    return _invokeCommand ??= new CommandInvocationIntrinsics(Context, this);
                 }
             }
         }
diff --git a/src/System.Management.Automation/engine/MshCommandRuntime.cs b/src/System.Management.Automation/engine/MshCommandRuntime.cs
index 2709ba1384e..a1cd276fa89 100644
--- a/src/System.Management.Automation/engine/MshCommandRuntime.cs
+++ b/src/System.Management.Automation/engine/MshCommandRuntime.cs
@@ -125,7 +125,7 @@ public override string ToString()
         /// <value>The invocation object for this command.</value>
         internal InvocationInfo MyInvocation
         {
-            get { return _myInvocation ?? (_myInvocation = _thisCommand.MyInvocation); }
+            get { return _myInvocation ??= _thisCommand.MyInvocation; }
         }
 
         /// <summary>
@@ -1735,8 +1735,13 @@ public bool ShouldContinue(string query, string caption)
         {
             bool yesToAll = false;
             bool noToAll = false;
-            bool hasSecurityImpact = false;
-            return DoShouldContinue(query, caption, hasSecurityImpact, false, ref yesToAll, ref noToAll);
+            return DoShouldContinue(
+                query,
+                caption,
+                hasSecurityImpact: false,
+                supportsToAllOptions: false,
+                ref yesToAll,
+                ref noToAll);
         }
 
         /// <summary>
@@ -2206,7 +2211,7 @@ internal void SetMergeFromRuntime(MshCommandRuntime fromRuntime)
         /// </summary>
         internal Pipe InputPipe
         {
-            get { return _inputPipe ?? (_inputPipe = new Pipe()); }
+            get { return _inputPipe ??= new Pipe(); }
 
             set { _inputPipe = value; }
         }
@@ -2216,7 +2221,7 @@ internal Pipe InputPipe
         /// </summary>
         internal Pipe OutputPipe
         {
-            get { return _outputPipe ?? (_outputPipe = new Pipe()); }
+            get { return _outputPipe ??= new Pipe(); }
 
             set { _outputPipe = value; }
         }
@@ -2239,7 +2244,7 @@ internal object[] GetResultsAsArray()
         /// </summary>
         internal Pipe ErrorOutputPipe
         {
-            get { return _errorOutputPipe ?? (_errorOutputPipe = new Pipe()); }
+            get { return _errorOutputPipe ??= new Pipe(); }
 
             set { _errorOutputPipe = value; }
         }
@@ -2844,20 +2849,20 @@ internal void _WriteErrorSkipAllowCheck(ErrorRecord errorRecord, ActionPreferenc
                 }
 
                 // No trace of the error in the 'Ignore' case
-                if (ActionPreference.Ignore == preference)
+                if (preference == ActionPreference.Ignore)
                 {
                     return; // do not write or record to output pipe
                 }
 
                 // 2004/05/26-JonN
                 // The object is not written in the SilentlyContinue case
-                if (ActionPreference.SilentlyContinue == preference)
+                if (preference == ActionPreference.SilentlyContinue)
                 {
                     AppendErrorToVariables(errorRecord);
                     return; // do not write to output pipe
                 }
 
-                if (ContinueStatus.YesToAll == lastErrorContinueStatus)
+                if (lastErrorContinueStatus == ContinueStatus.YesToAll)
                 {
                     preference = ActionPreference.Continue;
                 }
@@ -3384,7 +3389,7 @@ internal enum ContinueStatus
             No,
             YesToAll,
             NoToAll
-        };
+        }
 
         internal ContinueStatus lastShouldProcessContinueStatus = ContinueStatus.Yes;
         internal ContinueStatus lastErrorContinueStatus = ContinueStatus.Yes;
@@ -3684,7 +3689,7 @@ bool hasSecurityImpact
                     CBhost.EnterNestedPrompt(_thisCommand);
                     // continue loop
                 }
-                else if (-1 == response)
+                else if (response == -1)
                 {
                     ActionPreferenceStopException e =
                         new ActionPreferenceStopException(
@@ -3746,6 +3751,17 @@ internal void SetVariableListsInPipe()
 
             if (this.PipelineVariable != null)
             {
+                // _state can be null if the current script block is dynamicparam, etc.
+                if (_state != null)
+                {
+                    // Create the pipeline variable
+                    _state.PSVariable.Set(_pipelineVarReference);
+
+                    // Get the reference again in case we re-used one from the
+                    // same scope.
+                    _pipelineVarReference = _state.PSVariable.Get(this.PipelineVariable);
+                }
+
                 this.OutputPipe.SetPipelineVariable(_pipelineVarReference);
             }
         }
diff --git a/src/System.Management.Automation/engine/MshMemberInfo.cs b/src/System.Management.Automation/engine/MshMemberInfo.cs
index 50d036a1bdd..9bbec9c4312 100644
--- a/src/System.Management.Automation/engine/MshMemberInfo.cs
+++ b/src/System.Management.Automation/engine/MshMemberInfo.cs
@@ -6,6 +6,7 @@
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;
 using System.Management.Automation.Internal;
@@ -161,7 +162,7 @@ internal enum MshMemberMatchOptions
         IncludeHidden = 1,
 
         /// <summary>
-        /// Only include members with <see cref="PSMemberInfo.ShouldSerialize"/> property set to <c>true</c>
+        /// Only include members with <see cref="PSMemberInfo.ShouldSerialize"/> property set to <see langword="true"/>
         /// </summary>
         OnlySerializable = 2
     }
@@ -875,6 +876,7 @@ public override PSMemberInfo Copy()
         /// </summary>
         /// <exception cref="GetValueException">When getting and there is no getter or when the getter throws an exception.</exception>
         /// <exception cref="SetValueException">When setting and there is no setter or when the setter throws an exception.</exception>
+        [SuppressMessage("Design", "CA1065:Do not raise exceptions in unexpected locations", Justification = "<Pending>")]
         public override object Value
         {
             get
@@ -964,6 +966,7 @@ public override object Value
         /// Gets the type of the value for this member.
         /// </summary>
         /// <exception cref="GetValueException">If there is no property getter.</exception>
+        [SuppressMessage("Design", "CA1065:Do not raise exceptions in unexpected locations", Justification = "<Pending>")]
         public override string TypeNameOfValue
         {
             get
@@ -1786,6 +1789,7 @@ public override PSMemberInfo Copy()
         /// </exception>
         /// <exception cref="SetValueException">When setting and there is no setter,
         /// when the setter throws an exception or when there is no Runspace to run the script.</exception>
+        [SuppressMessage("Design", "CA1065:Do not raise exceptions in unexpected locations", Justification = "<Pending>")]
         public override object Value
         {
             get
@@ -1911,12 +1915,12 @@ internal PSMethodInvocationConstraints(
         }
 
         /// <remarks>
-        /// If <c>null</c> then there are no constraints
+        /// If <see langword="null"/> then there are no constraints
         /// </remarks>
         public Type MethodTargetType { get; }
 
         /// <remarks>
-        /// If <c>null</c> then there are no constraints
+        /// If <see langword="null"/> then there are no constraints
         /// </remarks>
         public IEnumerable<Type> ParameterTypes => _parameterTypes;
 
@@ -1971,7 +1975,7 @@ public bool Equals(PSMethodInvocationConstraints other)
 
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj))
+            if (obj is null)
             {
                 return false;
             }
@@ -3728,7 +3732,7 @@ internal static PSMemberInfoInternalCollection<T> Match<T>(PSMemberInfoInternalC
     /// A Predicate that determine if a member name matches a criterion.
     /// </summary>
     /// <param name="memberName"></param>
-    /// <returns><c>true</c> if the <paramref name="memberName"/> matches the predicate, otherwise <c>false</c>.</returns>
+    /// <returns><see langword="true"/> if the <paramref name="memberName"/> matches the predicate, otherwise <see langword="false"/>.</returns>
     public delegate bool MemberNamePredicate(string memberName);
 
     /// <summary>
diff --git a/src/System.Management.Automation/engine/MshObject.cs b/src/System.Management.Automation/engine/MshObject.cs
index 71d567c7d1b..2253c7c913e 100644
--- a/src/System.Management.Automation/engine/MshObject.cs
+++ b/src/System.Management.Automation/engine/MshObject.cs
@@ -651,6 +651,7 @@ internal static PSObject ConstructPSObjectFromSerializationInfo(SerializationInf
             new PSObject.AdapterSet(new ThirdPartyAdapter(typeof(Microsoft.Management.Infrastructure.CimInstance),
                                                           new Microsoft.PowerShell.Cim.CimInstanceAdapter()),
                                     PSObject.DotNetInstanceAdapter);
+
 #if !UNIX
         private static readonly AdapterSet s_managementObjectAdapter = new AdapterSet(new ManagementObjectAdapter(), DotNetInstanceAdapter);
         private static readonly AdapterSet s_managementClassAdapter = new AdapterSet(new ManagementClassApdapter(), DotNetInstanceAdapter);
@@ -946,6 +947,7 @@ public static implicit operator PSObject(int valueToConvert)
         {
             return PSObject.AsPSObject(valueToConvert);
         }
+
         /// <summary>
         /// </summary>
         /// <param name="valueToConvert"></param>
@@ -954,6 +956,7 @@ public static implicit operator PSObject(string valueToConvert)
         {
             return PSObject.AsPSObject(valueToConvert);
         }
+
         /// <summary>
         /// </summary>
         /// <param name="valueToConvert"></param>
@@ -962,6 +965,7 @@ public static implicit operator PSObject(Hashtable valueToConvert)
         {
             return PSObject.AsPSObject(valueToConvert);
         }
+
         /// <summary>
         /// </summary>
         /// <param name="valueToConvert"></param>
@@ -970,6 +974,7 @@ public static implicit operator PSObject(double valueToConvert)
         {
             return PSObject.AsPSObject(valueToConvert);
         }
+
         /// <summary>
         /// </summary>
         /// <param name="valueToConvert"></param>
diff --git a/src/System.Management.Automation/engine/MshObjectTypeDescriptor.cs b/src/System.Management.Automation/engine/MshObjectTypeDescriptor.cs
index 9a36e04140b..6e941b4c5f1 100644
--- a/src/System.Management.Automation/engine/MshObjectTypeDescriptor.cs
+++ b/src/System.Management.Automation/engine/MshObjectTypeDescriptor.cs
@@ -92,6 +92,7 @@ internal GettingValueExceptionEventArgs(Exception exception)
     public class PSObjectPropertyDescriptor : PropertyDescriptor
     {
         internal event EventHandler<SettingValueExceptionEventArgs> SettingValueException;
+
         internal event EventHandler<GettingValueExceptionEventArgs> GettingValueException;
 
         internal PSObjectPropertyDescriptor(string propertyName, Type propertyType, bool isReadOnly, AttributeCollection propertyAttributes)
@@ -222,8 +223,8 @@ private static PSObject GetComponentPSObject(object component)
                 {
                     throw PSTraceSource.NewArgumentException(nameof(component), ExtendedTypeSystem.InvalidComponent,
                                                              "component",
-                                                             typeof(PSObject).Name,
-                                                             typeof(PSObjectTypeDescriptor).Name);
+                                                             nameof(PSObject),
+                                                             nameof(PSObjectTypeDescriptor));
                 }
 
                 mshObj = descriptor.Instance;
diff --git a/src/System.Management.Automation/engine/NativeCommandProcessor.cs b/src/System.Management.Automation/engine/NativeCommandProcessor.cs
index bcd42658d22..96ad84a6c46 100644
--- 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.
@@ -824,7 +824,7 @@ public int ParentId
                 get
                 {
                     // Construct parent id only once.
-                    if (int.MinValue == _parentId)
+                    if (_parentId == int.MinValue)
                     {
                         ConstructParentId();
                     }
@@ -1169,7 +1169,7 @@ private ProcessStartInfo GetProcessStartInfo(bool redirectOutput, bool redirectE
             return startInfo;
         }
 
-        private bool IsDownstreamOutDefault(Pipe downstreamPipe)
+        private static bool IsDownstreamOutDefault(Pipe downstreamPipe)
         {
             Diagnostics.Assert(downstreamPipe != null, "Caller makes sure the passed-in parameter is not null.");
 
@@ -1316,6 +1316,10 @@ private void CalculateIORedirection(bool isWindowsApplication, out bool redirect
 
         // On Windows, check the extension list and see if we should try to execute this directly.
         // Otherwise, use the platform library to check executability
+        [SuppressMessage(
+            "Performance",
+            "CA1822:Mark members as static",
+            Justification = "Accesses instance members in preprocessor branch.")]
         private bool IsExecutable(string path)
         {
 #if UNIX
@@ -1419,7 +1423,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/PSClassSearcher.cs b/src/System.Management.Automation/engine/PSClassSearcher.cs
index 82c96c8a350..ce47ae93e16 100644
--- a/src/System.Management.Automation/engine/PSClassSearcher.cs
+++ b/src/System.Management.Automation/engine/PSClassSearcher.cs
@@ -288,7 +288,7 @@ private Collection<PSModuleInfo> GetPSModuleInfo(string modulePath)
             return modules;
         }
 
-        private PSClassInfo ConvertToClassInfo(PSModuleInfo module, ScriptBlockAst ast, TypeDefinitionAst statement)
+        private static PSClassInfo ConvertToClassInfo(PSModuleInfo module, ScriptBlockAst ast, TypeDefinitionAst statement)
         {
             PSClassInfo classInfo = new PSClassInfo(statement.Name);
             Dbg.Assert(statement.Name != null, "statement should have a name.");
diff --git a/src/System.Management.Automation/engine/PSConfiguration.cs b/src/System.Management.Automation/engine/PSConfiguration.cs
index ade427b2154..16273979a69 100644
--- a/src/System.Management.Automation/engine/PSConfiguration.cs
+++ b/src/System.Management.Automation/engine/PSConfiguration.cs
@@ -174,7 +174,7 @@ internal void SetExecutionPolicy(ConfigScope scope, string shellId, string execu
             WriteValueToFile<string>(scope, key, executionPolicy);
         }
 
-        private string GetExecutionPolicySettingKey(string shellId)
+        private static string GetExecutionPolicySettingKey(string shellId)
         {
             return string.Equals(shellId, Utils.DefaultPowerShellShellID, StringComparison.Ordinal)
                 ? ExecutionPolicyDefaultShellKey
@@ -402,6 +402,10 @@ private T ReadValueFromFile<T>(ConfigScope scope, string key, T defaultValue = d
 
                         configData = serializer.Deserialize<JObject>(jsonReader) ?? emptyConfig;
                     }
+                    catch (Exception exc)
+                    {
+                        throw PSTraceSource.NewInvalidOperationException(exc, PSConfigurationStrings.CanNotConfigurationFile, args: fileName);
+                    }
                     finally
                     {
                         fileLock.ExitReadLock();
@@ -562,7 +566,7 @@ private void UpdateValueInFile<T>(ConfigScope scope, string key, T value, bool a
         /// <param name="value">The value to write.</param>
         private void WriteValueToFile<T>(ConfigScope scope, string key, T value)
         {
-            if (ConfigScope.CurrentUser == scope && !Directory.Exists(perUserConfigDirectory))
+            if (scope == ConfigScope.CurrentUser && !Directory.Exists(perUserConfigDirectory))
             {
                 Directory.CreateDirectory(perUserConfigDirectory);
             }
@@ -636,11 +640,17 @@ private void RemoveValueFromFile<T>(ConfigScope scope, string key)
     internal sealed class PowerShellPolicies
     {
         public ScriptExecution ScriptExecution { get; set; }
+
         public ScriptBlockLogging ScriptBlockLogging { get; set; }
+
         public ModuleLogging ModuleLogging { get; set; }
+
         public ProtectedEventLogging ProtectedEventLogging { get; set; }
+
         public Transcription Transcription { get; set; }
+
         public UpdatableHelp UpdatableHelp { get; set; }
+
         public ConsoleSessionConfiguration ConsoleSessionConfiguration { get; set; }
     }
 
@@ -652,6 +662,7 @@ internal abstract class PolicyBase { }
     internal sealed class ScriptExecution : PolicyBase
     {
         public string ExecutionPolicy { get; set; }
+
         public bool? EnableScripts { get; set; }
     }
 
@@ -661,6 +672,7 @@ internal sealed class ScriptExecution : PolicyBase
     internal sealed class ScriptBlockLogging : PolicyBase
     {
         public bool? EnableScriptBlockInvocationLogging { get; set; }
+
         public bool? EnableScriptBlockLogging { get; set; }
     }
 
@@ -670,6 +682,7 @@ internal sealed class ScriptBlockLogging : PolicyBase
     internal sealed class ModuleLogging : PolicyBase
     {
         public bool? EnableModuleLogging { get; set; }
+
         public string[] ModuleNames { get; set; }
     }
 
@@ -679,7 +692,9 @@ internal sealed class ModuleLogging : PolicyBase
     internal sealed class Transcription : PolicyBase
     {
         public bool? EnableTranscripting { get; set; }
+
         public bool? EnableInvocationHeader { get; set; }
+
         public string OutputDirectory { get; set; }
     }
 
@@ -689,6 +704,7 @@ internal sealed class Transcription : PolicyBase
     internal sealed class UpdatableHelp : PolicyBase
     {
         public bool? EnableUpdateHelpDefaultSourcePath { get; set; }
+
         public string DefaultSourcePath { get; set; }
     }
 
@@ -698,6 +714,7 @@ internal sealed class UpdatableHelp : PolicyBase
     internal sealed class ConsoleSessionConfiguration : PolicyBase
     {
         public bool? EnableConsoleSessionConfiguration { get; set; }
+
         public string ConsoleSessionConfigurationName { get; set; }
     }
 
@@ -707,6 +724,7 @@ internal sealed class ConsoleSessionConfiguration : PolicyBase
     internal sealed class ProtectedEventLogging : PolicyBase
     {
         public bool? EnableProtectedEventLogging { get; set; }
+
         public string[] EncryptionCertificate { get; set; }
     }
 
diff --git a/src/System.Management.Automation/engine/PSVersionInfo.cs b/src/System.Management.Automation/engine/PSVersionInfo.cs
index 529374a58db..289f105987e 100644
--- a/src/System.Management.Automation/engine/PSVersionInfo.cs
+++ b/src/System.Management.Automation/engine/PSVersionInfo.cs
@@ -859,7 +859,7 @@ public int CompareTo(object version)
         /// </summary>
         public int CompareTo(SemanticVersion value)
         {
-            if ((object)value == null)
+            if (value is null)
                 return 1;
 
             if (Major != value.Major)
diff --git a/src/System.Management.Automation/engine/ParameterBinderBase.cs b/src/System.Management.Automation/engine/ParameterBinderBase.cs
index daa5b2f8759..ee7028c3865 100644
--- a/src/System.Management.Automation/engine/ParameterBinderBase.cs
+++ b/src/System.Management.Automation/engine/ParameterBinderBase.cs
@@ -172,7 +172,7 @@ internal object Target
         /// </summary>
         internal CommandLineParameters CommandLineParameters
         {
-            get { return _commandLineParameters ?? (_commandLineParameters = new CommandLineParameters()); }
+            get { return _commandLineParameters ??= new CommandLineParameters(); }
 
             // Setter is needed to pass into RuntimeParameterBinder instances
             set { _commandLineParameters = value; }
@@ -439,7 +439,7 @@ internal virtual bool BindParameter(
                                             GetErrorExtent(parameter),
                                             parameterMetadata.Name,
                                             parameterMetadata.Type,
-                                            (parameterValue == null) ? null : parameterValue.GetType(),
+                                            parameterValue?.GetType(),
                                             ParameterBinderStrings.ParameterArgumentTransformationError,
                                             "ParameterArgumentTransformationError",
                                             e.Message);
@@ -522,7 +522,7 @@ internal virtual bool BindParameter(
                                             GetErrorExtent(parameter),
                                             parameterMetadata.Name,
                                             parameterMetadata.Type,
-                                            (parameterValue == null) ? null : parameterValue.GetType(),
+                                            parameterValue?.GetType(),
                                             ParameterBinderStrings.ParameterArgumentValidationError,
                                             "ParameterArgumentValidationError",
                                             e.Message);
@@ -586,7 +586,7 @@ internal virtual bool BindParameter(
 
                     if (bindError != null)
                     {
-                        Type specifiedType = (parameterValue == null) ? null : parameterValue.GetType();
+                        Type specifiedType = parameterValue?.GetType();
                         ParameterBindingException bindingException =
                             new ParameterBindingException(
                                 bindError,
@@ -736,7 +736,7 @@ private void ValidateNullOrEmptyArgument(
                             GetErrorExtent(parameter),
                             parameterMetadata.Name,
                             parameterMetadata.Type,
-                            (parameterValue == null) ? null : parameterValue.GetType(),
+                            parameterValue?.GetType(),
                             ParameterBinderStrings.ParameterArgumentValidationErrorEmptyStringNotAllowed,
                             "ParameterArgumentValidationErrorEmptyStringNotAllowed");
                     throw bindingException;
@@ -813,7 +813,7 @@ private void ValidateNullOrEmptyArgument(
                         GetErrorExtent(parameter),
                         parameterMetadata.Name,
                         parameterMetadata.Type,
-                        (parameterValue == null) ? null : parameterValue.GetType(),
+                        parameterValue?.GetType(),
                         resourceString,
                         errorId);
                 throw bindingException;
@@ -1781,7 +1781,7 @@ private object EncodeCollection(
                                     GetErrorExtent(argument),
                                     parameterName,
                                     toType,
-                                    (currentValueElement == null) ? null : currentValueElement.GetType(),
+                                    currentValueElement?.GetType(),
                                     ParameterBinderStrings.CannotConvertArgument,
                                     "CannotConvertArgument",
                                     currentValueElement ?? "null",
@@ -1878,7 +1878,7 @@ private object EncodeCollection(
                                 GetErrorExtent(argument),
                                 parameterName,
                                 toType,
-                                (currentValue == null) ? null : currentValue.GetType(),
+                                currentValue?.GetType(),
                                 ParameterBinderStrings.CannotConvertArgument,
                                 "CannotConvertArgument",
                                 currentValue ?? "null",
diff --git a/src/System.Management.Automation/engine/ParameterSetInfo.cs b/src/System.Management.Automation/engine/ParameterSetInfo.cs
index 97f4d72ca4c..74745fca6da 100644
--- a/src/System.Management.Automation/engine/ParameterSetInfo.cs
+++ b/src/System.Management.Automation/engine/ParameterSetInfo.cs
@@ -105,7 +105,7 @@ public override string ToString()
                     result.Append(']');
                 });
 
-          return result.ToString();
+            return result.ToString();
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/PathInterfaces.cs b/src/System.Management.Automation/engine/PathInterfaces.cs
index 2cf562d5f85..9a604829295 100644
--- a/src/System.Management.Automation/engine/PathInterfaces.cs
+++ b/src/System.Management.Automation/engine/PathInterfaces.cs
@@ -1402,7 +1402,7 @@ private LocationGlobber PathResolver
                     _sessionState != null,
                     "The only constructor for this class should always set the sessionState field");
 
-                return _pathResolver ?? (_pathResolver = _sessionState.ExecutionContext.LocationGlobber);
+                return _pathResolver ??= _sessionState.ExecutionContext.LocationGlobber;
             }
         }
 
diff --git a/src/System.Management.Automation/engine/Pipe.cs b/src/System.Management.Automation/engine/Pipe.cs
index 98b55cf1105..c930a43ef99 100644
--- 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.
@@ -299,7 +299,7 @@ internal void SetVariableListForTemporaryPipe(Pipe tempPipe)
             CopyVariableToTempPipe(VariableStreamKind.Information, _informationVariableList, tempPipe);
         }
 
-        private void CopyVariableToTempPipe(VariableStreamKind streamKind, List<IList> variableList, Pipe tempPipe)
+        private static void CopyVariableToTempPipe(VariableStreamKind streamKind, List<IList> variableList, Pipe tempPipe)
         {
             if (variableList != null && variableList.Count > 0)
             {
diff --git a/src/System.Management.Automation/engine/PseudoParameterBinder.cs b/src/System.Management.Automation/engine/PseudoParameterBinder.cs
index bddbe643f59..9bebe01b2e7 100644
--- a/src/System.Management.Automation/engine/PseudoParameterBinder.cs
+++ b/src/System.Management.Automation/engine/PseudoParameterBinder.cs
@@ -36,7 +36,7 @@ internal RuntimeDefinedParameterBinder(
             {
                 string key = pair.Key;
                 RuntimeDefinedParameter pp = pair.Value;
-                string ppName = (pp == null) ? null : pp.Name;
+                string ppName = pp?.Name;
                 if (pp == null || key != ppName)
                 {
                     ParameterBindingException bindingException =
diff --git a/src/System.Management.Automation/engine/ReflectionParameterBinder.cs b/src/System.Management.Automation/engine/ReflectionParameterBinder.cs
index ee0562f5b89..6488dbcee90 100644
--- a/src/System.Management.Automation/engine/ReflectionParameterBinder.cs
+++ b/src/System.Management.Automation/engine/ReflectionParameterBinder.cs
@@ -124,7 +124,7 @@ internal override void BindParameter(string name, object value, CompiledCommandP
             try
             {
                 var setter = parameterMetadata != null
-                    ? (parameterMetadata.Setter ?? (parameterMetadata.Setter = GetSetter(Target.GetType(), name)))
+                    ? (parameterMetadata.Setter ??= GetSetter(Target.GetType(), name))
                     : GetSetter(Target.GetType(), name);
                 setter(Target, value);
             }
diff --git a/src/System.Management.Automation/engine/ScriptCommandProcessor.cs b/src/System.Management.Automation/engine/ScriptCommandProcessor.cs
index 89e898a5532..99b685e07d2 100644
--- a/src/System.Management.Automation/engine/ScriptCommandProcessor.cs
+++ b/src/System.Management.Automation/engine/ScriptCommandProcessor.cs
@@ -131,7 +131,7 @@ protected void CommonInitialization(ScriptBlock scriptBlock, ExecutionContext co
         /// </summary>
         /// <param name="helpTarget">Help target to request.</param>
         /// <param name="helpCategory">Help category to request.</param>
-        /// <returns><c>true</c> if user requested help; <c>false</c> otherwise.</returns>
+        /// <returns><see langword="true"/> if user requested help; <see langword="false"/> otherwise.</returns>
         internal override bool IsHelpRequested(out string helpTarget, out HelpCategory helpCategory)
         {
             if (arguments != null && CommandInfo != null && !string.IsNullOrEmpty(CommandInfo.Name) && _scriptBlock != null)
@@ -274,7 +274,7 @@ private void Init()
         {
             _scriptBlock = base._scriptBlock;
             _obsoleteAttribute = _scriptBlock.ObsoleteAttribute;
-            _runOptimizedCode = _scriptBlock.Compile(optimized: _context._debuggingMode > 0 ? false : UseLocalScope);
+            _runOptimizedCode = _scriptBlock.Compile(optimized: _context._debuggingMode <= 0 && UseLocalScope);
             _localsTuple = _scriptBlock.MakeLocalsTuple(_runOptimizedCode);
 
             if (UseLocalScope)
diff --git a/src/System.Management.Automation/engine/ScriptInfo.cs b/src/System.Management.Automation/engine/ScriptInfo.cs
index 9c6b097fc05..af91867c452 100644
--- a/src/System.Management.Automation/engine/ScriptInfo.cs
+++ b/src/System.Management.Automation/engine/ScriptInfo.cs
@@ -116,9 +116,8 @@ internal override CommandMetadata CommandMetadata
         {
             get
             {
-                return _commandMetadata ??
-                       (_commandMetadata =
-                        new CommandMetadata(this.ScriptBlock, this.Name, LocalPipeline.GetExecutionContextFromTLS()));
+                return _commandMetadata ??=
+                    new CommandMetadata(this.ScriptBlock, this.Name, LocalPipeline.GetExecutionContextFromTLS());
             }
         }
 
diff --git a/src/System.Management.Automation/engine/SerializationStrings.cs b/src/System.Management.Automation/engine/SerializationStrings.cs
index a06156086d7..81b0f9cb741 100644
--- 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/SessionState.cs b/src/System.Management.Automation/engine/SessionState.cs
index 218fa6fd1c0..e0bdbd23ee0 100644
--- a/src/System.Management.Automation/engine/SessionState.cs
+++ b/src/System.Management.Automation/engine/SessionState.cs
@@ -143,7 +143,7 @@ internal void InitializeSessionStateInternalSpecialVariables(bool clearVariables
         /// </summary>
         internal LocationGlobber Globber
         {
-            get { return _globberPrivate ?? (_globberPrivate = ExecutionContext.LocationGlobber); }
+            get { return _globberPrivate ??= ExecutionContext.LocationGlobber; }
         }
 
         private LocationGlobber _globberPrivate;
@@ -158,7 +158,7 @@ internal LocationGlobber Globber
         /// </summary>
         internal SessionState PublicSessionState
         {
-            get { return _publicSessionState ?? (_publicSessionState = new SessionState(this)); }
+            get { return _publicSessionState ??= new SessionState(this); }
 
             set { _publicSessionState = value; }
         }
@@ -170,7 +170,7 @@ internal SessionState PublicSessionState
         /// </summary>
         internal ProviderIntrinsics InvokeProvider
         {
-            get { return _invokeProvider ?? (_invokeProvider = new ProviderIntrinsics(this)); }
+            get { return _invokeProvider ??= new ProviderIntrinsics(this); }
         }
 
         private ProviderIntrinsics _invokeProvider;
@@ -389,7 +389,7 @@ internal SessionStateEntryVisibility CheckApplicationVisibility(string applicati
             return checkPathVisibility(Applications, applicationPath);
         }
 
-        private SessionStateEntryVisibility checkPathVisibility(List<string> list, string path)
+        private static SessionStateEntryVisibility checkPathVisibility(List<string> list, string path)
         {
             if (list == null || list.Count == 0) return SessionStateEntryVisibility.Private;
             if (string.IsNullOrEmpty(path)) return SessionStateEntryVisibility.Private;
diff --git a/src/System.Management.Automation/engine/SessionStateContainer.cs b/src/System.Management.Automation/engine/SessionStateContainer.cs
index a2b6f3baffa..ca7f03a42ca 100644
--- a/src/System.Management.Automation/engine/SessionStateContainer.cs
+++ b/src/System.Management.Automation/engine/SessionStateContainer.cs
@@ -2061,7 +2061,7 @@ internal object GetChildItemsDynamicParameters(
         }
 
         // Detect if the GetChildItemDynamicParameters has been overridden.
-        private bool HasGetChildItemDynamicParameters(ProviderInfo providerInfo)
+        private static bool HasGetChildItemDynamicParameters(ProviderInfo providerInfo)
         {
             Type providerType = providerInfo.ImplementingType;
 
@@ -4038,7 +4038,7 @@ private bool HasChildItems(
         #region CopyItem
 
         /// <summary>
-        /// Copies an item at the specified path to an item at the <paramref name="copyPath" />.
+        /// Copies an item at the specified path to an item at the <paramref name="copyPath"/>.
         /// </summary>
         /// <param name="paths">
         /// The path(s) of the item(s) to copy.
@@ -4106,7 +4106,7 @@ internal Collection<PSObject> CopyItem(string[] paths,
         }
 
         /// <summary>
-        /// Copies an item at the specified path to an item at the <paramref name="copyPath" />.
+        /// Copies an item at the specified path to an item at the <paramref name="copyPath"/>.
         /// </summary>
         /// <param name="paths">
         /// The path(s) of the item(s) to copy.
@@ -4776,7 +4776,7 @@ private object CopyItemDynamicParameters(
 
         // This function validates a remote path, and if it exists, it returns the root path.
         //
-        private string ValidateRemotePathAndGetRoot(string path, Runspaces.PSSession session, CmdletProviderContext context, PSLanguageMode? languageMode, bool sourceIsRemote)
+        private static string ValidateRemotePathAndGetRoot(string path, Runspaces.PSSession session, CmdletProviderContext context, PSLanguageMode? languageMode, bool sourceIsRemote)
         {
             Hashtable op = null;
 
@@ -4790,9 +4790,8 @@ private string ValidateRemotePathAndGetRoot(string path, Runspaces.PSSession ses
                 if (languageMode.HasValue &&
                     (languageMode.Value == PSLanguageMode.ConstrainedLanguage || languageMode.Value == PSLanguageMode.NoLanguage))
                 {
-                    var psRemoteUtilsName = CopyFileRemoteUtils.PSCopyRemoteUtilsName;
                     ps.Runspace = session.Runspace;
-                    ps.AddCommand("Get-Command").AddArgument(psRemoteUtilsName);
+                    ps.AddCommand("Get-Command").AddArgument(CopyFileRemoteUtils.PSCopyRemoteUtilsName);
                     var result = ps.Invoke<bool>();
 
                     if (result.Count == 0)
@@ -4816,12 +4815,11 @@ private string ValidateRemotePathAndGetRoot(string path, Runspaces.PSSession ses
 
                     ps.Commands.Clear();
                     ps.Streams.ClearStreams();
-                    ps.AddCommand(psRemoteUtilsName);
+                    ps.AddCommand(CopyFileRemoteUtils.PSCopyRemoteUtilsName);
                 }
                 else
                 {
-                    string remoteScript = CopyFileRemoteUtils.PSValidatePathDefinition;
-                    ps.AddScript(remoteScript);
+                    ps.AddScript(CopyFileRemoteUtils.PSValidatePathDefinition);
                 }
 
                 ps.AddParameter("pathToValidate", path);
@@ -4894,7 +4892,7 @@ private string ValidateRemotePathAndGetRoot(string path, Runspaces.PSSession ses
             return root;
         }
 
-        private bool isValidSession(PSSession session, CmdletProviderContext context, out PSLanguageMode? languageMode)
+        private static bool isValidSession(PSSession session, CmdletProviderContext context, out PSLanguageMode? languageMode)
         {
             // session == null is validated by the parameter binding
             if (session.Availability != RunspaceAvailability.Available)
diff --git a/src/System.Management.Automation/engine/SessionStateFunctionAPIs.cs b/src/System.Management.Automation/engine/SessionStateFunctionAPIs.cs
index 42d3607cadb..adf4c396473 100644
--- a/src/System.Management.Automation/engine/SessionStateFunctionAPIs.cs
+++ b/src/System.Management.Automation/engine/SessionStateFunctionAPIs.cs
@@ -220,7 +220,7 @@ internal FunctionInfo GetFunction(string name)
             return GetFunction(name, CommandOrigin.Internal);
         }
 
-        private IEnumerable<string> GetFunctionAliases(IParameterMetadataProvider ipmp)
+        private static IEnumerable<string> GetFunctionAliases(IParameterMetadataProvider ipmp)
         {
             if (ipmp == null || ipmp.Body.ParamBlock == null)
                 yield break;
diff --git a/src/System.Management.Automation/engine/SessionStateNavigation.cs b/src/System.Management.Automation/engine/SessionStateNavigation.cs
index 4afb9218dd7..f6d1a28eb1c 100644
--- a/src/System.Management.Automation/engine/SessionStateNavigation.cs
+++ b/src/System.Management.Automation/engine/SessionStateNavigation.cs
@@ -190,7 +190,7 @@ internal string GetParentPath(
             }
         }
 
-        private string AddQualifier(string path, ProviderInfo provider, string qualifier, bool isProviderQualified, bool isDriveQualified)
+        private static string AddQualifier(string path, ProviderInfo provider, string qualifier, bool isProviderQualified, bool isDriveQualified)
         {
             string result = path;
 
@@ -640,7 +640,7 @@ internal string NormalizeRelativePath(
         /// </summary>
         /// <param name="c">The character to test.</param>
         /// <returns>True if the character is a path separator.</returns>
-        private bool IsPathSeparator(char c)
+        private static bool IsPathSeparator(char c)
         {
             return c == StringLiterals.DefaultPathSeparator || c == StringLiterals.AlternatePathSeparator;
         }
diff --git a/src/System.Management.Automation/engine/SessionStatePublic.cs b/src/System.Management.Automation/engine/SessionStatePublic.cs
index aa8932470ff..ce14d4948dc 100644
--- a/src/System.Management.Automation/engine/SessionStatePublic.cs
+++ b/src/System.Management.Automation/engine/SessionStatePublic.cs
@@ -88,7 +88,7 @@ public SessionState()
         /// </summary>
         public DriveManagementIntrinsics Drive
         {
-            get { return _drive ?? (_drive = new DriveManagementIntrinsics(_sessionState)); }
+            get { return _drive ??= new DriveManagementIntrinsics(_sessionState); }
         }
 
         /// <summary>
@@ -96,7 +96,7 @@ public DriveManagementIntrinsics Drive
         /// </summary>
         public CmdletProviderManagementIntrinsics Provider
         {
-            get { return _provider ?? (_provider = new CmdletProviderManagementIntrinsics(_sessionState)); }
+            get { return _provider ??= new CmdletProviderManagementIntrinsics(_sessionState); }
         }
 
         /// <summary>
@@ -104,7 +104,7 @@ public CmdletProviderManagementIntrinsics Provider
         /// </summary>
         public PathIntrinsics Path
         {
-            get { return _path ?? (_path = new PathIntrinsics(_sessionState)); }
+            get { return _path ??= new PathIntrinsics(_sessionState); }
         }
 
         /// <summary>
@@ -112,7 +112,7 @@ public PathIntrinsics Path
         /// </summary>
         public PSVariableIntrinsics PSVariable
         {
-            get { return _variable ?? (_variable = new PSVariableIntrinsics(_sessionState)); }
+            get { return _variable ??= new PSVariableIntrinsics(_sessionState); }
         }
 
         /// <summary>
@@ -336,6 +336,7 @@ public enum SessionStateEntryVisibility
         Private = 1
     }
 
+#nullable enable
     internal interface IHasSessionStateEntryVisibility
     {
         SessionStateEntryVisibility Visibility { get; set; }
diff --git a/src/System.Management.Automation/engine/SessionStateScope.cs b/src/System.Management.Automation/engine/SessionStateScope.cs
index db0bd76d55c..6f0c4fbbec3 100644
--- a/src/System.Management.Automation/engine/SessionStateScope.cs
+++ b/src/System.Management.Automation/engine/SessionStateScope.cs
@@ -111,7 +111,7 @@ internal SessionStateScope ScriptScope
         /// the provider has already been notified.
         /// </remarks>
         /// <exception cref="ArgumentNullException">
-        /// If <paramref name="newDrive" /> is null.
+        /// If <paramref name="newDrive"/> is null.
         /// </exception>
         /// <exception cref="SessionStateException">
         /// If a drive of the same name already exists in this scope.
@@ -165,7 +165,7 @@ internal void NewDrive(PSDriveInfo newDrive)
         /// by the provider.
         /// </remarks>
         /// <exception cref="ArgumentNullException">
-        /// If <paramref name="drive" /> is null.
+        /// If <paramref name="drive"/> is null.
         /// </exception>
         internal void RemoveDrive(PSDriveInfo drive)
         {
@@ -216,7 +216,7 @@ internal void RemoveAllDrives()
         /// exists in this scope or null if one does not exist.
         /// </returns>
         /// <exception cref="ArgumentNullException">
-        /// If <paramref name="name" /> is null.
+        /// If <paramref name="name"/> is null.
         /// </exception>
         internal PSDriveInfo GetDrive(string name)
         {
@@ -489,7 +489,7 @@ internal PSVariable SetVariable(string name, object value, bool asValue, bool fo
             }
             else
             {
-                variable = (LocalsTuple != null ? LocalsTuple.TrySetVariable(name, value) : null) ?? new PSVariable(name, value);
+                variable = (LocalsTuple?.TrySetVariable(name, value)) ?? new PSVariable(name, value);
             }
 
             if (ExecutionContext.HasEverUsedConstrainedLanguage)
@@ -1692,7 +1692,7 @@ private static FunctionInfo CreateFunction(string name, ScriptBlock function, Fu
         // performance degradation, so we use lazy initialization for all of them.
         private Dictionary<string, PSDriveInfo> GetDrives()
         {
-            return _drives ?? (_drives = new Dictionary<string, PSDriveInfo>(StringComparer.OrdinalIgnoreCase));
+            return _drives ??= new Dictionary<string, PSDriveInfo>(StringComparer.OrdinalIgnoreCase);
         }
 
         private Dictionary<string, PSDriveInfo> _drives;
@@ -1704,8 +1704,7 @@ private Dictionary<string, PSDriveInfo> GetDrives()
         // performance degradation, so we use lazy initialization for all of them.
         private Dictionary<string, PSDriveInfo> GetAutomountedDrives()
         {
-            return _automountedDrives ??
-                   (_automountedDrives = new Dictionary<string, PSDriveInfo>(StringComparer.OrdinalIgnoreCase));
+            return _automountedDrives ??= new Dictionary<string, PSDriveInfo>(StringComparer.OrdinalIgnoreCase);
         }
 
         private Dictionary<string, PSDriveInfo> _automountedDrives;
diff --git a/src/System.Management.Automation/engine/SessionStateVariableAPIs.cs b/src/System.Management.Automation/engine/SessionStateVariableAPIs.cs
index f63a0a87c0f..8cc9e4bafa4 100644
--- a/src/System.Management.Automation/engine/SessionStateVariableAPIs.cs
+++ b/src/System.Management.Automation/engine/SessionStateVariableAPIs.cs
@@ -181,7 +181,7 @@ internal object GetVariableValue(string name, object defaultValue)
         /// The variable if it was found or null if it was not.
         /// </returns>
         /// <remarks>
-        /// The <paramref name="variablePath" /> is first parsed to see if it contains a drive
+        /// The <paramref name="variablePath"/> is first parsed to see if it contains a drive
         /// specifier or special scope.  If a special scope is found ("LOCAL" or "GLOBAL")
         /// then only that scope is searched for the variable. If any other drive specifier
         /// is found the lookup goes in the following order.
@@ -252,7 +252,7 @@ internal object GetVariableValue(
         /// The variable if it was found or null if it was not.
         /// </returns>
         /// <remarks>
-        /// The <paramref name="variablePath" /> is first parsed to see if it contains a drive
+        /// The <paramref name="variablePath"/> is first parsed to see if it contains a drive
         /// specifier or special scope.  If a special scope is found ("LOCAL" or "GLOBAL")
         /// then only that scope is searched for the variable. If any other drive specifier
         /// is found the lookup goes in the following order.
@@ -523,7 +523,7 @@ internal object GetVariableValueFromProvider(
         /// The variable if it was found or null if it was not.
         /// </returns>
         /// <remarks>
-        /// The <paramref name="variablePath" /> is first parsed to see if it contains a drive
+        /// The <paramref name="variablePath"/> is first parsed to see if it contains a drive
         /// specifier or special scope.  If a special scope is found ("LOCAL" or "GLOBAL")
         /// then only that scope is searched for the variable.
         ///     - current scope
@@ -575,7 +575,7 @@ internal PSVariable GetVariableItem(
         /// The variable if it was found or null if it was not.
         /// </returns>
         /// <remarks>
-        /// The <paramref name="variablePath" /> is first parsed to see if it contains a drive
+        /// The <paramref name="variablePath"/> is first parsed to see if it contains a drive
         /// specifier or special scope.  If a special scope is found ("LOCAL" or "GLOBAL")
         /// then only that scope is searched for the variable.
         ///     - current scope
@@ -1816,7 +1816,7 @@ internal IDictionary<string, PSVariable> GetVariableTable()
             return result;
         }
 
-        private void GetScopeVariableTable(SessionStateScope scope, Dictionary<string, PSVariable> result, bool includePrivate)
+        private static void GetScopeVariableTable(SessionStateScope scope, Dictionary<string, PSVariable> result, bool includePrivate)
         {
             foreach (KeyValuePair<string, PSVariable> entry in scope.Variables)
             {
diff --git a/src/System.Management.Automation/engine/ShellVariable.cs b/src/System.Management.Automation/engine/ShellVariable.cs
index 1a4bdb359a7..f8a32fca917 100644
--- a/src/System.Management.Automation/engine/ShellVariable.cs
+++ b/src/System.Management.Automation/engine/ShellVariable.cs
@@ -387,7 +387,7 @@ internal void SetOptions(ScopedItemOptions newOptions, bool force)
         /// </remarks>
         public Collection<Attribute> Attributes
         {
-            get { return _attributes ?? (_attributes = new PSVariableAttributeCollection(this)); }
+            get { return _attributes ??= new PSVariableAttributeCollection(this); }
         }
 
         private PSVariableAttributeCollection _attributes;
@@ -840,7 +840,7 @@ public override object Value
         /// </summary>
         public override string Description
         {
-            get { return _description ?? (_description = SessionStateStrings.DollarNullDescription); }
+            get { return _description ??= SessionStateStrings.DollarNullDescription; }
 
             set { /* Do nothing */ }
         }
diff --git a/src/System.Management.Automation/engine/SpecialVariables.cs b/src/System.Management.Automation/engine/SpecialVariables.cs
index aa241b6c942..ba757722e91 100644
--- a/src/System.Management.Automation/engine/SpecialVariables.cs
+++ b/src/System.Management.Automation/engine/SpecialVariables.cs
@@ -32,6 +32,10 @@ internal static class SpecialVariables
 
         internal static readonly VariablePath OFSVarPath = new VariablePath(OFS);
 
+        internal const string PSStyle = "PSStyle";
+
+        internal static readonly VariablePath PSStyleVarPath = new VariablePath(PSStyle);
+
         internal const string OutputEncoding = "OutputEncoding";
 
         internal static readonly VariablePath OutputEncodingVarPath = new VariablePath(OutputEncoding);
diff --git a/src/System.Management.Automation/engine/Subsystem/SubsystemInfo.cs b/src/System.Management.Automation/engine/Subsystem/SubsystemInfo.cs
index b0b31504da4..24adf990d9e 100644
--- a/src/System.Management.Automation/engine/Subsystem/SubsystemInfo.cs
+++ b/src/System.Management.Automation/engine/Subsystem/SubsystemInfo.cs
@@ -90,6 +90,7 @@ private protected SubsystemInfo(SubsystemKind kind, Type subsystemType)
         }
 
         private protected abstract void AddImplementation(ISubsystem rawImpl);
+
         private protected abstract ISubsystem RemoveImplementation(Guid id);
 
         internal void RegisterImplementation(ISubsystem impl)
diff --git a/src/System.Management.Automation/engine/Subsystem/SubsystemManager.cs b/src/System.Management.Automation/engine/Subsystem/SubsystemManager.cs
index 1e32436e6da..81a27f61279 100644
--- a/src/System.Management.Automation/engine/Subsystem/SubsystemManager.cs
+++ b/src/System.Management.Automation/engine/Subsystem/SubsystemManager.cs
@@ -217,7 +217,7 @@ private static void RegisterSubsystem(SubsystemInfo subsystemInfo, ISubsystem pr
                     nameof(proxy));
             }
 
-            if (subsystemInfo.RequiredCmdlets.Any() || subsystemInfo.RequiredFunctions.Any())
+            if (subsystemInfo.RequiredCmdlets.Count > 0 || subsystemInfo.RequiredFunctions.Count > 0)
             {
                 // Process 'proxy.CmdletImplementationAssembly' and 'proxy.FunctionsToDefine'
                 // Functions are added to global scope.
@@ -265,7 +265,7 @@ public static void UnregisterSubsystem(SubsystemKind kind, Guid id)
 
         private static void UnregisterSubsystem(SubsystemInfo subsystemInfo, Guid id)
         {
-            if (subsystemInfo.RequiredCmdlets.Any() || subsystemInfo.RequiredFunctions.Any())
+            if (subsystemInfo.RequiredCmdlets.Count > 0 || subsystemInfo.RequiredFunctions.Count > 0)
             {
                 throw new NotSupportedException("NotSupported yet: unregister subsystem that introduced new cmdlets/functions.");
             }
diff --git a/src/System.Management.Automation/engine/ThirdPartyAdapter.cs b/src/System.Management.Automation/engine/ThirdPartyAdapter.cs
index 26a01b1d26d..bde0c0f3483 100644
--- a/src/System.Management.Automation/engine/ThirdPartyAdapter.cs
+++ b/src/System.Management.Automation/engine/ThirdPartyAdapter.cs
@@ -351,7 +351,7 @@ public virtual Collection<string> GetTypeNameHierarchy(object baseObject)
         /// <summary>
         /// Returns a property if it's name matches the specified <see cref="MemberNamePredicate"/>, otherwise null.
         /// </summary>
-        /// <returns>An adapted property if the predicate matches, or <c>null</c>.</returns>
+        /// <returns>An adapted property if the predicate matches, or <see langword="null"/>.</returns>
         public virtual PSAdaptedProperty GetFirstPropertyOrDefault(object baseObject, MemberNamePredicate predicate)
         {
             foreach (var property in GetProperties(baseObject))
diff --git a/src/System.Management.Automation/engine/TypeMetadata.cs b/src/System.Management.Automation/engine/TypeMetadata.cs
index 372497a0261..31a6adeab73 100644
--- a/src/System.Management.Automation/engine/TypeMetadata.cs
+++ b/src/System.Management.Automation/engine/TypeMetadata.cs
@@ -278,10 +278,10 @@ internal ParameterFlags Flags
 
             set
             {
-                this.IsMandatory = (ParameterFlags.Mandatory == (value & ParameterFlags.Mandatory));
-                this.ValueFromPipeline = (ParameterFlags.ValueFromPipeline == (value & ParameterFlags.ValueFromPipeline));
-                this.ValueFromPipelineByPropertyName = (ParameterFlags.ValueFromPipelineByPropertyName == (value & ParameterFlags.ValueFromPipelineByPropertyName));
-                this.ValueFromRemainingArguments = (ParameterFlags.ValueFromRemainingArguments == (value & ParameterFlags.ValueFromRemainingArguments));
+                this.IsMandatory = ((value & ParameterFlags.Mandatory) == ParameterFlags.Mandatory);
+                this.ValueFromPipeline = ((value & ParameterFlags.ValueFromPipeline) == ParameterFlags.ValueFromPipeline);
+                this.ValueFromPipelineByPropertyName = ((value & ParameterFlags.ValueFromPipelineByPropertyName) == ParameterFlags.ValueFromPipelineByPropertyName);
+                this.ValueFromRemainingArguments = ((value & ParameterFlags.ValueFromRemainingArguments) == ParameterFlags.ValueFromRemainingArguments);
             }
         }
 
@@ -895,7 +895,7 @@ internal string GetProxyParameterData(string prefix, string paramNameOverride, b
         /// <returns>
         /// Attribute's proxy string.
         /// </returns>
-        private string GetProxyAttributeData(Attribute attrib, string prefix)
+        private static string GetProxyAttributeData(Attribute attrib, string prefix)
         {
             string result;
 
@@ -978,7 +978,7 @@ private string GetProxyAttributeData(Attribute attrib, string prefix)
                 string or = string.Empty;
                 string[] regexOptionEnumValues = Enum.GetNames(typeof(System.Text.RegularExpressions.RegexOptions));
 
-                foreach(string regexOption in regexOptionEnumValues)
+                foreach (string regexOption in regexOptionEnumValues)
                 {
                     System.Text.RegularExpressions.RegexOptions option = (System.Text.RegularExpressions.RegexOptions) Enum.Parse(
                         typeof(System.Text.RegularExpressions.RegexOptions),
@@ -1367,7 +1367,7 @@ private void ConstructCompiledParametersUsingReflection(bool processingDynamicPa
             }
         }
 
-        private void CheckForReservedParameter(string name)
+        private static void CheckForReservedParameter(string name)
         {
             if (name.Equals("SelectProperty", StringComparison.OrdinalIgnoreCase)
                 ||
diff --git a/src/System.Management.Automation/engine/TypeTable.cs b/src/System.Management.Automation/engine/TypeTable.cs
index 3d40a915f14..0e407d57ac4 100644
--- a/src/System.Management.Automation/engine/TypeTable.cs
+++ b/src/System.Management.Automation/engine/TypeTable.cs
@@ -277,7 +277,7 @@ private void CheckStandardNote<T>(TypeMemberData member, TypeData typeData, Acti
             }
         }
 
-        private bool CheckStandardPropertySet(TypeMemberData member, TypeData typeData, Action<TypeData, PropertySetData> setter)
+        private static bool CheckStandardPropertySet(TypeMemberData member, TypeData typeData, Action<TypeData, PropertySetData> setter)
         {
             var propertySet = member as PropertySetData;
             if (propertySet != null)
@@ -4567,7 +4567,7 @@ internal void Initialize(
         /// <summary>
         /// Helper method to load content for a module.
         /// </summary>
-        private string GetModuleContents(
+        private static string GetModuleContents(
             string moduleName,
             string fileToLoad,
             ConcurrentBag<string> errors,
diff --git a/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs b/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs
index aad2f70246e..5a7133b7cd3 100644
--- a/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs
+++ b/src/System.Management.Automation/engine/TypeTable_Types_Ps1Xml.cs
@@ -9227,7 +9227,6 @@ private void Process_Types_Ps1Xml(string filePath, ConcurrentBag<string> errors)
 #if UNIX
             #region UnixStat
 
-
             if (ExperimentalFeature.IsEnabled("PSUnixFileStat"))
             {
                 typeName = @"System.IO.FileSystemInfo";
diff --git a/src/System.Management.Automation/engine/Utils.cs b/src/System.Management.Automation/engine/Utils.cs
index 968e2c2aea6..6a4a863d23c 100644
--- a/src/System.Management.Automation/engine/Utils.cs
+++ b/src/System.Management.Automation/engine/Utils.cs
@@ -49,7 +49,7 @@ internal static class Utils
 
         internal static bool TryCast(BigInteger value, out byte b)
         {
-            if (value < byte.MinValue || byte.MaxValue < value)
+            if (value < byte.MinValue || value > byte.MaxValue)
             {
                 b = 0;
                 return false;
@@ -61,7 +61,7 @@ internal static bool TryCast(BigInteger value, out byte b)
 
         internal static bool TryCast(BigInteger value, out sbyte sb)
         {
-            if (value < sbyte.MinValue || sbyte.MaxValue < value)
+            if (value < sbyte.MinValue || value > sbyte.MaxValue)
             {
                 sb = 0;
                 return false;
@@ -73,7 +73,7 @@ internal static bool TryCast(BigInteger value, out sbyte sb)
 
         internal static bool TryCast(BigInteger value, out short s)
         {
-            if (value < short.MinValue || short.MaxValue < value)
+            if (value < short.MinValue || value > short.MaxValue)
             {
                 s = 0;
                 return false;
@@ -85,7 +85,7 @@ internal static bool TryCast(BigInteger value, out short s)
 
         internal static bool TryCast(BigInteger value, out ushort us)
         {
-            if (value < ushort.MinValue || ushort.MaxValue < value)
+            if (value < ushort.MinValue || value > ushort.MaxValue)
             {
                 us = 0;
                 return false;
@@ -97,7 +97,7 @@ internal static bool TryCast(BigInteger value, out ushort us)
 
         internal static bool TryCast(BigInteger value, out int i)
         {
-            if (value < int.MinValue || int.MaxValue < value)
+            if (value < int.MinValue || value > int.MaxValue)
             {
                 i = 0;
                 return false;
@@ -109,7 +109,7 @@ internal static bool TryCast(BigInteger value, out int i)
 
         internal static bool TryCast(BigInteger value, out uint u)
         {
-            if (value < uint.MinValue || uint.MaxValue < value)
+            if (value < uint.MinValue || value > uint.MaxValue)
             {
                 u = 0;
                 return false;
@@ -121,7 +121,7 @@ internal static bool TryCast(BigInteger value, out uint u)
 
         internal static bool TryCast(BigInteger value, out long l)
         {
-            if (value < long.MinValue || long.MaxValue < value)
+            if (value < long.MinValue || value > long.MaxValue)
             {
                 l = 0;
                 return false;
@@ -133,7 +133,7 @@ internal static bool TryCast(BigInteger value, out long l)
 
         internal static bool TryCast(BigInteger value, out ulong ul)
         {
-            if (value < ulong.MinValue || ulong.MaxValue < value)
+            if (value < ulong.MinValue || value > ulong.MaxValue)
             {
                 ul = 0;
                 return false;
@@ -1391,96 +1391,11 @@ internal static bool Succeeded(int hresult)
             return hresult >= 0;
         }
 
-        // Attempt to determine the existing encoding
-        internal static Encoding GetEncoding(string path)
-        {
-            if (!File.Exists(path))
-            {
-                return ClrFacade.GetDefaultEncoding();
-            }
-
-            byte[] initialBytes = new byte[100];
-            int bytesRead = 0;
-
-            try
-            {
-                using (FileStream stream = System.IO.File.OpenRead(path))
-                {
-                    using (BinaryReader reader = new BinaryReader(stream))
-                    {
-                        bytesRead = reader.Read(initialBytes, 0, 100);
-                    }
-                }
-            }
-            catch (IOException)
-            {
-                return ClrFacade.GetDefaultEncoding();
-            }
-
-            // Test for four-byte preambles
-            string preamble = null;
-            Encoding foundEncoding = ClrFacade.GetDefaultEncoding();
-
-            if (bytesRead > 3)
-            {
-                preamble = string.Join("-", initialBytes[0], initialBytes[1], initialBytes[2], initialBytes[3]);
-
-                if (encodingMap.TryGetValue(preamble, out foundEncoding))
-                {
-                    return foundEncoding;
-                }
-            }
-
-            // Test for three-byte preambles
-            if (bytesRead > 2)
-            {
-                preamble = string.Join("-", initialBytes[0], initialBytes[1], initialBytes[2]);
-                if (encodingMap.TryGetValue(preamble, out foundEncoding))
-                {
-                    return foundEncoding;
-                }
-            }
-
-            // Test for two-byte preambles
-            if (bytesRead > 1)
-            {
-                preamble = string.Join("-", initialBytes[0], initialBytes[1]);
-                if (encodingMap.TryGetValue(preamble, out foundEncoding))
-                {
-                    return foundEncoding;
-                }
-            }
-
-            // Check for binary
-            string initialBytesAsAscii = System.Text.Encoding.ASCII.GetString(initialBytes, 0, bytesRead);
-            if (initialBytesAsAscii.IndexOfAny(nonPrintableCharacters) >= 0)
-            {
-                return Encoding.Unicode;
-            }
-
-            return utf8NoBom;
-        }
-
         // BigEndianUTF32 encoding is possible, but requires creation
         internal static readonly Encoding BigEndianUTF32Encoding = new UTF32Encoding(bigEndian: true, byteOrderMark: true);
         // [System.Text.Encoding]::GetEncodings() | Where-Object { $_.GetEncoding().GetPreamble() } |
         //     Add-Member ScriptProperty Preamble { $this.GetEncoding().GetPreamble() -join "-" } -PassThru |
         //     Format-Table -Auto
-        internal static readonly Dictionary<string, Encoding> encodingMap =
-            new Dictionary<string, Encoding>()
-            {
-                { "255-254", Encoding.Unicode },
-                { "254-255", Encoding.BigEndianUnicode },
-                { "255-254-0-0", Encoding.UTF32 },
-                { "0-0-254-255", BigEndianUTF32Encoding },
-                { "239-187-191", Encoding.UTF8 },
-            };
-
-        internal static readonly char[] nonPrintableCharacters = {
-            (char) 0, (char) 1, (char) 2, (char) 3, (char) 4, (char) 5, (char) 6, (char) 7, (char) 8,
-            (char) 11, (char) 12, (char) 14, (char) 15, (char) 16, (char) 17, (char) 18, (char) 19, (char) 20,
-            (char) 21, (char) 22, (char) 23, (char) 24, (char) 25, (char) 26, (char) 28, (char) 29, (char) 30,
-            (char) 31, (char) 127, (char) 129, (char) 141, (char) 143, (char) 144, (char) 157 };
 
         internal static readonly UTF8Encoding utf8NoBom =
             new UTF8Encoding(encoderShouldEmitUTF8Identifier: false);
@@ -1872,6 +1787,107 @@ private static bool TryGetCommandInfoList(PowerShell ps, HashSet<string> command
             return true;
         }
 
+        internal static bool ShouldOutputPlainText(bool isHost, bool? supportsVirtualTerminal)
+        {
+            var outputRendering = OutputRendering.Ansi;
+
+            if (ExperimentalFeature.IsEnabled("PSAnsiRendering"))
+            {
+                if (supportsVirtualTerminal != false)
+                {
+                    switch (PSStyle.Instance.OutputRendering)
+                    {
+                        case OutputRendering.Automatic:
+                            outputRendering = OutputRendering.Ansi;
+                            break;
+                        case OutputRendering.Host:
+                            outputRendering = isHost ? OutputRendering.Ansi : OutputRendering.PlainText;
+                            break;
+                        default:
+                            outputRendering = PSStyle.Instance.OutputRendering;
+                            break;
+                    }
+                }
+            }
+
+            return outputRendering == OutputRendering.PlainText;
+        }
+
+        internal static string GetOutputString(string s, bool isHost, bool? supportsVirtualTerminal = null, bool isOutputRedirected = false)
+        {
+            if (ExperimentalFeature.IsEnabled("PSAnsiRendering"))
+            {
+                var sd = new ValueStringDecorated(s);
+
+                if (sd.IsDecorated)
+                {
+                    var outputRendering = OutputRendering.Ansi;
+                    if (InternalTestHooks.BypassOutputRedirectionCheck)
+                    {
+                        isOutputRedirected = false;
+                    }
+
+                    if (isOutputRedirected || ShouldOutputPlainText(isHost, supportsVirtualTerminal))
+                    {
+                        outputRendering = OutputRendering.PlainText;
+                    }
+
+                    s = sd.ToString(outputRendering);
+                }
+            }
+
+            return s;
+        }
+
+        internal enum FormatStyle
+        {
+            Reset,
+            FormatAccent,
+            ErrorAccent,
+            Error,
+            Warning,
+            Verbose,
+            Debug,
+        }
+
+        internal static string GetFormatStyleString(FormatStyle formatStyle)
+        {
+            // redirected console gets plaintext output to preserve existing behavior
+            if (!InternalTestHooks.BypassOutputRedirectionCheck &&
+                ((PSStyle.Instance.OutputRendering == OutputRendering.PlainText) ||
+                (formatStyle == FormatStyle.Error && Console.IsErrorRedirected) ||
+                (formatStyle != FormatStyle.Error && Console.IsOutputRedirected)))
+            {
+                return string.Empty;
+            }
+
+            if (ExperimentalFeature.IsEnabled("PSAnsiRendering"))
+            {
+                PSStyle psstyle = PSStyle.Instance;                
+                switch (formatStyle)
+                {
+                    case FormatStyle.Reset:
+                        return psstyle.Reset;
+                    case FormatStyle.FormatAccent:
+                        return psstyle.Formatting.FormatAccent;
+                    case FormatStyle.ErrorAccent:
+                        return psstyle.Formatting.ErrorAccent;
+                    case FormatStyle.Error:
+                        return psstyle.Formatting.Error;
+                    case FormatStyle.Warning:
+                        return psstyle.Formatting.Warning;
+                    case FormatStyle.Verbose:
+                        return psstyle.Formatting.Verbose;
+                    case FormatStyle.Debug:
+                        return psstyle.Formatting.Debug;
+                    default:
+                        return string.Empty;
+                }
+            }
+
+            return string.Empty;
+        }
+
         #endregion
     }
 
@@ -2055,6 +2071,7 @@ public static class InternalTestHooks
         internal static bool BypassAppLockerPolicyCaching;
         internal static bool BypassOnlineHelpRetrieval;
         internal static bool ForcePromptForChoiceDefaultOption;
+        internal static bool BypassOutputRedirectionCheck;
 
         // Stop/Restart/Rename Computer tests
         internal static bool TestStopComputer;
diff --git a/src/System.Management.Automation/engine/debugger/Breakpoint.cs b/src/System.Management.Automation/engine/debugger/Breakpoint.cs
index b506ee8a246..ca1c9818206 100644
--- a/src/System.Management.Automation/engine/debugger/Breakpoint.cs
+++ b/src/System.Management.Automation/engine/debugger/Breakpoint.cs
@@ -434,7 +434,9 @@ public override string ToString()
         }
 
         internal int SequencePointIndex { get; set; }
+
         internal IScriptExtent[] SequencePoints { get; set; }
+
         internal BitArray BreakpointBitArray { get; set; }
 
         private class CheckBreakpointInScript : AstVisitor
diff --git a/src/System.Management.Automation/engine/debugger/debugger.cs b/src/System.Management.Automation/engine/debugger/debugger.cs
index a32276bcc79..30e83c38f90 100644
--- 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.
@@ -1447,7 +1447,7 @@ private List<VariableBreakpoint> GetVariableBreakpointsToTrigger(string variable
                     return null;
 
                 var callStackInfo = _callStack.Last();
-                var currentScriptFile = (callStackInfo != null) ? callStackInfo.File : null;
+                var currentScriptFile = callStackInfo?.File;
                 return breakpoints.Values.Where(bp => bp.Trigger(currentScriptFile, read: read)).ToList();
             }
             finally
@@ -1578,8 +1578,11 @@ internal void OnSequencePointHit(FunctionContext functionContext)
         private class CallStackInfo
         {
             internal InvocationInfo InvocationInfo { get; set; }
+
             internal string File { get; set; }
+
             internal bool DebuggerStepThrough { get; set; }
+
             internal FunctionContext FunctionContext { get; set; }
 
             /// <summary>
@@ -1589,7 +1592,7 @@ private class CallStackInfo
             internal bool IsFrameHidden { get; set; }
 
             internal bool TopFrameAtBreakpoint { get; set; }
-        };
+        }
 
         private struct CallStackList
         {
@@ -1633,7 +1636,7 @@ internal CallStackInfo Last()
             internal FunctionContext LastFunctionContext()
             {
                 var last = Last();
-                return last != null ? last.FunctionContext : null;
+                return last?.FunctionContext;
             }
 
             internal bool Any()
@@ -2865,7 +2868,7 @@ public override Breakpoint DisableBreakpoint(Breakpoint breakpoint, int? runspac
             return null;
         }
 
-        private Debugger GetRunspaceDebugger(int runspaceId)
+        private static Debugger GetRunspaceDebugger(int runspaceId)
         {
             if (!Runspace.RunspaceDictionary.TryGetValue(runspaceId, out WeakReference<Runspace> wr))
             {
@@ -3677,7 +3680,7 @@ private void RemoveFromRunningRunspaceList(Runspace runspace)
             }
 
             // Clean up nested debugger.
-            NestedRunspaceDebugger nestedDebugger = (runspaceInfo != null) ? runspaceInfo.NestedDebugger : null;
+            NestedRunspaceDebugger nestedDebugger = runspaceInfo?.NestedDebugger;
             if (nestedDebugger != null)
             {
                 nestedDebugger.DebuggerStop -= HandleMonitorRunningRSDebuggerStop;
@@ -4138,7 +4141,7 @@ internal void TraceVariableSet(string varName, object value)
             // because 'ToStringParser' would iterate through the enumerator to get the individual elements, which will
             // make irreversible changes to the enumerator.
             bool isValueAnIEnumerator = PSObject.Base(value) is IEnumerator;
-            string valAsString = isValueAnIEnumerator ? typeof(IEnumerator).Name : PSObject.ToStringParser(_context, value);
+            string valAsString = isValueAnIEnumerator ? nameof(IEnumerator) : PSObject.ToStringParser(_context, value);
             int msgLength = 60 - varName.Length;
 
             if (valAsString.Length > msgLength)
@@ -4195,7 +4198,7 @@ public Guid ParentDebuggerId
         /// <param name="runspace">Runspace.</param>
         /// <param name="runspaceType">Runspace type.</param>
         /// <param name="parentDebuggerId">Debugger Id of parent.</param>
-        public NestedRunspaceDebugger(
+        protected NestedRunspaceDebugger(
             Runspace runspace,
             PSMonitorRunspaceType runspaceType,
             Guid parentDebuggerId)
@@ -4447,14 +4450,14 @@ protected virtual DebuggerCommandResults HandlePromptCommand(PSDataCollection<PS
         {
             // Nested debugged runspace prompt should look like:
             // [ComputerName]: [DBG]: [Process:<id>]: [RunspaceName]: PS C:\>
-            string computerName = (_runspace.ConnectionInfo != null) ? _runspace.ConnectionInfo.ComputerName : null;
-            string processPartPattern = "{0}[{1}:{2}]:{3}";
+            string computerName = _runspace.ConnectionInfo?.ComputerName;
+            const string processPartPattern = "{0}[{1}:{2}]:{3}";
             string processPart = StringUtil.Format(processPartPattern,
                 @"""",
                 DebuggerStrings.NestedRunspaceDebuggerPromptProcessName,
                 @"$($PID)",
                 @"""");
-            string locationPart = @"""PS $($executionContext.SessionState.Path.CurrentLocation)> """;
+            const string locationPart = @"""PS $($executionContext.SessionState.Path.CurrentLocation)> """;
             string promptScript = "'[DBG]: '" + " + " + processPart + " + " + "' [" + CodeGeneration.EscapeSingleQuotedStringContent(_runspace.Name) + "]: '" + " + " + locationPart;
 
             // Get the command prompt from the wrapped debugger.
@@ -4647,7 +4650,7 @@ private object DrainAndBlockRemoteOutput()
             return null;
         }
 
-        private void RestoreRemoteOutput(object runningCmd)
+        private static void RestoreRemoteOutput(object runningCmd)
         {
             if (runningCmd == null) { return; }
 
@@ -4905,7 +4908,7 @@ private InvocationInfo CreateInvocationInfoFromParent(
             return null;
         }
 
-        private string FixUpStatementExtent(int startColNum, string stateExtentText)
+        private static string FixUpStatementExtent(int startColNum, string stateExtentText)
         {
             Text.StringBuilder sb = new Text.StringBuilder();
             sb.Append(' ', startColNum);
@@ -4944,7 +4947,7 @@ private object DrainAndBlockRemoteOutput()
             return null;
         }
 
-        private void RestoreRemoteOutput(object runningCmd)
+        private static void RestoreRemoteOutput(object runningCmd)
         {
             if (runningCmd == null) { return; }
 
@@ -5204,7 +5207,7 @@ private DebuggerCommand DoProcessCommand(PSHost host, string command, Invocation
         /// <summary>
         /// Displays the help text for the debugger commands.
         /// </summary>
-        private void DisplayHelp(PSHost host, IList<PSObject> output)
+        private static void DisplayHelp(PSHost host, IList<PSObject> output)
         {
             WriteLine(string.Empty, host, output);
             WriteLine(StringUtil.Format(DebuggerStrings.StepHelp, StepShortcut, StepCommand), host, output);
@@ -5332,7 +5335,7 @@ private void DisplayScript(PSHost host, IList<PSObject> output, InvocationInfo i
             WriteCR(host, output);
         }
 
-        private void WriteLine(string line, PSHost host, IList<PSObject> output)
+        private static void WriteLine(string line, PSHost host, IList<PSObject> output)
         {
             if (host != null)
             {
@@ -5345,7 +5348,7 @@ private void WriteLine(string line, PSHost host, IList<PSObject> output)
             }
         }
 
-        private void WriteCR(PSHost host, IList<PSObject> output)
+        private static void WriteCR(PSHost host, IList<PSObject> output)
         {
             if (host != null)
             {
@@ -5358,7 +5361,7 @@ private void WriteCR(PSHost host, IList<PSObject> output)
             }
         }
 
-        private void WriteErrorLine(string error, PSHost host, IList<PSObject> output)
+        private static void WriteErrorLine(string error, PSHost host, IList<PSObject> output)
         {
             if (host != null)
             {
diff --git a/src/System.Management.Automation/engine/hostifaces/AsyncResult.cs b/src/System.Management.Automation/engine/hostifaces/AsyncResult.cs
index fa965f4ab59..f1e57e6fe39 100644
--- a/src/System.Management.Automation/engine/hostifaces/AsyncResult.cs
+++ b/src/System.Management.Automation/engine/hostifaces/AsyncResult.cs
@@ -42,7 +42,7 @@ internal class AsyncResult : IAsyncResult
         /// </param>
         internal AsyncResult(Guid ownerId, AsyncCallback callback, object state)
         {
-            Dbg.Assert(Guid.Empty != ownerId, "ownerId cannot be empty");
+            Dbg.Assert(ownerId != Guid.Empty, "ownerId cannot be empty");
             OwnerId = ownerId;
             Callback = callback;
             AsyncState = state;
diff --git a/src/System.Management.Automation/engine/hostifaces/Command.cs b/src/System.Management.Automation/engine/hostifaces/Command.cs
index 4af611980d3..6d8cd526486 100644
--- a/src/System.Management.Automation/engine/hostifaces/Command.cs
+++ b/src/System.Management.Automation/engine/hostifaces/Command.cs
@@ -422,7 +422,7 @@ public void MergeMyResults(PipelineResultTypes myResult, PipelineResultTypes toR
             }
         }
 
-        private Pipe GetRedirectionPipe(
+        private static Pipe GetRedirectionPipe(
             PipelineResultTypes toType,
             MshCommandRuntime mcr)
         {
diff --git a/src/System.Management.Automation/engine/hostifaces/Connection.cs b/src/System.Management.Automation/engine/hostifaces/Connection.cs
index 29e86c91b9b..5af011adb82 100644
--- 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
@@ -952,7 +952,7 @@ internal void UpdateRunspaceAvailability(PipelineState pipelineState, bool raise
                             {
                                 RemoteRunspace remoteRunspace = this as RemoteRunspace;
                                 RemoteDebugger remoteDebugger = (remoteRunspace != null) ? remoteRunspace.Debugger as RemoteDebugger : null;
-                                Internal.ConnectCommandInfo remoteCommand = (remoteRunspace != null) ? remoteRunspace.RemoteCommand : null;
+                                Internal.ConnectCommandInfo remoteCommand = remoteRunspace?.RemoteCommand;
                                 if (((pipelineState == PipelineState.Completed) || (pipelineState == PipelineState.Failed) ||
                                     ((pipelineState == PipelineState.Stopped) && (this.RunspaceStateInfo.State == RunspaceState.Opened)))
                                     && (remoteCommand != null) && (cmdInstanceId != null) && (remoteCommand.CommandId == cmdInstanceId))
@@ -1590,7 +1590,7 @@ public virtual Debugger Debugger
             get
             {
                 var context = GetExecutionContext;
-                return (context != null) ? context.Debugger : null;
+                return context?.Debugger;
             }
         }
 
@@ -1651,6 +1651,7 @@ public virtual void ResetRunspaceState()
 
         // Used for pipeline id generation.
         private long _pipelineIdSeed;
+
         // Generate pipeline id unique to this runspace
         internal long GeneratePipelineId()
         {
diff --git a/src/System.Management.Automation/engine/hostifaces/ConnectionBase.cs b/src/System.Management.Automation/engine/hostifaces/ConnectionBase.cs
index 48129196ad8..99151b7b0d4 100644
--- a/src/System.Management.Automation/engine/hostifaces/ConnectionBase.cs
+++ b/src/System.Management.Automation/engine/hostifaces/ConnectionBase.cs
@@ -1574,7 +1574,7 @@ internal ProviderIntrinsics InvokeProvider
         /// <returns></returns>
         internal override SessionStateProxy GetSessionStateProxy()
         {
-            return _sessionStateProxy ?? (_sessionStateProxy = new SessionStateProxy(this));
+            return _sessionStateProxy ??= new SessionStateProxy(this);
         }
 
         #endregion session state proxy
diff --git a/src/System.Management.Automation/engine/hostifaces/FieldDescription.cs b/src/System.Management.Automation/engine/hostifaces/FieldDescription.cs
index c9a2c9fe424..75987cc463a 100644
--- a/src/System.Management.Automation/engine/hostifaces/FieldDescription.cs
+++ b/src/System.Management.Automation/engine/hostifaces/FieldDescription.cs
@@ -291,7 +291,7 @@ public string Name
         Collection<Attribute>
         Attributes
         {
-            get { return metadata ?? (metadata = new Collection<Attribute>()); }
+            get { return metadata ??= new Collection<Attribute>(); }
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/hostifaces/History.cs b/src/System.Management.Automation/engine/hostifaces/History.cs
index ddf533142a8..e1100b97487 100644
--- a/src/System.Management.Automation/engine/hostifaces/History.cs
+++ b/src/System.Management.Automation/engine/hostifaces/History.cs
@@ -416,7 +416,7 @@ internal HistoryInfo[] GetEntries(long id, long count, SwitchParameter newest)
                     }
                     else
                     {
-                        index = _countEntriesAdded;//SmallestIDinBuffer
+                        index = _countEntriesAdded; //SmallestIDinBuffer
 
                         for (long i = count - 1; i >= 0;)
                         {
@@ -755,11 +755,11 @@ private void IncrementCountOfEntriesInBuffer()
         /// Get the current history size.
         /// </summary>
         /// <returns></returns>
-        private int GetHistorySize()
+        private static int GetHistorySize()
         {
             int historySize = 0;
             var executionContext = LocalPipeline.GetExecutionContextFromTLS();
-            object obj = (executionContext != null) ? executionContext.GetVariableValue(SpecialVariables.HistorySizeVarPath) : null;
+            object obj = executionContext?.GetVariableValue(SpecialVariables.HistorySizeVarPath);
             if (obj != null)
             {
                 try
@@ -1315,7 +1315,7 @@ private void PopulateIdAndCommandLine()
         /// in the pipeline. If there are more than one element in pipeline
         /// (ex A | Invoke-History 2 | B) then we cannot do this replacement.
         /// </summary>
-        private void ReplaceHistoryString(HistoryInfo entry, LocalRunspace localRunspace)
+        private static void ReplaceHistoryString(HistoryInfo entry, LocalRunspace localRunspace)
         {
             var pipeline = (LocalPipeline)localRunspace.GetCurrentlyRunningPipeline();
             if (pipeline.AddToHistory)
@@ -1433,6 +1433,7 @@ void ProcessRecord()
                 {
                     break;
                 }
+
                 // Read CommandLine property
                 if (!(GetPropertyValue(mshObject, "CommandLine") is string commandLine))
                 {
@@ -1441,109 +1442,32 @@ void ProcessRecord()
 
                 // Read ExecutionStatus property
                 object pipelineState = GetPropertyValue(mshObject, "ExecutionStatus");
-                if (pipelineState == null)
-                {
-                    break;
-                }
-
-                PipelineState executionStatus;
-                if (pipelineState is PipelineState)
-                {
-                    executionStatus = (PipelineState)pipelineState;
-                }
-                else if (pipelineState is PSObject)
-                {
-                    PSObject serializedPipelineState = pipelineState as PSObject;
-                    object baseObject = serializedPipelineState.BaseObject;
-                    if (baseObject is not int)
-                    {
-                        break;
-                    }
-
-                    executionStatus = (PipelineState)baseObject;
-                    if (executionStatus < PipelineState.NotStarted || executionStatus > PipelineState.Failed)
-                    {
-                        break;
-                    }
-                }
-                else if (pipelineState is string)
-                {
-                    try
-                    {
-                        executionStatus = (PipelineState)Enum.Parse(typeof(PipelineState), (string)pipelineState);
-                    }
-                    catch (ArgumentException)
-                    {
-                        break;
-                    }
-                }
-                else
+                if (pipelineState == null || !LanguagePrimitives.TryConvertTo<PipelineState>(pipelineState, out PipelineState executionStatus))
                 {
                     break;
                 }
 
                 // Read StartExecutionTime property
-                DateTime startExecutionTime;
                 object temp = GetPropertyValue(mshObject, "StartExecutionTime");
-                if (temp == null)
-                {
-                    break;
-                }
-                else if (temp is DateTime)
-                {
-                    startExecutionTime = (DateTime)temp;
-                }
-                else if (temp is string)
-                {
-                    try
-                    {
-                        startExecutionTime = DateTime.Parse((string)temp, System.Globalization.CultureInfo.CurrentCulture);
-                    }
-                    catch (FormatException)
-                    {
-                        break;
-                    }
-                }
-                else
+                if (temp == null || !LanguagePrimitives.TryConvertTo<DateTime>(temp, out DateTime startExecutionTime))
                 {
                     break;
                 }
 
                 // Read EndExecutionTime property
-                DateTime endExecutionTime;
                 temp = GetPropertyValue(mshObject, "EndExecutionTime");
-                if (temp == null)
-                {
-                    break;
-                }
-                else if (temp is DateTime)
-                {
-                    endExecutionTime = (DateTime)temp;
-                }
-                else if (temp is string)
-                {
-                    try
-                    {
-                        endExecutionTime = DateTime.Parse((string)temp, System.Globalization.CultureInfo.CurrentCulture);
-                    }
-                    catch (FormatException)
-                    {
-                        break;
-                    }
-                }
-                else
+                if (temp == null || !LanguagePrimitives.TryConvertTo<DateTime>(temp, out DateTime endExecutionTime))
                 {
                     break;
                 }
 
-                return new HistoryInfo
-                            (
-                                0,
-                                commandLine,
-                                executionStatus,
-                                startExecutionTime,
-                                endExecutionTime
-                            );
+                return new HistoryInfo(
+                    pipelineId: 0,
+                    commandLine,
+                    executionStatus,
+                    startExecutionTime,
+                    endExecutionTime
+                );
             } while (false);
 
             // If we are here, an error has occured.
@@ -1816,7 +1740,7 @@ private void ClearHistoryByID()
                 // confirmation message if all the clearhistory cmdlet is used without any parameters
                 if (!_countParameterSpecified)
                 {
-                    string message = StringUtil.Format(HistoryStrings.ClearHistoryWarning, "Warning");// "The command would clear all the entry(s) from the session history,Are you sure you want to continue ?";
+                    string message = StringUtil.Format(HistoryStrings.ClearHistoryWarning, "Warning"); // "The command would clear all the entry(s) from the session history,Are you sure you want to continue ?";
                     if (!ShouldProcess(message))
                     {
                         return;
@@ -1897,10 +1821,10 @@ private void ClearHistoryByCmdLine()
 
         /// <summary>
         /// Clears the session history based on the input parameter
-        /// <param name="id" >Id of the entry to be cleared.</param>
-        /// <param name="count" >Count of entries to be cleared.</param>
-        /// <param name="cmdline" >Cmdline string to be cleared.</param>
-        /// <param name="newest" >Order of the entries.</param>
+        /// <param name="id">Id of the entry to be cleared.</param>
+        /// <param name="count">Count of entries to be cleared.</param>
+        /// <param name="cmdline">Cmdline string to be cleared.</param>
+        /// <param name="newest">Order of the entries.</param>
         /// <returns>Nothing.</returns>
         /// </summary>
         private void ClearHistoryEntries(long id, int count, string cmdline, SwitchParameter newest)
diff --git a/src/System.Management.Automation/engine/hostifaces/InternalHostUserInterface.cs b/src/System.Management.Automation/engine/hostifaces/InternalHostUserInterface.cs
index 4dbc7acb855..b30d64d04db 100644
--- a/src/System.Management.Automation/engine/hostifaces/InternalHostUserInterface.cs
+++ b/src/System.Management.Automation/engine/hostifaces/InternalHostUserInterface.cs
@@ -49,8 +49,7 @@ class InternalHostUserInterface : PSHostUserInterface, IHostUISupportsMultipleCh
             _internalRawUI.ThrowNotInteractive();
         }
 
-        private
-        void
+        private static void
         ThrowPromptNotInteractive(string promptMessage)
         {
             string message = StringUtil.Format(HostInterfaceExceptionsStrings.HostFunctionPromptNotImplemented, promptMessage);
@@ -79,7 +78,7 @@ public override
 
         public override bool SupportsVirtualTerminal
         {
-            get { return (_externalUI != null) ? _externalUI.SupportsVirtualTerminal : false; }
+            get { return _externalUI != null && _externalUI.SupportsVirtualTerminal; }
         }
 
         /// <summary>
@@ -680,12 +679,12 @@ internal static Type GetFieldType(FieldDescription field)
 
         internal static bool IsSecuritySensitiveType(string typeName)
         {
-            if (typeName.Equals(typeof(PSCredential).Name, StringComparison.OrdinalIgnoreCase))
+            if (typeName.Equals(nameof(PSCredential), StringComparison.OrdinalIgnoreCase))
             {
                 return true;
             }
 
-            if (typeName.Equals(typeof(SecureString).Name, StringComparison.OrdinalIgnoreCase))
+            if (typeName.Equals(nameof(SecureString), StringComparison.OrdinalIgnoreCase))
             {
                 return true;
             }
@@ -912,7 +911,7 @@ private Collection<int> EmulatePromptForMultipleChoice(string caption,
 
             // Construct the caption + message + list of choices + default choices
             Text.StringBuilder choicesMessage = new Text.StringBuilder();
-            char newLine = '\n';
+            const char newLine = '\n';
             if (!string.IsNullOrEmpty(caption))
             {
                 choicesMessage.Append(caption);
@@ -928,7 +927,7 @@ private Collection<int> EmulatePromptForMultipleChoice(string caption,
             string[,] hotkeysAndPlainLabels = null;
             HostUIHelperMethods.BuildHotkeysAndPlainLabels(choices, out hotkeysAndPlainLabels);
 
-            string choiceTemplate = "[{0}] {1}  ";
+            const string choiceTemplate = "[{0}] {1}  ";
             for (int i = 0; i < hotkeysAndPlainLabels.GetLength(1); ++i)
             {
                 string choice =
diff --git a/src/System.Management.Automation/engine/hostifaces/LocalConnection.cs b/src/System.Management.Automation/engine/hostifaces/LocalConnection.cs
index 22a0ab07d05..7f10b75525c 100644
--- a/src/System.Management.Automation/engine/hostifaces/LocalConnection.cs
+++ b/src/System.Management.Automation/engine/hostifaces/LocalConnection.cs
@@ -941,7 +941,7 @@ private void DoCloseHelper()
         /// function.  If a remote runspace supports disconnect then it will be disconnected
         /// rather than closed.
         /// </summary>
-        private void CloseOrDisconnectAllRemoteRunspaces(Func<List<RemoteRunspace>> getRunspaces)
+        private static void CloseOrDisconnectAllRemoteRunspaces(Func<List<RemoteRunspace>> getRunspaces)
         {
             List<RemoteRunspace> runspaces = getRunspaces();
             if (runspaces.Count == 0) { return; }
diff --git a/src/System.Management.Automation/engine/hostifaces/LocalPipeline.cs b/src/System.Management.Automation/engine/hostifaces/LocalPipeline.cs
index 61f391dd358..ab430decb50 100644
--- a/src/System.Management.Automation/engine/hostifaces/LocalPipeline.cs
+++ b/src/System.Management.Automation/engine/hostifaces/LocalPipeline.cs
@@ -249,7 +249,7 @@ protected override void StartPipelineExecution()
                     }
 
                 default:
-                    Debug.Fail("");
+                    Debug.Fail(string.Empty);
                     break;
             }
         }
@@ -1251,7 +1251,7 @@ public void Dispose()
         }
 
         /// <summary>
-        /// Ensure we release the worker thread.
+        /// Finalizes an instance of the <see cref="PipelineThread"/> class.
         /// </summary>
         ~PipelineThread()
         {
diff --git a/src/System.Management.Automation/engine/hostifaces/MshHost.cs b/src/System.Management.Automation/engine/hostifaces/MshHost.cs
index 64d8f1170f2..7ee89d14b12 100644
--- a/src/System.Management.Automation/engine/hostifaces/MshHost.cs
+++ b/src/System.Management.Automation/engine/hostifaces/MshHost.cs
@@ -290,6 +290,7 @@ public virtual bool DebuggerEnabled
     /// This interface needs to be implemented by PSHost objects that want to support the PushRunspace
     /// and PopRunspace functionality.
     /// </summary>
+#nullable enable
     public interface IHostSupportsInteractiveSession
     {
         /// <summary>
@@ -317,6 +318,6 @@ public interface IHostSupportsInteractiveSession
         /// Returns the current runspace associated with this host.
         /// </summary>
         [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Runspace")]
-        Runspace Runspace { get; }
+        Runspace? Runspace { get; }
     }
 }
diff --git a/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs b/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs
index caaaa17a9ac..1e3da98da26 100644
--- a/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs
+++ b/src/System.Management.Automation/engine/hostifaces/MshHostUserInterface.cs
@@ -619,6 +619,16 @@ internal void TranscribeResult(Runspace sourceRunspace, string resultText)
                     }
 
                     resultText = resultText.TrimEnd();
+
+                    if (ExperimentalFeature.IsEnabled("PSAnsiRendering"))
+                    {
+                        var text = new ValueStringDecorated(resultText);
+                        if (text.IsDecorated)
+                        {
+                            resultText = text.ToString(OutputRendering.PlainText);
+                        }
+                    }
+
                     foreach (TranscriptionOption transcript in TranscriptionData.Transcripts.Prepend<TranscriptionOption>(TranscriptionData.SystemTranscript))
                     {
                         if (transcript != null)
@@ -1051,8 +1061,11 @@ internal TranscriptionData()
         internal List<TranscriptionOption> Transcripts { get; }
 
         internal TranscriptionOption SystemTranscript { get; set; }
+
         internal string CommandBeingIgnored { get; set; }
+
         internal bool IsHelperCommand { get; set; }
+
         internal string PromptText { get; set; }
     }
 
@@ -1068,22 +1081,7 @@ internal TranscriptionOption()
         /// <summary>
         /// The path that this transcript is being logged to.
         /// </summary>
-        internal string Path
-        {
-            get
-            {
-                return _path;
-            }
-
-            set
-            {
-                _path = value;
-                // Get the encoding from the file, or default (UTF8-NoBom)
-                Encoding = Utils.GetEncoding(value);
-            }
-        }
-
-        private string _path;
+        internal string Path { get; set; }
 
         /// <summary>
         /// Any output to log for this transcript.
@@ -1101,12 +1099,6 @@ internal string Path
         /// </summary>
         internal bool IncludeInvocationHeader { get; set; }
 
-        /// <summary>
-        /// The encoding of this transcript, so that appending to it
-        /// can be done correctly.
-        /// </summary>
-        internal Encoding Encoding { get; private set; }
-
         /// <summary>
         /// Logs buffered content to disk. We use this instead of File.AppendAllLines
         /// so that we don't need to pay seek penalties all the time, and so that we
@@ -1114,6 +1106,13 @@ internal string Path
         /// </summary>
         internal void FlushContentToDisk()
         {
+            static Encoding GetPathEncoding(string path)
+            {
+                using StreamReader reader = new StreamReader(path, Utils.utf8NoBom, detectEncodingFromByteOrderMarks: true);
+                _ = reader.Read();
+                return reader.CurrentEncoding;
+            }
+
             lock (OutputBeingLogged)
             {
                 if (!_disposed)
@@ -1122,11 +1121,13 @@ internal void FlushContentToDisk()
                     {
                         try
                         {
+                            var currentEncoding = GetPathEncoding(this.Path);
+
                             // Try to first open the file with permissions that will allow us to read from it
                             // later.
                             _contentWriter = new StreamWriter(
                                 new FileStream(this.Path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.Read),
-                                this.Encoding);
+                                currentEncoding);
                             _contentWriter.BaseStream.Seek(0, SeekOrigin.End);
                         }
                         catch (IOException)
@@ -1135,7 +1136,7 @@ internal void FlushContentToDisk()
                             // file permissions.
                             _contentWriter = new StreamWriter(
                                 new FileStream(this.Path, FileMode.Append, FileAccess.Write, FileShare.Read),
-                                this.Encoding);
+                                Utils.utf8NoBom);
                         }
 
                         _contentWriter.AutoFlush = true;
diff --git a/src/System.Management.Automation/engine/hostifaces/PSDataCollection.cs b/src/System.Management.Automation/engine/hostifaces/PSDataCollection.cs
index 6d690d1206e..1743e6d4678 100644
--- a/src/System.Management.Automation/engine/hostifaces/PSDataCollection.cs
+++ b/src/System.Management.Automation/engine/hostifaces/PSDataCollection.cs
@@ -1629,7 +1629,7 @@ private static void VerifyValueType(object value)
         }
 
         // Serializes an object, as long as it's not serialized.
-        private PSObject GetSerializedObject(object value)
+        private static PSObject GetSerializedObject(object value)
         {
             // This is a safe cast, as this method is only called with "SerializeInput" is set,
             // and that method throws if the collection type is not PSObject.
@@ -1654,7 +1654,7 @@ private PSObject GetSerializedObject(object value)
             }
         }
 
-        private bool SerializationWouldHaveNoEffect(PSObject result)
+        private static bool SerializationWouldHaveNoEffect(PSObject result)
         {
             if (result == null)
             {
diff --git a/src/System.Management.Automation/engine/hostifaces/PowerShell.cs b/src/System.Management.Automation/engine/hostifaces/PowerShell.cs
index 11fc4592fb0..a76dbe1c0b1 100644
--- a/src/System.Management.Automation/engine/hostifaces/PowerShell.cs
+++ b/src/System.Management.Automation/engine/hostifaces/PowerShell.cs
@@ -4602,7 +4602,7 @@ private void CoreInvokeRemoteHelper<TInput, TOutput>(PSDataCollection<TInput> in
             psAsyncResult.EndInvoke();
             EndInvokeAsyncResult = null;
 
-            if ((PSInvocationState.Failed == InvocationStateInfo.State) &&
+            if ((InvocationStateInfo.State == PSInvocationState.Failed) &&
                         (InvocationStateInfo.Reason != null))
             {
                 throw InvocationStateInfo.Reason;
@@ -4931,7 +4931,7 @@ private IAsyncResult CoreInvokeAsync<TInput, TOutput>(PSDataCollection<TInput> i
         /// <summary>
         /// Verifies the settings for ThreadOptions and ApartmentState.
         /// </summary>
-        private void VerifyThreadSettings(PSInvocationSettings settings, ApartmentState runspaceApartmentState, PSThreadOptions runspaceThreadOptions, bool isRemote)
+        private static void VerifyThreadSettings(PSInvocationSettings settings, ApartmentState runspaceApartmentState, PSThreadOptions runspaceThreadOptions, bool isRemote)
         {
             ApartmentState apartmentState;
 
@@ -5546,7 +5546,7 @@ internal bool ConstructPipelineAndDoWork(Runspace rs, bool performSyncInvoke)
                         LocalPipeline localPipeline = new LocalPipeline(
                             lrs,
                             _shell.Commands.Commands,
-                            ((_settings != null) && (_settings.AddToHistory)) ? true : false,
+                            (_settings != null && _settings.AddToHistory),
                             _shell.IsNested,
                             _inputStream,
                             _outputStream,
@@ -5827,7 +5827,7 @@ internal PSObject ToPSObjectForRemoting()
             return powerShellAsPSObject;
         }
 
-        private List<PSObject> CommandsAsListOfPSObjects(CommandCollection commands, Version psRPVersion)
+        private static List<PSObject> CommandsAsListOfPSObjects(CommandCollection commands, Version psRPVersion)
         {
             List<PSObject> commandsAsListOfPSObjects = new List<PSObject>(commands.Count);
             foreach (Command command in commands)
diff --git a/src/System.Management.Automation/engine/hostifaces/PowerShellProcessInstance.cs b/src/System.Management.Automation/engine/hostifaces/PowerShellProcessInstance.cs
index 35029df1e06..3f4dcf40744 100644
--- a/src/System.Management.Automation/engine/hostifaces/PowerShellProcessInstance.cs
+++ b/src/System.Management.Automation/engine/hostifaces/PowerShellProcessInstance.cs
@@ -185,6 +185,7 @@ public void Dispose()
             Dispose(true);
             GC.SuppressFinalize(this);
         }
+
         /// <summary>
         /// </summary>
         /// <param name="disposing"></param>
diff --git a/src/System.Management.Automation/engine/hostifaces/RunspacePool.cs b/src/System.Management.Automation/engine/hostifaces/RunspacePool.cs
index 2a53a8a93ab..5f814e0428b 100644
--- a/src/System.Management.Automation/engine/hostifaces/RunspacePool.cs
+++ b/src/System.Management.Automation/engine/hostifaces/RunspacePool.cs
@@ -508,7 +508,9 @@ public sealed class RunspacePool : IDisposable
         private readonly object _syncObject = new object();
 
         private event EventHandler<RunspacePoolStateChangedEventArgs> InternalStateChanged = null;
+
         private event EventHandler<PSEventArgs> InternalForwardEvent = null;
+
         private event EventHandler<RunspaceCreatedEventArgs> InternalRunspaceCreated = null;
 
         #endregion
diff --git a/src/System.Management.Automation/engine/interpreter/AddInstruction.cs b/src/System.Management.Automation/engine/interpreter/AddInstruction.cs
index 9858167aa74..2f7ada9dcfd 100644
--- a/src/System.Management.Automation/engine/interpreter/AddInstruction.cs
+++ b/src/System.Management.Automation/engine/interpreter/AddInstruction.cs
@@ -130,14 +130,14 @@ public static Instruction Create(Type type)
             Debug.Assert(!type.IsEnum);
             switch (type.GetTypeCode())
             {
-                case TypeCode.Int16: return s_int16 ?? (s_int16 = new AddInt16());
-                case TypeCode.Int32: return s_int32 ?? (s_int32 = new AddInt32());
-                case TypeCode.Int64: return s_int64 ?? (s_int64 = new AddInt64());
-                case TypeCode.UInt16: return s_UInt16 ?? (s_UInt16 = new AddUInt16());
-                case TypeCode.UInt32: return s_UInt32 ?? (s_UInt32 = new AddUInt32());
-                case TypeCode.UInt64: return s_UInt64 ?? (s_UInt64 = new AddUInt64());
-                case TypeCode.Single: return s_single ?? (s_single = new AddSingle());
-                case TypeCode.Double: return s_double ?? (s_double = new AddDouble());
+                case TypeCode.Int16: return s_int16 ??= new AddInt16();
+                case TypeCode.Int32: return s_int32 ??= new AddInt32();
+                case TypeCode.Int64: return s_int64 ??= new AddInt64();
+                case TypeCode.UInt16: return s_UInt16 ??= new AddUInt16();
+                case TypeCode.UInt32: return s_UInt32 ??= new AddUInt32();
+                case TypeCode.UInt64: return s_UInt64 ??= new AddUInt64();
+                case TypeCode.Single: return s_single ??= new AddSingle();
+                case TypeCode.Double: return s_double ??= new AddDouble();
 
                 default:
                     throw Assert.Unreachable;
@@ -263,14 +263,14 @@ public static Instruction Create(Type type)
             Debug.Assert(!type.IsEnum);
             switch (type.GetTypeCode())
             {
-                case TypeCode.Int16: return s_int16 ?? (s_int16 = new AddOvfInt16());
-                case TypeCode.Int32: return s_int32 ?? (s_int32 = new AddOvfInt32());
-                case TypeCode.Int64: return s_int64 ?? (s_int64 = new AddOvfInt64());
-                case TypeCode.UInt16: return s_UInt16 ?? (s_UInt16 = new AddOvfUInt16());
-                case TypeCode.UInt32: return s_UInt32 ?? (s_UInt32 = new AddOvfUInt32());
-                case TypeCode.UInt64: return s_UInt64 ?? (s_UInt64 = new AddOvfUInt64());
-                case TypeCode.Single: return s_single ?? (s_single = new AddOvfSingle());
-                case TypeCode.Double: return s_double ?? (s_double = new AddOvfDouble());
+                case TypeCode.Int16: return s_int16 ??= new AddOvfInt16();
+                case TypeCode.Int32: return s_int32 ??= new AddOvfInt32();
+                case TypeCode.Int64: return s_int64 ??= new AddOvfInt64();
+                case TypeCode.UInt16: return s_UInt16 ??= new AddOvfUInt16();
+                case TypeCode.UInt32: return s_UInt32 ??= new AddOvfUInt32();
+                case TypeCode.UInt64: return s_UInt64 ??= new AddOvfUInt64();
+                case TypeCode.Single: return s_single ??= new AddOvfSingle();
+                case TypeCode.Double: return s_double ??= new AddOvfDouble();
 
                 default:
                     throw Assert.Unreachable;
diff --git a/src/System.Management.Automation/engine/interpreter/BranchLabel.cs b/src/System.Management.Automation/engine/interpreter/BranchLabel.cs
index 919a7b06106..08af974416c 100644
--- a/src/System.Management.Automation/engine/interpreter/BranchLabel.cs
+++ b/src/System.Management.Automation/engine/interpreter/BranchLabel.cs
@@ -19,7 +19,7 @@
 
 namespace System.Management.Automation.Interpreter
 {
-    internal struct RuntimeLabel
+    internal readonly struct RuntimeLabel
     {
         public readonly int Index;
         public readonly int StackDepth;
diff --git a/src/System.Management.Automation/engine/interpreter/ControlFlowInstructions.cs b/src/System.Management.Automation/engine/interpreter/ControlFlowInstructions.cs
index 6408a800b97..0fddd203346 100644
--- a/src/System.Management.Automation/engine/interpreter/ControlFlowInstructions.cs
+++ b/src/System.Management.Automation/engine/interpreter/ControlFlowInstructions.cs
@@ -69,7 +69,7 @@ internal sealed class BranchFalseInstruction : OffsetInstruction
 
         public override Instruction[] Cache
         {
-            get { return s_cache ?? (s_cache = new Instruction[CacheSize]); }
+            get { return s_cache ??= new Instruction[CacheSize]; }
         }
 
         internal BranchFalseInstruction()
@@ -97,7 +97,7 @@ internal sealed class BranchTrueInstruction : OffsetInstruction
 
         public override Instruction[] Cache
         {
-            get { return s_cache ?? (s_cache = new Instruction[CacheSize]); }
+            get { return s_cache ??= new Instruction[CacheSize]; }
         }
 
         internal BranchTrueInstruction()
@@ -125,7 +125,7 @@ internal sealed class CoalescingBranchInstruction : OffsetInstruction
 
         public override Instruction[] Cache
         {
-            get { return s_cache ?? (s_cache = new Instruction[CacheSize]); }
+            get { return s_cache ??= new Instruction[CacheSize]; }
         }
 
         internal CoalescingBranchInstruction()
@@ -204,7 +204,7 @@ internal abstract class IndexedBranchInstruction : Instruction
 
         internal readonly int _labelIndex;
 
-        public IndexedBranchInstruction(int labelIndex)
+        protected IndexedBranchInstruction(int labelIndex)
         {
             _labelIndex = labelIndex;
         }
diff --git a/src/System.Management.Automation/engine/interpreter/DivInstruction.cs b/src/System.Management.Automation/engine/interpreter/DivInstruction.cs
index f6cfb5b265f..11edd140945 100644
--- a/src/System.Management.Automation/engine/interpreter/DivInstruction.cs
+++ b/src/System.Management.Automation/engine/interpreter/DivInstruction.cs
@@ -130,14 +130,14 @@ public static Instruction Create(Type type)
             Debug.Assert(!type.IsEnum);
             switch (type.GetTypeCode())
             {
-                case TypeCode.Int16: return s_int16 ?? (s_int16 = new DivInt16());
-                case TypeCode.Int32: return s_int32 ?? (s_int32 = new DivInt32());
-                case TypeCode.Int64: return s_int64 ?? (s_int64 = new DivInt64());
-                case TypeCode.UInt16: return s_UInt16 ?? (s_UInt16 = new DivUInt16());
-                case TypeCode.UInt32: return s_UInt32 ?? (s_UInt32 = new DivUInt32());
-                case TypeCode.UInt64: return s_UInt64 ?? (s_UInt64 = new DivUInt64());
-                case TypeCode.Single: return s_single ?? (s_single = new DivSingle());
-                case TypeCode.Double: return s_double ?? (s_double = new DivDouble());
+                case TypeCode.Int16: return s_int16 ??= new DivInt16();
+                case TypeCode.Int32: return s_int32 ??= new DivInt32();
+                case TypeCode.Int64: return s_int64 ??= new DivInt64();
+                case TypeCode.UInt16: return s_UInt16 ??= new DivUInt16();
+                case TypeCode.UInt32: return s_UInt32 ??= new DivUInt32();
+                case TypeCode.UInt64: return s_UInt64 ??= new DivUInt64();
+                case TypeCode.Single: return s_single ??= new DivSingle();
+                case TypeCode.Double: return s_double ??= new DivDouble();
 
                 default:
                     throw Assert.Unreachable;
diff --git a/src/System.Management.Automation/engine/interpreter/EqualInstruction.cs b/src/System.Management.Automation/engine/interpreter/EqualInstruction.cs
index 639190e4d46..4db34761ce8 100644
--- a/src/System.Management.Automation/engine/interpreter/EqualInstruction.cs
+++ b/src/System.Management.Automation/engine/interpreter/EqualInstruction.cs
@@ -154,25 +154,25 @@ public static Instruction Create(Type type)
             var typeToUse = type.IsEnum ? Enum.GetUnderlyingType(type) : type;
             switch (typeToUse.GetTypeCode())
             {
-                case TypeCode.Boolean: return s_boolean ?? (s_boolean = new EqualBoolean());
-                case TypeCode.SByte: return s_SByte ?? (s_SByte = new EqualSByte());
-                case TypeCode.Byte: return s_byte ?? (s_byte = new EqualByte());
-                case TypeCode.Char: return s_char ?? (s_char = new EqualChar());
-                case TypeCode.Int16: return s_int16 ?? (s_int16 = new EqualInt16());
-                case TypeCode.Int32: return s_int32 ?? (s_int32 = new EqualInt32());
-                case TypeCode.Int64: return s_int64 ?? (s_int64 = new EqualInt64());
+                case TypeCode.Boolean: return s_boolean ??= new EqualBoolean();
+                case TypeCode.SByte: return s_SByte ??= new EqualSByte();
+                case TypeCode.Byte: return s_byte ??= new EqualByte();
+                case TypeCode.Char: return s_char ??= new EqualChar();
+                case TypeCode.Int16: return s_int16 ??= new EqualInt16();
+                case TypeCode.Int32: return s_int32 ??= new EqualInt32();
+                case TypeCode.Int64: return s_int64 ??= new EqualInt64();
 
-                case TypeCode.UInt16: return s_UInt16 ?? (s_UInt16 = new EqualInt16());
-                case TypeCode.UInt32: return s_UInt32 ?? (s_UInt32 = new EqualInt32());
-                case TypeCode.UInt64: return s_UInt64 ?? (s_UInt64 = new EqualInt64());
+                case TypeCode.UInt16: return s_UInt16 ??= new EqualInt16();
+                case TypeCode.UInt32: return s_UInt32 ??= new EqualInt32();
+                case TypeCode.UInt64: return s_UInt64 ??= new EqualInt64();
 
-                case TypeCode.Single: return s_single ?? (s_single = new EqualSingle());
-                case TypeCode.Double: return s_double ?? (s_double = new EqualDouble());
+                case TypeCode.Single: return s_single ??= new EqualSingle();
+                case TypeCode.Double: return s_double ??= new EqualDouble();
 
                 case TypeCode.Object:
                     if (!type.IsValueType)
                     {
-                        return s_reference ?? (s_reference = new EqualReference());
+                        return s_reference ??= new EqualReference();
                     }
                     // TODO: Nullable<T>
                     throw new NotImplementedException();
diff --git a/src/System.Management.Automation/engine/interpreter/GreaterThanInstruction.cs b/src/System.Management.Automation/engine/interpreter/GreaterThanInstruction.cs
index 9f46323308f..ccd5c3780f7 100644
--- a/src/System.Management.Automation/engine/interpreter/GreaterThanInstruction.cs
+++ b/src/System.Management.Automation/engine/interpreter/GreaterThanInstruction.cs
@@ -144,17 +144,17 @@ public static Instruction Create(Type type)
             Debug.Assert(!type.IsEnum);
             switch (type.GetTypeCode())
             {
-                case TypeCode.SByte: return s_SByte ?? (s_SByte = new GreaterThanSByte());
-                case TypeCode.Byte: return s_byte ?? (s_byte = new GreaterThanByte());
-                case TypeCode.Char: return s_char ?? (s_char = new GreaterThanChar());
-                case TypeCode.Int16: return s_int16 ?? (s_int16 = new GreaterThanInt16());
-                case TypeCode.Int32: return s_int32 ?? (s_int32 = new GreaterThanInt32());
-                case TypeCode.Int64: return s_int64 ?? (s_int64 = new GreaterThanInt64());
-                case TypeCode.UInt16: return s_UInt16 ?? (s_UInt16 = new GreaterThanUInt16());
-                case TypeCode.UInt32: return s_UInt32 ?? (s_UInt32 = new GreaterThanUInt32());
-                case TypeCode.UInt64: return s_UInt64 ?? (s_UInt64 = new GreaterThanUInt64());
-                case TypeCode.Single: return s_single ?? (s_single = new GreaterThanSingle());
-                case TypeCode.Double: return s_double ?? (s_double = new GreaterThanDouble());
+                case TypeCode.SByte: return s_SByte ??= new GreaterThanSByte();
+                case TypeCode.Byte: return s_byte ??= new GreaterThanByte();
+                case TypeCode.Char: return s_char ??= new GreaterThanChar();
+                case TypeCode.Int16: return s_int16 ??= new GreaterThanInt16();
+                case TypeCode.Int32: return s_int32 ??= new GreaterThanInt32();
+                case TypeCode.Int64: return s_int64 ??= new GreaterThanInt64();
+                case TypeCode.UInt16: return s_UInt16 ??= new GreaterThanUInt16();
+                case TypeCode.UInt32: return s_UInt32 ??= new GreaterThanUInt32();
+                case TypeCode.UInt64: return s_UInt64 ??= new GreaterThanUInt64();
+                case TypeCode.Single: return s_single ??= new GreaterThanSingle();
+                case TypeCode.Double: return s_double ??= new GreaterThanDouble();
 
                 default:
                     throw Assert.Unreachable;
diff --git a/src/System.Management.Automation/engine/interpreter/Instruction.cs b/src/System.Management.Automation/engine/interpreter/Instruction.cs
index 0a46fd88dfa..f1d8edaeb87 100644
--- a/src/System.Management.Automation/engine/interpreter/Instruction.cs
+++ b/src/System.Management.Automation/engine/interpreter/Instruction.cs
@@ -17,10 +17,12 @@
 
 namespace System.Management.Automation.Interpreter
 {
+#nullable enable
     internal interface IInstructionProvider
     {
         void AddInstructions(LightCompiler compiler);
     }
+#nullable restore
 
     internal abstract class Instruction
     {
diff --git a/src/System.Management.Automation/engine/interpreter/InstructionFactory.cs b/src/System.Management.Automation/engine/interpreter/InstructionFactory.cs
index 286fce26f15..4a707201eb6 100644
--- a/src/System.Management.Automation/engine/interpreter/InstructionFactory.cs
+++ b/src/System.Management.Automation/engine/interpreter/InstructionFactory.cs
@@ -53,11 +53,17 @@ internal static InstructionFactory GetFactory(Type type)
         }
 
         protected internal abstract Instruction GetArrayItem();
+
         protected internal abstract Instruction SetArrayItem();
+
         protected internal abstract Instruction TypeIs();
+
         protected internal abstract Instruction TypeAs();
+
         protected internal abstract Instruction DefaultValue();
+
         protected internal abstract Instruction NewArray();
+
         protected internal abstract Instruction NewArrayInit(int elementCount);
     }
 
@@ -81,32 +87,32 @@ private InstructionFactory() { }
 
         protected internal override Instruction GetArrayItem()
         {
-            return _getArrayItem ?? (_getArrayItem = new GetArrayItemInstruction<T>());
+            return _getArrayItem ??= new GetArrayItemInstruction<T>();
         }
 
         protected internal override Instruction SetArrayItem()
         {
-            return _setArrayItem ?? (_setArrayItem = new SetArrayItemInstruction<T>());
+            return _setArrayItem ??= new SetArrayItemInstruction<T>();
         }
 
         protected internal override Instruction TypeIs()
         {
-            return _typeIs ?? (_typeIs = new TypeIsInstruction<T>());
+            return _typeIs ??= new TypeIsInstruction<T>();
         }
 
         protected internal override Instruction TypeAs()
         {
-            return _typeAs ?? (_typeAs = new TypeAsInstruction<T>());
+            return _typeAs ??= new TypeAsInstruction<T>();
         }
 
         protected internal override Instruction DefaultValue()
         {
-            return _defaultValue ?? (_defaultValue = new DefaultValueInstruction<T>());
+            return _defaultValue ??= new DefaultValueInstruction<T>();
         }
 
         protected internal override Instruction NewArray()
         {
-            return _newArray ?? (_newArray = new NewArrayInstruction<T>());
+            return _newArray ??= new NewArrayInstruction<T>();
         }
 
         protected internal override Instruction NewArrayInit(int elementCount)
diff --git a/src/System.Management.Automation/engine/interpreter/InstructionList.cs b/src/System.Management.Automation/engine/interpreter/InstructionList.cs
index 79aca5b48ba..972c3f8635c 100644
--- a/src/System.Management.Automation/engine/interpreter/InstructionList.cs
+++ b/src/System.Management.Automation/engine/interpreter/InstructionList.cs
@@ -24,7 +24,7 @@ namespace System.Management.Automation.Interpreter
 {
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1815:OverrideEqualsAndOperatorEqualsOnValueTypes")]
     [DebuggerTypeProxy(typeof(InstructionArray.DebugView))]
-    internal struct InstructionArray
+    internal readonly struct InstructionArray
     {
         internal readonly int MaxStackDepth;
         internal readonly int MaxContinuationDepth;
@@ -156,7 +156,7 @@ internal static InstructionView[] GetInstructionViews(IList<Instruction> instruc
             }
 
             [DebuggerDisplay("{GetValue(),nq}", Name = "{GetName(),nq}", Type = "{GetDisplayType(), nq}")]
-            internal struct InstructionView
+            internal readonly struct InstructionView
             {
                 private readonly int _index;
                 private readonly int _stackDepth;
@@ -312,7 +312,7 @@ public InstructionArray ToArray()
                 _maxStackDepth,
                 _maxContinuationDepth,
                 _instructions.ToArray(),
-                (_objects != null) ? _objects.ToArray() : null,
+                _objects?.ToArray(),
                 BuildRuntimeLabels(),
                 _debugCookies
             );
@@ -341,11 +341,11 @@ public void EmitLoad(bool value)
         {
             if ((bool)value)
             {
-                Emit(s_true ?? (s_true = new LoadObjectInstruction(value)));
+                Emit(s_true ??= new LoadObjectInstruction(value));
             }
             else
             {
-                Emit(s_false ?? (s_false = new LoadObjectInstruction(value)));
+                Emit(s_false ??= new LoadObjectInstruction(value));
             }
         }
 
@@ -353,7 +353,7 @@ public void EmitLoad(object value, Type type)
         {
             if (value == null)
             {
-                Emit(s_null ?? (s_null = new LoadObjectInstruction(null)));
+                Emit(s_null ??= new LoadObjectInstruction(null));
                 return;
             }
 
@@ -925,7 +925,7 @@ public void EmitLoadField(FieldInfo field)
             Emit(GetLoadField(field));
         }
 
-        private Instruction GetLoadField(FieldInfo field)
+        private static Instruction GetLoadField(FieldInfo field)
         {
             lock (s_loadFields)
             {
diff --git a/src/System.Management.Automation/engine/interpreter/InterpretedFrame.cs b/src/System.Management.Automation/engine/interpreter/InterpretedFrame.cs
index 431471d0619..4b084ba72a8 100644
--- a/src/System.Management.Automation/engine/interpreter/InterpretedFrame.cs
+++ b/src/System.Management.Automation/engine/interpreter/InterpretedFrame.cs
@@ -295,12 +295,12 @@ internal void PopPendingContinuation()
 
         internal static MethodInfo GotoMethod
         {
-            get { return s_goto ?? (s_goto = typeof(InterpretedFrame).GetMethod("Goto")); }
+            get { return s_goto ??= typeof(InterpretedFrame).GetMethod("Goto"); }
         }
 
         internal static MethodInfo VoidGotoMethod
         {
-            get { return s_voidGoto ?? (s_voidGoto = typeof(InterpretedFrame).GetMethod("VoidGoto")); }
+            get { return s_voidGoto ??= typeof(InterpretedFrame).GetMethod("VoidGoto"); }
         }
 
         public int VoidGoto(int labelIndex)
diff --git a/src/System.Management.Automation/engine/interpreter/LessThanInstruction.cs b/src/System.Management.Automation/engine/interpreter/LessThanInstruction.cs
index aaf632d0c77..2d6754ff2fd 100644
--- a/src/System.Management.Automation/engine/interpreter/LessThanInstruction.cs
+++ b/src/System.Management.Automation/engine/interpreter/LessThanInstruction.cs
@@ -144,17 +144,17 @@ public static Instruction Create(Type type)
             Debug.Assert(!type.IsEnum);
             switch (type.GetTypeCode())
             {
-                case TypeCode.SByte: return s_SByte ?? (s_SByte = new LessThanSByte());
-                case TypeCode.Byte: return s_byte ?? (s_byte = new LessThanByte());
-                case TypeCode.Char: return s_char ?? (s_char = new LessThanChar());
-                case TypeCode.Int16: return s_int16 ?? (s_int16 = new LessThanInt16());
-                case TypeCode.Int32: return s_int32 ?? (s_int32 = new LessThanInt32());
-                case TypeCode.Int64: return s_int64 ?? (s_int64 = new LessThanInt64());
-                case TypeCode.UInt16: return s_UInt16 ?? (s_UInt16 = new LessThanUInt16());
-                case TypeCode.UInt32: return s_UInt32 ?? (s_UInt32 = new LessThanUInt32());
-                case TypeCode.UInt64: return s_UInt64 ?? (s_UInt64 = new LessThanUInt64());
-                case TypeCode.Single: return s_single ?? (s_single = new LessThanSingle());
-                case TypeCode.Double: return s_double ?? (s_double = new LessThanDouble());
+                case TypeCode.SByte: return s_SByte ??= new LessThanSByte();
+                case TypeCode.Byte: return s_byte ??= new LessThanByte();
+                case TypeCode.Char: return s_char ??= new LessThanChar();
+                case TypeCode.Int16: return s_int16 ??= new LessThanInt16();
+                case TypeCode.Int32: return s_int32 ??= new LessThanInt32();
+                case TypeCode.Int64: return s_int64 ??= new LessThanInt64();
+                case TypeCode.UInt16: return s_UInt16 ??= new LessThanUInt16();
+                case TypeCode.UInt32: return s_UInt32 ??= new LessThanUInt32();
+                case TypeCode.UInt64: return s_UInt64 ??= new LessThanUInt64();
+                case TypeCode.Single: return s_single ??= new LessThanSingle();
+                case TypeCode.Double: return s_double ??= new LessThanDouble();
 
                 default:
                     throw Assert.Unreachable;
diff --git a/src/System.Management.Automation/engine/interpreter/LightCompiler.cs b/src/System.Management.Automation/engine/interpreter/LightCompiler.cs
index 00bdc0d5dd6..85f97ee7d40 100644
--- a/src/System.Management.Automation/engine/interpreter/LightCompiler.cs
+++ b/src/System.Management.Automation/engine/interpreter/LightCompiler.cs
@@ -243,7 +243,7 @@ public override string ToString()
     // TODO:
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1815:OverrideEqualsAndOperatorEqualsOnValueTypes")]
     [Serializable]
-    internal struct InterpretedFrameInfo
+    internal readonly struct InterpretedFrameInfo
     {
         public readonly string MethodName;
 
@@ -1025,7 +1025,7 @@ private void CompileConditionalExpression(Expression expr, bool asVoid)
 
         #region Loops
 
-        private void CompileLoopExpression(Expression expr)
+        private static void CompileLoopExpression(Expression expr)
         {
             //    var node = (LoopExpression)expr;
             //    var enterLoop = new EnterLoopInstruction(node, _locals, _compilationThreshold, _instructions.Count);
@@ -1531,7 +1531,7 @@ private void CompileTryExpression(Expression expr)
                 enterTryInstr.SetTryHandler(
                     new TryCatchFinallyHandler(tryStart, tryEnd, gotoEnd.TargetIndex,
                         startOfFinally.TargetIndex, _instructions.Count,
-                        exHandlers != null ? exHandlers.ToArray() : null));
+                        exHandlers?.ToArray()));
                 PopLabelBlock(LabelScopeKind.Finally);
             }
             else
@@ -2004,7 +2004,8 @@ private void CompileNoLabelPush(Expression expr)
                 case ExpressionType.Index: CompileIndexExpression(expr); break;
                 case ExpressionType.Label: CompileLabelExpression(expr); break;
                 case ExpressionType.RuntimeVariables: CompileRuntimeVariablesExpression(expr); break;
-                case ExpressionType.Loop: CompileLoopExpression(expr); break;
+                case ExpressionType.Loop:
+                    CompileLoopExpression(expr); break;
                 case ExpressionType.Switch: CompileSwitchExpression(expr); break;
                 case ExpressionType.Throw: CompileThrowUnaryExpression(expr, expr.Type == typeof(void)); break;
                 case ExpressionType.Try: CompileTryExpression(expr); break;
diff --git a/src/System.Management.Automation/engine/interpreter/LightDelegateCreator.cs b/src/System.Management.Automation/engine/interpreter/LightDelegateCreator.cs
index 5c96d2f6870..0df528b94bb 100644
--- a/src/System.Management.Automation/engine/interpreter/LightDelegateCreator.cs
+++ b/src/System.Management.Automation/engine/interpreter/LightDelegateCreator.cs
@@ -169,7 +169,7 @@ internal void Compile(object state)
                 // So change the lambda's delegate type to Func<...> or
                 // Action<...> so it can be called from the LightLambda.Run
                 // methods.
-                LambdaExpression lambda = (_lambda as LambdaExpression);// ?? (LambdaExpression)((LightLambdaExpression)_lambda).Reduce();
+                LambdaExpression lambda = (_lambda as LambdaExpression); // ?? (LambdaExpression)((LightLambdaExpression)_lambda).Reduce();
                 if (_interpreter != null)
                 {
                     _compiledDelegateType = GetFuncOrAction(lambda);
diff --git a/src/System.Management.Automation/engine/interpreter/LocalAccess.cs b/src/System.Management.Automation/engine/interpreter/LocalAccess.cs
index 7b0711b1930..30596866c0c 100644
--- a/src/System.Management.Automation/engine/interpreter/LocalAccess.cs
+++ b/src/System.Management.Automation/engine/interpreter/LocalAccess.cs
@@ -23,10 +23,13 @@
 
 namespace System.Management.Automation.Interpreter
 {
+
+#nullable enable
     internal interface IBoxableInstruction
     {
-        Instruction BoxIfIndexMatches(int index);
+        Instruction? BoxIfIndexMatches(int index);
     }
+#nullable restore
 
     internal abstract class LocalAccessInstruction : Instruction
     {
diff --git a/src/System.Management.Automation/engine/interpreter/LocalVariables.cs b/src/System.Management.Automation/engine/interpreter/LocalVariables.cs
index e093877ce34..aaee75d0234 100644
--- a/src/System.Management.Automation/engine/interpreter/LocalVariables.cs
+++ b/src/System.Management.Automation/engine/interpreter/LocalVariables.cs
@@ -78,7 +78,7 @@ public override string ToString()
         }
     }
 
-    internal struct LocalDefinition
+    internal readonly struct LocalDefinition
     {
         private readonly int _index;
         private readonly ParameterExpression _parameter;
diff --git a/src/System.Management.Automation/engine/interpreter/MulInstruction.cs b/src/System.Management.Automation/engine/interpreter/MulInstruction.cs
index 486d2ebc751..3b150a7abbd 100644
--- a/src/System.Management.Automation/engine/interpreter/MulInstruction.cs
+++ b/src/System.Management.Automation/engine/interpreter/MulInstruction.cs
@@ -130,14 +130,14 @@ public static Instruction Create(Type type)
             Debug.Assert(!type.IsEnum);
             switch (type.GetTypeCode())
             {
-                case TypeCode.Int16: return s_int16 ?? (s_int16 = new MulInt16());
-                case TypeCode.Int32: return s_int32 ?? (s_int32 = new MulInt32());
-                case TypeCode.Int64: return s_int64 ?? (s_int64 = new MulInt64());
-                case TypeCode.UInt16: return s_UInt16 ?? (s_UInt16 = new MulUInt16());
-                case TypeCode.UInt32: return s_UInt32 ?? (s_UInt32 = new MulUInt32());
-                case TypeCode.UInt64: return s_UInt64 ?? (s_UInt64 = new MulUInt64());
-                case TypeCode.Single: return s_single ?? (s_single = new MulSingle());
-                case TypeCode.Double: return s_double ?? (s_double = new MulDouble());
+                case TypeCode.Int16: return s_int16 ??= new MulInt16();
+                case TypeCode.Int32: return s_int32 ??= new MulInt32();
+                case TypeCode.Int64: return s_int64 ??= new MulInt64();
+                case TypeCode.UInt16: return s_UInt16 ??= new MulUInt16();
+                case TypeCode.UInt32: return s_UInt32 ??= new MulUInt32();
+                case TypeCode.UInt64: return s_UInt64 ??= new MulUInt64();
+                case TypeCode.Single: return s_single ??= new MulSingle();
+                case TypeCode.Double: return s_double ??= new MulDouble();
 
                 default:
                     throw Assert.Unreachable;
@@ -263,14 +263,14 @@ public static Instruction Create(Type type)
             Debug.Assert(!type.IsEnum);
             switch (type.GetTypeCode())
             {
-                case TypeCode.Int16: return s_int16 ?? (s_int16 = new MulOvfInt16());
-                case TypeCode.Int32: return s_int32 ?? (s_int32 = new MulOvfInt32());
-                case TypeCode.Int64: return s_int64 ?? (s_int64 = new MulOvfInt64());
-                case TypeCode.UInt16: return s_UInt16 ?? (s_UInt16 = new MulOvfUInt16());
-                case TypeCode.UInt32: return s_UInt32 ?? (s_UInt32 = new MulOvfUInt32());
-                case TypeCode.UInt64: return s_UInt64 ?? (s_UInt64 = new MulOvfUInt64());
-                case TypeCode.Single: return s_single ?? (s_single = new MulOvfSingle());
-                case TypeCode.Double: return s_double ?? (s_double = new MulOvfDouble());
+                case TypeCode.Int16: return s_int16 ??= new MulOvfInt16();
+                case TypeCode.Int32: return s_int32 ??= new MulOvfInt32();
+                case TypeCode.Int64: return s_int64 ??= new MulOvfInt64();
+                case TypeCode.UInt16: return s_UInt16 ??= new MulOvfUInt16();
+                case TypeCode.UInt32: return s_UInt32 ??= new MulOvfUInt32();
+                case TypeCode.UInt64: return s_UInt64 ??= new MulOvfUInt64();
+                case TypeCode.Single: return s_single ??= new MulOvfSingle();
+                case TypeCode.Double: return s_double ??= new MulOvfDouble();
 
                 default:
                     throw Assert.Unreachable;
diff --git a/src/System.Management.Automation/engine/interpreter/NotEqualInstruction.cs b/src/System.Management.Automation/engine/interpreter/NotEqualInstruction.cs
index 440b5f8d6fa..79df1b9a84b 100644
--- a/src/System.Management.Automation/engine/interpreter/NotEqualInstruction.cs
+++ b/src/System.Management.Automation/engine/interpreter/NotEqualInstruction.cs
@@ -154,25 +154,25 @@ public static Instruction Create(Type type)
             var typeToUse = type.IsEnum ? Enum.GetUnderlyingType(type) : type;
             switch (typeToUse.GetTypeCode())
             {
-                case TypeCode.Boolean: return s_boolean ?? (s_boolean = new NotEqualBoolean());
-                case TypeCode.SByte: return s_SByte ?? (s_SByte = new NotEqualSByte());
-                case TypeCode.Byte: return s_byte ?? (s_byte = new NotEqualByte());
-                case TypeCode.Char: return s_char ?? (s_char = new NotEqualChar());
-                case TypeCode.Int16: return s_int16 ?? (s_int16 = new NotEqualInt16());
-                case TypeCode.Int32: return s_int32 ?? (s_int32 = new NotEqualInt32());
-                case TypeCode.Int64: return s_int64 ?? (s_int64 = new NotEqualInt64());
+                case TypeCode.Boolean: return s_boolean ??= new NotEqualBoolean();
+                case TypeCode.SByte: return s_SByte ??= new NotEqualSByte();
+                case TypeCode.Byte: return s_byte ??= new NotEqualByte();
+                case TypeCode.Char: return s_char ??= new NotEqualChar();
+                case TypeCode.Int16: return s_int16 ??= new NotEqualInt16();
+                case TypeCode.Int32: return s_int32 ??= new NotEqualInt32();
+                case TypeCode.Int64: return s_int64 ??= new NotEqualInt64();
 
-                case TypeCode.UInt16: return s_UInt16 ?? (s_UInt16 = new NotEqualInt16());
-                case TypeCode.UInt32: return s_UInt32 ?? (s_UInt32 = new NotEqualInt32());
-                case TypeCode.UInt64: return s_UInt64 ?? (s_UInt64 = new NotEqualInt64());
+                case TypeCode.UInt16: return s_UInt16 ??= new NotEqualInt16();
+                case TypeCode.UInt32: return s_UInt32 ??= new NotEqualInt32();
+                case TypeCode.UInt64: return s_UInt64 ??= new NotEqualInt64();
 
-                case TypeCode.Single: return s_single ?? (s_single = new NotEqualSingle());
-                case TypeCode.Double: return s_double ?? (s_double = new NotEqualDouble());
+                case TypeCode.Single: return s_single ??= new NotEqualSingle();
+                case TypeCode.Double: return s_double ??= new NotEqualDouble();
 
                 case TypeCode.Object:
                     if (!type.IsValueType)
                     {
-                        return s_reference ?? (s_reference = new NotEqualReference());
+                        return s_reference ??= new NotEqualReference();
                     }
                     // TODO: Nullable<T>
                     throw new NotImplementedException();
diff --git a/src/System.Management.Automation/engine/interpreter/SubInstruction.cs b/src/System.Management.Automation/engine/interpreter/SubInstruction.cs
index c0874d47d89..486cd7f8933 100644
--- a/src/System.Management.Automation/engine/interpreter/SubInstruction.cs
+++ b/src/System.Management.Automation/engine/interpreter/SubInstruction.cs
@@ -130,14 +130,14 @@ public static Instruction Create(Type type)
             Debug.Assert(!type.IsEnum);
             switch (type.GetTypeCode())
             {
-                case TypeCode.Int16: return s_int16 ?? (s_int16 = new SubInt16());
-                case TypeCode.Int32: return s_int32 ?? (s_int32 = new SubInt32());
-                case TypeCode.Int64: return s_int64 ?? (s_int64 = new SubInt64());
-                case TypeCode.UInt16: return s_UInt16 ?? (s_UInt16 = new SubUInt16());
-                case TypeCode.UInt32: return s_UInt32 ?? (s_UInt32 = new SubUInt32());
-                case TypeCode.UInt64: return s_UInt64 ?? (s_UInt64 = new SubUInt64());
-                case TypeCode.Single: return s_single ?? (s_single = new SubSingle());
-                case TypeCode.Double: return s_double ?? (s_double = new SubDouble());
+                case TypeCode.Int16: return s_int16 ??= new SubInt16();
+                case TypeCode.Int32: return s_int32 ??= new SubInt32();
+                case TypeCode.Int64: return s_int64 ??= new SubInt64();
+                case TypeCode.UInt16: return s_UInt16 ??= new SubUInt16();
+                case TypeCode.UInt32: return s_UInt32 ??= new SubUInt32();
+                case TypeCode.UInt64: return s_UInt64 ??= new SubUInt64();
+                case TypeCode.Single: return s_single ??= new SubSingle();
+                case TypeCode.Double: return s_double ??= new SubDouble();
 
                 default:
                     throw Assert.Unreachable;
@@ -263,14 +263,14 @@ public static Instruction Create(Type type)
             Debug.Assert(!type.IsEnum);
             switch (type.GetTypeCode())
             {
-                case TypeCode.Int16: return s_int16 ?? (s_int16 = new SubOvfInt16());
-                case TypeCode.Int32: return s_int32 ?? (s_int32 = new SubOvfInt32());
-                case TypeCode.Int64: return s_int64 ?? (s_int64 = new SubOvfInt64());
-                case TypeCode.UInt16: return s_UInt16 ?? (s_UInt16 = new SubOvfUInt16());
-                case TypeCode.UInt32: return s_UInt32 ?? (s_UInt32 = new SubOvfUInt32());
-                case TypeCode.UInt64: return s_UInt64 ?? (s_UInt64 = new SubOvfUInt64());
-                case TypeCode.Single: return s_single ?? (s_single = new SubOvfSingle());
-                case TypeCode.Double: return s_double ?? (s_double = new SubOvfDouble());
+                case TypeCode.Int16: return s_int16 ??= new SubOvfInt16();
+                case TypeCode.Int32: return s_int32 ??= new SubOvfInt32();
+                case TypeCode.Int64: return s_int64 ??= new SubOvfInt64();
+                case TypeCode.UInt16: return s_UInt16 ??= new SubOvfUInt16();
+                case TypeCode.UInt32: return s_UInt32 ??= new SubOvfUInt32();
+                case TypeCode.UInt64: return s_UInt64 ??= new SubOvfUInt64();
+                case TypeCode.Single: return s_single ??= new SubOvfSingle();
+                case TypeCode.Double: return s_double ??= new SubOvfDouble();
 
                 default:
                     throw Assert.Unreachable;
diff --git a/src/System.Management.Automation/engine/interpreter/Utilities.cs b/src/System.Management.Automation/engine/interpreter/Utilities.cs
index 35c7756ee66..3d4307f1d3a 100644
--- a/src/System.Management.Automation/engine/interpreter/Utilities.cs
+++ b/src/System.Management.Automation/engine/interpreter/Utilities.cs
@@ -668,7 +668,7 @@ public TValue this[TKey key]
             }
         }
 
-        private struct KeyInfo
+        private readonly struct KeyInfo
         {
             internal readonly TValue Value;
             internal readonly LinkedListNode<TKey> List;
diff --git a/src/System.Management.Automation/engine/lang/parserutils.cs b/src/System.Management.Automation/engine/lang/parserutils.cs
index f1133733448..52c64400ccd 100644
--- a/src/System.Management.Automation/engine/lang/parserutils.cs
+++ b/src/System.Management.Automation/engine/lang/parserutils.cs
@@ -378,8 +378,8 @@ internal static object ImplicitOp(object lval, object rval, string op, IScriptEx
             lval = PSObject.Base(lval);
             rval = PSObject.Base(rval);
 
-            Type lvalType = lval != null ? lval.GetType() : null;
-            Type rvalType = rval != null ? rval.GetType() : null;
+            Type lvalType = lval?.GetType();
+            Type rvalType = rval?.GetType();
             Type opType;
             if (lvalType == null || (lvalType.IsPrimitive))
             {
@@ -965,6 +965,7 @@ internal static object ReplaceOperator(ExecutionContext context, IScriptExtent e
                 }
             }
 
+            var replacer = ReplaceOperatorImpl.Create(context, rr, substitute);
             IEnumerator list = LanguagePrimitives.GetEnumerator(lval);
             if (list == null)
             {
@@ -978,7 +979,7 @@ internal static object ReplaceOperator(ExecutionContext context, IScriptExtent e
                     lvalString = lval?.ToString() ?? string.Empty;
                 }
 
-                return ReplaceOperatorImpl(context, lvalString, rr, substitute);
+                return replacer.Replace(lvalString);
             }
             else
             {
@@ -986,51 +987,84 @@ internal static object ReplaceOperator(ExecutionContext context, IScriptExtent e
                 while (ParserOps.MoveNext(context, errorPosition, list))
                 {
                     string lvalString = PSObject.ToStringParser(context, ParserOps.Current(errorPosition, list));
-                    resultList.Add(ReplaceOperatorImpl(context, lvalString, rr, substitute));
+                    resultList.Add(replacer.Replace(lvalString));
                 }
 
                 return resultList.ToArray();
             }
         }
 
-        /// <summary>
-        /// ReplaceOperator implementation.
-        /// Abstracts away conversion of the optional substitute parameter to either a string or a MatchEvaluator delegate
-        /// and finally returns the result of the final Regex.Replace operation.
-        /// </summary>
-        /// <param name="context">The execution context in which to evaluate the expression.</param>
-        /// <param name="input">The input string.</param>
-        /// <param name="regex">A Regex instance.</param>
-        /// <param name="substitute">The substitute value.</param>
-        /// <returns>The result of the regex.Replace operation.</returns>
-        private static object ReplaceOperatorImpl(ExecutionContext context, string input, Regex regex, object substitute)
+        private struct ReplaceOperatorImpl
         {
-            switch (substitute)
+            public static ReplaceOperatorImpl Create(ExecutionContext context, Regex regex, object substitute)
+            {
+                return new ReplaceOperatorImpl(context, regex, substitute);
+            }
+
+            private readonly Regex _regex;
+            private readonly string _cachedReplacementString;
+            private readonly MatchEvaluator _cachedMatchEvaluator;
+
+            private ReplaceOperatorImpl(
+                ExecutionContext context,
+                Regex regex,
+                object substitute)
             {
-                case string replacementString:
-                    return regex.Replace(input, replacementString);
+                _regex = regex;
+                _cachedReplacementString = null;
+                _cachedMatchEvaluator = null;
 
-                case ScriptBlock sb:
-                    MatchEvaluator me = match =>
-                    {
-                        var result = sb.DoInvokeReturnAsIs(
-                            useLocalScope: false, /* Use current scope to be consistent with 'ForEach/Where-Object {}' and 'collection.ForEach{}/Where{}' */
-                            errorHandlingBehavior: ScriptBlock.ErrorHandlingBehavior.WriteToCurrentErrorPipe,
-                            dollarUnder: match,
-                            input: AutomationNull.Value,
-                            scriptThis: AutomationNull.Value,
-                            args: Array.Empty<object>());
-
-                        return PSObject.ToStringParser(context, result);
-                    };
-                    return regex.Replace(input, me);
-
-                case object val when LanguagePrimitives.TryConvertTo(val, out MatchEvaluator matchEvaluator):
-                    return regex.Replace(input, matchEvaluator);
-
-                default:
-                    string replacement = PSObject.ToStringParser(context, substitute);
-                    return regex.Replace(input, replacement);
+                switch (substitute)
+                {
+                    case string replacement:
+                        _cachedReplacementString = replacement;
+                        break;
+
+                    case ScriptBlock sb:
+                        _cachedMatchEvaluator = GetMatchEvaluator(context, sb);
+                        break;
+
+                    case object val when LanguagePrimitives.TryConvertTo(val, out _cachedMatchEvaluator):
+                        break;
+
+                    default:
+                        _cachedReplacementString = PSObject.ToStringParser(context, substitute);
+                        break;
+                }
+            }
+
+            // Local helper function to avoid creating an instance of the generated delegate helper class
+            // every time 'ReplaceOperatorImpl' is invoked.
+            private static MatchEvaluator GetMatchEvaluator(ExecutionContext context, ScriptBlock sb)
+            {
+                return match =>
+                {
+                    var result = sb.DoInvokeReturnAsIs(
+                        useLocalScope: false, /* Use current scope to be consistent with 'ForEach/Where-Object {}' and 'collection.ForEach{}/Where{}' */
+                        errorHandlingBehavior: ScriptBlock.ErrorHandlingBehavior.WriteToCurrentErrorPipe,
+                        dollarUnder: match,
+                        input: AutomationNull.Value,
+                        scriptThis: AutomationNull.Value,
+                        args: Array.Empty<object>());
+
+                    return PSObject.ToStringParser(context, result);
+                };
+            }
+
+            /// <summary>
+            /// ReplaceOperator implementation.
+            /// Abstracts away conversion of the optional substitute parameter to either a string or a MatchEvaluator delegate
+            /// and finally returns the result of the final Regex.Replace operation.
+            /// </summary>
+            public object Replace(string input)
+            {
+                if (_cachedReplacementString is not null)
+                {
+                    return _regex.Replace(input, _cachedReplacementString);
+                }
+
+                Dbg.Assert(_cachedMatchEvaluator is not null, "_cachedMatchEvaluator should be not null when code reach here.");
+                return _regex.Replace(input, _cachedMatchEvaluator);
             }
         }
 
diff --git a/src/System.Management.Automation/engine/lang/scriptblock.cs b/src/System.Management.Automation/engine/lang/scriptblock.cs
index 6bf326ae81c..765809be306 100644
--- a/src/System.Management.Automation/engine/lang/scriptblock.cs
+++ b/src/System.Management.Automation/engine/lang/scriptblock.cs
@@ -596,7 +596,7 @@ internal void InvokeAsMemberFunction(object instance, object[] args)
         /// Get the PSModuleInfo object for the module that defined this
         /// scriptblock.
         /// </summary>
-        public PSModuleInfo Module { get => SessionStateInternal != null ? SessionStateInternal.Module : null; }
+        public PSModuleInfo Module { get => SessionStateInternal?.Module; }
 
         /// <summary>
         /// Return the PSToken object for this function definition...
@@ -709,7 +709,7 @@ internal SessionState SessionState
                     }
                 }
 
-                return SessionStateInternal != null ? SessionStateInternal.PublicSessionState : null;
+                return SessionStateInternal?.PublicSessionState;
             }
 
             set
@@ -1120,14 +1120,14 @@ internal SteppablePipeline(ExecutionContext context, PipelineProcessor pipeline)
         /// <summary>
         /// Begin execution of a steppable pipeline. This overload doesn't reroute output and error pipes.
         /// </summary>
-        /// <param name="expectInput"><c>true</c> if you plan to write input into this pipe; <c>false</c> otherwise.</param>
+        /// <param name="expectInput"><see langword="true"/> if you plan to write input into this pipe; <see langword="false"/> otherwise.</param>
         public void Begin(bool expectInput) => Begin(expectInput, commandRuntime: (ICommandRuntime)null);
 
         /// <summary>
         /// Begin execution of a steppable pipeline, using the command running currently in the specified context to figure
         /// out how to route the output and errors.
         /// </summary>
-        /// <param name="expectInput"><c>true</c> if you plan to write input into this pipe; <c>false</c> otherwise.</param>
+        /// <param name="expectInput"><see langword="true"/> if you plan to write input into this pipe; <see langword="false"/> otherwise.</param>
         /// <param name="contextToRedirectTo">Context used to figure out how to route the output and errors.</param>
         public void Begin(bool expectInput, EngineIntrinsics contextToRedirectTo)
         {
@@ -1138,7 +1138,7 @@ public void Begin(bool expectInput, EngineIntrinsics contextToRedirectTo)
 
             ExecutionContext executionContext = contextToRedirectTo.SessionState.Internal.ExecutionContext;
             CommandProcessorBase commandProcessor = executionContext.CurrentCommandProcessor;
-            ICommandRuntime crt = commandProcessor == null ? null : commandProcessor.CommandRuntime;
+            ICommandRuntime crt = commandProcessor?.CommandRuntime;
             Begin(expectInput, crt);
         }
 
@@ -1313,14 +1313,6 @@ private void Dispose(bool disposing)
             _disposed = true;
         }
 
-        /// <summary>
-        /// Finalizer for class SteppablePipeline.
-        /// </summary>
-        ~SteppablePipeline()
-        {
-            Dispose(false);
-        }
-
         #endregion IDispose
     }
 
@@ -1447,13 +1439,21 @@ internal ScriptBlockInvocationEventArgs(
         }
 
         internal ScriptBlock ScriptBlock { get; set; }
+
         internal bool UseLocalScope { get; set; }
+
         internal ScriptBlock.ErrorHandlingBehavior ErrorHandlingBehavior { get; set; }
+
         internal object DollarUnder { get; set; }
+
         internal object Input { get; set; }
+
         internal object ScriptThis { get; set; }
+
         internal Pipe OutputPipe { get; set; }
+
         internal InvocationInfo InvocationInfo { get; set; }
+
         internal object[] Args { get; set; }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/parser/AstVisitor.cs b/src/System.Management.Automation/engine/parser/AstVisitor.cs
index a20ea4a5ce8..5c09ee78dc6 100644
--- a/src/System.Management.Automation/engine/parser/AstVisitor.cs
+++ b/src/System.Management.Automation/engine/parser/AstVisitor.cs
@@ -201,35 +201,37 @@ public interface ICustomAstVisitor
     }
 
     /// <summary/>
+#nullable enable
     public interface ICustomAstVisitor2 : ICustomAstVisitor
     {
         /// <summary/>
-        object VisitTypeDefinition(TypeDefinitionAst typeDefinitionAst) => DefaultVisit(typeDefinitionAst);
+        object? VisitTypeDefinition(TypeDefinitionAst typeDefinitionAst) => DefaultVisit(typeDefinitionAst);
 
         /// <summary/>
-        object VisitPropertyMember(PropertyMemberAst propertyMemberAst) => DefaultVisit(propertyMemberAst);
+        object? VisitPropertyMember(PropertyMemberAst propertyMemberAst) => DefaultVisit(propertyMemberAst);
 
         /// <summary/>
-        object VisitFunctionMember(FunctionMemberAst functionMemberAst) => DefaultVisit(functionMemberAst);
+        object? VisitFunctionMember(FunctionMemberAst functionMemberAst) => DefaultVisit(functionMemberAst);
 
         /// <summary/>
-        object VisitBaseCtorInvokeMemberExpression(BaseCtorInvokeMemberExpressionAst baseCtorInvokeMemberExpressionAst) => DefaultVisit(baseCtorInvokeMemberExpressionAst);
+        object? VisitBaseCtorInvokeMemberExpression(BaseCtorInvokeMemberExpressionAst baseCtorInvokeMemberExpressionAst) => DefaultVisit(baseCtorInvokeMemberExpressionAst);
 
         /// <summary/>
-        object VisitUsingStatement(UsingStatementAst usingStatement) => DefaultVisit(usingStatement);
+        object? VisitUsingStatement(UsingStatementAst usingStatement) => DefaultVisit(usingStatement);
 
         /// <summary/>
-        object VisitConfigurationDefinition(ConfigurationDefinitionAst configurationDefinitionAst) => DefaultVisit(configurationDefinitionAst);
+        object? VisitConfigurationDefinition(ConfigurationDefinitionAst configurationDefinitionAst) => DefaultVisit(configurationDefinitionAst);
 
         /// <summary/>
-        object VisitDynamicKeywordStatement(DynamicKeywordStatementAst dynamicKeywordAst) => DefaultVisit(dynamicKeywordAst);
+        object? VisitDynamicKeywordStatement(DynamicKeywordStatementAst dynamicKeywordAst) => DefaultVisit(dynamicKeywordAst);
 
         /// <summary/>
-        object VisitTernaryExpression(TernaryExpressionAst ternaryExpressionAst) => DefaultVisit(ternaryExpressionAst);
+        object? VisitTernaryExpression(TernaryExpressionAst ternaryExpressionAst) => DefaultVisit(ternaryExpressionAst);
 
         /// <summary/>
-        object VisitPipelineChain(PipelineChainAst statementChainAst) => DefaultVisit(statementChainAst);
+        object? VisitPipelineChain(PipelineChainAst statementChainAst) => DefaultVisit(statementChainAst);
     }
+#nullable restore
 
 #if DEBUG
     internal class CheckAllParentsSet : AstVisitor2
@@ -425,7 +427,7 @@ internal static bool Contains(Ast ast, Func<Ast, bool> predicate, bool searchNes
 
             var searcher = new AstSearcher(predicate, stopOnFirst: true, searchNestedScriptBlocks: searchNestedScriptBlocks);
             ast.InternalVisit(searcher);
-            return searcher.Results.Any();
+            return searcher.Results.Count > 0;
         }
 
         internal static bool IsUsingDollarInput(Ast ast)
diff --git a/src/System.Management.Automation/engine/parser/Compiler.cs b/src/System.Management.Automation/engine/parser/Compiler.cs
index 8c1acd9c6e2..5d632d55a38 100644
--- a/src/System.Management.Automation/engine/parser/Compiler.cs
+++ b/src/System.Management.Automation/engine/parser/Compiler.cs
@@ -1166,7 +1166,7 @@ internal static Type GetTypeConstraintForMethodResolution(ExpressionAst expr)
                 expr = ((AttributedExpressionAst)expr).Child;
             }
 
-            return firstConvert == null ? null : firstConvert.Type.TypeName.GetReflectionType();
+            return firstConvert?.Type.TypeName.GetReflectionType();
         }
 
         internal static PSMethodInvocationConstraints CombineTypeConstraintForMethodResolution(Type targetType, Type argType)
@@ -2045,7 +2045,7 @@ internal void Compile(CompiledScriptBlockData scriptBlock, bool optimize)
             }
         }
 
-        private Action<FunctionContext> CompileTree(Expression<Action<FunctionContext>> lambda, CompileInterpretChoice compileInterpretChoice)
+        private static Action<FunctionContext> CompileTree(Expression<Action<FunctionContext>> lambda, CompileInterpretChoice compileInterpretChoice)
         {
             if (lambda == null)
             {
@@ -2589,7 +2589,7 @@ private Expression<Action<FunctionContext>> CompileSingleLambda(
             return Expression.Lambda<Action<FunctionContext>>(body, funcName, new[] { s_functionContext });
         }
 
-        private void GenerateTypesAndUsings(ScriptBlockAst rootForDefiningTypesAndUsings, List<Expression> exprs)
+        private static void GenerateTypesAndUsings(ScriptBlockAst rootForDefiningTypesAndUsings, List<Expression> exprs)
         {
             // We don't postpone load assemblies, import modules from 'using' to the moment, when enclosed scriptblock is executed.
             // We do loading, when root of the script is compiled.
@@ -6311,7 +6311,7 @@ internal static PSMethodInvocationConstraints GetInvokeMemberConstraints(InvokeM
             var targetTypeConstraint = GetTypeConstraintForMethodResolution(invokeMemberExpressionAst.Expression);
             return CombineTypeConstraintForMethodResolution(
                     targetTypeConstraint,
-                    arguments != null ? arguments.Select(Compiler.GetTypeConstraintForMethodResolution).ToArray() : null);
+                    arguments?.Select(Compiler.GetTypeConstraintForMethodResolution).ToArray());
         }
 
         internal static PSMethodInvocationConstraints GetInvokeMemberConstraints(BaseCtorInvokeMemberExpressionAst invokeMemberExpressionAst)
@@ -6330,7 +6330,7 @@ internal static PSMethodInvocationConstraints GetInvokeMemberConstraints(BaseCto
 
             return CombineTypeConstraintForMethodResolution(
                     targetTypeConstraint,
-                    arguments != null ? arguments.Select(Compiler.GetTypeConstraintForMethodResolution).ToArray() : null);
+                    arguments?.Select(Compiler.GetTypeConstraintForMethodResolution).ToArray());
         }
 
         internal Expression InvokeMember(
@@ -6343,7 +6343,7 @@ internal Expression InvokeMember(
             bool nullConditional = false)
         {
             var callInfo = new CallInfo(args.Count());
-            var classScope = _memberFunctionType != null ? _memberFunctionType.Type : null;
+            var classScope = _memberFunctionType?.Type;
             var binder = name.Equals("new", StringComparison.OrdinalIgnoreCase) && @static
                 ? (CallSiteBinder)PSCreateInstanceBinder.Get(callInfo, constraints, publicTypeOnly: true)
                 : PSInvokeMemberBinder.Get(name, callInfo, @static, propertySet, constraints, classScope);
@@ -6353,7 +6353,7 @@ internal Expression InvokeMember(
             return nullConditional ? GetNullConditionalWrappedExpression(target, dynamicExprFromBinder) : dynamicExprFromBinder;
         }
 
-        private Expression InvokeBaseCtorMethod(PSMethodInvocationConstraints constraints, Expression target, IEnumerable<Expression> args)
+        private static Expression InvokeBaseCtorMethod(PSMethodInvocationConstraints constraints, Expression target, IEnumerable<Expression> args)
         {
             var callInfo = new CallInfo(args.Count());
             var binder = PSInvokeBaseCtorBinder.Get(callInfo, constraints);
diff --git a/src/System.Management.Automation/engine/parser/ConstantValues.cs b/src/System.Management.Automation/engine/parser/ConstantValues.cs
index ba244e29044..a8ada5f96d5 100644
--- a/src/System.Management.Automation/engine/parser/ConstantValues.cs
+++ b/src/System.Management.Automation/engine/parser/ConstantValues.cs
@@ -53,7 +53,9 @@ public static bool IsConstant(Ast ast, out object constantValue, bool forAttribu
         }
 
         internal bool CheckingAttributeArgument { get; set; }
+
         internal bool CheckingClassAttributeArguments { get; set; }
+
         internal bool CheckingRequiresArgument { get; set; }
 
         public object VisitErrorStatement(ErrorStatementAst errorStatementAst) { return false; }
@@ -322,6 +324,7 @@ public object VisitParenExpression(ParenExpressionAst parenExpressionAst)
     internal class ConstantValueVisitor : ICustomAstVisitor2
     {
         internal bool AttributeArgument { get; set; }
+
         internal bool RequiresArgument { get; set; }
 
         [Conditional("DEBUG")]
diff --git a/src/System.Management.Automation/engine/parser/PSType.cs b/src/System.Management.Automation/engine/parser/PSType.cs
index cffb32e7092..7ffc308369f 100644
--- a/src/System.Management.Automation/engine/parser/PSType.cs
+++ b/src/System.Management.Automation/engine/parser/PSType.cs
@@ -921,7 +921,7 @@ private void DefineConstructor(IParameterMetadataProvider ipmp, ReadOnlyCollecti
                     (i, n) => ctor.DefineParameter(i, ParameterAttributes.None, n));
             }
 
-            private string GetMetaDataName(string name, int numberOfParameters)
+            private static string GetMetaDataName(string name, int numberOfParameters)
             {
                 int currentId = Interlocked.Increment(ref s_globalCounter);
                 string metaDataName = name + "_" + numberOfParameters + "_" + currentId;
diff --git a/src/System.Management.Automation/engine/parser/Parser.cs b/src/System.Management.Automation/engine/parser/Parser.cs
index 995418f8061..cac1019ea67 100644
--- a/src/System.Management.Automation/engine/parser/Parser.cs
+++ b/src/System.Management.Automation/engine/parser/Parser.cs
@@ -1666,7 +1666,7 @@ private ScriptBlockAst ScriptBlockBodyRule(Token lCurly, List<UsingStatementAst>
                 statements.Add(predefinedStatementAst);
             }
 
-            IScriptExtent statementListExtent = paramBlockAst != null ? paramBlockAst.Extent : null;
+            IScriptExtent statementListExtent = paramBlockAst?.Extent;
             IScriptExtent scriptBlockExtent;
 
             while (true)
@@ -1707,7 +1707,7 @@ private ScriptBlockAst NamedBlockListRule(Token lCurly, List<UsingStatementAst>
             NamedBlockAst endBlock = null;
             IScriptExtent startExtent = lCurly != null
                                             ? lCurly.Extent
-                                            : (paramBlockAst != null) ? paramBlockAst.Extent : null;
+                                            : paramBlockAst?.Extent;
             IScriptExtent endExtent = null;
             IScriptExtent extent = null;
             IScriptExtent scriptBlockExtent = null;
@@ -2042,7 +2042,7 @@ private StatementAst StatementRule()
                     statement = BlockStatementRule(token);
                     break;
                 case TokenKind.Configuration:
-                    statement = ConfigurationStatementRule(attributes != null ? attributes.OfType<AttributeAst>() : null, token);
+                    statement = ConfigurationStatementRule(attributes?.OfType<AttributeAst>(), token);
                     break;
                 case TokenKind.From:
                 case TokenKind.Define:
@@ -2848,7 +2848,7 @@ private StatementAst SwitchStatementRule(LabelToken labelToken, Token switchToke
             }
 
             return new SwitchStatementAst(ExtentOf(labelToken ?? switchToken, rCurly),
-                labelToken != null ? labelToken.LabelText : null, condition, flags, clauses, @default);
+                labelToken?.LabelText, condition, flags, clauses, @default);
         }
 
         private StatementAst ConfigurationStatementRule(IEnumerable<AttributeAst> customAttributes, Token configurationToken)
@@ -3439,7 +3439,7 @@ private StatementAst ForeachStatementRule(LabelToken labelToken, Token forEachTo
             }
 
             return new ForEachStatementAst(ExtentOf(startOfStatement, body),
-                labelToken != null ? labelToken.LabelText : null,
+                labelToken?.LabelText,
                 flags,
                 throttleLimit, variableAst, pipeline, body);
         }
@@ -3552,7 +3552,7 @@ private StatementAst ForStatementRule(LabelToken labelToken, Token forToken)
             }
 
             return new ForStatementAst(ExtentOf(labelToken ?? forToken, body),
-                labelToken != null ? labelToken.LabelText : null, initializer, condition, iterator, body);
+                labelToken?.LabelText, initializer, condition, iterator, body);
         }
 
         private StatementAst WhileStatementRule(LabelToken labelToken, Token whileToken)
@@ -3634,7 +3634,7 @@ private StatementAst WhileStatementRule(LabelToken labelToken, Token whileToken)
             }
 
             return new WhileStatementAst(ExtentOf(labelToken ?? whileToken, body),
-                labelToken != null ? labelToken.LabelText : null, condition, body);
+                labelToken?.LabelText, condition, body);
         }
 
         /// <summary>
@@ -4129,7 +4129,7 @@ private StatementAst DoWhileStatementRule(LabelToken labelToken, Token doToken)
             }
 
             IScriptExtent extent = ExtentOf(startExtent, rParen);
-            string label = (labelToken != null) ? labelToken.LabelText : null;
+            string label = labelToken?.LabelText;
             if (whileOrUntilToken.Kind == TokenKind.Until)
             {
                 return new DoUntilStatementAst(extent, label, condition, body);
@@ -4283,7 +4283,7 @@ private StatementAst ClassDefinitionRule(List<AttributeBaseAst> customAttributes
                                       ? customAttributes[0].Extent
                                       : classToken.Extent;
                 var extent = ExtentOf(startExtent, lastExtent);
-                var classDefn = new TypeDefinitionAst(extent, name.Value, customAttributes == null ? null : customAttributes.OfType<AttributeAst>(), members, TypeAttributes.Class, superClassesList);
+                var classDefn = new TypeDefinitionAst(extent, name.Value, customAttributes?.OfType<AttributeAst>(), members, TypeAttributes.Class, superClassesList);
                 if (customAttributes != null && customAttributes.OfType<TypeConstraintAst>().Any())
                 {
                     if (nestedAsts == null)
@@ -4574,7 +4574,7 @@ private MemberAst ClassMemberRule(string className, out List<Ast> astsOnError)
             return null;
         }
 
-        private bool TryUseTokenAsSimpleName(Token token)
+        private static bool TryUseTokenAsSimpleName(Token token)
         {
             if (token.Kind == TokenKind.Identifier
                 || token.Kind == TokenKind.DynamicKeyword
@@ -4587,7 +4587,7 @@ private bool TryUseTokenAsSimpleName(Token token)
             return false;
         }
 
-        private void RecordErrorAsts(Ast errAst, ref List<Ast> astsOnError)
+        private static void RecordErrorAsts(Ast errAst, ref List<Ast> astsOnError)
         {
             if (errAst == null)
             {
@@ -4602,7 +4602,7 @@ private void RecordErrorAsts(Ast errAst, ref List<Ast> astsOnError)
             astsOnError.Add(errAst);
         }
 
-        private void RecordErrorAsts(IEnumerable<Ast> errAsts, ref List<Ast> astsOnError)
+        private static void RecordErrorAsts(IEnumerable<Ast> errAsts, ref List<Ast> astsOnError)
         {
             if (errAsts == null || !errAsts.Any())
             {
@@ -4744,7 +4744,7 @@ private StatementAst EnumDefinitionRule(List<AttributeBaseAst> customAttributes,
                                           ? customAttributes[0].Extent
                                           : enumToken.Extent;
                 var extent = ExtentOf(startExtent, rCurly);
-                var enumDefn = new TypeDefinitionAst(extent, name.Value, customAttributes == null ? null : customAttributes.OfType<AttributeAst>(), members, TypeAttributes.Enum, underlyingTypeConstraint == null ? null : new[] { underlyingTypeConstraint });
+                var enumDefn = new TypeDefinitionAst(extent, name.Value, customAttributes?.OfType<AttributeAst>(), members, TypeAttributes.Enum, underlyingTypeConstraint == null ? null : new[] { underlyingTypeConstraint });
                 if (customAttributes != null && customAttributes.OfType<TypeConstraintAst>().Any())
                 {
                     // No need to report error since there is error reported in method StatementRule
@@ -5623,7 +5623,7 @@ private StatementAst DataStatementRule(Token dataToken)
             IScriptExtent endErrorStatement = null;
             SkipNewlines();
             var dataVariableNameAst = SimpleNameRule();
-            string dataVariableName = (dataVariableNameAst != null) ? dataVariableNameAst.Value : null;
+            string dataVariableName = dataVariableNameAst?.Value;
 
             SkipNewlines();
             Token supportedCommandToken = PeekToken();
@@ -6629,7 +6629,7 @@ internal Ast CommandRule(bool forDynamicKeyword)
 
             return new CommandAst(ExtentOf(firstToken, endExtent), elements,
                                   dotSource || ampersand ? firstToken.Kind : TokenKind.Unknown,
-                                  redirections != null ? redirections.Where(r => r != null) : null);
+                                  redirections?.Where(r => r != null));
         }
 
         #endregion Pipelines
@@ -7939,7 +7939,7 @@ private static void AssertErrorIdCorrespondsToMsgString(string errorId, string e
 
         private static object[] arrayOfOneArg
         {
-            get { return t_arrayOfOneArg ?? (t_arrayOfOneArg = new object[1]); }
+            get { return t_arrayOfOneArg ??= new object[1]; }
         }
 
         [ThreadStatic]
@@ -7947,7 +7947,7 @@ private static object[] arrayOfOneArg
 
         private static object[] arrayOfTwoArgs
         {
-            get { return t_arrayOfTwoArgs ?? (t_arrayOfTwoArgs = new object[2]); }
+            get { return t_arrayOfTwoArgs ??= new object[2]; }
         }
 
         [ThreadStatic]
@@ -8013,7 +8013,7 @@ internal void ReportError(ParseError error)
             SaveError(error);
         }
 
-        private void ReportErrorsAsWarnings(Collection<Exception> errors)
+        private static void ReportErrorsAsWarnings(Collection<Exception> errors)
         {
             var executionContext = Runspaces.Runspace.DefaultRunspace.ExecutionContext;
             if (executionContext != null && executionContext.InternalHost != null && executionContext.InternalHost.UI != null)
diff --git a/src/System.Management.Automation/engine/parser/Position.cs b/src/System.Management.Automation/engine/parser/Position.cs
index 24ce0d118a2..5e967e432b6 100644
--- a/src/System.Management.Automation/engine/parser/Position.cs
+++ b/src/System.Management.Automation/engine/parser/Position.cs
@@ -51,12 +51,13 @@ public interface IScriptPosition
     /// <summary>
     /// Represents the a span of text in a script.
     /// </summary>
+#nullable enable
     public interface IScriptExtent
     {
         /// <summary>
         /// The filename the extent includes, or null if the extent is not included in any file.
         /// </summary>
-        string File { get; }
+        string? File { get; }
 
         /// <summary>
         /// The starting position of the extent.
@@ -103,6 +104,7 @@ public interface IScriptExtent
         /// </summary>
         int EndOffset { get; }
     }
+#nullable restore
 
     /// <summary>
     /// A few utility functions for script positions.
diff --git a/src/System.Management.Automation/engine/parser/PreOrderVisitor.cs b/src/System.Management.Automation/engine/parser/PreOrderVisitor.cs
index 0bf5368fddb..33b2fadec64 100644
--- a/src/System.Management.Automation/engine/parser/PreOrderVisitor.cs
+++ b/src/System.Management.Automation/engine/parser/PreOrderVisitor.cs
@@ -254,6 +254,7 @@ public abstract class AstVisitor2 : AstVisitor
     /// Implement this interface when you implement <see cref="AstVisitor"/> or <see cref="AstVisitor2"/> when
     /// you want to do something after possibly visiting the children of the ast.
     /// </summary>
+#nullable enable
     public interface IAstPostVisitHandler
     {
         /// <summary>
diff --git a/src/System.Management.Automation/engine/parser/SafeValues.cs b/src/System.Management.Automation/engine/parser/SafeValues.cs
index 37320de83d1..a727ae1d287 100644
--- a/src/System.Management.Automation/engine/parser/SafeValues.cs
+++ b/src/System.Management.Automation/engine/parser/SafeValues.cs
@@ -362,7 +362,8 @@ internal enum SafeValueContext
         {
             Default,
             GetPowerShell,
-            ModuleAnalysis
+            ModuleAnalysis,
+            SkipHashtableSizeCheck,
         }
 
         // future proofing
@@ -371,7 +372,8 @@ private GetSafeValueVisitor() { }
         public static object GetSafeValue(Ast ast, ExecutionContext context, SafeValueContext safeValueContext)
         {
             t_context = context;
-            if (IsSafeValueVisitor.IsAstSafe(ast, safeValueContext))
+
+            if (safeValueContext == SafeValueContext.SkipHashtableSizeCheck || IsSafeValueVisitor.IsAstSafe(ast, safeValueContext))
             {
                 return ast.Accept(new GetSafeValueVisitor());
             }
@@ -480,7 +482,7 @@ public static object GetSafeValue(Ast ast, ExecutionContext context, SafeValueCo
         // this can throw, but there really isn't useful information we can add, as the
         // offending expression will be presented in the case of any failure
         //
-        private object GetSingleValueFromTarget(object target, object index)
+        private static object GetSingleValueFromTarget(object target, object index)
         {
             var targetString = target as string;
             if (targetString != null)
@@ -517,7 +519,7 @@ private object GetSingleValueFromTarget(object target, object index)
             throw new Exception();
         }
 
-        private object GetIndexedValueFromTarget(object target, object index)
+        private static object GetIndexedValueFromTarget(object target, object index)
         {
             var indexArray = index as object[];
             return indexArray != null ? ((object[])indexArray).Select(i => GetSingleValueFromTarget(target, i)).ToArray() : GetSingleValueFromTarget(target, index);
diff --git a/src/System.Management.Automation/engine/parser/SemanticChecks.cs b/src/System.Management.Automation/engine/parser/SemanticChecks.cs
index ae959f0c58d..3afd10ff6e2 100644
--- a/src/System.Management.Automation/engine/parser/SemanticChecks.cs
+++ b/src/System.Management.Automation/engine/parser/SemanticChecks.cs
@@ -62,12 +62,12 @@ private bool AnalyzingStaticMember()
             return fnMemberAst != null ? fnMemberAst.IsStatic : ((PropertyMemberAst)currentMember).IsStatic;
         }
 
-        private bool IsValidAttributeArgument(Ast ast, IsConstantValueVisitor visitor)
+        private static bool IsValidAttributeArgument(Ast ast, IsConstantValueVisitor visitor)
         {
             return (bool)ast.Accept(visitor);
         }
 
-        private (string id, string msg) GetNonConstantAttributeArgErrorExpr(IsConstantValueVisitor visitor)
+        private static (string id, string msg) GetNonConstantAttributeArgErrorExpr(IsConstantValueVisitor visitor)
         {
             if (visitor.CheckingClassAttributeArguments)
             {
@@ -670,7 +670,7 @@ private static string GetLabel(ExpressionAst expr)
             }
 
             var str = expr as StringConstantExpressionAst;
-            return str != null ? str.Value : null;
+            return str?.Value;
         }
 
         public override AstVisitAction VisitBreakStatement(BreakStatementAst breakStatementAst)
@@ -1183,7 +1183,7 @@ public override AstVisitAction VisitInvokeMemberExpression(InvokeMemberExpressio
             return AstVisitAction.Continue;
         }
 
-        private void CheckMemberAccess(MemberExpressionAst ast)
+        private static void CheckMemberAccess(MemberExpressionAst ast)
         {
             // If the member access is not constant, it may be considered suspicious
             if (ast.Member is not ConstantExpressionAst)
@@ -1201,7 +1201,7 @@ private void CheckMemberAccess(MemberExpressionAst ast)
         }
 
         // Mark all of the parents of an AST as suspicious
-        private void MarkAstParentsAsSuspicious(Ast ast)
+        private static void MarkAstParentsAsSuspicious(Ast ast)
         {
             Ast targetAst = ast;
             var parent = ast;
diff --git a/src/System.Management.Automation/engine/parser/SymbolResolver.cs b/src/System.Management.Automation/engine/parser/SymbolResolver.cs
index 603ae539cb1..2da38a4ed06 100644
--- a/src/System.Management.Automation/engine/parser/SymbolResolver.cs
+++ b/src/System.Management.Automation/engine/parser/SymbolResolver.cs
@@ -30,6 +30,7 @@ public TypeLookupResult(TypeDefinitionAst type = null)
         }
 
         public TypeDefinitionAst Type { get; set; }
+
         public List<string> ExternalNamespaces { get; set; }
 
         public bool IsAmbiguous()
diff --git a/src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs b/src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs
index 2543c5273d0..45f278b6b5a 100644
--- a/src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs
+++ b/src/System.Management.Automation/engine/parser/TypeInferenceVisitor.cs
@@ -132,7 +132,7 @@ public TypeInferenceContext() : this(PowerShell.Create(RunspaceMode.CurrentRunsp
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="TypeInferenceContext" /> class.
+        /// Initializes a new instance of the <see cref="TypeInferenceContext"/> class.
         /// The powerShell instance passed need to have a non null Runspace.
         /// </summary>
         /// <param name="powerShell">The instance of powershell to use for expression evaluation needed for type inference.</param>
@@ -1217,7 +1217,7 @@ bool IsInPropertyArgument(object o)
             }
 
             var previousPipelineElement = GetPreviousPipelineCommand(commandAst);
-            var typeName = "Microsoft.PowerShell.Commands.GroupInfo";
+            const string typeName = "Microsoft.PowerShell.Commands.GroupInfo";
             var members = new List<PSMemberNameAndType>();
             foreach (var prevType in InferTypes(previousPipelineElement))
             {
@@ -1699,7 +1699,7 @@ private bool TryGetTypeFromMember(
             return false;
         }
 
-        private void AddTypesFromMethodCacheEntry(
+        private static void AddTypesFromMethodCacheEntry(
             DotNetAdapter.MethodCacheEntry methodCacheEntry,
             List<PSTypeName> result,
             bool isInvokeMemberExpressionAst)
@@ -2021,7 +2021,7 @@ private void InferTypeFrom(VariableExpressionAst variableExpressionAst, List<PST
         /// </summary>
         /// <param name="inferredTypes">The inferred types all the items in the array.</param>
         /// <returns>The inferred strongly typed array type.</returns>
-        private PSTypeName GetArrayType(IEnumerable<PSTypeName> inferredTypes)
+        private static PSTypeName GetArrayType(IEnumerable<PSTypeName> inferredTypes)
         {
             PSTypeName foundType = null;
             foreach (PSTypeName inferredType in inferredTypes)
@@ -2077,7 +2077,7 @@ private PSTypeName GetArrayType(IEnumerable<PSTypeName> inferredTypes)
         /// </summary>
         /// <param name="enumerableType">The type to infer enumerated item type from.</param>
         /// <returns>The inferred enumerated item type.</returns>
-        private Type GetMostSpecificEnumeratedItemType(Type enumerableType)
+        private static Type GetMostSpecificEnumeratedItemType(Type enumerableType)
         {
             if (enumerableType.IsArray)
             {
@@ -2141,19 +2141,19 @@ private Type GetMostSpecificEnumeratedItemType(Type enumerableType)
         /// <param name="interfaceType">The interface to test.</param>
         /// <param name="hasSeenNonGeneric">
         /// A reference to a value indicating whether a non-generic enumerable type has been
-        /// seen. If <see paramref="interfaceType" /> is a non-generic enumerable type this
-        /// value will be set to <see langword="true" />.
+        /// seen. If <see paramref="interfaceType"/> is a non-generic enumerable type this
+        /// value will be set to <see langword="true"/>.
         /// </param>
         /// <param name="hasSeenDictionaryEnumerator">
-        /// A reference to a value indicating whether <see cref="IDictionaryEnumerator" /> has been
-        /// seen. If <paramref name="interfaceType" /> is a <see cref="IDictionaryEnumerator" /> this
-        /// value will be set to <see langword="true" />.
+        /// A reference to a value indicating whether <see cref="IDictionaryEnumerator"/> has been
+        /// seen. If <paramref name="interfaceType"/> is a <see cref="IDictionaryEnumerator"/> this
+        /// value will be set to <see langword="true"/>.
         /// </param>
         /// <returns>
-        /// The value of <paramref name="interfaceType" /> if it can be used to infer a specific
-        /// enumerated type, otherwise <see langword="null" />.
+        /// The value of <paramref name="interfaceType"/> if it can be used to infer a specific
+        /// enumerated type, otherwise <see langword="null"/>.
         /// </returns>
-        private Type GetGenericCollectionLikeInterface(
+        private static Type GetGenericCollectionLikeInterface(
             Type interfaceType,
             ref bool hasSeenNonGeneric,
             ref bool hasSeenDictionaryEnumerator)
@@ -2250,14 +2250,14 @@ private IEnumerable<PSTypeName> InferTypeFrom(IndexExpressionAst indexExpression
         }
 
         /// <summary>
-        /// Infers the types as if they were enumerated. For example, a <see cref="List{T}" />
-        /// of type <see cref="string" /> would be returned as <see cref="string" />.
+        /// Infers the types as if they were enumerated. For example, a <see cref="List{T}"/>
+        /// of type <see cref="string"/> would be returned as <see cref="string"/>.
         /// </summary>
         /// <param name="enumerableTypes">
         /// The potentially enumerable types to infer enumerated type from.
         /// </param>
         /// <returns>The enumerated item types.</returns>
-        private IEnumerable<PSTypeName> GetInferredEnumeratedTypes(IEnumerable<PSTypeName> enumerableTypes)
+        private static IEnumerable<PSTypeName> GetInferredEnumeratedTypes(IEnumerable<PSTypeName> enumerableTypes)
         {
             foreach (PSTypeName maybeEnumerableType in enumerableTypes)
             {
diff --git a/src/System.Management.Automation/engine/parser/TypeResolver.cs b/src/System.Management.Automation/engine/parser/TypeResolver.cs
index b5e6ae733a1..85325b61305 100644
--- a/src/System.Management.Automation/engine/parser/TypeResolver.cs
+++ b/src/System.Management.Automation/engine/parser/TypeResolver.cs
@@ -246,7 +246,7 @@ private static Type CallResolveTypeNameWorkerHelper(TypeName typeName,
             try
             {
                 exception = null;
-                var currentScope = context != null ? context.EngineSessionState.CurrentScope : null;
+                var currentScope = context?.EngineSessionState.CurrentScope;
                 Type result = ResolveTypeNameWorker(typeName, currentScope, typeResolutionState.assemblies, t_searchedAssemblies, typeResolutionState,
                                                     /*onlySearchInGivenAssemblies*/ false, /* reportAmbiguousException */ true, out exception);
                 if (exception == null && result == null)
diff --git a/src/System.Management.Automation/engine/parser/VariableAnalysis.cs b/src/System.Management.Automation/engine/parser/VariableAnalysis.cs
index 092a9fc9a49..4cc8e98a2c0 100644
--- a/src/System.Management.Automation/engine/parser/VariableAnalysis.cs
+++ b/src/System.Management.Automation/engine/parser/VariableAnalysis.cs
@@ -25,12 +25,19 @@ internal VariableAnalysisDetails()
         }
 
         public int BitIndex { get; set; }
+
         public int LocalTupleIndex { get; set; }
+
         public Type Type { get; set; }
+
         public string Name { get; set; }
+
         public bool Automatic { get; set; }
+
         public bool PreferenceVariable { get; set; }
+
         public bool Assigned { get; set; }
+
         public List<Ast> AssociatedAsts { get; }
     }
 
diff --git a/src/System.Management.Automation/engine/parser/ast.cs b/src/System.Management.Automation/engine/parser/ast.cs
index b654ab0ccdc..156e0365b4a 100644
--- a/src/System.Management.Automation/engine/parser/ast.cs
+++ b/src/System.Management.Automation/engine/parser/ast.cs
@@ -29,11 +29,15 @@ namespace System.Management.Automation.Language
     using System.Runtime.CompilerServices;
     using System.Reflection.Emit;
 
+#nullable enable
+
     internal interface ISupportsAssignment
     {
         IAssignableValue GetAssignableValue();
     }
 
+#nullable restore
+
     internal interface IAssignableValue
     {
         /// <summary>
@@ -53,8 +57,11 @@ internal interface IAssignableValue
     internal interface IParameterMetadataProvider
     {
         bool HasAnyScriptBlockAttributes();
+
         RuntimeDefinedParameterDictionary GetParameterMetadata(bool automaticPositions, ref bool usesCmdletBinding);
+
         IEnumerable<Attribute> GetScriptBlockAttributes();
+
         IEnumerable<ExperimentalAttribute> GetExperimentalAttributes();
 
         bool UsesCmdletBinding();
@@ -195,6 +202,19 @@ public override string ToString()
         /// If <paramref name="extent"/> is deemed unsafe
         /// </exception>
         public object SafeGetValue()
+        {
+            return SafeGetValue(skipHashtableSizeCheck: false);
+        }
+
+        /// <summary>
+        /// Constructs the resultant object from the AST and returns it if it is safe.
+        /// </summary>
+        /// <param name="skipHashtableSizeCheck">Set to skip hashtable limit validation.</param>
+        /// <returns>The object represented by the AST as a safe object.</returns>
+        /// <exception cref="InvalidOperationException">
+        /// If <paramref name="extent"/> is deemed unsafe.
+        /// </exception>
+        public object SafeGetValue(bool skipHashtableSizeCheck)
         {
             try
             {
@@ -204,7 +224,7 @@ public object SafeGetValue()
                     context = System.Management.Automation.Runspaces.Runspace.DefaultRunspace.ExecutionContext;
                 }
 
-                return GetSafeValueVisitor.GetSafeValue(this, context, GetSafeValueVisitor.SafeValueContext.Default);
+                return GetSafeValueVisitor.GetSafeValue(this, context, skipHashtableSizeCheck ? GetSafeValueVisitor.SafeValueContext.SkipHashtableSizeCheck : GetSafeValueVisitor.SafeValueContext.Default);
             }
             catch
             {
@@ -286,6 +306,7 @@ internal void ClearParent()
         }
 
         internal abstract object Accept(ICustomAstVisitor visitor);
+
         internal abstract AstVisitAction InternalVisit(AstVisitor visitor);
 
         internal static readonly PSTypeName[] EmptyPSTypeNameArray = Array.Empty<PSTypeName>();
@@ -770,6 +791,7 @@ public class ScriptBlockAst : Ast, IParameterMetadataProvider
             Utils.EmptyReadOnlyCollection<UsingStatementAst>();
 
         internal bool HadErrors { get; set; }
+
         internal bool IsConfiguration { get; private set; }
 
         internal bool PostParseChecksPerformed { get; set; }
@@ -1749,7 +1771,7 @@ public class NamedBlockAst : Ast
         /// </exception>
         /// <exception cref="PSArgumentException">
         /// If <paramref name="blockName"/> is not one of the valid kinds for a named block,
-        /// or if <paramref name="unnamed"/> is <c>true</c> and <paramref name="blockName"/> is neither
+        /// or if <paramref name="unnamed"/> is <see langword="true"/> and <paramref name="blockName"/> is neither
         /// <see cref="TokenKind.Process"/> nor <see cref="TokenKind.End"/>.
         /// </exception>
         public NamedBlockAst(IScriptExtent extent, TokenKind blockName, StatementBlockAst statementBlock, bool unnamed)
@@ -2656,7 +2678,7 @@ public override Ast Copy()
         internal override object Accept(ICustomAstVisitor visitor)
         {
             var visitor2 = visitor as ICustomAstVisitor2;
-            return visitor2 != null ? visitor2.VisitTypeDefinition(this) : null;
+            return visitor2?.VisitTypeDefinition(this);
         }
 
         internal override AstVisitAction InternalVisit(AstVisitor visitor)
@@ -2904,7 +2926,7 @@ public override Ast Copy()
         internal override object Accept(ICustomAstVisitor visitor)
         {
             var visitor2 = visitor as ICustomAstVisitor2;
-            return visitor2 != null ? visitor2.VisitUsingStatement(this) : null;
+            return visitor2?.VisitUsingStatement(this);
         }
 
         internal override AstVisitAction InternalVisit(AstVisitor visitor)
@@ -3132,7 +3154,7 @@ internal override string GetTooltip()
         internal override object Accept(ICustomAstVisitor visitor)
         {
             var visitor2 = visitor as ICustomAstVisitor2;
-            return visitor2 != null ? visitor2.VisitPropertyMember(this) : null;
+            return visitor2?.VisitPropertyMember(this);
         }
 
         internal override AstVisitAction InternalVisit(AstVisitor visitor)
@@ -3352,7 +3374,7 @@ internal override string GetTooltip()
         internal override object Accept(ICustomAstVisitor visitor)
         {
             var visitor2 = visitor as ICustomAstVisitor2;
-            return visitor2 != null ? visitor2.VisitFunctionMember(this) : null;
+            return visitor2?.VisitFunctionMember(this);
         }
 
         internal override AstVisitAction InternalVisit(AstVisitor visitor)
@@ -3444,7 +3466,7 @@ internal bool IsReturnTypeVoid()
             if (ReturnType == null)
                 return true;
             var typeName = ReturnType.TypeName as TypeName;
-            return typeName == null ? false : typeName.IsType(typeof(void));
+            return typeName != null && typeName.IsType(typeof(void));
         }
 
         internal Type GetReturnType()
@@ -3829,7 +3851,7 @@ IEnumerable<ExperimentalAttribute> IParameterMetadataProvider.GetExperimentalAtt
 
         ReadOnlyCollection<ParameterAst> IParameterMetadataProvider.Parameters
         {
-            get { return Parameters ?? (Body.ParamBlock != null ? Body.ParamBlock.Parameters : null); }
+            get { return Parameters ?? (Body.ParamBlock?.Parameters); }
         }
 
         PowerShell IParameterMetadataProvider.GetPowerShell(ExecutionContext context, Dictionary<string, object> variables, bool isTrustedInput,
@@ -5879,7 +5901,7 @@ public CommandAst(IScriptExtent extent,
         public string GetCommandName()
         {
             var name = CommandElements[0] as StringConstantExpressionAst;
-            return name != null ? name.Value : null;
+            return name?.Value;
         }
 
         /// <summary>
@@ -6422,7 +6444,7 @@ public override Ast Copy()
             {
                 LCurlyToken = this.LCurlyToken,
                 ConfigurationToken = this.ConfigurationToken,
-                CustomAttributes = this.CustomAttributes == null ? null : this.CustomAttributes.Select(e => (AttributeAst)e.Copy())
+                CustomAttributes = this.CustomAttributes?.Select(e => (AttributeAst)e.Copy())
             };
         }
 
@@ -6431,7 +6453,7 @@ public override Ast Copy()
         internal override object Accept(ICustomAstVisitor visitor)
         {
             var visitor2 = visitor as ICustomAstVisitor2;
-            return visitor2 != null ? visitor2.VisitConfigurationDefinition(this) : null;
+            return visitor2?.VisitConfigurationDefinition(this);
         }
 
         internal override AstVisitAction InternalVisit(AstVisitor visitor)
@@ -6463,7 +6485,9 @@ internal override AstVisitAction InternalVisit(AstVisitor visitor)
         #region Internal methods/properties
 
         internal Token LCurlyToken { get; set; }
+
         internal Token ConfigurationToken { get; set; }
+
         internal IEnumerable<AttributeAst> CustomAttributes { get; set; }
 
         /// <summary>
@@ -6521,7 +6545,7 @@ internal PipelineAst GenerateSetItemPipelineAst()
             cea.Add(new CommandParameterAst(PositionUtilities.EmptyExtent, "ResourceModuleTuplesToImport", new ConstantExpressionAst(PositionUtilities.EmptyExtent, resourceModulePairsToImport), PositionUtilities.EmptyExtent));
 
             var scriptBlockBody = new ScriptBlockAst(Body.Extent,
-                CustomAttributes == null ? null : CustomAttributes.Select(att => (AttributeAst)att.Copy()).ToList(),
+                CustomAttributes?.Select(att => (AttributeAst)att.Copy()).ToList(),
                 null,
                 new StatementBlockAst(Body.Extent, resourceBody, null),
                 false, false);
@@ -6580,7 +6604,7 @@ internal PipelineAst GenerateSetItemPipelineAst()
             var statmentBlockAst = new StatementBlockAst(this.Extent, funcStatements, null);
 
             var funcBody = new ScriptBlockAst(Body.Extent,
-                CustomAttributes == null ? null : CustomAttributes.Select(att => (AttributeAst)att.Copy()).ToList(),
+                CustomAttributes?.Select(att => (AttributeAst)att.Copy()).ToList(),
                 paramBlockAst, statmentBlockAst, false, true);
             var funcBodyExp = new ScriptBlockExpressionAst(this.Extent, funcBody);
 
@@ -6898,7 +6922,7 @@ public override Ast Copy()
         internal override object Accept(ICustomAstVisitor visitor)
         {
             var visitor2 = visitor as ICustomAstVisitor2;
-            return visitor2 != null ? visitor2.VisitDynamicKeywordStatement(this) : null;
+            return visitor2?.VisitDynamicKeywordStatement(this);
         }
 
         internal override AstVisitAction InternalVisit(AstVisitor visitor)
@@ -6945,10 +6969,15 @@ internal DynamicKeyword Keyword
         private DynamicKeyword _keyword;
 
         internal Token LCurly { get; set; }
+
         internal Token FunctionName { get; set; }
+
         internal ExpressionAst InstanceName { get; set; }
+
         internal ExpressionAst OriginalInstanceName { get; set; }
+
         internal ExpressionAst BodyExpression { get; set; }
+
         internal string ElementName { get; set; }
 
         private PipelineAst _commandCallPipelineAst;
@@ -8103,7 +8132,7 @@ internal override AstVisitAction InternalVisit(AstVisitor visitor)
         internal override object Accept(ICustomAstVisitor visitor)
         {
             var visitor2 = visitor as ICustomAstVisitor2;
-            return visitor2 != null ? visitor2.VisitBaseCtorInvokeMemberExpression(this) : null;
+            return visitor2?.VisitBaseCtorInvokeMemberExpression(this);
         }
     }
 
@@ -9233,6 +9262,7 @@ internal override AstVisitAction InternalVisit(AstVisitor visitor)
         internal int TupleIndex { get; set; } = VariableAnalysis.Unanalyzed;
 
         internal bool Automatic { get; set; }
+
         internal bool Assigned { get; set; }
 
         IAssignableValue ISupportsAssignment.GetAssignableValue()
diff --git a/src/System.Management.Automation/engine/parser/tokenizer.cs b/src/System.Management.Automation/engine/parser/tokenizer.cs
index 3d66362745c..5ab09c0a40f 100644
--- a/src/System.Management.Automation/engine/parser/tokenizer.cs
+++ b/src/System.Management.Automation/engine/parser/tokenizer.cs
@@ -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.
@@ -77,8 +77,7 @@ private static Dictionary<string, DynamicKeyword> DynamicKeywords
         {
             get
             {
-                return t_dynamicKeywords ??
-                       (t_dynamicKeywords = new Dictionary<string, DynamicKeyword>(StringComparer.OrdinalIgnoreCase));
+                return t_dynamicKeywords ??= new Dictionary<string, DynamicKeyword>(StringComparer.OrdinalIgnoreCase);
             }
         }
 
@@ -92,8 +91,7 @@ private static Stack<Dictionary<string, DynamicKeyword>> DynamicKeywordsStack
         {
             get
             {
-                return t_dynamicKeywordsStack ??
-                       (t_dynamicKeywordsStack = new Stack<Dictionary<string, DynamicKeyword>>());
+                return t_dynamicKeywordsStack ??= new Stack<Dictionary<string, DynamicKeyword>>();
             }
         }
 
@@ -320,8 +318,7 @@ public Dictionary<string, DynamicKeywordProperty> Properties
         {
             get
             {
-                return _properties ??
-                       (_properties = new Dictionary<string, DynamicKeywordProperty>(StringComparer.OrdinalIgnoreCase));
+                return _properties ??= new Dictionary<string, DynamicKeywordProperty>(StringComparer.OrdinalIgnoreCase);
             }
         }
 
@@ -334,8 +331,7 @@ public Dictionary<string, DynamicKeywordParameter> Parameters
         {
             get
             {
-                return _parameters ??
-                       (_parameters = new Dictionary<string, DynamicKeywordParameter>(StringComparer.OrdinalIgnoreCase));
+                return _parameters ??= new Dictionary<string, DynamicKeywordParameter>(StringComparer.OrdinalIgnoreCase);
             }
         }
 
@@ -426,7 +422,7 @@ public class DynamicKeywordProperty
         /// </summary>
         public List<string> Attributes
         {
-            get { return _attributes ?? (_attributes = new List<string>()); }
+            get { return _attributes ??= new List<string>(); }
         }
 
         private List<string> _attributes;
@@ -436,7 +432,7 @@ public List<string> Attributes
         /// </summary>
         public List<string> Values
         {
-            get { return _values ?? (_values = new List<string>()); }
+            get { return _values ??= new List<string>(); }
         }
 
         private List<string> _values;
@@ -446,7 +442,7 @@ public List<string> Values
         /// </summary>
         public Dictionary<string, string> ValueMap
         {
-            get { return _valueMap ?? (_valueMap = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)); }
+            get { return _valueMap ??= new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); }
         }
 
         private Dictionary<string, string> _valueMap;
@@ -721,6 +717,7 @@ internal Tokenizer(Parser parser)
         }
 
         internal TokenizerMode Mode { get; set; }
+
         internal bool AllowSignedNumbers { get; set; }
 
         // TODO: use auto-properties when making 'ternary operator' an official feature.
@@ -733,8 +730,11 @@ internal bool ForceEndNumberOnTernaryOpChars
         }
 
         internal bool WantSimpleName { get; set; }
+
         internal bool InWorkflowContext { get; set; }
+
         internal List<Token> TokenList { get; set; }
+
         internal Token FirstToken { get; private set; }
 
         internal Token LastToken { get; private set; }
@@ -826,7 +826,7 @@ internal void FinishNestedScan(TokenizerState ts)
 
         private char GetChar()
         {
-            Diagnostics.Assert(0 <= _currentIndex, "GetChar reading before start of input.");
+            Diagnostics.Assert(_currentIndex >= 0, "GetChar reading before start of input.");
             Diagnostics.Assert(_currentIndex <= _script.Length + 1, "GetChar reading after end of input.");
 
             // Increment _currentIndex, even if it goes over the Length so callers can call UngetChar to unget EOF.
@@ -848,7 +848,7 @@ private void UngetChar()
 
         private char PeekChar()
         {
-            Diagnostics.Assert(0 <= _currentIndex && _currentIndex <= _script.Length, "PeekChar out of range.");
+            Diagnostics.Assert(_currentIndex >= 0 && _currentIndex <= _script.Length, "PeekChar out of range.");
 
             if (_currentIndex == _script.Length)
             {
@@ -1045,7 +1045,7 @@ internal void Resync(int start)
             {
                 _currentIndex = _script.Length + 1;
             }
-            else if (0 > _currentIndex)
+            else if (_currentIndex < 0)
             {
                 _currentIndex = 0;
             }
diff --git a/src/System.Management.Automation/engine/pipeline.cs b/src/System.Management.Automation/engine/pipeline.cs
index 17fe22bcfd0..fb753652c93 100644
--- a/src/System.Management.Automation/engine/pipeline.cs
+++ b/src/System.Management.Automation/engine/pipeline.cs
@@ -91,14 +91,6 @@ private void Dispose(bool disposing)
             _disposed = true;
         }
 
-        /// <summary>
-        /// Finalizer for class PipelineProcessor.
-        /// </summary>
-        ~PipelineProcessor()
-        {
-            Dispose(false);
-        }
-
         #endregion IDispose
 
         #region Execution Logging
@@ -174,7 +166,7 @@ internal void LogExecutionException(Exception exception)
             Log(message, null, PipelineExecutionStatus.Error);
         }
 
-        private string GetCommand(InvocationInfo invocationInfo)
+        private static string GetCommand(InvocationInfo invocationInfo)
         {
             if (invocationInfo == null)
                 return string.Empty;
@@ -187,7 +179,7 @@ private string GetCommand(InvocationInfo invocationInfo)
             return string.Empty;
         }
 
-        private string GetCommand(Exception exception)
+        private static string GetCommand(Exception exception)
         {
             IContainsErrorRecord icer = exception as IContainsErrorRecord;
             if (icer != null && icer.ErrorRecord != null)
diff --git a/src/System.Management.Automation/engine/regex.cs b/src/System.Management.Automation/engine/regex.cs
index 06b9676c0e8..3f827dc08f8 100644
--- 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.
@@ -184,7 +184,7 @@ StringComparison GetStringComparison()
             if (index == Pattern.Length - 1 && Pattern[index] == '*')
             {
                 // No special characters present in the pattern before last position and last character is asterisk.
-                var patternWithoutAsterisk = Pattern.AsMemory().Slice(0, index);
+                var patternWithoutAsterisk = Pattern.AsMemory(0, index);
                 _isMatch = str => str.AsSpan().StartsWith(patternWithoutAsterisk.Span, GetStringComparison());
                 return;
             }
@@ -325,7 +325,7 @@ public static bool ContainsWildcardCharacters(string pattern)
         /// converted to their unescaped form.
         /// </returns>
         /// <exception cref="ArgumentNullException">
-        /// If <paramref name="pattern" /> is null.
+        /// If <paramref name="pattern"/> is null.
         /// </exception>
         public static string Unescape(string pattern)
         {
@@ -729,7 +729,7 @@ internal static WildcardPatternException NewWildcardPatternException(string inva
 
             return e;
         }
-    };
+    }
 
     /// <summary>
     /// Convert a string with wild cards into its equivalent regex.
@@ -1264,7 +1264,7 @@ protected override void EndBracketExpression()
             }
         }
 
-        private struct CharacterNormalizer
+        private readonly struct CharacterNormalizer
         {
             private readonly CultureInfo _cultureInfo;
             private readonly bool _caseInsensitive;
diff --git a/src/System.Management.Automation/engine/remoting/client/ClientMethodExecutor.cs b/src/System.Management.Automation/engine/remoting/client/ClientMethodExecutor.cs
index 3defa2f8285..120ca07a5af 100644
--- a/src/System.Management.Automation/engine/remoting/client/ClientMethodExecutor.cs
+++ b/src/System.Management.Automation/engine/remoting/client/ClientMethodExecutor.cs
@@ -98,8 +98,7 @@ internal static void Dispatch(
                 if (hostPrivateData != null)
                 {
                     PSNoteProperty allowSetShouldExit = hostPrivateData.Properties["AllowSetShouldExitFromRemote"] as PSNoteProperty;
-                    hostAllowSetShouldExit = (allowSetShouldExit != null && allowSetShouldExit.Value is bool) ?
-                        (bool)allowSetShouldExit.Value : false;
+                    hostAllowSetShouldExit = allowSetShouldExit != null && allowSetShouldExit.Value is bool && (bool)allowSetShouldExit.Value;
                 }
             }
 
@@ -132,7 +131,7 @@ internal static void Dispatch(
         /// <summary>
         /// Is runspace pushed.
         /// </summary>
-        private bool IsRunspacePushed(PSHost host)
+        private static bool IsRunspacePushed(PSHost host)
         {
             if (!(host is IHostSupportsInteractiveSession host2)) { return false; }
 
diff --git a/src/System.Management.Automation/engine/remoting/client/ClientRemotePowerShell.cs b/src/System.Management.Automation/engine/remoting/client/ClientRemotePowerShell.cs
index 672fe188da7..4ea06ea2feb 100644
--- a/src/System.Management.Automation/engine/remoting/client/ClientRemotePowerShell.cs
+++ b/src/System.Management.Automation/engine/remoting/client/ClientRemotePowerShell.cs
@@ -645,7 +645,7 @@ private void HandleCloseCompleted(object sender, EventArgs args)
                     // If RemoteSessionStateEventArgs are provided then use them to set the
                     // session close reason when setting finished state.
                     RemoteSessionStateEventArgs sessionEventArgs = args as RemoteSessionStateEventArgs;
-                    Exception closeReason = (sessionEventArgs != null) ? sessionEventArgs.SessionStateInfo.Reason : null;
+                    Exception closeReason = sessionEventArgs?.SessionStateInfo.Reason;
                     PSInvocationState finishedState = (shell.InvocationStateInfo.State == PSInvocationState.Disconnected) ?
                         PSInvocationState.Failed : PSInvocationState.Stopped;
 
@@ -663,7 +663,7 @@ private void HandleCloseCompleted(object sender, EventArgs args)
             }
         }
 
-        private bool IsFinished(PSInvocationState state)
+        private static bool IsFinished(PSInvocationState state)
         {
             return (state == PSInvocationState.Completed ||
                     state == PSInvocationState.Failed ||
@@ -977,7 +977,7 @@ internal enum PSConnectionRetryStatus
         AutoDisconnectStarting = 4,
         AutoDisconnectSucceeded = 5,
         InternalErrorAbort = 6
-    };
+    }
 
     /// <summary>
     /// PSConnectionRetryStatusEventArgs.
diff --git a/src/System.Management.Automation/engine/remoting/client/Job.cs b/src/System.Management.Automation/engine/remoting/client/Job.cs
index b88e8003945..8e876902c26 100644
--- a/src/System.Management.Automation/engine/remoting/client/Job.cs
+++ b/src/System.Management.Automation/engine/remoting/client/Job.cs
@@ -379,12 +379,13 @@ internal JobIdentifier(int id, Guid instanceId)
     /// <summary>
     /// Interface to expose a job debugger.
     /// </summary>
+#nullable enable
     public interface IJobDebugger
     {
         /// <summary>
         /// Job Debugger.
         /// </summary>
-        Debugger Debugger
+        Debugger? Debugger
         {
             get;
         }
@@ -398,6 +399,7 @@ bool IsAsync
             set;
         }
     }
+#nullable restore
 
     /// <summary>
     /// Represents a command running in background. A job object can internally
@@ -2016,7 +2018,7 @@ internal void ConnectJob(Guid runspaceInstanceId)
             SubmitAndWaitForConnect(connectJobOperations);
         }
 
-        private void SubmitAndWaitForConnect(List<IThrottleOperation> connectJobOperations)
+        private static void SubmitAndWaitForConnect(List<IThrottleOperation> connectJobOperations)
         {
             using (ThrottleManager connectThrottleManager = new ThrottleManager())
             {
@@ -2968,7 +2970,7 @@ internal override bool CanDisconnect
             get
             {
                 RemoteRunspace remoteRS = Runspace as RemoteRunspace;
-                return (remoteRS != null) ? remoteRS.CanDisconnect : false;
+                return remoteRS != null && remoteRS.CanDisconnect;
             }
         }
 
@@ -4122,7 +4124,7 @@ private Pipeline DrainAndBlockRemoteOutput()
             return null;
         }
 
-        private void RestoreRemoteOutput(Pipeline runningCmd)
+        private static void RestoreRemoteOutput(Pipeline runningCmd)
         {
             if (runningCmd != null)
             {
@@ -4518,9 +4520,10 @@ internal OutputProcessingStateEventArgs(bool processingOutput)
         }
     }
 
+#nullable enable
     internal interface IOutputProcessingState
     {
-        event EventHandler<OutputProcessingStateEventArgs> OutputProcessingStateChanged;
+        event EventHandler<OutputProcessingStateEventArgs>? OutputProcessingStateChanged;
     }
 
     #endregion
diff --git a/src/System.Management.Automation/engine/remoting/client/JobManager.cs b/src/System.Management.Automation/engine/remoting/client/JobManager.cs
index b2e4f0d6454..f907cf922d8 100644
--- a/src/System.Management.Automation/engine/remoting/client/JobManager.cs
+++ b/src/System.Management.Automation/engine/remoting/client/JobManager.cs
@@ -616,7 +616,7 @@ private List<Job2> GetFilteredJobs(
         /// <param name="sourceAdapter"></param>
         /// <param name="jobSourceAdapterTypes"></param>
         /// <returns></returns>
-        private bool CheckTypeNames(JobSourceAdapter sourceAdapter, string[] jobSourceAdapterTypes)
+        private static bool CheckTypeNames(JobSourceAdapter sourceAdapter, string[] jobSourceAdapterTypes)
         {
             // If no type names were specified then allow all adapter types.
             if (jobSourceAdapterTypes == null ||
@@ -641,7 +641,7 @@ private bool CheckTypeNames(JobSourceAdapter sourceAdapter, string[] jobSourceAd
             return false;
         }
 
-        private string GetAdapterName(JobSourceAdapter sourceAdapter)
+        private static string GetAdapterName(JobSourceAdapter sourceAdapter)
         {
             return (!string.IsNullOrEmpty(sourceAdapter.Name) ?
                 sourceAdapter.Name :
diff --git a/src/System.Management.Automation/engine/remoting/client/JobSourceAdapter.cs b/src/System.Management.Automation/engine/remoting/client/JobSourceAdapter.cs
index de3d41d1956..f5a5022d705 100644
--- a/src/System.Management.Automation/engine/remoting/client/JobSourceAdapter.cs
+++ b/src/System.Management.Automation/engine/remoting/client/JobSourceAdapter.cs
@@ -238,7 +238,7 @@ public JobDefinition Definition
         /// </summary>
         public List<CommandParameterCollection> Parameters
         {
-            get { return _parameters ?? (_parameters = new List<CommandParameterCollection>()); }
+            get { return _parameters ??= new List<CommandParameterCollection>(); }
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/remoting/client/RemoteRunspacePoolInternal.cs b/src/System.Management.Automation/engine/remoting/client/RemoteRunspacePoolInternal.cs
index 3e873fbe42c..94584c613f5 100644
--- a/src/System.Management.Automation/engine/remoting/client/RemoteRunspacePoolInternal.cs
+++ b/src/System.Management.Automation/engine/remoting/client/RemoteRunspacePoolInternal.cs
@@ -1426,8 +1426,7 @@ private static void UpdateWSManConnectionInfo(
                 string compressionModeString = pspCompressionMode.Value as string;
                 if (compressionModeString != null)
                 {
-                    wsmanConnectionInfo.UseCompression = compressionModeString.Equals("NoCompression", StringComparison.OrdinalIgnoreCase)
-                        ? false : true;
+                    wsmanConnectionInfo.UseCompression = !compressionModeString.Equals("NoCompression", StringComparison.OrdinalIgnoreCase);
                 }
             }
 
@@ -1436,8 +1435,7 @@ private static void UpdateWSManConnectionInfo(
                 string encodingString = pspEncoding.Value as string;
                 if (encodingString != null)
                 {
-                    wsmanConnectionInfo.UseUTF16 = encodingString.Equals("UTF16", StringComparison.OrdinalIgnoreCase)
-                        ? true : false;
+                    wsmanConnectionInfo.UseUTF16 = encodingString.Equals("UTF16", StringComparison.OrdinalIgnoreCase);
                 }
             }
 
@@ -1446,8 +1444,7 @@ private static void UpdateWSManConnectionInfo(
                 string machineProfileLoadedString = pspProfile.Value as string;
                 if (machineProfileLoadedString != null)
                 {
-                    wsmanConnectionInfo.NoMachineProfile = machineProfileLoadedString.Equals("Yes", StringComparison.OrdinalIgnoreCase)
-                        ? false : true;
+                    wsmanConnectionInfo.NoMachineProfile = !machineProfileLoadedString.Equals("Yes", StringComparison.OrdinalIgnoreCase);
                 }
             }
 
@@ -1882,7 +1879,7 @@ private void WaitAndRaiseConnectEventsProc(object state)
         private readonly RunspaceConnectionInfo _connectionInfo;     // connection info with which this
         // runspace is created
         // data structure handler handling
-        private RunspacePoolAsyncResult _openAsyncResult;// async result object generated on
+        private RunspacePoolAsyncResult _openAsyncResult; // async result object generated on
         // CoreOpen
         private RunspacePoolAsyncResult _closeAsyncResult; // async result object generated by
         // BeginClose
diff --git a/src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs b/src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs
index 501a87e6ed9..8b8908b6e61 100644
--- a/src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs
+++ b/src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs
@@ -233,7 +233,7 @@ internal void CreatePowerShellOnServerAndInvoke(ClientRemotePowerShell shell)
 
             // Find out if this is an invoke and disconnect operation and if so whether the endpoint
             // supports disconnect.  Throw exception if disconnect is not supported.
-            bool invokeAndDisconnect = (shell.Settings != null) ? shell.Settings.InvokeAndDisconnect : false;
+            bool invokeAndDisconnect = shell.Settings != null && shell.Settings.InvokeAndDisconnect;
             if (invokeAndDisconnect && !EndpointSupportsDisconnect)
             {
                 throw new PSRemotingDataStructureException(RemotingErrorIdStrings.EndpointDoesNotSupportDisconnect);
@@ -873,6 +873,7 @@ private void HandleSessionCreateCompleted(object sender, CreateCompleteEventArgs
 
         private readonly Dictionary<Guid, ClientPowerShellDataStructureHandler> _associatedPowerShellDSHandlers
             = new Dictionary<Guid, ClientPowerShellDataStructureHandler>();
+
         // data structure handlers of all ClientRemotePowerShell which are
         // associated with this runspace pool
         private readonly object _associationSyncObject = new object();
@@ -937,7 +938,7 @@ internal bool EndpointSupportsDisconnect
             get
             {
                 WSManClientSessionTransportManager wsmanTransportManager = _transportManager as WSManClientSessionTransportManager;
-                return (wsmanTransportManager != null) ? wsmanTransportManager.SupportsDisconnect : false;
+                return wsmanTransportManager != null && wsmanTransportManager.SupportsDisconnect;
             }
         }
 
@@ -1412,7 +1413,7 @@ internal void ProcessDisconnect(RunspacePoolStateInfo rsStateInfo)
             // disconnect may be called on a pipeline that is already disconnected.
             PSInvocationStateInfo stateInfo =
                             new PSInvocationStateInfo(PSInvocationState.Disconnected,
-                                (rsStateInfo != null) ? rsStateInfo.Reason : null);
+                                rsStateInfo?.Reason);
 
             Dbg.Assert(InvocationStateInfoReceived != null,
                 "ClientRemotePowerShell should subscribe to all data structure handler events");
diff --git a/src/System.Management.Automation/engine/remoting/client/RunspaceRef.cs b/src/System.Management.Automation/engine/remoting/client/RunspaceRef.cs
index 4dfcb01555b..dfd1cd3bf7f 100644
--- a/src/System.Management.Automation/engine/remoting/client/RunspaceRef.cs
+++ b/src/System.Management.Automation/engine/remoting/client/RunspaceRef.cs
@@ -93,7 +93,7 @@ private PSCommand ParsePsCommandUsingScriptBlock(string line, bool? useLocalScop
                 // and if we are not in a loopback configuration mode, in which case we always force remote script commands
                 // to be parsed and evaluated on the remote session (not in the current local session).
                 RemoteRunspace remoteRunspace = _runspaceRef.Value as RemoteRunspace;
-                bool isConfiguredLoopback = (remoteRunspace != null) ? remoteRunspace.IsConfiguredLoopBack : false;
+                bool isConfiguredLoopback = remoteRunspace != null && remoteRunspace.IsConfiguredLoopBack;
                 bool isTrustedInput = !isConfiguredLoopback && (localRunspace.ExecutionContext.LanguageMode == PSLanguageMode.FullLanguage);
 
                 // Create PowerShell from ScriptBlock.
@@ -139,7 +139,7 @@ internal PSCommand CreatePsCommand(string line, bool isScript, bool? useNewScope
         /// <summary>
         /// Creates the PSCommand when the runspace is not overridden.
         /// </summary>
-        private PSCommand CreatePsCommandNotOverridden(string line, bool isScript, bool? useNewScope)
+        private static PSCommand CreatePsCommandNotOverridden(string line, bool isScript, bool? useNewScope)
         {
             PSCommand command = new PSCommand();
 
@@ -407,7 +407,7 @@ private void StartProgressBar(
             }
         }
 
-        private void StopProgressBar(
+        private static void StopProgressBar(
             long sourceId)
         {
             s_RCProgress.StopProgress(sourceId);
diff --git a/src/System.Management.Automation/engine/remoting/client/ThrottlingJob.cs b/src/System.Management.Automation/engine/remoting/client/ThrottlingJob.cs
index b1d9c968b10..a00fdee17c2 100644
--- a/src/System.Management.Automation/engine/remoting/client/ThrottlingJob.cs
+++ b/src/System.Management.Automation/engine/remoting/client/ThrottlingJob.cs
@@ -191,8 +191,8 @@ internal enum ChildJobFlags
 
             /// <summary>
             /// Child job can call <see cref="ThrottlingJob.AddChildJobWithoutBlocking"/> method
-            /// or <see cref="ThrottlingJob.AddChildJobAndPotentiallyBlock(StartableJob, ChildJobFlags)" />
-            /// or <see cref="ThrottlingJob.AddChildJobAndPotentiallyBlock(Cmdlet, StartableJob, ChildJobFlags)" />
+            /// or <see cref="ThrottlingJob.AddChildJobAndPotentiallyBlock(StartableJob, ChildJobFlags)"/>
+            /// or <see cref="ThrottlingJob.AddChildJobAndPotentiallyBlock(Cmdlet, StartableJob, ChildJobFlags)"/>
             /// method
             /// of the <see cref="ThrottlingJob"/> instance it belongs to.
             /// </summary>
@@ -269,12 +269,12 @@ private int CountOfRunningOrReadyToRunChildJobs
         /// Passing 0 requests to turn off throttling (i.e. allow unlimited number of child jobs to run)
         /// </param>
         /// <param name="cmdletMode">
-        /// <c>true</c> if this <see cref="ThrottlingJob" /> is used from a cmdlet invoked without -AsJob switch.
-        /// <c>false</c> if this <see cref="ThrottlingJob" /> is used from a cmdlet invoked with -AsJob switch.
+        /// <see langword="true"/> if this <see cref="ThrottlingJob"/> is used from a cmdlet invoked without -AsJob switch.
+        /// <see langword="false"/> if this <see cref="ThrottlingJob"/> is used from a cmdlet invoked with -AsJob switch.
         ///
-        /// If <paramref name="cmdletMode"/> is <c>true</c>, then
+        /// If <paramref name="cmdletMode"/> is <see langword="true"/>, then
         /// memory can be managed more aggressively (for example ChildJobs can be discarded as soon as they complete)
-        /// because the <see cref="ThrottlingJob" /> is not exposed to the end user.
+        /// because the <see cref="ThrottlingJob"/> is not exposed to the end user.
         /// </param>
         internal ThrottlingJob(string command, string jobName, string jobTypeName, int maximumConcurrentChildJobs, bool cmdletMode)
             : base(command, jobName)
@@ -387,7 +387,7 @@ internal void AddChildJobWithoutBlocking(StartableJob childJob, ChildJobFlags fl
                     newJobStateInfo = new JobStateInfo(JobState.Running);
                 }
 
-                if (ChildJobFlags.CreatesChildJobs == (ChildJobFlags.CreatesChildJobs & flags))
+                if ((ChildJobFlags.CreatesChildJobs & flags) == ChildJobFlags.CreatesChildJobs)
                 {
                     _setOfChildJobsThatCanAddMoreChildJobs.Add(childJob.InstanceId);
                 }
@@ -777,8 +777,8 @@ private List<Job> GetChildJobsSnapshot()
 
         /// <summary>
         /// Indicates if job has more data available.
-        /// <c>true</c> if any of the child jobs have more data OR if <see cref="EndOfChildJobs"/> have not been called yet;
-        /// <c>false</c> otherwise.
+        /// <see langword="true"/> if any of the child jobs have more data OR if <see cref="EndOfChildJobs"/> have not been called yet;
+        /// <see langword="false"/> otherwise.
         /// </summary>
         public override bool HasMoreData
         {
diff --git a/src/System.Management.Automation/engine/remoting/client/clientremotesessionprotocolstatemachine.cs b/src/System.Management.Automation/engine/remoting/client/clientremotesessionprotocolstatemachine.cs
index ca26f32cc5b..d035ce6e820 100644
--- a/src/System.Management.Automation/engine/remoting/client/clientremotesessionprotocolstatemachine.cs
+++ b/src/System.Management.Automation/engine/remoting/client/clientremotesessionprotocolstatemachine.cs
@@ -48,6 +48,7 @@ internal class ClientRemoteSessionDSHandlerStateMachine
 
         private readonly Queue<RemoteSessionStateMachineEventArgs> _processPendingEventsQueue
             = new Queue<RemoteSessionStateMachineEventArgs>();
+
         // all events raised through the state machine
         // will be queued in this
         private readonly object _syncObject = new object();
@@ -775,7 +776,7 @@ private void DoFatal(object sender, RemoteSessionStateMachineEventArgs eventArgs
 
         #endregion Event Handlers
 
-        private void CleanAll()
+        private static void CleanAll()
         {
         }
 
diff --git a/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs b/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs
index 7824c350c78..7ddd657872e 100644
--- a/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs
+++ b/src/System.Management.Automation/engine/remoting/client/remoterunspace.cs
@@ -1201,7 +1201,7 @@ internal void DoConcurrentCheckAndAddToRunningPipelines(RemotePipeline pipeline,
         /// <returns></returns>
         internal override SessionStateProxy GetSessionStateProxy()
         {
-            return _sessionStateProxy ?? (_sessionStateProxy = new RemoteSessionStateProxy(this));
+            return _sessionStateProxy ??= new RemoteSessionStateProxy(this);
         }
 
         private RemoteSessionStateProxy _sessionStateProxy = null;
@@ -1936,17 +1936,17 @@ public override DebuggerCommandResults ProcessCommand(PSCommand command, PSDataC
                     {
                         // Allow the IncompleteParseException to throw so that the console
                         // can handle here strings and continued parsing.
-                        if (re.ErrorRecord.CategoryInfo.Reason == typeof(IncompleteParseException).Name)
+                        if (re.ErrorRecord.CategoryInfo.Reason == nameof(IncompleteParseException))
                         {
                             throw new IncompleteParseException(
-                                (re.ErrorRecord.Exception != null) ? re.ErrorRecord.Exception.Message : null,
+                                re.ErrorRecord.Exception?.Message,
                                 re.ErrorRecord.FullyQualifiedErrorId);
                         }
 
                         // Allow the RemoteException and InvalidRunspacePoolStateException to propagate so that the host can
                         // clean up the debug session.
-                        if ((re.ErrorRecord.CategoryInfo.Reason == typeof(InvalidRunspacePoolStateException).Name) ||
-                            (re.ErrorRecord.CategoryInfo.Reason == typeof(RemoteException).Name))
+                        if ((re.ErrorRecord.CategoryInfo.Reason == nameof(InvalidRunspacePoolStateException)) ||
+                            (re.ErrorRecord.CategoryInfo.Reason == nameof(RemoteException)))
                         {
                             throw new PSRemotingTransportException(
                                 (re.ErrorRecord.Exception != null) ? re.ErrorRecord.Exception.Message : string.Empty);
@@ -2660,7 +2660,7 @@ private void ProcessDebuggerStopEvent(DebuggerStopEventArgs args)
             // Attempt to process debugger stop event on original thread if it
             // is available (i.e., if it is blocked by EndInvoke).
             PowerShell powershell = _runspace.RunspacePool.RemoteRunspacePoolInternal.GetCurrentRunningPowerShell();
-            AsyncResult invokeAsyncResult = (powershell != null) ? powershell.EndInvokeAsyncResult : null;
+            AsyncResult invokeAsyncResult = powershell?.EndInvokeAsyncResult;
 
             bool invokedOnBlockedThread = false;
             if ((invokeAsyncResult != null) && (!invokeAsyncResult.IsCompleted))
diff --git a/src/System.Management.Automation/engine/remoting/client/remoterunspaceinfo.cs b/src/System.Management.Automation/engine/remoting/client/remoterunspaceinfo.cs
index 1a975f5a785..1fa03edf25b 100644
--- a/src/System.Management.Automation/engine/remoting/client/remoterunspaceinfo.cs
+++ b/src/System.Management.Automation/engine/remoting/client/remoterunspaceinfo.cs
@@ -208,7 +208,7 @@ public Runspace Runspace
         public override string ToString()
         {
             // PSSession is a PowerShell type name and so should not be localized.
-            string formatString = "[PSSession]{0}";
+            const string formatString = "[PSSession]{0}";
             return StringUtil.Format(formatString, Name);
         }
 
@@ -347,9 +347,9 @@ private string GetTransportName()
         /// </summary>
         /// <param name="shell">Shell configuration name.</param>
         /// <returns>Display shell name.</returns>
-        private string GetDisplayShellName(string shell)
+        private static string GetDisplayShellName(string shell)
         {
-            string shellPrefix = System.Management.Automation.Remoting.Client.WSManNativeApi.ResourceURIPrefix;
+            const string shellPrefix = System.Management.Automation.Remoting.Client.WSManNativeApi.ResourceURIPrefix;
             int index = shell.IndexOf(shellPrefix, StringComparison.OrdinalIgnoreCase);
 
             return (index == 0) ? shell.Substring(shellPrefix.Length) : shell;
diff --git a/src/System.Management.Automation/engine/remoting/commands/CustomShellCommands.cs b/src/System.Management.Automation/engine/remoting/commands/CustomShellCommands.cs
index ae13e4fda76..c9202190221 100644
--- a/src/System.Management.Automation/engine/remoting/commands/CustomShellCommands.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/CustomShellCommands.cs
@@ -589,8 +589,8 @@ protected override void ProcessRecord()
                                             restartServiceTarget,
                                             restartServiceAction,
                                             restartWSManRequiredForUI,
-                                            runAsCredential != null ? runAsCredential.UserName : null,
-                                            runAsCredential != null ? runAsCredential.Password : null,
+                                            runAsCredential?.UserName,
+                                            runAsCredential?.Password,
                                             AccessMode,
                                             isSddlSpecified,
                                             _configTableSDDL,
@@ -641,7 +641,7 @@ protected override void EndProcessing()
         /// 1. New shell successfully registered. However cannot delete temporary plugin file {0}.
         ///    Reason for failure: {1}.
         /// </exception>
-        private void DeleteFile(string tmpFileName)
+        private static void DeleteFile(string tmpFileName)
         {
             Dbg.Assert(!string.IsNullOrEmpty(tmpFileName), "tmpFile cannot be null or empty.");
 
@@ -693,7 +693,7 @@ private void DeleteFile(string tmpFileName)
         /// 2. Cannot write shell configuration data into temporary file {0}. Try again.
         ///    Reason for failure: {1}.
         /// </exception>
-        private string ConstructTemporaryFile(string pluginContent)
+        private static string ConstructTemporaryFile(string pluginContent)
         {
             // Path.GetTempFileName creates a temporary file whereas GetRandomFileName does not.
             string tmpFileName = System.IO.Path.Combine(System.IO.Path.GetTempPath(), System.IO.Path.GetRandomFileName()) + "psshell.xml";
@@ -798,7 +798,7 @@ private string ConstructPluginContent(out string srcConfigFilePath, out string d
             destConfigFilePath = null;
             StringBuilder initParameters = new StringBuilder();
 
-            bool assemblyAndTypeTokensSet = false;
+            const bool assemblyAndTypeTokensSet = false;
 
             // DISC endpoint
             if (Path != null)
diff --git a/src/System.Management.Automation/engine/remoting/commands/DebugJob.cs b/src/System.Management.Automation/engine/remoting/commands/DebugJob.cs
index 979912619f2..777f56807fe 100644
--- a/src/System.Management.Automation/engine/remoting/commands/DebugJob.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/DebugJob.cs
@@ -237,7 +237,7 @@ private bool CheckForDebuggableJob()
             return debuggableJobFound;
         }
 
-        private bool GetJobDebuggable(Job job)
+        private static bool GetJobDebuggable(Job job)
         {
             if (job is IJobDebugger)
             {
diff --git a/src/System.Management.Automation/engine/remoting/commands/DisconnectPSSession.cs b/src/System.Management.Automation/engine/remoting/commands/DisconnectPSSession.cs
index 5e4f3b8c129..0e2458daba0 100644
--- a/src/System.Management.Automation/engine/remoting/commands/DisconnectPSSession.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/DisconnectPSSession.cs
@@ -109,7 +109,7 @@ private PSSessionOption PSSessionOption
             {
                 // no need to lock as the cmdlet parameters will not be assigned
                 // from multiple threads.
-                return _sessionOption ?? (_sessionOption = new PSSessionOption());
+                return _sessionOption ??= new PSSessionOption();
             }
         }
 
@@ -346,7 +346,7 @@ private bool ValidateIdleTimeout(PSSession session)
         {
             int idleTimeout = session.Runspace.ConnectionInfo.IdleTimeout;
             int maxIdleTimeout = session.Runspace.ConnectionInfo.MaxIdleTimeout;
-            int minIdleTimeout = BaseTransportManager.MinimumIdleTimeout;
+            const int minIdleTimeout = BaseTransportManager.MinimumIdleTimeout;
 
             if (idleTimeout != BaseTransportManager.UseServerDefaultIdleTimeout &&
                 (idleTimeout > maxIdleTimeout || idleTimeout < minIdleTimeout))
@@ -363,7 +363,7 @@ private bool ValidateIdleTimeout(PSSession session)
             return true;
         }
 
-        private string GetLocalhostWithNetworkAccessEnabled(Dictionary<Guid, PSSession> psSessions)
+        private static string GetLocalhostWithNetworkAccessEnabled(Dictionary<Guid, PSSession> psSessions)
         {
             System.Text.StringBuilder sb = new System.Text.StringBuilder();
 
diff --git a/src/System.Management.Automation/engine/remoting/commands/EnterPSHostProcessCommand.cs b/src/System.Management.Automation/engine/remoting/commands/EnterPSHostProcessCommand.cs
index 454cc10efd0..756250eb8d7 100644
--- a/src/System.Management.Automation/engine/remoting/commands/EnterPSHostProcessCommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/EnterPSHostProcessCommand.cs
@@ -292,7 +292,7 @@ private Runspace CreateNamedPipeRunspace(NamedPipeConnectionInfo connectionInfo)
             return remoteRunspace;
         }
 
-        private void PrepareRunspace(Runspace runspace)
+        private static void PrepareRunspace(Runspace runspace)
         {
             string promptFn = StringUtil.Format(RemotingErrorIdStrings.EnterPSHostProcessPrompt,
                 @"function global:prompt { """,
@@ -574,7 +574,7 @@ protected override void EndProcessing()
 
         #region Private Methods
 
-        private int[] GetProcIdsFromProcs(Process[] processes)
+        private static int[] GetProcIdsFromProcs(Process[] processes)
         {
             List<int> returnIds = new List<int>();
             foreach (Process process in processes)
@@ -585,7 +585,7 @@ private int[] GetProcIdsFromProcs(Process[] processes)
             return returnIds.ToArray();
         }
 
-        private int[] GetProcIdsFromNames(string[] names)
+        private static int[] GetProcIdsFromNames(string[] names)
         {
             if ((names == null) || (names.Length == 0))
             {
diff --git a/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs b/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
index 677a767d1fd..b60f3131f24 100644
--- a/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
@@ -1875,7 +1875,7 @@ private void StartProgressBar(
                 this.Host);
         }
 
-        private void StopProgressBar(
+        private static void StopProgressBar(
             long sourceId)
         {
             s_RCProgress.StopProgress(sourceId);
@@ -1954,7 +1954,7 @@ private void DetermineThrowStatementBehavior()
         /// Process the stream object before writing it in the specified collection.
         /// </summary>
         /// <param name="streamObject">Stream object to process.</param>
-        private void PreProcessStreamObject(PSStreamObject streamObject)
+        private static void PreProcessStreamObject(PSStreamObject streamObject)
         {
             ErrorRecord errorRecord = streamObject.Value as ErrorRecord;
 
diff --git a/src/System.Management.Automation/engine/remoting/commands/NewPSSessionConfigurationFile.cs b/src/System.Management.Automation/engine/remoting/commands/NewPSSessionConfigurationFile.cs
index 02115bb2f47..f306246e289 100644
--- a/src/System.Management.Automation/engine/remoting/commands/NewPSSessionConfigurationFile.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/NewPSSessionConfigurationFile.cs
@@ -857,7 +857,7 @@ protected override void ProcessRecord()
                 {
                     if (Full)
                     {
-                        string exampleModulesToImport = "'MyCustomModule', @{ ModuleName = 'MyCustomModule'; ModuleVersion = '1.0.0.0'; GUID = '4d30d5f0-cb16-4898-812d-f20a6c596bdf' }";
+                        const string exampleModulesToImport = "'MyCustomModule', @{ ModuleName = 'MyCustomModule'; ModuleVersion = '1.0.0.0'; GUID = '4d30d5f0-cb16-4898-812d-f20a6c596bdf' }";
                         result.Append(SessionConfigurationUtils.ConfigFragment(ConfigFileConstants.ModulesToImport, RemotingErrorIdStrings.DISCModulesToImportComment, exampleModulesToImport, streamWriter, true));
                     }
                 }
@@ -1621,7 +1621,7 @@ protected override void ProcessRecord()
                 // Modules to import
                 if (_modulesToImport == null)
                 {
-                    string exampleModulesToImport = "'MyCustomModule', @{ ModuleName = 'MyCustomModule'; ModuleVersion = '1.0.0.0'; GUID = '4d30d5f0-cb16-4898-812d-f20a6c596bdf' }";
+                    const string exampleModulesToImport = "'MyCustomModule', @{ ModuleName = 'MyCustomModule'; ModuleVersion = '1.0.0.0'; GUID = '4d30d5f0-cb16-4898-812d-f20a6c596bdf' }";
                     result.Append(SessionConfigurationUtils.ConfigFragment(ConfigFileConstants.ModulesToImport, RemotingErrorIdStrings.DISCModulesToImportComment, exampleModulesToImport, streamWriter, true));
                 }
                 else
diff --git a/src/System.Management.Automation/engine/remoting/commands/NewPSSessionOptionCommand.cs b/src/System.Management.Automation/engine/remoting/commands/NewPSSessionOptionCommand.cs
index 5ad0df8910c..2a6dbc30679 100644
--- a/src/System.Management.Automation/engine/remoting/commands/NewPSSessionOptionCommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/NewPSSessionOptionCommand.cs
@@ -48,7 +48,7 @@ public int MaximumRedirection
         public SwitchParameter NoCompression { get; set; }
 
         /// <summary>
-        /// If <c>true</c> then Operating System won't load the user profile (i.e. registry keys under HKCU) on the remote server
+        /// If <see langword="true"/> then Operating System won't load the user profile (i.e. registry keys under HKCU) on the remote server
         /// which can result in a faster session creation time.  This option won't have any effect if the remote machine has
         /// already loaded the profile (i.e. in another session).
         /// </summary>
diff --git a/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs b/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
index 0e422808f1a..bbb2056189c 100644
--- a/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
@@ -1879,7 +1879,7 @@ internal Pipeline CreatePipeline(RemoteRunspace remoteRunspace)
         /// <summary>
         /// Check the powershell version of the remote server.
         /// </summary>
-        private string GetRemoteServerPsVersion(RemoteRunspace remoteRunspace)
+        private static string GetRemoteServerPsVersion(RemoteRunspace remoteRunspace)
         {
             if (remoteRunspace.ConnectionInfo is NewProcessConnectionInfo)
             {
@@ -2427,7 +2427,7 @@ private List<object> GetUsingVariableValues(List<VariableExpressionAst> paramUsi
         /// </summary>
         /// <param name="localScriptBlock"></param>
         /// <returns>A list of UsingExpressionAsts ordered by the StartOffset.</returns>
-        private List<VariableExpressionAst> GetUsingVariables(ScriptBlock localScriptBlock)
+        private static List<VariableExpressionAst> GetUsingVariables(ScriptBlock localScriptBlock)
         {
             if (localScriptBlock == null)
             {
@@ -3003,9 +3003,9 @@ private Dictionary<Guid, PSSession> GetMatchingRunspacesByVMNameContainerId(bool
                     var matchingRunspaceInfos = remoteRunspaceInfos
                         .Where<PSSession>(session => (supportWildChar ? inputNamePattern.IsMatch(session.VMName)
                                                                       : inputName.Equals(session.ContainerId)) &&
-                                                     ((sessionNamePattern == null) ? true : sessionNamePattern.IsMatch(session.Name)) &&
+                                                     (sessionNamePattern == null || sessionNamePattern.IsMatch(session.Name)) &&
                                                      QueryRunspaces.TestRunspaceState(session.Runspace, filterState) &&
-                                                     ((configurationNamePattern == null) ? true : configurationNamePattern.IsMatch(session.ConfigurationName)) &&
+                                                     (configurationNamePattern == null || configurationNamePattern.IsMatch(session.ConfigurationName)) &&
                                                      (session.ComputerType == computerType))
                         .ToList<PSSession>();
 
@@ -3063,7 +3063,7 @@ private Dictionary<Guid, PSSession> GetMatchingRunspacesByVMNameContainerIdSessi
                                                                       : inputName.Equals(session.ContainerId)) &&
                                                      sessionInstanceId.Equals(session.InstanceId) &&
                                                      QueryRunspaces.TestRunspaceState(session.Runspace, filterState) &&
-                                                     ((configurationNamePattern == null) ? true : configurationNamePattern.IsMatch(session.ConfigurationName)) &&
+                                                     (configurationNamePattern == null || configurationNamePattern.IsMatch(session.ConfigurationName)) &&
                                                      (session.ComputerType == computerType))
                         .ToList<PSSession>();
 
@@ -3106,9 +3106,9 @@ private Dictionary<Guid, PSSession> GetMatchingRunspacesByVMId(bool writeobject,
 
                     var matchingRunspaceInfos = remoteRunspaceInfos
                         .Where<PSSession>(session => vmId.Equals(session.VMId) &&
-                                                     ((sessionNamePattern == null) ? true : sessionNamePattern.IsMatch(session.Name)) &&
+                                                     (sessionNamePattern == null || sessionNamePattern.IsMatch(session.Name)) &&
                                                      QueryRunspaces.TestRunspaceState(session.Runspace, filterState) &&
-                                                     ((configurationNamePattern == null) ? true : configurationNamePattern.IsMatch(session.ConfigurationName)) &&
+                                                     (configurationNamePattern == null || configurationNamePattern.IsMatch(session.ConfigurationName)) &&
                                                      (session.ComputerType == TargetMachineType.VirtualMachine))
                         .ToList<PSSession>();
 
@@ -3143,7 +3143,7 @@ private Dictionary<Guid, PSSession> GetMatchingRunspacesByVMIdSessionInstanceId(
                         .Where<PSSession>(session => vmId.Equals(session.VMId) &&
                                                      sessionInstanceId.Equals(session.InstanceId) &&
                                                      QueryRunspaces.TestRunspaceState(session.Runspace, filterState) &&
-                                                     ((configurationNamePattern == null) ? true : configurationNamePattern.IsMatch(session.ConfigurationName)) &&
+                                                     (configurationNamePattern == null || configurationNamePattern.IsMatch(session.ConfigurationName)) &&
                                                      (session.ComputerType == TargetMachineType.VirtualMachine))
                         .ToList<PSSession>();
 
@@ -4328,7 +4328,7 @@ public PSSessionOption()
         public bool NoCompression { get; set; } = false;
 
         /// <summary>
-        /// If <c>true</c> then Operating System won't load the user profile (i.e. registry keys under HKCU) on the remote server
+        /// If <see langword="true"/> then Operating System won't load the user profile (i.e. registry keys under HKCU) on the remote server
         /// which can result in a faster session creation time.  This option won't have any effect if the remote machine has
         /// already loaded the profile (i.e. in another session).
         /// </summary>
diff --git a/src/System.Management.Automation/engine/remoting/commands/PushRunspaceCommand.cs b/src/System.Management.Automation/engine/remoting/commands/PushRunspaceCommand.cs
index 29e85600500..cbc5f82742b 100644
--- a/src/System.Management.Automation/engine/remoting/commands/PushRunspaceCommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/PushRunspaceCommand.cs
@@ -791,12 +791,13 @@ private RemoteRunspace GetRunspaceMatchingCondition(
         /// </summary>
         private RemoteRunspace GetRunspaceMatchingRunspaceId(Guid remoteRunspaceId)
         {
-            Predicate<PSSession> condition = (PSSession info) => info.InstanceId == remoteRunspaceId;
-            PSRemotingErrorId tooFew = PSRemotingErrorId.RemoteRunspaceNotAvailableForSpecifiedRunspaceId;
-            PSRemotingErrorId tooMany = PSRemotingErrorId.RemoteRunspaceHasMultipleMatchesForSpecifiedRunspaceId;
-            string tooFewResourceString = RemotingErrorIdStrings.RemoteRunspaceNotAvailableForSpecifiedRunspaceId;
-            string tooManyResourceString = RemotingErrorIdStrings.RemoteRunspaceHasMultipleMatchesForSpecifiedRunspaceId;
-            return GetRunspaceMatchingCondition(condition, tooFew, tooMany, tooFewResourceString, tooManyResourceString, remoteRunspaceId);
+            return GetRunspaceMatchingCondition(
+                condition: info => info.InstanceId == remoteRunspaceId,
+                tooFew: PSRemotingErrorId.RemoteRunspaceNotAvailableForSpecifiedRunspaceId,
+                tooMany: PSRemotingErrorId.RemoteRunspaceHasMultipleMatchesForSpecifiedRunspaceId,
+                tooFewResourceString: RemotingErrorIdStrings.RemoteRunspaceNotAvailableForSpecifiedRunspaceId,
+                tooManyResourceString: RemotingErrorIdStrings.RemoteRunspaceHasMultipleMatchesForSpecifiedRunspaceId,
+                errorArgument: remoteRunspaceId);
         }
 
         /// <summary>
@@ -804,12 +805,13 @@ private RemoteRunspace GetRunspaceMatchingRunspaceId(Guid remoteRunspaceId)
         /// </summary>
         private RemoteRunspace GetRunspaceMatchingSessionId(int sessionId)
         {
-            Predicate<PSSession> condition = (PSSession info) => info.Id == sessionId;
-            PSRemotingErrorId tooFew = PSRemotingErrorId.RemoteRunspaceNotAvailableForSpecifiedSessionId;
-            PSRemotingErrorId tooMany = PSRemotingErrorId.RemoteRunspaceHasMultipleMatchesForSpecifiedSessionId;
-            string tooFewResourceString = RemotingErrorIdStrings.RemoteRunspaceNotAvailableForSpecifiedSessionId;
-            string tooManyResourceString = RemotingErrorIdStrings.RemoteRunspaceHasMultipleMatchesForSpecifiedSessionId;
-            return GetRunspaceMatchingCondition(condition, tooFew, tooMany, tooFewResourceString, tooManyResourceString, sessionId);
+            return GetRunspaceMatchingCondition(
+                condition: info => info.Id == sessionId,
+                tooFew: PSRemotingErrorId.RemoteRunspaceNotAvailableForSpecifiedSessionId,
+                tooMany: PSRemotingErrorId.RemoteRunspaceHasMultipleMatchesForSpecifiedSessionId,
+                tooFewResourceString: RemotingErrorIdStrings.RemoteRunspaceNotAvailableForSpecifiedSessionId,
+                tooManyResourceString: RemotingErrorIdStrings.RemoteRunspaceHasMultipleMatchesForSpecifiedSessionId,
+                errorArgument: sessionId);
         }
 
         /// <summary>
@@ -817,16 +819,13 @@ private RemoteRunspace GetRunspaceMatchingSessionId(int sessionId)
         /// </summary>
         private RemoteRunspace GetRunspaceMatchingName(string name)
         {
-            Predicate<PSSession> condition = (PSSession info) =>
-            {
-                // doing case-insensitive match for session name
-                return info.Name.Equals(name, StringComparison.OrdinalIgnoreCase);
-            };
-            PSRemotingErrorId tooFew = PSRemotingErrorId.RemoteRunspaceNotAvailableForSpecifiedName;
-            PSRemotingErrorId tooMany = PSRemotingErrorId.RemoteRunspaceHasMultipleMatchesForSpecifiedName;
-            string tooFewResourceString = RemotingErrorIdStrings.RemoteRunspaceNotAvailableForSpecifiedName;
-            string tooManyResourceString = RemotingErrorIdStrings.RemoteRunspaceHasMultipleMatchesForSpecifiedName;
-            return GetRunspaceMatchingCondition(condition, tooFew, tooMany, tooFewResourceString, tooManyResourceString, name);
+            return GetRunspaceMatchingCondition(
+                condition: info => info.Name.Equals(name, StringComparison.OrdinalIgnoreCase),
+                tooFew: PSRemotingErrorId.RemoteRunspaceNotAvailableForSpecifiedName,
+                tooMany: PSRemotingErrorId.RemoteRunspaceHasMultipleMatchesForSpecifiedName,
+                tooFewResourceString: RemotingErrorIdStrings.RemoteRunspaceNotAvailableForSpecifiedName,
+                tooManyResourceString: RemotingErrorIdStrings.RemoteRunspaceHasMultipleMatchesForSpecifiedName,
+                errorArgument: name);
         }
 
         private Job FindJobForRunspace(Guid id)
@@ -1084,7 +1083,7 @@ private RemoteRunspace GetRunspaceForVMSession()
         /// <summary>
         /// Create temporary remote runspace.
         /// </summary>
-        private RemoteRunspace CreateTemporaryRemoteRunspaceForPowerShellDirect(PSHost host, RunspaceConnectionInfo connectionInfo)
+        private static RemoteRunspace CreateTemporaryRemoteRunspaceForPowerShellDirect(PSHost host, RunspaceConnectionInfo connectionInfo)
         {
             // Create and open the runspace.
             TypeTable typeTable = TypeTable.LoadDefaultTypeFiles();
diff --git a/src/System.Management.Automation/engine/remoting/commands/ReceivePSSession.cs b/src/System.Management.Automation/engine/remoting/commands/ReceivePSSession.cs
index faf8bfdaa00..12cced4ae91 100644
--- a/src/System.Management.Automation/engine/remoting/commands/ReceivePSSession.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/ReceivePSSession.cs
@@ -1115,7 +1115,7 @@ private void ConnectSessionToJob(PSSession session, PSRemotingJob job = null)
         /// <param name="session">Session to connect.</param>
         /// <param name="ex">Optional exception object.</param>
         /// <returns>Connected session or null.</returns>
-        private PSSession ConnectSession(PSSession session, out Exception ex)
+        private static PSSession ConnectSession(PSSession session, out Exception ex)
         {
             ex = null;
 
diff --git a/src/System.Management.Automation/engine/remoting/commands/RemoveJob.cs b/src/System.Management.Automation/engine/remoting/commands/RemoveJob.cs
index 51fe75b19bc..f8c0a71a0df 100644
--- a/src/System.Management.Automation/engine/remoting/commands/RemoveJob.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/RemoveJob.cs
@@ -540,7 +540,7 @@ internal List<Job> FindJobsMatchingByFilter(bool writeobject)
         /// <param name="matches"></param>
         /// <param name="jobsToSearch"></param>
         /// <returns></returns>
-        private bool FindJobsMatchingByFilterHelper(List<Job> matches, List<Job> jobsToSearch)
+        private static bool FindJobsMatchingByFilterHelper(List<Job> matches, List<Job> jobsToSearch)
         {
             // check that filter only has job properties
             // if so, filter on one at a time using helpers.
diff --git a/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs b/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs
index a6342196fa8..3122d7e1176 100644
--- a/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/newrunspacecommand.cs
@@ -530,7 +530,7 @@ private void HandleRunspaceStateChanged(object sender, OperationStateEventArgs s
                             transErrorCode,
                             _defaultFQEID);
 
-                        if (WSManNativeApi.ERROR_WSMAN_NO_LOGON_SESSION_EXIST == transErrorCode)
+                        if (transErrorCode == WSManNativeApi.ERROR_WSMAN_NO_LOGON_SESSION_EXIST)
                         {
                             errorDetails += System.Environment.NewLine + string.Format(System.Globalization.CultureInfo.CurrentCulture, RemotingErrorIdStrings.RemotingErrorNoLogonSessionExist);
                         }
@@ -661,7 +661,7 @@ private List<RemoteRunspace> CreateRunspacesWhenRunspaceParameterSpecified()
                             if (originalWSManConnectionInfo != null)
                             {
                                 newWSManConnectionInfo = originalWSManConnectionInfo.Copy();
-                                newWSManConnectionInfo.EnableNetworkAccess = (newWSManConnectionInfo.EnableNetworkAccess || EnableNetworkAccess) ? true : false;
+                                newWSManConnectionInfo.EnableNetworkAccess = newWSManConnectionInfo.EnableNetworkAccess || EnableNetworkAccess;
                                 newConnectionInfo = newWSManConnectionInfo;
                             }
                             else
diff --git a/src/System.Management.Automation/engine/remoting/commands/remotingcommandutil.cs b/src/System.Management.Automation/engine/remoting/commands/remotingcommandutil.cs
index 2537abe6369..094dcedc6ad 100644
--- a/src/System.Management.Automation/engine/remoting/commands/remotingcommandutil.cs
+++ b/src/System.Management.Automation/engine/remoting/commands/remotingcommandutil.cs
@@ -87,7 +87,7 @@ internal static void CheckRemotingCmdletPrerequisites()
             return;
 #else
             bool notSupported = true;
-            string WSManKeyPath = "Software\\Microsoft\\Windows\\CurrentVersion\\WSMAN\\";
+            const string WSManKeyPath = "Software\\Microsoft\\Windows\\CurrentVersion\\WSMAN\\";
 
             CheckHostRemotingPrerequisites();
 
diff --git a/src/System.Management.Automation/engine/remoting/common/Indexer.cs b/src/System.Management.Automation/engine/remoting/common/Indexer.cs
index 243a1580ea5..019eb9dfce4 100644
--- a/src/System.Management.Automation/engine/remoting/common/Indexer.cs
+++ b/src/System.Management.Automation/engine/remoting/common/Indexer.cs
@@ -49,7 +49,7 @@ internal Indexer(int[] lengths)
         /// Check lengths non negative.
         /// </summary>
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        private bool CheckLengthsNonNegative(int[] lengths)
+        private static bool CheckLengthsNonNegative(int[] lengths)
         {
             for (int i = 0; i < lengths.Length; ++i)
             {
diff --git a/src/System.Management.Automation/engine/remoting/common/RemoteSessionNamedPipe.cs b/src/System.Management.Automation/engine/remoting/common/RemoteSessionNamedPipe.cs
index d50b7989b66..6f520e0ac26 100644
--- a/src/System.Management.Automation/engine/remoting/common/RemoteSessionNamedPipe.cs
+++ b/src/System.Management.Automation/engine/remoting/common/RemoteSessionNamedPipe.cs
@@ -466,7 +466,7 @@ internal RemoteSessionNamedPipeServer(
         /// <param name="coreName">Named pipe core name.</param>
         /// <param name="securityDesc"></param>
         /// <returns>NamedPipeServerStream.</returns>
-        private NamedPipeServerStream CreateNamedPipe(
+        private static NamedPipeServerStream CreateNamedPipe(
             string serverName,
             string namespaceName,
             string coreName,
@@ -1291,9 +1291,6 @@ public ContainerSessionNamedPipeClient(
         /// </summary>
         protected override NamedPipeClientStream DoConnect(int timeout)
         {
-            // Create pipe flags.
-            uint pipeFlags = NamedPipeNative.FILE_FLAG_OVERLAPPED;
-
             //
             // WaitNamedPipe API is not supported by Windows Server container now, so we need to repeatedly
             // attempt connection to pipe server until timeout expires.
@@ -1306,13 +1303,13 @@ protected override NamedPipeClientStream DoConnect(int timeout)
             {
                 // Get handle to pipe.
                 pipeHandle = NamedPipeNative.CreateFile(
-                    _pipeName,
-                    NamedPipeNative.GENERIC_READ | NamedPipeNative.GENERIC_WRITE,
-                    0,
-                    IntPtr.Zero,
-                    NamedPipeNative.OPEN_EXISTING,
-                    pipeFlags,
-                    IntPtr.Zero);
+                    lpFileName: _pipeName,
+                    dwDesiredAccess: NamedPipeNative.GENERIC_READ | NamedPipeNative.GENERIC_WRITE,
+                    dwShareMode: 0,
+                    SecurityAttributes: IntPtr.Zero,
+                    dwCreationDisposition: NamedPipeNative.OPEN_EXISTING,
+                    dwFlagsAndAttributes: NamedPipeNative.FILE_FLAG_OVERLAPPED,
+                    hTemplateFile: IntPtr.Zero);
 
                 int lastError = Marshal.GetLastWin32Error();
                 if (pipeHandle.IsInvalid)
diff --git a/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs b/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
index 6b4e91efae3..9debc89ce76 100644
--- a/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
+++ b/src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
@@ -642,7 +642,7 @@ public override string CertificateThumbprint
         public bool UseCompression { get; set; } = true;
 
         /// <summary>
-        /// If <c>true</c> then Operating System won't load the user profile (i.e. registry keys under HKCU) on the remote server
+        /// If <see langword="true"/> then Operating System won't load the user profile (i.e. registry keys under HKCU) on the remote server
         /// which can result in a faster session creation time.  This option won't have any effect if the remote machine has
         /// already loaded the profile (i.e. in another session).
         /// </summary>
@@ -1096,7 +1096,7 @@ internal override BaseClientSessionTransportManager CreateClientSessionTransport
 
         #region Private Methods
 
-        private string ResolveShellUri(string shell)
+        private static string ResolveShellUri(string shell)
         {
             string resolvedShellUri = shell;
             if (string.IsNullOrEmpty(resolvedShellUri))
@@ -2050,9 +2050,9 @@ internal int StartSSHProcess(
         {
             string filePath = string.Empty;
 #if UNIX
-            string sshCommand = "ssh";
+            const string sshCommand = "ssh";
 #else
-            string sshCommand = "ssh.exe";
+            const string sshCommand = "ssh.exe";
 #endif
             var context = Runspaces.LocalPipeline.GetExecutionContextFromTLS();
             if (context != null)
@@ -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();
@@ -2625,21 +2625,15 @@ private static Process CreateProcessWithRedirectedStd(
 
         private static SafePipeHandle GetNamedPipeHandle(string pipeName)
         {
-            // Create pipe flags for asynchronous pipes.
-            uint pipeFlags = NamedPipeNative.FILE_FLAG_OVERLAPPED;
-
-            // We want an inheritable handle.
-            PlatformInvokes.SECURITY_ATTRIBUTES securityAttributes = new PlatformInvokes.SECURITY_ATTRIBUTES();
-
             // Get handle to pipe.
             var fileHandle = PlatformInvokes.CreateFileW(
-                pipeName,
-                NamedPipeNative.GENERIC_READ | NamedPipeNative.GENERIC_WRITE,
-                0,
-                securityAttributes,
-                NamedPipeNative.OPEN_EXISTING,
-                pipeFlags,
-                IntPtr.Zero);
+                lpFileName: pipeName,
+                dwDesiredAccess: NamedPipeNative.GENERIC_READ | NamedPipeNative.GENERIC_WRITE,
+                dwShareMode: 0,
+                lpSecurityAttributes: new PlatformInvokes.SECURITY_ATTRIBUTES(), // Create an inheritable handle.
+                dwCreationDisposition: NamedPipeNative.OPEN_EXISTING,
+                dwFlagsAndAttributes: NamedPipeNative.FILE_FLAG_OVERLAPPED, // Open in asynchronous mode.
+                hTemplateFile: IntPtr.Zero);
 
             int lastError = Marshal.GetLastWin32Error();
             if (fileHandle == PlatformInvokes.INVALID_HANDLE_VALUE)
@@ -3458,7 +3452,7 @@ private void GetContainerPropertiesInternal()
                             }
                         }
 
-                        if (ContainerObRoot == null) 
+                        if (ContainerObRoot == null)
                         {
                             throw new PSInvalidOperationException(RemotingErrorIdStrings.CannotGetHostInteropTypes);
                         }
@@ -3493,7 +3487,7 @@ private void GetContainerPropertiesInternal()
         /// <summary>
         /// Run some tasks on MTA thread if needed.
         /// </summary>
-        private void RunOnMTAThread(ThreadStart threadProc)
+        private static void RunOnMTAThread(ThreadStart threadProc)
         {
             if (Thread.CurrentThread.GetApartmentState() == ApartmentState.MTA)
             {
@@ -3512,7 +3506,7 @@ private void RunOnMTAThread(ThreadStart threadProc)
         /// <summary>
         /// Get error message from the thrown exception.
         /// </summary>
-        private string GetErrorMessageFromException(Exception e)
+        private static string GetErrorMessageFromException(Exception e)
         {
             string errorMessage = e.Message;
 
diff --git a/src/System.Management.Automation/engine/remoting/common/WireDataFormat/EncodeAndDecode.cs b/src/System.Management.Automation/engine/remoting/common/WireDataFormat/EncodeAndDecode.cs
index fc011b313e2..03a3cd51a87 100644
--- a/src/System.Management.Automation/engine/remoting/common/WireDataFormat/EncodeAndDecode.cs
+++ b/src/System.Management.Automation/engine/remoting/common/WireDataFormat/EncodeAndDecode.cs
@@ -1196,10 +1196,10 @@ internal static RemoteDataObject GenerateRunspacePoolStateInfo(
             // Add Reason property
             if (stateInfo.Reason != null)
             {
-                // If Reason is of not type IContainsErrorRecord, a new ErrorRecord is
-                // created using this errorId
-                string errorId = "RemoteRunspaceStateInfoReason";
-                PSNoteProperty exceptionProperty = GetExceptionProperty(stateInfo.Reason, errorId, ErrorCategory.NotSpecified);
+                PSNoteProperty exceptionProperty = GetExceptionProperty(
+                    exception: stateInfo.Reason,
+                    errorId: "RemoteRunspaceStateInfoReason",
+                    category: ErrorCategory.NotSpecified);
                 dataAsPSObject.Properties.Add(exceptionProperty);
             }
 
@@ -1515,12 +1515,10 @@ internal static RemoteDataObject GeneratePowerShellStateInfo(PSInvocationStateIn
             // Add exception property
             if (stateInfo.Reason != null)
             {
-                // If Reason is of not type IContainsErrorRecord,
-                // a new ErrorRecord is created using this errorId
-                string errorId = "RemotePSInvocationStateInfoReason";
-                PSNoteProperty exceptionProperty =
-                    GetExceptionProperty(stateInfo.Reason, errorId,
-                        ErrorCategory.NotSpecified);
+                PSNoteProperty exceptionProperty = GetExceptionProperty(
+                    exception: stateInfo.Reason,
+                    errorId: "RemotePSInvocationStateInfoReason",
+                    category: ErrorCategory.NotSpecified);
                 dataAsPSObject.Properties.Add(exceptionProperty);
             }
 
@@ -1563,6 +1561,9 @@ internal static ErrorRecord GetErrorRecordFromException(Exception exception)
         /// <summary>
         /// Gets a Note Property for the exception.
         /// </summary>
+        /// <remarks>
+        /// If <paramref name="exception"/> is of not type IContainsErrorRecord, a new ErrorRecord is created.
+        /// </remarks>
         /// <param name="exception"></param>
         /// <param name="errorId">ErrorId to use if exception is not of type IContainsErrorRecord.</param>
         /// <param name="category">ErrorCategory to use if exception is not of type IContainsErrorRecord.</param>
@@ -2236,7 +2237,7 @@ internal static PowerShell GetCommandDiscoveryPipeline(object data)
             }
             else
             {
-                module = new string[] { "" };
+                module = new string[] { string.Empty };
             }
 
             ModuleSpecification[] fullyQualifiedName = null;
@@ -2280,7 +2281,7 @@ internal static PowerShell GetCommandDiscoveryPipeline(object data)
         /// Gets the NoInput setting from the specified data.
         /// </summary>
         /// <param name="data">Data to decode.</param>
-        /// <returns><c>true</c> if there is no pipeline input; <c>false</c> otherwise.</returns>
+        /// <returns><see langword="true"/> if there is no pipeline input; <see langword="false"/> otherwise.</returns>
         internal static bool GetNoInput(object data)
         {
             PSObject dataAsPSObject = PSObject.AsPSObject(data);
@@ -2297,7 +2298,7 @@ internal static bool GetNoInput(object data)
         /// Gets the AddToHistory setting from the specified data.
         /// </summary>
         /// <param name="data">Data to decode.</param>
-        /// <returns><c>true</c> if there is addToHistory data; <c>false</c> otherwise.</returns>
+        /// <returns><see langword="true"/> if there is addToHistory data; <see langword="false"/> otherwise.</returns>
         internal static bool GetAddToHistory(object data)
         {
             PSObject dataAsPSObject = PSObject.AsPSObject(data);
@@ -2314,7 +2315,7 @@ internal static bool GetAddToHistory(object data)
         /// Gets the IsNested setting from the specified data.
         /// </summary>
         /// <param name="data">Data to decode.</param>
-        /// <returns><c>true</c> if there is IsNested data; <c>false</c> otherwise.</returns>
+        /// <returns><see langword="true"/> if there is IsNested data; <see langword="false"/> otherwise.</returns>
         internal static bool GetIsNested(object data)
         {
             PSObject dataAsPSObject = PSObject.AsPSObject(data);
diff --git a/src/System.Management.Automation/engine/remoting/common/WireDataFormat/RemoteHost.cs b/src/System.Management.Automation/engine/remoting/common/WireDataFormat/RemoteHost.cs
index f0f37381e7c..c29be13487b 100644
--- a/src/System.Management.Automation/engine/remoting/common/WireDataFormat/RemoteHost.cs
+++ b/src/System.Management.Automation/engine/remoting/common/WireDataFormat/RemoteHost.cs
@@ -198,7 +198,7 @@ internal void ExecuteVoidMethod(PSHost clientHost)
         /// <summary>
         /// Get remote runspace to close.
         /// </summary>
-        private RemoteRunspace GetRemoteRunspaceToClose(PSHost clientHost)
+        private static RemoteRunspace GetRemoteRunspaceToClose(PSHost clientHost)
         {
             // Figure out if we need to close the remote runspace. Return null if we don't.
 
@@ -440,7 +440,7 @@ internal Collection<RemoteHostCall> PerformSecurityChecksOnHostMessage(string co
         /// </summary>
         /// <param name="caption">Caption to modify.</param>
         /// <returns>New modified caption.</returns>
-        private string ModifyCaption(string caption)
+        private static string ModifyCaption(string caption)
         {
             string pscaption = CredUI.PromptForCredential_DefaultCaption;
 
@@ -465,7 +465,7 @@ private string ModifyCaption(string caption)
         /// <param name="computerName">computername to include in the
         /// message</param>
         /// <returns>Message which contains a warning as well.</returns>
-        private string ModifyMessage(string message, string computerName)
+        private static string ModifyMessage(string message, string computerName)
         {
             string modifiedMessage = PSRemotingErrorInvariants.FormatResourceString(
                     RemotingErrorIdStrings.RemoteHostPromptForCredentialModifiedMessage,
@@ -485,7 +485,7 @@ private string ModifyMessage(string message, string computerName)
         /// <param name="resourceString">Resource string to use.</param>
         /// <returns>A constructed remote host call message
         /// which will display the warning.</returns>
-        private RemoteHostCall ConstructWarningMessageForSecureString(string computerName,
+        private static RemoteHostCall ConstructWarningMessageForSecureString(string computerName,
             string resourceString)
         {
             string warning = PSRemotingErrorInvariants.FormatResourceString(
@@ -506,7 +506,7 @@ private RemoteHostCall ConstructWarningMessageForSecureString(string computerNam
         /// in warning</param>
         /// <returns>A constructed remote host call message
         /// which will display the warning.</returns>
-        private RemoteHostCall ConstructWarningMessageForGetBufferContents(string computerName)
+        private static RemoteHostCall ConstructWarningMessageForGetBufferContents(string computerName)
         {
             string warning = PSRemotingErrorInvariants.FormatResourceString(
                 RemotingErrorIdStrings.RemoteHostGetBufferContents,
diff --git a/src/System.Management.Automation/engine/remoting/common/WireDataFormat/RemotingDataObject.cs b/src/System.Management.Automation/engine/remoting/common/WireDataFormat/RemotingDataObject.cs
index 664c2a91ae0..0fed6cc759d 100644
--- a/src/System.Management.Automation/engine/remoting/common/WireDataFormat/RemotingDataObject.cs
+++ b/src/System.Management.Automation/engine/remoting/common/WireDataFormat/RemotingDataObject.cs
@@ -213,7 +213,7 @@ private void SerializeHeader(Stream streamToWriteTo)
             return;
         }
 
-        private void SerializeUInt(uint data, Stream streamToWriteTo)
+        private static void SerializeUInt(uint data, Stream streamToWriteTo)
         {
             Dbg.Assert(streamToWriteTo != null, "stream to write to cannot be null");
 
@@ -241,7 +241,7 @@ private static uint DeserializeUInt(Stream serializedDataStream)
             return result;
         }
 
-        private void SerializeGuid(Guid guid, Stream streamToWriteTo)
+        private static void SerializeGuid(Guid guid, Stream streamToWriteTo)
         {
             Dbg.Assert(streamToWriteTo != null, "stream to write to cannot be null");
 
diff --git a/src/System.Management.Automation/engine/remoting/common/fragmentor.cs b/src/System.Management.Automation/engine/remoting/common/fragmentor.cs
index 87543552c53..4685af1e75d 100644
--- a/src/System.Management.Automation/engine/remoting/common/fragmentor.cs
+++ b/src/System.Management.Automation/engine/remoting/common/fragmentor.cs
@@ -105,7 +105,7 @@ internal FragmentedRemoteObject(byte[] blob, long objectId, long fragmentId,
             ObjectId = objectId;
             FragmentId = fragmentId;
 
-            IsStartFragment = (fragmentId == 0) ? true : false;
+            IsStartFragment = fragmentId == 0;
             IsEndFragment = isEndFragment;
 
             _blob = blob;
@@ -205,10 +205,10 @@ internal byte[] Blob
         /// </returns>
         internal byte[] GetBytes()
         {
-            int objectIdSize = 8; // number of bytes of long
-            int fragmentIdSize = 8; // number of bytes of long
-            int flagsSize = 1; // 1 byte for IsEndOfFrag and IsControl
-            int blobLengthSize = 4; // number of bytes of int
+            const int objectIdSize = 8; // number of bytes of long
+            const int fragmentIdSize = 8; // number of bytes of long
+            const int flagsSize = 1; // 1 byte for IsEndOfFrag and IsControl
+            const int blobLengthSize = 4; // number of bytes of int
 
             int totalLength = objectIdSize + fragmentIdSize + flagsSize + blobLengthSize + BlobLength;
 
@@ -883,9 +883,11 @@ protected override void Dispose(bool disposing)
         /// <summary>
         /// </summary>
         public override bool CanRead { get { return true; } }
+
         /// <summary>
         /// </summary>
         public override bool CanSeek { get { return false; } }
+
         /// <summary>
         /// </summary>
         public override bool CanWrite { get { return true; } }
@@ -893,6 +895,7 @@ protected override void Dispose(bool disposing)
         /// Gets the length of the stream in bytes.
         /// </summary>
         public override long Length { get { return _length; } }
+
         /// <summary>
         /// </summary>
         public override long Position
@@ -908,6 +911,7 @@ public override long Position
         public override void Flush()
         {
         }
+
         /// <summary>
         /// </summary>
         /// <param name="offset"></param>
@@ -917,6 +921,7 @@ public override long Seek(long offset, SeekOrigin origin)
         {
             throw new NotSupportedException();
         }
+
         /// <summary>
         /// </summary>
         /// <param name="value"></param>
diff --git a/src/System.Management.Automation/engine/remoting/common/psstreamobject.cs b/src/System.Management.Automation/engine/remoting/common/psstreamobject.cs
index cb985ac5ed0..3419bde7966 100644
--- a/src/System.Management.Automation/engine/remoting/common/psstreamobject.cs
+++ b/src/System.Management.Automation/engine/remoting/common/psstreamobject.cs
@@ -75,7 +75,9 @@ public class PSStreamObject
         /// <summary>
         /// </summary>
         public PSStreamObjectType ObjectType { get; set; }
+
         internal object Value { get; set; }
+
         internal Guid Id { get; set; }
 
         internal PSStreamObject(PSStreamObjectType objectType, object value, Guid id)
diff --git a/src/System.Management.Automation/engine/remoting/common/throttlemanager.cs b/src/System.Management.Automation/engine/remoting/common/throttlemanager.cs
index cf742cdba7d..afccc28362a 100644
--- a/src/System.Management.Automation/engine/remoting/common/throttlemanager.cs
+++ b/src/System.Management.Automation/engine/remoting/common/throttlemanager.cs
@@ -675,9 +675,9 @@ internal class Operation : IThrottleOperation
         private Thread workerThreadStart;
         private Thread workerThreadStop;
 
-        public bool Done { set; get; }
+        public bool Done { get; set; }
 
-        public int SleepTime { set; get; } = 100;
+        public int SleepTime { get; set; } = 100;
 
         private void WorkerThreadMethodStart()
         {
diff --git a/src/System.Management.Automation/engine/remoting/fanin/BaseTransportManager.cs b/src/System.Management.Automation/engine/remoting/fanin/BaseTransportManager.cs
index aa496990dd8..5d12914074c 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 @@ internal enum ConnectionStatus
         AutoDisconnectStarting = 4,
         AutoDisconnectSucceeded = 5,
         InternalErrorAbort = 6
-    };
+    }
 
     /// <summary>
     /// ConnectionStatusEventArgs.
@@ -757,7 +757,7 @@ internal void EnqueueAndStartProcessingThread(RemoteDataObject<PSObject> remoteO
         /// </summary>
         /// <param name="remoteObject">Remote data object.</param>
         /// <returns>True if remote data object requires a user response.</returns>
-        private bool CheckForInteractiveHostCall(RemoteDataObject<PSObject> remoteObject)
+        private static bool CheckForInteractiveHostCall(RemoteDataObject<PSObject> remoteObject)
         {
             bool interactiveHostCall = false;
 
@@ -972,7 +972,7 @@ internal virtual void PrepareForConnect()
         #region Clean up
 
         /// <summary>
-        /// Finalizer.
+        /// Finalizes an instance of the <see cref="BaseClientTransportManager"/> class.
         /// </summary>
         ~BaseClientTransportManager()
         {
@@ -1524,7 +1524,7 @@ internal static byte[] ExtractEncodedXmlElement(string xmlBuffer, string xmlTag)
             XmlReader reader = XmlReader.Create(new StringReader(xmlBuffer), readerSettings);
 
             string additionalData;
-            if (XmlNodeType.Element == reader.MoveToContent())
+            if (reader.MoveToContent() == XmlNodeType.Element)
             {
                 additionalData = reader.ReadElementContentAsString(xmlTag, reader.NamespaceURI);
             }
diff --git a/src/System.Management.Automation/engine/remoting/fanin/InitialSessionStateProvider.cs b/src/System.Management.Automation/engine/remoting/fanin/InitialSessionStateProvider.cs
index 2914d42af3d..6cde06cea36 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/InitialSessionStateProvider.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/InitialSessionStateProvider.cs
@@ -157,7 +157,7 @@ private void Update(string optionName, string optionValue)
         /// <exception cref="ArgumentException">
         /// 1. "optionName" is already defined
         /// </exception>
-        private void AssertValueNotAssigned(string optionName, object originalValue)
+        private static void AssertValueNotAssigned(string optionName, object originalValue)
         {
             if (originalValue != null)
             {
@@ -401,7 +401,7 @@ public virtual InitialSessionState GetInitialSessionState(PSSessionConfiguration
         /// <param name="senderInfo">
         /// User Identity for which this information is requested
         /// </param>
-        /// <returns>Application private data or <c>null</c></returns>
+        /// <returns>Application private data or <see langword="null"/></returns>
         public virtual PSPrimitiveDictionary GetApplicationPrivateData(PSSenderInfo senderInfo)
         {
             return null;
@@ -1896,7 +1896,7 @@ private void MergeConfigHashIntoConfigHash(IDictionary childConfigHash)
             }
         }
 
-        private string GetRoleCapabilityPath(string roleCapability)
+        private static string GetRoleCapabilityPath(string roleCapability)
         {
             string moduleName = "*";
             if (roleCapability.Contains('\\'))
@@ -2395,7 +2395,7 @@ public override InitialSessionState GetInitialSessionState(PSSenderInfo senderIn
                 if (Convert.ToBoolean(_configHash[ConfigFileConstants.MountUserDrive], CultureInfo.InvariantCulture))
                 {
                     iss.UserDriveEnabled = true;
-                    iss.UserDriveUserName = (senderInfo != null) ? senderInfo.UserInfo.Identity.Name : null;
+                    iss.UserDriveUserName = senderInfo?.UserInfo.Identity.Name;
 
                     // Set user drive max drive if provided.
                     if (_configHash.ContainsKey(ConfigFileConstants.UserDriveMaxSize))
@@ -2620,7 +2620,7 @@ private static void ProcessVisibleCommand(InitialSessionState iss, string comman
         /// <summary>
         /// Creates an alias entry.
         /// </summary>
-        private SessionStateAliasEntry CreateSessionStateAliasEntry(Hashtable alias, bool isAliasVisibilityDefined)
+        private static SessionStateAliasEntry CreateSessionStateAliasEntry(Hashtable alias, bool isAliasVisibilityDefined)
         {
             string name = TryGetValue(alias, ConfigFileConstants.AliasNameToken);
 
@@ -2660,7 +2660,7 @@ private SessionStateAliasEntry CreateSessionStateAliasEntry(Hashtable alias, boo
         /// Creates a function entry.
         /// </summary>
         /// <returns></returns>
-        private SessionStateFunctionEntry CreateSessionStateFunctionEntry(Hashtable function, bool isFunctionVisibilityDefined)
+        private static SessionStateFunctionEntry CreateSessionStateFunctionEntry(Hashtable function, bool isFunctionVisibilityDefined)
         {
             string name = TryGetValue(function, ConfigFileConstants.FunctionNameToken);
 
@@ -2700,7 +2700,7 @@ private SessionStateFunctionEntry CreateSessionStateFunctionEntry(Hashtable func
         /// <summary>
         /// Creates a variable entry.
         /// </summary>
-        private SessionStateVariableEntry CreateSessionStateVariableEntry(Hashtable variable, PSLanguageMode languageMode)
+        private static SessionStateVariableEntry CreateSessionStateVariableEntry(Hashtable variable, PSLanguageMode languageMode)
         {
             string name = TryGetValue(variable, ConfigFileConstants.VariableNameToken);
 
diff --git a/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs b/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
index 8cd28d17845..b8f6da13c17 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/OutOfProcTransportManager.cs
@@ -144,12 +144,19 @@ private static string CreatePSGuidPacket(string element, Guid psGuid)
         #region Packet Processing Helper Methods / Delegates
 
         internal delegate void DataPacketReceived(byte[] rawData, string stream, Guid psGuid);
+
         internal delegate void DataAckPacketReceived(Guid psGuid);
+
         internal delegate void CommandCreationPacketReceived(Guid psGuid);
+
         internal delegate void CommandCreationAckReceived(Guid psGuid);
+
         internal delegate void ClosePacketReceived(Guid psGuid);
+
         internal delegate void CloseAckPacketReceived(Guid psGuid);
+
         internal delegate void SignalPacketReceived(Guid psGuid);
+
         internal delegate void SignalAckPacketReceived(Guid psGuid);
 
         internal struct DataProcessingDelegates
diff --git a/src/System.Management.Automation/engine/remoting/fanin/PSSessionConfigurationData.cs b/src/System.Management.Automation/engine/remoting/fanin/PSSessionConfigurationData.cs
index 17aac7adfdf..6da557cca40 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/PSSessionConfigurationData.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/PSSessionConfigurationData.cs
@@ -18,7 +18,9 @@ public sealed class PSSessionConfigurationData
     {
         /// <summary>
         /// </summary>
+#pragma warning disable CA2211 // Non-constant fields should not be visible
         public static bool IsServerManager;
+#pragma warning restore CA2211 // Non-constant fields should not be visible
 
         #region Public Properties
 
diff --git a/src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs b/src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs
index d354574c37b..1bf8afd3dd1 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs
@@ -163,8 +163,8 @@ Verify arrays and dataToBeSent objects before referencing.
             */
             if (_dataSyncObjects != null && _dataToBeSent != null)
             {
-                int promptResponseIndex = (int)DataPriorityType.PromptResponse;
-                int defaultIndex = (int)DataPriorityType.Default;
+                const int promptResponseIndex = (int)DataPriorityType.PromptResponse;
+                const int defaultIndex = (int)DataPriorityType.Default;
 
                 lock (_dataSyncObjects[promptResponseIndex])
                 {
diff --git a/src/System.Management.Automation/engine/remoting/fanin/WSManNativeAPI.cs b/src/System.Management.Automation/engine/remoting/fanin/WSManNativeAPI.cs
index 404dd3b576d..6dd3614a62f 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/WSManNativeAPI.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/WSManNativeAPI.cs
@@ -192,7 +192,7 @@ internal static MarshalledObject Create<T>(T obj)
             /// </summary>
             public void Dispose()
             {
-                if (IntPtr.Zero != _dataPtr)
+                if (_dataPtr != IntPtr.Zero)
                 {
                     Marshal.FreeHGlobal(_dataPtr);
                     _dataPtr = IntPtr.Zero;
@@ -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
@@ -687,18 +687,6 @@ internal WSManData_ManToUn(string data)
                 Marshal.StructureToPtr(_internalData, _marshalledObject, false);
             }
 
-            /// <summary>
-            /// Finalizer
-            ///
-            /// Note: Do not depend on the finalizer! This object should be
-            /// properly disposed of when no longer needed via a direct call
-            /// to Dispose().
-            /// </summary>
-            ~WSManData_ManToUn()
-            {
-                Dispose(false);
-            }
-
             /// <summary>
             /// Gets the type of data.
             /// </summary>
@@ -747,6 +735,14 @@ private void Dispose(bool isDisposing)
                 }
             }
 
+            /// <summary>
+            /// Finalizes an instance of the <see cref="WSManData_ManToUn"/> class.
+            /// </summary>
+            ~WSManData_ManToUn()
+            {
+                Dispose(false);
+            }
+
             /// <summary>
             /// Implicit IntPtr conversion.
             /// </summary>
@@ -869,7 +865,7 @@ internal static WSManData_UnToMan UnMarshal(IntPtr unmanagedData)
             {
                 WSManData_UnToMan result = null;
 
-                if (IntPtr.Zero != unmanagedData)
+                if (unmanagedData != IntPtr.Zero)
                 {
                     WSManDataStruct resultInternal = Marshal.PtrToStructure<WSManDataStruct>(unmanagedData);
                     result = WSManData_UnToMan.UnMarshal(resultInternal);
@@ -972,7 +968,7 @@ internal WSManStreamIDSet_ManToUn(string[] streamIds)
             /// </summary>
             internal void Dispose()
             {
-                if (IntPtr.Zero != _streamSetInfo.streamIDs)
+                if (_streamSetInfo.streamIDs != IntPtr.Zero)
                 {
                     int sizeOfIntPtr = Marshal.SizeOf<IntPtr>();
                     for (int index = 0; index < _streamSetInfo.streamIDsCount; index++)
@@ -980,7 +976,7 @@ internal void Dispose()
                         IntPtr streamAddress = IntPtr.Zero;
                         streamAddress = Marshal.ReadIntPtr(_streamSetInfo.streamIDs, index * sizeOfIntPtr);
 
-                        if (IntPtr.Zero != streamAddress)
+                        if (streamAddress != IntPtr.Zero)
                         {
                             Marshal.FreeHGlobal(streamAddress);
                             streamAddress = IntPtr.Zero;
@@ -1019,7 +1015,7 @@ internal static WSManStreamIDSet_UnToMan UnMarshal(IntPtr unmanagedData)
             {
                 WSManStreamIDSet_UnToMan result = null;
 
-                if (IntPtr.Zero != unmanagedData)
+                if (unmanagedData != IntPtr.Zero)
                 {
                     WSManStreamIDSetStruct resultInternal = Marshal.PtrToStructure<WSManStreamIDSetStruct>(unmanagedData);
 
@@ -1140,7 +1136,7 @@ internal WSManOptionSet(WSManOption[] options)
             /// </summary>
             public void Dispose()
             {
-                if (IntPtr.Zero != _optionSet.options)
+                if (_optionSet.options != IntPtr.Zero)
                 {
                     Marshal.FreeHGlobal(_optionSet.options);
                     _optionSet.options = IntPtr.Zero;
@@ -1174,7 +1170,7 @@ public static implicit operator IntPtr(WSManOptionSet optionSet)
             /// <returns></returns>
             internal static WSManOptionSet UnMarshal(IntPtr unmanagedData)
             {
-                if (IntPtr.Zero == unmanagedData)
+                if (unmanagedData == IntPtr.Zero)
                 {
                     return new WSManOptionSet();
                 }
@@ -1264,7 +1260,7 @@ internal WSManCommandArgSet(byte[] firstArgument)
             public void Dispose()
             {
                 IntPtr firstArgAddress = Marshal.ReadIntPtr(_internalData.args);
-                if (IntPtr.Zero != firstArgAddress)
+                if (firstArgAddress != IntPtr.Zero)
                 {
                     Marshal.FreeHGlobal(firstArgAddress);
                 }
@@ -1302,7 +1298,7 @@ internal static WSManCommandArgSet UnMarshal(IntPtr unmanagedData)
             {
                 WSManCommandArgSet result = new WSManCommandArgSet();
 
-                if (IntPtr.Zero != unmanagedData)
+                if (unmanagedData != IntPtr.Zero)
                 {
                     WSManCommandArgSetInternal resultInternal = Marshal.PtrToStructure<WSManCommandArgSetInternal>(unmanagedData);
 
@@ -1486,7 +1482,7 @@ internal static WSManShellStartupInfo_UnToMan UnMarshal(IntPtr unmanagedData)
             {
                 WSManShellStartupInfo_UnToMan result = null;
 
-                if (IntPtr.Zero != unmanagedData)
+                if (unmanagedData != IntPtr.Zero)
                 {
                     WSManShellStartupInfoStruct resultInternal = Marshal.PtrToStructure<WSManShellStartupInfoStruct>(unmanagedData);
 
@@ -1522,7 +1518,7 @@ internal static WSManEnvironmentVariableSet UnMarshal(IntPtr unmanagedData)
             {
                 WSManEnvironmentVariableSet result = null;
 
-                if (IntPtr.Zero != unmanagedData)
+                if (unmanagedData != IntPtr.Zero)
                 {
                     WSManEnvironmentVariableSetInternal resultInternal = Marshal.PtrToStructure<WSManEnvironmentVariableSetInternal>(unmanagedData);
 
@@ -1841,7 +1837,7 @@ internal static WSManCreateShellDataResult UnMarshal(IntPtr unmanagedData)
             {
                 WSManCreateShellDataResult result = new WSManCreateShellDataResult();
 
-                if (IntPtr.Zero != unmanagedData)
+                if (unmanagedData != IntPtr.Zero)
                 {
                     WSManCreateShellDataResultInternal resultInternal = Marshal.PtrToStructure<WSManCreateShellDataResultInternal>(unmanagedData);
 
@@ -2058,7 +2054,7 @@ internal static WSManPluginRequest UnMarshal(IntPtr unmanagedData)
                 // Dbg.Assert(IntPtr.Zero != unmanagedData, "unmanagedData must be non-null. This means WinRM sent a bad pointer.");
                 WSManPluginRequest result = null;
 
-                if (IntPtr.Zero != unmanagedData)
+                if (unmanagedData != IntPtr.Zero)
                 {
                     WSManPluginRequestInternal resultInternal = Marshal.PtrToStructure<WSManPluginRequestInternal>(unmanagedData);
 
@@ -2116,7 +2112,7 @@ internal static WSManSenderDetails UnMarshal(IntPtr unmanagedData)
             {
                 WSManSenderDetails result = null;
 
-                if (IntPtr.Zero != unmanagedData)
+                if (unmanagedData != IntPtr.Zero)
                 {
                     WSManSenderDetailsInternal resultInternal = Marshal.PtrToStructure<WSManSenderDetailsInternal>(unmanagedData);
 
@@ -2169,7 +2165,7 @@ internal static WSManCertificateDetails UnMarshal(IntPtr unmanagedData)
             {
                 WSManCertificateDetails result = null;
 
-                if (IntPtr.Zero != unmanagedData)
+                if (unmanagedData != IntPtr.Zero)
                 {
                     WSManCertificateDetailsInternal resultInternal = Marshal.PtrToStructure<WSManCertificateDetailsInternal>(unmanagedData);
 
@@ -2218,7 +2214,7 @@ internal static WSManOperationInfo UnMarshal(IntPtr unmanagedData)
             {
                 WSManOperationInfo result = null;
 
-                if (IntPtr.Zero != unmanagedData)
+                if (unmanagedData != IntPtr.Zero)
                 {
                     WSManOperationInfoInternal resultInternal = Marshal.PtrToStructure<WSManOperationInfoInternal>(unmanagedData);
 
@@ -2459,15 +2455,15 @@ internal static extern int WSManGetSessionOptionAsDword(IntPtr wsManSessionHandl
         internal static string WSManGetSessionOptionAsString(IntPtr wsManAPIHandle,
             WSManSessionOption option)
         {
-            Dbg.Assert(IntPtr.Zero != wsManAPIHandle, "wsManAPIHandle cannot be null.");
+            Dbg.Assert(wsManAPIHandle != IntPtr.Zero, "wsManAPIHandle cannot be null.");
             // The error code taken from winerror.h used for getting buffer length.
             const int ERROR_INSUFFICIENT_BUFFER = 122;
 
             string returnval = string.Empty;
             int bufferSize = 0;
             // calculate buffer size required
-            if (ERROR_INSUFFICIENT_BUFFER != WSManGetSessionOptionAsString(wsManAPIHandle,
-                option, 0, null, out bufferSize))
+            if (WSManGetSessionOptionAsString(wsManAPIHandle,
+                option, 0, null, out bufferSize) != ERROR_INSUFFICIENT_BUFFER)
             {
                 return returnval;
             }
@@ -2805,7 +2801,7 @@ internal static extern void WSManSignalShellEx(IntPtr shellOperationHandle,
         /// <returns></returns>
         internal static string WSManGetErrorMessage(IntPtr wsManAPIHandle, int errorCode)
         {
-            Dbg.Assert(IntPtr.Zero != wsManAPIHandle, "wsManAPIHandle cannot be null.");
+            Dbg.Assert(wsManAPIHandle != IntPtr.Zero, "wsManAPIHandle cannot be null.");
 
             // The error code taken from winerror.h used for getting buffer length.
             const int ERROR_INSUFFICIENT_BUFFER = 122;
@@ -2816,8 +2812,8 @@ internal static string WSManGetErrorMessage(IntPtr wsManAPIHandle, int errorCode
             string returnval = string.Empty;
             int bufferSize = 0;
             // calculate buffer size required
-            if (ERROR_INSUFFICIENT_BUFFER != WSManGetErrorMessage(wsManAPIHandle,
-                    0, langCode, errorCode, 0, null, out bufferSize))
+            if (WSManGetErrorMessage(wsManAPIHandle,
+                    0, langCode, errorCode, 0, null, out bufferSize) != ERROR_INSUFFICIENT_BUFFER)
             {
                 return returnval;
             }
@@ -3019,6 +3015,7 @@ internal static extern void WSManPluginRegisterShutdownCallback(
     /// unit testing.
     /// Note: It is implemented as a class to avoid exposing it outside the module.
     /// </summary>
+#nullable enable
     internal interface IWSManNativeApiFacade
     {
         // TODO: Expand this to cover the rest of the API once I prove that it works!
@@ -3037,7 +3034,7 @@ int WSManPluginOperationComplete(
         int WSManPluginReceiveResult(
             IntPtr requestDetails,
             int flags,
-            string stream,
+            string? stream,
             IntPtr streamResult,
             string commandState,
             int exitCode);
@@ -3052,6 +3049,7 @@ void WSManPluginRegisterShutdownCallback(
             IntPtr shutdownCallback,
             IntPtr shutdownContext);
     }
+#nullable restore
 
     /// <summary>
     /// Concrete implementation of the PInvoke facade for use in the production code.
diff --git a/src/System.Management.Automation/engine/remoting/fanin/WSManPlugin.cs b/src/System.Management.Automation/engine/remoting/fanin/WSManPlugin.cs
index a8ffc052f4f..9382beb9b31 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/WSManPlugin.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/WSManPlugin.cs
@@ -333,7 +333,7 @@ internal void CreateShell(
 
                 if (inboundShellInformation != null)
                 {
-                    if ((uint)WSManNativeApi.WSManDataType.WSMAN_DATA_TYPE_TEXT != inboundShellInformation.Type)
+                    if (inboundShellInformation.Type != (uint)WSManNativeApi.WSManDataType.WSMAN_DATA_TYPE_TEXT)
                     {
                         // only text data is supported
                         ReportOperationComplete(
@@ -361,7 +361,7 @@ internal void CreateShell(
                     requestDetails.ToString(), requestDetails.ToString());
                 result = wsmanPinvokeStatic.WSManPluginReportContext(requestDetails.unmanagedHandle, 0, requestDetails.unmanagedHandle);
 
-                if (WSManPluginConstants.ExitCodeSuccess != result)
+                if (result != WSManPluginConstants.ExitCodeSuccess)
                 {
                     ReportOperationComplete(
                         requestDetails,
@@ -563,7 +563,7 @@ private void AddToActiveShellSessions(
             lock (_syncObject)
             {
                 IntPtr key = newShellSession.creationRequestDetails.unmanagedHandle;
-                Dbg.Assert(IntPtr.Zero != key, "NULL handles should not be provided");
+                Dbg.Assert(key != IntPtr.Zero, "NULL handles should not be provided");
 
                 if (!_activeShellSessions.ContainsKey(key))
                 {
@@ -574,7 +574,7 @@ private void AddToActiveShellSessions(
                 }
             }
 
-            if (-1 != count)
+            if (count != -1)
             {
                 // Raise session count changed event
                 WSManServerChannelEvents.RaiseActiveSessionsChangedEvent(new ActiveSessionsChangedEventArgs(count));
@@ -614,7 +614,7 @@ private void DeleteFromActiveShellSessions(
                 }
             }
 
-            if (-1 != count)
+            if (count != -1)
             {
                 // Raise session count changed event
                 WSManServerChannelEvents.RaiseActiveSessionsChangedEvent(new ActiveSessionsChangedEventArgs(count));
@@ -640,7 +640,7 @@ private void HandleShellSessionClosed(
         /// <param name="shellContext"></param>
         /// <param name="inputFunctionName"></param>
         /// <returns></returns>
-        private bool validateIncomingContexts(
+        private static bool validateIncomingContexts(
             WSManNativeApi.WSManPluginRequest requestDetails,
             IntPtr shellContext,
             string inputFunctionName)
@@ -662,7 +662,7 @@ private bool validateIncomingContexts(
                 return false;
             }
 
-            if (IntPtr.Zero == shellContext)
+            if (shellContext == IntPtr.Zero)
             {
                 ReportOperationComplete(
                     requestDetails,
@@ -871,7 +871,7 @@ internal void ConnectShellOrCommand(
                 return;
             }
 
-            if (IntPtr.Zero == commandContext)
+            if (commandContext == IntPtr.Zero)
             {
                 mgdShellSession.ExecuteConnect(requestDetails, flags, inboundConnectInformation);
                 return;
@@ -964,7 +964,7 @@ internal void SendOneItemToShellOrCommand(
                 return;
             }
 
-            if (IntPtr.Zero == commandContext)
+            if (commandContext == IntPtr.Zero)
             {
                 // the data is destined for shell (runspace) session. so let shell handle it
                 mgdShellSession.SendOneItemToSession(requestDetails, flags, stream, inboundData);
@@ -1075,7 +1075,7 @@ internal void EnableShellOrCommandToSendDataToClient(
                 "EnableShellOrCommandToSendDataToClient: Instruction destined to shell or for command",
                 string.Empty);
 
-            if (IntPtr.Zero == commandContext)
+            if (commandContext == IntPtr.Zero)
             {
                 // the instruction is destined for shell (runspace) session. so let shell handle it
                 if (mgdShellSession.EnableSessionToSendDataToClient(requestDetails, flags, streamSet, ctxtToReport))
@@ -1111,7 +1111,7 @@ internal void EnableShellOrCommandToSendDataToClient(
         /// </summary>
         /// <param name="senderDetails"></param>
         /// <returns></returns>
-        private PSSenderInfo GetPSSenderInfo(
+        private static PSSenderInfo GetPSSenderInfo(
             WSManNativeApi.WSManSenderDetails senderDetails)
         {
             // senderDetails will not be null.
@@ -1168,7 +1168,7 @@ private PSSenderInfo GetPSSenderInfo(
         /// environment variable, which is set in the WSMan layer for Virtual or RunAs accounts.
         /// </summary>
         /// <returns>ClientToken IntPtr.</returns>
-        private IntPtr GetRunAsClientToken()
+        private static IntPtr GetRunAsClientToken()
         {
             string clientTokenStr = System.Environment.GetEnvironmentVariable(WSManRunAsClientTokenName);
             if (clientTokenStr != null)
@@ -1576,7 +1576,7 @@ internal static void PerformWSManPluginSignal(
             WSManNativeApi.WSManPluginRequest request = WSManNativeApi.WSManPluginRequest.UnMarshal(requestDetails);
 
             // Close Command
-            if (IntPtr.Zero != commandContext)
+            if (commandContext != IntPtr.Zero)
             {
                 if (!string.Equals(code, WSManPluginConstants.CtrlCSignal, StringComparison.Ordinal))
                 {
@@ -1640,7 +1640,7 @@ internal static void PerformCloseOperation(
                 return;
             }
 
-            if (IntPtr.Zero == context.commandContext)
+            if (context.commandContext == IntPtr.Zero)
             {
                 // this is targeted at shell
                 pluginToUse.CloseShellOperation(context);
@@ -1794,13 +1794,13 @@ internal static void SetThreadProperties(
                 WSManPluginConstants.WSManPluginParamsGetRequestedDataLocale,
                 outputStruct);
             // ref nativeDataLocaleData);
-            bool retrievingDataLocaleSucceeded = ((int)WSManPluginErrorCodes.NoError == hResult);
+            bool retrievingDataLocaleSucceeded = (hResult == (int)WSManPluginErrorCodes.NoError);
             WSManNativeApi.WSManData_UnToMan dataLocaleData = WSManNativeApi.WSManData_UnToMan.UnMarshal(outputStruct); // nativeDataLocaleData
 
             // Set the UI Culture
             try
             {
-                if (retrievingLocaleSucceeded && ((uint)WSManNativeApi.WSManDataType.WSMAN_DATA_TYPE_TEXT == localeData.Type))
+                if (retrievingLocaleSucceeded && (localeData.Type == (uint)WSManNativeApi.WSManDataType.WSMAN_DATA_TYPE_TEXT))
                 {
                     CultureInfo uiCultureToUse = new CultureInfo(localeData.Text);
                     Thread.CurrentThread.CurrentUICulture = uiCultureToUse;
@@ -1814,7 +1814,7 @@ internal static void SetThreadProperties(
             // Set the Culture
             try
             {
-                if (retrievingDataLocaleSucceeded && ((uint)WSManNativeApi.WSManDataType.WSMAN_DATA_TYPE_TEXT == dataLocaleData.Type))
+                if (retrievingDataLocaleSucceeded && (dataLocaleData.Type == (uint)WSManNativeApi.WSManDataType.WSMAN_DATA_TYPE_TEXT))
                 {
                     CultureInfo cultureToUse = new CultureInfo(dataLocaleData.Text);
                     Thread.CurrentThread.CurrentCulture = cultureToUse;
@@ -1883,7 +1883,7 @@ internal static void ReportOperationComplete(
             WSManPluginErrorCodes errorCode)
         {
             if (requestDetails != null &&
-                IntPtr.Zero != requestDetails.unmanagedHandle)
+                requestDetails.unmanagedHandle != IntPtr.Zero)
             {
                 wsmanPinvokeStatic.WSManPluginOperationComplete(
                     requestDetails.unmanagedHandle,
@@ -1906,7 +1906,7 @@ internal static void ReportOperationComplete(
             WSManPluginErrorCodes errorCode,
             string errorMessage = "")
         {
-            if (IntPtr.Zero == requestDetails)
+            if (requestDetails == IntPtr.Zero)
             {
                 // cannot report if requestDetails is null.
                 return;
diff --git a/src/System.Management.Automation/engine/remoting/fanin/WSManPluginFacade.cs b/src/System.Management.Automation/engine/remoting/fanin/WSManPluginFacade.cs
index 6735f51b5ca..e2679fcdf44 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/WSManPluginFacade.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/WSManPluginFacade.cs
@@ -234,11 +234,7 @@ private void Dispose(bool disposing)
         }
 
         /// <summary>
-        /// Use C# destructor syntax for finalization code.
-        /// This destructor will run only if the Dispose method
-        /// does not get called.
-        /// It gives your base class the opportunity to finalize.
-        /// Do not provide destructors in types derived from this class.
+        /// Finalizes an instance of the <see cref="WSManPluginEntryDelegates"/> class.
         /// </summary>
         ~WSManPluginEntryDelegates()
         {
@@ -433,7 +429,7 @@ private WSManPluginManagedEntryWrapper() { }
         public static int InitPlugin(
             IntPtr wkrPtrs)
         {
-            if (IntPtr.Zero == wkrPtrs)
+            if (wkrPtrs == IntPtr.Zero)
             {
                 return WSManPluginConstants.ExitCodeFailure;
             }
@@ -473,7 +469,7 @@ public static void WSManPluginConnect(
             IntPtr commandContext,
             IntPtr inboundConnectInformation)
         {
-            if (IntPtr.Zero == pluginContext)
+            if (pluginContext == IntPtr.Zero)
             {
                 WSManPluginInstance.ReportOperationComplete(
                     requestDetails,
@@ -505,7 +501,7 @@ public static void WSManPluginShell(
             IntPtr startupInfo,
             IntPtr inboundShellInformation)
         {
-            if (IntPtr.Zero == pluginContext)
+            if (pluginContext == IntPtr.Zero)
             {
                 WSManPluginInstance.ReportOperationComplete(
                     requestDetails,
@@ -561,7 +557,7 @@ public static void WSManPluginCommand(
             [MarshalAs(UnmanagedType.LPWStr)] string commandLine,
             IntPtr arguments)
         {
-            if (IntPtr.Zero == pluginContext)
+            if (pluginContext == IntPtr.Zero)
             {
                 WSManPluginInstance.ReportOperationComplete(
                     requestDetails,
@@ -622,7 +618,7 @@ public static void WSManPluginSend(
             [MarshalAs(UnmanagedType.LPWStr)] string stream,
             IntPtr inboundData)
         {
-            if (IntPtr.Zero == pluginContext)
+            if (pluginContext == IntPtr.Zero)
             {
                 WSManPluginInstance.ReportOperationComplete(
                     requestDetails,
@@ -654,7 +650,7 @@ public static void WSManPluginReceive(
             IntPtr commandContext,
             IntPtr streamSet)
         {
-            if (IntPtr.Zero == pluginContext)
+            if (pluginContext == IntPtr.Zero)
             {
                 WSManPluginInstance.ReportOperationComplete(
                     requestDetails,
@@ -686,7 +682,7 @@ public static void WSManPluginSignal(
             IntPtr commandContext,
             [MarshalAs(UnmanagedType.LPWStr)] string code)
         {
-            if ((IntPtr.Zero == pluginContext) || (IntPtr.Zero == shellContext))
+            if ((pluginContext == IntPtr.Zero) || (shellContext == IntPtr.Zero))
             {
                 WSManPluginInstance.ReportOperationComplete(
                     requestDetails,
@@ -766,11 +762,7 @@ private void Dispose(bool disposing)
         }
 
         /// <summary>
-        /// Use C# destructor syntax for finalization code.
-        /// This destructor will run only if the Dispose method
-        /// does not get called.
-        /// It gives your base class the opportunity to finalize.
-        /// Do not provide destructors in types derived from this class.
+        /// Finalizes an instance of the <see cref="WSManPluginManagedEntryInstanceWrapper"/> class.
         /// </summary>
         ~WSManPluginManagedEntryInstanceWrapper()
         {
diff --git a/src/System.Management.Automation/engine/remoting/fanin/WSManPluginShellSession.cs b/src/System.Management.Automation/engine/remoting/fanin/WSManPluginShellSession.cs
index cf6cdd613df..51635922e0b 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/WSManPluginShellSession.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/WSManPluginShellSession.cs
@@ -111,11 +111,7 @@ protected virtual void Dispose(bool disposing)
         }
 
         /// <summary>
-        /// Use C# destructor syntax for finalization code.
-        /// This destructor will run only if the Dispose method
-        /// does not get called.
-        /// It gives your base class the opportunity to finalize.
-        /// Do not provide destructors in types derived from this class.
+        /// Finalizes an instance of the <see cref="WSManPluginServerSession"/> class.
         /// </summary>
         ~WSManPluginServerSession()
         {
@@ -152,7 +148,7 @@ internal void SendOneItemToSession(
                 return;
             }
 
-            if ((uint)WSManNativeApi.WSManDataType.WSMAN_DATA_TYPE_BINARY != inboundData.Type)
+            if (inboundData.Type != (uint)WSManNativeApi.WSManDataType.WSMAN_DATA_TYPE_BINARY)
             {
                 // only binary data is supported
                 WSManPluginInstance.ReportOperationComplete(
@@ -256,7 +252,7 @@ internal void ReportContext()
                     // TO BE FIXED - As soon as this API is called, WinRM service will send CommandResponse back and Signal is expected anytime
                     // If Signal comes and executes before registering the notification handle, cleanup will be messed
                     result = WSManNativeApi.WSManPluginReportContext(creationRequestDetails.unmanagedHandle, 0, creationRequestDetails.unmanagedHandle);
-                    if (Platform.IsWindows && (WSManPluginConstants.ExitCodeSuccess == result))
+                    if (Platform.IsWindows && (result == WSManPluginConstants.ExitCodeSuccess))
                     {
                         registeredShutdownNotification = 1;
 
@@ -281,7 +277,7 @@ internal void ReportContext()
                 }
             }
 
-            if ((WSManPluginConstants.ExitCodeSuccess != result) || (isRegisterWaitForSingleObjectFailed))
+            if ((result != WSManPluginConstants.ExitCodeSuccess) || (isRegisterWaitForSingleObjectFailed))
             {
                 string errorMessage;
                 if (isRegisterWaitForSingleObjectFailed)
@@ -591,7 +587,7 @@ private void AddToActiveCmdSessions(
                 }
 
                 IntPtr key = newCmdSession.creationRequestDetails.unmanagedHandle;
-                Dbg.Assert(IntPtr.Zero != key, "NULL handles should not be provided");
+                Dbg.Assert(key != IntPtr.Zero, "NULL handles should not be provided");
 
                 if (!_activeCommandSessions.ContainsKey(key))
                 {
diff --git a/src/System.Management.Automation/engine/remoting/fanin/WSManPluginTransportManager.cs b/src/System.Management.Automation/engine/remoting/fanin/WSManPluginTransportManager.cs
index 312c880b59b..9cc10ce435e 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/WSManPluginTransportManager.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/WSManPluginTransportManager.cs
@@ -181,7 +181,7 @@ internal override void ReportExecutionStatusAsRunning()
                 }
             }
 
-            if ((int)WSManPluginErrorCodes.NoError != result)
+            if (result != (int)WSManPluginErrorCodes.NoError)
             {
                 ReportError(result, "WSManPluginReceiveResult");
             }
@@ -247,7 +247,7 @@ protected override void SendDataToClient(
                 }
             }
 
-            if ((int)WSManPluginErrorCodes.NoError != result)
+            if (result != (int)WSManPluginErrorCodes.NoError)
             {
                 ReportError(result, "WSManPluginReceiveResult");
             }
@@ -304,6 +304,7 @@ internal override void RemoveCommandTransportManager(
                 _activeCmdTransportManagers.Remove(cmdId);
             }
         }
+
         #endregion
         internal bool EnableTransportManagerSendDataToClient(
             WSManNativeApi.WSManPluginRequest requestDetails,
diff --git a/src/System.Management.Automation/engine/remoting/fanin/WSManTransportManager.cs b/src/System.Management.Automation/engine/remoting/fanin/WSManTransportManager.cs
index 414020eaa42..20db6a1dd1d 100644
--- a/src/System.Management.Automation/engine/remoting/fanin/WSManTransportManager.cs
+++ b/src/System.Management.Automation/engine/remoting/fanin/WSManTransportManager.cs
@@ -456,6 +456,7 @@ private void ProcessShellData(string data)
             new Dictionary<long, WSManClientSessionTransportManager>();
 
         private static long s_sessionTMSeed;
+
         // generate unique session id
         private static long GetNextSessionTMHandleId()
         {
@@ -1203,7 +1204,7 @@ internal override void CloseAsync()
                 else if (_startMode == WSManTransportManagerUtils.tmStartModes.Create ||
                     _startMode == WSManTransportManagerUtils.tmStartModes.Connect)
                 {
-                    if (IntPtr.Zero == _wsManShellOperationHandle)
+                    if (_wsManShellOperationHandle == IntPtr.Zero)
                     {
                         shouldRaiseCloseCompleted = true;
                     }
@@ -1472,7 +1473,7 @@ private void Initialize(Uri connectionUri, WSManConnectionInfo connectionInfo)
                 proxyAuthCredentials = new WSManNativeApi.WSManUserNameAuthenticationCredentials(userName, password, authMechanism);
             }
 
-            WSManNativeApi.WSManProxyInfo proxyInfo = (ProxyAccessType.None == connectionInfo.ProxyAccessType) ?
+            WSManNativeApi.WSManProxyInfo proxyInfo = (connectionInfo.ProxyAccessType == ProxyAccessType.None) ?
                 null :
                 new WSManNativeApi.WSManProxyInfo(connectionInfo.ProxyAccessType, proxyAuthCredentials);
 
@@ -1695,7 +1696,7 @@ internal void ClearReceiveOrSendResources(int flags, bool shouldClearSend)
                 }
 
                 // For send..clear always
-                if (IntPtr.Zero != _wsManSendOperationHandle)
+                if (_wsManSendOperationHandle != IntPtr.Zero)
                 {
                     WSManNativeApi.WSManCloseOperation(_wsManSendOperationHandle, 0);
                     _wsManSendOperationHandle = IntPtr.Zero;
@@ -1706,7 +1707,7 @@ internal void ClearReceiveOrSendResources(int flags, bool shouldClearSend)
                 // clearing for receive..Clear only when the end of operation is reached.
                 if (flags == (int)WSManNativeApi.WSManCallbackFlags.WSMAN_FLAG_CALLBACK_END_OF_OPERATION)
                 {
-                    if (IntPtr.Zero != _wsManReceiveOperationHandle)
+                    if (_wsManReceiveOperationHandle != IntPtr.Zero)
                     {
                         WSManNativeApi.WSManCloseOperation(_wsManReceiveOperationHandle, 0);
                         _wsManReceiveOperationHandle = IntPtr.Zero;
@@ -1894,7 +1895,7 @@ private static void OnCreateSessionCallback(IntPtr operationContext,
                 }
             }
 
-            if (IntPtr.Zero != error)
+            if (error != IntPtr.Zero)
             {
                 WSManNativeApi.WSManError errorStruct = WSManNativeApi.WSManError.UnMarshal(error);
 
@@ -1924,7 +1925,7 @@ private static void OnCreateSessionCallback(IntPtr operationContext,
             }
 
             // check if the session supports disconnect
-            sessionTM.SupportsDisconnect = ((flags & (int)WSManNativeApi.WSManCallbackFlags.WSMAN_FLAG_CALLBACK_SHELL_SUPPORTS_DISCONNECT) != 0) ? true : false;
+            sessionTM.SupportsDisconnect = (flags & (int)WSManNativeApi.WSManCallbackFlags.WSMAN_FLAG_CALLBACK_SHELL_SUPPORTS_DISCONNECT) != 0;
 
             // openContent is used by redirection ie., while redirecting to
             // a new machine.. this is not needed anymore as the connection
@@ -1995,7 +1996,7 @@ private static void OnCloseSessionCompleted(IntPtr operationContext,
                 sessionTM.RunspacePoolInstanceId.ToString(),
                 "OnCloseSessionCompleted");
 
-            if (IntPtr.Zero != error)
+            if (error != IntPtr.Zero)
             {
                 WSManNativeApi.WSManError errorStruct = WSManNativeApi.WSManError.UnMarshal(error);
 
@@ -2054,7 +2055,7 @@ private static void OnRemoteSessionDisconnectCompleted(IntPtr operationContext,
                 sessionTM._disconnectSessionCompleted = null;
             }
 
-            if (IntPtr.Zero != error)
+            if (error != IntPtr.Zero)
             {
                 WSManNativeApi.WSManError errorStruct = WSManNativeApi.WSManError.UnMarshal(error);
 
@@ -2136,7 +2137,7 @@ private static void OnRemoteSessionReconnectCompleted(IntPtr operationContext,
                 sessionTM._reconnectSessionCompleted = null;
             }
 
-            if (IntPtr.Zero != error)
+            if (error != IntPtr.Zero)
             {
                 WSManNativeApi.WSManError errorStruct = WSManNativeApi.WSManError.UnMarshal(error);
 
@@ -2246,7 +2247,7 @@ private static void OnRemoteSessionConnectCallback(IntPtr operationContext,
                 return;
             }
 
-            if (IntPtr.Zero != error)
+            if (error != IntPtr.Zero)
             {
                 WSManNativeApi.WSManError errorStruct = WSManNativeApi.WSManError.UnMarshal(error);
 
@@ -2353,7 +2354,7 @@ private static void OnRemoteSessionSendCompleted(IntPtr operationContext,
                 return;
             }
 
-            if (IntPtr.Zero != error)
+            if (error != IntPtr.Zero)
             {
                 WSManNativeApi.WSManError errorStruct = WSManNativeApi.WSManError.UnMarshal(error);
 
@@ -2423,7 +2424,7 @@ private static void OnRemoteSessionDataReceived(IntPtr operationContext,
                 return;
             }
 
-            if (IntPtr.Zero != error)
+            if (error != IntPtr.Zero)
             {
                 WSManNativeApi.WSManError errorStruct = WSManNativeApi.WSManError.UnMarshal(error);
 
@@ -2730,7 +2731,7 @@ public void Dispose()
                 _inputStreamSet.Dispose();
                 _outputStreamSet.Dispose();
 
-                if (IntPtr.Zero != _handle)
+                if (_handle != IntPtr.Zero)
                 {
                     int result = 0;
 
@@ -2918,7 +2919,7 @@ internal WSManClientCommandTransportManager(WSManConnectionInfo connectionInfo,
             WSManClientSessionTransportManager sessnTM) :
             base(shell, sessnTM.CryptoHelper, sessnTM)
         {
-            Dbg.Assert(IntPtr.Zero != wsManShellOperationHandle, "Shell operation handle cannot be IntPtr.Zero.");
+            Dbg.Assert(wsManShellOperationHandle != IntPtr.Zero, "Shell operation handle cannot be IntPtr.Zero.");
             Dbg.Assert(connectionInfo != null, "connectionInfo cannot be null");
 
             _wsManShellOperationHandle = wsManShellOperationHandle;
@@ -3160,7 +3161,7 @@ internal override void CloseAsync()
 
                 // There is no valid cmd operation handle..so just
                 // raise close completed.
-                if (IntPtr.Zero == _wsManCmdOperationHandle)
+                if (_wsManCmdOperationHandle == IntPtr.Zero)
                 {
                     shouldRaiseCloseCompleted = true;
                 }
@@ -3286,7 +3287,7 @@ internal void ClearReceiveOrSendResources(int flags, bool shouldClearSend)
                 }
 
                 // For send..clear always
-                if (IntPtr.Zero != _wsManSendOperationHandle)
+                if (_wsManSendOperationHandle != IntPtr.Zero)
                 {
                     WSManNativeApi.WSManCloseOperation(_wsManSendOperationHandle, 0);
                     _wsManSendOperationHandle = IntPtr.Zero;
@@ -3297,7 +3298,7 @@ internal void ClearReceiveOrSendResources(int flags, bool shouldClearSend)
                 // clearing for receive..Clear only when the end of operation is reached.
                 if (flags == (int)WSManNativeApi.WSManCallbackFlags.WSMAN_FLAG_CALLBACK_END_OF_OPERATION)
                 {
-                    if (IntPtr.Zero != _wsManReceiveOperationHandle)
+                    if (_wsManReceiveOperationHandle != IntPtr.Zero)
                     {
                         WSManNativeApi.WSManCloseOperation(_wsManReceiveOperationHandle, 0);
                         _wsManReceiveOperationHandle = IntPtr.Zero;
@@ -3386,7 +3387,7 @@ private static void OnCreateCmdCompleted(IntPtr operationContext,
             // Remove this once WSMan fixes its code.
             cmdTM._wsManCmdOperationHandle = commandOperationHandle;
 
-            if (IntPtr.Zero != error)
+            if (error != IntPtr.Zero)
             {
                 WSManNativeApi.WSManError errorStruct = WSManNativeApi.WSManError.UnMarshal(error);
                 if (errorStruct.errorCode != 0)
@@ -3484,7 +3485,7 @@ private static void OnConnectCmdCompleted(IntPtr operationContext,
 
             cmdTM._wsManCmdOperationHandle = commandOperationHandle;
 
-            if (IntPtr.Zero != error)
+            if (error != IntPtr.Zero)
             {
                 WSManNativeApi.WSManError errorStruct = WSManNativeApi.WSManError.UnMarshal(error);
                 if (errorStruct.errorCode != 0)
@@ -3655,7 +3656,7 @@ private static void OnRemoteCmdSendCompleted(IntPtr operationContext,
                 return;
             }
 
-            if (IntPtr.Zero != error)
+            if (error != IntPtr.Zero)
             {
                 WSManNativeApi.WSManError errorStruct = WSManNativeApi.WSManError.UnMarshal(error);
                 // Ignore Command aborted error. Command aborted is raised by WSMan to
@@ -3732,7 +3733,7 @@ private static void OnRemoteCmdDataReceived(IntPtr operationContext,
                 return;
             }
 
-            if (IntPtr.Zero != error)
+            if (error != IntPtr.Zero)
             {
                 WSManNativeApi.WSManError errorStruct = WSManNativeApi.WSManError.UnMarshal(error);
                 if (errorStruct.errorCode != 0)
@@ -3812,7 +3813,7 @@ private static void OnReconnectCmdCompleted(IntPtr operationContext,
                 return;
             }
 
-            if (IntPtr.Zero != error)
+            if (error != IntPtr.Zero)
             {
                 WSManNativeApi.WSManError errorStruct = WSManNativeApi.WSManError.UnMarshal(error);
                 if (errorStruct.errorCode != 0)
@@ -3885,7 +3886,7 @@ private static void OnRemoteCmdSignalCompleted(IntPtr operationContext,
             }
 
             // release the resources related to signal
-            if (IntPtr.Zero != cmdTM._cmdSignalOperationHandle)
+            if (cmdTM._cmdSignalOperationHandle != IntPtr.Zero)
             {
                 WSManNativeApi.WSManCloseOperation(cmdTM._cmdSignalOperationHandle, 0);
                 cmdTM._cmdSignalOperationHandle = IntPtr.Zero;
@@ -3904,7 +3905,7 @@ private static void OnRemoteCmdSignalCompleted(IntPtr operationContext,
                 return;
             }
 
-            if (IntPtr.Zero != error)
+            if (error != IntPtr.Zero)
             {
                 WSManNativeApi.WSManError errorStruct = WSManNativeApi.WSManError.UnMarshal(error);
                 if (errorStruct.errorCode != 0)
diff --git a/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs b/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs
index 67817c8c6e2..1c2728cc6d6 100644
--- a/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs
+++ b/src/System.Management.Automation/engine/remoting/server/OutOfProcServerMediator.cs
@@ -125,7 +125,7 @@ protected void OnDataPacketReceived(byte[] rawData, string stream, Guid psGuid)
                 streamTemp = System.Management.Automation.Remoting.Client.WSManNativeApi.WSMAN_STREAM_ID_PROMPTRESPONSE;
             }
 
-            if (Guid.Empty == psGuid)
+            if (psGuid == Guid.Empty)
             {
                 lock (_syncObject)
                 {
diff --git a/src/System.Management.Automation/engine/remoting/server/ServerMethodExecutor.cs b/src/System.Management.Automation/engine/remoting/server/ServerMethodExecutor.cs
index d9b4d734900..d98239c3c33 100644
--- a/src/System.Management.Automation/engine/remoting/server/ServerMethodExecutor.cs
+++ b/src/System.Management.Automation/engine/remoting/server/ServerMethodExecutor.cs
@@ -92,7 +92,7 @@ internal void ExecuteVoidMethod(RemoteHostMethodId methodId, object[] parameters
             Dbg.Assert(parameters != null, "Expected parameters != null");
 
             // Use void call ID so that the call is known to not have a return value.
-            long callId = ServerDispatchTable.VoidCallId;
+            const long callId = ServerDispatchTable.VoidCallId;
             RemoteHostCall remoteHostCall = new RemoteHostCall(callId, methodId, parameters);
 
             // Dispatch the call but don't wait for response since the return value is void.
diff --git a/src/System.Management.Automation/engine/remoting/server/ServerRemoteHost.cs b/src/System.Management.Automation/engine/remoting/server/ServerRemoteHost.cs
index 4d9985e0d18..ca7ff805c02 100644
--- a/src/System.Management.Automation/engine/remoting/server/ServerRemoteHost.cs
+++ b/src/System.Management.Automation/engine/remoting/server/ServerRemoteHost.cs
@@ -334,8 +334,8 @@ public override void PushRunspace(Runspace runspace)
 
             // PSEdit support.  Existence of RemoteSessionOpenFileEvent event indicates host supports PSEdit
             _hostSupportsPSEdit = false;
-            PSEventManager localEventManager = (Runspace != null) ? Runspace.Events : null;
-            _hostSupportsPSEdit = (localEventManager != null) ? localEventManager.GetEventSubscribers(HostUtilities.RemoteSessionOpenFileEvent).GetEnumerator().MoveNext() : false;
+            PSEventManager localEventManager = Runspace?.Events;
+            _hostSupportsPSEdit = localEventManager != null && localEventManager.GetEventSubscribers(HostUtilities.RemoteSessionOpenFileEvent).GetEnumerator().MoveNext();
             if (_hostSupportsPSEdit)
             {
                 AddPSEditForRunspace(remoteRunspace);
diff --git a/src/System.Management.Automation/engine/remoting/server/ServerRemotingProtocol2.cs b/src/System.Management.Automation/engine/remoting/server/ServerRemotingProtocol2.cs
index 8d35ba456c1..f87f89b5bac 100644
--- a/src/System.Management.Automation/engine/remoting/server/ServerRemotingProtocol2.cs
+++ b/src/System.Management.Automation/engine/remoting/server/ServerRemotingProtocol2.cs
@@ -417,6 +417,7 @@ private void HandleRemoveAssociation(object sender, EventArgs e)
 
         private readonly Dictionary<Guid, ServerPowerShellDataStructureHandler> _associatedShells
             = new Dictionary<Guid, ServerPowerShellDataStructureHandler>();
+
         // powershell data structure handlers associated with this
         // runspace pool data structure handler
         private readonly object _associationSyncObject = new object();
diff --git a/src/System.Management.Automation/engine/remoting/server/ServerRunspacePoolDriver.cs b/src/System.Management.Automation/engine/remoting/server/ServerRunspacePoolDriver.cs
index bf235088a41..21cb200e561 100644
--- a/src/System.Management.Automation/engine/remoting/server/ServerRunspacePoolDriver.cs
+++ b/src/System.Management.Automation/engine/remoting/server/ServerRunspacePoolDriver.cs
@@ -31,7 +31,9 @@ namespace System.Management.Automation
     internal interface IRSPDriverInvoke
     {
         void EnterNestedPipeline();
+
         void ExitNestedPipeline();
+
         bool HandleStopSignal();
     }
 
@@ -1246,7 +1248,7 @@ private enum PreProcessCommandResult
             /// The PreProcessCommandResult used for managing breakpoints.
             /// </summary>
             BreakpointManagement,
-        };
+        }
 
         private class DebuggerCommandArgument
         {
@@ -1484,9 +1486,7 @@ private static PreProcessCommandResult PreProcessDebuggerCommand(
 
                 Breakpoint breakpoint = serverRemoteDebugger.GetBreakpoint(breakpointId, runspaceId);
                 preProcessOutput.Add(
-                    breakpoint == null
-                        ? false
-                        : serverRemoteDebugger.RemoveBreakpoint(breakpoint, runspaceId));
+                    breakpoint != null && serverRemoteDebugger.RemoveBreakpoint(breakpoint, runspaceId));
 
                 result = PreProcessCommandResult.BreakpointManagement;
             }
@@ -1626,7 +1626,7 @@ public bool IsAvailable
                         pump = null;
                     }
 
-                    return (pump != null) ? !(pump.IsBusy) : false;
+                    return (pump != null) && !(pump.IsBusy);
                 }
             }
 
@@ -2064,7 +2064,7 @@ public override bool IsActive
         public override void SetDebuggerStepMode(bool enabled)
         {
             // Enable both the wrapper and wrapped debuggers for debugging before setting step mode.
-            DebugModes mode = DebugModes.LocalScript | DebugModes.RemoteScript;
+            const DebugModes mode = DebugModes.LocalScript | DebugModes.RemoteScript;
             base.SetDebugMode(mode);
             _wrappedDebugger.Value.SetDebugMode(mode);
 
@@ -2710,7 +2710,7 @@ internal void StartPowerShellCommand(
                 powershell.InvocationStateChanged += HandlePowerShellInvocationStateChanged;
                 powershell.SetIsNested(false);
 
-                string script = @"
+                const string script = @"
                     param ($Debugger, $Commands, $output)
                     trap { throw $_ }
 
diff --git a/src/System.Management.Automation/engine/remoting/server/ServerSteppablePipelineSubscriber.cs b/src/System.Management.Automation/engine/remoting/server/ServerSteppablePipelineSubscriber.cs
index 556d71e2a9b..328571647cb 100644
--- a/src/System.Management.Automation/engine/remoting/server/ServerSteppablePipelineSubscriber.cs
+++ b/src/System.Management.Automation/engine/remoting/server/ServerSteppablePipelineSubscriber.cs
@@ -62,6 +62,7 @@ internal void SubscribeEvents(ServerSteppablePipelineDriver driver)
         #region Events and Handlers
 
         public event EventHandler<EventArgs> StartSteppablePipeline;
+
         public event EventHandler<EventArgs> RunProcessRecord;
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs b/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs
index 9f91e8a255d..7b08c674301 100644
--- a/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs
+++ b/src/System.Management.Automation/engine/remoting/server/serverremotesession.cs
@@ -206,7 +206,7 @@ internal static ServerRemoteSession CreateServerRemoteSession(
                 throw PSTraceSource.NewInvalidOperationException("RemotingErrorIdStrings.NonExistentInitialSessionStateProvider", configurationProviderId);
             }
 
-            string shellPrefix = System.Management.Automation.Remoting.Client.WSManNativeApi.ResourceURIPrefix;
+            const string shellPrefix = System.Management.Automation.Remoting.Client.WSManNativeApi.ResourceURIPrefix;
             int index = configurationProviderId.IndexOf(shellPrefix, StringComparison.OrdinalIgnoreCase);
             senderInfo.ConfigurationName = (index == 0) ? configurationProviderId.Substring(shellPrefix.Length) : string.Empty;
             ServerRemoteSession result = new ServerRemoteSession(
@@ -285,10 +285,10 @@ internal override RemotingDestination MySelf
         /// This parameter contains the remote data received from client.
         /// </param>
         /// <exception cref="ArgumentNullException">
-        /// If the parameter <paramref name="dataEventArg" /> is null.
+        /// If the parameter <paramref name="dataEventArg"/> is null.
         /// </exception>
         /// <exception cref="ArgumentException">
-        /// If the parameter <paramref name="dataEventArg" /> does not contain remote data.
+        /// If the parameter <paramref name="dataEventArg"/> does not contain remote data.
         /// </exception>
         /// <exception cref="PSRemotingDataStructureException">
         /// If the destination of the data is not for server.
@@ -696,7 +696,7 @@ internal void ExecuteConnect(byte[] connectData, out byte[] connectResponseData)
             // as this is executed only when connecting from a new client that does not have any previous fragments context.
             // no problem even if fragment Ids in this response and the sessiontransport stream clash (interfere) and its guaranteed
             // that the fragments in connect response are always complete (enclose a complete object).
-            SerializedDataStream stream = new SerializedDataStream(4 * 1024);//Each message with fragment headers cannot cross 4k
+            SerializedDataStream stream = new SerializedDataStream(4 * 1024); //Each message with fragment headers cannot cross 4k
             stream.Enter();
             capability.Serialize(stream, fragmentor);
             stream.Exit();
diff --git a/src/System.Management.Automation/engine/remoting/server/serverremotesessionstatemachine.cs b/src/System.Management.Automation/engine/remoting/server/serverremotesessionstatemachine.cs
index 8be75b445b4..732e5a836ab 100644
--- a/src/System.Management.Automation/engine/remoting/server/serverremotesessionstatemachine.cs
+++ b/src/System.Management.Automation/engine/remoting/server/serverremotesessionstatemachine.cs
@@ -39,6 +39,7 @@ internal class ServerRemoteSessionDSHandlerStateMachine
 
         private readonly Queue<RemoteSessionStateMachineEventArgs> _processPendingEventsQueue
             = new Queue<RemoteSessionStateMachineEventArgs>();
+
         // whether some thread is actively processing events
         // in a loop. If this is set then other threads
         // should simply add to the queue and not attempt
@@ -1001,7 +1002,7 @@ private void HandleKeyExchangeTimeout(object sender)
         /// It can also be used for graceful shutdown of the server process, which is not currently
         /// implemented.
         /// </summary>
-        private void CleanAll()
+        private static void CleanAll()
         {
         }
 
diff --git a/src/System.Management.Automation/engine/runtime/Binding/Binders.cs b/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
index b8fed047fc0..83dc432ef55 100644
--- a/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
+++ b/src/System.Management.Automation/engine/runtime/Binding/Binders.cs
@@ -1202,7 +1202,7 @@ internal static PSInvokeDynamicMemberBinder Get(CallInfo callInfo, TypeDefinitio
         {
             PSInvokeDynamicMemberBinder result;
 
-            var classScope = classScopeAst != null ? classScopeAst.Type : null;
+            var classScope = classScopeAst?.Type;
             lock (s_binderCache)
             {
                 var key = Tuple.Create(callInfo, constraints, propertySetter, @static, classScope);
@@ -1296,7 +1296,7 @@ internal static PSGetDynamicMemberBinder Get(TypeDefinitionAst classScope, bool
             PSGetDynamicMemberBinder binder;
             lock (s_binderCache)
             {
-                var type = classScope != null ? classScope.Type : null;
+                var type = classScope?.Type;
                 var tuple = Tuple.Create(type, @static);
                 if (!s_binderCache.TryGetValue(tuple, out binder))
                 {
@@ -1406,7 +1406,7 @@ internal static PSSetDynamicMemberBinder Get(TypeDefinitionAst classScope, bool
             PSSetDynamicMemberBinder binder;
             lock (s_binderCache)
             {
-                var type = classScope != null ? classScope.Type : null;
+                var type = classScope?.Type;
                 var tuple = Tuple.Create(type, @static);
                 if (!s_binderCache.TryGetValue(tuple, out binder))
                 {
@@ -2035,36 +2035,39 @@ private static object NullRule(CallSite site, object obj)
 
         internal static bool IsValueTypeMutable(Type type)
         {
-            if (type.IsPrimitive || type.IsEnum)
+            // First, check for enums/primitives and compiler-defined attributes.
+            if (type.IsPrimitive
+                || type.IsEnum
+                || type.IsDefined(typeof(System.Runtime.CompilerServices.IsReadOnlyAttribute), inherit: false))
             {
                 return false;
             }
 
-            // If there are any fields, the type is mutable.
-            if (type.GetFields(BindingFlags.Public | BindingFlags.Instance).Length > 0)
+            // If the builtin attribute is not present, check for a custom attribute from by the compiler. If the
+            // library targets netstandard2.0, the compiler can't be sure the attribute will be provided by the runtime,
+            // and defines its own attribute of the same name during compilation. To account for this, we must check the
+            // type by name, not by reference.
+            foreach (object attribute in type.GetCustomAttributes(inherit: false))
             {
-                return true;
+                if (attribute.GetType().FullName.Equals(
+                    "System.Runtime.CompilerServices.IsReadOnlyAttribute",
+                    StringComparison.Ordinal))
+                {
+                    return false;
+                }
             }
 
-            // If there are any properties with setters, the type is mutable.
-            var properties = type.GetProperties(BindingFlags.Public | BindingFlags.Instance);
-            for (int index = 0; index < properties.Length; index++)
+            // Fallback: check all fields (public + private) to verify whether they're all readonly.
+            // If any field is not readonly, the value type is potentially mutable.
+            foreach (var field in type.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic))
             {
-                var property = properties[index];
-                if (property.CanWrite)
+                if (!field.IsInitOnly)
                 {
                     return true;
                 }
             }
 
-            // If there are any methods other than the property getters, the type might
-            // be mutable, so assume the type is mutable.
-            var methods = type.GetMethods(BindingFlags.Public | BindingFlags.Instance);
-            if (methods.Length != properties.Length)
-            {
-                return true;
-            }
-
+            // If all fields are init-only (read-only), then the value type is immutable.
             return false;
         }
 
@@ -5071,7 +5074,7 @@ internal static void TypeTableMemberPossiblyUpdated(string memberName)
 
         public static PSGetMemberBinder Get(string memberName, TypeDefinitionAst classScope, bool @static)
         {
-            return Get(memberName, classScope != null ? classScope.Type : null, @static, false);
+            return Get(memberName, classScope?.Type, @static, false);
         }
 
         public static PSGetMemberBinder Get(string memberName, Type classScope, bool @static)
@@ -5629,7 +5632,7 @@ internal PSMemberInfo GetPSMemberInfo(DynamicMetaObject target,
             PSMemberInfo memberInfo = null;
             ConsolidatedString typenames = null;
             var context = LocalPipeline.GetExecutionContextFromTLS();
-            var typeTable = context != null ? context.TypeTable : null;
+            var typeTable = context?.TypeTable;
 
             if (hasTypeTableMember)
             {
@@ -5842,7 +5845,7 @@ internal static object GetAdaptedValue(object obj, string member)
                 }
             }
 
-            var adapterSet = PSObject.GetMappedAdapter(obj, context != null ? context.TypeTable : null);
+            var adapterSet = PSObject.GetMappedAdapter(obj, context?.TypeTable);
             if (memberInfo == null)
             {
                 memberInfo = adapterSet.OriginalAdapter.BaseGetMember<PSMemberInfo>(obj, member);
@@ -5881,7 +5884,7 @@ internal static bool IsTypeNameSame(object value, string typeName)
         internal static TypeTable GetTypeTableFromTLS()
         {
             var executionContext = LocalPipeline.GetExecutionContextFromTLS();
-            return executionContext != null ? executionContext.TypeTable : null;
+            return executionContext?.TypeTable;
         }
 
         internal static bool TryGetInstanceMember(object value, string memberName, out PSMemberInfo memberInfo)
@@ -5964,7 +5967,7 @@ private static readonly Dictionary<PSSetMemberBinderKeyType, PSSetMemberBinder>
 
         public static PSSetMemberBinder Get(string memberName, TypeDefinitionAst classScopeAst, bool @static)
         {
-            var classScope = classScopeAst != null ? classScopeAst.Type : null;
+            var classScope = classScopeAst?.Type;
             return Get(memberName, classScope, @static);
         }
 
@@ -5998,7 +6001,7 @@ public override string ToString()
             return string.Format(CultureInfo.InvariantCulture, "SetMember: {0}{1} ver:{2}", _static ? "static " : string.Empty, Name, _getMemberBinder._version);
         }
 
-        private Expression GetTransformedExpression(IEnumerable<ArgumentTransformationAttribute> transformationAttributes, Expression originalExpression)
+        private static Expression GetTransformedExpression(IEnumerable<ArgumentTransformationAttribute> transformationAttributes, Expression originalExpression)
         {
             if (transformationAttributes == null)
             {
@@ -6286,7 +6289,7 @@ public override DynamicMetaObject FallbackSetMember(DynamicMetaObject target, Dy
                             if (value.Value == null)
                             {
                                 expr = Expression.Block(
-                                    Expression.Assign(lhs, this.GetTransformedExpression(argumentTransformationAttributes, Expression.Constant(null, lhsType))),
+                                    Expression.Assign(lhs, GetTransformedExpression(argumentTransformationAttributes, Expression.Constant(null, lhsType))),
                                     ExpressionCache.NullConstant);
                             }
                             else
@@ -6295,7 +6298,7 @@ public override DynamicMetaObject FallbackSetMember(DynamicMetaObject target, Dy
                                 Expression assignmentExpression;
                                 if (transformationNeeded)
                                 {
-                                    var transformedExpr = this.GetTransformedExpression(argumentTransformationAttributes, value.Expression);
+                                    var transformedExpr = GetTransformedExpression(argumentTransformationAttributes, value.Expression);
                                     assignmentExpression = DynamicExpression.Dynamic(PSConvertBinder.Get(nullableUnderlyingType), nullableUnderlyingType, transformedExpr);
                                 }
                                 else
@@ -6317,7 +6320,7 @@ public override DynamicMetaObject FallbackSetMember(DynamicMetaObject target, Dy
                             if (transformationNeeded)
                             {
                                 assignedValue = DynamicExpression.Dynamic(PSConvertBinder.Get(lhsType), lhsType,
-                                   this.GetTransformedExpression(argumentTransformationAttributes, value.Expression));
+                                   GetTransformedExpression(argumentTransformationAttributes, value.Expression));
                             }
                             else
                             {
@@ -6446,7 +6449,7 @@ internal static object SetAdaptedValue(object obj, string member, object value)
                     }
                 }
 
-                var adapterSet = PSObject.GetMappedAdapter(obj, context != null ? context.TypeTable : null);
+                var adapterSet = PSObject.GetMappedAdapter(obj, context?.TypeTable);
                 if (memberInfo == null)
                 {
                     memberInfo = adapterSet.OriginalAdapter.BaseGetMember<PSMemberInfo>(obj, member);
@@ -7401,7 +7404,7 @@ internal static bool IsHeterogeneousArray(object[] args)
         internal static object InvokeAdaptedMember(object obj, string methodName, object[] args)
         {
             var context = LocalPipeline.GetExecutionContextFromTLS();
-            var adapterSet = PSObject.GetMappedAdapter(obj, context != null ? context.TypeTable : null);
+            var adapterSet = PSObject.GetMappedAdapter(obj, context?.TypeTable);
             var methodInfo = adapterSet.OriginalAdapter.BaseGetMember<PSMemberInfo>(obj, methodName) as PSMethodInfo;
             if (methodInfo == null && adapterSet.DotNetAdapter != null)
             {
@@ -7446,7 +7449,7 @@ internal static object InvokeAdaptedMember(object obj, string methodName, object
         internal static object InvokeAdaptedSetMember(object obj, string methodName, object[] args, object valueToSet)
         {
             var context = LocalPipeline.GetExecutionContextFromTLS();
-            var adapterSet = PSObject.GetMappedAdapter(obj, context != null ? context.TypeTable : null);
+            var adapterSet = PSObject.GetMappedAdapter(obj, context?.TypeTable);
             var methodInfo = adapterSet.OriginalAdapter.BaseGetMember<PSParameterizedProperty>(obj, methodName);
             if (methodInfo == null && adapterSet.DotNetAdapter != null)
             {
diff --git a/src/System.Management.Automation/engine/runtime/CompiledScriptBlock.cs b/src/System.Management.Automation/engine/runtime/CompiledScriptBlock.cs
index a706315f52e..97625a9e46a 100644
--- a/src/System.Management.Automation/engine/runtime/CompiledScriptBlock.cs
+++ b/src/System.Management.Automation/engine/runtime/CompiledScriptBlock.cs
@@ -307,18 +307,29 @@ private IParameterMetadataProvider DelayParseScriptText()
         }
 
         internal Type LocalsMutableTupleType { get; set; }
+
         internal Type UnoptimizedLocalsMutableTupleType { get; set; }
+
         internal Func<MutableTuple> LocalsMutableTupleCreator { get; set; }
+
         internal Func<MutableTuple> UnoptimizedLocalsMutableTupleCreator { get; set; }
+
         internal Dictionary<string, int> NameToIndexMap { get; set; }
 
         internal Action<FunctionContext> DynamicParamBlock { get; set; }
+
         internal Action<FunctionContext> UnoptimizedDynamicParamBlock { get; set; }
+
         internal Action<FunctionContext> BeginBlock { get; set; }
+
         internal Action<FunctionContext> UnoptimizedBeginBlock { get; set; }
+
         internal Action<FunctionContext> ProcessBlock { get; set; }
+
         internal Action<FunctionContext> UnoptimizedProcessBlock { get; set; }
+
         internal Action<FunctionContext> EndBlock { get; set; }
+
         internal Action<FunctionContext> UnoptimizedEndBlock { get; set; }
 
         internal IScriptExtent[] SequencePoints { get; set; }
@@ -332,11 +343,15 @@ private IParameterMetadataProvider DelayParseScriptText()
         private bool? _isProductCode;
 
         internal bool DebuggerHidden { get; set; }
+
         internal bool DebuggerStepThrough { get; set; }
+
         internal Guid Id { get; private set; }
 
         internal bool HasLogged { get; set; }
+
         internal bool SkipLogging { get; set; }
+
         internal bool IsFilter { get; }
 
         internal bool IsProductCode
@@ -989,7 +1004,7 @@ internal void InvokeWithPipeImpl(
                 args = Array.Empty<object>();
             }
 
-            bool runOptimized = context._debuggingMode > 0 ? false : createLocalScope;
+            bool runOptimized = context._debuggingMode <= 0 && createLocalScope;
             var codeToInvoke = GetCodeToInvoke(ref runOptimized, clauseToInvoke);
             if (codeToInvoke == null)
             {
@@ -2192,7 +2207,7 @@ public PSScriptCmdlet(ScriptBlock scriptBlock, bool useNewScope, bool fromScript
             _scriptBlock = scriptBlock;
             _useLocalScope = useNewScope;
             _fromScriptFile = fromScriptFile;
-            _runOptimized = _scriptBlock.Compile(optimized: context._debuggingMode > 0 ? false : useNewScope);
+            _runOptimized = _scriptBlock.Compile(optimized: context._debuggingMode <= 0 && useNewScope);
             _localsTuple = _scriptBlock.MakeLocalsTuple(_runOptimized);
             _localsTuple.SetAutomaticVariable(AutomaticVariable.PSCmdlet, this, context);
             _scriptBlock.SetPSScriptRootAndPSCommandPath(_localsTuple, context);
diff --git a/src/System.Management.Automation/engine/runtime/MutableTuple.cs b/src/System.Management.Automation/engine/runtime/MutableTuple.cs
index 4d813166795..e7ee0d615df 100644
--- a/src/System.Management.Automation/engine/runtime/MutableTuple.cs
+++ b/src/System.Management.Automation/engine/runtime/MutableTuple.cs
@@ -149,6 +149,7 @@ public void SetValue(int index, object value)
         }
 
         protected abstract object GetValueImpl(int index);
+
         protected abstract void SetValueImpl(int index, object value);
 
         /// <summary>
diff --git a/src/System.Management.Automation/engine/runtime/Operations/ArrayOps.cs b/src/System.Management.Automation/engine/runtime/Operations/ArrayOps.cs
index f6b71fad1ef..fa4c2c2b565 100644
--- a/src/System.Management.Automation/engine/runtime/Operations/ArrayOps.cs
+++ b/src/System.Management.Automation/engine/runtime/Operations/ArrayOps.cs
@@ -234,7 +234,7 @@ internal static string IndexStringMessage(object index)
             // Convert this index into something printable (we hope)...
             string msgString = PSObject.ToString(null, index, ",", null, null, true, true);
             if (msgString.Length > 20)
-                msgString = string.Concat(msgString.AsSpan().Slice(0, 20), " ...");
+                msgString = string.Concat(msgString.AsSpan(0, 20), " ...");
             return msgString;
         }
 
diff --git a/src/System.Management.Automation/engine/runtime/Operations/ClassOps.cs b/src/System.Management.Automation/engine/runtime/Operations/ClassOps.cs
index 7b06697afa1..5afe23a6362 100644
--- a/src/System.Management.Automation/engine/runtime/Operations/ClassOps.cs
+++ b/src/System.Management.Automation/engine/runtime/Operations/ClassOps.cs
@@ -284,7 +284,7 @@ public static void ValidateSetProperty(Type type, string propertyName, object va
         {
             var validateAttributes = type.GetProperty(propertyName).GetCustomAttributes<ValidateArgumentsAttribute>();
             var executionContext = LocalPipeline.GetExecutionContextFromTLS();
-            var engineIntrinsics = executionContext == null ? null : executionContext.EngineIntrinsics;
+            var engineIntrinsics = executionContext?.EngineIntrinsics;
             foreach (var validateAttribute in validateAttributes)
             {
                 validateAttribute.InternalValidate(value, engineIntrinsics);
diff --git a/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs b/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
index fdc259a684e..df8b36eb40f 100644
--- a/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
+++ b/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs
@@ -407,7 +407,7 @@ private static string GetParameterText(string parameterName)
             else
             {
                 string whitespaces = parameterName.Substring(endPosition);
-                parameterText = string.Concat("-", parameterName.AsSpan().Slice(0, endPosition), ":", whitespaces);
+                parameterText = string.Concat("-", parameterName.AsSpan(0, endPosition), ":", whitespaces);
             }
 
             return parameterText;
@@ -449,7 +449,7 @@ internal static void InvokePipeline(object input,
 
                 for (int i = 0; i < pipeElements.Length; i++)
                 {
-                    commandRedirection = commandRedirections != null ? commandRedirections[i] : null;
+                    commandRedirection = commandRedirections?[i];
                     commandProcessor = AddCommand(pipelineProcessor, pipeElements[i], pipeElementAsts[i],
                                                   commandRedirection, context);
                 }
@@ -1308,7 +1308,7 @@ internal ScriptBlock GetScriptBlock(ExecutionContext context, bool isFilter)
             Diagnostics.Assert(_scriptBlock == null || _scriptBlock.SessionStateInternal == null,
                 "Cached script block should not hold on to session state");
 
-            var result = (_scriptBlock ?? (_scriptBlock = new ScriptBlock(_ast, isFilter))).Clone();
+            var result = (_scriptBlock ??= new ScriptBlock(_ast, isFilter)).Clone();
             result.SessionStateInternal = context.EngineSessionState;
             return result;
         }
diff --git a/src/System.Management.Automation/engine/runtime/ScriptBlockToPowerShell.cs b/src/System.Management.Automation/engine/runtime/ScriptBlockToPowerShell.cs
index 09e21f5c7b4..f5d2f51f698 100644
--- a/src/System.Management.Automation/engine/runtime/ScriptBlockToPowerShell.cs
+++ b/src/System.Management.Automation/engine/runtime/ScriptBlockToPowerShell.cs
@@ -16,6 +16,7 @@ internal class ScriptBlockToPowerShellChecker : AstVisitor
         private readonly HashSet<string> _validVariables = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
         internal ScriptBlockAst ScriptBeingConverted { get; set; }
+
         internal bool UsesParameter { get; private set; }
 
         internal bool HasUsingExpr { get; private set; }
@@ -546,7 +547,6 @@ private void ConvertCommand(CommandAst commandAst, bool isTrustedInput)
                 Diagnostics.Assert(commandAst.Redirections.Count == 1, "only 1 kind of redirection is supported");
                 Diagnostics.Assert(commandAst.Redirections[0] is MergingRedirectionAst, "unexpected redirection type");
 
-                PipelineResultTypes toType = PipelineResultTypes.Output;
                 PipelineResultTypes fromType;
                 switch (commandAst.Redirections[0].FromStream)
                 {
@@ -580,7 +580,7 @@ private void ConvertCommand(CommandAst commandAst, bool isTrustedInput)
                         break;
                 }
 
-                command.MergeMyResults(fromType, toType);
+                command.MergeMyResults(fromType, toResult: PipelineResultTypes.Output);
             }
 
             _powershell.AddCommand(command);
diff --git a/src/System.Management.Automation/engine/serialization.cs b/src/System.Management.Automation/engine/serialization.cs
index 488b73d14fc..a01f67b81e2 100644
--- a/src/System.Management.Automation/engine/serialization.cs
+++ b/src/System.Management.Automation/engine/serialization.cs
@@ -201,7 +201,7 @@ internal Serializer(XmlWriter writer)
         /// <param name="writer">Writer to be used for serialization.</param>
         /// <param name="depth">Depth of serialization.</param>
         /// <param name="useDepthFromTypes">
-        /// if <c>true</c> then types.ps1xml can override depth
+        /// if <see langword="true"/> then types.ps1xml can override depth
         /// for a particular types (using SerializationDepth property)
         /// </param>
         internal Serializer(XmlWriter writer, int depth, bool useDepthFromTypes)
@@ -540,7 +540,7 @@ private void Start()
 
             // If version is not provided, we assume it is the default
             string version = InternalSerializer.DefaultVersion;
-            if (DeserializationOptions.NoRootElement == (_context.options & DeserializationOptions.NoRootElement))
+            if ((_context.options & DeserializationOptions.NoRootElement) == DeserializationOptions.NoRootElement)
             {
                 _done = _reader.EOF;
             }
@@ -571,7 +571,7 @@ internal bool Done()
         {
             if (!_done)
             {
-                if (DeserializationOptions.NoRootElement == (_context.options & DeserializationOptions.NoRootElement))
+                if ((_context.options & DeserializationOptions.NoRootElement) == DeserializationOptions.NoRootElement)
                 {
                     _done = _reader.EOF;
                 }
@@ -661,7 +661,7 @@ internal static void AddDeserializationPrefix(ref string type)
         /// </summary>
         /// <param name="o"></param>
         /// <param name="type"></param>
-        /// <returns><c>true</c> if <paramref name="o"/> is either a live or deserialized instance of class <paramref name="type"/> or one of its subclasses;  <c>false</c> otherwise.</returns>
+        /// <returns><see langword="true"/> if <paramref name="o"/> is either a live or deserialized instance of class <paramref name="type"/> or one of its subclasses;  <see langword="false"/> otherwise.</returns>
         internal static bool IsInstanceOfType(object o, Type type)
         {
             if (type == null)
@@ -682,7 +682,7 @@ internal static bool IsInstanceOfType(object o, Type type)
         /// </summary>
         /// <param name="o"></param>
         /// <param name="type"></param>
-        /// <returns><c>true</c> if <paramref name="o"/> is a deserialized instance of class <paramref name="type"/> or one of its subclasses;  <c>false</c> otherwise.</returns>
+        /// <returns><see langword="true"/> if <paramref name="o"/> is a deserialized instance of class <paramref name="type"/> or one of its subclasses;  <see langword="false"/> otherwise.</returns>
         internal static bool IsDeserializedInstanceOfType(object o, Type type)
         {
             if (type == null)
@@ -791,7 +791,7 @@ internal enum ContainerType
         List,
         Enumerable,
         None
-    };
+    }
 
     /// <summary>
     /// This internal helper class provides methods for serializing mshObject.
@@ -866,7 +866,7 @@ internal TypeTable TypeTable
         /// </summary>
         internal void Start()
         {
-            if (SerializationOptions.NoRootElement != (_context.options & SerializationOptions.NoRootElement))
+            if ((_context.options & SerializationOptions.NoRootElement) != SerializationOptions.NoRootElement)
             {
                 this.WriteStartElement(SerializationStrings.RootElementTag);
                 this.WriteAttribute(SerializationStrings.VersionAttribute, InternalSerializer.DefaultVersion);
@@ -878,7 +878,7 @@ internal void Start()
         /// </summary>
         internal void End()
         {
-            if (SerializationOptions.NoRootElement != (_context.options & SerializationOptions.NoRootElement))
+            if ((_context.options & SerializationOptions.NoRootElement) != SerializationOptions.NoRootElement)
             {
                 _writer.WriteEndElement();
             }
@@ -1893,9 +1893,8 @@ private Collection<CollectionEntry<PSMemberInfo>> ExtendedMembersCollection
         {
             get
             {
-                return _extendedMembersCollection ??
-                       (_extendedMembersCollection =
-                           PSObject.GetMemberCollection(PSMemberViewTypes.Extended, _typeTable));
+                return _extendedMembersCollection ??=
+                    PSObject.GetMemberCollection(PSMemberViewTypes.Extended, _typeTable);
             }
         }
 
@@ -1905,8 +1904,7 @@ private Collection<CollectionEntry<PSPropertyInfo>> AllPropertiesCollection
         {
             get
             {
-                return _allPropertiesCollection ??
-                       (_allPropertiesCollection = PSObject.GetPropertyCollection(PSMemberViewTypes.All, _typeTable));
+                return _allPropertiesCollection ??= PSObject.GetPropertyCollection(PSMemberViewTypes.All, _typeTable);
             }
         }
 
@@ -2750,7 +2748,7 @@ internal static void WriteSecureString(InternalSerializer serializer, string str
         private void WriteStartElement(string elementTag)
         {
             Dbg.Assert(!string.IsNullOrEmpty(elementTag), "Caller should validate the parameter");
-            if (SerializationOptions.NoNamespace == (_context.options & SerializationOptions.NoNamespace))
+            if ((_context.options & SerializationOptions.NoNamespace) == SerializationOptions.NoNamespace)
             {
                 _writer.WriteStartElement(elementTag);
             }
@@ -2828,7 +2826,7 @@ internal static string EncodeString(string s)
 
         /// <summary>
         /// This is the real workhorse that encodes strings.
-        /// See <see cref="EncodeString(string)" /> for more information.
+        /// See <see cref="EncodeString(string)"/> for more information.
         /// </summary>
         /// <param name="s">String to encode.</param>
         /// <param name="indexOfFirstEncodableCharacter">IndexOfFirstEncodableCharacter.</param>
@@ -2908,7 +2906,7 @@ private void WriteEncodedElementString(string name, string value)
 
             value = EncodeString(value);
 
-            if (SerializationOptions.NoNamespace == (_context.options & SerializationOptions.NoNamespace))
+            if ((_context.options & SerializationOptions.NoNamespace) == SerializationOptions.NoNamespace)
             {
                 _writer.WriteElementString(name, value);
             }
@@ -2957,6 +2955,10 @@ private bool UnknownTagsAllowed
             }
         }
 
+        [SuppressMessage(
+            "Performance",
+            "CA1822:Mark members as static",
+            Justification = "Accesses instance members in preprocessor branch.")]
         private bool DuplicateRefIdsAllowed
         {
             get
@@ -3196,7 +3198,7 @@ private void CheckIfStopping()
         internal const string CimHashCodeProperty = "Hash";
         internal const string CimMiXmlProperty = "MiXml";
 
-        private bool RehydrateCimInstanceProperty(
+        private static bool RehydrateCimInstanceProperty(
             CimInstance cimInstance,
             PSPropertyInfo deserializedProperty,
             HashSet<string> namesOfModifiedProperties)
@@ -4418,7 +4420,7 @@ internal static object DeserializeScriptBlock(InternalDeserializer deserializer)
         {
             Dbg.Assert(deserializer != null, "Caller should validate the parameter");
             string scriptBlockBody = deserializer.ReadDecodedElementString(SerializationStrings.ScriptBlockTag);
-            if (DeserializationOptions.DeserializeScriptBlocks == (deserializer._context.options & DeserializationOptions.DeserializeScriptBlocks))
+            if ((deserializer._context.options & DeserializationOptions.DeserializeScriptBlocks) == DeserializationOptions.DeserializeScriptBlocks)
             {
                 return ScriptBlock.Create(scriptBlockBody);
             }
@@ -4652,7 +4654,7 @@ internal static object DeserializeProgressRecord(InternalDeserializer deserializ
                 activityId = int.Parse(deserializer.ReadDecodedElementString(SerializationStrings.ProgressRecordActivityId), CultureInfo.InvariantCulture);
 
                 object tmp = deserializer.ReadOneObject();
-                currentOperation = (tmp == null) ? null : tmp.ToString();
+                currentOperation = tmp?.ToString();
 
                 parentActivityId = int.Parse(deserializer.ReadDecodedElementString(SerializationStrings.ProgressRecordParentActivityId), CultureInfo.InvariantCulture);
                 percentComplete = int.Parse(deserializer.ReadDecodedElementString(SerializationStrings.ProgressRecordPercentComplete), CultureInfo.InvariantCulture);
@@ -4768,7 +4770,7 @@ private void ReadStartElement(string element)
         {
             Dbg.Assert(!string.IsNullOrEmpty(element), "Caller should validate the parameter");
 
-            if (DeserializationOptions.NoNamespace == (_context.options & DeserializationOptions.NoNamespace))
+            if ((_context.options & DeserializationOptions.NoNamespace) == DeserializationOptions.NoNamespace)
             {
                 _reader.ReadStartElement(element);
             }
@@ -4792,7 +4794,7 @@ private string ReadDecodedElementString(string element)
             this.CheckIfStopping();
 
             string temp = null;
-            if (DeserializationOptions.NoNamespace == (_context.options & DeserializationOptions.NoNamespace))
+            if ((_context.options & DeserializationOptions.NoNamespace) == DeserializationOptions.NoNamespace)
             {
                 temp = _reader.ReadElementContentAsString(element, string.Empty);
             }
@@ -4969,7 +4971,7 @@ internal string SetRefId(T t)
         }
 
         /// <summary>
-        /// Gets a RefId already assigned for the given object or <c>null</c> if there is no associated ref id.
+        /// Gets a RefId already assigned for the given object or <see langword="null"/> if there is no associated ref id.
         /// </summary>
         /// <param name="t"></param>
         /// <returns></returns>
@@ -5930,7 +5932,7 @@ private PSPrimitiveDictionary(System.Runtime.Serialization.SerializationInfo inf
 
         #region Plumbing to make Hashtable reject all non-primitive types
 
-        private string VerifyKey(object key)
+        private static string VerifyKey(object key)
         {
             key = PSObject.Base(key);
             string keyAsString = key as string;
@@ -6030,7 +6032,7 @@ private void VerifyValue(object value)
         /// </exception>
         public override void Add(object key, object value)
         {
-            string keyAsString = this.VerifyKey(key);
+            string keyAsString = VerifyKey(key);
             this.VerifyValue(value);
             base.Add(keyAsString, value);
         }
@@ -6041,7 +6043,7 @@ public override void Add(object key, object value)
         /// <param name="key">The key whose value to get or set.</param>
         /// <returns>The value associated with the specified key.</returns>
         /// <remarks>
-        /// If the specified key is not found, attempting to get it returns <c>null</c>
+        /// If the specified key is not found, attempting to get it returns <see langword="null"/>
         /// and attempting to set it creates a new element using the specified key.
         /// </remarks>
         /// <exception cref="ArgumentException">
@@ -6058,7 +6060,7 @@ public override object this[object key]
 
             set
             {
-                string keyAsString = this.VerifyKey(key);
+                string keyAsString = VerifyKey(key);
                 this.VerifyValue(value);
                 base[keyAsString] = value;
             }
@@ -6070,7 +6072,7 @@ public override object this[object key]
         /// <param name="key">The key whose value to get or set.</param>
         /// <returns>The value associated with the specified key.</returns>
         /// <remarks>
-        /// If the specified key is not found, attempting to get it returns <c>null</c>
+        /// If the specified key is not found, attempting to get it returns <see langword="null"/>
         /// and attempting to set it creates a new element using the specified key.
         /// </remarks>
         /// <exception cref="ArgumentException">
@@ -6532,7 +6534,7 @@ internal static PSPrimitiveDictionary CloneAndAddPSVersionTable(PSPrimitiveDicti
         /// <param name="data">The root dictionary.</param>
         /// <param name="result"></param>
         /// <param name="keys">A chain of keys leading from the root dictionary (<paramref name="data"/>) to the value.</param>
-        /// <returns><c>true</c> if the value was found and was of the correct type; <c>false</c> otherwise.</returns>
+        /// <returns><see langword="true"/> if the value was found and was of the correct type; <see langword="false"/> otherwise.</returns>
         internal static bool TryPathGet<T>(IDictionary data, out T result, params string[] keys)
         {
             Dbg.Assert(keys != null, "Caller should verify that keys != null");
@@ -6850,14 +6852,14 @@ internal static T GetPropertyValue<T>(PSObject pso, string propertyName, Rehydra
             Dbg.Assert(!string.IsNullOrEmpty(propertyName), "Caller should verify propertyName != null");
 
             PSPropertyInfo property = pso.Properties[propertyName];
-            if ((property == null) && (RehydrationFlags.MissingPropertyOk == (flags & RehydrationFlags.MissingPropertyOk)))
+            if ((property == null) && ((flags & RehydrationFlags.MissingPropertyOk) == RehydrationFlags.MissingPropertyOk))
             {
                 return default(T);
             }
             else
             {
                 object propertyValue = property.Value;
-                if ((propertyValue == null) && (RehydrationFlags.NullValueOk == (flags & RehydrationFlags.NullValueOk)))
+                if ((propertyValue == null) && ((flags & RehydrationFlags.NullValueOk) == RehydrationFlags.NullValueOk))
                 {
                     return default(T);
                 }
@@ -6875,7 +6877,7 @@ private static ListType RehydrateList<ListType, ItemType>(PSObject pso, string p
             ArrayList deserializedList = GetPropertyValue<ArrayList>(pso, propertyName, flags);
             if (deserializedList == null)
             {
-                if (RehydrationFlags.NullValueMeansEmptyList == (flags & RehydrationFlags.NullValueMeansEmptyList))
+                if ((flags & RehydrationFlags.NullValueMeansEmptyList) == RehydrationFlags.NullValueMeansEmptyList)
                 {
                     return new ListType();
                 }
diff --git a/src/System.Management.Automation/help/CabinetNativeApi.cs b/src/System.Management.Automation/help/CabinetNativeApi.cs
index 267317b11d0..76e8fe853a4 100644
--- a/src/System.Management.Automation/help/CabinetNativeApi.cs
+++ b/src/System.Management.Automation/help/CabinetNativeApi.cs
@@ -84,7 +84,7 @@ protected override void Dispose(bool disposing)
         }
 
         /// <summary>
-        /// Finalizer to ensure destruction of unmanaged resources.
+        /// Finalizes an instance of the <see cref="CabinetExtractor"/> class.
         /// </summary>
         ~CabinetExtractor()
         {
@@ -164,7 +164,7 @@ private void CleanUpDelegates()
                 _fdiNotifyHandle.Free();
             }
         }
-    };
+    }
 
     // CabinetExtractor loader implementation
     internal class CabinetExtractorLoader : ICabinetExtractorLoader
@@ -188,7 +188,7 @@ internal override ICabinetExtractor GetCabinetExtractor()
         {
             return s_extractorInstance;
         }
-    };
+    }
 
     internal static class CabinetNativeApi
     {
@@ -458,11 +458,11 @@ internal static FileMode ConvertOpflagToFileMode(int oflag)
         {
             // Note: This is not done in a switch because the order of tests matters.
 
-            if ((int)(OpFlags.Create | OpFlags.Excl) == (oflag & (int)(OpFlags.Create | OpFlags.Excl)))
+            if ((oflag & (int)(OpFlags.Create | OpFlags.Excl)) == (int)(OpFlags.Create | OpFlags.Excl))
             {
                 return FileMode.CreateNew;
             }
-            else if ((int)(OpFlags.Create | OpFlags.Truncate) == (oflag & (int)(OpFlags.Create | OpFlags.Truncate)))
+            else if ((oflag & (int)(OpFlags.Create | OpFlags.Truncate)) == (int)(OpFlags.Create | OpFlags.Truncate))
             {
                 return FileMode.OpenOrCreate;
             }
@@ -497,7 +497,7 @@ internal static FileAccess ConvertPermissionModeToFileAccess(int pmode)
         {
             // Note: This is not done in a switch because the order of tests matters.
 
-            if ((int)(PermissionMode.Read | PermissionMode.Write) == (pmode & (int)(PermissionMode.Read | PermissionMode.Write)))
+            if ((pmode & (int)(PermissionMode.Read | PermissionMode.Write)) == (int)(PermissionMode.Read | PermissionMode.Write))
             {
                 return FileAccess.ReadWrite;
             }
@@ -524,7 +524,7 @@ internal static FileShare ConvertPermissionModeToFileShare(int pmode)
         {
             // Note: This is not done in a switch because the order of tests matters.
 
-            if ((int)(PermissionMode.Read | PermissionMode.Write) == (pmode & (int)(PermissionMode.Read | PermissionMode.Write)))
+            if ((pmode & (int)(PermissionMode.Read | PermissionMode.Write)) == (int)(PermissionMode.Read | PermissionMode.Write))
             {
                 return FileShare.ReadWrite;
             }
@@ -589,7 +589,7 @@ internal class FdiNotification
             internal short iCabinet; // USHORT
             internal short iFolder; // USHORT
             internal int fdie; // FDIERROR
-        };
+        }
 
         internal enum FdiNotificationType : int
         {
@@ -607,7 +607,7 @@ internal class FdiERF
             internal int erfOper;
             internal int erfType;
             internal bool fError;
-        };
+        }
 
         internal sealed class FdiContextHandle : SafeHandleZeroOrMinusOneIsInvalid
         {
diff --git a/src/System.Management.Automation/help/CommandHelpProvider.cs b/src/System.Management.Automation/help/CommandHelpProvider.cs
index e6eafa8704f..05a4e48af70 100644
--- a/src/System.Management.Automation/help/CommandHelpProvider.cs
+++ b/src/System.Management.Automation/help/CommandHelpProvider.cs
@@ -84,7 +84,7 @@ internal override HelpCategory HelpCategory
 
         #region Help Provider Interface
 
-        private void GetModulePaths(CommandInfo commandInfo, out string moduleName, out string moduleDir, out string nestedModulePath)
+        private static void GetModulePaths(CommandInfo commandInfo, out string moduleName, out string moduleDir, out string nestedModulePath)
         {
             Dbg.Assert(commandInfo != null, "Caller should verify that commandInfo != null");
 
@@ -132,7 +132,7 @@ private void GetModulePaths(CommandInfo commandInfo, out string moduleName, out
             }
         }
 
-        private string GetHelpName(CommandInfo commandInfo)
+        private static string GetHelpName(CommandInfo commandInfo)
         {
             Dbg.Assert(commandInfo != null, "Caller should verify that commandInfo != null");
 
@@ -1250,7 +1250,7 @@ private static bool Match(string target, ICollection<string> patterns)
         /// <returns>The result helpInfo objects after processing.</returns>
         internal override IEnumerable<HelpInfo> ProcessForwardedHelp(HelpInfo helpInfo, HelpRequest helpRequest)
         {
-            HelpCategory categoriesHandled = (HelpCategory.Alias
+            const HelpCategory categoriesHandled = (HelpCategory.Alias
                 | HelpCategory.ExternalScript | HelpCategory.Filter | HelpCategory.Function | HelpCategory.ScriptCommand);
 
             if ((helpInfo.HelpCategory & categoriesHandled) != 0)
diff --git a/src/System.Management.Automation/help/HelpCommands.cs b/src/System.Management.Automation/help/HelpCommands.cs
index e67caa40db8..edf8d9e4355 100644
--- a/src/System.Management.Automation/help/HelpCommands.cs
+++ b/src/System.Management.Automation/help/HelpCommands.cs
@@ -516,7 +516,7 @@ private void ValidateAndThrowIfError(HelpCategory cat)
             }
 
             // categories that support -Parameter, -Role, -Functionality, -Component parameters
-            HelpCategory supportedCategories =
+            const HelpCategory supportedCategories =
                 HelpCategory.Alias | HelpCategory.Cmdlet | HelpCategory.ExternalScript |
                 HelpCategory.Filter | HelpCategory.Function | HelpCategory.ScriptCommand;
 
diff --git a/src/System.Management.Automation/help/HelpCommentsParser.cs b/src/System.Management.Automation/help/HelpCommentsParser.cs
index beda31bfd8e..21ac7b9e79d 100644
--- a/src/System.Management.Automation/help/HelpCommentsParser.cs
+++ b/src/System.Management.Automation/help/HelpCommentsParser.cs
@@ -496,7 +496,7 @@ private void BuildSyntaxForParameterSet(XmlElement command, XmlElement syntax, M
 
         private static void GetExampleSections(string content, out string prompt_str, out string code_str, out string remarks_str)
         {
-            string default_prompt_str = "PS > ";
+            const string default_prompt_str = "PS > ";
 
             var promptMatch = Regex.Match(content, "^.*?>");
             prompt_str = promptMatch.Success ? promptMatch.Value : default_prompt_str;
diff --git a/src/System.Management.Automation/help/HelpFileHelpProvider.cs b/src/System.Management.Automation/help/HelpFileHelpProvider.cs
index 36ffeb58675..8900a7167b3 100644
--- a/src/System.Management.Automation/help/HelpFileHelpProvider.cs
+++ b/src/System.Management.Automation/help/HelpFileHelpProvider.cs
@@ -268,7 +268,7 @@ internal override IEnumerable<HelpInfo> SearchHelp(HelpRequest helpRequest, bool
             }
         }
 
-        private void GetModuleNameAndVersion(string psmodulePathRoot, string filePath, out string moduleName, out Version moduleVersion)
+        private static void GetModuleNameAndVersion(string psmodulePathRoot, string filePath, out string moduleName, out Version moduleVersion)
         {
             moduleVersion = null;
             moduleName = null;
diff --git a/src/System.Management.Automation/help/HelpSystem.cs b/src/System.Management.Automation/help/HelpSystem.cs
index bb7c1d0de9b..a7c86bd5ebd 100644
--- a/src/System.Management.Automation/help/HelpSystem.cs
+++ b/src/System.Management.Automation/help/HelpSystem.cs
@@ -803,7 +803,9 @@ internal void ClearScriptBlockTokenCache()
     internal class HelpProgressEventArgs : EventArgs
     {
         internal bool Completed { get; set; }
+
         internal string Activity { get; set; }
+
         internal int PercentComplete { get; set; }
     }
 
diff --git a/src/System.Management.Automation/help/MUIFileSearcher.cs b/src/System.Management.Automation/help/MUIFileSearcher.cs
index 301369959aa..bf6244fe3eb 100644
--- a/src/System.Management.Automation/help/MUIFileSearcher.cs
+++ b/src/System.Management.Automation/help/MUIFileSearcher.cs
@@ -113,7 +113,7 @@ private void SearchForFiles()
             }
         }
 
-        private string[] GetFiles(string path, string pattern)
+        private static string[] GetFiles(string path, string pattern)
         {
 #if UNIX
             // On Linux, file names are case sensitive, so we need to add
diff --git a/src/System.Management.Automation/help/MamlNode.cs b/src/System.Management.Automation/help/MamlNode.cs
index 4392dffd0ca..fe4e803a294 100644
--- a/src/System.Management.Automation/help/MamlNode.cs
+++ b/src/System.Management.Automation/help/MamlNode.cs
@@ -646,7 +646,7 @@ private PSObject[] GetMamlFormattingPSObjects(XmlNode xmlNode)
         /// </summary>
         /// <param name="nodes"></param>
         /// <returns></returns>
-        private int GetParaMamlNodeCount(XmlNodeList nodes)
+        private static int GetParaMamlNodeCount(XmlNodeList nodes)
         {
             int i = 0;
 
diff --git a/src/System.Management.Automation/help/PSClassHelpProvider.cs b/src/System.Management.Automation/help/PSClassHelpProvider.cs
index ee65529a026..e4c74c6398a 100644
--- a/src/System.Management.Automation/help/PSClassHelpProvider.cs
+++ b/src/System.Management.Automation/help/PSClassHelpProvider.cs
@@ -80,11 +80,9 @@ internal override IEnumerable<HelpInfo> SearchHelp(HelpRequest helpRequest, bool
             else
                 patternList.Add(target);
 
-            bool useWildCards = true;
-
             foreach (string pattern in patternList)
             {
-                PSClassSearcher searcher = new PSClassSearcher(pattern, useWildCards, _context);
+                PSClassSearcher searcher = new PSClassSearcher(pattern, useWildCards: true, _context);
 
                 foreach (var helpInfo in GetHelpInfo(searcher))
                 {
@@ -108,10 +106,7 @@ internal override IEnumerable<HelpInfo> ExactMatchHelp(HelpRequest helpRequest)
                 yield return null;
             }
 
-            string target = helpRequest.Target;
-            bool useWildCards = false;
-
-            PSClassSearcher searcher = new PSClassSearcher(target, useWildCards, _context);
+            PSClassSearcher searcher = new PSClassSearcher(helpRequest.Target, useWildCards: false, _context);
 
             foreach (var helpInfo in GetHelpInfo(searcher))
             {
diff --git a/src/System.Management.Automation/help/SaveHelpCommand.cs b/src/System.Management.Automation/help/SaveHelpCommand.cs
index 3c4d18af00a..7059550730b 100644
--- a/src/System.Management.Automation/help/SaveHelpCommand.cs
+++ b/src/System.Management.Automation/help/SaveHelpCommand.cs
@@ -484,7 +484,7 @@ public override object Transform(EngineIntrinsics engineIntrinsics, object input
             return inputData;
         }
 
-        private bool TryConvertFromDeserializedModuleInfo(object inputData, out PSModuleInfo moduleInfo)
+        private static bool TryConvertFromDeserializedModuleInfo(object inputData, out PSModuleInfo moduleInfo)
         {
             moduleInfo = null;
             PSObject pso = inputData as PSObject;
diff --git a/src/System.Management.Automation/help/UpdatableHelpCommandBase.cs b/src/System.Management.Automation/help/UpdatableHelpCommandBase.cs
index 9697ffb2f25..6bd8b6e84b4 100644
--- a/src/System.Management.Automation/help/UpdatableHelpCommandBase.cs
+++ b/src/System.Management.Automation/help/UpdatableHelpCommandBase.cs
@@ -299,9 +299,9 @@ private Dictionary<Tuple<string, Version>, UpdatableHelpModuleInfo> GetModuleInf
                 }
             }
 
-            // Match wildcards
-            WildcardOptions wildcardOptions = WildcardOptions.IgnoreCase | WildcardOptions.CultureInvariant;
-            IEnumerable<WildcardPattern> patternList = SessionStateUtilities.CreateWildcardsFromStrings(new string[1] { moduleNamePattern }, wildcardOptions);
+            IEnumerable<WildcardPattern> patternList = SessionStateUtilities.CreateWildcardsFromStrings(
+                globPatterns: new[] { moduleNamePattern },
+                options: WildcardOptions.IgnoreCase | WildcardOptions.CultureInvariant);
 
             foreach (KeyValuePair<string, string> name in s_metadataCache)
             {
@@ -784,7 +784,7 @@ private IEnumerable<string> RecursiveResolvePathHelper(string path)
             {
                 yield return path;
 
-                foreach (string subDirectory in Directory.GetDirectories(path))
+                foreach (string subDirectory in Directory.EnumerateDirectories(path))
                 {
                     foreach (string subDirectory2 in RecursiveResolvePathHelper(subDirectory))
                     {
diff --git a/src/System.Management.Automation/help/UpdatableHelpSystem.cs b/src/System.Management.Automation/help/UpdatableHelpSystem.cs
index add71bd55b5..d302f7b9cae 100644
--- a/src/System.Management.Automation/help/UpdatableHelpSystem.cs
+++ b/src/System.Management.Automation/help/UpdatableHelpSystem.cs
@@ -513,6 +513,9 @@ private string ResolveUri(string baseUri, bool verbose)
 
         private const string HelpInfoXmlNamespace = "http://schemas.microsoft.com/powershell/help/2010/05";
         private const string HelpInfoXmlValidationFailure = "HelpInfoXmlValidationFailure";
+        private const string MamlXmlNamespace = "http://schemas.microsoft.com/maml/2004/10";
+        private const string CommandXmlNamespace = "http://schemas.microsoft.com/maml/dev/command/2004/10";
+        private const string DscResourceXmlNamespace = "http://schemas.microsoft.com/maml/dev/dscResource/2004/10";
 
         /// <summary>
         /// Creates a HelpInfo object.
@@ -586,8 +589,9 @@ internal UpdatableHelpInfo CreateHelpInfo(string xml, string moduleName, Guid mo
 
             if (!string.IsNullOrEmpty(currentCulture))
             {
-                WildcardOptions wildcardOptions = WildcardOptions.IgnoreCase | WildcardOptions.CultureInvariant;
-                IEnumerable<WildcardPattern> patternList = SessionStateUtilities.CreateWildcardsFromStrings(new string[1] { currentCulture }, wildcardOptions);
+                IEnumerable<WildcardPattern> patternList = SessionStateUtilities.CreateWildcardsFromStrings(
+                    globPatterns: new[] { currentCulture },
+                    options: WildcardOptions.IgnoreCase | WildcardOptions.CultureInvariant);
 
                 for (int i = 0; i < updatableHelpItem.Length; i++)
                 {
@@ -617,7 +621,7 @@ internal UpdatableHelpInfo CreateHelpInfo(string xml, string moduleName, Guid mo
         /// <param name="schema">Xml schema.</param>
         /// <param name="handler">Validation event handler.</param>
         /// <param name="helpInfo">HelpInfo or HelpContent?</param>
-        private XmlDocument CreateValidXmlDocument(string xml, string ns, string schema, ValidationEventHandler handler,
+        private static XmlDocument CreateValidXmlDocument(string xml, string ns, string schema, ValidationEventHandler handler,
             bool helpInfo)
         {
             XmlReaderSettings settings = new XmlReaderSettings();
@@ -994,7 +998,7 @@ internal void GenerateHelpInfo(string moduleName, Guid moduleGuid, string conten
         /// Removes the read only attribute.
         /// </summary>
         /// <param name="path"></param>
-        private void RemoveReadOnly(string path)
+        private static void RemoveReadOnly(string path)
         {
             if (File.Exists(path))
             {
@@ -1089,7 +1093,7 @@ internal void InstallHelpContent(UpdatableHelpCommandType commandType, Execution
         }
 
 #if UNIX
-        private bool ExpandArchive(string source, string destination)
+        private static bool ExpandArchive(string source, string destination)
         {
             bool sucessfulDecompression = false;
 
@@ -1121,7 +1125,7 @@ private bool ExpandArchive(string source, string destination)
         /// <param name="srcPath">Source path.</param>
         /// <param name="destPath">Destination path.</param>
         /// <param name="needToCopy">Is set to false if we find a single file placeholder.txt in cab. This means we no longer need to install help files.</param>
-        private void UnzipHelpContent(ExecutionContext context, string srcPath, string destPath, out bool needToCopy)
+        private static void UnzipHelpContent(ExecutionContext context, string srcPath, string destPath, out bool needToCopy)
         {
             needToCopy = true;
 
@@ -1305,8 +1309,6 @@ private void ValidateAndCopyHelpContent(string sourcePath, Collection<string> de
 
                         Debug.Assert(helpItemsNode != null, "helpItemsNode must not be null");
 
-                        string targetNamespace = "http://schemas.microsoft.com/maml/2004/10";
-
                         foreach (XmlNode node in helpItemsNode.ChildNodes)
                         {
                             if (node.NodeType == XmlNodeType.Element)
@@ -1315,11 +1317,11 @@ private void ValidateAndCopyHelpContent(string sourcePath, Collection<string> de
                                 {
                                     if (node.LocalName.Equals("para", StringComparison.OrdinalIgnoreCase))
                                     {
-                                        if (!node.NamespaceURI.Equals("http://schemas.microsoft.com/maml/2004/10", StringComparison.OrdinalIgnoreCase))
+                                        if (!node.NamespaceURI.Equals(MamlXmlNamespace, StringComparison.OrdinalIgnoreCase))
                                         {
                                             throw new UpdatableHelpSystemException("HelpContentXmlValidationFailure",
                                                 StringUtil.Format(HelpDisplayStrings.HelpContentXmlValidationFailure,
-                                                StringUtil.Format(HelpDisplayStrings.HelpContentMustBeInTargetNamespace, targetNamespace)), ErrorCategory.InvalidData, null, null);
+                                                StringUtil.Format(HelpDisplayStrings.HelpContentMustBeInTargetNamespace, MamlXmlNamespace)), ErrorCategory.InvalidData, null, null);
                                         }
                                         else
                                         {
@@ -1327,16 +1329,16 @@ private void ValidateAndCopyHelpContent(string sourcePath, Collection<string> de
                                         }
                                     }
 
-                                    if (!node.NamespaceURI.Equals("http://schemas.microsoft.com/maml/dev/command/2004/10", StringComparison.OrdinalIgnoreCase) &&
-                                        !node.NamespaceURI.Equals("http://schemas.microsoft.com/maml/dev/dscResource/2004/10", StringComparison.OrdinalIgnoreCase))
+                                    if (!node.NamespaceURI.Equals(CommandXmlNamespace, StringComparison.OrdinalIgnoreCase) &&
+                                        !node.NamespaceURI.Equals(DscResourceXmlNamespace, StringComparison.OrdinalIgnoreCase))
                                     {
                                         throw new UpdatableHelpSystemException("HelpContentXmlValidationFailure",
                                             StringUtil.Format(HelpDisplayStrings.HelpContentXmlValidationFailure,
-                                            StringUtil.Format(HelpDisplayStrings.HelpContentMustBeInTargetNamespace, targetNamespace)), ErrorCategory.InvalidData, null, null);
+                                            StringUtil.Format(HelpDisplayStrings.HelpContentMustBeInTargetNamespace, MamlXmlNamespace)), ErrorCategory.InvalidData, null, null);
                                     }
                                 }
 
-                                CreateValidXmlDocument(node.OuterXml, targetNamespace, xsd,
+                                CreateValidXmlDocument(node.OuterXml, MamlXmlNamespace, xsd,
                                     new ValidationEventHandler(HelpContentValidationHandler),
                                     false);
                             }
diff --git a/src/System.Management.Automation/help/UpdateHelpCommand.cs b/src/System.Management.Automation/help/UpdateHelpCommand.cs
index bccd7418476..01b17cbad7e 100644
--- a/src/System.Management.Automation/help/UpdateHelpCommand.cs
+++ b/src/System.Management.Automation/help/UpdateHelpCommand.cs
@@ -348,7 +348,7 @@ internal override bool ProcessModuleWithCulture(UpdatableHelpModuleInfo module,
 
             foreach (UpdatableHelpUri contentUri in newHelpInfo.HelpContentUriCollection)
             {
-                Version currentHelpVersion = (currentHelpInfo != null) ? currentHelpInfo.GetCultureVersion(contentUri.Culture) : null;
+                Version currentHelpVersion = currentHelpInfo?.GetCultureVersion(contentUri.Culture);
                 string updateHelpShouldProcessAction = string.Format(CultureInfo.InvariantCulture,
                     HelpDisplayStrings.UpdateHelpShouldProcessActionMessage,
                     module.ModuleName,
@@ -488,7 +488,7 @@ internal override bool ProcessModuleWithCulture(UpdatableHelpModuleInfo module,
         /// </summary>
         /// <param name="path"></param>
         /// <param name="e"></param>
-        private void ThrowPathMustBeValidContainersException(string path, Exception e)
+        private static void ThrowPathMustBeValidContainersException(string path, Exception e)
         {
             throw new UpdatableHelpSystemException("PathMustBeValidContainers",
                 StringUtil.Format(HelpDisplayStrings.PathMustBeValidContainers, path), ErrorCategory.InvalidArgument,
diff --git a/src/System.Management.Automation/logging/MshLog.cs b/src/System.Management.Automation/logging/MshLog.cs
index 23c687b58ee..02a8990bc69 100644
--- a/src/System.Management.Automation/logging/MshLog.cs
+++ b/src/System.Management.Automation/logging/MshLog.cs
@@ -469,7 +469,8 @@ internal static void LogCommandLifecycleEvent(ExecutionContext executionContext,
                 if (NeedToLogCommandLifecycleEvent(provider, executionContext))
                 {
                     provider.LogCommandLifecycleEvent(
-                        () => logContext ?? (logContext = GetLogContext(executionContext, invocationInfo)), commandState);
+                        () => logContext ??= GetLogContext(executionContext, invocationInfo),
+                        commandState);
                 }
             }
         }
@@ -1085,7 +1086,7 @@ internal enum Severity
         /// Informational.
         /// </summary>
         Informational
-    };
+    }
 
     /// <summary>
     /// Enum for command states.
@@ -1103,7 +1104,7 @@ internal enum CommandState
         /// <summary>
         /// </summary>
         Terminated = 2
-    };
+    }
 
     /// <summary>
     /// Enum for provider states.
@@ -1117,7 +1118,7 @@ internal enum ProviderState
         /// <summary>
         /// </summary>
         Stopped = 1,
-    };
+    }
 
     #endregion
 }
diff --git a/src/System.Management.Automation/namespaces/ContainerProviderBase.cs b/src/System.Management.Automation/namespaces/ContainerProviderBase.cs
index bd3e9957311..cc3e0ac83e2 100644
--- a/src/System.Management.Automation/namespaces/ContainerProviderBase.cs
+++ b/src/System.Management.Automation/namespaces/ContainerProviderBase.cs
@@ -999,7 +999,7 @@ protected virtual bool HasChildItems(string path)
         }
 
         /// <summary>
-        /// Copies an item at the specified path to an item at the <paramref name="copyPath" />.
+        /// Copies an item at the specified path to an item at the <paramref name="copyPath"/>.
         /// </summary>
         /// <param name="path">
         /// The path of the item to copy.
diff --git a/src/System.Management.Automation/namespaces/CoreCommandContext.cs b/src/System.Management.Automation/namespaces/CoreCommandContext.cs
index 1422e256a47..5446b6b71cb 100644
--- a/src/System.Management.Automation/namespaces/CoreCommandContext.cs
+++ b/src/System.Management.Automation/namespaces/CoreCommandContext.cs
@@ -331,13 +331,13 @@ internal CmdletProviderContext(
 
         /// <summary>
         /// A collection in which objects that are written using the WriteObject(s)
-        /// methods are accumulated if <see cref="PassThru" /> is false.
+        /// methods are accumulated if <see cref="PassThru"/> is false.
         /// </summary>
         private Collection<PSObject> _accumulatedObjects = new Collection<PSObject>();
 
         /// <summary>
         /// A collection in which objects that are written using the WriteError
-        /// method are accumulated if <see cref="PassThru" /> is false.
+        /// method are accumulated if <see cref="PassThru"/> is false.
         /// </summary>
         private Collection<ErrorRecord> _accumulatedErrorObjects = new Collection<ErrorRecord>();
 
diff --git a/src/System.Management.Automation/namespaces/FileSystemContentStream.cs b/src/System.Management.Automation/namespaces/FileSystemContentStream.cs
index 51349970709..3c627542b4b 100644
--- a/src/System.Management.Automation/namespaces/FileSystemContentStream.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemContentStream.cs
@@ -1515,7 +1515,7 @@ internal struct CPINFO
 
                 [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 d39733bed49..db619e3d15e 100644
--- a/src/System.Management.Automation/namespaces/FileSystemProvider.cs
+++ b/src/System.Management.Automation/namespaces/FileSystemProvider.cs
@@ -709,7 +709,7 @@ private void WinMapNetworkDrive(PSDriveInfo drive)
         /// </summary>
         /// <param name="drive"></param>
         /// <returns></returns>
-        private bool IsNetworkMappedDrive(PSDriveInfo drive)
+        private static bool IsNetworkMappedDrive(PSDriveInfo drive)
         {
             bool shouldMapNetworkDrive = (drive != null && !string.IsNullOrEmpty(drive.Root) && PathIsNetworkPath(drive.Root)) &&
                                          (drive.Persist || (drive.Credential != null && !drive.Credential.Equals(PSCredential.Empty)));
@@ -789,7 +789,7 @@ private PSDriveInfo WinRemoveDrive(PSDriveInfo drive)
         /// PS Drive Info.
         /// </param>
         /// <returns>True if the drive can be persisted or else false.</returns>
-        private bool IsSupportedDriveForPersistence(PSDriveInfo drive)
+        private static bool IsSupportedDriveForPersistence(PSDriveInfo drive)
         {
             bool isSupportedDriveForPersistence = false;
             if (drive != null && !string.IsNullOrEmpty(drive.Name) && drive.Name.Length == 1)
@@ -1311,35 +1311,36 @@ protected override void GetItem(string path)
                     // If we want to retrieve the file streams, retrieve them.
                     if (retrieveStreams)
                     {
-                        if (!isContainer)
+                        foreach (string desiredStream in dynamicParameters.Stream)
                         {
-                            foreach (string desiredStream in dynamicParameters.Stream)
-                            {
-                                // See that it matches the name specified
-                                WildcardPattern p = WildcardPattern.Get(desiredStream, WildcardOptions.IgnoreCase | WildcardOptions.CultureInvariant);
-                                bool foundStream = false;
+                            // See that it matches the name specified
+                            WildcardPattern p = WildcardPattern.Get(desiredStream, WildcardOptions.IgnoreCase | WildcardOptions.CultureInvariant);
+                            bool foundStream = false;
 
-                                foreach (AlternateStreamData stream in AlternateDataStreamUtilities.GetStreams(result.FullName))
+                            foreach (AlternateStreamData stream in AlternateDataStreamUtilities.GetStreams(result.FullName))
+                            {
+                                if (!p.IsMatch(stream.Stream))
                                 {
-                                    if (!p.IsMatch(stream.Stream)) { continue; }
-
-                                    string outputPath = result.FullName + ":" + stream.Stream;
-                                    WriteItemObject(stream, outputPath, isContainer);
-                                    foundStream = true;
+                                    continue;
                                 }
 
-                                if ((!WildcardPattern.ContainsWildcardCharacters(desiredStream)) && (!foundStream))
-                                {
-                                    string errorMessage = StringUtil.Format(
-                                        FileSystemProviderStrings.AlternateDataStreamNotFound, desiredStream, result.FullName);
-                                    Exception e = new FileNotFoundException(errorMessage, result.FullName);
-
-                                    WriteError(new ErrorRecord(
-                                        e,
-                                        "AlternateDataStreamNotFound",
-                                        ErrorCategory.ObjectNotFound,
-                                        path));
-                                }
+                                string outputPath = result.FullName + ":" + stream.Stream;
+                                // Alternate data streams can never be containers.
+                                WriteItemObject(stream, outputPath, isContainer: false);
+                                foundStream = true;
+                            }
+
+                            if ((!WildcardPattern.ContainsWildcardCharacters(desiredStream)) && (!foundStream))
+                            {
+                                string errorMessage = StringUtil.Format(
+                                    FileSystemProviderStrings.AlternateDataStreamNotFound, desiredStream, result.FullName);
+                                Exception e = new FileNotFoundException(errorMessage, result.FullName);
+
+                                WriteError(new ErrorRecord(
+                                    e,
+                                    "AlternateDataStreamNotFound",
+                                    ErrorCategory.ObjectNotFound,
+                                    path));
                             }
                         }
                     }
@@ -2019,7 +2020,7 @@ string ToModeString(FileSystemInfo fileSystemInfo)
                 FileAttributes fileAttributes = fileSystemInfo.Attributes;
 
                 bool isReparsePoint = InternalSymbolicLinkLinkCodeMethods.IsReparsePoint(fileSystemInfo);
-                bool isLink = isReparsePoint || (excludeHardLink ? false : InternalSymbolicLinkLinkCodeMethods.IsHardLink(fileSystemInfo));
+                bool isLink = isReparsePoint || (!excludeHardLink && InternalSymbolicLinkLinkCodeMethods.IsHardLink(fileSystemInfo));
                 if (!isLink)
                 {
                     // special casing for the common cases - no allocations
@@ -2241,7 +2242,7 @@ protected override void RenameItem(
         /// Specify "directory" or "container" to create a directory.
         /// </param>
         /// <param name="value">
-        /// If <paramref name="type" /> is "file" then this parameter becomes the content
+        /// If <paramref name="type"/> is "file" then this parameter becomes the content
         /// of the file to be created.
         /// </param>
         /// <returns>
@@ -2376,7 +2377,7 @@ protected override void NewItem(
                             if (strTargetPath.StartsWith(".\\", StringComparison.OrdinalIgnoreCase) ||
                                 strTargetPath.StartsWith("./", StringComparison.OrdinalIgnoreCase))
                             {
-                                normalizedTargetPath = Path.Join(SessionState.Internal.CurrentLocation.ProviderPath, strTargetPath.AsSpan().Slice(2));
+                                normalizedTargetPath = Path.Join(SessionState.Internal.CurrentLocation.ProviderPath, strTargetPath.AsSpan(2));
                             }
 
                             GetFileSystemInfo(normalizedTargetPath, out isDirectory);
@@ -2721,7 +2722,7 @@ private enum ItemType
             SymbolicLink,
             Junction,
             HardLink
-        };
+        }
 
         private static ItemType GetItemType(string input)
         {
@@ -4195,7 +4196,7 @@ private void RemoveFunctionsPSCopyFileFromRemoteSession(System.Management.Automa
                 return;
             }
 
-            string remoteScript = @"
+            const string remoteScript = @"
                 Microsoft.PowerShell.Management\Remove-Item function:PSCopyFromSessionHelper -ea SilentlyContinue -Force
                 Microsoft.PowerShell.Management\Remove-Item function:PSCopyRemoteUtils -ea SilentlyContinue -Force
             ";
@@ -4203,7 +4204,7 @@ private void RemoveFunctionsPSCopyFileFromRemoteSession(System.Management.Automa
             SafeInvokeCommand.Invoke(ps, this, null, false);
         }
 
-        private bool ValidRemoteSessionForScripting(Runspace runspace)
+        private static bool ValidRemoteSessionForScripting(Runspace runspace)
         {
             if (runspace is not RemoteRunspace)
             {
@@ -4373,7 +4374,7 @@ private bool PerformCopyFileFromRemoteSession(string sourceFileFullName, FileInf
                     wStream = AlternateDataStreamUtilities.CreateFileStream(destinationFile.FullName, streamName, FileMode.Append, FileAccess.Write, FileShare.ReadWrite);
                 }
 #endif
-                long fragmentSize = FILETRANSFERSIZE;
+                const long fragmentSize = FILETRANSFERSIZE;
                 long copiedSoFar = 0;
                 long currentIndex = 0;
 
@@ -4506,7 +4507,7 @@ private void RemoveFunctionPSCopyFileToRemoteSession(System.Management.Automatio
         {
             if ((ps == null) || !ValidRemoteSessionForScripting(ps.Runspace)) { return; }
 
-            string remoteScript = @"
+            const string remoteScript = @"
                 Microsoft.PowerShell.Management\Remove-Item function:PSCopyToSessionHelper -ea SilentlyContinue -Force
                 Microsoft.PowerShell.Management\Remove-Item function:PSCopyRemoteUtils -ea SilentlyContinue -Force
             ";
@@ -4624,7 +4625,7 @@ private bool CopyFileStreamToRemoteSession(FileInfo file, string destinationPath
             WriteProgress(progress);
 
             // 4MB gives the best results without spiking the resources on the remote connection.
-            int fragmentSize = FILETRANSFERSIZE;
+            const int fragmentSize = FILETRANSFERSIZE;
             byte[] fragment = null;
             int iteration = 0;
             bool success = false;
@@ -4768,7 +4769,7 @@ private bool CopyFileStreamToRemoteSession(FileInfo file, string destinationPath
 
         // Returns a hash table with metadata about this file info.
         //
-        private Hashtable GetFileMetadata(FileInfo file)
+        private static Hashtable GetFileMetadata(FileInfo file)
         {
             Hashtable metadata = new Hashtable();
 
@@ -6137,7 +6138,7 @@ private void CopyAndDelete(DirectoryInfo directory, string destination, bool for
         }
 
 #if !UNIX
-        private bool IsSameWindowsVolume(string source, string destination)
+        private static bool IsSameWindowsVolume(string source, string destination)
         {
             FileInfo src = new FileInfo(source);
             FileInfo dest = new FileInfo(destination);
@@ -6159,8 +6160,8 @@ private bool IsSameWindowsVolume(string source, string destination)
         /// <param name="providerSpecificPickList">
         /// The list of properties to get.  Examples include "Attributes", "LastAccessTime,"
         /// and other properties defined by
-        /// <see cref="System.IO.DirectoryInfo" /> and
-        /// <see cref="System.IO.FileInfo" />
+        /// <see cref="System.IO.DirectoryInfo"/> and
+        /// <see cref="System.IO.FileInfo"/>
         /// </param>
         public void GetProperty(string path, Collection<string> providerSpecificPickList)
         {
@@ -6663,7 +6664,14 @@ public IContentReader GetContentReader(string path)
 
             try
             {
-                if (Directory.Exists(path))
+                // Get-Content will write a non-terminating error if the target is a directory.
+                // On Windows, the streamName must be null or empty for it to write the error. Otherwise, the
+                // alternate data stream is not a directory, even if it's set on a directory.
+                if (Directory.Exists(path)
+#if !UNIX
+                    && string.IsNullOrEmpty(streamName)
+#endif
+                    )
                 {
                     string errMsg = StringUtil.Format(SessionStateStrings.GetContainerContentException, path);
                     ErrorRecord error = new ErrorRecord(new InvalidOperationException(errMsg), "GetContainerContentException", ErrorCategory.InvalidOperation, null);
@@ -6771,7 +6779,7 @@ public IContentWriter GetContentWriter(string path)
             bool usingByteEncoding = false;
             bool streamTypeSpecified = false;
             Encoding encoding = ClrFacade.GetDefaultEncoding();
-            FileMode filemode = FileMode.OpenOrCreate;
+            const FileMode filemode = FileMode.OpenOrCreate;
             string streamName = null;
             bool suppressNewline = false;
 
@@ -6818,7 +6826,14 @@ public IContentWriter GetContentWriter(string path)
 
             try
             {
-                if (Directory.Exists(path))
+                // Add-Content and Set-Content will write a non-terminating error if the target is a directory.
+                // On Windows, the streamName must be null or empty for it to write the error. Otherwise, the
+                // alternate data stream is not a directory, even if it's set on a directory.
+                if (Directory.Exists(path)
+#if !UNIX
+                    && string.IsNullOrEmpty(streamName)
+#endif
+                    )
                 {
                     string errMsg = StringUtil.Format(SessionStateStrings.WriteContainerContentException, path);
                     ErrorRecord error = new ErrorRecord(new InvalidOperationException(errMsg), "WriteContainerContentException", ErrorCategory.InvalidOperation, null);
@@ -6896,13 +6911,6 @@ public void ClearContent(string path)
 
             path = NormalizePath(path);
 
-            if (Directory.Exists(path))
-            {
-                string errorMsg = StringUtil.Format(SessionStateStrings.ClearDirectoryContent, path);
-                WriteError(new ErrorRecord(new NotSupportedException(errorMsg), "ClearDirectoryContent", ErrorCategory.InvalidOperation, path));
-                return;
-            }
-
             try
             {
 #if !UNIX
@@ -6954,6 +6962,26 @@ public void ClearContent(string path)
                     clearStream = false;
                 }
 
+#endif
+                // On Windows, determine if our argument is a directory only after we determine if
+                // we're being asked to work with an alternate data stream, because directories can have
+                // alternate data streams on them that are not child items. These alternate data streams
+                // must be treated as data streams, even if they're attached to directories. However,
+                // if asked to work with a directory without a data stream specified, write a non-terminating
+                // error instead of clearing all child items of the directory. (On non-Windows, alternate
+                // data streams don't exist, so in that environment always write the error when addressing
+                // a directory.)
+                if (Directory.Exists(path)
+#if !UNIX
+                    && !clearStream
+#endif
+                    )
+                {
+                    string errorMsg = StringUtil.Format(SessionStateStrings.ClearDirectoryContent, path);
+                    WriteError(new ErrorRecord(new NotSupportedException(errorMsg), "ClearDirectoryContent", ErrorCategory.InvalidOperation, path));
+                    return;
+                }
+#if !UNIX
                 if (clearStream)
                 {
                     FileStream fileStream = null;
@@ -7837,8 +7865,6 @@ public static class InternalSymbolicLinkLinkCodeMethods
         // data is 16KB, plus there's a header.
         private const int MAX_REPARSE_SIZE = (16 * 1024) + REPARSE_GUID_DATA_BUFFER_HEADER_SIZE;
 
-        private const int ERROR_NOT_A_REPARSE_POINT = 4390;
-
         private const int FSCTL_GET_REPARSE_POINT = 0x000900A8;
 
         private const int FSCTL_SET_REPARSE_POINT = 0x000900A4;
@@ -8153,16 +8179,20 @@ private static string WinInternalGetLinkType(string filePath)
                     // Get Buffer size
                     IntPtr dangerousHandle = handle.DangerousGetHandle();
 
-                    bool result = DeviceIoControl(dangerousHandle, FSCTL_GET_REPARSE_POINT,
-                        IntPtr.Zero, 0, outBuffer, outBufferSize, out bytesReturned, IntPtr.Zero);
+                    bool result = DeviceIoControl(
+                        dangerousHandle,
+                        FSCTL_GET_REPARSE_POINT,
+                        InBuffer: IntPtr.Zero,
+                        nInBufferSize: 0,
+                        outBuffer,
+                        outBufferSize,
+                        out bytesReturned,
+                        lpOverlapped: IntPtr.Zero);
 
                     if (!result)
                     {
-                        int lastError = Marshal.GetLastWin32Error();
-                        if (lastError == ERROR_NOT_A_REPARSE_POINT)
-                            linkType = null;
-                        else
-                            throw new Win32Exception(lastError);
+                        // It's not a reparse point or the file system doesn't support reparse points.
+                        return IsHardLink(ref dangerousHandle) ? "HardLink" : null;
                     }
 
                     REPARSE_DATA_BUFFER_SYMBOLICLINK reparseDataBuffer = Marshal.PtrToStructure<REPARSE_DATA_BUFFER_SYMBOLICLINK>(outBuffer);
@@ -8182,7 +8212,7 @@ private static string WinInternalGetLinkType(string filePath)
                             break;
 
                         default:
-                            linkType = IsHardLink(ref dangerousHandle) ? "HardLink" : null;
+                            linkType = null;
                             break;
                     }
 
@@ -8287,10 +8317,10 @@ internal static bool IsSameFileSystemItem(string pathOne, string pathTwo)
 #if !UNIX
         private static bool WinIsSameFileSystemItem(string pathOne, string pathTwo)
         {
-            var access = FileAccess.Read;
-            var share = FileShare.Read;
-            var creation = FileMode.Open;
-            var attributes = FileAttributes.BackupSemantics | FileAttributes.PosixSemantics;
+            const FileAccess access = FileAccess.Read;
+            const FileShare share = FileShare.Read;
+            const FileMode creation = FileMode.Open;
+            const FileAttributes attributes = FileAttributes.BackupSemantics | FileAttributes.PosixSemantics;
 
             using (var sfOne = AlternateDataStreamUtilities.NativeMethods.CreateFile(pathOne, access, share, IntPtr.Zero, creation, (int)attributes, IntPtr.Zero))
             using (var sfTwo = AlternateDataStreamUtilities.NativeMethods.CreateFile(pathTwo, access, share, IntPtr.Zero, creation, (int)attributes, IntPtr.Zero))
@@ -8326,10 +8356,10 @@ internal static bool GetInodeData(string path, out System.ValueTuple<UInt64, UIn
 #if !UNIX
         private static bool WinGetInodeData(string path, out System.ValueTuple<UInt64, UInt64> inodeData)
         {
-            var access = FileAccess.Read;
-            var share = FileShare.Read;
-            var creation = FileMode.Open;
-            var attributes = FileAttributes.BackupSemantics | FileAttributes.PosixSemantics;
+            const FileAccess access = FileAccess.Read;
+            const FileShare share = FileShare.Read;
+            const FileMode creation = FileMode.Open;
+            const FileAttributes attributes = FileAttributes.BackupSemantics | FileAttributes.PosixSemantics;
 
             using (var sf = AlternateDataStreamUtilities.NativeMethods.CreateFile(path, access, share, IntPtr.Zero, creation, (int)attributes, IntPtr.Zero))
             {
@@ -8399,16 +8429,20 @@ private static string WinInternalGetTarget(SafeFileHandle handle)
                 // According to MSDN guidance DangerousAddRef() and DangerousRelease() have been used.
                 handle.DangerousAddRef(ref success);
 
-                bool result = DeviceIoControl(handle.DangerousGetHandle(), FSCTL_GET_REPARSE_POINT,
-                    IntPtr.Zero, 0, outBuffer, outBufferSize, out bytesReturned, IntPtr.Zero);
+                bool result = DeviceIoControl(
+                    handle.DangerousGetHandle(),
+                    FSCTL_GET_REPARSE_POINT,
+                    InBuffer: IntPtr.Zero,
+                    nInBufferSize: 0,
+                    outBuffer,
+                    outBufferSize,
+                    out bytesReturned,
+                    lpOverlapped: IntPtr.Zero);
 
                 if (!result)
                 {
-                    int lastError = Marshal.GetLastWin32Error();
-                    if (lastError == ERROR_NOT_A_REPARSE_POINT)
-                        return null;
-
-                    throw new Win32Exception(lastError);
+                    // It's not a reparse point or the file system doesn't support reparse points.
+                    return null;
                 }
 
                 string targetDir = null;
@@ -8619,7 +8653,22 @@ internal static List<AlternateStreamData> GetStreams(string path)
             SafeFindHandle handle = NativeMethods.FindFirstStreamW(
                 path, NativeMethods.StreamInfoLevels.FindStreamInfoStandard,
                 findStreamData, 0);
-            if (handle.IsInvalid) throw new Win32Exception();
+
+            if (handle.IsInvalid)
+            {
+                int error = Marshal.GetLastWin32Error();
+
+                // Directories don't normally have alternate streams, so this is not an exceptional state.
+                // If a directory has no alternate data streams, FindFirstStreamW returns ERROR_HANDLE_EOF.
+                if (error == NativeMethods.ERROR_HANDLE_EOF)
+                {
+                    return alternateStreams;
+                }
+
+                // An unexpected error was returned, that we don't know how to interpret. The most helpful
+                // thing we can do at this point is simply throw the raw Win32 exception.
+                throw new Win32Exception(error);
+            }
 
             try
             {
@@ -8629,7 +8678,7 @@ internal static List<AlternateStreamData> GetStreams(string path)
                     findStreamData.Name = findStreamData.Name.Substring(1);
 
                     // And trailing :$DATA (as long as it's not the default data stream)
-                    string dataStream = ":$DATA";
+                    const string dataStream = ":$DATA";
                     if (!string.Equals(findStreamData.Name, dataStream, StringComparison.OrdinalIgnoreCase))
                     {
                         findStreamData.Name = findStreamData.Name.Replace(dataStream, string.Empty);
@@ -8754,6 +8803,7 @@ internal static void SetZoneOfOrigin(string path, SecurityZone securityZone)
         internal static class NativeMethods
         {
             internal const int ERROR_HANDLE_EOF = 38;
+            internal const int ERROR_INVALID_PARAMETER = 87;
 
             internal enum StreamInfoLevels { FindStreamInfoStandard = 0 }
 
diff --git a/src/System.Management.Automation/namespaces/IContentWriter.cs b/src/System.Management.Automation/namespaces/IContentWriter.cs
index eee05cacf13..621808af80c 100644
--- a/src/System.Management.Automation/namespaces/IContentWriter.cs
+++ b/src/System.Management.Automation/namespaces/IContentWriter.cs
@@ -4,6 +4,7 @@
 using System.Collections;
 using System.IO;
 
+#nullable enable
 namespace System.Management.Automation.Provider
 {
     #region IContentWriter
diff --git a/src/System.Management.Automation/namespaces/IDynamicPropertyProvider.cs b/src/System.Management.Automation/namespaces/IDynamicPropertyProvider.cs
index 6b8c69c270e..232f3f5d78b 100644
--- a/src/System.Management.Automation/namespaces/IDynamicPropertyProvider.cs
+++ b/src/System.Management.Automation/namespaces/IDynamicPropertyProvider.cs
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+#nullable enable
 namespace System.Management.Automation.Provider
 {
     #region IDynamicPropertyCmdletProvider
-
     /// <summary>
     /// An interface that can be implemented on a Cmdlet provider to expose the dynamic
     /// manipulation of properties.
@@ -61,7 +61,7 @@ void NewProperty(
             string path,
             string propertyName,
             string propertyTypeName,
-            object value);
+            object? value);
 
         /// <summary>
         /// Gives the provider an opportunity to attach additional parameters to the
@@ -87,11 +87,11 @@ void NewProperty(
         ///
         /// The default implementation returns null. (no additional parameters)
         /// </returns>
-        object NewPropertyDynamicParameters(
+        object? NewPropertyDynamicParameters(
             string path,
             string propertyName,
             string propertyTypeName,
-            object value);
+            object? value);
 
         /// <summary>
         /// Removes a property on the item specified by the path.
@@ -196,7 +196,7 @@ void RenameProperty(
         ///
         /// The default implementation returns null. (no additional parameters)
         /// </returns>
-        object RenamePropertyDynamicParameters(
+        object? RenamePropertyDynamicParameters(
             string path,
             string sourceProperty,
             string destinationProperty);
@@ -262,7 +262,7 @@ void CopyProperty(
         ///
         /// The default implementation returns null. (no additional parameters)
         /// </returns>
-        object CopyPropertyDynamicParameters(
+        object? CopyPropertyDynamicParameters(
             string sourcePath,
             string sourceProperty,
             string destinationPath,
@@ -328,7 +328,7 @@ void MoveProperty(
         ///
         /// The default implementation returns null. (no additional parameters)
         /// </returns>
-        object MovePropertyDynamicParameters(
+        object? MovePropertyDynamicParameters(
             string sourcePath,
             string sourceProperty,
             string destinationPath,
diff --git a/src/System.Management.Automation/namespaces/IPropertiesProvider.cs b/src/System.Management.Automation/namespaces/IPropertiesProvider.cs
index 555037635ef..1f4a6c168fe 100644
--- a/src/System.Management.Automation/namespaces/IPropertiesProvider.cs
+++ b/src/System.Management.Automation/namespaces/IPropertiesProvider.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.ObjectModel;
 
+#nullable enable
 namespace System.Management.Automation.Provider
 {
     #region IPropertyCmdletProvider
@@ -58,7 +59,7 @@ public interface IPropertyCmdletProvider
         /// </remarks>
         void GetProperty(
             string path,
-            Collection<string> providerSpecificPickList);
+            Collection<string>? providerSpecificPickList);
 
         /// <summary>
         /// Gives the provider an opportunity to attach additional parameters to the
@@ -79,9 +80,9 @@ void GetProperty(
         ///
         /// The default implementation returns null. (no additional parameters)
         /// </returns>
-        object GetPropertyDynamicParameters(
+        object? GetPropertyDynamicParameters(
             string path,
-            Collection<string> providerSpecificPickList);
+            Collection<string>? providerSpecificPickList);
 
         /// <summary>
         /// Sets the specified properties of the item at the specified path.
@@ -137,7 +138,7 @@ void SetProperty(
         ///
         /// The default implementation returns null. (no additional parameters)
         /// </returns>
-        object SetPropertyDynamicParameters(
+        object? SetPropertyDynamicParameters(
             string path,
             PSObject propertyValue);
 
@@ -191,7 +192,7 @@ void ClearProperty(
         ///
         /// The default implementation returns null. (no additional parameters)
         /// </returns>
-        object ClearPropertyDynamicParameters(
+        object? ClearPropertyDynamicParameters(
             string path,
             Collection<string> propertyToClear);
     }
diff --git a/src/System.Management.Automation/namespaces/LocationGlobber.cs b/src/System.Management.Automation/namespaces/LocationGlobber.cs
index 4aaa3549d65..e4ab1f3cfc5 100644
--- a/src/System.Management.Automation/namespaces/LocationGlobber.cs
+++ b/src/System.Management.Automation/namespaces/LocationGlobber.cs
@@ -52,7 +52,7 @@ internal sealed class LocationGlobber
         /// The instance of session state on which this location globber acts.
         /// </param>
         /// <exception cref="ArgumentNullException">
-        /// If <paramref name="sessionState" /> is null.
+        /// If <paramref name="sessionState"/> is null.
         /// </exception>
         internal LocationGlobber(SessionState sessionState)
         {
@@ -1666,7 +1666,7 @@ internal bool IsAbsolutePath(string path, out string driveName)
         /// The path with the glob characters unescaped.
         /// </returns>
         /// <exception cref="ArgumentNullException">
-        /// If <paramref name="path" /> is null.
+        /// If <paramref name="path"/> is null.
         /// </exception>
         private static string RemoveGlobEscaping(string path)
         {
@@ -1699,7 +1699,7 @@ private static string RemoveGlobEscaping(string path)
         /// false otherwise.
         /// </returns>
         /// <exception cref="ArgumentNullException">
-        /// If <paramref name="driveName" /> is null.
+        /// If <paramref name="driveName"/> is null.
         /// </exception>
         /// <remarks>
         /// The comparison is done using a case-insensitive comparison using the
@@ -1763,7 +1763,7 @@ internal bool IsShellVirtualDrive(string driveName, out SessionStateScope scope)
         /// </param>
         /// <param name="workingDriveForPath">
         /// This out parameter returns the drive that was specified
-        /// by the <paramref name="path" />. If <paramref name="path"/> is
+        /// by the <paramref name="path"/>. If <paramref name="path"/> is
         /// an absolute path this value may be something other than
         /// the current working drive.
         ///
@@ -1789,7 +1789,7 @@ internal bool IsShellVirtualDrive(string driveName, out SessionStateScope scope)
         /// This is internal so that it can be called from SessionState
         /// </remarks>
         /// <exception cref="ArgumentNullException">
-        /// If <paramref name="path" /> is null.
+        /// If <paramref name="path"/> is null.
         /// </exception>
         /// <exception cref="DriveNotFoundException">
         /// If the <paramref name="path"/> refers to a drive that could not be found.
@@ -2272,7 +2272,7 @@ internal string GenerateRelativePath(
             return driveRootRelativeWorkingPath;
         }
 
-        private bool HasRelativePathTokens(string path)
+        private static bool HasRelativePathTokens(string path)
         {
             string comparePath = path.Replace('/', '\\');
 
@@ -2417,7 +2417,7 @@ private static string ParseProviderPath(string path, out string providerId)
         /// paths. Instead an appropriate path will be returned as if it did exist.
         /// </param>
         /// <param name="containerProvider">
-        /// The provider that will be used to glob the <paramref name="path" />.
+        /// The provider that will be used to glob the <paramref name="path"/>.
         /// </param>
         /// <param name="context">
         /// The context under which the command is occurring.
@@ -3273,27 +3273,27 @@ internal static string RemoveProviderQualifier(string path)
         /// <summary>
         /// Generates a collection of containers and/or leaves that are children of the containers
         /// in the currentDirs parameter and match the glob expression in the
-        /// <paramref name="leafElement" /> parameter.
+        /// <paramref name="leafElement"/> parameter.
         /// </summary>
         /// <param name="currentDirs">
         /// A collection of paths that should be searched for leaves that match the
-        /// <paramref name="leafElement" /> expression.
+        /// <paramref name="leafElement"/> expression.
         /// </param>
         /// <param name="drive">
         /// The drive the Msh path is relative to.
         /// </param>
         /// <param name="leafElement">
         /// A single element of a path that may or may not contain a glob expression. This parameter
-        /// is used to search the containers in <paramref name="currentDirs" /> for children that
+        /// is used to search the containers in <paramref name="currentDirs"/> for children that
         /// match the glob expression.
         /// </param>
         /// <param name="isLastLeaf">
-        /// True if the <paramref name="leafElement" /> is the last element to glob over. If false, we
+        /// True if the <paramref name="leafElement"/> is the last element to glob over. If false, we
         /// need to get all container names from the provider even if they don't match the filter.
         /// </param>
         /// <param name="provider">
         /// The provider associated with the paths that are being passed in the
-        /// <paramref name="currentDirs" /> and <paramref name="leafElement" /> parameters.
+        /// <paramref name="currentDirs"/> and <paramref name="leafElement"/> parameters.
         /// The provider must derive from ContainerCmdletProvider or NavigationCmdletProvider
         /// in order to get globbing.
         /// </param>
@@ -3302,10 +3302,10 @@ internal static string RemoveProviderQualifier(string path)
         /// </param>
         /// <returns>
         /// A collection of fully qualified namespace paths whose leaf element matches the
-        /// <paramref name="leafElement" /> expression.
+        /// <paramref name="leafElement"/> expression.
         /// </returns>
         /// <exception cref="ArgumentNullException">
-        /// If <paramref name="currentDirs" /> or <paramref name="provider" />
+        /// If <paramref name="currentDirs"/> or <paramref name="provider"/>
         /// is null.
         /// </exception>
         /// <exception cref="ProviderInvocationException">
@@ -3892,24 +3892,24 @@ internal Collection<string> ExpandGlobPath(
         /// <summary>
         /// Generates a collection of containers and/or leaves that are children of the containers
         /// in the currentDirs parameter and match the glob expression in the
-        /// <paramref name="leafElement" /> parameter.
+        /// <paramref name="leafElement"/> parameter.
         /// </summary>
         /// <param name="currentDirs">
         /// A collection of paths that should be searched for leaves that match the
-        /// <paramref name="leafElement" /> expression.
+        /// <paramref name="leafElement"/> expression.
         /// </param>
         /// <param name="leafElement">
         /// A single element of a path that may or may not contain a glob expression. This parameter
-        /// is used to search the containers in <paramref name="currentDirs" /> for children that
+        /// is used to search the containers in <paramref name="currentDirs"/> for children that
         /// match the glob expression.
         /// </param>
         /// <param name="isLastLeaf">
-        /// True if the <paramref name="leafElement" /> is the last element to glob over. If false, we
+        /// True if the <paramref name="leafElement"/> is the last element to glob over. If false, we
         /// need to get all container names from the provider even if they don't match the filter.
         /// </param>
         /// <param name="provider">
         /// The provider associated with the paths that are being passed in the
-        /// <paramref name="currentDirs" /> and <paramref name="leafElement" /> parameters.
+        /// <paramref name="currentDirs"/> and <paramref name="leafElement"/> parameters.
         /// The provider must derive from ContainerCmdletProvider or NavigationCmdletProvider
         /// in order to get globbing.
         /// </param>
@@ -3918,10 +3918,10 @@ internal Collection<string> ExpandGlobPath(
         /// </param>
         /// <returns>
         /// A collection of fully qualified namespace paths whose leaf element matches the
-        /// <paramref name="leafElement" /> expression.
+        /// <paramref name="leafElement"/> expression.
         /// </returns>
         /// <exception cref="ArgumentNullException">
-        /// If <paramref name="currentDirs" /> or <paramref name="provider" />
+        /// If <paramref name="currentDirs"/> or <paramref name="provider"/>
         /// is null.
         /// </exception>
         /// <exception cref="ProviderInvocationException">
diff --git a/src/System.Management.Automation/namespaces/RegistryProvider.cs b/src/System.Management.Automation/namespaces/RegistryProvider.cs
index 23160e63897..1898c960620 100644
--- a/src/System.Management.Automation/namespaces/RegistryProvider.cs
+++ b/src/System.Management.Automation/namespaces/RegistryProvider.cs
@@ -1819,7 +1819,7 @@ public void GetProperty(
                     // as the property name when adding the note, as
                     // PSObject does not allow an empty propertyName
 
-                    notePropertyName = GetLocalizedDefaultToken();
+                    notePropertyName = LocalizedDefaultToken;
                 }
 
                 propertyResults.Properties.Add(new PSNoteProperty(notePropertyName, key.GetValue(valueName)));
@@ -2024,7 +2024,7 @@ public void ClearProperty(
                     string propertyNameToAdd = valueName;
                     if (string.IsNullOrEmpty(valueName))
                     {
-                        propertyNameToAdd = GetLocalizedDefaultToken();
+                        propertyNameToAdd = LocalizedDefaultToken;
                     }
 
                     result.Properties.Add(new PSNoteProperty(propertyNameToAdd, defaultValue));
@@ -2956,7 +2956,7 @@ private string NormalizePath(string path)
             return result;
         }
 
-        private bool HasRelativePathTokens(string path)
+        private static bool HasRelativePathTokens(string path)
         {
             return (
                 path.StartsWith('\\') ||
@@ -3056,7 +3056,7 @@ private void GetFilteredRegistryKeyProperties(string path,
 
                         if (!string.IsNullOrEmpty(requestedValueName))
                         {
-                            valueNameToMatch = GetLocalizedDefaultToken();
+                            valueNameToMatch = LocalizedDefaultToken;
                         }
                     }
 
@@ -3071,7 +3071,7 @@ private void GetFilteredRegistryKeyProperties(string path,
                             // as the property name when adding the note, as
                             // PSObject does not allow an empty propertyName
 
-                            valueNameToMatch = GetLocalizedDefaultToken();
+                            valueNameToMatch = LocalizedDefaultToken;
                         }
 
                         hadAMatch = true;
@@ -3195,7 +3195,7 @@ private object ResetRegistryKeyValue(IRegistryWrapper key, string valueName)
         /// <returns>
         /// true if the path is empty, a \ or a /, else false
         /// </returns>
-        private bool IsHiveContainer(string path)
+        private static bool IsHiveContainer(string path)
         {
             bool result = false;
             if (path == null)
@@ -3783,7 +3783,7 @@ private void WriteWrappedPropertyObject(object value, string propertyName, strin
             string propertyNameToAdd = propertyName;
             if (string.IsNullOrEmpty(propertyName))
             {
-                propertyNameToAdd = GetLocalizedDefaultToken();
+                propertyNameToAdd = LocalizedDefaultToken;
             }
 
             result.Properties.Add(new PSNoteProperty(propertyNameToAdd, value));
@@ -3835,7 +3835,7 @@ private static object ConvertValueToKind(object value, RegistryValueKind kind)
                             value = 0;
                         }
                     }
-                    
+
                     break;
 
                 case RegistryValueKind.ExpandString:
@@ -4033,7 +4033,7 @@ private void WriteRegistryItemObject(
                 if (string.IsNullOrEmpty(valueNames[index]))
                 {
                     // The first unnamed value becomes the default value
-                    valueNames[index] = GetLocalizedDefaultToken();
+                    valueNames[index] = LocalizedDefaultToken;
                     break;
                 }
             }
@@ -4108,16 +4108,13 @@ private bool ParseKind(string type, out RegistryValueKind kind)
         /// Gets the default value name token from the resource.
         /// In English that token is "(default)" without the quotes.
         /// </summary>
+        /// <remarks>
+        /// This should not be localized as it will break scripts.
+        /// </remarks>
         /// <returns>
         /// A string containing the default value name.
         /// </returns>
-        private string GetLocalizedDefaultToken()
-        {
-            // This shouldn't be localized as it will break scripts
-
-            string defaultValueName = "(default)";
-            return defaultValueName;
-        }
+        private static string LocalizedDefaultToken => "(default)";
 
         /// <summary>
         /// Converts an empty or null userEnteredPropertyName to the localized
@@ -4140,7 +4137,7 @@ private string GetPropertyName(string userEnteredPropertyName)
 
                 if (stringComparer.Compare(
                         userEnteredPropertyName,
-                        GetLocalizedDefaultToken(),
+                        LocalizedDefaultToken,
                         CompareOptions.IgnoreCase) == 0)
                 {
                     result = null;
diff --git a/src/System.Management.Automation/namespaces/RegistrySecurity.cs b/src/System.Management.Automation/namespaces/RegistrySecurity.cs
index ad355ac6638..9308c50dddc 100644
--- a/src/System.Management.Automation/namespaces/RegistrySecurity.cs
+++ b/src/System.Management.Automation/namespaces/RegistrySecurity.cs
@@ -164,7 +164,7 @@ public void SetSecurityDescriptor(
         /// Specifies the parts of a security descriptor to create.
         /// </param>
         /// <returns>
-        /// An instance of <see cref="System.Security.AccessControl.ObjectSecurity" /> object.
+        /// An instance of <see cref="System.Security.AccessControl.ObjectSecurity"/> object.
         /// </returns>
         /// <remarks><paramref name="path"/> and <paramref name="sections"/> are not used by this method.</remarks>
         public ObjectSecurity NewSecurityDescriptorFromPath(
@@ -191,7 +191,7 @@ public ObjectSecurity NewSecurityDescriptorFromPath(
         /// Specifies the parts of a security descriptor to create.
         /// </param>
         /// <returns>
-        /// An instance of <see cref="System.Security.AccessControl.ObjectSecurity" /> object.
+        /// An instance of <see cref="System.Security.AccessControl.ObjectSecurity"/> object.
         /// </returns>
         public ObjectSecurity NewSecurityDescriptorOfType(
             string type,
diff --git a/src/System.Management.Automation/namespaces/RegistryWrapper.cs b/src/System.Management.Automation/namespaces/RegistryWrapper.cs
index d3a44564dba..0e8e0558312 100644
--- a/src/System.Management.Automation/namespaces/RegistryWrapper.cs
+++ b/src/System.Management.Automation/namespaces/RegistryWrapper.cs
@@ -20,21 +20,33 @@ namespace Microsoft.PowerShell.Commands
     internal interface IRegistryWrapper
     {
         void SetValue(string name, object value);
+
         void SetValue(string name, object value, RegistryValueKind valueKind);
+
         string[] GetValueNames();
+
         void DeleteValue(string name);
+
         string[] GetSubKeyNames();
+
         IRegistryWrapper CreateSubKey(string subkey);
+
         IRegistryWrapper OpenSubKey(string name, bool writable);
+
         void DeleteSubKeyTree(string subkey);
+
         object GetValue(string name);
+
         object GetValue(string name, object defaultValue, RegistryValueOptions options);
+
         RegistryValueKind GetValueKind(string name);
 
         object RegistryKey { get; }
 
         void SetAccessControl(ObjectSecurity securityDescriptor);
+
         ObjectSecurity GetAccessControl(AccessControlSections includeSections);
+
         void Close();
 
         string Name { get; }
diff --git a/src/System.Management.Automation/resources/PSConfigurationStrings.resx b/src/System.Management.Automation/resources/PSConfigurationStrings.resx
new file mode 100644
index 00000000000..a1671d7f9e8
--- /dev/null
+++ b/src/System.Management.Automation/resources/PSConfigurationStrings.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="https://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="https://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CanNotConfigurationFile" xml:space="preserve">
+    <value>PowerShell has stopped working because of a security issue: Cannot read the configuration file: {0}</value>
+  </data>
+</root>
diff --git a/src/System.Management.Automation/resources/RunspaceInit.resx b/src/System.Management.Automation/resources/RunspaceInit.resx
index c4a485121c7..ac900465d7d 100644
--- a/src/System.Management.Automation/resources/RunspaceInit.resx
+++ b/src/System.Management.Automation/resources/RunspaceInit.resx
@@ -153,6 +153,9 @@
   <data name="OutputEncodingDescription" xml:space="preserve">
     <value>The text encoding used when piping text to a native executable file</value>
   </data>
+  <data name="PSStyleDescription" xml:space="preserve">
+    <value>Configuration controlling how text is rendered.</value>
+  </data>
   <data name="PSEmailServerDescription" xml:space="preserve">
     <value>Variable to contain the name of the email server. This can be used instead of the HostName parameter in the Send-MailMessage cmdlet.</value>
   </data>
diff --git a/src/System.Management.Automation/security/Authenticode.cs b/src/System.Management.Automation/security/Authenticode.cs
index 584087a6e69..0abdafa956c 100644
--- a/src/System.Management.Automation/security/Authenticode.cs
+++ b/src/System.Management.Automation/security/Authenticode.cs
@@ -292,7 +292,7 @@ internal static Signature GetSignature(string fileName, string fileContent)
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2001:AvoidCallingProblematicMethods")]
         private static Signature GetSignatureFromCatalog(string filename)
         {
-            if (Signature.CatalogApiAvailable.HasValue && !Signature.CatalogApiAvailable.GetValueOrDefault())
+            if (Signature.CatalogApiAvailable.HasValue && !Signature.CatalogApiAvailable.Value)
             {
                 // Signature.CatalogApiAvailable would be set to false the first time it is detected that
                 // WTGetSignatureInfo API does not exist on the platform, or if the API is not functional on the target platform.
diff --git a/src/System.Management.Automation/security/CatalogHelper.cs b/src/System.Management.Automation/security/CatalogHelper.cs
index f984976b33d..0c1c76b63e4 100644
--- a/src/System.Management.Automation/security/CatalogHelper.cs
+++ b/src/System.Management.Automation/security/CatalogHelper.cs
@@ -409,8 +409,8 @@ internal static string CalculateFileHash(string filePath, string hashAlgorithm)
                 _cmdlet.ThrowTerminatingError(errorRecord);
             }
 
-            DWORD GENERIC_READ = 0x80000000;
-            DWORD OPEN_EXISTING = 3;
+            const DWORD GENERIC_READ = 0x80000000;
+            const DWORD OPEN_EXISTING = 3;
             IntPtr INVALID_HANDLE_VALUE = new IntPtr(-1);
 
             // Open the file that is to be hashed for reading and get its handle
diff --git a/src/System.Management.Automation/security/MshSignature.cs b/src/System.Management.Automation/security/MshSignature.cs
index 221472a12d2..96ff8a9638a 100644
--- a/src/System.Management.Automation/security/MshSignature.cs
+++ b/src/System.Management.Automation/security/MshSignature.cs
@@ -71,7 +71,7 @@ public enum SignatureStatus
         /// with the current system.
         /// </summary>
         Incompatible
-    };
+    }
 
     /// <summary>
     /// Defines the valid types of signatures.
@@ -92,7 +92,7 @@ public enum SignatureType
         /// The signature is a catalog signature.
         /// </summary>
         Catalog = 2
-    };
+    }
 
     /// <summary>
     /// Represents a digital signature on a signed
@@ -389,5 +389,5 @@ private static string GetSignatureStatusMessage(SignatureStatus status,
 
             return message;
         }
-    };
+    }
 }
diff --git a/src/System.Management.Automation/security/SecurityManager.cs b/src/System.Management.Automation/security/SecurityManager.cs
index b3967bcb834..1b554ad3940 100644
--- a/src/System.Management.Automation/security/SecurityManager.cs
+++ b/src/System.Management.Automation/security/SecurityManager.cs
@@ -368,7 +368,7 @@ private bool CheckPolicy(ExternalScriptInfo script, PSHost host, out Exception r
             return policyCheckPassed;
         }
 
-        private bool SetPolicyFromAuthenticodePrompt(string path, PSHost host, ref Exception reason, Signature signature)
+        private static bool SetPolicyFromAuthenticodePrompt(string path, PSHost host, ref Exception reason, Signature signature)
         {
             bool policyCheckPassed = false;
 
@@ -398,14 +398,14 @@ private bool SetPolicyFromAuthenticodePrompt(string path, PSHost host, ref Excep
                         reason = new UnauthorizedAccessException(reasonMessage);
                         policyCheckPassed = false;
                     }
-                    
+
                     break;
             }
 
             return policyCheckPassed;
         }
 
-        private bool IsLocalFile(string filename)
+        private static bool IsLocalFile(string filename)
         {
 #if UNIX
             return true;
@@ -425,7 +425,7 @@ private bool IsLocalFile(string filename)
 
         // Checks that a publisher is trusted by the system or is one of
         // the signed product binaries
-        private bool IsTrustedPublisher(Signature signature, string file)
+        private static bool IsTrustedPublisher(Signature signature, string file)
         {
             // Get the thumbprint of the current signature
             X509Certificate2 signerCertificate = signature.SignerCertificate;
@@ -444,7 +444,7 @@ private bool IsTrustedPublisher(Signature signature, string file)
             return false;
         }
 
-        private bool IsUntrustedPublisher(Signature signature, string file)
+        private static bool IsUntrustedPublisher(Signature signature, string file)
         {
             // Get the thumbprint of the current signature
             X509Certificate2 signerCertificate = signature.SignerCertificate;
@@ -467,7 +467,7 @@ private bool IsUntrustedPublisher(Signature signature, string file)
         /// Trust a publisher by adding it to the "Trusted Publishers" store.
         /// </summary>
         /// <param name="signature"></param>
-        private void TrustPublisher(Signature signature)
+        private static void TrustPublisher(Signature signature)
         {
             // Get the certificate of the signer
             X509Certificate2 signerCertificate = signature.SignerCertificate;
@@ -485,7 +485,7 @@ private void TrustPublisher(Signature signature)
             }
         }
 
-        private void UntrustPublisher(Signature signature)
+        private static void UntrustPublisher(Signature signature)
         {
             // Get the certificate of the signer
             X509Certificate2 signerCertificate = signature.SignerCertificate;
@@ -516,7 +516,7 @@ private void UntrustPublisher(Signature signature)
             }
         }
 
-        private Signature GetSignatureWithEncodingRetry(string path, ExternalScriptInfo script)
+        private static Signature GetSignatureWithEncodingRetry(string path, ExternalScriptInfo script)
         {
             string verificationContents = System.Text.Encoding.Unicode.GetString(script.OriginalEncoding.GetPreamble()) + script.ScriptContents;
             Signature signature = SignatureHelper.GetSignature(path, verificationContents);
@@ -640,7 +640,7 @@ protected internal override bool ShouldRun(CommandInfo commandInfo,
             return allowRun;
         }
 
-        private RunPromptDecision AuthenticodePrompt(string path,
+        private static RunPromptDecision AuthenticodePrompt(string path,
                                                 Signature signature,
                                                 PSHost host)
         {
@@ -713,7 +713,7 @@ private RunPromptDecision AuthenticodePrompt(string path,
             return decision;
         }
 
-        private RunPromptDecision RemoteFilePrompt(string path, PSHost host)
+        private static RunPromptDecision RemoteFilePrompt(string path, PSHost host)
         {
             if ((host == null) || (host.UI == null))
             {
@@ -743,7 +743,7 @@ private RunPromptDecision RemoteFilePrompt(string path, PSHost host)
             }
         }
 
-        private Collection<ChoiceDescription> GetAuthenticodePromptChoices()
+        private static Collection<ChoiceDescription> GetAuthenticodePromptChoices()
         {
             Collection<ChoiceDescription> choices = new Collection<ChoiceDescription>();
 
@@ -764,7 +764,7 @@ private Collection<ChoiceDescription> GetAuthenticodePromptChoices()
             return choices;
         }
 
-        private Collection<ChoiceDescription> GetRemoteFilePromptChoices()
+        private static Collection<ChoiceDescription> GetRemoteFilePromptChoices()
         {
             Collection<ChoiceDescription> choices = new Collection<ChoiceDescription>();
 
diff --git a/src/System.Management.Automation/security/SecuritySupport.cs b/src/System.Management.Automation/security/SecuritySupport.cs
index 4303075d8eb..809c13efb3f 100644
--- a/src/System.Management.Automation/security/SecuritySupport.cs
+++ b/src/System.Management.Automation/security/SecuritySupport.cs
@@ -63,7 +63,7 @@ public enum ExecutionPolicy
         /// 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 e6ca212c274..37e29c1f7cb 100644
--- a/src/System.Management.Automation/security/nativeMethods.cs
+++ b/src/System.Management.Automation/security/nativeMethods.cs
@@ -556,7 +556,7 @@ internal enum CryptUIFlags
         {
             CRYPTUI_WIZ_NO_UI = 0x0001
             // other flags not used
-        };
+        }
 
         [StructLayout(LayoutKind.Sequential)]
         internal struct CRYPTUI_WIZ_DIGITAL_SIGN_INFO
@@ -575,14 +575,14 @@ internal struct CRYPTUI_WIZ_DIGITAL_SIGN_INFO
 
             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 @@ internal enum SignInfoCertChoice
             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 @@ internal struct CRYPTUI_WIZ_DIGITAL_SIGN_EXTENDED_INFO
             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 @@ internal struct WINTRUST_FILE_INFO
             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 @@ internal enum WintrustUIChoice
             WTD_UI_NONE = 2,
             WTD_UI_NOBAD = 3,
             WTD_UI_NOGOOD = 4
-        };
+        }
 
         [Flags]
         internal enum WintrustUnionChoice
@@ -881,7 +881,7 @@ internal enum WintrustUnionChoice
             WTD_CHOICE_BLOB = 3,
             // WTD_CHOICE_SIGNER = 4,
             // WTD_CHOICE_CERT = 5,
-        };
+        }
 
         [Flags]
         internal enum WintrustProviderFlags
@@ -899,7 +899,7 @@ internal enum WintrustProviderFlags
             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 @@ internal enum WintrustAction
             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 @@ internal struct CRYPT_PROVIDER_CERT
             private DWORD _dwCtlError;
             private BOOL _fIsCyclic;
             private IntPtr _pChainElement; // PCERT_CHAIN_ELEMENT
-        };
+        }
 
         [StructLayout(LayoutKind.Sequential)]
         internal struct CRYPT_PROVIDER_SGNR
@@ -1118,7 +1118,7 @@ internal struct CRYPT_PROVIDER_SGNR
             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 @@ internal struct CERT_ENHKEY_USAGE
             // [MarshalAs(UnmanagedType.LPArray, ArraySubType=UnmanagedType.LPStr, SizeParamIndex=0)]
             // internal string[] rgpszUsageIdentifier; // LPSTR*
             internal IntPtr rgpszUsageIdentifier;
-        };
+        }
 
         internal enum SIGNATURE_STATE
         {
@@ -1877,7 +1877,7 @@ internal static bool IsSystem32DllPresent(string DllName)
                                         NativeMethods.LOAD_LIBRARY_AS_DATAFILE |
                                             NativeMethods.LOAD_LIBRARY_AS_IMAGE_RESOURCE |
                                             NativeMethods.LOAD_LIBRARY_SEARCH_SYSTEM32);
-                if (IntPtr.Zero != module)
+                if (module != IntPtr.Zero)
                 {
                     FreeLibrary(module);
                     DllExists = true;
@@ -1955,19 +1955,19 @@ internal struct SIP_INDIRECT_DATA
         }
 
         [StructLayout(LayoutKind.Sequential)]
-        internal struct CRYPTCATCDF
+        internal readonly struct CRYPTCATCDF
         {
-            private DWORD _cbStruct;
-            private IntPtr _hFile;
-            private DWORD _dwCurFilePos;
-            private DWORD _dwLastMemberOffset;
-            private BOOL _fEOF;
+            private readonly DWORD _cbStruct;
+            private readonly IntPtr _hFile;
+            private readonly DWORD _dwCurFilePos;
+            private readonly DWORD _dwLastMemberOffset;
+            private readonly BOOL _fEOF;
 
             [MarshalAs(UnmanagedType.LPWStr)]
-            private string _pwszResultDir;
+            private readonly string _pwszResultDir;
 
-            private IntPtr _hCATStore;
-        };
+            private readonly IntPtr _hCATStore;
+        }
 
         [StructLayout(LayoutKind.Sequential)]
         internal struct CRYPTCATMEMBER
@@ -1988,7 +1988,7 @@ internal struct CRYPTCATMEMBER
             internal IntPtr hReserved;
             internal CRYPT_ATTR_BLOB sEncodedIndirectData;
             internal CRYPT_ATTR_BLOB sEncodedMemberInfo;
-        };
+        }
 
         [StructLayout(LayoutKind.Sequential)]
         internal struct CRYPTCATATTRIBUTE
@@ -2002,7 +2002,7 @@ internal struct CRYPTCATATTRIBUTE
             internal DWORD cbValue;
             internal System.IntPtr pbValue;
             private DWORD _dwReserved;
-        };
+        }
 
         [StructLayout(LayoutKind.Sequential)]
         internal struct CRYPTCATSTORE
@@ -2020,7 +2020,7 @@ internal struct CRYPTCATSTORE
             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/security/wldpNativeMethods.cs b/src/System.Management.Automation/security/wldpNativeMethods.cs
index 5d4b49270c3..0eb53dbcb3a 100644
--- a/src/System.Management.Automation/security/wldpNativeMethods.cs
+++ b/src/System.Management.Automation/security/wldpNativeMethods.cs
@@ -78,28 +78,31 @@ public static SystemEnforcementMode GetSystemLockdownPolicy()
         /// <returns>An EnforcementMode that describes policy.</returns>
         public static SystemEnforcementMode GetLockdownPolicy(string path, SafeHandle handle)
         {
-            // Check the WLDP API
-            SystemEnforcementMode lockdownPolicy = GetWldpPolicy(path, handle);
-            if (lockdownPolicy == SystemEnforcementMode.Enforce)
+            // Check the WLDP File policy via API
+            var wldpFilePolicy = GetWldpPolicy(path, handle);
+            if (wldpFilePolicy == SystemEnforcementMode.Enforce)
             {
-                return lockdownPolicy;
+                return wldpFilePolicy;
+            }
+
+            // Check the AppLocker File policy via API
+            // This needs to be checked before WLDP audit policy
+            // So, that we don't end up in Audit mode,
+            // when we should be enforce mode.
+            var appLockerFilePolicy = GetAppLockerPolicy(path, handle);
+            if (appLockerFilePolicy == SystemEnforcementMode.Enforce)
+            {
+                return appLockerFilePolicy;
             }
 
             // At this point, LockdownPolicy = Audit or Allowed.
             // If there was a WLDP policy, but WLDP didn't block it,
             // then it was explicitly allowed. Therefore, return the result for the file.
             SystemEnforcementMode systemWldpPolicy = s_cachedWldpSystemPolicy.GetValueOrDefault(SystemEnforcementMode.None);
-            if ((systemWldpPolicy == SystemEnforcementMode.Enforce) ||
-                (systemWldpPolicy == SystemEnforcementMode.Audit))
-            {
-                return lockdownPolicy;
-            }
-
-            // Check the AppLocker API
-            lockdownPolicy = GetAppLockerPolicy(path, handle);
-            if (lockdownPolicy == SystemEnforcementMode.Enforce)
+            if ((systemWldpPolicy == SystemEnforcementMode.Audit) ||
+                (systemWldpPolicy == SystemEnforcementMode.Enforce))
             {
-                return lockdownPolicy;
+                return wldpFilePolicy;
             }
 
             // If there was a system-wide AppLocker policy, but AppLocker didn't block it,
@@ -107,7 +110,7 @@ public static SystemEnforcementMode GetLockdownPolicy(string path, SafeHandle ha
             if (s_cachedSaferSystemPolicy.GetValueOrDefault(SaferPolicy.Allowed) ==
                 SaferPolicy.Disallowed)
             {
-                return lockdownPolicy;
+                return appLockerFilePolicy;
             }
 
             // If it's not set to 'Enforce' by the platform, allow debug overrides
@@ -230,7 +233,7 @@ private static SystemEnforcementMode GetAppLockerPolicy(string path, SafeHandle
 
                                 // AppLocker fails when you try to check a policy on a file
                                 // with no content. So create a scratch file and test on that.
-                                string dtAppLockerTestFileContents = AppLockerTestFileContents + DateTime.Now;
+                                string dtAppLockerTestFileContents = AppLockerTestFileContents + Environment.TickCount64;
                                 IO.File.WriteAllText(testPathScript, dtAppLockerTestFileContents);
                                 IO.File.WriteAllText(testPathModule, dtAppLockerTestFileContents);
                             }
diff --git a/src/System.Management.Automation/utils/CommandDiscoveryExceptions.cs b/src/System.Management.Automation/utils/CommandDiscoveryExceptions.cs
index 81b011d389a..e08d8e1a65c 100644
--- a/src/System.Management.Automation/utils/CommandDiscoveryExceptions.cs
+++ b/src/System.Management.Automation/utils/CommandDiscoveryExceptions.cs
@@ -161,7 +161,7 @@ params object[] messageArgs
             )
         {
             object[] a;
-            if (messageArgs != null && 0 < messageArgs.Length)
+            if (messageArgs != null && messageArgs.Length > 0)
             {
                 a = new object[messageArgs.Length + 1];
                 a[0] = commandName;
diff --git a/src/System.Management.Automation/utils/CryptoUtils.cs b/src/System.Management.Automation/utils/CryptoUtils.cs
index c75acdf1aff..96877437da2 100644
--- a/src/System.Management.Automation/utils/CryptoUtils.cs
+++ b/src/System.Management.Automation/utils/CryptoUtils.cs
@@ -627,18 +627,6 @@ protected void Dispose(bool disposing)
             }
         }
 
-        /// <summary>
-        /// Destructor.
-        /// </summary>
-        ~PSRSACryptoServiceProvider()
-        {
-            // When Dispose() is called, GC.SuppressFinalize()
-            // is called and therefore this finalizer will not
-            // be invoked. Hence this is run only on process
-            // shutdown
-            Dispose(true);
-        }
-
         #endregion IDisposable
     }
 
diff --git a/src/System.Management.Automation/utils/EncodingUtils.cs b/src/System.Management.Automation/utils/EncodingUtils.cs
index 33ff3c7f598..e9802488006 100644
--- a/src/System.Management.Automation/utils/EncodingUtils.cs
+++ b/src/System.Management.Automation/utils/EncodingUtils.cs
@@ -64,7 +64,7 @@ internal static Encoding Convert(Cmdlet cmdlet, string encoding)
             if (encodingMap.TryGetValue(encoding, out foundEncoding))
             {
                 // Write a warning if using utf7 as it is obsolete in .NET5
-                if (string.Compare(encoding, Utf7, StringComparison.OrdinalIgnoreCase) == 0)
+                if (string.Equals(encoding, Utf7, StringComparison.OrdinalIgnoreCase))
                 {
                     cmdlet.WriteWarning(PathUtilsStrings.Utf7EncodingObsolete);
                 }
diff --git a/src/System.Management.Automation/utils/ExecutionExceptions.cs b/src/System.Management.Automation/utils/ExecutionExceptions.cs
index eb392f7536a..226a9cb8cdd 100644
--- a/src/System.Management.Automation/utils/ExecutionExceptions.cs
+++ b/src/System.Management.Automation/utils/ExecutionExceptions.cs
@@ -285,9 +285,7 @@ public ProviderInfo ProviderInfo
         {
             get
             {
-                return (_providerInvocationException == null)
-                    ? null
-                    : _providerInvocationException.ProviderInfo;
+                return _providerInvocationException?.ProviderInfo;
             }
         }
 
@@ -296,7 +294,7 @@ public ProviderInfo ProviderInfo
         #region Internal
         private static Exception GetInnerException(Exception e)
         {
-            return (e == null) ? null : e.InnerException;
+            return e?.InnerException;
         }
         #endregion Internal
     }
@@ -709,7 +707,7 @@ public override string Message
         {
             get
             {
-                return _message ?? (_message = (_wrapperException != null) ? _wrapperException.Message : string.Empty);
+                return _message ??= (_wrapperException != null) ? _wrapperException.Message : string.Empty;
             }
         }
 
diff --git a/src/System.Management.Automation/utils/HostInterfacesExceptions.cs b/src/System.Management.Automation/utils/HostInterfacesExceptions.cs
index dab2568a2f7..c70a007d0f1 100644
--- a/src/System.Management.Automation/utils/HostInterfacesExceptions.cs
+++ b/src/System.Management.Automation/utils/HostInterfacesExceptions.cs
@@ -101,6 +101,7 @@ class HostException : RuntimeException
             : base(info, context)
         {
         }
+
         #endregion
         #region private
         private void SetDefaultErrorRecord()
diff --git a/src/System.Management.Automation/utils/IObjectWriter.cs b/src/System.Management.Automation/utils/IObjectWriter.cs
index 226082be67e..49181e34584 100644
--- a/src/System.Management.Automation/utils/IObjectWriter.cs
+++ b/src/System.Management.Automation/utils/IObjectWriter.cs
@@ -160,7 +160,7 @@ public override void Flush()
 
         public override int Write(object obj)
         {
-            int numberOfObjectsWritten = 1;
+            const int numberOfObjectsWritten = 1;
             _count += numberOfObjectsWritten;
             return numberOfObjectsWritten;
         }
diff --git a/src/System.Management.Automation/utils/ObjectReader.cs b/src/System.Management.Automation/utils/ObjectReader.cs
index 5b5e588f6e6..f06243ddd5b 100644
--- a/src/System.Management.Automation/utils/ObjectReader.cs
+++ b/src/System.Management.Automation/utils/ObjectReader.cs
@@ -21,7 +21,7 @@ internal abstract class ObjectReaderBase<T> : PipelineReader<T>, IDisposable
         /// </summary>
         /// <param name="stream">The stream to read.</param>
         /// <exception cref="ArgumentNullException">Thrown if the specified stream is null.</exception>
-        public ObjectReaderBase([In, Out] ObjectStreamBase stream)
+        protected ObjectReaderBase([In, Out] ObjectStreamBase stream)
         {
             if (stream == null)
             {
@@ -617,7 +617,7 @@ protected override void Dispose(bool disposing)
             }
         }
 
-        private ReturnType ConvertToReturnType(object inputObject)
+        private static ReturnType ConvertToReturnType(object inputObject)
         {
             Type resultType = typeof(ReturnType);
             if (typeof(PSObject) == resultType || typeof(object) == resultType)
@@ -793,7 +793,7 @@ public override ReturnType Peek()
         /// </summary>
         /// <param name="inputObject">Input object to convert.</param>
         /// <returns>Input object converted to the specified return type.</returns>
-        private ReturnType ConvertToReturnType(object inputObject)
+        private static ReturnType ConvertToReturnType(object inputObject)
         {
             Type resultType = typeof(ReturnType);
             if (typeof(PSObject) == resultType || typeof(object) == resultType)
diff --git a/src/System.Management.Automation/utils/ObjectStream.cs b/src/System.Management.Automation/utils/ObjectStream.cs
index 807292fd3d8..2f4cbef8a08 100644
--- a/src/System.Management.Automation/utils/ObjectStream.cs
+++ b/src/System.Management.Automation/utils/ObjectStream.cs
@@ -1403,7 +1403,7 @@ internal override int Write(object obj, bool enumerateCollection)
                         // subtraction to ensure we don't have an
                         // overflow exception
                         int freeSpace = _capacity - _objects.Count;
-                        if (0 >= freeSpace)
+                        if (freeSpace <= 0)
                         {
                             // NOTE: lock is released in finally
                             continue;
diff --git a/src/System.Management.Automation/utils/ParameterBinderExceptions.cs b/src/System.Management.Automation/utils/ParameterBinderExceptions.cs
index baee153558d..841523f6bdb 100644
--- a/src/System.Management.Automation/utils/ParameterBinderExceptions.cs
+++ b/src/System.Management.Automation/utils/ParameterBinderExceptions.cs
@@ -384,7 +384,7 @@ public ParameterBindingException(
         /// </summary>
         public override string Message
         {
-            get { return _message ?? (_message = BuildMessage()); }
+            get { return _message ??= BuildMessage(); }
         }
 
         private string _message;
diff --git a/src/System.Management.Automation/utils/PathUtils.cs b/src/System.Management.Automation/utils/PathUtils.cs
index ad92bc37fff..991e3fa63b6 100644
--- a/src/System.Management.Automation/utils/PathUtils.cs
+++ b/src/System.Management.Automation/utils/PathUtils.cs
@@ -23,13 +23,13 @@ internal static class PathUtils
         /// <param name="cmdlet">Cmdlet that is opening the file (used mainly for error reporting).</param>
         /// <param name="filePath">Path to the file (as specified on the command line - this method will resolve the path).</param>
         /// <param name="encoding">Encoding (this method will convert the command line string to an Encoding instance).</param>
-        /// <param name="defaultEncoding">If <c>true</c>, then we will use default .NET encoding instead of the encoding specified in <paramref name="encoding"/> parameter.</param>
+        /// <param name="defaultEncoding">If <see langword="true"/>, then we will use default .NET encoding instead of the encoding specified in <paramref name="encoding"/> parameter.</param>
         /// <param name="Append"></param>
         /// <param name="Force"></param>
         /// <param name="NoClobber"></param>
         /// <param name="fileStream">Result1: <see cref="FileStream"/> opened for writing.</param>
         /// <param name="streamWriter">Result2: <see cref="StreamWriter"/> (inherits from <see cref="TextWriter"/>) opened for writing.</param>
-        /// <param name="readOnlyFileInfo">Result3: file info that should be used to restore file attributes after done with the file (<c>null</c> is this is not needed).</param>
+        /// <param name="readOnlyFileInfo">Result3: file info that should be used to restore file attributes after done with the file (<see langword="null"/> is this is not needed).</param>
         /// <param name="isLiteralPath">True if wildcard expansion should be bypassed.</param>
         internal static void MasterStreamOpen(
             PSCmdlet cmdlet,
@@ -57,13 +57,13 @@ bool isLiteralPath
         /// <param name="cmdlet">Cmdlet that is opening the file (used mainly for error reporting).</param>
         /// <param name="filePath">Path to the file (as specified on the command line - this method will resolve the path).</param>
         /// <param name="resolvedEncoding">Encoding (this method will convert the command line string to an Encoding instance).</param>
-        /// <param name="defaultEncoding">If <c>true</c>, then we will use default .NET encoding instead of the encoding specified in <paramref name="encoding"/> parameter.</param>
+        /// <param name="defaultEncoding">If <see langword="true"/>, then we will use default .NET encoding instead of the encoding specified in <paramref name="encoding"/> parameter.</param>
         /// <param name="Append"></param>
         /// <param name="Force"></param>
         /// <param name="NoClobber"></param>
         /// <param name="fileStream">Result1: <see cref="FileStream"/> opened for writing.</param>
         /// <param name="streamWriter">Result2: <see cref="StreamWriter"/> (inherits from <see cref="TextWriter"/>) opened for writing.</param>
-        /// <param name="readOnlyFileInfo">Result3: file info that should be used to restore file attributes after done with the file (<c>null</c> is this is not needed).</param>
+        /// <param name="readOnlyFileInfo">Result3: file info that should be used to restore file attributes after done with the file (<see langword="null"/> is this is not needed).</param>
         /// <param name="isLiteralPath">True if wildcard expansion should be bypassed.</param>
         internal static void MasterStreamOpen(
             PSCmdlet cmdlet,
diff --git a/src/System.Management.Automation/utils/PlatformInvokes.cs b/src/System.Management.Automation/utils/PlatformInvokes.cs
index 6d76f8feb1a..c8dc6290511 100644
--- a/src/System.Management.Automation/utils/PlatformInvokes.cs
+++ b/src/System.Management.Automation/utils/PlatformInvokes.cs
@@ -32,7 +32,7 @@ public long ToTicks()
             {
                 return ((long)dwHighDateTime << 32) + dwLowDateTime;
             }
-        };
+        }
 
         [Flags]
         // dwDesiredAccess of CreateFile
diff --git a/src/System.Management.Automation/utils/PowerShellETWTracer.cs b/src/System.Management.Automation/utils/PowerShellETWTracer.cs
index 7631d760b2d..9c5e2046c87 100644
--- a/src/System.Management.Automation/utils/PowerShellETWTracer.cs
+++ b/src/System.Management.Automation/utils/PowerShellETWTracer.cs
@@ -866,7 +866,7 @@ private bool Trace(PowerShellTraceEvent traceEvent, PowerShellTraceLevel level,
                 }
             }
 
-            return _provider.WriteEvent(ref ed, args);
+            return _provider.WriteEvent(in ed, args);
         }
 
         /// <summary>
@@ -988,7 +988,7 @@ public void Dispose()
         /// </summary>
         public PowerShellTraceTask Task { get; set; } = PowerShellTraceTask.None;
 
-        private bool IsEtwSupported
+        private static bool IsEtwSupported
         {
             get
             {
diff --git a/src/System.Management.Automation/utils/SessionStateExceptions.cs b/src/System.Management.Automation/utils/SessionStateExceptions.cs
index b8b79af68a6..a08e7615dc5 100644
--- a/src/System.Management.Automation/utils/SessionStateExceptions.cs
+++ b/src/System.Management.Automation/utils/SessionStateExceptions.cs
@@ -543,7 +543,7 @@ private static string BuildMessage(
             params object[] messageArgs)
         {
             object[] a;
-            if (messageArgs != null && 0 < messageArgs.Length)
+            if (messageArgs != null && messageArgs.Length > 0)
             {
                 a = new object[messageArgs.Length + 1];
                 a[0] = itemName;
diff --git a/src/System.Management.Automation/utils/StructuredTraceSource.cs b/src/System.Management.Automation/utils/StructuredTraceSource.cs
index 84eb6fa40ef..47b6e1b4e1d 100644
--- a/src/System.Management.Automation/utils/StructuredTraceSource.cs
+++ b/src/System.Management.Automation/utils/StructuredTraceSource.cs
@@ -1443,7 +1443,7 @@ internal static int ThreadIndentLevel
         /// </summary>
         internal TraceSource TraceSource
         {
-            get { return _traceSource ?? (_traceSource = new MonadTraceSource(_name)); }
+            get { return _traceSource ??= new MonadTraceSource(_name); }
         }
 
         private TraceSource _traceSource;
diff --git a/src/System.Management.Automation/utils/tracing/EtwActivity.cs b/src/System.Management.Automation/utils/tracing/EtwActivity.cs
index 54e1034b1ac..b50f68e699d 100644
--- a/src/System.Management.Automation/utils/tracing/EtwActivity.cs
+++ b/src/System.Management.Automation/utils/tracing/EtwActivity.cs
@@ -255,7 +255,7 @@ public void Callback(IAsyncResult asyncResult)
         private static readonly Dictionary<Guid, EventProvider> providers = new Dictionary<Guid, EventProvider>();
         private static readonly object syncLock = new object();
 
-        private static EventDescriptor _WriteTransferEvent = new EventDescriptor(0x1f05, 0x1, 0x11, 0x5, 0x14, 0x0, (long)0x4000000000000000);
+        private static readonly EventDescriptor _WriteTransferEvent = new EventDescriptor(0x1f05, 0x1, 0x11, 0x5, 0x14, 0x0, (long)0x4000000000000000);
 
         private EventProvider currentProvider;
 
@@ -328,7 +328,7 @@ public void CorrelateWithActivity(Guid parentActivityId)
             if (parentActivityId != Guid.Empty)
             {
                 EventDescriptor transferEvent = TransferEvent;
-                provider.WriteTransferEvent(ref transferEvent, parentActivityId, activityId, parentActivityId);
+                provider.WriteTransferEvent(in transferEvent, parentActivityId, activityId, parentActivityId);
             }
         }
 
@@ -473,7 +473,7 @@ protected void WriteEvent(EventDescriptor ed, params object[] payload)
                 }
             }
 
-            bool success = provider.WriteEvent(ref ed, payload);
+            bool success = provider.WriteEvent(in ed, payload);
             if (EventWritten != null)
             {
                 EventWritten.Invoke(this, new EtwEventArgs(ed, success, payload));
diff --git a/src/System.Management.Automation/utils/tracing/EtwActivityReverter.cs b/src/System.Management.Automation/utils/tracing/EtwActivityReverter.cs
index a7a257ceb21..5154f637283 100644
--- a/src/System.Management.Automation/utils/tracing/EtwActivityReverter.cs
+++ b/src/System.Management.Automation/utils/tracing/EtwActivityReverter.cs
@@ -20,7 +20,7 @@ public interface IEtwActivityReverter :
         ///     Reverts the ETW activity ID of the current thread to its original value.
         /// </summary>
         /// <remarks>
-        ///     <para>Calling <see cref="IDisposable.Dispose" /> has the same effect as
+        ///     <para>Calling <see cref="IDisposable.Dispose"/> has the same effect as
         ///         calling this method and is useful in the C# "using" syntax.</para>
         /// </remarks>
         void RevertCurrentActivityId();
diff --git a/src/System.Management.Automation/utils/tracing/EtwEventCorrelator.cs b/src/System.Management.Automation/utils/tracing/EtwEventCorrelator.cs
index 4895a582223..a421b918eb8 100644
--- a/src/System.Management.Automation/utils/tracing/EtwEventCorrelator.cs
+++ b/src/System.Management.Automation/utils/tracing/EtwEventCorrelator.cs
@@ -12,6 +12,7 @@ namespace System.Management.Automation.Tracing
     ///     An object that can be used to manage the ETW activity ID of the current thread.
     /// </summary>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Etw")]
+#nullable enable
     public interface IEtwEventCorrelator
     {
         /// <summary>
@@ -19,8 +20,8 @@ public interface IEtwEventCorrelator
         /// </summary>
         /// <remarks>
         ///     <para>This method should only be used for advanced scenarios
-        ///         or diagnostics.  Prefer using <see cref="StartActivity()" />
-        ///         or <see cref="StartActivity(Guid)" /> instead.</para>
+        ///         or diagnostics.  Prefer using <see cref="StartActivity()"/>
+        ///         or <see cref="StartActivity(Guid)"/> instead.</para>
         /// </remarks>
         Guid CurrentActivityId { get; set; }
 
@@ -29,7 +30,7 @@ public interface IEtwEventCorrelator
         ///     the new activity with another activity.
         /// </summary>
         /// <param name="relatedActivityId">The ID of an existing activity to be correlated with the
-        ///     new activity or <see cref="Guid.Empty" /> if correlation is not desired.</param>
+        ///     new activity or <see cref="Guid.Empty"/> if correlation is not desired.</param>
         /// <returns>An object which can be used to revert the activity ID of the current thread once
         ///     the new activity yields control of the current thread.</returns>
         IEtwActivityReverter StartActivity(Guid relatedActivityId);
@@ -42,9 +43,10 @@ public interface IEtwEventCorrelator
         ///     the new activity yields control of the current thread.</returns>
         IEtwActivityReverter StartActivity();
     }
+#nullable restore
 
     /// <summary>
-    ///     A simple implementation of <see cref="IEtwEventCorrelator" />.
+    ///     A simple implementation of <see cref="IEtwEventCorrelator"/>.
     /// </summary>
     [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Etw")]
     public class EtwEventCorrelator :
@@ -54,11 +56,11 @@ public class EtwEventCorrelator :
         private readonly EventDescriptor _transferEvent;
 
         /// <summary>
-        ///     Creates an <see cref="EtwEventCorrelator" />.
+        ///     Creates an <see cref="EtwEventCorrelator"/>.
         /// </summary>
-        /// <param name="transferProvider">The <see cref="EventProvider" /> to use when logging transfer events
+        /// <param name="transferProvider">The <see cref="EventProvider"/> to use when logging transfer events
         ///     during activity correlation.</param>
-        /// <param name="transferEvent">The <see cref="EventDescriptor" /> to use when logging transfer events
+        /// <param name="transferEvent">The <see cref="EventDescriptor"/> to use when logging transfer events
         ///     during activity correlation.</param>
         public EtwEventCorrelator(EventProvider transferProvider, EventDescriptor transferEvent)
         {
@@ -72,7 +74,7 @@ public EtwEventCorrelator(EventProvider transferProvider, EventDescriptor transf
         }
 
         /// <summary>
-        ///     Implements <see cref="IEtwEventCorrelator.CurrentActivityId" />.
+        ///     Implements <see cref="IEtwEventCorrelator.CurrentActivityId"/>.
         /// </summary>
         public Guid CurrentActivityId
         {
@@ -88,7 +90,7 @@ public Guid CurrentActivityId
         }
 
         /// <summary>
-        ///     Implements <see cref="IEtwEventCorrelator.StartActivity(Guid)" />.
+        ///     Implements <see cref="IEtwEventCorrelator.StartActivity(Guid)"/>.
         /// </summary>
         public IEtwActivityReverter StartActivity(Guid relatedActivityId)
         {
@@ -98,14 +100,14 @@ public IEtwActivityReverter StartActivity(Guid relatedActivityId)
             if (relatedActivityId != Guid.Empty)
             {
                 var tempTransferEvent = _transferEvent;
-                _transferProvider.WriteTransferEvent(ref tempTransferEvent, relatedActivityId);
+                _transferProvider.WriteTransferEvent(in tempTransferEvent, relatedActivityId);
             }
 
             return retActivity;
         }
 
         /// <summary>
-        ///     Implements <see cref="IEtwEventCorrelator.StartActivity()" />.
+        ///     Implements <see cref="IEtwEventCorrelator.StartActivity()"/>.
         /// </summary>
         public IEtwActivityReverter StartActivity()
         {
diff --git a/src/System.Management.Automation/utils/tracing/PSEtwLogProvider.cs b/src/System.Management.Automation/utils/tracing/PSEtwLogProvider.cs
index b511a037294..03b6c9a558b 100755
--- a/src/System.Management.Automation/utils/tracing/PSEtwLogProvider.cs
+++ b/src/System.Management.Automation/utils/tracing/PSEtwLogProvider.cs
@@ -284,7 +284,7 @@ internal void WriteEvent(PSEventId id, PSChannel channel, PSOpcode opcode, PSLev
             EventDescriptor desc = new EventDescriptor((int)id, (byte)PSEventVersion.One, (byte)channel,
                 (byte)level, (byte)opcode, (int)task, longKeyword);
 
-            etwProvider.WriteEvent(ref desc, args);
+            etwProvider.WriteEvent(in desc, args);
         }
 
         /// <summary>
@@ -292,7 +292,7 @@ internal void WriteEvent(PSEventId id, PSChannel channel, PSOpcode opcode, PSLev
         /// </summary>
         internal void WriteTransferEvent(Guid parentActivityId)
         {
-            etwProvider.WriteTransferEvent(ref _xferEventDescriptor, parentActivityId, EtwActivity.GetActivityId(), parentActivityId);
+            etwProvider.WriteTransferEvent(in _xferEventDescriptor, parentActivityId, EtwActivity.GetActivityId(), parentActivityId);
         }
 
         /// <summary>
diff --git a/src/System.Management.Automation/utils/tracing/TracingGen.cs b/src/System.Management.Automation/utils/tracing/TracingGen.cs
index ea369e4513a..d6d5f5070bb 100644
--- a/src/System.Management.Automation/utils/tracing/TracingGen.cs
+++ b/src/System.Management.Automation/utils/tracing/TracingGen.cs
@@ -38,88 +38,88 @@ public sealed partial class Tracer : System.Management.Automation.Tracing.EtwAct
         public const long KeywordAll = 0xFFFFFFFF;
 
         private static Guid providerId = Guid.Parse("a0c1853b-5c40-4b15-8766-3cf1c58f985a");
-        private static EventDescriptor WriteTransferEventEvent;
-        private static EventDescriptor DebugMessageEvent;
-        private static EventDescriptor M3PAbortingWorkflowExecutionEvent;
-        private static EventDescriptor M3PActivityExecutionFinishedEvent;
-        private static EventDescriptor M3PActivityExecutionQueuedEvent;
-        private static EventDescriptor M3PActivityExecutionStartedEvent;
-        private static EventDescriptor M3PBeginContainerParentJobExecutionEvent;
-        private static EventDescriptor M3PBeginCreateNewJobEvent;
-        private static EventDescriptor M3PBeginJobLogicEvent;
-        private static EventDescriptor M3PBeginProxyChildJobEventHandlerEvent;
-        private static EventDescriptor M3PBeginProxyJobEventHandlerEvent;
-        private static EventDescriptor M3PBeginProxyJobExecutionEvent;
-        private static EventDescriptor M3PBeginRunGarbageCollectionEvent;
-        private static EventDescriptor M3PBeginStartWorkflowApplicationEvent;
-        private static EventDescriptor M3PBeginWorkflowExecutionEvent;
-        private static EventDescriptor M3PCancellingWorkflowExecutionEvent;
-        private static EventDescriptor M3PChildWorkflowJobAdditionEvent;
-        private static EventDescriptor M3PEndContainerParentJobExecutionEvent;
-        private static EventDescriptor M3PEndCreateNewJobEvent;
-        private static EventDescriptor M3PEndJobLogicEvent;
-        private static EventDescriptor M3PEndpointDisabledEvent;
-        private static EventDescriptor M3PEndpointEnabledEvent;
-        private static EventDescriptor M3PEndpointModifiedEvent;
-        private static EventDescriptor M3PEndpointRegisteredEvent;
-        private static EventDescriptor M3PEndpointUnregisteredEvent;
-        private static EventDescriptor M3PEndProxyChildJobEventHandlerEvent;
-        private static EventDescriptor M3PEndProxyJobEventHandlerEvent;
-        private static EventDescriptor M3PEndProxyJobExecutionEvent;
-        private static EventDescriptor M3PEndRunGarbageCollectionEvent;
-        private static EventDescriptor M3PEndStartWorkflowApplicationEvent;
-        private static EventDescriptor M3PEndWorkflowExecutionEvent;
-        private static EventDescriptor M3PErrorImportingWorkflowFromXamlEvent;
-        private static EventDescriptor M3PForcedWorkflowShutdownErrorEvent;
-        private static EventDescriptor M3PForcedWorkflowShutdownFinishedEvent;
-        private static EventDescriptor M3PForcedWorkflowShutdownStartedEvent;
-        private static EventDescriptor M3PImportedWorkflowFromXamlEvent;
-        private static EventDescriptor M3PImportingWorkflowFromXamlEvent;
-        private static EventDescriptor M3PJobCreationCompleteEvent;
-        private static EventDescriptor M3PJobErrorEvent;
-        private static EventDescriptor M3PJobRemovedEvent;
-        private static EventDescriptor M3PJobRemoveErrorEvent;
-        private static EventDescriptor M3PJobStateChangedEvent;
-        private static EventDescriptor M3PLoadingWorkflowForExecutionEvent;
-        private static EventDescriptor M3POutOfProcessRunspaceStartedEvent;
-        private static EventDescriptor M3PParameterSplattingWasPerformedEvent;
-        private static EventDescriptor M3PParentJobCreatedEvent;
-        private static EventDescriptor M3PPersistenceStoreMaxSizeReachedEvent;
-        private static EventDescriptor M3PPersistingWorkflowEvent;
-        private static EventDescriptor M3PProxyJobRemoteJobAssociationEvent;
-        private static EventDescriptor M3PRemoveJobStartedEvent;
-        private static EventDescriptor M3PRunspaceAvailabilityChangedEvent;
-        private static EventDescriptor M3PRunspaceStateChangedEvent;
-        private static EventDescriptor M3PTrackingGuidContainerParentJobCorrelationEvent;
-        private static EventDescriptor M3PUnloadingWorkflowEvent;
-        private static EventDescriptor M3PWorkflowActivityExecutionFailedEvent;
-        private static EventDescriptor M3PWorkflowActivityValidatedEvent;
-        private static EventDescriptor M3PWorkflowActivityValidationFailedEvent;
-        private static EventDescriptor M3PWorkflowCleanupPerformedEvent;
-        private static EventDescriptor M3PWorkflowDeletedFromDiskEvent;
-        private static EventDescriptor M3PWorkflowEngineStartedEvent;
-        private static EventDescriptor M3PWorkflowExecutionAbortedEvent;
-        private static EventDescriptor M3PWorkflowExecutionCancelledEvent;
-        private static EventDescriptor M3PWorkflowExecutionErrorEvent;
-        private static EventDescriptor M3PWorkflowExecutionFinishedEvent;
-        private static EventDescriptor M3PWorkflowExecutionStartedEvent;
-        private static EventDescriptor M3PWorkflowJobCreatedEvent;
-        private static EventDescriptor M3PWorkflowLoadedForExecutionEvent;
-        private static EventDescriptor M3PWorkflowLoadedFromDiskEvent;
-        private static EventDescriptor M3PWorkflowManagerCheckpointEvent;
-        private static EventDescriptor M3PWorkflowPersistedEvent;
-        private static EventDescriptor M3PWorkflowPluginRequestedToShutdownEvent;
-        private static EventDescriptor M3PWorkflowPluginRestartedEvent;
-        private static EventDescriptor M3PWorkflowPluginStartedEvent;
-        private static EventDescriptor M3PWorkflowQuotaViolatedEvent;
-        private static EventDescriptor M3PWorkflowResumedEvent;
-        private static EventDescriptor M3PWorkflowResumingEvent;
-        private static EventDescriptor M3PWorkflowRunspacePoolCreatedEvent;
-        private static EventDescriptor M3PWorkflowStateChangedEvent;
-        private static EventDescriptor M3PWorkflowUnloadedEvent;
-        private static EventDescriptor M3PWorkflowValidationErrorEvent;
-        private static EventDescriptor M3PWorkflowValidationFinishedEvent;
-        private static EventDescriptor M3PWorkflowValidationStartedEvent;
+        private static readonly EventDescriptor WriteTransferEventEvent;
+        private static readonly EventDescriptor DebugMessageEvent;
+        private static readonly EventDescriptor M3PAbortingWorkflowExecutionEvent;
+        private static readonly EventDescriptor M3PActivityExecutionFinishedEvent;
+        private static readonly EventDescriptor M3PActivityExecutionQueuedEvent;
+        private static readonly EventDescriptor M3PActivityExecutionStartedEvent;
+        private static readonly EventDescriptor M3PBeginContainerParentJobExecutionEvent;
+        private static readonly EventDescriptor M3PBeginCreateNewJobEvent;
+        private static readonly EventDescriptor M3PBeginJobLogicEvent;
+        private static readonly EventDescriptor M3PBeginProxyChildJobEventHandlerEvent;
+        private static readonly EventDescriptor M3PBeginProxyJobEventHandlerEvent;
+        private static readonly EventDescriptor M3PBeginProxyJobExecutionEvent;
+        private static readonly EventDescriptor M3PBeginRunGarbageCollectionEvent;
+        private static readonly EventDescriptor M3PBeginStartWorkflowApplicationEvent;
+        private static readonly EventDescriptor M3PBeginWorkflowExecutionEvent;
+        private static readonly EventDescriptor M3PCancellingWorkflowExecutionEvent;
+        private static readonly EventDescriptor M3PChildWorkflowJobAdditionEvent;
+        private static readonly EventDescriptor M3PEndContainerParentJobExecutionEvent;
+        private static readonly EventDescriptor M3PEndCreateNewJobEvent;
+        private static readonly EventDescriptor M3PEndJobLogicEvent;
+        private static readonly EventDescriptor M3PEndpointDisabledEvent;
+        private static readonly EventDescriptor M3PEndpointEnabledEvent;
+        private static readonly EventDescriptor M3PEndpointModifiedEvent;
+        private static readonly EventDescriptor M3PEndpointRegisteredEvent;
+        private static readonly EventDescriptor M3PEndpointUnregisteredEvent;
+        private static readonly EventDescriptor M3PEndProxyChildJobEventHandlerEvent;
+        private static readonly EventDescriptor M3PEndProxyJobEventHandlerEvent;
+        private static readonly EventDescriptor M3PEndProxyJobExecutionEvent;
+        private static readonly EventDescriptor M3PEndRunGarbageCollectionEvent;
+        private static readonly EventDescriptor M3PEndStartWorkflowApplicationEvent;
+        private static readonly EventDescriptor M3PEndWorkflowExecutionEvent;
+        private static readonly EventDescriptor M3PErrorImportingWorkflowFromXamlEvent;
+        private static readonly EventDescriptor M3PForcedWorkflowShutdownErrorEvent;
+        private static readonly EventDescriptor M3PForcedWorkflowShutdownFinishedEvent;
+        private static readonly EventDescriptor M3PForcedWorkflowShutdownStartedEvent;
+        private static readonly EventDescriptor M3PImportedWorkflowFromXamlEvent;
+        private static readonly EventDescriptor M3PImportingWorkflowFromXamlEvent;
+        private static readonly EventDescriptor M3PJobCreationCompleteEvent;
+        private static readonly EventDescriptor M3PJobErrorEvent;
+        private static readonly EventDescriptor M3PJobRemovedEvent;
+        private static readonly EventDescriptor M3PJobRemoveErrorEvent;
+        private static readonly EventDescriptor M3PJobStateChangedEvent;
+        private static readonly EventDescriptor M3PLoadingWorkflowForExecutionEvent;
+        private static readonly EventDescriptor M3POutOfProcessRunspaceStartedEvent;
+        private static readonly EventDescriptor M3PParameterSplattingWasPerformedEvent;
+        private static readonly EventDescriptor M3PParentJobCreatedEvent;
+        private static readonly EventDescriptor M3PPersistenceStoreMaxSizeReachedEvent;
+        private static readonly EventDescriptor M3PPersistingWorkflowEvent;
+        private static readonly EventDescriptor M3PProxyJobRemoteJobAssociationEvent;
+        private static readonly EventDescriptor M3PRemoveJobStartedEvent;
+        private static readonly EventDescriptor M3PRunspaceAvailabilityChangedEvent;
+        private static readonly EventDescriptor M3PRunspaceStateChangedEvent;
+        private static readonly EventDescriptor M3PTrackingGuidContainerParentJobCorrelationEvent;
+        private static readonly EventDescriptor M3PUnloadingWorkflowEvent;
+        private static readonly EventDescriptor M3PWorkflowActivityExecutionFailedEvent;
+        private static readonly EventDescriptor M3PWorkflowActivityValidatedEvent;
+        private static readonly EventDescriptor M3PWorkflowActivityValidationFailedEvent;
+        private static readonly EventDescriptor M3PWorkflowCleanupPerformedEvent;
+        private static readonly EventDescriptor M3PWorkflowDeletedFromDiskEvent;
+        private static readonly EventDescriptor M3PWorkflowEngineStartedEvent;
+        private static readonly EventDescriptor M3PWorkflowExecutionAbortedEvent;
+        private static readonly EventDescriptor M3PWorkflowExecutionCancelledEvent;
+        private static readonly EventDescriptor M3PWorkflowExecutionErrorEvent;
+        private static readonly EventDescriptor M3PWorkflowExecutionFinishedEvent;
+        private static readonly EventDescriptor M3PWorkflowExecutionStartedEvent;
+        private static readonly EventDescriptor M3PWorkflowJobCreatedEvent;
+        private static readonly EventDescriptor M3PWorkflowLoadedForExecutionEvent;
+        private static readonly EventDescriptor M3PWorkflowLoadedFromDiskEvent;
+        private static readonly EventDescriptor M3PWorkflowManagerCheckpointEvent;
+        private static readonly EventDescriptor M3PWorkflowPersistedEvent;
+        private static readonly EventDescriptor M3PWorkflowPluginRequestedToShutdownEvent;
+        private static readonly EventDescriptor M3PWorkflowPluginRestartedEvent;
+        private static readonly EventDescriptor M3PWorkflowPluginStartedEvent;
+        private static readonly EventDescriptor M3PWorkflowQuotaViolatedEvent;
+        private static readonly EventDescriptor M3PWorkflowResumedEvent;
+        private static readonly EventDescriptor M3PWorkflowResumingEvent;
+        private static readonly EventDescriptor M3PWorkflowRunspacePoolCreatedEvent;
+        private static readonly EventDescriptor M3PWorkflowStateChangedEvent;
+        private static readonly EventDescriptor M3PWorkflowUnloadedEvent;
+        private static readonly EventDescriptor M3PWorkflowValidationErrorEvent;
+        private static readonly EventDescriptor M3PWorkflowValidationFinishedEvent;
+        private static readonly EventDescriptor M3PWorkflowValidationStartedEvent;
 
         /// <summary>
         /// Static constructor.
diff --git a/src/TypeCatalogGen/TypeCatalogGen.cs b/src/TypeCatalogGen/TypeCatalogGen.cs
index e05f8b63e13..993413bc59a 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<string, string> InitializeTypeCatalog()
+        private static Dictionary<string, string> InitializeTypeCatalog()
         {{
             return new Dictionary<string, string>({0}, StringComparer.OrdinalIgnoreCase) {{";
             const string SourceEnd = @"
diff --git a/src/powershell/Program.cs b/src/powershell/Program.cs
index 9f2af53e758..c885fa7fd2e 100644
--- a/src/powershell/Program.cs
+++ b/src/powershell/Program.cs
@@ -185,7 +185,6 @@ private static void AttemptExecPwshLogin(string[] args)
                     // We can reuse this value later to prevent needing to call a .NET API
                     // to generate our exec invocation.
 
-
                     // We don't care about argc's value, since argv[0] must always exist.
                     // Skip over argc, but remember where exec_path is for later
                     executablePathPtr = IntPtr.Add(procargs, sizeof(int));
@@ -321,7 +320,7 @@ private static int ExecPwshLogin(string[] args, string pwshPath, bool isMacOS)
             //
             // Since command_name is ignored and we can't use null (it's the terminator)
             // we use empty string
-            execArgs[4] = "";
+            execArgs[4] = string.Empty;
 
             // Add the arguments passed to pwsh on the end.
             args.CopyTo(execArgs, 5);
@@ -371,7 +370,7 @@ private static void CreatePwshInvocation(
             (string path, int quotedLength) invocationInfo)
         {
             // "exec "
-            string prefix = "exec ";
+            const string prefix = "exec ";
             prefix.AsSpan().CopyTo(strBuf);
 
             // The quoted path to pwsh, like "'/opt/microsoft/powershell/7/pwsh'"
@@ -381,7 +380,7 @@ private static void CreatePwshInvocation(
             i += invocationInfo.quotedLength;
 
             // ' "$@"' the argument vector splat to pass pwsh arguments through
-            string suffix = " \"$@\"";
+            const string suffix = " \"$@\"";
             Span<char> bufSuffix = strBuf.Slice(i);
             suffix.AsSpan().CopyTo(bufSuffix);
         }
diff --git a/test/Test.Common.props b/test/Test.Common.props
index 998cb665464..02ac0912eb9 100644
--- a/test/Test.Common.props
+++ b/test/Test.Common.props
@@ -1,4 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Analyzers.props" />
+
   <PropertyGroup>
     <Product>PowerShell Test</Product>
     <Company>Microsoft Corporation</Company>
diff --git a/test/common/markdown/package.json b/test/common/markdown/package.json
index 99462871b52..cefe4fd4b90 100644
--- a/test/common/markdown/package.json
+++ b/test/common/markdown/package.json
@@ -7,8 +7,11 @@
     "dependencies": {
         "gulp": "^4.0.2",
         "markdownlint": "^0.21.0",
-        "through2": "^4.0.2",
-        "yargs-parser": "13.1.2"
+        "through2": "^4.0.2"
+    },
+    "resolutions": {
+        "yargs-parser": "^13.1.2" ,
+        "y18n": "^5.0.5"
     },
     "devDependencies": {
         "gulp-concat": "^2.6.1",
diff --git a/test/common/markdown/yarn.lock b/test/common/markdown/yarn.lock
index 9b80e9de744..1d86b0465ce 100644
--- a/test/common/markdown/yarn.lock
+++ b/test/common/markdown/yarn.lock
@@ -4,38 +4,38 @@
 
 ansi-colors@^1.0.1:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz"
   integrity sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==
   dependencies:
     ansi-wrap "^0.1.0"
 
 ansi-gray@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
+  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz"
   integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE=
   dependencies:
     ansi-wrap "0.1.0"
 
 ansi-regex@^2.0.0:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"
   integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
 ansi-styles@^3.2.1:
   version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
 
 ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
+  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz"
   integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
 
 anymatch@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz"
   integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
   dependencies:
     micromatch "^3.1.4"
@@ -43,60 +43,60 @@ anymatch@^2.0.0:
 
 append-buffer@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1"
+  resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz"
   integrity sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=
   dependencies:
     buffer-equal "^1.0.0"
 
 archy@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
+  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz"
   integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=
 
 argparse@^1.0.7:
   version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"
   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
 arr-diff@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz"
   integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
 arr-filter@^1.1.1:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/arr-filter/-/arr-filter-1.1.2.tgz#43fdddd091e8ef11aa4c45d9cdc18e2dff1711ee"
+  resolved "https://registry.yarnpkg.com/arr-filter/-/arr-filter-1.1.2.tgz"
   integrity sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=
   dependencies:
     make-iterator "^1.0.0"
 
 arr-flatten@^1.0.1, arr-flatten@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz"
   integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
 arr-map@^2.0.0, arr-map@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/arr-map/-/arr-map-2.0.2.tgz#3a77345ffc1cf35e2a91825601f9e58f2e24cac4"
+  resolved "https://registry.yarnpkg.com/arr-map/-/arr-map-2.0.2.tgz"
   integrity sha1-Onc0X/wc814qkYJWAfnljy4kysQ=
   dependencies:
     make-iterator "^1.0.0"
 
 arr-union@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
 array-each@^1.0.0, array-each@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
+  resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz"
   integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8=
 
 array-initial@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/array-initial/-/array-initial-1.1.0.tgz#2fa74b26739371c3947bd7a7adc73be334b3d795"
+  resolved "https://registry.yarnpkg.com/array-initial/-/array-initial-1.1.0.tgz"
   integrity sha1-L6dLJnOTccOUe9enrcc74zSz15U=
   dependencies:
     array-slice "^1.0.0"
@@ -104,19 +104,19 @@ array-initial@^1.0.0:
 
 array-last@^1.1.1:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/array-last/-/array-last-1.3.0.tgz#7aa77073fec565ddab2493f5f88185f404a9d336"
+  resolved "https://registry.yarnpkg.com/array-last/-/array-last-1.3.0.tgz"
   integrity sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==
   dependencies:
     is-number "^4.0.0"
 
 array-slice@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
+  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz"
   integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==
 
 array-sort@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a"
+  resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz"
   integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==
   dependencies:
     default-compare "^1.0.0"
@@ -125,17 +125,17 @@ array-sort@^1.0.0:
 
 array-unique@^0.3.2:
   version "0.3.2"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
 assign-symbols@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz"
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
 async-done@^1.2.0, async-done@^1.2.2:
   version "1.3.2"
-  resolved "https://registry.yarnpkg.com/async-done/-/async-done-1.3.2.tgz#5e15aa729962a4b07414f528a88cdf18e0b290a2"
+  resolved "https://registry.yarnpkg.com/async-done/-/async-done-1.3.2.tgz"
   integrity sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==
   dependencies:
     end-of-stream "^1.1.0"
@@ -145,24 +145,24 @@ async-done@^1.2.0, async-done@^1.2.2:
 
 async-each@^1.0.1:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz"
   integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
 
 async-settle@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/async-settle/-/async-settle-1.0.0.tgz#1d0a914bb02575bec8a8f3a74e5080f72b2c0c6b"
+  resolved "https://registry.yarnpkg.com/async-settle/-/async-settle-1.0.0.tgz"
   integrity sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=
   dependencies:
     async-done "^1.2.2"
 
 atob@^2.1.2:
   version "2.1.2"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 bach@^1.0.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/bach/-/bach-1.2.0.tgz#4b3ce96bf27134f79a1b414a51c14e34c3bd9880"
+  resolved "https://registry.yarnpkg.com/bach/-/bach-1.2.0.tgz"
   integrity sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=
   dependencies:
     arr-filter "^1.1.1"
@@ -177,12 +177,12 @@ bach@^1.0.0:
 
 balanced-match@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
 base@^0.11.1:
   version "0.11.2"
-  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz"
   integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
   dependencies:
     cache-base "^1.0.1"
@@ -195,19 +195,19 @@ base@^0.11.1:
 
 binary-extensions@^1.0.0:
   version "1.13.1"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz"
   integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
 bindings@^1.5.0:
   version "1.5.0"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz"
   integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
   dependencies:
     file-uri-to-path "1.0.0"
 
 brace-expansion@^1.1.7:
   version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"
   integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
@@ -215,7 +215,7 @@ brace-expansion@^1.1.7:
 
 braces@^2.3.1, braces@^2.3.2:
   version "2.3.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz"
   integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
   dependencies:
     arr-flatten "^1.1.0"
@@ -231,17 +231,17 @@ braces@^2.3.1, braces@^2.3.2:
 
 buffer-equal@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe"
+  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz"
   integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74=
 
 buffer-from@^1.0.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
 cache-base@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz"
   integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
   dependencies:
     collection-visit "^1.0.0"
@@ -254,9 +254,17 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
+call-bind@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz"
+  integrity sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.0"
+
 camelcase@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz"
   integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
 
 camelcase@^5.0.0:
@@ -266,7 +274,7 @@ camelcase@^5.0.0:
 
 chalk@^2.3.0:
   version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
   dependencies:
     ansi-styles "^3.2.1"
@@ -275,7 +283,7 @@ chalk@^2.3.0:
 
 chokidar@^2.0.0:
   version "2.1.8"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz"
   integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
   dependencies:
     anymatch "^2.0.0"
@@ -294,7 +302,7 @@ chokidar@^2.0.0:
 
 class-utils@^0.3.5:
   version "0.3.6"
-  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz"
   integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
   dependencies:
     arr-union "^3.1.0"
@@ -304,7 +312,7 @@ class-utils@^0.3.5:
 
 cliui@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz"
   integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
   dependencies:
     string-width "^1.0.1"
@@ -313,22 +321,22 @@ cliui@^3.2.0:
 
 clone-buffer@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
+  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz"
   integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg=
 
 clone-stats@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
+  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz"
   integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=
 
 clone@^2.1.1:
   version "2.1.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz"
   integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
 
 cloneable-readable@^1.0.0:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec"
+  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz"
   integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==
   dependencies:
     inherits "^2.0.1"
@@ -337,12 +345,12 @@ cloneable-readable@^1.0.0:
 
 code-point-at@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
 collection-map@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/collection-map/-/collection-map-1.0.0.tgz#aea0f06f8d26c780c2b75494385544b2255af18c"
+  resolved "https://registry.yarnpkg.com/collection-map/-/collection-map-1.0.0.tgz"
   integrity sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=
   dependencies:
     arr-map "^2.0.2"
@@ -351,7 +359,7 @@ collection-map@^1.0.0:
 
 collection-visit@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz"
   integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
   dependencies:
     map-visit "^1.0.0"
@@ -359,34 +367,34 @@ collection-visit@^1.0.0:
 
 color-convert@^1.9.0:
   version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
     color-name "1.1.3"
 
 color-name@1.1.3:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
 color-support@^1.1.3:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
 component-emitter@^1.2.1:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
 concat-map@0.0.1:
   version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
 concat-stream@^1.6.0:
   version "1.6.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
   dependencies:
     buffer-from "^1.0.0"
@@ -396,26 +404,26 @@ concat-stream@^1.6.0:
 
 concat-with-sourcemaps@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e"
+  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz"
   integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==
   dependencies:
     source-map "^0.6.1"
 
 convert-source-map@^1.5.0:
   version "1.7.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz"
   integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
   dependencies:
     safe-buffer "~5.1.1"
 
 copy-descriptor@^0.1.0:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 copy-props@^2.0.1:
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/copy-props/-/copy-props-2.0.4.tgz#93bb1cadfafd31da5bb8a9d4b41f471ec3a72dfe"
+  resolved "https://registry.yarnpkg.com/copy-props/-/copy-props-2.0.4.tgz"
   integrity sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==
   dependencies:
     each-props "^1.3.0"
@@ -423,12 +431,12 @@ copy-props@^2.0.1:
 
 core-util-is@~1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
 d@1, d@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz"
   integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
   dependencies:
     es5-ext "^0.10.50"
@@ -436,7 +444,7 @@ d@1, d@^1.0.1:
 
 debug@^2.2.0, debug@^2.3.3:
   version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
@@ -448,45 +456,45 @@ decamelize@^1.1.1, decamelize@^1.2.0:
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz"
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 default-compare@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f"
+  resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz"
   integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==
   dependencies:
     kind-of "^5.0.2"
 
 default-resolution@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/default-resolution/-/default-resolution-2.0.0.tgz#bcb82baa72ad79b426a76732f1a81ad6df26d684"
+  resolved "https://registry.yarnpkg.com/default-resolution/-/default-resolution-2.0.0.tgz"
   integrity sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=
 
-define-properties@^1.1.2:
+define-properties@^1.1.3:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"
   integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
   dependencies:
     object-keys "^1.0.12"
 
 define-property@^0.2.5:
   version "0.2.5"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz"
   integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
   dependencies:
     is-descriptor "^0.1.0"
 
 define-property@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz"
   integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
   dependencies:
     is-descriptor "^1.0.0"
 
 define-property@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz"
   integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
   dependencies:
     is-descriptor "^1.0.2"
@@ -494,12 +502,12 @@ define-property@^2.0.2:
 
 detect-file@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
+  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz"
   integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
 
 duplexify@^3.6.0:
   version "3.7.1"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz"
   integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
   dependencies:
     end-of-stream "^1.0.0"
@@ -509,7 +517,7 @@ duplexify@^3.6.0:
 
 each-props@^1.3.0:
   version "1.3.2"
-  resolved "https://registry.yarnpkg.com/each-props/-/each-props-1.3.2.tgz#ea45a414d16dd5cfa419b1a81720d5ca06892333"
+  resolved "https://registry.yarnpkg.com/each-props/-/each-props-1.3.2.tgz"
   integrity sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==
   dependencies:
     is-plain-object "^2.0.1"
@@ -517,26 +525,26 @@ each-props@^1.3.0:
 
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
   dependencies:
     once "^1.4.0"
 
 entities@~2.0.0:
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz"
   integrity sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==
 
 error-ex@^1.2.0:
   version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
 es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50:
   version "0.10.53"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz"
   integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==
   dependencies:
     es6-iterator "~2.0.3"
@@ -545,7 +553,7 @@ es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50:
 
 es6-iterator@^2.0.1, es6-iterator@^2.0.3, es6-iterator@~2.0.3:
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz"
   integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
   dependencies:
     d "1"
@@ -554,7 +562,7 @@ es6-iterator@^2.0.1, es6-iterator@^2.0.3, es6-iterator@~2.0.3:
 
 es6-symbol@^3.1.1, es6-symbol@~3.1.3:
   version "3.1.3"
-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
+  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz"
   integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
   dependencies:
     d "^1.0.1"
@@ -562,7 +570,7 @@ es6-symbol@^3.1.1, es6-symbol@~3.1.3:
 
 es6-weak-map@^2.0.1:
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz#b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53"
+  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz"
   integrity sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==
   dependencies:
     d "1"
@@ -572,12 +580,12 @@ es6-weak-map@^2.0.1:
 
 escape-string-regexp@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
 expand-brackets@^2.1.4:
   version "2.1.4"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz"
   integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
   dependencies:
     debug "^2.3.3"
@@ -590,28 +598,28 @@ expand-brackets@^2.1.4:
 
 expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
+  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz"
   integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
   dependencies:
     homedir-polyfill "^1.0.1"
 
 ext@^1.1.2:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244"
+  resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz"
   integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==
   dependencies:
     type "^2.0.0"
 
 extend-shallow@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz"
   integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
   dependencies:
     is-extendable "^0.1.0"
 
 extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz"
   integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
   dependencies:
     assign-symbols "^1.0.0"
@@ -619,12 +627,12 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
 
 extend@^3.0.0:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
 extglob@^2.0.4:
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz"
   integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
   dependencies:
     array-unique "^0.3.2"
@@ -638,7 +646,7 @@ extglob@^2.0.4:
 
 fancy-log@^1.3.2:
   version "1.3.3"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
+  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz"
   integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==
   dependencies:
     ansi-gray "^0.1.1"
@@ -646,14 +654,19 @@ fancy-log@^1.3.2:
     parse-node-version "^1.0.0"
     time-stamp "^1.0.0"
 
+fast-levenshtein@^1.0.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz"
+  integrity sha1-5qdUzI8V5YmHqpy9J69m/W9OWvk=
+
 file-uri-to-path@1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"
   integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
 fill-range@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz"
   integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
   dependencies:
     extend-shallow "^2.0.1"
@@ -663,7 +676,7 @@ fill-range@^4.0.0:
 
 find-up@^1.0.0:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz"
   integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
   dependencies:
     path-exists "^2.0.0"
@@ -671,7 +684,7 @@ find-up@^1.0.0:
 
 findup-sync@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz"
   integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=
   dependencies:
     detect-file "^1.0.0"
@@ -681,7 +694,7 @@ findup-sync@^2.0.0:
 
 findup-sync@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz"
   integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==
   dependencies:
     detect-file "^1.0.0"
@@ -691,7 +704,7 @@ findup-sync@^3.0.0:
 
 fined@^1.0.1:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b"
+  resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz"
   integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==
   dependencies:
     expand-tilde "^2.0.2"
@@ -702,12 +715,12 @@ fined@^1.0.1:
 
 flagged-respawn@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41"
+  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz"
   integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==
 
 flush-write-stream@^1.0.2:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz"
   integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
   dependencies:
     inherits "^2.0.3"
@@ -715,26 +728,26 @@ flush-write-stream@^1.0.2:
 
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz"
   integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
 for-own@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz"
   integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
   dependencies:
     for-in "^1.0.1"
 
 fragment-cache@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz"
   integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
   dependencies:
     map-cache "^0.2.2"
 
 fs-mkdirp-stream@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz#0b7815fc3201c6a69e14db98ce098c16935259eb"
+  resolved "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz"
   integrity sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=
   dependencies:
     graceful-fs "^4.1.11"
@@ -742,12 +755,12 @@ fs-mkdirp-stream@^1.0.0:
 
 fs.realpath@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^1.2.7:
   version "1.2.13"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz"
   integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
   dependencies:
     bindings "^1.5.0"
@@ -755,27 +768,36 @@ fsevents@^1.2.7:
 
 function-bind@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
 get-caller-file@^1.0.1:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz"
   integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
+get-intrinsic@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz"
+  integrity sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
 get-own-enumerable-property-symbols@^3.0.0:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664"
+  resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"
   integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==
 
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
-  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz"
   integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
 glob-parent@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz"
   integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
   dependencies:
     is-glob "^3.1.0"
@@ -783,7 +805,7 @@ glob-parent@^3.1.0:
 
 glob-stream@^6.1.0:
   version "6.1.0"
-  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4"
+  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz"
   integrity sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=
   dependencies:
     extend "^3.0.0"
@@ -798,20 +820,21 @@ glob-stream@^6.1.0:
     unique-stream "^2.0.2"
 
 glob-watcher@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-5.0.3.tgz#88a8abf1c4d131eb93928994bc4a593c2e5dd626"
-  integrity sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-5.0.5.tgz"
+  integrity sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==
   dependencies:
     anymatch "^2.0.0"
     async-done "^1.2.0"
     chokidar "^2.0.0"
     is-negated-glob "^1.0.0"
     just-debounce "^1.0.0"
+    normalize-path "^3.0.0"
     object.defaults "^1.1.0"
 
 glob@^7.1.1:
   version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
   dependencies:
     fs.realpath "^1.0.0"
@@ -823,7 +846,7 @@ glob@^7.1.1:
 
 global-modules@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz"
   integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
   dependencies:
     global-prefix "^1.0.1"
@@ -832,7 +855,7 @@ global-modules@^1.0.0:
 
 global-prefix@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz"
   integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
   dependencies:
     expand-tilde "^2.0.2"
@@ -843,20 +866,20 @@ global-prefix@^1.0.1:
 
 glogg@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.2.tgz#2d7dd702beda22eb3bffadf880696da6d846313f"
+  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.2.tgz"
   integrity sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==
   dependencies:
     sparkles "^1.0.0"
 
 graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.2.4"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
 gulp-cli@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.2.1.tgz#376e427661b7996430a89d71c15df75defa3360a"
-  integrity sha512-yEMxrXqY8mJFlaauFQxNrCpzWJThu0sH1sqlToaTOT063Hub9s/Nt2C+GSLe6feQ/IMWrHvGOOsyES7CQc9O+A==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.3.0.tgz"
+  integrity sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==
   dependencies:
     ansi-colors "^1.0.1"
     archy "^1.0.0"
@@ -866,7 +889,7 @@ gulp-cli@^2.2.0:
     copy-props "^2.0.1"
     fancy-log "^1.3.2"
     gulplog "^1.0.0"
-    interpret "^1.1.0"
+    interpret "^1.4.0"
     isobject "^3.0.1"
     liftoff "^3.1.0"
     matchdep "^2.0.0"
@@ -874,12 +897,12 @@ gulp-cli@^2.2.0:
     pretty-hrtime "^1.0.0"
     replace-homedir "^1.0.0"
     semver-greatest-satisfied-range "^1.1.0"
-    v8flags "^3.0.1"
+    v8flags "^3.2.0"
     yargs "^7.1.0"
 
 gulp-concat@^2.6.1:
   version "2.6.1"
-  resolved "https://registry.yarnpkg.com/gulp-concat/-/gulp-concat-2.6.1.tgz#633d16c95d88504628ad02665663cee5a4793353"
+  resolved "https://registry.yarnpkg.com/gulp-concat/-/gulp-concat-2.6.1.tgz"
   integrity sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=
   dependencies:
     concat-with-sourcemaps "^1.0.0"
@@ -888,7 +911,7 @@ gulp-concat@^2.6.1:
 
 gulp-debug@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/gulp-debug/-/gulp-debug-4.0.0.tgz#036f9539c3fb6af720e01a9ea5c195fc73f29d5b"
+  resolved "https://registry.yarnpkg.com/gulp-debug/-/gulp-debug-4.0.0.tgz"
   integrity sha512-cn/GhMD2nVZCVxAl5vWao4/dcoZ8wUJ8w3oqTvQaGDmC1vT7swNOEbhQTWJp+/otKePT64aENcqAQXDcdj5H1g==
   dependencies:
     chalk "^2.3.0"
@@ -900,7 +923,7 @@ gulp-debug@^4.0.0:
 
 gulp@^4.0.2:
   version "4.0.2"
-  resolved "https://registry.yarnpkg.com/gulp/-/gulp-4.0.2.tgz#543651070fd0f6ab0a0650c6a3e6ff5a7cb09caa"
+  resolved "https://registry.yarnpkg.com/gulp/-/gulp-4.0.2.tgz"
   integrity sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==
   dependencies:
     glob-watcher "^5.0.3"
@@ -910,24 +933,24 @@ gulp@^4.0.2:
 
 gulplog@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
+  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz"
   integrity sha1-4oxNRdBey77YGDY86PnFkmIp/+U=
   dependencies:
     glogg "^1.0.0"
 
 has-flag@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
-has-symbols@^1.0.0:
+has-symbols@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
 
 has-value@^0.3.1:
   version "0.3.1"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz"
   integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
   dependencies:
     get-value "^2.0.3"
@@ -936,7 +959,7 @@ has-value@^0.3.1:
 
 has-value@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz"
   integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
   dependencies:
     get-value "^2.0.6"
@@ -945,32 +968,39 @@ has-value@^1.0.0:
 
 has-values@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz"
   integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
 
 has-values@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz"
   integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
   dependencies:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
+has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  dependencies:
+    function-bind "^1.1.1"
+
 homedir-polyfill@^1.0.1:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
+  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"
   integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
   dependencies:
     parse-passwd "^1.0.0"
 
 hosted-git-info@^2.1.4:
   version "2.8.8"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz"
   integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
 
 inflight@^1.0.4:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"
   integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
   dependencies:
     once "^1.3.0"
@@ -978,32 +1008,32 @@ inflight@^1.0.4:
 
 inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
 ini@^1.3.4:
   version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
-interpret@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
-  integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
+interpret@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz"
+  integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
 
 invert-kv@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz"
   integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
 
 irregular-plurals@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-2.0.0.tgz#39d40f05b00f656d0b7fa471230dd3b714af2872"
+  resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-2.0.0.tgz"
   integrity sha512-Y75zBYLkh0lJ9qxeHlMjQ7bSbyiSqNW/UOPWDmzC7cXskL1hekSITh1Oc6JV0XCWWZ9DE8VYSB71xocLk3gmGw==
 
 is-absolute@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
+  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz"
   integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
   dependencies:
     is-relative "^1.0.0"
@@ -1011,52 +1041,59 @@ is-absolute@^1.0.0:
 
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"
   integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
   dependencies:
     kind-of "^3.0.2"
 
 is-accessor-descriptor@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"
   integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"
   integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
 is-binary-path@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz"
   integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
   dependencies:
     binary-extensions "^1.0.0"
 
 is-buffer@^1.1.5:
   version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
+is-core-module@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz"
+  integrity sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"
   integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
   dependencies:
     kind-of "^3.0.2"
 
 is-data-descriptor@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"
   integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-descriptor@^0.1.0:
   version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz"
   integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
   dependencies:
     is-accessor-descriptor "^0.1.6"
@@ -1065,7 +1102,7 @@ is-descriptor@^0.1.0:
 
 is-descriptor@^1.0.0, is-descriptor@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz"
   integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
   dependencies:
     is-accessor-descriptor "^1.0.0"
@@ -1074,164 +1111,164 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz"
   integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
 
 is-extendable@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz"
   integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
   dependencies:
     is-plain-object "^2.0.4"
 
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"
   integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
   dependencies:
     number-is-nan "^1.0.0"
 
 is-glob@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz"
   integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
   dependencies:
     is-extglob "^2.1.0"
 
 is-glob@^4.0.0:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"
   integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
   dependencies:
     is-extglob "^2.1.1"
 
 is-negated-glob@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
+  resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz"
   integrity sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=
 
 is-number@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz"
   integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
   dependencies:
     kind-of "^3.0.2"
 
 is-number@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz"
   integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
 is-obj@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz"
   integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
 
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz"
   integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
 is-regexp@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
+  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz"
   integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
 
 is-relative@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
+  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz"
   integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
   dependencies:
     is-unc-path "^1.0.0"
 
 is-unc-path@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
+  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz"
   integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
   dependencies:
     unc-path-regex "^0.1.2"
 
 is-utf8@^0.2.0, is-utf8@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz"
   integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
 is-valid-glob@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa"
+  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz"
   integrity sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=
 
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
 isarray@1.0.0, isarray@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
 isexe@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"
   integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
 
 isobject@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz"
   integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
   integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
 just-debounce@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/just-debounce/-/just-debounce-1.0.0.tgz#87fccfaeffc0b68cd19d55f6722943f929ea35ea"
+  resolved "https://registry.yarnpkg.com/just-debounce/-/just-debounce-1.0.0.tgz"
   integrity sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=
 
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz"
   integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz"
   integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^5.0.0, kind-of@^5.0.2:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz"
   integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.3"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
 last-run@^1.1.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/last-run/-/last-run-1.1.1.tgz#45b96942c17b1c79c772198259ba943bebf8ca5b"
+  resolved "https://registry.yarnpkg.com/last-run/-/last-run-1.1.1.tgz"
   integrity sha1-RblpQsF7HHnHchmCWbqUO+v4yls=
   dependencies:
     default-resolution "^2.0.0"
@@ -1239,28 +1276,28 @@ last-run@^1.1.0:
 
 lazystream@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
+  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz"
   integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=
   dependencies:
     readable-stream "^2.0.5"
 
 lcid@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz"
   integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
   dependencies:
     invert-kv "^1.0.0"
 
 lead@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz#6f14f99a37be3a9dd784f5495690e5903466ee42"
+  resolved "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz"
   integrity sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=
   dependencies:
     flush-write-stream "^1.0.2"
 
 liftoff@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-3.1.0.tgz#c9ba6081f908670607ee79062d700df062c52ed3"
+  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-3.1.0.tgz"
   integrity sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==
   dependencies:
     extend "^3.0.0"
@@ -1274,14 +1311,14 @@ liftoff@^3.1.0:
 
 linkify-it@^3.0.1:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.2.tgz#f55eeb8bc1d3ae754049e124ab3bb56d97797fb8"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.2.tgz"
   integrity sha512-gDBO4aHNZS6coiZCKVhSNh43F9ioIL4JwRjLZPkoLIY4yZFwg264Y5lu2x6rb1Js42Gh6Yqm2f6L2AJcnkzinQ==
   dependencies:
     uc.micro "^1.0.1"
 
 load-json-file@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz"
   integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
   dependencies:
     graceful-fs "^4.1.2"
@@ -1292,26 +1329,26 @@ load-json-file@^1.0.0:
 
 make-iterator@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6"
+  resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz"
   integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==
   dependencies:
     kind-of "^6.0.2"
 
 map-cache@^0.2.0, map-cache@^0.2.2:
   version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz"
   integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
 map-visit@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz"
   integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
   dependencies:
     object-visit "^1.0.0"
 
 markdown-it@11.0.0:
   version "11.0.0"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-11.0.0.tgz#dbfc30363e43d756ebc52c38586b91b90046b876"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-11.0.0.tgz"
   integrity sha512-+CvOnmbSubmQFSA9dKz1BRiaSMV7rhexl3sngKqFyXSagoA3fBdJQ8oZWtRy2knXdpDXaBw44euz37DeJQ9asg==
   dependencies:
     argparse "^1.0.7"
@@ -1321,15 +1358,15 @@ markdown-it@11.0.0:
     uc.micro "^1.0.5"
 
 markdownlint@^0.21.0:
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.21.0.tgz#411a6937315c7562042e478cd91f52194ff88da4"
-  integrity sha512-rTxr0fbCFmS65oxXBD0HNy3/+PSukLS+b7Z6rGDWbjdRJp/e2dKj538r3KTn8oXrusx+ZtuYOozV2Knpnn0pkQ==
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.21.1.tgz"
+  integrity sha512-8kc88w5dyEzlmOWIElp8J17qBgzouOQfJ0LhCcpBFrwgyYK6JTKvILsk4FCEkiNqHkTxwxopT2RS2DYb/10qqg==
   dependencies:
     markdown-it "11.0.0"
 
 matchdep@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/matchdep/-/matchdep-2.0.0.tgz#c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e"
+  resolved "https://registry.yarnpkg.com/matchdep/-/matchdep-2.0.0.tgz"
   integrity sha1-xvNINKDY28OzfCfui7yyfHd1WC4=
   dependencies:
     findup-sync "^2.0.0"
@@ -1339,12 +1376,12 @@ matchdep@^2.0.0:
 
 mdurl@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
+  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz"
   integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
 
 micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz"
   integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
   dependencies:
     arr-diff "^4.0.0"
@@ -1363,14 +1400,14 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
 
 minimatch@^3.0.4:
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
 mixin-deep@^1.2.0:
   version "1.3.2"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz"
   integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
   dependencies:
     for-in "^1.0.2"
@@ -1378,22 +1415,22 @@ mixin-deep@^1.2.0:
 
 ms@2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
 mute-stdout@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mute-stdout/-/mute-stdout-1.0.1.tgz#acb0300eb4de23a7ddeec014e3e96044b3472331"
+  resolved "https://registry.yarnpkg.com/mute-stdout/-/mute-stdout-1.0.1.tgz"
   integrity sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==
 
 nan@^2.12.1:
-  version "2.14.1"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01"
-  integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==
+  version "2.14.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz"
+  integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
 
 nanomatch@^1.2.9:
   version "1.2.13"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz"
   integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
   dependencies:
     arr-diff "^4.0.0"
@@ -1410,12 +1447,12 @@ nanomatch@^1.2.9:
 
 next-tick@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz"
   integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
 
 normalize-package-data@^2.3.2:
   version "2.5.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
   dependencies:
     hosted-git-info "^2.1.4"
@@ -1425,62 +1462,62 @@ normalize-package-data@^2.3.2:
 
 normalize-path@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz"
   integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
   dependencies:
     remove-trailing-separator "^1.0.1"
 
 normalize-path@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
 now-and-later@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz#8e579c8685764a7cc02cb680380e94f43ccb1f7c"
+  resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz"
   integrity sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==
   dependencies:
     once "^1.3.2"
 
 number-is-nan@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
 object-copy@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz"
   integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
   dependencies:
     copy-descriptor "^0.1.0"
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-keys@^1.0.11, object-keys@^1.0.12:
+object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
 object-visit@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz"
   integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.0.4, object.assign@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
+object.assign@^4.0.4:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz"
+  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
   dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    has-symbols "^1.0.1"
+    object-keys "^1.1.1"
 
 object.defaults@^1.0.0, object.defaults@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
+  resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz"
   integrity sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=
   dependencies:
     array-each "^1.0.1"
@@ -1490,7 +1527,7 @@ object.defaults@^1.0.0, object.defaults@^1.1.0:
 
 object.map@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"
+  resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz"
   integrity sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=
   dependencies:
     for-own "^1.0.0"
@@ -1498,14 +1535,14 @@ object.map@^1.0.0:
 
 object.pick@^1.2.0, object.pick@^1.3.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz"
   integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
   dependencies:
     isobject "^3.0.1"
 
 object.reduce@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object.reduce/-/object.reduce-1.0.1.tgz#6fe348f2ac7fa0f95ca621226599096825bb03ad"
+  resolved "https://registry.yarnpkg.com/object.reduce/-/object.reduce-1.0.1.tgz"
   integrity sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=
   dependencies:
     for-own "^1.0.0"
@@ -1513,33 +1550,33 @@ object.reduce@^1.0.0:
 
 once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"
   integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
 ordered-read-streams@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e"
+  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz"
   integrity sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=
   dependencies:
     readable-stream "^2.0.1"
 
 os-homedir@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
 os-locale@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz"
   integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
   dependencies:
     lcid "^1.0.0"
 
 parse-filepath@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
+  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz"
   integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=
   dependencies:
     is-absolute "^1.0.0"
@@ -1548,63 +1585,63 @@ parse-filepath@^1.0.1:
 
 parse-json@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz"
   integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
   dependencies:
     error-ex "^1.2.0"
 
 parse-node-version@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
+  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz"
   integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
 
 parse-passwd@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
+  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz"
   integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
 
 pascalcase@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz"
   integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
 path-dirname@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz"
   integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
 path-exists@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz"
   integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
   dependencies:
     pinkie-promise "^2.0.0"
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
 path-parse@^1.0.6:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
 path-root-regex@^0.1.0:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
+  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz"
   integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=
 
 path-root@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
+  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz"
   integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=
   dependencies:
     path-root-regex "^0.1.0"
 
 path-type@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz"
   integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
   dependencies:
     graceful-fs "^4.1.2"
@@ -1613,46 +1650,46 @@ path-type@^1.0.0:
 
 pify@^2.0.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz"
   integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
   integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
 plur@^3.0.0:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/plur/-/plur-3.1.1.tgz#60267967866a8d811504fe58f2faaba237546a5b"
+  resolved "https://registry.yarnpkg.com/plur/-/plur-3.1.1.tgz"
   integrity sha512-t1Ax8KUvV3FFII8ltczPn2tJdjqbd1sIzu6t4JL7nQ3EyeL/lTrj5PWKb06ic5/6XYDr65rQ4uzQEGN70/6X5w==
   dependencies:
     irregular-plurals "^2.0.0"
 
 posix-character-classes@^0.1.0:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz"
   integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
 pretty-hrtime@^1.0.0:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
+  resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz"
   integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=
 
 process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
 pump@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz"
   integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
   dependencies:
     end-of-stream "^1.1.0"
@@ -1660,7 +1697,7 @@ pump@^2.0.0:
 
 pumpify@^1.3.5:
   version "1.5.1"
-  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz"
   integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
   dependencies:
     duplexify "^3.6.0"
@@ -1669,7 +1706,7 @@ pumpify@^1.3.5:
 
 read-pkg-up@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz"
   integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
   dependencies:
     find-up "^1.0.0"
@@ -1677,7 +1714,7 @@ read-pkg-up@^1.0.1:
 
 read-pkg@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz"
   integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
   dependencies:
     load-json-file "^1.0.0"
@@ -1686,7 +1723,7 @@ read-pkg@^1.0.0:
 
 readable-stream@3:
   version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
   dependencies:
     inherits "^2.0.3"
@@ -1695,7 +1732,7 @@ readable-stream@3:
 
 readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
   dependencies:
     core-util-is "~1.0.0"
@@ -1708,7 +1745,7 @@ readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable
 
 readdirp@^2.2.1:
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz"
   integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
   dependencies:
     graceful-fs "^4.1.11"
@@ -1717,14 +1754,14 @@ readdirp@^2.2.1:
 
 rechoir@^0.6.2:
   version "0.6.2"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz"
   integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
   dependencies:
     resolve "^1.1.6"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz"
   integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
   dependencies:
     extend-shallow "^3.0.2"
@@ -1732,7 +1769,7 @@ regex-not@^1.0.0, regex-not@^1.0.2:
 
 remove-bom-buffer@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz#c2bf1e377520d324f623892e33c10cac2c252b53"
+  resolved "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz"
   integrity sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==
   dependencies:
     is-buffer "^1.1.5"
@@ -1740,7 +1777,7 @@ remove-bom-buffer@^3.0.0:
 
 remove-bom-stream@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz#05f1a593f16e42e1fb90ebf59de8e569525f9523"
+  resolved "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz"
   integrity sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=
   dependencies:
     remove-bom-buffer "^3.0.0"
@@ -1749,27 +1786,27 @@ remove-bom-stream@^1.2.0:
 
 remove-trailing-separator@^1.0.1, remove-trailing-separator@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"
   integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
 repeat-element@^1.1.2:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz"
   integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
 repeat-string@^1.6.1:
   version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
 replace-ext@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a"
+  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz"
   integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
 
 replace-homedir@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/replace-homedir/-/replace-homedir-1.0.0.tgz#e87f6d513b928dde808260c12be7fec6ff6e798c"
+  resolved "https://registry.yarnpkg.com/replace-homedir/-/replace-homedir-1.0.0.tgz"
   integrity sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=
   dependencies:
     homedir-polyfill "^1.0.1"
@@ -1778,17 +1815,17 @@ replace-homedir@^1.0.0:
 
 require-directory@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
 require-main-filename@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz"
   integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
 
 resolve-dir@^1.0.0, resolve-dir@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
+  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz"
   integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
   dependencies:
     expand-tilde "^2.0.0"
@@ -1796,65 +1833,66 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1:
 
 resolve-options@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz#32bb9e39c06d67338dc9378c0d6d6074566ad131"
+  resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz"
   integrity sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=
   dependencies:
     value-or-function "^3.0.0"
 
 resolve-url@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
 resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.4.0:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
-  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz"
+  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
   dependencies:
+    is-core-module "^2.1.0"
     path-parse "^1.0.6"
 
 ret@~0.1.10:
   version "0.1.15"
-  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
 safe-buffer@^5.1.0, safe-buffer@~5.2.0:
   version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
 safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
 safe-regex@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz"
   integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
   dependencies:
     ret "~0.1.10"
 
 semver-greatest-satisfied-range@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz#13e8c2658ab9691cb0cd71093240280d36f77a5b"
+  resolved "https://registry.yarnpkg.com/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz"
   integrity sha1-E+jCZYq5aRywzXEJMkAoDTb3els=
   dependencies:
     sver-compat "^1.5.0"
 
 "semver@2 || 3 || 4 || 5":
   version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
 set-blocking@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
 set-value@^2.0.0, set-value@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz"
   integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
   dependencies:
     extend-shallow "^2.0.1"
@@ -1864,7 +1902,7 @@ set-value@^2.0.0, set-value@^2.0.1:
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz"
   integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
   dependencies:
     define-property "^1.0.0"
@@ -1873,14 +1911,14 @@ snapdragon-node@^2.0.1:
 
 snapdragon-util@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz"
   integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
   dependencies:
     kind-of "^3.2.0"
 
 snapdragon@^0.8.1:
   version "0.8.2"
-  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz"
   integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
   dependencies:
     base "^0.11.1"
@@ -1894,7 +1932,7 @@ snapdragon@^0.8.1:
 
 source-map-resolve@^0.5.0:
   version "0.5.3"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz"
   integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
   dependencies:
     atob "^2.1.2"
@@ -1905,27 +1943,27 @@ source-map-resolve@^0.5.0:
 
 source-map-url@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz"
   integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
 source-map@^0.5.6:
   version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
 source-map@^0.6.1:
   version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 sparkles@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"
+  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz"
   integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==
 
 spdx-correct@^3.0.0:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz"
   integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
   dependencies:
     spdx-expression-parse "^3.0.0"
@@ -1933,42 +1971,42 @@ spdx-correct@^3.0.0:
 
 spdx-exceptions@^2.1.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"
   integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
 
 spdx-expression-parse@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"
   integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
-  integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz"
+  integrity sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz"
   integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
   dependencies:
     extend-shallow "^3.0.0"
 
 sprintf-js@~1.0.2:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 stack-trace@0.0.10:
   version "0.0.10"
-  resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
+  resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz"
   integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
 
 static-extend@^0.1.1:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz"
   integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
   dependencies:
     define-property "^0.2.5"
@@ -1976,17 +2014,17 @@ static-extend@^0.1.1:
 
 stream-exhaust@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/stream-exhaust/-/stream-exhaust-1.0.2.tgz#acdac8da59ef2bc1e17a2c0ccf6c320d120e555d"
+  resolved "https://registry.yarnpkg.com/stream-exhaust/-/stream-exhaust-1.0.2.tgz"
   integrity sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==
 
 stream-shift@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz"
   integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
 
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"
   integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
   dependencies:
     code-point-at "^1.0.0"
@@ -1995,21 +2033,21 @@ string-width@^1.0.1, string-width@^1.0.2:
 
 string_decoder@^1.1.1:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"
   integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
   dependencies:
     safe-buffer "~5.2.0"
 
 string_decoder@~1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"
   integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
     safe-buffer "~5.1.0"
 
 stringify-object@^3.0.0:
   version "3.3.0"
-  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629"
+  resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz"
   integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==
   dependencies:
     get-own-enumerable-property-symbols "^3.0.0"
@@ -2018,28 +2056,28 @@ stringify-object@^3.0.0:
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"
   integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-bom@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz"
   integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
   dependencies:
     is-utf8 "^0.2.0"
 
 supports-color@^5.3.0:
   version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
 sver-compat@^1.5.0:
   version "1.5.0"
-  resolved "https://registry.yarnpkg.com/sver-compat/-/sver-compat-1.5.0.tgz#3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8"
+  resolved "https://registry.yarnpkg.com/sver-compat/-/sver-compat-1.5.0.tgz"
   integrity sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=
   dependencies:
     es6-iterator "^2.0.1"
@@ -2047,7 +2085,7 @@ sver-compat@^1.5.0:
 
 through2-filter@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254"
+  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz"
   integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==
   dependencies:
     through2 "~2.0.0"
@@ -2055,7 +2093,7 @@ through2-filter@^3.0.0:
 
 through2@^2.0.0, through2@^2.0.3, through2@~2.0.0:
   version "2.0.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz"
   integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
   dependencies:
     readable-stream "~2.3.6"
@@ -2063,26 +2101,26 @@ through2@^2.0.0, through2@^2.0.3, through2@~2.0.0:
 
 through2@^4.0.2:
   version "4.0.2"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz"
   integrity sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==
   dependencies:
     readable-stream "3"
 
 tildify@^1.1.2:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a"
+  resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz"
   integrity sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=
   dependencies:
     os-homedir "^1.0.0"
 
 time-stamp@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
+  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz"
   integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
 
 to-absolute-glob@^2.0.0:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b"
+  resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz"
   integrity sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=
   dependencies:
     is-absolute "^1.0.0"
@@ -2090,14 +2128,14 @@ to-absolute-glob@^2.0.0:
 
 to-object-path@^0.3.0:
   version "0.3.0"
-  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz"
   integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
   dependencies:
     kind-of "^3.0.2"
 
 to-regex-range@^2.1.0:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz"
   integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
   dependencies:
     is-number "^3.0.0"
@@ -2105,7 +2143,7 @@ to-regex-range@^2.1.0:
 
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz"
   integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
   dependencies:
     define-property "^2.0.2"
@@ -2115,51 +2153,52 @@ to-regex@^3.0.1, to-regex@^3.0.2:
 
 to-through@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz#fc92adaba072647bc0b67d6b03664aa195093af6"
+  resolved "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz"
   integrity sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=
   dependencies:
     through2 "^2.0.3"
 
 type@^1.0.1:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
+  resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz"
   integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
 
 type@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz#5f16ff6ef2eb44f260494dae271033b29c09a9c3"
-  integrity sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz"
+  integrity sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA==
 
 typedarray@^0.0.6:
   version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
+  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz"
   integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
 
 unc-path-regex@^0.1.2:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
+  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz"
   integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
 
 undertaker-registry@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/undertaker-registry/-/undertaker-registry-1.0.1.tgz#5e4bda308e4a8a2ae584f9b9a4359a499825cc50"
+  resolved "https://registry.yarnpkg.com/undertaker-registry/-/undertaker-registry-1.0.1.tgz"
   integrity sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=
 
 undertaker@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/undertaker/-/undertaker-1.2.1.tgz#701662ff8ce358715324dfd492a4f036055dfe4b"
-  integrity sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/undertaker/-/undertaker-1.3.0.tgz"
+  integrity sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==
   dependencies:
     arr-flatten "^1.0.1"
     arr-map "^2.0.0"
     bach "^1.0.0"
     collection-map "^1.0.0"
     es6-weak-map "^2.0.1"
+    fast-levenshtein "^1.0.0"
     last-run "^1.1.0"
     object.defaults "^1.0.0"
     object.reduce "^1.0.0"
@@ -2167,7 +2206,7 @@ undertaker@^1.2.1:
 
 union-value@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz"
   integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
   dependencies:
     arr-union "^3.1.0"
@@ -2177,7 +2216,7 @@ union-value@^1.0.0:
 
 unique-stream@^2.0.2:
   version "2.3.1"
-  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac"
+  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz"
   integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==
   dependencies:
     json-stable-stringify-without-jsonify "^1.0.1"
@@ -2185,7 +2224,7 @@ unique-stream@^2.0.2:
 
 unset-value@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz"
   integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
   dependencies:
     has-value "^0.3.1"
@@ -2193,34 +2232,34 @@ unset-value@^1.0.0:
 
 upath@^1.1.1:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
 urix@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz"
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
 use@^3.1.0:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz"
   integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-v8flags@^3.0.1:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.1.3.tgz#fc9dc23521ca20c5433f81cc4eb9b3033bb105d8"
-  integrity sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==
+v8flags@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz"
+  integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==
   dependencies:
     homedir-polyfill "^1.0.1"
 
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"
   integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
     spdx-correct "^3.0.0"
@@ -2228,12 +2267,12 @@ validate-npm-package-license@^3.0.1:
 
 value-or-function@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813"
+  resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz"
   integrity sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=
 
 vinyl-fs@^3.0.0:
   version "3.0.3"
-  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz#c85849405f67428feabbbd5c5dbdd64f47d31bc7"
+  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz"
   integrity sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==
   dependencies:
     fs-mkdirp-stream "^1.0.0"
@@ -2256,7 +2295,7 @@ vinyl-fs@^3.0.0:
 
 vinyl-sourcemap@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz#92a800593a38703a8cdb11d8b300ad4be63b3e16"
+  resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz"
   integrity sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=
   dependencies:
     append-buffer "^1.0.2"
@@ -2268,9 +2307,9 @@ vinyl-sourcemap@^1.1.0:
     vinyl "^2.0.0"
 
 vinyl@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86"
-  integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz"
+  integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==
   dependencies:
     clone "^2.1.1"
     clone-buffer "^1.0.0"
@@ -2281,19 +2320,19 @@ vinyl@^2.0.0:
 
 which-module@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz"
   integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
 
 which@^1.2.14:
   version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
 wrap-ansi@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz"
   integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
   dependencies:
     string-width "^1.0.1"
@@ -2301,20 +2340,20 @@ wrap-ansi@^2.0.0:
 
 wrappy@1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
-y18n@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
+y18n@^3.2.1, y18n@^5.0.5:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18"
+  integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==
 
-yargs-parser@13.1.2:
+yargs-parser@5.0.0-security.0, yargs-parser@^13.1.2:
   version "13.1.2"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
   integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
@@ -2322,17 +2361,9 @@ yargs-parser@13.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@5.0.0-security.0:
-  version "5.0.0-security.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0-security.0.tgz#4ff7271d25f90ac15643b86076a2ab499ec9ee24"
-  integrity sha512-T69y4Ps64LNesYxeYGYPvfoMTt/7y1XtfpIslUeK4um+9Hu7hlGoRtaDLvdXb7+/tfq4opVa2HRY5xGip022rQ==
-  dependencies:
-    camelcase "^3.0.0"
-    object.assign "^4.1.0"
-
 yargs@^7.1.0:
   version "7.1.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.1.tgz#67f0ef52e228d4ee0d6311acede8850f53464df6"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.1.tgz"
   integrity sha512-huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g==
   dependencies:
     camelcase "^3.0.0"
diff --git a/test/powershell/Language/Operators/ReplaceOperator.Tests.ps1 b/test/powershell/Language/Operators/ReplaceOperator.Tests.ps1
index 59d7039898a..b72779f59c4 100644
--- a/test/powershell/Language/Operators/ReplaceOperator.Tests.ps1
+++ b/test/powershell/Language/Operators/ReplaceOperator.Tests.ps1
@@ -11,6 +11,12 @@ Describe "Replace Operator" -Tags CI {
             $res | Should -BeExactly "image.jpg"
         }
 
+        It "Replace operator can convert an substitution object to string" {
+            $substitution = Get-Process -Id $pid
+            $res = "!3!" -replace "3",$substitution
+            $res | Should -BeExactly "!System.Diagnostics.Process (pwsh)!"
+        }
+
         It "Replace operator can be case-insensitive and case-sensitive" {
             $res = "book" -replace "B","C"
             $res | Should -BeExactly "Cook"
@@ -29,6 +35,18 @@ Describe "Replace Operator" -Tags CI {
             $res = "PowerPoint" -replace "Point"
             $res | Should -BeExactly "Power"
         }
+
+        It "Replace operator can take an enumerable as first argument, a mandatory pattern, and an optional substitution" {
+            $res = "PowerPoint1","PowerPoint2" -replace "Point","Shell"
+            $res.Count | Should -Be 2
+            $res[0] | Should -BeExactly "PowerShell1"
+            $res[1] | Should -BeExactly "PowerShell2"
+
+            $res = "PowerPoint1","PowerPoint2" -replace "Point"
+            $res.Count | Should -Be 2
+            $res[0] | Should -BeExactly "Power1"
+            $res[1] | Should -BeExactly "Power2"
+        }
     }
 
     Context "Replace operator substitutions" {
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Add-Content.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Add-Content.Tests.ps1
index d4bd23a6fee..6d63206b709 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Add-Content.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Add-Content.Tests.ps1
@@ -5,6 +5,7 @@ Describe "Add-Content cmdlet tests" -Tags "CI" {
   BeforeAll {
     $file1 = "file1.txt"
     Setup -File "$file1"
+    $streamContent = "ShouldWork"
   }
 
   Context "Add-Content should actually add content" {
@@ -47,6 +48,29 @@ Describe "Add-Content cmdlet tests" -Tags "CI" {
       { Add-Content -Path . -Value "WriteContainerContentException" -ErrorAction Stop } | Should -Throw -ErrorId "WriteContainerContentException,Microsoft.PowerShell.Commands.AddContentCommand"
     }
 
+    Context "Add-Content should work with alternate data streams on Windows" {
+      BeforeAll {
+        if (!$isWindows) {
+          return
+        }
+        $ADSTestDir = "addcontentadstest"
+        $ADSTestFile = "addcontentads.txt"
+        $streamContent = "This is a test stream."
+        Setup -Directory "$ADSTestDir"
+        Setup -File "$ADSTestFile"
+      }
+
+      It "Should add an alternate data stream on a directory" -Skip:(!$IsWindows) {
+        Add-Content -Path TestDrive:\$ADSTestDir -Stream Add-Content-Test-Stream -Value $streamContent -ErrorAction Stop        
+        Get-Content -Path TestDrive:\$ADSTestDir -Stream Add-Content-Test-Stream | Should -BeExactly $streamContent
+      }
+
+      It "Should add an alternate data stream on a file" -Skip:(!$IsWindows) {
+        Add-Content -Path TestDrive:\$ADSTestFile -Stream Add-Content-Test-Stream -Value $streamContent -ErrorAction Stop        
+        Get-Content -Path TestDrive:\$ADSTestFile -Stream Add-Content-Test-Stream | Should -BeExactly $streamContent
+      }
+    }
+
     #[BugId(BugDatabase.WindowsOutOfBandReleases, 906022)]
     It "should throw 'NotSupportedException' when you add-content to an unsupported provider" -Skip:($IsLinux -Or $IsMacOS) {
       { Add-Content -Path HKLM:\\software\\microsoft -Value "ShouldNotWorkBecausePathIsUnsupported" -ErrorAction Stop } | Should -Throw -ErrorId "NotSupported,Microsoft.PowerShell.Commands.AddContentCommand"
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Clear-Content.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Clear-Content.Tests.ps1
index e2ab56fc809..ff9d0c8f39c 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Clear-Content.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Clear-Content.Tests.ps1
@@ -51,6 +51,8 @@ Describe "Clear-Content cmdlet tests" -Tags "CI" {
     Setup -File "$file3" -Content $content2
     $streamContent = "content for alternate stream"
     $streamName = "altStream1"
+    $dirName = "clearcontent"
+    Setup -Directory "$dirName"
   }
 
   Context "Clear-Content should actually clear content" {
@@ -75,32 +77,50 @@ Describe "Clear-Content cmdlet tests" -Tags "CI" {
       $cci.SupportsShouldProcess | Should -BeTrue
     }
 
-    It "Alternate streams should be cleared with clear-content" -Skip:(!$IsWindows) {
-      # make sure that the content is correct
-      # this is here rather than BeforeAll because only windows can write to an alternate stream
-      Set-Content -Path "TestDrive:/$file3" -Stream $streamName -Value $streamContent
-      Get-Content -Path "TestDrive:/$file3" | Should -BeExactly $content2
-      Get-Content -Path "TestDrive:/$file3" -Stream $streamName | Should -BeExactly $streamContent
-      Clear-Content -Path "TestDrive:/$file3" -Stream $streamName
-      Get-Content -Path "TestDrive:/$file3" | Should -BeExactly $content2
-      Get-Content -Path "TestDrive:/$file3" -Stream $streamName | Should -BeNullOrEmpty
-    }
+    Context "Clear-Content should work with alternate data streams on Windows" {
+      It "Alternate streams should be cleared with Clear-Content on a file" -Skip:(!$IsWindows) {
+
+        Set-Content           -Path "TestDrive:/$file3" -Stream $streamName -Value $streamContent
+        Get-Content           -Path "TestDrive:/$file3" -Stream $streamName | Should -BeExactly $streamContent
+
+        Clear-Content         -Path "TestDrive:/$file3" -Stream $streamName -ErrorAction Stop
+
+        $result = Get-Item -Path "TestDrive:/$file3" -Stream $streamName
+        $result | Should -BeOfType System.Management.Automation.Internal.AlternateStreamData
+        $result.length | Should -Be 0
+      }
 
-    It "the '-Stream' dynamic parameter is visible to get-command in the filesystem" -Skip:(!$IsWindows) {
-      try {
-        Push-Location -Path TestDrive:
-        (Get-Command Clear-Content -Stream foo).parameters.keys -eq "stream" | Should -Be "stream"
+      It "Alternate streams should be cleared with Clear-Content on a directory" -Skip:(!$IsWindows) {
+        Set-Content           -Path "TestDrive:/$dirName" -Stream $streamName -Value $streamContent
+
+        Get-Content           -Path "TestDrive:/$dirName" -Stream $streamName | Should -BeExactly $streamContent
+        Clear-Content         -Path "TestDrive:/$dirName" -Stream $streamName -ErrorAction Stop
+
+        $result = Get-Item -Path "TestDrive:/$dirName" -Stream $streamName
+        $result | Should -BeOfType System.Management.Automation.Internal.AlternateStreamData
+        $result.length | Should -Be 0
       }
-      finally {
-        Pop-Location
+
+      It "the '-Stream' dynamic parameter is visible to get-command in the filesystem" -Skip:(!$IsWindows) {
+        try {
+          Push-Location -Path TestDrive:
+          (Get-Command Clear-Content -Stream foo).parameters.keys -eq "Stream" | Should -BeExactly "Stream"
+        }
+        finally {
+          Pop-Location
+        }
       }
-    }
 
-    It "the '-Stream' dynamic parameter should not be visible to get-command in the function provider" {
-      Push-Location -Path function:
-      { Get-Command Clear-Content -Stream $streamName } |
-        Should -Throw -ErrorId "NamedParameterNotFound,Microsoft.PowerShell.Commands.GetCommandCommand"
-      Pop-Location
+      It "the '-Stream' dynamic parameter should not be visible to get-command in the function provider" -Skip:(!$IsWindows) {
+        try {
+        Push-Location -Path function:
+          { Get-Command Clear-Content -Stream $streamName } |
+            Should -Throw -ErrorId "NamedParameterNotFound,Microsoft.PowerShell.Commands.GetCommandCommand"
+        }
+        finally {
+          Pop-Location
+        }
+      }
     }
   }
 
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Content.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Content.Tests.ps1
index 6c50cee5aa8..5fdc904580d 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Content.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Content.Tests.ps1
@@ -221,25 +221,27 @@ Describe "Get-Content" -Tags "CI" {
         $expected = 'He', 'o,', '', 'Wor', "d${nl}He", 'o2,', '', 'Wor', "d2${nl}"
         for ($i = 0; $i -lt $result.Length ; $i++) { $result[$i]    | Should -BeExactly $expected[$i]}
     }
+    
+    Context "Alternate Data Stream support on Windows" {
+        It "Should support NTFS streams using colon syntax" -Skip:(!$IsWindows) {
+            Set-Content "${testPath}:Stream" -Value "Foo"
+            { Test-Path "${testPath}:Stream" | Should -Throw -ErrorId "ItemExistsNotSupportedError,Microsoft.PowerShell.Commands,TestPathCommand" }
+            Get-Content "${testPath}:Stream" | Should -BeExactly "Foo"
+            Get-Content $testPath | Should -BeExactly $testString
+        }
 
-    It "Should support NTFS streams using colon syntax" -Skip:(!$IsWindows) {
-        Set-Content "${testPath}:Stream" -Value "Foo"
-        { Test-Path "${testPath}:Stream" | Should -Throw -ErrorId "ItemExistsNotSupportedError,Microsoft.PowerShell.Commands,TestPathCommand" }
-        Get-Content "${testPath}:Stream" | Should -BeExactly "Foo"
-        Get-Content $testPath | Should -BeExactly $testString
-    }
-
-    It "Should support NTFS streams using -Stream" -Skip:(!$IsWindows) {
-        Set-Content -Path $testPath -Stream hello -Value World
-        Get-Content -Path $testPath | Should -BeExactly $testString
-        Get-Content -Path $testPath -Stream hello | Should -BeExactly "World"
-        $item = Get-Item -Path $testPath -Stream hello
-        $item | Should -BeOfType System.Management.Automation.Internal.AlternateStreamData
-        $item.Stream | Should -BeExactly "hello"
-        Clear-Content -Path $testPath -Stream hello
-        Get-Content -Path $testPath -Stream hello | Should -BeNullOrEmpty
-        Remove-Item -Path $testPath -Stream hello
-        { Get-Content -Path $testPath -Stream hello | Should -Throw -ErrorId "GetContentReaderFileNotFoundError,Microsoft.PowerShell.Commands.GetContentCommand" }
+        It "Should support NTFS streams using -Stream" -Skip:(!$IsWindows) {
+            Set-Content -Path $testPath -Stream hello -Value World
+            Get-Content -Path $testPath | Should -BeExactly $testString
+            Get-Content -Path $testPath -Stream hello | Should -BeExactly "World"
+            $item = Get-Item -Path $testPath -Stream hello
+            $item | Should -BeOfType System.Management.Automation.Internal.AlternateStreamData
+            $item.Stream | Should -BeExactly "hello"
+            Clear-Content -Path $testPath -Stream hello
+            Get-Content -Path $testPath -Stream hello | Should -BeNullOrEmpty
+            Remove-Item -Path $testPath -Stream hello
+            { Get-Content -Path $testPath -Stream hello -ErrorAction stop} | Should -Throw -ErrorId "GetContentReaderFileNotFoundError,Microsoft.PowerShell.Commands.GetContentCommand"
+        }
     }
 
     It "Should support colons in filename on Linux/Mac" -Skip:($IsWindows) {
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Item.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Item.Tests.ps1
index 86b831ba8d0..c04412e91b4 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Item.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Get-Item.Tests.ps1
@@ -112,16 +112,38 @@ Describe "Get-Item" -Tags "CI" {
                 return
             }
             $altStreamPath = "$TESTDRIVE/altStream.txt"
+            $altStreamDirectory = "$TESTDRIVE/altstreamdir"
+            $noAltStreamDirectory = "$TESTDRIVE/noaltstreamdir"
             $stringData = "test data"
             $streamName = "test"
-            $item = New-Item -type file $altStreamPath
+            $absentStreamName = "noExist"
+            $null = New-Item -type file $altStreamPath
             Set-Content -Path $altStreamPath -Stream $streamName -Value $stringData
+            $null = New-Item -type directory $altStreamDirectory
+            Set-Content -Path $altStreamDirectory -Stream $streamName -Value $stringData
+            $null = New-Item -type directory $noAltStreamDirectory
         }
-        It "Should find an alternate stream if present" -Skip:$skipNotWindows {
+        It "Should find an alternate stream on a file if present" -Skip:$skipNotWindows {
             $result = Get-Item $altStreamPath -Stream $streamName
             $result.Length | Should -Be ($stringData.Length + [Environment]::NewLine.Length)
             $result.Stream | Should -Be $streamName
         }
+        It "Should error if it cannot find alternate stream on an existing file" -Skip:$skipNotWindows {
+            { Get-Item $altStreamPath -Stream $absentStreamName -ErrorAction Stop } | Should -Throw -ErrorId "AlternateDataStreamNotFound,Microsoft.PowerShell.Commands.GetItemCommand"
+        }
+        It "Should find an alternate stream on a directory if present, and it should not be a container" -Skip:$skipNotWindows {
+            $result = Get-Item $altStreamDirectory -Stream $streamName
+            $result.Length | Should -Be ($stringData.Length + [Environment]::NewLine.Length )
+            $result.Stream | Should -Be $streamName
+            $result.PSIsContainer | Should -BeExactly $false
+        }
+        It "Should not find an alternate stream on a directory if not present" -Skip:$skipNotWindows {
+            { Get-Item $noAltStreamDirectory -Stream $absentStreamName -ErrorAction Stop } | Should -Throw -ErrorId "AlternateDataStreamNotFound,Microsoft.PowerShell.Commands.GetItemCommand"
+        }
+        It "Should find zero alt streams and not fail on a directory with a wildcard stream name if no alt streams are present" -Skip:$skipNotWindows {
+            $result = Get-Item $noAltStreamDirectory -Stream * -ErrorAction Stop
+            $result | Should -BeExactly $null
+        }
     }
 
     Context "Registry Provider" {
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Remove-Item.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Remove-Item.Tests.ps1
index 769a8a34003..3e8ccb8fa91 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Remove-Item.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Remove-Item.Tests.ps1
@@ -7,9 +7,7 @@ Describe "Remove-Item" -Tags "CI" {
     Context "File removal Tests" {
 	BeforeEach {
 	    New-Item -Name $testfile -Path $testpath -ItemType "file" -Value "lorem ipsum" -Force
-
 	    Test-Path $testfilepath | Should -BeTrue
-
 	}
 
 	It "Should be able to be called on a regular file without error using the Path parameter" {
@@ -138,4 +136,35 @@ Describe "Remove-Item" -Tags "CI" {
 	    Test-Path $testdirectory | Should -BeFalse
 	}
     }
+
+    Context "Alternate Data Streams should be supported on Windows" {
+      BeforeAll {
+        if (!$IsWindows) {
+          return
+        }
+        $fileName = "ADStest.txt"
+        $streamName = "teststream"
+        $dirName = "ADStestdir"
+        $fileContent =" This is file content."
+        $streamContent = "datastream content here"
+        $streamfile = Join-Path -Path $testpath -ChildPath $fileName
+        $streamdir = Join-Path -Path $testpath -ChildPath $dirName
+
+        $null = New-Item -Path $streamfile -ItemType "File" -force
+        Add-Content -Path $streamfile -Value $fileContent
+        Add-Content -Path $streamfile -Stream $streamName -Value $streamContent
+        $null = New-Item -Path $streamdir -ItemType "Directory" -Force
+        Add-Content -Path $streamdir -Stream $streamName -Value $streamContent
+      }
+      It "Should completely remove a datastream from a file" -Skip:(!$IsWindows) {
+        Get-Item -Path $streamfile -Stream $streamName | Should -Not -BeNullOrEmpty
+        Remove-Item -Path $streamfile -Stream $streamName
+        Get-Item -Path $streamfile -Stream $streamName -ErrorAction SilentlyContinue | Should -BeNullOrEmpty
+      }
+      It "Should completely remove a datastream from a directory" -Skip:(!$IsWindows) {
+        Get-Item -Path $streamdir -Stream $streamName | Should -Not -BeNullOrEmpty
+        Remove-Item -Path $streamdir -Stream $streamName
+        Get-Item -Path $streamdir -Stream $streamname -ErrorAction SilentlyContinue | Should -BeNullOrEmpty
+      }
+    }
 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Set-Content.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Set-Content.Tests.ps1
index 6e8f8bde083..fefd73412df 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Set-Content.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Set-Content.Tests.ps1
@@ -72,6 +72,39 @@ Describe "Set-Content cmdlet tests" -Tags "CI" {
             $result[1]     | Should -BeExactly "world"
         }
     }
+    Context "Set-Content should work with alternate data streams on Windows" {
+        BeforeAll {
+            if ( -Not $IsWindows )
+            {
+                return
+            }
+            $altStreamPath = "$TESTDRIVE/altStream.txt"
+            $altStreamPath2 = "$TESTDRIVE/altStream2.txt"
+            $altStreamDirectory = "$TESTDRIVE/altstreamdir"
+            $altStreamDirectory2 = "$TESTDRIVE/altstream2dir"
+            $stringData = "test data"
+            $streamName = "test"
+            $absentStreamName = "noExist"
+            $item = New-Item -type file $altStreamPath
+            $altstreamdiritem = New-Item -type directory $altStreamDirectory
+        }
+        It "Should create a new data stream on a file" -Skip:(-Not $IsWindows) {
+            Set-Content -Path $altStreamPath -Stream $streamName -Value $stringData
+            Get-Content -Path $altStreamPath -Stream $streamName | Should -BeExactly $stringData
+        }
+        It "Should create a new data stream on a file using colon syntax" -Skip:(-Not $IsWindows) {
+            Set-Content -Path ${altStreamPath2}:${streamName} -Value $stringData
+            Get-Content -Path ${altStreamPath2} -Stream $streamName | Should -BeExactly $stringData
+        }
+        It "Should create a new data stream on a directory" -Skip:(-Not $IsWindows) {
+            Set-Content -Path $altStreamDirectory -Stream $streamName -Value $stringData
+            Get-Content -Path $altStreamDirectory -Stream $streamName | Should -BeExactly $stringData
+        }
+        It "Should create a new data stream on a directory using colon syntax" -Skip:(-Not $IsWindows) {
+            Set-Content -Path ${altStreamDirectory2}:${streamName} -Value $stringData
+            Get-Content -Path ${altStreamDirectory2} -Stream ${streamName} | Should -BeExactly $stringData
+        }
+    }
 }
 
 Describe "Set-Content should work for PSDrive with UNC path as root" -Tags @('CI', 'RequireAdminOnWindows') {
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1
index bcd0562af85..10f39bca320 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Test-Connection.Tests.ps1
@@ -44,6 +44,7 @@ Describe "Test-Connection" -tags "CI" {
         $targetAddress = "127.0.0.1"
         $targetAddressIPv6 = "::1"
         $UnreachableAddress = "10.11.12.13"
+
         # under some environments, we can't round trip this and retrieve the real name from the address
         # in this case we will simply use the hostname
         $jobContinues = Start-Job { Test-Connection $using:targetAddress -Repeat }
@@ -105,7 +106,7 @@ Describe "Test-Connection" -tags "CI" {
             $error[0].Exception.InnerException.ErrorCode | Should -Be $code
         }
 
-        It "Force IPv4 with implicit PingOptions" -Pending {
+        It "Force IPv4 with implicit PingOptions" {
             $result = Test-Connection $testAddress -Count 1 -IPv4
 
             $result[0].Address | Should -BeExactly $testAddress
@@ -116,6 +117,7 @@ Describe "Test-Connection" -tags "CI" {
         }
 
         # In VSTS, address is 0.0.0.0
+        # This test is marked as PENDING as .NET Core does not return correct PingOptions from ping request
         It "Force IPv4 with explicit PingOptions" -Pending {
             $result1 = Test-Connection $testAddress -Count 1 -IPv4 -MaxHops 10 -DontFragment
 
@@ -259,7 +261,7 @@ Describe "Test-Connection" -tags "CI" {
     Context "MTUSizeDetect" {
         # We skip the MtuSize detection tests when in containers, as the environments throw raw exceptions
         # instead of returning a PacketTooBig response cleanly.
-        It "MTUSizeDetect works" -Pending:($true -or $env:__INCONTAINER -eq 1) {
+        It "MTUSizeDetect works" -Pending:($env:__INCONTAINER -eq 1) {
             $result = Test-Connection $testAddress -MtuSize
 
             $result | Should -BeOfType Microsoft.PowerShell.Commands.TestConnectionCommand+PingMtuStatus
@@ -282,7 +284,7 @@ Describe "Test-Connection" -tags "CI" {
             $result = Test-Connection $testAddress -TraceRoute -IPv4
 
             $result[0] | Should -BeOfType Microsoft.PowerShell.Commands.TestConnectionCommand+TraceStatus
-            $result[0].Source | Should -BeExactly $hostName
+            $result[0].Source | Should -BeExactly $testAddress
             $result[0].TargetAddress | Should -BeExactly $testAddress
             $result[0].Target | Should -BeExactly $testAddress
             $result[0].Hop | Should -Be 1
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/PowerShellData.tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/PowerShellData.tests.ps1
index 6d13be5005b..222bbf7e900 100644
--- a/test/powershell/Modules/Microsoft.PowerShell.Utility/PowerShellData.tests.ps1
+++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/PowerShellData.tests.ps1
@@ -1,6 +1,19 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 Describe "Tests for the Import-PowerShellDataFile cmdlet" -Tags "CI" {
+    BeforeAll {
+        $largePsd1Path = Join-Path -Path $TestDrive -ChildPath 'large.psd1'
+        $largePsd1Builder = [System.Text.StringBuilder]::new('@{')
+        1..501 | ForEach-Object {
+            $largePsd1Builder.Append("key$_ = $_;")
+        }
+        $largePsd1Builder.Append('}')
+        Set-Content -Path $largePsd1Path -Value $largePsd1Builder.ToString()
+
+        if ((Get-ExperimentalFeature Microsoft.PowerShell.Utility.PSImportPSDataFileSkipLimitCheck).Enabled -ne $true) {
+            $skipTest = $true
+        }
+    }
 
     It "Validates error on a missing path" {
         { Import-PowerShellDataFile -Path /SomeMissingDirectory -ErrorAction Stop } |
@@ -32,4 +45,12 @@ Describe "Tests for the Import-PowerShellDataFile cmdlet" -Tags "CI" {
         $result.Hello | Should -BeExactly "World"
     }
 
+    It 'Fails if psd1 file has more than 500 keys' {
+        { Import-PowerShellDataFile $largePsd1Path } | Should -Throw -ErrorId 'System.InvalidOperationException,Microsoft.PowerShell.Commands.ImportPowerShellDataFileCommand'
+    }
+
+    It 'Succeeds if -NoLimit is used and has more than 500 keys' -Skip:$skipTest {
+        $result = Import-PowerShellDataFile $largePsd1Path -SkipLimitCheck
+        $result.Keys.Count | Should -Be 501
+    }
 }
diff --git a/test/powershell/engine/Formatting/OutputRendering.Tests.ps1 b/test/powershell/engine/Formatting/OutputRendering.Tests.ps1
new file mode 100644
index 00000000000..27dea30689e
--- /dev/null
+++ b/test/powershell/engine/Formatting/OutputRendering.Tests.ps1
@@ -0,0 +1,85 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe 'OutputRendering tests' {
+    BeforeAll {
+        $PSDefaultParameterValues.Add('It:Skip', (-not $EnabledExperimentalFeatures.Contains('PSAnsiRendering')))
+        $th = New-TestHost
+        $rs = [runspacefactory]::Createrunspace($th)
+        $rs.open()
+        $ps = [powershell]::Create()
+        $ps.Runspace = $rs
+    }
+
+    AfterAll {
+        $PSDefaultParameterValues.Remove('It:Skip')
+    }
+
+    BeforeEach {
+        if ($null -ne $PSStyle) {
+            $oldOutputRendering = $PSStyle.OutputRendering
+        }
+    }
+
+    AfterEach {
+        if ($null -ne $PSStyle) {
+            $PSStyle.OutputRendering = $oldOutputRendering
+        }
+
+        $ps.Commands.Clear()
+    }
+
+    It 'OutputRendering works for "<outputRendering>" to the host' -TestCases @(
+        @{ outputRendering = 'automatic'; ansi = $true }
+        @{ outputRendering = 'host'     ; ansi = $true }
+        @{ outputRendering = 'ansi'     ; ansi = $true }
+        @{ outputRendering = 'plaintext'; ansi = $false }
+    ) {
+        param($outputRendering, $ansi)
+
+        $out = pwsh -noprofile -command "[System.Management.Automation.Internal.InternalTestHooks]::SetTestHook('BypassOutputRedirectionCheck', `$true); `$PSStyle.OutputRendering = '$outputRendering'; write-host '$($PSStyle.Foreground.Green)hello'"
+
+        if ($ansi) {
+            $out | Should -BeLike "*`e*" -Because ($out | Format-Hex | Out-String)
+        }
+        else {
+            $out | Should -Not -BeLike "*`e*" -Because ($out | Format-Hex | Out-String)
+        }
+    }
+
+    It 'OutputRendering works for "<outputRendering>" to the pipeline' -TestCases @(
+        @{ outputRendering = 'automatic'; ansi = $true }
+        @{ outputRendering = 'host'     ; ansi = $false }
+        @{ outputRendering = 'ansi'     ; ansi = $true }
+        @{ outputRendering = 'plaintext'; ansi = $false }
+    ) {
+        param($outputRendering, $ansi)
+
+        $PSStyle.OutputRendering = $outputRendering
+        $out = "$($PSStyle.Foreground.Green)hello" | Out-String
+
+        if ($ansi) {
+            $out | Should -BeLike "*`e*" -Because ($out | Format-Hex | Out-String)
+        }
+        else {
+            $out | Should -Not -BeLike "*`e*" -Because ($out | Format-Hex | Out-String)
+        }
+    }
+
+    # Error isn't covered here because it has custom formatting
+    It 'OutputRendering is correct for <stream>' -TestCases @(
+        @{ stream = 'Verbose' }
+        @{ stream = 'Debug' }
+        @{ stream = 'Warning' }
+    ) {
+        param($stream)
+
+        if ($stream -ne 'Warning')
+        {
+            $switch = "-$stream"
+        }
+
+        $out = pwsh -noprofile -command "[System.Management.Automation.Internal.InternalTestHooks]::SetTestHook('BypassOutputRedirectionCheck', `$true); write-$stream $switch 'hello'"
+        $out | Should -BeExactly "$($PSStyle.Formatting.$stream)$($stream.ToUpper()): hello"
+    }
+}
diff --git a/test/powershell/engine/Formatting/PSStyle.Tests.ps1 b/test/powershell/engine/Formatting/PSStyle.Tests.ps1
new file mode 100644
index 00000000000..5e02e2e231c
--- /dev/null
+++ b/test/powershell/engine/Formatting/PSStyle.Tests.ps1
@@ -0,0 +1,114 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe 'Tests for $PSStyle automatic variable' {
+    BeforeAll {
+        $PSDefaultParameterValues.Add('It:Skip', (-not $EnabledExperimentalFeatures.Contains('PSAnsiRendering')))
+        $styleDefaults = @{
+            Reset = "`e[0m"
+            BlinkOff = "`e[5m"
+            Blink = "`e[25m"
+            BoldOff = "`e[22m"
+            Bold = "`e[1m"
+            HiddenOff = "`e[28m"
+            Hidden = "`e[8m"
+            ReverseOff = "`e[27m"
+            Reverse = "`e[7m"
+            ItalicOff = "`e[23m"
+            Italic = "`e[3m"
+            UnderlineOff = "`e[24m"
+            Underline = "`e[4m"
+        }
+
+        $formattingDefaults = @{
+            FormatAccent = "`e[32;1m"
+            ErrorAccent = "`e[36;1m"
+            Error = "`e[31;1m"
+            Debug = "`e[33;1m"
+            Verbose = "`e[33;1m"
+            Warning = "`e[33;1m"
+        }
+
+        $foregroundDefaults = @{
+            Black = "`e[30m"
+            White = "`e[37m"
+            DarkGray = "`e[90m"
+            LightGray = "`e[97m"
+            Red = "`e[31m"
+            LightRed = "`e[91m"
+            Magenta = "`e[35m"
+            LightMagenta = "`e[95m"
+            Blue = "`e[34m"
+            LightBlue = "`e[94m"
+            Cyan = "`e[36m"
+            LightCyan = "`e[96m"
+            Green = "`e[32m"
+            LightGreen = "`e[92m"
+            Yellow = "`e[33m"
+            LightYellow = "`e[93m"
+        }
+
+        $backgroundDefaults = @{
+            Black = "`e[40m"
+            White = "`e[47m"
+            DarkGray = "`e[100m"
+            LightGray = "`e[107m"
+            Red = "`e[41m"
+            LightRed = "`e[101m"
+            Magenta = "`e[45m"
+            LightMagenta = "`e[105m"
+            Blue = "`e[44m"
+            LightBlue = "`e[104m"
+            Cyan = "`e[46m"
+            LightCyan = "`e[106m"
+            Green = "`e[42m"
+            LightGreen = "`e[102m"
+            Yellow = "`e[43m"
+            LightYellow = "`e[103m"
+        }
+
+        function Get-TestCases($hashtable) {
+            $testcases = [System.Collections.Generic.List[hashtable]]::new()
+            foreach ($key in $hashtable.Keys) {
+                $testcases.Add(
+                    @{ Key = $key; Value = $hashtable[$key] }
+                )
+            }
+
+            return $testcases
+        }
+    }
+
+    AfterAll {
+        $PSDefaultParameterValues.Remove('It:Skip')
+    }
+
+    It '$PSStyle has correct default for OutputRendering' {
+        $PSStyle | Should -Not -BeNullOrEmpty
+        $PSStyle.OutputRendering | Should -BeExactly 'Automatic'
+    }
+
+    It '$PSStyle has correct defaults for style <key>' -TestCases (Get-TestCases $styleDefaults) {
+        param($key, $value)
+
+        $PSStyle.$key | Should -BeExactly $value
+    }
+
+    It '$PSStyle.Formatting has correct default for <key>' -TestCases (Get-TestCases $formattingDefaults) {
+        param($key, $value)
+
+        $PSStyle.Formatting.$key | Should -BeExactly $value
+    }
+
+    It '$PSStyle.Foreground has correct default for <key>' -TestCases (Get-TestCases $foregroundDefaults) {
+        param($key, $value)
+
+        $PSStyle.Foreground.$key | Should -BeExactly $value
+    }
+
+    It '$PSStyle.Background has correct default for <key>' -TestCases (Get-TestCases $backgroundDefaults) {
+        param($key, $value)
+
+        $PSStyle.Background.$key | Should -BeExactly $value
+    }
+}
diff --git a/test/powershell/engine/ParameterBinding/ParameterBinding.Tests.ps1 b/test/powershell/engine/ParameterBinding/ParameterBinding.Tests.ps1
index 07d132012a0..a0fe5973c8e 100644
--- a/test/powershell/engine/ParameterBinding/ParameterBinding.Tests.ps1
+++ b/test/powershell/engine/ParameterBinding/ParameterBinding.Tests.ps1
@@ -256,6 +256,62 @@ Describe "Parameter Binding Tests" -Tags "CI" {
         DynamicParamTest -PipelineVariable bar | ForEach-Object { $bar } | Should -Be "hi"
     }
 
+    Context "PipelineVariable Behaviour" {
+
+        BeforeAll {
+            function Write-PipelineVariable {
+                [CmdletBinding()]
+                [OutputType([int])]
+                param(
+                    [Parameter(ValueFromPipeline)]
+                    $a
+                )
+                begin { 1 }
+                process { 2 }
+                end { 3 }
+            }
+
+            $testScripts = @(
+                @{
+                    CmdletType = 'Script Cmdlet'
+                    Script     = {
+                        1..3 |
+                            Write-PipelineVariable -PipelineVariable pipe |
+                            Select-Object -Property @(
+                                @{ Name = "PipelineVariableSet"; Expression = { $null -ne $pipe ? $true : $false } }
+                                @{ Name = "PipelineVariable"; Expression = { $pipe } }
+                            )
+                    }
+                }
+                @{
+                    CmdletType = 'Compiled Cmdlet'
+                    Script     = {
+                        1..3 |
+                            Write-PipelineVariable |
+                            ForEach-Object { $_ } -PipelineVariable pipe |
+                            Select-Object -Property @(
+                                @{ Name = "PipelineVariableSet"; Expression = { $null -ne $pipe ? $true : $false } }
+                                @{ Name = "PipelineVariable"; Expression = { $pipe } }
+                            )
+                    }
+                }
+            )
+        }
+
+        AfterAll {
+            Remove-Item -Path 'function:Write-PipelineVariable'
+        }
+
+        It 'should set the pipeline variable every time for a <CmdletType>' -TestCases $testScripts {
+            param($Script, $CmdletType)
+
+            $result = & $Script
+            $result.Count | Should -Be 5
+            $result.PipelineVariableSet | Should -Not -Contain $false
+            $result.PipelineVariable | Should -Be 1, 2, 2, 2, 3
+        }
+    }
+
     Context "Use automatic variables as default value for parameters" {
         BeforeAll {
             ## Explicit use of 'CmdletBinding' make it a script cmdlet
diff --git a/test/tools/Modules/nuget.config b/test/tools/Modules/nuget.config
new file mode 100644
index 00000000000..b0fc73009da
--- /dev/null
+++ b/test/tools/Modules/nuget.config
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="PSGallery" value="https://www.powershellgallery.com/api/v2/" />
+  </packageSources>
+  <disabledPackageSources>
+    <clear />
+  </disabledPackageSources>
+</configuration>
diff --git a/test/tools/TestExe/TestExe.cs b/test/tools/TestExe/TestExe.cs
index c8f91d4d38e..0eac8074de0 100644
--- a/test/tools/TestExe/TestExe.cs
+++ b/test/tools/TestExe/TestExe.cs
@@ -13,7 +13,7 @@ private static int Main(string[] args)
         {
             if (args.Length > 0)
             {
-                switch(args[0].ToLowerInvariant())
+                switch (args[0].ToLowerInvariant())
                 {
                     case "-echoargs":
                         EchoArgs(args);
diff --git a/test/tools/WebListener/Controllers/DosController.cs b/test/tools/WebListener/Controllers/DosController.cs
index 6024430095e..7fc138e0e81 100644
--- a/test/tools/WebListener/Controllers/DosController.cs
+++ b/test/tools/WebListener/Controllers/DosController.cs
@@ -22,7 +22,6 @@ public string Index()
 
             Response.StatusCode = 200;
 
-
             StringValues dosType;
             if (Request.Query.TryGetValue("dosType", out dosType))
             {
diff --git a/test/tools/WebListener/Controllers/LinkController.cs b/test/tools/WebListener/Controllers/LinkController.cs
index 3aa7541f4ee..e15607d6b9b 100644
--- a/test/tools/WebListener/Controllers/LinkController.cs
+++ b/test/tools/WebListener/Controllers/LinkController.cs
@@ -109,7 +109,7 @@ public IActionResult Error()
             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 70e4659b3a4..6347abc98e6 100644
--- a/test/tools/WebListener/Controllers/ResponseController.cs
+++ b/test/tools/WebListener/Controllers/ResponseController.cs
@@ -99,7 +99,7 @@ public IActionResult Error()
             return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
         }
 
-        private List<T> GetSingleOrArray<T>(JToken token)
+        private static List<T> GetSingleOrArray<T>(JToken token)
         {
             if (token.HasValues)
             {
diff --git a/test/tools/WebListener/Controllers/ResumeController.cs b/test/tools/WebListener/Controllers/ResumeController.cs
index ebcfad40d78..8aec71e416f 100644
--- a/test/tools/WebListener/Controllers/ResumeController.cs
+++ b/test/tools/WebListener/Controllers/ResumeController.cs
@@ -30,12 +30,12 @@ public async void Index()
             if (TryGetRangeHeader(out rangeHeader))
             {
                 var range = GetRange(rangeHeader);
-                if(range.From != null)
+                if (range.From != null)
                 {
                     from = (int)range.From;
                 }
 
-                if(range.To != null)
+                if (range.To != null)
                 {
                     to = (int)range.To;
                 }
@@ -49,7 +49,7 @@ public async void Index()
                 return;
             }
 
-            if(to >= FileBytes.Length || from >= FileBytes.Length)
+            if (to >= FileBytes.Length || from >= FileBytes.Length)
             {
                 Response.StatusCode = StatusCodes.Status416RequestedRangeNotSatisfiable;
                 Response.Headers[HeaderNames.ContentRange] = $"bytes */{FileBytes.Length}";
@@ -91,7 +91,7 @@ public IActionResult Error()
             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();
         }
@@ -113,7 +113,7 @@ private void SetResumeResponseHeaders()
         private bool TryGetRangeHeader(out string rangeHeader)
         {
             var rangeHeaderSv = new StringValues();
-            if(Request.Headers.TryGetValue("Range", out rangeHeaderSv))
+            if (Request.Headers.TryGetValue("Range", out rangeHeaderSv))
             {
                 rangeHeader = rangeHeaderSv.FirstOrDefault();
                 return true;
diff --git a/test/tools/WebListener/Program.cs b/test/tools/WebListener/Program.cs
index 08055965d81..49f3df50bb9 100644
--- a/test/tools/WebListener/Program.cs
+++ b/test/tools/WebListener/Program.cs
@@ -42,7 +42,7 @@ public static IWebHost BuildWebHost(string[] args) =>
                        HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
                        httpsOption.SslProtocols = SslProtocols.Tls12;
                        httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
-                       httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => {return true;};
+                       httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
                        httpsOption.CheckCertificateRevocation = false;
                        httpsOption.ServerCertificate = certificate;
                        listenOptions.UseHttps(httpsOption);
@@ -53,7 +53,7 @@ public static IWebHost BuildWebHost(string[] args) =>
                        HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
                        httpsOption.SslProtocols = SslProtocols.Tls11;
                        httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
-                       httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => {return true;};
+                       httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
                        httpsOption.CheckCertificateRevocation = false;
                        httpsOption.ServerCertificate = certificate;
                        listenOptions.UseHttps(httpsOption);
@@ -64,7 +64,7 @@ public static IWebHost BuildWebHost(string[] args) =>
                        HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
                        httpsOption.SslProtocols = SslProtocols.Tls;
                        httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
-                       httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => {return true;};
+                       httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
                        httpsOption.CheckCertificateRevocation = false;
                        httpsOption.ServerCertificate = certificate;
                        listenOptions.UseHttps(httpsOption);
@@ -75,7 +75,7 @@ public static IWebHost BuildWebHost(string[] args) =>
                        HttpsConnectionAdapterOptions httpsOption = new HttpsConnectionAdapterOptions();
                        httpsOption.SslProtocols = SslProtocols.Tls13;
                        httpsOption.ClientCertificateMode = ClientCertificateMode.AllowCertificate;
-                       httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => {return true;};
+                       httpsOption.ClientCertificateValidation = (inCertificate, inChain, inPolicy) => { return true; };
                        httpsOption.CheckCertificateRevocation = false;
                        httpsOption.ServerCertificate = certificate;
                        listenOptions.UseHttps(httpsOption);
diff --git a/test/xUnit/csharp/test_AstDefaultVisit.cs b/test/xUnit/csharp/test_AstDefaultVisit.cs
index 925f2c6be53..283c1f73071 100644
--- a/test/xUnit/csharp/test_AstDefaultVisit.cs
+++ b/test/xUnit/csharp/test_AstDefaultVisit.cs
@@ -44,7 +44,7 @@ public static class AstDefaultVisitTests
         public static void TestCustomAstVisitor()
         {
             var ast = Parser.ParseInput("a | b", out _, out _);
-            var expected = typeof(NamedBlockAst).Name;
+            var expected = nameof(NamedBlockAst);
 
             var myVisitor1 = new MyICustomAstVisitor2();
             var result1 = ast.EndBlock.Accept(myVisitor1);
diff --git a/test/xUnit/csharp/test_CommandLineParser.cs b/test/xUnit/csharp/test_CommandLineParser.cs
index f52fcdf2fee..9e942bb0051 100644
--- a/test/xUnit/csharp/test_CommandLineParser.cs
+++ b/test/xUnit/csharp/test_CommandLineParser.cs
@@ -976,6 +976,7 @@ public IEnumerator<object[]> GetEnumerator()
                 yield return new object[] { "-settingsfile", _fileName };
                 yield return new object[] { "-settings", _fileName };
             }
+
             IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
         }
 
diff --git a/test/xUnit/csharp/test_FileSystemProvider.cs b/test/xUnit/csharp/test_FileSystemProvider.cs
index ef702d47bd6..b2a017b4b95 100644
--- a/test/xUnit/csharp/test_FileSystemProvider.cs
+++ b/test/xUnit/csharp/test_FileSystemProvider.cs
@@ -39,12 +39,21 @@ public FileSystemProviderTests()
             File.AppendAllText(testPath, testContent);
         }
 
-        void IDisposable.Dispose()
+        public void Dispose()
         {
-            File.Delete(testPath);
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }        
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                File.Delete(testPath);
+            }
         }
 
-        private ExecutionContext GetExecutionContext()
+        private static ExecutionContext GetExecutionContext()
         {
             CultureInfo currentCulture = CultureInfo.CurrentCulture;
             PSHost hostInterface = new DefaultHost(currentCulture, currentCulture);
@@ -54,7 +63,7 @@ private ExecutionContext GetExecutionContext()
             return executionContext;
         }
 
-        private ProviderInfo GetProvider()
+        private static ProviderInfo GetProvider()
         {
             ExecutionContext executionContext = GetExecutionContext();
             SessionStateInternal sessionState = new SessionStateInternal(executionContext);
diff --git a/test/xUnit/csharp/test_NamedPipe.cs b/test/xUnit/csharp/test_NamedPipe.cs
index 1ee50036fc0..1174799fd95 100644
--- a/test/xUnit/csharp/test_NamedPipe.cs
+++ b/test/xUnit/csharp/test_NamedPipe.cs
@@ -31,7 +31,7 @@ public void TestCustomPipeNameCreation()
         [Fact]
         public void TestCustomPipeNameCreationTooLongOnNonWindows()
         {
-            var longPipeName = "DoggoipsumwaggywagssmolborkingdoggowithalongsnootforpatsdoingmeafrightenporgoYapperporgolongwatershoobcloudsbigolpupperlengthboy";
+            const string longPipeName = "DoggoipsumwaggywagssmolborkingdoggowithalongsnootforpatsdoingmeafrightenporgoYapperporgolongwatershoobcloudsbigolpupperlengthboy";
 
             if (!Platform.IsWindows)
             {
diff --git a/test/xUnit/csharp/test_PSConfiguration.cs b/test/xUnit/csharp/test_PSConfiguration.cs
index 6237f453335..54e69da68f0 100644
--- a/test/xUnit/csharp/test_PSConfiguration.cs
+++ b/test/xUnit/csharp/test_PSConfiguration.cs
@@ -97,18 +97,27 @@ public PowerShellPolicyFixture()
 
         public void Dispose()
         {
-            CleanupConfigFiles();
-            if (systemWideConfigBackupFile != null)
-            {
-                File.Move(systemWideConfigBackupFile, systemWideConfigFile);
-            }
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }        
 
-            if (currentUserConfigBackupFile != null)
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
             {
-                File.Move(currentUserConfigBackupFile, currentUserConfigFile);
-            }
+                CleanupConfigFiles();
+                if (systemWideConfigBackupFile != null)
+                {
+                    File.Move(systemWideConfigBackupFile, systemWideConfigFile);
+                }
 
-            InternalTestHooks.BypassGroupPolicyCaching = originalTestHookValue;
+                if (currentUserConfigBackupFile != null)
+                {
+                    File.Move(currentUserConfigBackupFile, currentUserConfigFile);
+                }
+
+                InternalTestHooks.BypassGroupPolicyCaching = originalTestHookValue;
+            }
         }
 
         internal PowerShellPolicies SystemWidePolicies
@@ -357,11 +366,27 @@ public void SetupConfigFile4()
             CreateEmptyFile(currentUserConfigFile);
         }
 
-        private void CreateEmptyFile(string fileName)
+        private static void CreateEmptyFile(string fileName)
         {
             File.Create(fileName).Dispose();
         }
 
+        public void SetupConfigFile5()
+        {
+            CleanupConfigFiles();
+
+            // System wide config file is broken
+            CreateBrokenConfigFile(systemWideConfigFile);
+
+            // Current user config file is broken
+            CreateBrokenConfigFile(currentUserConfigFile);
+        }
+
+        private static void CreateBrokenConfigFile(string fileName)
+        {
+            File.WriteAllText(fileName, "[abbra");
+        }
+
         internal void ForceReadingFromFile()
         {
             // Reset the cached roots.
@@ -952,5 +977,15 @@ public void Utils_GetPolicySetting_BothConfigFilesNotExist()
             consoleSessionConfiguration = Utils.GetPolicySetting<ConsoleSessionConfiguration>(Utils.CurrentUserThenSystemWideConfig);
             fixture.CompareConsoleSessionConfiguration(consoleSessionConfiguration, null);
         }
+
+        [Fact, Priority(11)]
+        public void PowerShellConfig_GetPowerShellPolicies_BrokenSystemConfig()
+        {
+            fixture.SetupConfigFile5();
+            fixture.ForceReadingFromFile();
+
+            Assert.Throws<System.Management.Automation.PSInvalidOperationException>(() => PowerShellConfig.Instance.GetPowerShellPolicies(ConfigScope.AllUsers));
+            Assert.Throws<System.Management.Automation.PSInvalidOperationException>(() => PowerShellConfig.Instance.GetPowerShellPolicies(ConfigScope.CurrentUser));
+        }
     }
 }
diff --git a/test/xUnit/csharp/test_Utils.cs b/test/xUnit/csharp/test_Utils.cs
index b30c3ad18f8..ea45ce533d6 100644
--- a/test/xUnit/csharp/test_Utils.cs
+++ b/test/xUnit/csharp/test_Utils.cs
@@ -59,7 +59,7 @@ public static void TestHistoryStack()
         [Fact]
         public static void TestBoundedStack()
         {
-            int capacity = 20;
+            const int capacity = 20;
             var boundedStack = new BoundedStack<string>(capacity);
             Assert.Throws<InvalidOperationException>(() => boundedStack.Pop());
 
@@ -116,7 +116,7 @@ public static void TestConvertToJsonWithEnum()
         public static void TestConvertToJsonWithoutCompress()
         {
             var context = new JsonObject.ConvertToJsonContext(maxDepth: 1, enumsAsStrings: true, compressOutput: false);
-            string expected = @"{
+            const string expected = @"{
   ""type"": ""Alias""
 }";
             Hashtable hash = new Hashtable {
diff --git a/test/xUnit/xUnit.tests.csproj b/test/xUnit/xUnit.tests.csproj
index 6ecf0f798aa..352da3d353d 100644
--- a/test/xUnit/xUnit.tests.csproj
+++ b/test/xUnit/xUnit.tests.csproj
@@ -27,7 +27,7 @@
     <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="XunitXml.TestLogger" Version="2.1.26" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tools/metadata.json b/tools/metadata.json
index 551b28425c6..77d654d1dd1 100644
--- a/tools/metadata.json
+++ b/tools/metadata.json
@@ -1,9 +1,9 @@
 {
   "StableReleaseTag": "v7.1.0",
-  "PreviewReleaseTag": "v7.1.0-rc.2",
+  "PreviewReleaseTag": "v7.2.0-preview.1",
   "ServicingReleaseTag": "v6.2.7",
   "ReleaseTag": "v7.1.0",
   "LTSReleaseTag" : ["v7.0.3"],
-  "NextReleaseTag": "v7.2.0-preview.1",
+  "NextReleaseTag": "v7.2.0-preview.2",
   "LTSRelease": false
 }
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 4a1ecd52854..aaaee8688d0 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -1825,8 +1825,7 @@ function New-ILNugetPackage
         "Microsoft.PowerShell.SDK.dll",
         "Microsoft.WSMan.Management.dll",
         "Microsoft.WSMan.Runtime.dll",
-        "System.Management.Automation.dll",
-        "Microsoft.PowerShell.MarkdownRender.dll")
+        "System.Management.Automation.dll")
 
     $linuxExceptionList = @(
         "Microsoft.Management.Infrastructure.CimCmdlets.dll",
@@ -1934,7 +1933,6 @@ function New-ILNugetPackage
 
                 'Microsoft.PowerShell.Commands.Utility' {
                     $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null
-                    $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.MarkdownRender'), [tuple]::Create('version', $PackageVersion))) > $null
 
                     foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $fileBaseName))
                     {
@@ -1996,14 +1994,6 @@ function New-ILNugetPackage
                         $deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
                     }
                 }
-
-                'Microsoft.PowerShell.MarkdownRender' {
-                    $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null
-                    foreach($packageInfo in (Get-ProjectPackageInformation -ProjectName $fileBaseName))
-                    {
-                        $deps.Add([tuple]::Create([tuple]::Create('id', $packageInfo.Name), [tuple]::Create('version', $packageInfo.Version))) > $null
-                    }
-                }
             }
 
             New-NuSpec -PackageId $fileBaseName -PackageVersion $PackageVersion -Dependency $deps -FilePath (Join-Path $filePackageFolder.FullName "$fileBaseName.nuspec")
@@ -2321,7 +2311,6 @@ function CleanupGeneratedSourceCode
         '[Microsoft.PowerShell.Commands.AddMemberCommand'
         '[System.Management.Automation.ArgumentCompleterAttribute(typeof(Microsoft.PowerShell.Commands.Utility.JoinItemCompleter))]'
         '[System.Management.Automation.ArgumentCompleterAttribute(typeof(System.Management.Automation.PropertyNameCompleter))]'
-        '[System.Management.Automation.OutputTypeAttribute(typeof(Microsoft.PowerShell.MarkdownRender'
         '[Microsoft.PowerShell.Commands.ArgumentToTypeNameTransformationAttribute]'
         '[System.Management.Automation.Internal.ArchitectureSensitiveAttribute]'
         '[Microsoft.PowerShell.Commands.SelectStringCommand.FileinfoToStringAttribute]'
@@ -2401,7 +2390,6 @@ function CleanupGeneratedSourceCode
             if ($assemblyName -in $patternToReplace.ApplyTo -and $line.Contains($patternToReplace.Pattern)) {
                 $line = $line.Replace($patternToReplace.Pattern, $patternToReplace.Replacement)
                 $lineWasProcessed = $true
-                break
             }
         }
 
diff --git a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 8890d53951a..d6aa032de2b 100644
--- a/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/tools/packaging/projects/reference/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -15,5 +15,6 @@
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="System.Security.AccessControl" Version="5.0.0" />
+    <PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0-preview.2" />
   </ItemGroup>
 </Project>
diff --git a/tools/releaseBuild/azureDevOps/AzArtifactFeed/PSGalleryToAzArtifacts.yml b/tools/releaseBuild/azureDevOps/AzArtifactFeed/PSGalleryToAzArtifacts.yml
index fab28643168..221a385b8b8 100644
--- a/tools/releaseBuild/azureDevOps/AzArtifactFeed/PSGalleryToAzArtifacts.yml
+++ b/tools/releaseBuild/azureDevOps/AzArtifactFeed/PSGalleryToAzArtifacts.yml
@@ -18,7 +18,7 @@ steps:
 
   - pwsh: |
       Import-Module -Force "$(Build.SourcesDirectory)/tools/releaseBuild/azureDevOps/AzArtifactFeed/SyncGalleryToAzArtifacts.psm1"
-      SyncGalleryToAzArtifacts -AzDevOpsFeedUserName $(AzDevOpsFeedUserName) -AzDevOpsPAT $(AzDevOpsFeedPAT) -Destination $(Build.ArtifactStagingDirectory)
+      SyncGalleryToAzArtifacts -AzDevOpsFeedUserName $(AzDevOpsFeedUserName) -AzDevOpsPAT $(AzDevOpsFeedPAT2) -Destination $(Build.ArtifactStagingDirectory)
     displayName: Download packages from PSGallery that need to be updated
     condition: succeededOrFailed()
 
diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml
index 6df2fe18f09..5e87ff58ec7 100644
--- a/tools/releaseBuild/azureDevOps/releaseBuild.yml
+++ b/tools/releaseBuild/azureDevOps/releaseBuild.yml
@@ -16,6 +16,7 @@ resources:
     type: github
     endpoint: ComplianceGHRepo
     name: PowerShell/compliance
+    ref: master
 
 variables:
   - name: DOTNET_CLI_TELEMETRY_OPTOUT
diff --git a/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml b/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
index ae697e70e33..5fdb9f7d977 100644
--- a/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
+++ b/tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
@@ -1,11 +1,25 @@
+parameters:
+  - name: "repoRoot"
+    default: $(REPOROOT)
+
 steps:
-- powershell: |
-      Import-Module $(Build.SourcesDirectory)/build.psm1 -Force
-      New-NugetConfigFile -NugetFeedUrl $(AzDevOpsFeed) -UserName $(AzDevOpsFeedUserName) -ClearTextPAT $(AzDevOpsFeedPAT) -FeedName AzDevOpsFeed -Destination $(Build.SourcesDirectory)/src/Modules
+- pwsh: |
+      Import-Module ${{ parameters.repoRoot }}/build.psm1 -Force
+      New-NugetConfigFile -NugetFeedUrl $(AzDevOpsFeed) -UserName $(AzDevOpsFeedUserName) -ClearTextPAT $(AzDevOpsFeedPAT2) -FeedName AzDevOpsFeed -Destination '${{ parameters.repoRoot }}/src/Modules'
 
-      if(-not (Test-Path "$(Build.SourcesDirectory)/src/Modules/nuget.config"))
+      if(-not (Test-Path "${{ parameters.repoRoot }}/src/Modules/nuget.config"))
       {
           throw "nuget.config is not created"
       }
   displayName: 'Add nuget.config for Azure DevOps feed for PSGallery modules'
   condition: and(succeededOrFailed(), ne(variables['AzDevOpsFeed'], ''))
+- pwsh: |
+      Import-Module ${{ parameters.repoRoot }}/build.psm1 -Force
+      New-NugetConfigFile -NugetFeedUrl $(AzDevOpsPackageFeed) -UserName $(AzDevOpsFeedUserName) -ClearTextPAT $(AzDevOpsFeedPAT2) -FeedName AzDevOpsFeed -Destination '${{ parameters.repoRoot }}'
+
+      if(-not (Test-Path "${{ parameters.repoRoot }}/nuget.config"))
+      {
+          throw "nuget.config is not created"
+      }
+  displayName: 'Add nuget.config for Azure DevOps feed for packages'
+  condition: and(succeededOrFailed(), ne(variables['AzDevOpsPackageFeed'], ''))
diff --git a/tools/releaseBuild/azureDevOps/templates/linux.yml b/tools/releaseBuild/azureDevOps/templates/linux.yml
index 5c94fce0c26..0fac7ae4f24 100644
--- a/tools/releaseBuild/azureDevOps/templates/linux.yml
+++ b/tools/releaseBuild/azureDevOps/templates/linux.yml
@@ -7,15 +7,23 @@ jobs:
 - job: build_${{ parameters.buildName }}
   displayName: Build ${{ parameters.buildName }}
   condition: succeeded()
-  pool: Hosted Ubuntu 1604
+  pool:
+    vmImage: ubuntu-16.04
   dependsOn: ${{ parameters.parentJob }}
   variables:
-    build: ${{ parameters.buildName }}
-    runCodesignValidationInjection: false
+    - name: runCodesignValidationInjection
+      value: false
+    - name: build
+      value: ${{ parameters.buildName }}
+    - group: ESRP
+
   steps:
   - checkout: self
     clean: true
 
+  - checkout: ComplianceRepo
+    clean: true
+
   - template: SetVersionVariables.yml
     parameters:
       ReleaseTagVar: $(ReleaseTagVar)
@@ -34,16 +42,19 @@ jobs:
     displayName: 'Skip Alpine or fxdependent for PS v6.0.*'
 
   - template: insert-nuget-config-azfeed.yml
-
+    parameters:
+      repoRoot: $(REPOROOT)
 
   - powershell: |
-      import-module ./build.psm1
+      import-module "$env:REPOROOT/build.psm1"
       Sync-PSTags -AddRemoteIfMissing
     displayName: SyncTags
     condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
 
   - powershell: |
-      tools/releaseBuild/vstsbuild.ps1 -ReleaseTag $(ReleaseTagVar) -Name '$(build)'
+      $env:AzDevOpsFeedPAT2 = '$(AzDevOpsFeedPAT2)'
+      & "$env:REPOROOT/tools/releaseBuild/vstsbuild.ps1" -ReleaseTag $(ReleaseTagVar) -Name '$(build)'
+      $env:AzDevOpsFeedPAT2 = $null
 
     displayName: 'Build and package'
     condition: and(succeeded(), ne(variables['SkipBuild'], 'true'))
@@ -52,10 +63,19 @@ jobs:
   displayName: ${{ parameters.uploadDisplayName }} ${{ parameters.buildName }}
   dependsOn: build_${{ parameters.buildName }}
   condition: succeeded()
-  pool: Package ES Standard Build
+  pool:
+    vmImage: windows-latest
   variables:
-    buildName: ${{ parameters.buildName }}
+    - name: buildName
+      value: ${{ parameters.buildName }}
+    - group: ESRP
+
   steps:
+  - checkout: self
+    clean: true
+
+  - checkout: ComplianceRepo
+    clean: true
 
   - template: shouldSign.yml
 
@@ -86,32 +106,26 @@ jobs:
       downloadPath: '$(System.ArtifactsDirectory)\rpm'
     condition: and(eq(variables['buildName'], 'RPM'),succeeded())
 
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-antimalware.AntiMalware@3
-    displayName: 'Run Defender Scan'
-
-  - powershell: |
-      $authenticodefiles = @()
-      Get-ChildItem -Path '$(System.ArtifactsDirectory)\rpm\*.rpm' -recurse | ForEach-Object { $authenticodefiles += $_.FullName}
-      tools/releaseBuild/generatePackgeSigning.ps1 -LinuxFiles $authenticodeFiles -path "$(System.ArtifactsDirectory)\package.xml"
-    displayName: 'Generate RPM Signing Xml'
-    condition: and(and(succeeded(), eq(variables['SHOULD_SIGN'], 'true')),eq(variables['buildName'], 'RPM'))
-
-  - powershell: |
-      Get-Content "$(System.ArtifactsDirectory)\package.xml"
-    displayName: 'Capture RPM signing xml'
-    condition: and(and(succeeded(), eq(variables['SHOULD_SIGN'], 'true')),eq(variables['buildName'], 'RPM'))
-
-  - task: PkgESCodeSign@10
-    displayName: 'CodeSign RPM $(System.ArtifactsDirectory)\package.xml'
-    env:
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-    inputs:
-      signConfigXml: '$(System.ArtifactsDirectory)\package.xml'
-      outPathRoot: '$(Build.StagingDirectory)\signedPackages'
-      binVersion: $(SigingVersion)
-      binVersionOverride: $(SigningVersionOverride)
-    condition: and(and(succeeded(), eq(variables['SHOULD_SIGN'], 'true')),eq(variables['buildName'], 'RPM'))
-
+  - template: EsrpScan.yml@ComplianceRepo
+    parameters:
+        scanPath: $(System.ArtifactsDirectory)
+        pattern: |
+          **\*.rpm
+          **\*.deb
+          **\*.tar.gz
+
+  - ${{ if eq(variables['buildName'], 'RPM') }}:
+    - template: EsrpSign.yml@ComplianceRepo
+      parameters:
+          buildOutputPath: $(System.ArtifactsDirectory)\rpm
+          signOutputPath: $(Build.StagingDirectory)\signedPackages
+          certificateId: "CP-450779-Pgp"
+          pattern: |
+            **\*.rpm
+          useMinimatch: true
+          shouldSign: $(SHOULD_SIGN)
+
+  # requires windows
   - task: AzureFileCopy@4
     displayName: 'Upload to Azure - DEB and tar.gz'
     inputs:
@@ -125,6 +139,7 @@ jobs:
     parameters:
       artifactPath: $(System.ArtifactsDirectory)\finished\release
 
+  # requires windows
   - task: AzureFileCopy@4
     displayName: 'Upload to Azure - RPM - Unsigned'
     inputs:
@@ -135,10 +150,11 @@ jobs:
       ContainerName: '$(AzureVersion)'
     condition: and(and(succeeded(), ne(variables['SHOULD_SIGN'], 'true')),eq(variables['buildName'], 'RPM'))
 
+  # requires windows
   - task: AzureFileCopy@4
     displayName: 'Upload to Azure - RPM - Signed'
     inputs:
-      SourcePath: '$(Build.StagingDirectory)\signedPackages\*'
+      SourcePath: '$(Build.StagingDirectory)\signedPackages\release\*'
       azureSubscription: '$(AzureFileCopySubscription)'
       Destination: AzureBlob
       storage: '$(StorageAccount)'
@@ -152,7 +168,7 @@ jobs:
 
   - template: upload-final-results.yml
     parameters:
-      artifactPath: '$(Build.StagingDirectory)\signedPackages'
+      artifactPath: '$(Build.StagingDirectory)\signedPackages\release'
       condition: and(and(succeeded(), eq(variables['SHOULD_SIGN'], 'true')),eq(variables['buildName'], 'RPM'))
 
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
index fddbe5f131d..0332ec560d0 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-file-signing.yml
@@ -9,13 +9,15 @@ jobs:
     pool:
       name: Package ES Standard Build
     variables:
-      BuildConfiguration: release
-      BuildPlatform: any cpu
+      - group: ESRP
 
     steps:
     - checkout: self
       clean: true
 
+    - checkout: ComplianceRepo
+      clean: true
+
     - template: shouldSign.yml
 
     - template: SetVersionVariables.yml
@@ -63,27 +65,15 @@ jobs:
         Write-Host $zipFile
       displayName: 'Compress macOS binary files'
 
-    - pwsh: |
-        $pkgFiles = "$(Build.StagingDirectory)\macos\powershell-files-$(Version)-osx-x64.zip", "$(Build.StagingDirectory)\macos\powershell-lts-$(Version)-osx-x64.zip"
-        tools/releaseBuild/generatePackgeSigning.ps1 -MacDeveloperFiles $pkgFiles -path "$(System.ArtifactsDirectory)\package.xml"
-      displayName: 'Generate macOS binary Signing Xml'
-
-    - pwsh: |
-        Get-Content "$(System.ArtifactsDirectory)\package.xml"
-      displayName: 'Capture macOS signing xml'
-      # Diagnostics is not critical it passes every time it runs
-      continueOnError: true
-
-    - task: PkgESCodeSign@10
-      displayName: 'CodeSign $(System.ArtifactsDirectory)\package.xml'
-      env:
-        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-      inputs:
-        signConfigXml: '$(System.ArtifactsDirectory)\package.xml'
-        outPathRoot: '$(Build.StagingDirectory)\signedMacOSPackages'
-        binVersion: $(SigingVersion)
-        binVersionOverride: $(SigningVersionOverride)
-      condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
+    - template: EsrpSign.yml@ComplianceRepo
+      parameters:
+          buildOutputPath: $(Build.StagingDirectory)\macos
+          signOutputPath: $(Build.StagingDirectory)\signedMacOSPackages
+          certificateId: "CP-401337-Apple"
+          pattern: |
+            **\*.zip
+          useMinimatch: true
+          shouldSign: $(SHOULD_SIGN)
 
     - pwsh: |
         $destination = "$(System.ArtifactsDirectory)\azureMacOs"
@@ -100,8 +90,12 @@ jobs:
         artifactName: signedMacOsBins
         condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
 
-    - task: securedevelopmentteam.vss-secure-development-tools.build-task-antimalware.AntiMalware@3
-      displayName: 'Run Defender Scan'
+    - ${{ if eq(variables['SHOULD_SIGN'], 'true') }}:
+      - template: EsrpScan.yml@ComplianceRepo
+        parameters:
+            scanPath: $(System.ArtifactsDirectory)\azureMacOs
+            pattern: |
+              **\*
 
     - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
       displayName: 'Component Detection'
diff --git a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
index 05fe9114892..8d13693ca5a 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac-package-signing.yml
@@ -9,13 +9,15 @@ jobs:
   pool:
     name: Package ES Standard Build
   variables:
-    BuildConfiguration: release
-    BuildPlatform: any cpu
+    - group: ESRP
 
   steps:
   - checkout: self
     clean: true
 
+  - checkout: ComplianceRepo
+    clean: true
+
   - template: shouldSign.yml
 
   - template: SetVersionVariables.yml
@@ -50,27 +52,15 @@ jobs:
       }
     displayName: 'Compress macOS Package'
 
-  - pwsh: |
-      $pkgFiles = "$(Build.StagingDirectory)\macos\powershell-$(Version)-osx-x64.zip", "$(Build.StagingDirectory)\macos\powershell-lts-$(Version)-osx-x64.zip"
-      tools/releaseBuild/generatePackgeSigning.ps1 -MacDeveloperFiles $pkgFiles -path "$(System.ArtifactsDirectory)\package.xml"
-    displayName: 'Generate macOS Package Signing Xml'
-
-  - pwsh: |
-      Get-Content "$(System.ArtifactsDirectory)\package.xml"
-    displayName: 'Capture macOS signing xml'
-    # Diagnostics is not critical it passes every time it runs
-    continueOnError: true
-
-  - task: PkgESCodeSign@10
-    displayName: 'CodeSign $(System.ArtifactsDirectory)\package.xml'
-    env:
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-    inputs:
-      signConfigXml: '$(System.ArtifactsDirectory)\package.xml'
-      outPathRoot: '$(Build.StagingDirectory)\signedMacOSPackages'
-      binVersion: $(SigingVersion)
-      binVersionOverride: $(SigningVersionOverride)
-    condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
+  - template: EsrpSign.yml@ComplianceRepo
+    parameters:
+        buildOutputPath: $(Build.StagingDirectory)\macos
+        signOutputPath: $(Build.StagingDirectory)\signedMacOSPackages
+        certificateId: "CP-401337-Apple"
+        pattern: |
+          **\*.zip
+        useMinimatch: true
+        shouldSign: $(SHOULD_SIGN)
 
   - template: upload-final-results.yml
     parameters:
@@ -120,9 +110,6 @@ jobs:
       ContainerName: '$(AzureVersion)'
     condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
 
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-antimalware.AntiMalware@3
-    displayName: 'Run Defender Scan'
-
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
     inputs:
diff --git a/tools/releaseBuild/azureDevOps/templates/mac.yml b/tools/releaseBuild/azureDevOps/templates/mac.yml
index f38e9b63573..6690f678888 100644
--- a/tools/releaseBuild/azureDevOps/templates/mac.yml
+++ b/tools/releaseBuild/azureDevOps/templates/mac.yml
@@ -35,20 +35,14 @@ jobs:
       tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -location $(PowerShellRoot) -BootStrap
     displayName: 'Bootstrap VM'
 
-  - pwsh: |
-      Import-Module $(Build.SourcesDirectory)/build.psm1 -Force
-      New-NugetConfigFile -NugetFeedUrl $(AzDevOpsFeed) -UserName $(AzDevOpsFeedUserName) -ClearTextPAT $(AzDevOpsFeedPAT) -FeedName AzDevOpsFeed -Destination "$(PowerShellRoot)/src/Modules"
-
-      if(-not (Test-Path "$(PowerShellRoot)/src/Modules/nuget.config"))
-      {
-          throw "nuget.config is not created"
-      }
-    displayName: 'Add nuget.config for AzDevOps feed for PSGallery modules '
+  - template: /tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
+    parameters:
+      repoRoot: $(PowerShellRoot)
 
   - pwsh: |
-      $env:AZDEVOPSFEEDPAT = '$(AzDevOpsFeedPAT)'
+      $env:AzDevOpsFeedPAT2 = '$(AzDevOpsFeedPAT2)'
       $(Build.SourcesDirectory)/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 -ReleaseTag $(ReleaseTagVar) -Destination $(System.ArtifactsDirectory) -Symbols -location $(PowerShellRoot) -Build -ArtifactName macosBinResults
-      $env:AZDEVOPSFEEDPAT = $null
+      $env:AzDevOpsFeedPAT2 = $null
     displayName: 'Build'
 
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
diff --git a/tools/releaseBuild/azureDevOps/templates/nuget.yml b/tools/releaseBuild/azureDevOps/templates/nuget.yml
index 0e81e337aed..b2702f162ee 100644
--- a/tools/releaseBuild/azureDevOps/templates/nuget.yml
+++ b/tools/releaseBuild/azureDevOps/templates/nuget.yml
@@ -12,19 +12,35 @@ jobs:
   timeoutInMinutes: 90
 
   variables:
-    runCodesignValidationInjection: false
-    GenAPIToolPath: '$(System.ArtifactsDirectory)/GenAPI'
-    PackagePath: '$(System.ArtifactsDirectory)/UnifiedPackagePath'
-    winFxdPath: '$(System.ArtifactsDirectory)/winFxd'
-    winFxdWinDesktopPath: '$(System.ArtifactsDirectory)/winFxdWinDesktop'
-    linuxFxdPath: '$(System.ArtifactsDirectory)/linuxFxd'
+    - name: runCodesignValidationInjection
+      value: false
+    - name: build
+      value: ${{ parameters.buildName }}
+    - group: ESRP
+    - name: GenAPIToolPath
+      value: '$(System.ArtifactsDirectory)/GenAPI'
+    - name: PackagePath
+      value: '$(System.ArtifactsDirectory)/UnifiedPackagePath'
+    - name: winFxdPath
+      value: '$(System.ArtifactsDirectory)/winFxd'
+    - name: winFxdWinDesktopPath
+      value: '$(System.ArtifactsDirectory)/winFxdWinDesktop'
+    - name: linuxFxdPath
+      value: '$(System.ArtifactsDirectory)/linuxFxd'
 
   steps:
   - checkout: self
     clean: true
 
+  - checkout: ComplianceRepo
+    clean: true
+
+  - template: SetVersionVariables.yml
+    parameters:
+      ReleaseTagVar: $(ReleaseTagVar)
+
   - powershell: |
-      $content = Get-Content "$(Build.SourcesDirectory)/global.json" -Raw | ConvertFrom-Json
+      $content = Get-Content "$env:REPOROOT/global.json" -Raw | ConvertFrom-Json
       $vstsCommandString = "vso[task.setvariable variable=SDKVersion]$($content.sdk.version)"
       Write-Host "sending " + $vstsCommandString
       Write-Host "##$vstsCommandString"
@@ -90,8 +106,8 @@ jobs:
     displayName: 'Install NuGet.exe'
 
   - powershell: |
-      Import-Module $env:BUILD_SOURCESDIRECTORY\build.psm1
-      Import-Module $env:BUILD_SOURCESDIRECTORY\tools\packaging
+      Import-Module $env:REPOROOT\build.psm1
+      Import-Module $env:REPOROOT\tools\packaging
       Find-Dotnet
       New-ILNugetPackage -PackagePath "$(PackagePath)" -PackageVersion "$(Version)" -WinFxdBinPath '$(winFxdPath)' -LinuxFxdBinPath '$(linuxFxdPath)' -GenAPIToolPath "$(GenAPIToolPath)"
     displayName: 'Create Nuget Package Folders'
@@ -103,8 +119,8 @@ jobs:
     displayName: Capture fxd folders
 
   - powershell: |
-      Import-Module $env:BUILD_SOURCESDIRECTORY\build.psm1
-      Import-Module $env:BUILD_SOURCESDIRECTORY\tools\packaging
+      Import-Module $env:REPOROOT\build.psm1
+      Import-Module $env:REPOROOT\tools\packaging
       Find-Dotnet
       # Create unified package first
       New-GlobalToolNupkg -UnifiedPackage -LinuxBinPath "$(linuxFxdPath)" -WindowsBinPath "$(winFxdPath)" -WindowsDesktopBinPath "$(winFxdWinDesktopPath)" -PackageVersion "$(Version)" -DestinationPath "$(PackagePath)\globaltool"
@@ -117,28 +133,15 @@ jobs:
       Get-ChildItem "$(PackagePath)" -Recurse
     displayName: Capture generated packages
 
-  - powershell: |
-      $packages = Get-ChildItem "$(PackagePath)\*.nupkg", "$(PackagePath)\globaltool\*.nupkg" | Select-Object -ExpandProperty FullName
-
-      if($packages.Count -lt 1)
-      {
-          throw "No packages created"
-      }
-
-      $(Build.SourcesDirectory)\tools\releaseBuild\generatePackgeSigning.ps1 -Path $(PackagePath)\NugetSigning.xml -NuPkgFiles $packages
-    displayName: Create signing file
-
-  - task: PkgESCodeSign@10
-    displayName: 'CodeSign Nuget Packages'
-    env:
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-    inputs:
-      signConfigXml: '$(PackagePath)\NugetSigning.xml'
-      inPathRoot: '$(PackagePath)'
-      outPathRoot: '$(System.ArtifactsDirectory)\signed'
-      binVersion: $(SigingVersion)
-      binVersionOverride: $(SigningVersionOverride)
-    condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
+  - template: EsrpSign.yml@ComplianceRepo
+    parameters:
+        buildOutputPath: $(PackagePath)
+        signOutputPath: $(System.ArtifactsDirectory)\signed
+        certificateId: "CP-401405"
+        pattern: |
+          **\*.nupkg
+        useMinimatch: true
+        shouldSign: $(SHOULD_SIGN)
 
   - pwsh: |
       if (-not (Test-Path '$(System.ArtifactsDirectory)\signed\')) { $null = New-Item -ItemType Directory -Path '$(System.ArtifactsDirectory)\signed\' }
@@ -148,7 +151,7 @@ jobs:
     condition: eq(variables['SHOULD_SIGN'], 'false')
 
   - powershell: |
-      Import-Module $(Build.SourcesDirectory)\build.psm1 -Force
+      Import-Module "${env:REPOROOT}\build.psm1" -Force
       Get-ChildItem -Recurse "$(System.ArtifactsDirectory)\signed\*.nupkg" -Verbose | ForEach-Object {  Start-NativeExecution -sb { nuget.exe verify -All $_.FullName } }
     displayName: Verify all packages are signed
     condition: eq(variables['SHOULD_SIGN'], 'true')
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
index 3413896f0b2..cc05417b17b 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-hosted-build.yml
@@ -31,10 +31,12 @@ jobs:
     parameters:
       ReleaseTagVar: $(ReleaseTagVar)
 
-  - template: insert-nuget-config-azfeed.yml
-
   - template: cloneToOfficialPath.yml
 
+  - template: /tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
+    parameters:
+      repoRoot: $(PowerShellRoot)
+
   - powershell: |
 
       $runtime = switch ($env:Architecture)
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
index 571467a3fb5..070a0840991 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-package-signing.yml
@@ -8,15 +8,19 @@ jobs:
     ${{ parameters.parentJobs }}
   condition: succeeded()
   pool:
-    name: Package ES Standard Build
+    vmImage: windows-latest
   variables:
-    BuildConfiguration: release
-    BuildPlatform: any cpu
+    - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
+      value: 1
+    - group: ESRP
 
   steps:
   - checkout: self
     clean: true
 
+  - checkout: ComplianceRepo
+    clean: true
+
   - template: shouldSign.yml
   - template: SetVersionVariables.yml
     parameters:
@@ -36,36 +40,16 @@ jobs:
     # Diagnostics is not critical it passes every time it runs
     continueOnError: true
 
-  - powershell: |
-      $authenticodefiles = @(
-        "$(System.ArtifactsDirectory)\signed\PowerShell-$(Version)-win-x64.msi"
-        "$(System.ArtifactsDirectory)\signed\PowerShell-$(Version)-win-x86.msi"
-      )
-
-      $msixFiles = @(
-        "$(System.ArtifactsDirectory)\signed\PowerShell-$(Version)-win-x86.msix"
-        "$(System.ArtifactsDirectory)\signed\PowerShell-$(Version)-win-x64.msix"
-        "$(System.ArtifactsDirectory)\signed\PowerShell-$(Version)-win-arm32.msix"
-        "$(System.ArtifactsDirectory)\signed\PowerShell-$(Version)-win-arm64.msix"
-      )
-
-      tools/releaseBuild/generatePackgeSigning.ps1 -AuthenticodeFiles $authenticodeFiles -path "$(System.ArtifactsDirectory)\package.xml" -MsixCertType $env:MSIX_TYPE -MsixFiles $msixFiles
-    displayName: 'Generate Package Signing Xml'
-
-  - powershell: |
-      Get-Content "$(System.ArtifactsDirectory)\package.xml"
-    displayName: 'Capture signing xml'
-
-  - task: PkgESCodeSign@10
-    displayName: 'CodeSign $(System.ArtifactsDirectory)\package.xml'
-    env:
-      SYSTEM_ACCESSTOKEN: $(System.AccessToken)
-    inputs:
-      signConfigXml: '$(System.ArtifactsDirectory)\package.xml'
-      outPathRoot: '$(Build.StagingDirectory)\signedPackages'
-      binVersion: $(SigingVersion)
-      binVersionOverride: $(SigningVersionOverride)
-    condition: and(succeeded(), eq(variables['SHOULD_SIGN'], 'true'))
+  - template: EsrpSign.yml@ComplianceRepo
+    parameters:
+        buildOutputPath: $(System.ArtifactsDirectory)\signed
+        signOutputPath: $(Build.StagingDirectory)\signedPackages
+        certificateId: "CP-230012"
+        pattern: |
+          **\*.msi
+          **\*.msix
+        useMinimatch: true
+        shouldSign: $(SHOULD_SIGN)
 
   - powershell: |
       new-item -itemtype Directory -path '$(Build.StagingDirectory)\signedPackages'
@@ -110,8 +94,13 @@ jobs:
       msi: no
       msix: no
 
-  - task: securedevelopmentteam.vss-secure-development-tools.build-task-antimalware.AntiMalware@3
-    displayName: 'Run Defender Scan'
+  - template: EsrpScan.yml@ComplianceRepo
+    parameters:
+        scanPath: $(Build.StagingDirectory)
+        pattern: |
+          **\*.msix
+          **\*.msi
+          **\*.zip
 
   - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
     displayName: 'Component Detection'
diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
index a89a397f343..81eac8e5a11 100644
--- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
+++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml
@@ -60,7 +60,7 @@ jobs:
 
   - template: cloneToOfficialPath.yml
 
-  - powershell: |
+  - pwsh: |
       # cleanup previous install
       if((Test-Path "${env:ProgramFiles(x86)}\WiX Toolset xcopy")) {
         Remove-Item "${env:ProgramFiles(x86)}\WiX Toolset xcopy" -Recurse -Force
@@ -68,7 +68,7 @@ jobs:
 
       $toolsDir = New-Item -ItemType Directory -Path '$(Build.ArtifactStagingDirectory)\tools'
       $wixUri = 'https://github.com/wixtoolset/wix3/releases/download/wix311rtm/wix311-binaries.zip'
-      Invoke-RestMethod -Uri $wixUri -OutFile '$(Build.ArtifactStagingDirectory)\tools\wix.zip'
+      Invoke-RestMethod -Uri $wixUri -OutFile '$(Build.ArtifactStagingDirectory)\tools\wix.zip' -MaximumRetryCount 5 -RetryIntervalSec 10
 
       Import-Module '$(PowerShellRoot)/tools/releaseBuild/Images/microsoft_powershell_windowsservercore/wix.psm1'
       Install-WixZip -zipPath '$(Build.ArtifactStagingDirectory)\tools\wix.zip'
@@ -124,13 +124,18 @@ jobs:
         "$($fullSymbolsFolder)\System.Management.Automation.dll" = ""
       }
 
+      $itemsToExclude = @(
+        # This package is retrieved from https://www.github.com/powershell/MarkdownRender
+        "$($fullSymbolsFolder)\Microsoft.PowerShell.MarkdownRender.dll"
+      )
+
       if ("$env:Architecture" -notlike 'fxdependent*')
       {
           $itemsToCopy +=  @{"$($fullSymbolsFolder)\pwsh.exe" = ""}
       }
 
       Write-Verbose -verbose "recusively copying $($itemsToCopyWithRecurse | out-string) to $filesToSignDirectory"
-      Copy-Item -Path $itemsToCopyWithRecurse -Destination $filesToSignDirectory -Recurse -verbose
+      Copy-Item -Path $itemsToCopyWithRecurse -Destination $filesToSignDirectory -Recurse -verbose -exclude $itemsToExclude
 
       foreach($pattern in $itemsToCopy.Keys) {
         $destinationFolder = Join-Path $filesToSignDirectory -ChildPath $itemsToCopy.$pattern
@@ -153,6 +158,7 @@ jobs:
           **\*.ps1
           **\*.exe
         useMinimatch: true
+        shouldSign: $(SHOULD_SIGN)
 
   - pwsh: |
       Import-Module $(PowerShellRoot)/build.psm1 -Force
@@ -188,6 +194,7 @@ jobs:
         pattern: |
           **\*.dll
         useMinimatch: true
+        shouldSign: $(SHOULD_SIGN)
 
   - powershell: |
       Get-ChildItem '$(System.ArtifactsDirectory)\thirdPartySigned\*'
diff --git a/tools/releaseBuild/setReleaseTag.ps1 b/tools/releaseBuild/setReleaseTag.ps1
index 1927eb7ae60..121425d963b 100644
--- a/tools/releaseBuild/setReleaseTag.ps1
+++ b/tools/releaseBuild/setReleaseTag.ps1
@@ -79,7 +79,7 @@ if($ReleaseTag -eq 'fromBranch' -or !$ReleaseTag)
             New-BuildInfoJson -ReleaseTag $releaseTag
         }
     }
-    elseif($branchOnly -eq 'master' -or $branchOnly -like '*dailytest*')
+    elseif(($branchOnly -eq 'master' -and $env:BUILD_REASON -ne 'Manual')  -or $branchOnly -like '*dailytest*')
     {
         $isDaily = $true
         Write-Verbose "daily build" -Verbose
diff --git a/tools/releaseBuild/signing.xml b/tools/releaseBuild/signing.xml
index 017dc425e0a..11f63fe69cc 100644
--- a/tools/releaseBuild/signing.xml
+++ b/tools/releaseBuild/signing.xml
@@ -8,7 +8,6 @@
     <file src="__INPATHROOT__\Microsoft.PowerShell.Commands.Utility.dll" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Microsoft.PowerShell.Commands.Utility.dll" />
     <file src="__INPATHROOT__\Microsoft.PowerShell.ConsoleHost.dll" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Microsoft.PowerShell.ConsoleHost.dll" />
     <file src="__INPATHROOT__\Microsoft.PowerShell.CoreCLR.Eventing.dll" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Microsoft.PowerShell.CoreCLR.Eventing.dll" />
-    <file src="__INPATHROOT__\Microsoft.PowerShell.MarkdownRender.dll" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Microsoft.PowerShell.MarkdownRender.dll" />
     <file src="__INPATHROOT__\Microsoft.PowerShell.GlobalTool.Shim.dll" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Microsoft.PowerShell.GlobalTool.Shim.dll" />
     <file src="__INPATHROOT__\Microsoft.PowerShell.Security.dll" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Microsoft.PowerShell.Security.dll" />
     <file src="__INPATHROOT__\Microsoft.WSMan.Management.dll" signType="AuthenticodeFormer" dest="__OUTPATHROOT__\Microsoft.WSMan.Management.dll" />
diff --git a/tools/releaseTools.psm1 b/tools/releaseTools.psm1
index 7f181c3f522..1ea38df348c 100644
--- a/tools/releaseTools.psm1
+++ b/tools/releaseTools.psm1
@@ -352,7 +352,7 @@ function Get-ChangeLog
     PrintChangeLog -clSection $clBuildPackage -sectionTitle 'Build and Packaging Improvements' -Compress
     PrintChangeLog -clSection $clDocs -sectionTitle 'Documentation and Help Content'
 
-    Write-Output "[${version}]: https://github.com/PowerShell/PowerShell/compare/${$LastReleaseTag}...${ThisReleaseTag}`n"
+    Write-Output "[${version}]: https://github.com/PowerShell/PowerShell/compare/${LastReleaseTag}...${ThisReleaseTag}`n"
 }
 
 function PrintChangeLog($clSection, $sectionTitle, [switch] $Compress) {
diff --git a/tools/windows/Reset-PWSHSystemPath.ps1 b/tools/windows/Reset-PWSHSystemPath.ps1
index 7a6a6d9e451..4b98e714525 100644
--- a/tools/windows/Reset-PWSHSystemPath.ps1
+++ b/tools/windows/Reset-PWSHSystemPath.ps1
@@ -32,11 +32,13 @@
 
   Removes ALL PowerShell paths from the Machine level path.
   Good for running right before upgrading PowerShell.
+
 .EXAMPLE
   .\Reset-PWSHSystemPath.ps1 -PathScope Machine, User, Process
 
   Removes all paths but the very last one when sorted in ascending order.
   Processes all path scopes including current process.
+
 .EXAMPLE
   .\Reset-PWSHSystemPath.ps1 -PathScope Machine, User, Process -RemoveAllOccurencs
 
@@ -53,7 +55,7 @@ ForEach ($PathScopeItem in $PathScope)
 {
   $AssembledNewPath = $NewPath = ''
   #From the current path scope. retrieve the array of paths that match the pathspec of PowerShell (to use as a filter)
-  $pathstoremove = @([Environment]::GetEnvironmentVariable("PATH","$PathScopeItem").split(';') | where { $_ -ilike "*\Program Files\Powershell\6*"})
+  $pathstoremove = @([Environment]::GetEnvironmentVariable("PATH","$PathScopeItem").split(';') | Where-Object { $_ -ilike "*\Program Files\Powershell\6*"})
   If (!$RemoveAllOccurences)
   {
     #If we are not removing all occurances of PowerShell paths, then remove the highest sorted path from the filter