diff --git a/.editorconfig b/.editorconfig
index 506dd29ec0..d23d7921d6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -53,6 +53,14 @@ dotnet_style_readonly_field = true:warning
 # Parameter preferences
 dotnet_code_quality_unused_parameters = all:warning
 
+# Expression preferences
+dotnet_style_prefer_compound_assignment = true:warning
+
+# Dispose rules (CA2000 and CA2213) ported to IDE analyzers. We already execute the CA rules on the repo, so disable the IDE ones.
+dotnet_diagnostic.IDE0067.severity = none
+dotnet_diagnostic.IDE0068.severity = none
+dotnet_diagnostic.IDE0069.severity = none
+
 ### CSharp code style settings ###
 [*.cs]
 
@@ -77,6 +85,8 @@ csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
 csharp_style_inlined_variable_declaration = true:suggestion
 csharp_style_throw_expression = true:suggestion
 csharp_style_conditional_delegate_call = true:suggestion
+csharp_prefer_static_local_function = true:warning
+csharp_prefer_simple_using_statement = true:warning
 
 # Newline settings
 csharp_new_line_before_open_brace = all
@@ -88,6 +98,7 @@ csharp_new_line_before_members_in_anonymous_types = true
 
 # Expression-level preferences
 csharp_style_unused_value_assignment_preference = discard_variable:warning
+csharp_style_pattern_matching_over_as_with_null_check = true:warning
 
 ### Visual Basic code style settings ###
 [*.vb]
diff --git a/PostReleaseActivities.md b/PostReleaseActivities.md
index 4c2f1d4d35..8921f01fdf 100644
--- a/PostReleaseActivities.md
+++ b/PostReleaseActivities.md
@@ -14,8 +14,9 @@ Please follow the below steps after publishing analyzer NuGet packages from this
    4. Update `eng\Versions.props`:
       1. Bump up the `VersionPrefix`.
       2. Reset `PreReleaseVersionLabel` to `beta1`.
-      3. Update `MicrosoftCodeAnalysisFXCopAnalyersVersion` to the latest released package version. Build the repo by invoking `Build.cmd` and fix/suppress any new CA diagnostics, as appropriate.
-   5. Create and submit a PR with the above changes.
+      3. Update `MicrosoftCodeAnalysisFXCopAnalyersVersion` to the latest released package version.
+   5. Build the repo by invoking `eng\common\CIBuild.cmd` and fix/suppress any new CA diagnostics, as appropriate. This should also update the analyzer documentation files in the repo to use the new version prefix.
+   6. Create and submit a PR with the above changes.
 
 Steps to generate Release Notes
 =================================================================
diff --git a/nuget/Microsoft.CodeAnalysis.FlowAnalysis.Utilities/Microsoft.CodeAnalysis.FlowAnalysis.Utilities.Package.csproj b/nuget/Microsoft.CodeAnalysis.FlowAnalysis.Utilities/Microsoft.CodeAnalysis.FlowAnalysis.Utilities.Package.csproj
index 1e3d8750b5..05e384f0ba 100644
--- a/nuget/Microsoft.CodeAnalysis.FlowAnalysis.Utilities/Microsoft.CodeAnalysis.FlowAnalysis.Utilities.Package.csproj
+++ b/nuget/Microsoft.CodeAnalysis.FlowAnalysis.Utilities/Microsoft.CodeAnalysis.FlowAnalysis.Utilities.Package.csproj
@@ -16,6 +16,9 @@
     -->
     <PackageId>*$(MSBuildProjectFullPath)*</PackageId>
     <DevelopmentDependency>false</DevelopmentDependency>
+
+    <!-- Override the version prefix for this package to append a "revision" field to allow more frequent stable releases -->
+    <VersionPrefix>$(VersionPrefix).0</VersionPrefix>
   </PropertyGroup>
   
   <ItemGroup>
diff --git a/src/GenerateAnalyzerRulesets/CodeFixerExtensions.cs b/src/GenerateAnalyzerRulesets/CodeFixerExtensions.cs
index 98ac3aa711..982489164b 100644
--- a/src/GenerateAnalyzerRulesets/CodeFixerExtensions.cs
+++ b/src/GenerateAnalyzerRulesets/CodeFixerExtensions.cs
@@ -40,7 +40,7 @@ public static ImmutableArray<CodeFixProvider> GetFixers(this AnalyzerFileReferen
                             ExportCodeFixProviderAttribute attribute = typeInfo.GetCustomAttribute<ExportCodeFixProviderAttribute>();
                             if (attribute != null)
                             {
-                                builder = builder ?? ImmutableArray.CreateBuilder<CodeFixProvider>();
+                                builder ??= ImmutableArray.CreateBuilder<CodeFixProvider>();
                                 var fixer = (CodeFixProvider)Activator.CreateInstance(typeInfo.AsType());
                                 if (HasImplementation(fixer))
                                 {
diff --git a/src/GenerateAnalyzerRulesets/Program.cs b/src/GenerateAnalyzerRulesets/Program.cs
index 32ece859f2..383b9b4da9 100644
--- a/src/GenerateAnalyzerRulesets/Program.cs
+++ b/src/GenerateAnalyzerRulesets/Program.cs
@@ -64,7 +64,7 @@ public static int Main(string[] args)
                 var analyzers = analyzerFileReference.GetAnalyzersForAllLanguages();
                 var rulesById = new SortedList<string, DiagnosticDescriptor>();
 
-                var assemblyRulesMetadata = (path: path, rules: new SortedList<string, (DiagnosticDescriptor rule, string typeName, string[] languages)>());
+                var assemblyRulesMetadata = (path, rules: new SortedList<string, (DiagnosticDescriptor rule, string typeName, string[] languages)>());
 
                 foreach (var analyzer in analyzers)
                 {
@@ -337,7 +337,7 @@ void createPropsFile()
                 File.WriteAllText(fileWithPath, fileContents);
             }
 
-            string getFlowAnalysisFeatureFlag()
+            static string getFlowAnalysisFeatureFlag()
             {
                 return @"
 
@@ -404,7 +404,7 @@ string getRulesetOverrides()
                 return string.Empty;
             }
 
-            string getEditorConfigAsAdditionalFile()
+            static string getEditorConfigAsAdditionalFile()
             {
                 return $@"
   <!-- 
@@ -475,116 +475,113 @@ void createAnalyzerSarifFile()
                 var directory = Directory.CreateDirectory(analyzerSarifFileDir);
                 var fileWithPath = Path.Combine(directory.FullName, analyzerSarifFileName);
 
-                using (var textWriter = new StreamWriter(fileWithPath, false, Encoding.UTF8))
-                using (var writer = new Roslyn.Utilities.JsonWriter(textWriter))
+                using var textWriter = new StreamWriter(fileWithPath, false, Encoding.UTF8);
+                using var writer = new Roslyn.Utilities.JsonWriter(textWriter);
+                writer.WriteObjectStart(); // root
+                writer.Write("$schema", "http://json.schemastore.org/sarif-1.0.0");
+                writer.Write("version", "1.0.0");
+                writer.WriteArrayStart("runs");
+
+                foreach (var assemblymetadata in rulesMetadata)
                 {
-                    writer.WriteObjectStart(); // root
-                    writer.Write("$schema", "http://json.schemastore.org/sarif-1.0.0");
-                    writer.Write("version", "1.0.0");
-                    writer.WriteArrayStart("runs");
+                    writer.WriteObjectStart(); // run
 
-                    foreach (var assemblymetadata in rulesMetadata)
-                    {
-                        writer.WriteObjectStart(); // run
+                    writer.WriteObjectStart("tool");
+                    writer.Write("name", assemblymetadata.Key);
 
-                        writer.WriteObjectStart("tool");
-                        writer.Write("name", assemblymetadata.Key);
+                    if (!string.IsNullOrWhiteSpace(analyzerVersion))
+                    {
+                        writer.Write("version", analyzerVersion);
+                    }
 
-                        if (!string.IsNullOrWhiteSpace(analyzerVersion))
-                        {
-                            writer.Write("version", analyzerVersion);
-                        }
+                    writer.Write("language", culture.Name);
+                    writer.WriteObjectEnd(); // tool
 
-                        writer.Write("language", culture.Name);
-                        writer.WriteObjectEnd(); // tool
+                    writer.WriteObjectStart("rules"); // rules
 
-                        writer.WriteObjectStart("rules"); // rules
+                    foreach (var rule in assemblymetadata.Value.rules)
+                    {
+                        var ruleId = rule.Key;
+                        var descriptor = rule.Value.rule;
 
-                        foreach (var rule in assemblymetadata.Value.rules)
-                        {
-                            var ruleId = rule.Key;
-                            var descriptor = rule.Value.rule;
+                        writer.WriteObjectStart(descriptor.Id); // rule
+                        writer.Write("id", descriptor.Id);
 
-                            writer.WriteObjectStart(descriptor.Id); // rule
-                            writer.Write("id", descriptor.Id);
+                        writer.Write("shortDescription", descriptor.Title.ToString(culture));
 
-                            writer.Write("shortDescription", descriptor.Title.ToString(culture));
+                        string fullDescription = descriptor.Description.ToString(culture);
+                        writer.Write("fullDescription", !string.IsNullOrEmpty(fullDescription) ? fullDescription : descriptor.MessageFormat.ToString());
 
-                            string fullDescription = descriptor.Description.ToString(culture);
-                            writer.Write("fullDescription", !string.IsNullOrEmpty(fullDescription) ? fullDescription : descriptor.MessageFormat.ToString());
+                        writer.Write("defaultLevel", getLevel(descriptor.DefaultSeverity));
 
-                            writer.Write("defaultLevel", getLevel(descriptor.DefaultSeverity));
+                        if (!string.IsNullOrEmpty(descriptor.HelpLinkUri))
+                        {
+                            writer.Write("helpUri", descriptor.HelpLinkUri);
+                        }
 
-                            if (!string.IsNullOrEmpty(descriptor.HelpLinkUri))
-                            {
-                                writer.Write("helpUri", descriptor.HelpLinkUri);
-                            }
+                        writer.WriteObjectStart("properties");
 
-                            writer.WriteObjectStart("properties");
+                        writer.Write("category", descriptor.Category);
 
-                            writer.Write("category", descriptor.Category);
+                        writer.Write("isEnabledByDefault", descriptor.IsEnabledByDefault);
 
-                            writer.Write("isEnabledByDefault", descriptor.IsEnabledByDefault);
+                        writer.Write("typeName", rule.Value.typeName);
 
-                            writer.Write("typeName", rule.Value.typeName);
+                        if ((rule.Value.languages?.Length ?? 0) > 0)
+                        {
+                            writer.WriteArrayStart("languages");
 
-                            if ((rule.Value.languages?.Length ?? 0) > 0)
+                            foreach (var language in rule.Value.languages.OrderBy(l => l, StringComparer.InvariantCultureIgnoreCase))
                             {
-                                writer.WriteArrayStart("languages");
-
-                                foreach (var language in rule.Value.languages.OrderBy(l => l, StringComparer.InvariantCultureIgnoreCase))
-                                {
-                                    writer.Write(language);
-                                }
-
-                                writer.WriteArrayEnd(); // languages
+                                writer.Write(language);
                             }
 
-                            if (descriptor.CustomTags.Any())
-                            {
-                                writer.WriteArrayStart("tags");
+                            writer.WriteArrayEnd(); // languages
+                        }
 
-                                foreach (string tag in descriptor.CustomTags)
-                                {
-                                    writer.Write(tag);
-                                }
+                        if (descriptor.CustomTags.Any())
+                        {
+                            writer.WriteArrayStart("tags");
 
-                                writer.WriteArrayEnd(); // tags
+                            foreach (string tag in descriptor.CustomTags)
+                            {
+                                writer.Write(tag);
                             }
 
-                            writer.WriteObjectEnd(); // properties
-                            writer.WriteObjectEnd(); // rule
+                            writer.WriteArrayEnd(); // tags
                         }
 
-                        writer.WriteObjectEnd(); // rules
-                        writer.WriteObjectEnd(); // run
+                        writer.WriteObjectEnd(); // properties
+                        writer.WriteObjectEnd(); // rule
                     }
 
-                    writer.WriteArrayEnd(); // runs
-                    writer.WriteObjectEnd(); // root
+                    writer.WriteObjectEnd(); // rules
+                    writer.WriteObjectEnd(); // run
+                }
 
-                    return;
+                writer.WriteArrayEnd(); // runs
+                writer.WriteObjectEnd(); // root
 
-                    string getLevel(DiagnosticSeverity severity)
+                return;
+                static string getLevel(DiagnosticSeverity severity)
+                {
+                    switch (severity)
                     {
-                        switch (severity)
-                        {
-                            case DiagnosticSeverity.Info:
-                                return "note";
+                        case DiagnosticSeverity.Info:
+                            return "note";
 
-                            case DiagnosticSeverity.Error:
-                                return "error";
+                        case DiagnosticSeverity.Error:
+                            return "error";
 
-                            case DiagnosticSeverity.Warning:
-                                return "warning";
+                        case DiagnosticSeverity.Warning:
+                            return "warning";
 
-                            case DiagnosticSeverity.Hidden:
-                            default:
-                                // hidden diagnostics are not reported on the command line and therefore not currently given to 
-                                // the error logger. We could represent it with a custom property in the SARIF log if that changes.
-                                Debug.Assert(false);
-                                goto case DiagnosticSeverity.Warning;
-                        }
+                        case DiagnosticSeverity.Hidden:
+                        default:
+                            // hidden diagnostics are not reported on the command line and therefore not currently given to 
+                            // the error logger. We could represent it with a custom property in the SARIF log if that changes.
+                            Debug.Assert(false);
+                            goto case DiagnosticSeverity.Warning;
                     }
                 }
             }
diff --git a/src/MetaCompilation.Analyzers/MetaCompilation.Analyzers.sarif b/src/MetaCompilation.Analyzers/MetaCompilation.Analyzers.sarif
index 2cb3f1f52f..467704286e 100644
--- a/src/MetaCompilation.Analyzers/MetaCompilation.Analyzers.sarif
+++ b/src/MetaCompilation.Analyzers/MetaCompilation.Analyzers.sarif
@@ -5,7 +5,7 @@
     {
       "tool": {
         "name": "MetaCompilation.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
diff --git a/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/DiagnosticDescriptorCreationAnalyzer.cs b/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/DiagnosticDescriptorCreationAnalyzer.cs
index 3edb1aba12..ac1da94afb 100644
--- a/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/DiagnosticDescriptorCreationAnalyzer.cs
+++ b/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/DiagnosticDescriptorCreationAnalyzer.cs
@@ -322,8 +322,7 @@ out ImmutableArray<(string prefix, int start, int end)> allowedIdsInfoList)
                     {
                         ruleId = (string)argument.Value.ConstantValue.Value;
                         var location = argument.Value.Syntax.GetLocation();
-
-                        string GetAnalyzerName(INamedTypeSymbol a) => a.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat);
+                        static string GetAnalyzerName(INamedTypeSymbol a) => a.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat);
 
                         // Factory methods to track declaration locations for every analyzer rule ID.
                         ConcurrentBag<Location> AddLocationFactory(string analyzerName)
@@ -367,7 +366,7 @@ ConcurrentBag<Location> UpdateLocationsFactory(string analyzerName, ConcurrentBa
                             Debug.Assert(additionalTextOpt != null);
 
                             var foundMatch = false;
-                            bool ShouldValidateRange((string prefix, int start, int end) range)
+                            static bool ShouldValidateRange((string prefix, int start, int end) range)
                                 => range.start >= 0 && range.end >= 0;
 
                             // Check if ID matches any one of the required ranges.
@@ -576,7 +575,7 @@ private static AdditionalText TryGetCategoryAndAllowedIdsInfoFile(ImmutableArray
                     string arg2 = Path.GetFileName(additionalText.Path);
                     LinePositionSpan linePositionSpan = lines.GetLinePositionSpan(line.Span);
                     Location location = Location.Create(additionalText.Path, line.Span, linePositionSpan);
-                    invalidFileDiagnostics = invalidFileDiagnostics ?? new List<Diagnostic>();
+                    invalidFileDiagnostics ??= new List<Diagnostic>();
                     var diagnostic = Diagnostic.Create(AnalyzerCategoryAndIdRangeFileInvalidRule, location, arg1, arg2);
                     invalidFileDiagnostics.Add(diagnostic);
                 }
diff --git a/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/Fixers/CompareSymbolsCorrectlyFix.cs b/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/Fixers/CompareSymbolsCorrectlyFix.cs
index 7f39b87fa2..368670b9d2 100644
--- a/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/Fixers/CompareSymbolsCorrectlyFix.cs
+++ b/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/Fixers/CompareSymbolsCorrectlyFix.cs
@@ -41,8 +41,7 @@ private async Task<Document> ConvertToEqualsAsync(Document document, TextSpan so
             var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
             var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
             var expression = root.FindNode(sourceSpan, getInnermostNodeForTie: true);
-            var operation = semanticModel.GetOperation(expression, cancellationToken) as IBinaryOperation;
-            if (operation is null)
+            if (!(semanticModel.GetOperation(expression, cancellationToken) is IBinaryOperation operation))
             {
                 return document;
             }
diff --git a/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/RegisterActionAnalyzer.cs b/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/RegisterActionAnalyzer.cs
index 4621930c05..91cf7cca3e 100644
--- a/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/RegisterActionAnalyzer.cs
+++ b/src/Microsoft.CodeAnalysis.Analyzers/Core/MetaAnalyzers/RegisterActionAnalyzer.cs
@@ -444,7 +444,7 @@ private void AnalyzeParameterDeclaration(IParameterSymbol parameter)
             {
                 if (IsContextType(parameter.Type, _compilationStartAnalysisContext, _codeBlockStartAnalysisContext, _operationBlockStartAnalysisContext))
                 {
-                    _declaredStartAnalysisContextParams = _declaredStartAnalysisContextParams ?? new HashSet<IParameterSymbol>();
+                    _declaredStartAnalysisContextParams ??= new HashSet<IParameterSymbol>();
                     _declaredStartAnalysisContextParams.Add(parameter);
                 }
             }
@@ -455,7 +455,7 @@ private void AnalyzeParameterReference(IParameterSymbol parameter)
                 // This is to avoid false positives, as the registration responsibility is not on the current method.
                 if (IsContextType(parameter.Type, _compilationStartAnalysisContext, _codeBlockStartAnalysisContext, _operationBlockStartAnalysisContext))
                 {
-                    _startAnalysisContextParamsToSkip = _startAnalysisContextParamsToSkip ?? new HashSet<IParameterSymbol>();
+                    _startAnalysisContextParamsToSkip ??= new HashSet<IParameterSymbol>();
                     _startAnalysisContextParamsToSkip.Add(parameter);
                 }
             }
@@ -486,7 +486,7 @@ private void NoteRegisterActionInvocation(IMethodSymbol method, TInvocationExpre
                     return;
                 }
 
-                _nestedActionsMap = _nestedActionsMap ?? new Dictionary<IParameterSymbol, List<NodeAndSymbol>>();
+                _nestedActionsMap ??= new Dictionary<IParameterSymbol, List<NodeAndSymbol>>();
                 if (!_nestedActionsMap.TryGetValue(contextParameter, out List<NodeAndSymbol> registerInvocations))
                 {
                     registerInvocations = new List<NodeAndSymbol>();
diff --git a/src/Microsoft.CodeAnalysis.Analyzers/Microsoft.CodeAnalysis.Analyzers.sarif b/src/Microsoft.CodeAnalysis.Analyzers/Microsoft.CodeAnalysis.Analyzers.sarif
index 33d299b0b4..2ee83aa017 100644
--- a/src/Microsoft.CodeAnalysis.Analyzers/Microsoft.CodeAnalysis.Analyzers.sarif
+++ b/src/Microsoft.CodeAnalysis.Analyzers/Microsoft.CodeAnalysis.Analyzers.sarif
@@ -5,7 +5,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -299,7 +299,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.CSharp.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -479,7 +479,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.VisualBasic.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
diff --git a/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/Microsoft.CodeAnalysis.BannedApiAnalyzers.sarif b/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/Microsoft.CodeAnalysis.BannedApiAnalyzers.sarif
index 761fcf3bc2..a9a2e13b64 100644
--- a/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/Microsoft.CodeAnalysis.BannedApiAnalyzers.sarif
+++ b/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/Microsoft.CodeAnalysis.BannedApiAnalyzers.sarif
@@ -5,7 +5,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -14,7 +14,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.CSharp.BannedApiAnalyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -76,7 +76,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.VisualBasic.BannedApiAnalyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
diff --git a/src/Microsoft.CodeAnalysis.FlowAnalysis.Utilities/PublicAPI.Unshipped.txt b/src/Microsoft.CodeAnalysis.FlowAnalysis.Utilities/PublicAPI.Unshipped.txt
index 93b47f9eff..1857fd76ef 100644
--- a/src/Microsoft.CodeAnalysis.FlowAnalysis.Utilities/PublicAPI.Unshipped.txt
+++ b/src/Microsoft.CodeAnalysis.FlowAnalysis.Utilities/PublicAPI.Unshipped.txt
@@ -1,18 +1,4 @@
-Analyzer.Utilities.DisposeAnalysisHelper
-Analyzer.Utilities.DisposeAnalysisHelper.GetDisposableFields(Microsoft.CodeAnalysis.INamedTypeSymbol namedType) -> System.Collections.Immutable.ImmutableHashSet<Microsoft.CodeAnalysis.IFieldSymbol>
-Analyzer.Utilities.DisposeAnalysisHelper.HasAnyDisposableCreationDescendant(System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.IOperation> operationBlocks, Microsoft.CodeAnalysis.IMethodSymbol containingMethod) -> bool
-Analyzer.Utilities.DisposeAnalysisHelper.IDisposable.get -> Microsoft.CodeAnalysis.INamedTypeSymbol
-Analyzer.Utilities.DisposeAnalysisHelper.IsDisposableCreationOrDisposeOwnershipTransfer(Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractLocation location, Microsoft.CodeAnalysis.IMethodSymbol containingMethod) -> bool
-Analyzer.Utilities.DisposeAnalysisHelper.Task.get -> Microsoft.CodeAnalysis.INamedTypeSymbol
-Analyzer.Utilities.DisposeAnalysisHelper.TryGetOrComputeResult(System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.IOperation> operationBlocks, Microsoft.CodeAnalysis.IMethodSymbol containingMethod, Microsoft.CodeAnalysis.Diagnostics.AnalyzerOptions analyzerOptions, Microsoft.CodeAnalysis.DiagnosticDescriptor rule, bool trackInstanceFields, bool trackExceptionPaths, System.Threading.CancellationToken cancellationToken, out Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DisposeAnalysis.DisposeAnalysisResult disposeAnalysisResult, out Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PointsToAnalysis.PointsToAnalysisResult pointsToAnalysisResult, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.InterproceduralAnalysisPredicate interproceduralAnalysisPredicateOpt = null, bool defaultDisposeOwnershipTransferAtConstructor = false) -> bool
-Analyzer.Utilities.DisposeAnalysisKind
-Analyzer.Utilities.DisposeAnalysisKind.AllPaths = 0 -> Analyzer.Utilities.DisposeAnalysisKind
-Analyzer.Utilities.DisposeAnalysisKind.AllPathsOnlyNotDisposed = 1 -> Analyzer.Utilities.DisposeAnalysisKind
-Analyzer.Utilities.DisposeAnalysisKind.NonExceptionPaths = 2 -> Analyzer.Utilities.DisposeAnalysisKind
-Analyzer.Utilities.DisposeAnalysisKind.NonExceptionPathsOnlyNotDisposed = 3 -> Analyzer.Utilities.DisposeAnalysisKind
-Analyzer.Utilities.DisposeAnalysisKindExtensions
-Microsoft.CodeAnalysis.FlowAnalysis.BasicBlockExtensions
-Microsoft.CodeAnalysis.FlowAnalysis.BranchWithInfo
+Microsoft.CodeAnalysis.FlowAnalysis.BranchWithInfo
 Microsoft.CodeAnalysis.FlowAnalysis.BranchWithInfo.BranchValueOpt.get -> Microsoft.CodeAnalysis.IOperation
 Microsoft.CodeAnalysis.FlowAnalysis.BranchWithInfo.ControlFlowConditionKind.get -> Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowConditionKind
 Microsoft.CodeAnalysis.FlowAnalysis.BranchWithInfo.Destination.get -> Microsoft.CodeAnalysis.FlowAnalysis.BasicBlock
@@ -22,8 +8,6 @@ Microsoft.CodeAnalysis.FlowAnalysis.BranchWithInfo.Kind.get -> Microsoft.CodeAna
 Microsoft.CodeAnalysis.FlowAnalysis.BranchWithInfo.LeavingRegionFlowCaptures.get -> System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.FlowAnalysis.CaptureId>
 Microsoft.CodeAnalysis.FlowAnalysis.BranchWithInfo.LeavingRegionLocals.get -> System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.ILocalSymbol>
 Microsoft.CodeAnalysis.FlowAnalysis.BranchWithInfo.LeavingRegions.get -> System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowRegion>
-Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowBranchExtensions
-Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraphExtensions
 Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractAnalysisData
 Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractAnalysisData.AbstractAnalysisData() -> void
 Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractAnalysisData.Dispose() -> void
@@ -97,7 +81,7 @@ Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity.SymbolOpt.get -> Mic
 Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity.Type.get -> Microsoft.CodeAnalysis.ITypeSymbol
 Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity.WithMergedInstanceLocation(Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity analysisEntityToMerge) -> Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity
 Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityBasedPredicateAnalysisData<TValue>
-Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityBasedPredicateAnalysisData<TValue>.AddTrackedEntities(Analyzer.Utilities.PooledObjects.PooledHashSet<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity> builder) -> void
+Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityBasedPredicateAnalysisData<TValue>.AddTrackedEntities(System.Collections.Generic.HashSet<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity> builder) -> void
 Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityBasedPredicateAnalysisData<TValue>.AnalysisEntityBasedPredicateAnalysisData() -> void
 Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityBasedPredicateAnalysisData<TValue>.AnalysisEntityBasedPredicateAnalysisData(Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityBasedPredicateAnalysisData<TValue> data1, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityBasedPredicateAnalysisData<TValue> data2, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.MapAbstractDomain<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity, TValue> coreDataAnalysisDomain) -> void
 Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityBasedPredicateAnalysisData<TValue>.AnalysisEntityBasedPredicateAnalysisData(Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityBasedPredicateAnalysisData<TValue> fromData) -> void
@@ -113,7 +97,7 @@ Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityBasedPredicateAnalysi
 Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityBasedPredicateAnalysisData<TValue>.TryGetValue(Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity key, out TValue value) -> bool
 Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityBasedPredicateAnalysisData<TValue>.this[Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity key].get -> TValue
 Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityDataFlowOperationVisitor<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>
-Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityDataFlowOperationVisitor<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.AddTrackedEntities(Analyzer.Utilities.PooledObjects.PooledHashSet<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity> builder, bool forInterproceduralAnalysis = false) -> void
+Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityDataFlowOperationVisitor<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.AddTrackedEntities(System.Collections.Generic.HashSet<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity> builder, bool forInterproceduralAnalysis = false) -> void
 Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityDataFlowOperationVisitor<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.AnalysisEntityDataFlowOperationVisitor(TAnalysisContext analysisContext) -> void
 Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityDataFlowOperationVisitor<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.ApplyInterproceduralAnalysisResultHelper(System.Collections.Generic.IDictionary<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity, TAbstractAnalysisValue> resultToApply) -> void
 Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityDataFlowOperationVisitor<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.ApplyMissingCurrentAnalysisDataForUnhandledExceptionData(Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DictionaryAnalysisData<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity, TAbstractAnalysisValue> coreDataAtException, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DictionaryAnalysisData<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity, TAbstractAnalysisValue> coreCurrentAnalysisData, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ThrownExceptionInfo throwBranchWithExceptionType) -> void
@@ -386,14 +370,11 @@ Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.WellKnownTypeProvider.Monitor.get -
 Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.WellKnownTypeProvider.SerializationInfo.get -> Microsoft.CodeAnalysis.INamedTypeSymbol
 Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.WellKnownTypeProvider.Task.get -> Microsoft.CodeAnalysis.INamedTypeSymbol
 Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.WellKnownTypeProvider.TryGetTypeByMetadataName(string fullTypeName, out Microsoft.CodeAnalysis.INamedTypeSymbol namedTypeSymbol) -> bool
-Analyzer.Utilities.PooledObjects.PooledHashSet<T>
-Analyzer.Utilities.PooledObjects.PooledHashSet<T>.Free() -> void
-Analyzer.Utilities.PooledObjects.PooledHashSet<T>.ToImmutableAndFree() -> System.Collections.Immutable.ImmutableHashSet<T>
 abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractAnalysisDomain<TAnalysisData>.Clone(TAnalysisData value) -> TAnalysisData
 abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractAnalysisDomain<TAnalysisData>.Compare(TAnalysisData oldValue, TAnalysisData newValue) -> int
 abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractAnalysisDomain<TAnalysisData>.Equals(TAnalysisData value1, TAnalysisData value2) -> bool
 abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractAnalysisDomain<TAnalysisData>.Merge(TAnalysisData value1, TAnalysisData value2) -> TAnalysisData
-abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractDataFlowAnalysisContext<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.ComputeHashCodePartsSpecific(Analyzer.Utilities.PooledObjects.ArrayBuilder<int> builder) -> void
+abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractDataFlowAnalysisContext<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.ComputeHashCodePartsSpecific(System.Action<int> builder) -> void
 abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractDataFlowAnalysisContext<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.ForkForInterproceduralAnalysis(Microsoft.CodeAnalysis.IMethodSymbol invokedMethod, Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph invokedCfg, Microsoft.CodeAnalysis.IOperation operation, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PointsToAnalysis.PointsToAnalysisResult pointsToAnalysisResultOpt, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DataFlowAnalysisResult<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.CopyAnalysis.CopyBlockAnalysisResult, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.CopyAnalysis.CopyAbstractValue> copyAnalysisResultOpt, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DataFlowAnalysisResult<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ValueContentAnalysis.ValueContentBlockAnalysisResult, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ValueContentAnalysis.ValueContentAbstractValue> valueContentAnalysisResultOpt, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.InterproceduralAnalysisData<TAnalysisData, TAnalysisContext, TAbstractAnalysisValue> interproceduralAnalysisData) -> TAnalysisContext
 abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractDomain<T>.Bottom.get -> T
 abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractDomain<T>.Compare(T oldValue, T newValue, bool assertMonotonicity) -> int
@@ -407,7 +388,7 @@ abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractValueDomain<T>.Unk
 abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityBasedPredicateAnalysisData<TValue>.Clone() -> Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityBasedPredicateAnalysisData<TValue>
 abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityBasedPredicateAnalysisData<TValue>.Compare(Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityBasedPredicateAnalysisData<TValue> other, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.MapAbstractDomain<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity, TValue> coreDataAnalysisDomain) -> int
 abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityBasedPredicateAnalysisData<TValue>.WithMergedData(Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityBasedPredicateAnalysisData<TValue> data, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.MapAbstractDomain<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity, TValue> coreDataAnalysisDomain) -> Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityBasedPredicateAnalysisData<TValue>
-abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityDataFlowOperationVisitor<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.AddTrackedEntities(TAnalysisData analysisData, Analyzer.Utilities.PooledObjects.PooledHashSet<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity> builder, bool forInterproceduralAnalysis = false) -> void
+abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityDataFlowOperationVisitor<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.AddTrackedEntities(TAnalysisData analysisData, System.Collections.Generic.HashSet<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity> builder, bool forInterproceduralAnalysis = false) -> void
 abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityDataFlowOperationVisitor<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.ApplyInterproceduralAnalysisResultCore(TAnalysisData resultData) -> void
 abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityDataFlowOperationVisitor<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.GetAbstractValue(Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity analysisEntity) -> TAbstractAnalysisValue
 abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityDataFlowOperationVisitor<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.GetTrimmedCurrentAnalysisData(System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity> withEntities) -> TAnalysisData
@@ -418,7 +399,7 @@ abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityDataFlowOper
 abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityMapAbstractDomain<TValue>.AssertValidEntryForMergedMap(Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity analysisEntity, TValue value) -> void
 abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityMapAbstractDomain<TValue>.CanSkipNewEntry(Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity analysisEntity, TValue value) -> bool
 abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityMapAbstractDomain<TValue>.GetDefaultValue(Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity analysisEntity) -> TValue
-abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.CacheBasedEquatable<T>.ComputeHashCodeParts(Analyzer.Utilities.PooledObjects.ArrayBuilder<int> builder) -> void
+abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.CacheBasedEquatable<T>.ComputeHashCodeParts(System.Action<int> addPart) -> void
 abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DataFlowAnalysis<TAnalysisData, TAnalysisContext, TAnalysisResult, TBlockAnalysisResult, TAbstractAnalysisValue>.ToBlockResult(Microsoft.CodeAnalysis.FlowAnalysis.BasicBlock basicBlock, TAnalysisData blockAnalysisData) -> TBlockAnalysisResult
 abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DataFlowAnalysis<TAnalysisData, TAnalysisContext, TAnalysisResult, TBlockAnalysisResult, TAbstractAnalysisValue>.ToResult(TAnalysisContext analysisContext, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DataFlowAnalysisResult<TBlockAnalysisResult, TAbstractAnalysisValue> dataFlowAnalysisResult) -> TAnalysisResult
 abstract Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DataFlowOperationVisitor<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.ApplyMissingCurrentAnalysisDataForUnhandledExceptionData(TAnalysisData dataAtException, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ThrownExceptionInfo throwBranchWithExceptionType) -> void
@@ -536,7 +517,7 @@ override Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ValueContentAnalysis.Value
 override Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ValueContentAnalysis.ValueContentAnalysisData.Clone() -> Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityBasedPredicateAnalysisData<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ValueContentAnalysis.ValueContentAbstractValue>
 override Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ValueContentAnalysis.ValueContentAnalysisData.Compare(Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityBasedPredicateAnalysisData<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ValueContentAnalysis.ValueContentAbstractValue> other, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.MapAbstractDomain<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ValueContentAnalysis.ValueContentAbstractValue> coreDataAnalysisDomain) -> int
 override Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ValueContentAnalysis.ValueContentAnalysisData.WithMergedData(Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityBasedPredicateAnalysisData<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ValueContentAnalysis.ValueContentAbstractValue> data, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.MapAbstractDomain<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ValueContentAnalysis.ValueContentAbstractValue> coreDataAnalysisDomain) -> Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityBasedPredicateAnalysisData<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ValueContentAnalysis.ValueContentAbstractValue>
-override sealed Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractDataFlowAnalysisContext<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.ComputeHashCodeParts(Analyzer.Utilities.PooledObjects.ArrayBuilder<int> builder) -> void
+override sealed Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractDataFlowAnalysisContext<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.ComputeHashCodeParts(System.Action<int> addPart) -> void
 override sealed Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityDataFlowOperationVisitor<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.ApplyInterproceduralAnalysisResult(TAnalysisData resultData, bool isLambdaOrLocalFunction, bool hasParameterWithDelegateType, TAnalysisResult interproceduralResult) -> void
 override sealed Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityDataFlowOperationVisitor<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.ApplyPredicatedDataForEntity(TAnalysisData analysisData, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity predicatedEntity, bool trueData) -> Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PredicateValueKind
 override sealed Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityDataFlowOperationVisitor<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.ComputeAnalysisValueForEscapedRefOrOutArgument(Microsoft.CodeAnalysis.Operations.IArgumentOperation operation, TAbstractAnalysisValue defaultValue) -> TAbstractAnalysisValue
@@ -592,22 +573,6 @@ override sealed Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DataFlowOperationVi
 override sealed Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DataFlowOperationVisitor<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.VisitWhileLoop(Microsoft.CodeAnalysis.Operations.IWhileLoopOperation operation, object argument) -> TAbstractAnalysisValue
 override sealed Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.MapAbstractDomain<TKey, TValue>.Compare(Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DictionaryAnalysisData<TKey, TValue> oldValue, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DictionaryAnalysisData<TKey, TValue> newValue) -> int
 override sealed Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.MapAbstractDomain<TKey, TValue>.Equals(Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DictionaryAnalysisData<TKey, TValue> value1, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DictionaryAnalysisData<TKey, TValue> value2) -> bool
-static Analyzer.Utilities.DisposeAnalysisHelper.TryGetOrCreate(Microsoft.CodeAnalysis.Compilation compilation, out Analyzer.Utilities.DisposeAnalysisHelper disposeHelper) -> bool
-static Analyzer.Utilities.DisposeAnalysisKindExtensions.AreExceptionPathsAndMayBeNotDisposedViolationsEnabled(this Analyzer.Utilities.DisposeAnalysisKind disposeAnalysisKind) -> bool
-static Analyzer.Utilities.DisposeAnalysisKindExtensions.AreExceptionPathsEnabled(this Analyzer.Utilities.DisposeAnalysisKind disposeAnalysisKind) -> bool
-static Analyzer.Utilities.DisposeAnalysisKindExtensions.AreMayBeNotDisposedViolationsEnabled(this Analyzer.Utilities.DisposeAnalysisKind disposeAnalysisKind) -> bool
-static Microsoft.CodeAnalysis.FlowAnalysis.BasicBlockExtensions.DescendantOperations(this Microsoft.CodeAnalysis.FlowAnalysis.BasicBlock basicBlock) -> System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.IOperation>
-static Microsoft.CodeAnalysis.FlowAnalysis.BasicBlockExtensions.GetContainingRegionOfKind(this Microsoft.CodeAnalysis.FlowAnalysis.BasicBlock basicBlock, Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowRegionKind regionKind) -> Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowRegion
-static Microsoft.CodeAnalysis.FlowAnalysis.BasicBlockExtensions.IsContainedInRegionOfKind(this Microsoft.CodeAnalysis.FlowAnalysis.BasicBlock basicBlock, Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowRegionKind regionKind) -> bool
-static Microsoft.CodeAnalysis.FlowAnalysis.BasicBlockExtensions.IsFirstBlockOfFinally(this Microsoft.CodeAnalysis.FlowAnalysis.BasicBlock basicBlock, out Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowRegion finallyRegion) -> bool
-static Microsoft.CodeAnalysis.FlowAnalysis.BasicBlockExtensions.IsFirstBlockOfRegionKind(this Microsoft.CodeAnalysis.FlowAnalysis.BasicBlock basicBlock, Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowRegionKind regionKind, out Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowRegion region) -> bool
-static Microsoft.CodeAnalysis.FlowAnalysis.BasicBlockExtensions.IsLastBlockOfFinally(this Microsoft.CodeAnalysis.FlowAnalysis.BasicBlock basicBlock, out Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowRegion finallyRegion) -> bool
-static Microsoft.CodeAnalysis.FlowAnalysis.BasicBlockExtensions.IsLastBlockOfRegionKind(this Microsoft.CodeAnalysis.FlowAnalysis.BasicBlock basicBlock, Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowRegionKind regionKind, out Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowRegion region) -> bool
-static Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowBranchExtensions.IsBackEdge(this Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowBranch controlFlowBranch) -> bool
-static Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraphExtensions.DescendantOperations(this Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph cfg) -> System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.IOperation>
-static Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraphExtensions.DescendantOperations<T>(this Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph cfg, Microsoft.CodeAnalysis.OperationKind operationKind) -> System.Collections.Generic.IEnumerable<T>
-static Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraphExtensions.GetEntry(this Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph cfg) -> Microsoft.CodeAnalysis.FlowAnalysis.BasicBlock
-static Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraphExtensions.GetExit(this Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph cfg) -> Microsoft.CodeAnalysis.FlowAnalysis.BasicBlock
 static Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractDomain<T>.FireNonMonotonicAssertIfNeeded(bool assertMonotonicity) -> void
 static Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractIndex.Create(Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity analysisEntity) -> Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractIndex
 static Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractIndex.Create(Microsoft.CodeAnalysis.IOperation operation) -> Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractIndex
@@ -623,7 +588,7 @@ static Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity.Create(Micros
 static Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity.Create(Microsoft.CodeAnalysis.ISymbol symbolOpt, System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractIndex> indices, Microsoft.CodeAnalysis.ITypeSymbol type, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PointsToAnalysis.PointsToAbstractValue instanceLocation, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity parentOpt) -> Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity
 static Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity.Create(Microsoft.CodeAnalysis.Operations.IInstanceReferenceOperation instanceReferenceOperation, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PointsToAnalysis.PointsToAbstractValue instanceLocation) -> Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity
 static Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity.CreateThisOrMeInstance(Microsoft.CodeAnalysis.INamedTypeSymbol typeSymbol, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PointsToAnalysis.PointsToAbstractValue instanceLocation) -> Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity
-static Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityDataFlowOperationVisitor<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.GetChildAnalysisEntities(Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity analysisEntity, Analyzer.Utilities.PooledObjects.PooledHashSet<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity> allEntities) -> System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity>
+static Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityDataFlowOperationVisitor<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.GetChildAnalysisEntities(Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity analysisEntity, System.Collections.Generic.HashSet<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity> allEntities) -> System.Collections.Generic.IEnumerable<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity>
 static Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityDataFlowOperationVisitor<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.IsChildAnalysisEntity(Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity entity, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity ancestorEntity) -> bool
 static Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntityDataFlowOperationVisitor<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.IsChildAnalysisEntity(Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AnalysisEntity entity, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PointsToAnalysis.PointsToAbstractValue instanceLocation) -> bool
 static Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.CacheBasedEquatable<T>.operator !=(Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.CacheBasedEquatable<T> value1, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.CacheBasedEquatable<T> value2) -> bool
@@ -656,8 +621,6 @@ static Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.SetAbstractDomain<T>.Default
 static Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ValueContentAnalysis.ValueContentAnalysis.TryGetOrComputeResult(Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph cfg, Microsoft.CodeAnalysis.ISymbol owningSymbol, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.WellKnownTypeProvider wellKnownTypeProvider, Microsoft.CodeAnalysis.Diagnostics.AnalyzerOptions analyzerOptions, Microsoft.CodeAnalysis.DiagnosticDescriptor rule, System.Threading.CancellationToken cancellationToken, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.InterproceduralAnalysisKind interproceduralAnalysisKind = Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.InterproceduralAnalysisKind.None, bool pessimisticAnalysis = true, bool performPointsToAnalysis = true) -> Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DataFlowAnalysisResult<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ValueContentAnalysis.ValueContentBlockAnalysisResult, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ValueContentAnalysis.ValueContentAbstractValue>
 static Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ValueContentAnalysis.ValueContentAnalysis.TryGetOrComputeResult(Microsoft.CodeAnalysis.FlowAnalysis.ControlFlowGraph cfg, Microsoft.CodeAnalysis.ISymbol owningSymbol, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.WellKnownTypeProvider wellKnownTypeProvider, Microsoft.CodeAnalysis.Diagnostics.AnalyzerOptions analyzerOptions, Microsoft.CodeAnalysis.DiagnosticDescriptor rule, System.Threading.CancellationToken cancellationToken, out Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DataFlowAnalysisResult<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.CopyAnalysis.CopyBlockAnalysisResult, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.CopyAnalysis.CopyAbstractValue> copyAnalysisResultOpt, out Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PointsToAnalysis.PointsToAnalysisResult pointsToAnalysisResultOpt, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.InterproceduralAnalysisKind interproceduralAnalysisKind = Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.InterproceduralAnalysisKind.None, bool pessimisticAnalysis = true, bool performPointsToAnalysis = true, bool performCopyAnalysisIfNotUserConfigured = true, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.InterproceduralAnalysisPredicate interproceduralAnalysisPredicateOpt = null) -> Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DataFlowAnalysisResult<Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ValueContentAnalysis.ValueContentBlockAnalysisResult, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ValueContentAnalysis.ValueContentAbstractValue>
 static Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.WellKnownTypeProvider.GetOrCreate(Microsoft.CodeAnalysis.Compilation compilation) -> Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.WellKnownTypeProvider
-static Analyzer.Utilities.PooledObjects.PooledHashSet<T>.CreatePool() -> Analyzer.Utilities.PooledObjects.ObjectPool<Analyzer.Utilities.PooledObjects.PooledHashSet<T>>
-static Analyzer.Utilities.PooledObjects.PooledHashSet<T>.GetInstance() -> Analyzer.Utilities.PooledObjects.PooledHashSet<T>
 static readonly Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractLocation.NoLocation -> Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractLocation
 static readonly Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractLocation.Null -> Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.AbstractLocation
 static readonly Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DisposeAnalysis.DisposeAbstractValue.Invalid -> Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DisposeAnalysis.DisposeAbstractValue
@@ -725,66 +688,4 @@ virtual Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DataFlowOperationVisitor<TA
 virtual Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DataFlowOperationVisitor<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.VisitInvocation_NonLambdaOrDelegateOrLocalFunction(Microsoft.CodeAnalysis.IMethodSymbol method, Microsoft.CodeAnalysis.IOperation visitedInstance, System.Collections.Immutable.ImmutableArray<Microsoft.CodeAnalysis.Operations.IArgumentOperation> visitedArguments, bool invokedAsDelegate, Microsoft.CodeAnalysis.IOperation originalOperation, TAbstractAnalysisValue defaultValue) -> TAbstractAnalysisValue
 virtual Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DataFlowOperationVisitor<TAnalysisData, TAnalysisContext, TAnalysisResult, TAbstractAnalysisValue>.VisitUnaryOperatorCore(Microsoft.CodeAnalysis.Operations.IUnaryOperation operation, object argument) -> TAbstractAnalysisValue
 virtual Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PredicatedAnalysisData<TKey, TValue>.ApplyPredicatedData(Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DictionaryAnalysisData<TKey, TValue> coreAnalysisData, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DictionaryAnalysisData<TKey, TValue> predicatedData) -> void
-virtual Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PredicatedAnalysisData<TKey, TValue>.RemoveEntryInPredicatedData(TKey key, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DictionaryAnalysisData<TKey, TValue> predicatedData) -> void
-Analyzer.Utilities.DisposeMethodKind
-Analyzer.Utilities.DisposeMethodKind.Close = 5 -> Analyzer.Utilities.DisposeMethodKind
-Analyzer.Utilities.DisposeMethodKind.Dispose = 1 -> Analyzer.Utilities.DisposeMethodKind
-Analyzer.Utilities.DisposeMethodKind.DisposeAsync = 3 -> Analyzer.Utilities.DisposeMethodKind
-Analyzer.Utilities.DisposeMethodKind.DisposeBool = 2 -> Analyzer.Utilities.DisposeMethodKind
-Analyzer.Utilities.DisposeMethodKind.DisposeCoreAsync = 4 -> Analyzer.Utilities.DisposeMethodKind
-Analyzer.Utilities.DisposeMethodKind.None = 0 -> Analyzer.Utilities.DisposeMethodKind
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.Add(T item) -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.AddMany(T item, int count) -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.AddRange(Analyzer.Utilities.PooledObjects.ArrayBuilder<T> items) -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.AddRange(System.Collections.Generic.IEnumerable<T> items) -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.AddRange(System.Collections.Immutable.ImmutableArray<T> items) -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.AddRange(System.Collections.Immutable.ImmutableArray<T> items, int length) -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.AddRange(T[] items, int length) -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.AddRange(T[] items, int start, int length) -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.AddRange(params T[] items) -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.AddRange<S>(System.Collections.Immutable.ImmutableArray<S> items) -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.AddRange<U>(Analyzer.Utilities.PooledObjects.ArrayBuilder<U> items) -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.Any() -> bool
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.ArrayBuilder() -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.ArrayBuilder(int size) -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.Clear() -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.Clip(int limit) -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.Contains(T item) -> bool
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.CopyTo(T[] array, int start) -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.Count.get -> int
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.Count.set -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.EnsureCapacity(int capacity) -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.FindIndex(System.Predicate<T> match) -> int
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.FindIndex(int startIndex, System.Predicate<T> match) -> int
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.FindIndex(int startIndex, int count, System.Predicate<T> match) -> int
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.First() -> T
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.Free() -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.IndexOf(T item) -> int
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.IndexOf(T item, System.Collections.Generic.IEqualityComparer<T> equalityComparer) -> int
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.IndexOf(T item, int startIndex, int count) -> int
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.Insert(int index, T item) -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.Last() -> T
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.RemoveAt(int index) -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.RemoveDuplicates() -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.RemoveLast() -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.ReverseContents() -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.SelectDistinct<S>(System.Func<T, S> selector) -> System.Collections.Immutable.ImmutableArray<S>
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.SetItem(int index, T value) -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.Sort() -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.Sort(System.Collections.Generic.IComparer<T> comparer) -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.Sort(System.Comparison<T> compare) -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.Sort(int startIndex, System.Collections.Generic.IComparer<T> comparer) -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.ToArray() -> T[]
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.ToArrayAndFree() -> T[]
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.ToDowncastedImmutable<U>() -> System.Collections.Immutable.ImmutableArray<U>
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.ToImmutable() -> System.Collections.Immutable.ImmutableArray<T>
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.ToImmutableAndFree() -> System.Collections.Immutable.ImmutableArray<T>
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.ToImmutableOrNull() -> System.Collections.Immutable.ImmutableArray<T>
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.ZeroInit(int count) -> void
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.this[int index].get -> T
-Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.this[int index].set -> void
-Analyzer.Utilities.PooledObjects.ObjectPool<T>
-static Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.GetInstance() -> Analyzer.Utilities.PooledObjects.ArrayBuilder<T>
-static Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.GetInstance(int capacity) -> Analyzer.Utilities.PooledObjects.ArrayBuilder<T>
-static Analyzer.Utilities.PooledObjects.ArrayBuilder<T>.GetInstance(int capacity, T fillWithValue) -> Analyzer.Utilities.PooledObjects.ArrayBuilder<T>
+virtual Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PredicatedAnalysisData<TKey, TValue>.RemoveEntryInPredicatedData(TKey key, Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DictionaryAnalysisData<TKey, TValue> predicatedData) -> void
\ No newline at end of file
diff --git a/src/Microsoft.CodeAnalysis.FxCopAnalyzers/Microsoft.CodeAnalysis.FxCopAnalyzers.md b/src/Microsoft.CodeAnalysis.FxCopAnalyzers/Microsoft.CodeAnalysis.FxCopAnalyzers.md
index d302fca025..84df6481d7 100644
--- a/src/Microsoft.CodeAnalysis.FxCopAnalyzers/Microsoft.CodeAnalysis.FxCopAnalyzers.md
+++ b/src/Microsoft.CodeAnalysis.FxCopAnalyzers/Microsoft.CodeAnalysis.FxCopAnalyzers.md
@@ -135,56 +135,58 @@ Sr. No. | Rule ID | Title | Category | Enabled | CodeFix | Description |
 132 | CA2326 | Do not use TypeNameHandling values other than None | Security | False | False | Deserializing JSON when using a TypeNameHandling value other than None can be insecure.  If you need to instead detect Json.NET deserialization when a SerializationBinder isn't specified, then disable rule CA2326, and enable rules CA2327, CA2328, CA2329, and CA2330. |
 133 | CA2327 | Do not use insecure JsonSerializerSettings | Security | False | False | When deserializing untrusted input, allowing arbitrary types to be deserialized is insecure.  When using JsonSerializerSettings, use TypeNameHandling.None, or for values other than None, restrict deserialized types with a SerializationBinder. |
 134 | CA2328 | Ensure that JsonSerializerSettings are secure | Security | False | False | When deserializing untrusted input, allowing arbitrary types to be deserialized is insecure.  When using JsonSerializerSettings, ensure TypeNameHandling.None is specified, or for values other than None, ensure a SerializationBinder is specified to restrict deserialized types. |
-135 | [CA3001](https://docs.microsoft.com/visualstudio/code-quality/ca3001-review-code-for-sql-injection-vulnerabilities) | Review code for SQL injection vulnerabilities | Security | False | False | Potential SQL injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
-136 | [CA3002](https://docs.microsoft.com/visualstudio/code-quality/ca3002-review-code-for-xss-vulnerabilities) | Review code for XSS vulnerabilities | Security | False | False | Potential cross-site scripting (XSS) vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
-137 | [CA3003](https://docs.microsoft.com/visualstudio/code-quality/ca3003-review-code-for-file-path-injection-vulnerabilities) | Review code for file path injection vulnerabilities | Security | False | False | Potential file path injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
-138 | [CA3004](https://docs.microsoft.com/visualstudio/code-quality/ca3004-review-code-for-information-disclosure-vulnerabilities) | Review code for information disclosure vulnerabilities | Security | False | False | Potential information disclosure vulnerability was found where '{0}' in method '{1}' may contain unintended information from '{2}' in method '{3}'. |
-139 | [CA3005](https://docs.microsoft.com/visualstudio/code-quality/ca3005-review-code-for-ldap-injection-vulnerabilities) | Review code for LDAP injection vulnerabilities | Security | False | False | Potential LDAP injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
-140 | [CA3006](https://docs.microsoft.com/visualstudio/code-quality/ca3006-review-code-for-process-command-injection-vulnerabilities) | Review code for process command injection vulnerabilities | Security | False | False | Potential process command injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
-141 | [CA3007](https://docs.microsoft.com/visualstudio/code-quality/ca3007-review-code-for-open-redirect-vulnerabilities) | Review code for open redirect vulnerabilities | Security | False | False | Potential open redirect vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
-142 | [CA3008](https://docs.microsoft.com/visualstudio/code-quality/ca3008-review-code-for-xpath-injection-vulnerabilities) | Review code for XPath injection vulnerabilities | Security | False | False | Potential XPath injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
-143 | [CA3009](https://docs.microsoft.com/visualstudio/code-quality/ca3009-review-code-for-xml-injection-vulnerabilities) | Review code for XML injection vulnerabilities | Security | False | False | Potential XML injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
-144 | [CA3010](https://docs.microsoft.com/visualstudio/code-quality/ca3010-review-code-for-xaml-injection-vulnerabilities) | Review code for XAML injection vulnerabilities | Security | False | False | Potential XAML injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
-145 | [CA3011](https://docs.microsoft.com/visualstudio/code-quality/ca3011-review-code-for-dll-injection-vulnerabilities) | Review code for DLL injection vulnerabilities | Security | False | False | Potential DLL injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
-146 | [CA3012](https://docs.microsoft.com/visualstudio/code-quality/ca3012-review-code-for-regex-injection-vulnerabilities) | Review code for regex injection vulnerabilities | Security | False | False | Potential regex injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
-147 | CA3061 | Do Not Add Schema By URL | Security | True | False | This overload of XmlSchemaCollection.Add method internally enables DTD processing on the XML reader instance used, and uses UrlResolver for resolving external XML entities. The outcome is information disclosure. Content from file system or network shares for the machine processing the XML can be exposed to attacker. In addition, an attacker can use this as a DoS vector. |
-148 | [CA3075](https://docs.microsoft.com/visualstudio/code-quality/ca3075-insecure-dtd-processing) | Insecure DTD processing in XML | Security | True | False | Using XmlTextReader.Load(), creating an insecure XmlReaderSettings instance when invoking XmlReader.Create(), setting the InnerXml property of the XmlDocument and enabling DTD processing using XmlUrlResolver insecurely can lead to information disclosure. Replace it with a call to the Load() method overload that takes an XmlReader instance, use XmlReader.Create() to accept XmlReaderSettings arguments or consider explicitly setting secure values. The DataViewSettingCollectionString property of DataViewManager should always be assigned from a trusted source, the DtdProcessing property should be set to false, and the XmlResolver property should be changed to XmlSecureResolver or null.  |
-149 | [CA3076](https://docs.microsoft.com/visualstudio/code-quality/ca3076-insecure-xslt-script-execution) | Insecure XSLT script processing. | Security | True | False | Providing an insecure XsltSettings instance and an insecure XmlResolver instance to XslCompiledTransform.Load method is potentially unsafe as it allows processing script within XSL, which on an untrusted XSL input may lead to malicious code execution. Either replace the insecure XsltSettings argument with XsltSettings.Default or an instance that has disabled document function and script execution, or replace the XmlResolver argurment with null or an XmlSecureResolver instance. This message may be suppressed if the input is known to be from a trusted source and external resource resolution from locations that are not known in advance must be supported. |
-150 | [CA3077](https://docs.microsoft.com/visualstudio/code-quality/ca3077-insecure-processing-in-api-design-xml-document-and-xml-text-reader) | Insecure Processing in API Design, XmlDocument and XmlTextReader | Security | True | False | Enabling DTD processing on all instances derived from XmlTextReader or  XmlDocument and using XmlUrlResolver for resolving external XML entities may lead to information disclosure. Ensure to set the XmlResolver property to null, create an instance of XmlSecureResolver when processing untrusted input, or use XmlReader.Create method with a secure XmlReaderSettings argument. Unless you need to enable it, ensure the DtdProcessing property is set to false.  |
-151 | [CA3147](https://docs.microsoft.com/visualstudio/code-quality/ca3147-mark-verb-handlers-with-validateantiforgerytoken) | Mark Verb Handlers With Validate Antiforgery Token | Security | True | False | Missing ValidateAntiForgeryTokenAttribute on controller action {0}. |
-152 | [CA5350](https://docs.microsoft.com/visualstudio/code-quality/ca5350-do-not-use-weak-cryptographic-algorithms) | Do Not Use Weak Cryptographic Algorithms | Security | True | False | Cryptographic algorithms degrade over time as attacks become for advances to attacker get access to more computation. Depending on the type and application of this cryptographic algorithm, further degradation of the cryptographic strength of it may allow attackers to read enciphered messages, tamper with enciphered  messages, forge digital signatures, tamper with hashed content, or otherwise compromise any cryptosystem based on this algorithm. Replace encryption uses with the AES algorithm (AES-256, AES-192 and AES-128 are acceptable) with a key length greater than or equal to 128 bits. Replace hashing uses with a hashing function in the SHA-2 family, such as SHA-2 512, SHA-2 384, or SHA-2 256. |
-153 | [CA5351](https://docs.microsoft.com/visualstudio/code-quality/ca5351-do-not-use-broken-cryptographic-algorithms) | Do Not Use Broken Cryptographic Algorithms | Security | True | False | An attack making it computationally feasible to break this algorithm exists. This allows attackers to break the cryptographic guarantees it is designed to provide. Depending on the type and application of this cryptographic algorithm, this may allow attackers to read enciphered messages, tamper with enciphered  messages, forge digital signatures, tamper with hashed content, or otherwise compromise any cryptosystem based on this algorithm. Replace encryption uses with the AES algorithm (AES-256, AES-192 and AES-128 are acceptable) with a key length greater than or equal to 128 bits. Replace hashing uses with a hashing function in the SHA-2 family, such as SHA512, SHA384, or SHA256. Replace digital signature uses with RSA with a key length greater than or equal to 2048-bits, or ECDSA with a key length greater than or equal to 256 bits. |
-154 | CA5358 | Do Not Use Unsafe Cipher Modes | Security | False | False | These modes are vulnerable to attacks. Use only approved modes (CBC, CTS). |
-155 | CA5359 | Do Not Disable Certificate Validation | Security | True | False | A certificate can help authenticate the identity of the server. Clients should validate the server certificate to ensure requests are sent to the intended server. If the ServerCertificateValidationCallback always returns 'true', any certificate will pass validation. |
-156 | CA5360 | Do Not Call Dangerous Methods In Deserialization | Security | True | False | Insecure Deserialization is a vulnerability which occurs when untrusted data is used to abuse the logic of an application, inflict a Denial-of-Service (DoS) attack, or even execute arbitrary code upon it being deserialized. It’s frequently possible for malicious users to abuse these deserialization features when the application is deserializing untrusted data which is under their control. Specifically, invoke dangerous methods in the process of deserialization. Successful insecure deserialization attacks could allow an attacker to carry out attacks such as DoS attacks, authentication bypasses, and remote code execution. |
-157 | [CA5361](https://docs.microsoft.com/visualstudio/code-quality/ca5361) | Do Not Disable SChannel Use of Strong Crypto | Security | True | False | Starting with the .NET Framework 4.6, the System.Net.ServicePointManager and System.Net.Security.SslStream classes are recommeded to use new protocols. The old ones have protocol weaknesses and are not supported. Setting Switch.System.Net.DontEnableSchUseStrongCrypto with true will use the old weak crypto check and opt out of the protocol migration. |
-158 | CA5362 | Do Not Refer Self In Serializable Class | Security | False | False | This can allow an attacker to DOS or exhaust the memory of the process. |
-159 | CA5363 | Do Not Disable Request Validation | Security | True | False | Request validation is a feature in ASP.NET that examines HTTP requests and determines whether they contain potentially dangerous content. This check adds protection from markup or code in the URL query string, cookies, or posted form values that might have been added for malicious purposes. So, it is generally desirable and should be left enabled for defense in depth. |
-160 | [CA5364](https://docs.microsoft.com/visualstudio/code-quality/ca5364) | Do Not Use Deprecated Security Protocols | Security | True | False | Using a deprecated security protocol rather than the system default is risky. |
-161 | CA5365 | Do Not Disable HTTP Header Checking | Security | True | False | HTTP header checking enables encoding of the carriage return and newline characters, \r and \n, that are found in response headers. This encoding can help to avoid injection attacks that exploit an application that echoes untrusted data contained by the header. |
-162 | CA5366 | Use XmlReader For DataSet Read Xml | Security | True | False | Processing XML from untrusted data may load dangerous external references, which should be restricted by using an XmlReader with a secure resolver or with DTD processing disabled. |
-163 | CA5367 | Do Not Serialize Types With Pointer Fields | Security | False | False | Pointers are not "type safe" in the sense that you cannot guarantee the correctness of the memory they point at. So, serializing types with pointer fields is dangerous, as it may allow an attacker to control the pointer. |
-164 | CA5368 | Set ViewStateUserKey For Classes Derived From Page | Security | True | False | Setting the ViewStateUserKey property can help you prevent attacks on your application by allowing you to assign an identifier to the view-state variable for individual users so that they cannot use the variable to generate an attack. Otherwise, there will be cross-site request forgery vulnerabilities. |
-165 | CA5369 | Use XmlReader For Deserialize | Security | True | False | Processing XML from untrusted data may load dangerous external references, which should be restricted by using an XmlReader with a secure resolver or with DTD processing disabled. |
-166 | CA5370 | Use XmlReader For Validating Reader | Security | True | False | Processing XML from untrusted data may load dangerous external references, which should be restricted by using an XmlReader with a secure resolver or with DTD processing disabled. |
-167 | CA5371 | Use XmlReader For Schema Read | Security | True | False | Processing XML from untrusted data may load dangerous external references, which should be restricted by using an XmlReader with a secure resolver or with DTD processing disabled. |
-168 | CA5372 | Use XmlReader For XPathDocument | Security | True | False | Processing XML from untrusted data may load dangerous external references, which should be restricted by using an XmlReader with a secure resolver or with DTD processing disabled. |
-169 | CA5373 | Do not use obsolete key derivation function | Security | True | False | Password-based key derivation should use PBKDF2 with SHA-2. Avoid using PasswordDeriveBytes since it generates a PBKDF1 key. Avoid using Rfc2898DeriveBytes.CryptDeriveKey since it doesn't use the iteration count or salt. |
-170 | CA5374 | Do Not Use XslTransform | Security | True | False | Do not use XslTransform. It does not restrict potentially dangerous external references. |
-171 | CA5375 | Do Not Use Account Shared Access Signature | Security | False | False | Shared Access Signatures(SAS) are a vital part of the security model for any application using Azure Storage, they should provide limited and safe permissions to your storage account to clients that don't have the account key. All of the operations available via a service SAS are also available via an account SAS, that is, account SAS is too powerful. So it is recommended to use Service SAS to delegate access more carefully. |
-172 | CA5376 | Use SharedAccessProtocol HttpsOnly | Security | True | False | HTTPS encrypts network traffic. Use HttpsOnly, rather than HttpOrHttps, to ensure network traffic is always encrypted to help prevent disclosure of sensitive data. |
-173 | CA5377 | Use Container Level Access Policy | Security | True | False | No access policy identifier is specified, making tokens non-revocable. |
-174 | [CA5378](https://docs.microsoft.com/visualstudio/code-quality/ca5378) | Do not disable ServicePointManagerSecurityProtocols | Security | True | False | Do not set Switch.System.ServiceModel.DisableUsingServicePointManagerSecurityProtocols to true.  Setting this switch limits Windows Communication Framework (WCF) to using Transport Layer Security (TLS) 1.0, which is insecure and obsolete. |
-175 | CA5379 | Do Not Use Weak Key Derivation Function Algorithm | Security | True | False | Some implementations of the Rfc2898DeriveBytes class allow for a hash algorithm to be specified in a constructor parameter or overwritten in the HashAlgorithm property. If a hash algorithm is specified, then it should be SHA-256 or higher. |
-176 | CA5380 | Do Not Add Certificates To Root Store | Security | True | False | By default, the Trusted Root Certification Authorities certificate store is configured with a set of public CAs that has met the requirements of the Microsoft Root Certificate Program. Since all trusted root CAs can issue certificates for any domain, an attacker can pick a weak or coercible CA that you install by yourself to target for an attack – and a single vulnerable, malicious or coercible CA undermines the security of the entire system. To make matters worse, these attacks can go unnoticed quite easily. |
-177 | CA5381 | Ensure Certificates Are Not Added To Root Store | Security | True | False | By default, the Trusted Root Certification Authorities certificate store is configured with a set of public CAs that has met the requirements of the Microsoft Root Certificate Program. Since all trusted root CAs can issue certificates for any domain, an attacker can pick a weak or coercible CA that you install by yourself to target for an attack – and a single vulnerable, malicious or coercible CA undermines the security of the entire system. To make matters worse, these attacks can go unnoticed quite easily. |
-178 | CA5382 | Use Secure Cookies In ASP.Net Core | Security | False | False | Applications available over HTTPS must use secure cookies. |
-179 | CA5383 | Ensure Use Secure Cookies In ASP.Net Core | Security | False | False | Applications available over HTTPS must use secure cookies. |
-180 | CA5384 | Do Not Use Digital Signature Algorithm (DSA) | Security | True | False | DSA is too weak to use. |
-181 | CA5385 | Use Rivest–Shamir–Adleman (RSA) Algorithm With Sufficient Key Size | Security | True | False | Encryption algorithms are vulnerable to brute force attacks when too small a key size is used. |
-182 | [CA5386](https://docs.microsoft.com/visualstudio/code-quality/ca5386) | Avoid hardcoding SecurityProtocolType value | Security | False | False | Avoid hardcoding SecurityProtocolType {0}, and instead use SecurityProtocolType.SystemDefault to allow the operating system to choose the best Transport Layer Security protocol to use. |
-183 | CA5387 | Do Not Use Weak Key Derivation Function With Insufficient Iteration Count | Security | False | False | When deriving cryptographic keys from user-provided inputs such as password, use sufficient iteration count (at least 100k). |
-184 | CA5388 | Ensure Sufficient Iteration Count When Using Weak Key Derivation Function | Security | False | False | When deriving cryptographic keys from user-provided inputs such as password, use sufficient iteration count (at least 100k). |
-185 | CA5389 | Do Not Add Archive Item's Path To The Target File System Path | Security | True | False | When extracting files from an archive and using the archive item's path, check if the path is safe. Archive path can be relative and can lead to file system access outside of the expected file system target path, leading to malicious config changes and remote code execution via lay-and-wait technique. |
-186 | CA5390 | Do Not Hard Code Encryption Key | Security | True | False | SymmetricAlgorithm's .Key property, or a method's rgbKey parameter, should never be a hardcoded value. |
-187 | CA9999 | Analyzer version mismatch | Reliability | True | False | Analyzers in this package require a certain minimum version of Microsoft.CodeAnalysis to execute correctly. Refer to https://docs.microsoft.com/visualstudio/code-quality/install-fxcop-analyzers#fxcopanalyzers-package-versions to install the correct analyzer version. |
+135 | CA2329 | Do not deserialize with JsonSerializer using an insecure configuration | Security | False | False | When deserializing untrusted input, allowing arbitrary types to be deserialized is insecure. When using deserializing JsonSerializer, use TypeNameHandling.None, or for values other than None, restrict deserialized types with a SerializationBinder. |
+136 | CA2330 | Ensure that JsonSerializer has a secure configuration when deserializing | Security | False | False | When deserializing untrusted input, allowing arbitrary types to be deserialized is insecure. When using deserializing JsonSerializer, use TypeNameHandling.None, or for values other than None, restrict deserialized types with a SerializationBinder. |
+137 | [CA3001](https://docs.microsoft.com/visualstudio/code-quality/ca3001-review-code-for-sql-injection-vulnerabilities) | Review code for SQL injection vulnerabilities | Security | False | False | Potential SQL injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
+138 | [CA3002](https://docs.microsoft.com/visualstudio/code-quality/ca3002-review-code-for-xss-vulnerabilities) | Review code for XSS vulnerabilities | Security | False | False | Potential cross-site scripting (XSS) vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
+139 | [CA3003](https://docs.microsoft.com/visualstudio/code-quality/ca3003-review-code-for-file-path-injection-vulnerabilities) | Review code for file path injection vulnerabilities | Security | False | False | Potential file path injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
+140 | [CA3004](https://docs.microsoft.com/visualstudio/code-quality/ca3004-review-code-for-information-disclosure-vulnerabilities) | Review code for information disclosure vulnerabilities | Security | False | False | Potential information disclosure vulnerability was found where '{0}' in method '{1}' may contain unintended information from '{2}' in method '{3}'. |
+141 | [CA3005](https://docs.microsoft.com/visualstudio/code-quality/ca3005-review-code-for-ldap-injection-vulnerabilities) | Review code for LDAP injection vulnerabilities | Security | False | False | Potential LDAP injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
+142 | [CA3006](https://docs.microsoft.com/visualstudio/code-quality/ca3006-review-code-for-process-command-injection-vulnerabilities) | Review code for process command injection vulnerabilities | Security | False | False | Potential process command injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
+143 | [CA3007](https://docs.microsoft.com/visualstudio/code-quality/ca3007-review-code-for-open-redirect-vulnerabilities) | Review code for open redirect vulnerabilities | Security | False | False | Potential open redirect vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
+144 | [CA3008](https://docs.microsoft.com/visualstudio/code-quality/ca3008-review-code-for-xpath-injection-vulnerabilities) | Review code for XPath injection vulnerabilities | Security | False | False | Potential XPath injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
+145 | [CA3009](https://docs.microsoft.com/visualstudio/code-quality/ca3009-review-code-for-xml-injection-vulnerabilities) | Review code for XML injection vulnerabilities | Security | False | False | Potential XML injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
+146 | [CA3010](https://docs.microsoft.com/visualstudio/code-quality/ca3010-review-code-for-xaml-injection-vulnerabilities) | Review code for XAML injection vulnerabilities | Security | False | False | Potential XAML injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
+147 | [CA3011](https://docs.microsoft.com/visualstudio/code-quality/ca3011-review-code-for-dll-injection-vulnerabilities) | Review code for DLL injection vulnerabilities | Security | False | False | Potential DLL injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
+148 | [CA3012](https://docs.microsoft.com/visualstudio/code-quality/ca3012-review-code-for-regex-injection-vulnerabilities) | Review code for regex injection vulnerabilities | Security | False | False | Potential regex injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
+149 | CA3061 | Do Not Add Schema By URL | Security | True | False | This overload of XmlSchemaCollection.Add method internally enables DTD processing on the XML reader instance used, and uses UrlResolver for resolving external XML entities. The outcome is information disclosure. Content from file system or network shares for the machine processing the XML can be exposed to attacker. In addition, an attacker can use this as a DoS vector. |
+150 | [CA3075](https://docs.microsoft.com/visualstudio/code-quality/ca3075-insecure-dtd-processing) | Insecure DTD processing in XML | Security | True | False | Using XmlTextReader.Load(), creating an insecure XmlReaderSettings instance when invoking XmlReader.Create(), setting the InnerXml property of the XmlDocument and enabling DTD processing using XmlUrlResolver insecurely can lead to information disclosure. Replace it with a call to the Load() method overload that takes an XmlReader instance, use XmlReader.Create() to accept XmlReaderSettings arguments or consider explicitly setting secure values. The DataViewSettingCollectionString property of DataViewManager should always be assigned from a trusted source, the DtdProcessing property should be set to false, and the XmlResolver property should be changed to XmlSecureResolver or null.  |
+151 | [CA3076](https://docs.microsoft.com/visualstudio/code-quality/ca3076-insecure-xslt-script-execution) | Insecure XSLT script processing. | Security | True | False | Providing an insecure XsltSettings instance and an insecure XmlResolver instance to XslCompiledTransform.Load method is potentially unsafe as it allows processing script within XSL, which on an untrusted XSL input may lead to malicious code execution. Either replace the insecure XsltSettings argument with XsltSettings.Default or an instance that has disabled document function and script execution, or replace the XmlResolver argurment with null or an XmlSecureResolver instance. This message may be suppressed if the input is known to be from a trusted source and external resource resolution from locations that are not known in advance must be supported. |
+152 | [CA3077](https://docs.microsoft.com/visualstudio/code-quality/ca3077-insecure-processing-in-api-design-xml-document-and-xml-text-reader) | Insecure Processing in API Design, XmlDocument and XmlTextReader | Security | True | False | Enabling DTD processing on all instances derived from XmlTextReader or  XmlDocument and using XmlUrlResolver for resolving external XML entities may lead to information disclosure. Ensure to set the XmlResolver property to null, create an instance of XmlSecureResolver when processing untrusted input, or use XmlReader.Create method with a secure XmlReaderSettings argument. Unless you need to enable it, ensure the DtdProcessing property is set to false.  |
+153 | [CA3147](https://docs.microsoft.com/visualstudio/code-quality/ca3147-mark-verb-handlers-with-validateantiforgerytoken) | Mark Verb Handlers With Validate Antiforgery Token | Security | True | False | Missing ValidateAntiForgeryTokenAttribute on controller action {0}. |
+154 | [CA5350](https://docs.microsoft.com/visualstudio/code-quality/ca5350-do-not-use-weak-cryptographic-algorithms) | Do Not Use Weak Cryptographic Algorithms | Security | True | False | Cryptographic algorithms degrade over time as attacks become for advances to attacker get access to more computation. Depending on the type and application of this cryptographic algorithm, further degradation of the cryptographic strength of it may allow attackers to read enciphered messages, tamper with enciphered  messages, forge digital signatures, tamper with hashed content, or otherwise compromise any cryptosystem based on this algorithm. Replace encryption uses with the AES algorithm (AES-256, AES-192 and AES-128 are acceptable) with a key length greater than or equal to 128 bits. Replace hashing uses with a hashing function in the SHA-2 family, such as SHA-2 512, SHA-2 384, or SHA-2 256. |
+155 | [CA5351](https://docs.microsoft.com/visualstudio/code-quality/ca5351-do-not-use-broken-cryptographic-algorithms) | Do Not Use Broken Cryptographic Algorithms | Security | True | False | An attack making it computationally feasible to break this algorithm exists. This allows attackers to break the cryptographic guarantees it is designed to provide. Depending on the type and application of this cryptographic algorithm, this may allow attackers to read enciphered messages, tamper with enciphered  messages, forge digital signatures, tamper with hashed content, or otherwise compromise any cryptosystem based on this algorithm. Replace encryption uses with the AES algorithm (AES-256, AES-192 and AES-128 are acceptable) with a key length greater than or equal to 128 bits. Replace hashing uses with a hashing function in the SHA-2 family, such as SHA512, SHA384, or SHA256. Replace digital signature uses with RSA with a key length greater than or equal to 2048-bits, or ECDSA with a key length greater than or equal to 256 bits. |
+156 | CA5358 | Do Not Use Unsafe Cipher Modes | Security | False | False | These modes are vulnerable to attacks. Use only approved modes (CBC, CTS). |
+157 | CA5359 | Do Not Disable Certificate Validation | Security | True | False | A certificate can help authenticate the identity of the server. Clients should validate the server certificate to ensure requests are sent to the intended server. If the ServerCertificateValidationCallback always returns 'true', any certificate will pass validation. |
+158 | CA5360 | Do Not Call Dangerous Methods In Deserialization | Security | True | False | Insecure Deserialization is a vulnerability which occurs when untrusted data is used to abuse the logic of an application, inflict a Denial-of-Service (DoS) attack, or even execute arbitrary code upon it being deserialized. It’s frequently possible for malicious users to abuse these deserialization features when the application is deserializing untrusted data which is under their control. Specifically, invoke dangerous methods in the process of deserialization. Successful insecure deserialization attacks could allow an attacker to carry out attacks such as DoS attacks, authentication bypasses, and remote code execution. |
+159 | [CA5361](https://docs.microsoft.com/visualstudio/code-quality/ca5361) | Do Not Disable SChannel Use of Strong Crypto | Security | True | False | Starting with the .NET Framework 4.6, the System.Net.ServicePointManager and System.Net.Security.SslStream classes are recommeded to use new protocols. The old ones have protocol weaknesses and are not supported. Setting Switch.System.Net.DontEnableSchUseStrongCrypto with true will use the old weak crypto check and opt out of the protocol migration. |
+160 | CA5362 | Do Not Refer Self In Serializable Class | Security | False | False | This can allow an attacker to DOS or exhaust the memory of the process. |
+161 | CA5363 | Do Not Disable Request Validation | Security | True | False | Request validation is a feature in ASP.NET that examines HTTP requests and determines whether they contain potentially dangerous content. This check adds protection from markup or code in the URL query string, cookies, or posted form values that might have been added for malicious purposes. So, it is generally desirable and should be left enabled for defense in depth. |
+162 | [CA5364](https://docs.microsoft.com/visualstudio/code-quality/ca5364) | Do Not Use Deprecated Security Protocols | Security | True | False | Using a deprecated security protocol rather than the system default is risky. |
+163 | CA5365 | Do Not Disable HTTP Header Checking | Security | True | False | HTTP header checking enables encoding of the carriage return and newline characters, \r and \n, that are found in response headers. This encoding can help to avoid injection attacks that exploit an application that echoes untrusted data contained by the header. |
+164 | CA5366 | Use XmlReader For DataSet Read Xml | Security | True | False | Processing XML from untrusted data may load dangerous external references, which should be restricted by using an XmlReader with a secure resolver or with DTD processing disabled. |
+165 | CA5367 | Do Not Serialize Types With Pointer Fields | Security | False | False | Pointers are not "type safe" in the sense that you cannot guarantee the correctness of the memory they point at. So, serializing types with pointer fields is dangerous, as it may allow an attacker to control the pointer. |
+166 | CA5368 | Set ViewStateUserKey For Classes Derived From Page | Security | True | False | Setting the ViewStateUserKey property can help you prevent attacks on your application by allowing you to assign an identifier to the view-state variable for individual users so that they cannot use the variable to generate an attack. Otherwise, there will be cross-site request forgery vulnerabilities. |
+167 | CA5369 | Use XmlReader For Deserialize | Security | True | False | Processing XML from untrusted data may load dangerous external references, which should be restricted by using an XmlReader with a secure resolver or with DTD processing disabled. |
+168 | CA5370 | Use XmlReader For Validating Reader | Security | True | False | Processing XML from untrusted data may load dangerous external references, which should be restricted by using an XmlReader with a secure resolver or with DTD processing disabled. |
+169 | CA5371 | Use XmlReader For Schema Read | Security | True | False | Processing XML from untrusted data may load dangerous external references, which should be restricted by using an XmlReader with a secure resolver or with DTD processing disabled. |
+170 | CA5372 | Use XmlReader For XPathDocument | Security | True | False | Processing XML from untrusted data may load dangerous external references, which should be restricted by using an XmlReader with a secure resolver or with DTD processing disabled. |
+171 | CA5373 | Do not use obsolete key derivation function | Security | True | False | Password-based key derivation should use PBKDF2 with SHA-2. Avoid using PasswordDeriveBytes since it generates a PBKDF1 key. Avoid using Rfc2898DeriveBytes.CryptDeriveKey since it doesn't use the iteration count or salt. |
+172 | CA5374 | Do Not Use XslTransform | Security | True | False | Do not use XslTransform. It does not restrict potentially dangerous external references. |
+173 | CA5375 | Do Not Use Account Shared Access Signature | Security | False | False | Shared Access Signatures(SAS) are a vital part of the security model for any application using Azure Storage, they should provide limited and safe permissions to your storage account to clients that don't have the account key. All of the operations available via a service SAS are also available via an account SAS, that is, account SAS is too powerful. So it is recommended to use Service SAS to delegate access more carefully. |
+174 | CA5376 | Use SharedAccessProtocol HttpsOnly | Security | True | False | HTTPS encrypts network traffic. Use HttpsOnly, rather than HttpOrHttps, to ensure network traffic is always encrypted to help prevent disclosure of sensitive data. |
+175 | CA5377 | Use Container Level Access Policy | Security | True | False | No access policy identifier is specified, making tokens non-revocable. |
+176 | [CA5378](https://docs.microsoft.com/visualstudio/code-quality/ca5378) | Do not disable ServicePointManagerSecurityProtocols | Security | True | False | Do not set Switch.System.ServiceModel.DisableUsingServicePointManagerSecurityProtocols to true.  Setting this switch limits Windows Communication Framework (WCF) to using Transport Layer Security (TLS) 1.0, which is insecure and obsolete. |
+177 | CA5379 | Do Not Use Weak Key Derivation Function Algorithm | Security | True | False | Some implementations of the Rfc2898DeriveBytes class allow for a hash algorithm to be specified in a constructor parameter or overwritten in the HashAlgorithm property. If a hash algorithm is specified, then it should be SHA-256 or higher. |
+178 | CA5380 | Do Not Add Certificates To Root Store | Security | True | False | By default, the Trusted Root Certification Authorities certificate store is configured with a set of public CAs that has met the requirements of the Microsoft Root Certificate Program. Since all trusted root CAs can issue certificates for any domain, an attacker can pick a weak or coercible CA that you install by yourself to target for an attack – and a single vulnerable, malicious or coercible CA undermines the security of the entire system. To make matters worse, these attacks can go unnoticed quite easily. |
+179 | CA5381 | Ensure Certificates Are Not Added To Root Store | Security | True | False | By default, the Trusted Root Certification Authorities certificate store is configured with a set of public CAs that has met the requirements of the Microsoft Root Certificate Program. Since all trusted root CAs can issue certificates for any domain, an attacker can pick a weak or coercible CA that you install by yourself to target for an attack – and a single vulnerable, malicious or coercible CA undermines the security of the entire system. To make matters worse, these attacks can go unnoticed quite easily. |
+180 | CA5382 | Use Secure Cookies In ASP.Net Core | Security | False | False | Applications available over HTTPS must use secure cookies. |
+181 | CA5383 | Ensure Use Secure Cookies In ASP.Net Core | Security | False | False | Applications available over HTTPS must use secure cookies. |
+182 | CA5384 | Do Not Use Digital Signature Algorithm (DSA) | Security | True | False | DSA is too weak to use. |
+183 | CA5385 | Use Rivest–Shamir–Adleman (RSA) Algorithm With Sufficient Key Size | Security | True | False | Encryption algorithms are vulnerable to brute force attacks when too small a key size is used. |
+184 | [CA5386](https://docs.microsoft.com/visualstudio/code-quality/ca5386) | Avoid hardcoding SecurityProtocolType value | Security | False | False | Avoid hardcoding SecurityProtocolType {0}, and instead use SecurityProtocolType.SystemDefault to allow the operating system to choose the best Transport Layer Security protocol to use. |
+185 | CA5387 | Do Not Use Weak Key Derivation Function With Insufficient Iteration Count | Security | False | False | When deriving cryptographic keys from user-provided inputs such as password, use sufficient iteration count (at least 100k). |
+186 | CA5388 | Ensure Sufficient Iteration Count When Using Weak Key Derivation Function | Security | False | False | When deriving cryptographic keys from user-provided inputs such as password, use sufficient iteration count (at least 100k). |
+187 | CA5389 | Do Not Add Archive Item's Path To The Target File System Path | Security | True | False | When extracting files from an archive and using the archive item's path, check if the path is safe. Archive path can be relative and can lead to file system access outside of the expected file system target path, leading to malicious config changes and remote code execution via lay-and-wait technique. |
+188 | CA5390 | Do Not Hard Code Encryption Key | Security | True | False | SymmetricAlgorithm's .Key property, or a method's rgbKey parameter, should never be a hardcoded value. |
+189 | CA9999 | Analyzer version mismatch | Reliability | True | False | Analyzers in this package require a certain minimum version of Microsoft.CodeAnalysis to execute correctly. Refer to https://docs.microsoft.com/visualstudio/code-quality/install-fxcop-analyzers#fxcopanalyzers-package-versions to install the correct analyzer version. |
diff --git a/src/Microsoft.CodeAnalysis.FxCopAnalyzers/Microsoft.CodeAnalysis.FxCopAnalyzers.sarif b/src/Microsoft.CodeAnalysis.FxCopAnalyzers/Microsoft.CodeAnalysis.FxCopAnalyzers.sarif
index 68b15fe22a..2334aa85f3 100644
--- a/src/Microsoft.CodeAnalysis.FxCopAnalyzers/Microsoft.CodeAnalysis.FxCopAnalyzers.sarif
+++ b/src/Microsoft.CodeAnalysis.FxCopAnalyzers/Microsoft.CodeAnalysis.FxCopAnalyzers.sarif
@@ -5,7 +5,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.VersionCheckAnalyzer",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -29,7 +29,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeQuality.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -1511,7 +1511,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeQuality.CSharp.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -1707,7 +1707,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeQuality.VisualBasic.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -1941,7 +1941,7 @@
     {
       "tool": {
         "name": "Microsoft.NetCore.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -2680,6 +2680,44 @@
             ]
           }
         },
+        "CA2329": {
+          "id": "CA2329",
+          "shortDescription": "Do not deserialize with JsonSerializer using an insecure configuration",
+          "fullDescription": "When deserializing untrusted input, allowing arbitrary types to be deserialized is insecure. When using deserializing JsonSerializer, use TypeNameHandling.None, or for values other than None, restrict deserialized types with a SerializationBinder.",
+          "defaultLevel": "warning",
+          "properties": {
+            "category": "Security",
+            "isEnabledByDefault": false,
+            "typeName": "DoNotUseInsecureDeserializerJsonNetWithoutBinder",
+            "languages": [
+              "C#",
+              "Visual Basic"
+            ],
+            "tags": [
+              "Dataflow",
+              "Telemetry"
+            ]
+          }
+        },
+        "CA2330": {
+          "id": "CA2330",
+          "shortDescription": "Ensure that JsonSerializer has a secure configuration when deserializing",
+          "fullDescription": "When deserializing untrusted input, allowing arbitrary types to be deserialized is insecure. When using deserializing JsonSerializer, use TypeNameHandling.None, or for values other than None, restrict deserialized types with a SerializationBinder.",
+          "defaultLevel": "warning",
+          "properties": {
+            "category": "Security",
+            "isEnabledByDefault": false,
+            "typeName": "DoNotUseInsecureDeserializerJsonNetWithoutBinder",
+            "languages": [
+              "C#",
+              "Visual Basic"
+            ],
+            "tags": [
+              "Dataflow",
+              "Telemetry"
+            ]
+          }
+        },
         "CA3001": {
           "id": "CA3001",
           "shortDescription": "Review code for SQL injection vulnerabilities",
@@ -3543,7 +3581,7 @@
     {
       "tool": {
         "name": "Microsoft.NetCore.CSharp.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -3678,7 +3716,7 @@
     {
       "tool": {
         "name": "Microsoft.NetCore.VisualBasic.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -3813,7 +3851,7 @@
     {
       "tool": {
         "name": "Microsoft.NetFramework.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -3896,7 +3934,7 @@
     {
       "tool": {
         "name": "Microsoft.NetFramework.CSharp.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -3941,7 +3979,7 @@
     {
       "tool": {
         "name": "Microsoft.NetFramework.VisualBasic.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
diff --git a/src/Microsoft.CodeAnalysis.VersionCheckAnalyzer/Microsoft.CodeAnalysis.VersionCheckAnalyzer.sarif b/src/Microsoft.CodeAnalysis.VersionCheckAnalyzer/Microsoft.CodeAnalysis.VersionCheckAnalyzer.sarif
index 43228f794b..c92a0e48f2 100644
--- a/src/Microsoft.CodeAnalysis.VersionCheckAnalyzer/Microsoft.CodeAnalysis.VersionCheckAnalyzer.sarif
+++ b/src/Microsoft.CodeAnalysis.VersionCheckAnalyzer/Microsoft.CodeAnalysis.VersionCheckAnalyzer.sarif
@@ -5,7 +5,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.VersionCheckAnalyzer",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
diff --git a/src/Microsoft.CodeQuality.Analyzers/Core/ApiDesignGuidelines/OperatorOverloadsHaveNamedAlternates.cs b/src/Microsoft.CodeQuality.Analyzers/Core/ApiDesignGuidelines/OperatorOverloadsHaveNamedAlternates.cs
index 9cc6ea02f5..cc6fc4be30 100644
--- a/src/Microsoft.CodeQuality.Analyzers/Core/ApiDesignGuidelines/OperatorOverloadsHaveNamedAlternates.cs
+++ b/src/Microsoft.CodeQuality.Analyzers/Core/ApiDesignGuidelines/OperatorOverloadsHaveNamedAlternates.cs
@@ -197,7 +197,7 @@ internal static ExpectedAlternateMethodGroup GetExpectedAlternateMethodGroup(str
             // list of operator alternate names: https://docs.microsoft.com/visualstudio/code-quality/ca2225-operator-overloads-have-named-alternates
 
             // the most common case; create a static method with the already specified types
-            ExpectedAlternateMethodGroup createSingle(string methodName) => new ExpectedAlternateMethodGroup(methodName);
+            static ExpectedAlternateMethodGroup createSingle(string methodName) => new ExpectedAlternateMethodGroup(methodName);
             switch (operatorName)
             {
                 case "op_Addition":
diff --git a/src/Microsoft.CodeQuality.Analyzers/Core/ApiDesignGuidelines/UseGenericEventHandlerInstances.cs b/src/Microsoft.CodeQuality.Analyzers/Core/ApiDesignGuidelines/UseGenericEventHandlerInstances.cs
index 04e160fbfb..8dc7ea37e1 100644
--- a/src/Microsoft.CodeQuality.Analyzers/Core/ApiDesignGuidelines/UseGenericEventHandlerInstances.cs
+++ b/src/Microsoft.CodeQuality.Analyzers/Core/ApiDesignGuidelines/UseGenericEventHandlerInstances.cs
@@ -90,7 +90,7 @@ public override void Initialize(AnalysisContext analysisContext)
                         return;
                     }
 
-                    bool IsDelegateTypeWithInvokeMethod(INamedTypeSymbol namedType) =>
+                    static bool IsDelegateTypeWithInvokeMethod(INamedTypeSymbol namedType) =>
                         namedType.TypeKind == TypeKind.Delegate && namedType.DelegateInvokeMethod != null;
 
                     bool IsEventArgsParameter(IParameterSymbol parameter)
diff --git a/src/Microsoft.CodeQuality.Analyzers/Core/Maintainability/AvoidDeadConditionalCode.cs b/src/Microsoft.CodeQuality.Analyzers/Core/Maintainability/AvoidDeadConditionalCode.cs
index 1f2e04bf3c..404d4e8c99 100644
--- a/src/Microsoft.CodeQuality.Analyzers/Core/Maintainability/AvoidDeadConditionalCode.cs
+++ b/src/Microsoft.CodeQuality.Analyzers/Core/Maintainability/AvoidDeadConditionalCode.cs
@@ -66,7 +66,7 @@ public override void Initialize(AnalysisContext context)
 
                     foreach (var operationRoot in operationBlockContext.OperationBlocks)
                     {
-                        bool ShouldAnalyze(IOperation op) =>
+                        static bool ShouldAnalyze(IOperation op) =>
                                 (op as IBinaryOperation)?.IsComparisonOperator() == true ||
                                 (op as IInvocationOperation)?.TargetMethod.ReturnType.SpecialType == SpecialType.System_Boolean ||
                                 op.Kind == OperationKind.Coalesce ||
diff --git a/src/Microsoft.CodeQuality.Analyzers/Core/Maintainability/AvoidUninstantiatedInternalClasses.cs b/src/Microsoft.CodeQuality.Analyzers/Core/Maintainability/AvoidUninstantiatedInternalClasses.cs
index 41464eeca5..5f9a6ab0aa 100644
--- a/src/Microsoft.CodeQuality.Analyzers/Core/Maintainability/AvoidUninstantiatedInternalClasses.cs
+++ b/src/Microsoft.CodeQuality.Analyzers/Core/Maintainability/AvoidUninstantiatedInternalClasses.cs
@@ -140,7 +140,7 @@ void ProcessNamedTypeParamConstraint(INamedTypeSymbol namedTypeArg)
                             }
                             else if (typeArg is ITypeParameterSymbol typeParameterArg && !typeParameterArg.ConstraintTypes.IsEmpty)
                             {
-                                IEnumerable<INamedTypeSymbol> GetAllNamedTypeConstraints(ITypeParameterSymbol t)
+                                static IEnumerable<INamedTypeSymbol> GetAllNamedTypeConstraints(ITypeParameterSymbol t)
                                 {
                                     var directConstraints = t.ConstraintTypes.OfType<INamedTypeSymbol>();
                                     var inheritedConstraints = t.ConstraintTypes.OfType<ITypeParameterSymbol>()
diff --git a/src/Microsoft.CodeQuality.Analyzers/Core/Maintainability/CodeMetricsAnalyzer.cs b/src/Microsoft.CodeQuality.Analyzers/Core/Maintainability/CodeMetricsAnalyzer.cs
index a2af7b2dde..15de6a30a4 100644
--- a/src/Microsoft.CodeQuality.Analyzers/Core/Maintainability/CodeMetricsAnalyzer.cs
+++ b/src/Microsoft.CodeQuality.Analyzers/Core/Maintainability/CodeMetricsAnalyzer.cs
@@ -237,7 +237,7 @@ void analyzeMetricsData(CodeAnalysisMetricData codeAnalysisMetricData)
                     return getDefaultThreshold(ruleId, symbolKind);
                 }
 
-                bool isApplicableByDefault(string ruleId, SymbolKind symbolKind)
+                static bool isApplicableByDefault(string ruleId, SymbolKind symbolKind)
                 {
                     switch (ruleId)
                     {
@@ -280,7 +280,7 @@ bool isApplicableByDefault(string ruleId, SymbolKind symbolKind)
                     }
                 }
 
-                uint? getDefaultThreshold(string ruleId, SymbolKind symbolKind)
+                static uint? getDefaultThreshold(string ruleId, SymbolKind symbolKind)
                 {
                     if (!isApplicableByDefault(ruleId, symbolKind))
                     {
@@ -460,7 +460,7 @@ private static AdditionalText TryGetCodeMetricsConfigurationFile(ImmutableArray<
                     string arg2 = Path.GetFileName(additionalText.Path);
                     LinePositionSpan linePositionSpan = lines.GetLinePositionSpan(line.Span);
                     Location location = Location.Create(additionalText.Path, line.Span, linePositionSpan);
-                    invalidFileDiagnostics = invalidFileDiagnostics ?? new List<Diagnostic>();
+                    invalidFileDiagnostics ??= new List<Diagnostic>();
                     var diagnostic = Diagnostic.Create(InvalidEntryInCodeMetricsConfigFileRule, location, arg1, arg2);
                     invalidFileDiagnostics.Add(diagnostic);
                 }
diff --git a/src/Microsoft.CodeQuality.Analyzers/Core/Maintainability/DoNotIgnoreMethodResults.cs b/src/Microsoft.CodeQuality.Analyzers/Core/Maintainability/DoNotIgnoreMethodResults.cs
index c7d76d20bf..462904b8e5 100644
--- a/src/Microsoft.CodeQuality.Analyzers/Core/Maintainability/DoNotIgnoreMethodResults.cs
+++ b/src/Microsoft.CodeQuality.Analyzers/Core/Maintainability/DoNotIgnoreMethodResults.cs
@@ -204,7 +204,7 @@ public override void Initialize(AnalysisContext analysisContext)
 
         private static bool ShouldSkipAnalyzing(OperationAnalysisContext operationContext, INamedTypeSymbol expectedExceptionType, INamedTypeSymbol xunitAssertType, INamedTypeSymbol nunitAssertType)
         {
-            bool IsThrowsArgument(IParameterSymbol parameterSymbol, string argumentName, ImmutableHashSet<string> methodNames, INamedTypeSymbol assertSymbol)
+            static bool IsThrowsArgument(IParameterSymbol parameterSymbol, string argumentName, ImmutableHashSet<string> methodNames, INamedTypeSymbol assertSymbol)
             {
                 return parameterSymbol.Name == argumentName &&
                        parameterSymbol.ContainingSymbol is IMethodSymbol methodSymbol &&
diff --git a/src/Microsoft.CodeQuality.Analyzers/Core/QualityGuidelines/MarkMembersAsStatic.Fixer.cs b/src/Microsoft.CodeQuality.Analyzers/Core/QualityGuidelines/MarkMembersAsStatic.Fixer.cs
index f36b3348c7..46b6472fd8 100644
--- a/src/Microsoft.CodeQuality.Analyzers/Core/QualityGuidelines/MarkMembersAsStatic.Fixer.cs
+++ b/src/Microsoft.CodeQuality.Analyzers/Core/QualityGuidelines/MarkMembersAsStatic.Fixer.cs
@@ -192,7 +192,7 @@ private async Task<(Solution newSolution, bool allReferencesFixed)> UpdateRefere
             return (solution, allReferencesFixed);
 
             // Local functions.
-            bool IsReplacableOperation(IOperation operation)
+            static bool IsReplacableOperation(IOperation operation)
             {
                 // We only replace reference operations whose removal cannot change semantics.
                 if (operation != null)
diff --git a/src/Microsoft.CodeQuality.Analyzers/Core/QualityGuidelines/MarkMembersAsStatic.cs b/src/Microsoft.CodeQuality.Analyzers/Core/QualityGuidelines/MarkMembersAsStatic.cs
index 399f8e8c38..6bab7fde58 100644
--- a/src/Microsoft.CodeQuality.Analyzers/Core/QualityGuidelines/MarkMembersAsStatic.cs
+++ b/src/Microsoft.CodeQuality.Analyzers/Core/QualityGuidelines/MarkMembersAsStatic.cs
@@ -235,7 +235,7 @@ void Add(INamedTypeSymbol symbol)
             {
                 if (symbol != null)
                 {
-                    builder = builder ?? ImmutableArray.CreateBuilder<INamedTypeSymbol>();
+                    builder ??= ImmutableArray.CreateBuilder<INamedTypeSymbol>();
                     builder.Add(symbol);
                 }
             }
diff --git a/src/Microsoft.CodeQuality.Analyzers/Microsoft.CodeQuality.Analyzers.sarif b/src/Microsoft.CodeQuality.Analyzers/Microsoft.CodeQuality.Analyzers.sarif
index 07796410ab..4de16b5a22 100644
--- a/src/Microsoft.CodeQuality.Analyzers/Microsoft.CodeQuality.Analyzers.sarif
+++ b/src/Microsoft.CodeQuality.Analyzers/Microsoft.CodeQuality.Analyzers.sarif
@@ -5,7 +5,7 @@
     {
       "tool": {
         "name": "Humanizer",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -14,7 +14,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeQuality.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -1496,7 +1496,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeQuality.CSharp.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -1692,7 +1692,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeQuality.VisualBasic.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
diff --git a/src/Microsoft.NetCore.Analyzers/Core/Data/ReviewSqlQueriesForSecurityVulnerabilities.cs b/src/Microsoft.NetCore.Analyzers/Core/Data/ReviewSqlQueriesForSecurityVulnerabilities.cs
index df60930ceb..471eba4245 100644
--- a/src/Microsoft.NetCore.Analyzers/Core/Data/ReviewSqlQueriesForSecurityVulnerabilities.cs
+++ b/src/Microsoft.NetCore.Analyzers/Core/Data/ReviewSqlQueriesForSecurityVulnerabilities.cs
@@ -212,17 +212,19 @@ private static bool IsParameterSymbolVulnerable(IParameterSymbol parameter)
             if (argumentValue.Type.SpecialType != SpecialType.System_String || !argumentValue.ConstantValue.HasValue)
             {
                 // We have a candidate for diagnostic. perform more precise dataflow analysis.
-                var cfg = argumentValue.GetEnclosingControlFlowGraph();
-                var wellKnownTypeProvider = WellKnownTypeProvider.GetOrCreate(operationContext.Compilation);
-                var valueContentResult = ValueContentAnalysis.TryGetOrComputeResult(cfg, containingMethod, wellKnownTypeProvider,
-                    operationContext.Options, Rule, operationContext.CancellationToken);
-                if (valueContentResult != null)
+                if (argumentValue.TryGetEnclosingControlFlowGraph(out var cfg))
                 {
-                    ValueContentAbstractValue value = valueContentResult[argumentValue.Kind, argumentValue.Syntax];
-                    if (value.NonLiteralState == ValueContainsNonLiteralState.No)
+                    var wellKnownTypeProvider = WellKnownTypeProvider.GetOrCreate(operationContext.Compilation);
+                    var valueContentResult = ValueContentAnalysis.TryGetOrComputeResult(cfg, containingMethod, wellKnownTypeProvider,
+                        operationContext.Options, Rule, operationContext.CancellationToken);
+                    if (valueContentResult != null)
                     {
-                        // The value is a constant literal or default/unitialized, so avoid flagging this usage.
-                        return false;
+                        ValueContentAbstractValue value = valueContentResult[argumentValue.Kind, argumentValue.Syntax];
+                        if (value.NonLiteralState == ValueContainsNonLiteralState.No)
+                        {
+                            // The value is a constant literal or default/unitialized, so avoid flagging this usage.
+                            return false;
+                        }
                     }
                 }
 
diff --git a/src/Microsoft.NetCore.Analyzers/Core/ImmutableCollections/DoNotCallToImmutableCollectionOnAnImmutableCollectionValue.Fixer.cs b/src/Microsoft.NetCore.Analyzers/Core/ImmutableCollections/DoNotCallToImmutableCollectionOnAnImmutableCollectionValue.Fixer.cs
index 2b34e2aabd..5a90403e9f 100644
--- a/src/Microsoft.NetCore.Analyzers/Core/ImmutableCollections/DoNotCallToImmutableCollectionOnAnImmutableCollectionValue.Fixer.cs
+++ b/src/Microsoft.NetCore.Analyzers/Core/ImmutableCollections/DoNotCallToImmutableCollectionOnAnImmutableCollectionValue.Fixer.cs
@@ -46,8 +46,7 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
             }
 
             var semanticModel = await document.GetSemanticModelAsync(context.CancellationToken).ConfigureAwait(false);
-            var invocationOperation = semanticModel.GetOperation(invocationNode) as IInvocationOperation;
-            if (invocationOperation == null ||
+            if (!(semanticModel.GetOperation(invocationNode) is IInvocationOperation invocationOperation) ||
                 !DoNotCallToImmutableCollectionOnAnImmutableCollectionValueAnalyzer.ToImmutableMethodNames.Contains(invocationOperation.TargetMethod.Name))
             {
                 return;
diff --git a/src/Microsoft.NetCore.Analyzers/Core/Runtime/DoNotPassLiteralsAsLocalizedParameters.cs b/src/Microsoft.NetCore.Analyzers/Core/Runtime/DoNotPassLiteralsAsLocalizedParameters.cs
index 62110667cc..041560804d 100644
--- a/src/Microsoft.NetCore.Analyzers/Core/Runtime/DoNotPassLiteralsAsLocalizedParameters.cs
+++ b/src/Microsoft.NetCore.Analyzers/Core/Runtime/DoNotPassLiteralsAsLocalizedParameters.cs
@@ -264,12 +264,6 @@ private static ImmutableHashSet<INamedTypeSymbol> GetTypesToIgnore(Compilation c
                 }
             }
 
-            // FxCop compat: If a localizable attribute isn't defined then fall back to name heuristics.
-            bool IsLocalizableByNameHeuristic(ISymbol symbol) =>
-                symbol.Name.Equals("message", StringComparison.OrdinalIgnoreCase) ||
-                symbol.Name.Equals("text", StringComparison.OrdinalIgnoreCase) ||
-                symbol.Name.Equals("caption", StringComparison.OrdinalIgnoreCase);
-
             if (IsLocalizableByNameHeuristic(parameterSymbol) ||
                 containingPropertySymbolOpt != null && IsLocalizableByNameHeuristic(containingPropertySymbolOpt))
             {
@@ -286,6 +280,12 @@ private static ImmutableHashSet<INamedTypeSymbol> GetTypesToIgnore(Compilation c
             }
 
             return false;
+
+            // FxCop compat: If a localizable attribute isn't defined then fall back to name heuristics.
+            static bool IsLocalizableByNameHeuristic(ISymbol symbol) =>
+                symbol.Name.Equals("message", StringComparison.OrdinalIgnoreCase) ||
+                symbol.Name.Equals("text", StringComparison.OrdinalIgnoreCase) ||
+                symbol.Name.Equals("caption", StringComparison.OrdinalIgnoreCase);
         }
 
         private static LocalizableAttributeState GetLocalizableAttributeState(ISymbol symbol, INamedTypeSymbol localizableAttributeTypeSymbol)
diff --git a/src/Microsoft.NetCore.Analyzers/Core/Runtime/DoNotUseEnumerableMethodsOnIndexableCollectionsInsteadUseTheCollectionDirectly.Fixer.cs b/src/Microsoft.NetCore.Analyzers/Core/Runtime/DoNotUseEnumerableMethodsOnIndexableCollectionsInsteadUseTheCollectionDirectly.Fixer.cs
index 52309983e9..31b72390d8 100644
--- a/src/Microsoft.NetCore.Analyzers/Core/Runtime/DoNotUseEnumerableMethodsOnIndexableCollectionsInsteadUseTheCollectionDirectly.Fixer.cs
+++ b/src/Microsoft.NetCore.Analyzers/Core/Runtime/DoNotUseEnumerableMethodsOnIndexableCollectionsInsteadUseTheCollectionDirectly.Fixer.cs
@@ -65,8 +65,7 @@ private async Task<Document> UseCollectionDirectly(Document document, TextSpan s
             }
 
             var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
-            var invocationOperation = semanticModel.GetOperation(invocationNode, cancellationToken) as IInvocationOperation;
-            if (invocationOperation == null)
+            if (!(semanticModel.GetOperation(invocationNode, cancellationToken) is IInvocationOperation invocationOperation))
             {
                 return document;
             }
diff --git a/src/Microsoft.NetCore.Analyzers/Core/Security/DoNotReferSelfInSerializableClass.cs b/src/Microsoft.NetCore.Analyzers/Core/Security/DoNotReferSelfInSerializableClass.cs
index ad59808189..9bcad01c4f 100644
--- a/src/Microsoft.NetCore.Analyzers/Core/Security/DoNotReferSelfInSerializableClass.cs
+++ b/src/Microsoft.NetCore.Analyzers/Core/Security/DoNotReferSelfInSerializableClass.cs
@@ -146,7 +146,7 @@ void DrawGraph(ITypeSymbol point)
                         }
                     }
 
-                    HashSet<ITypeSymbol> GetAssociatedTypes(ITypeSymbol type)
+                    static HashSet<ITypeSymbol> GetAssociatedTypes(ITypeSymbol type)
                     {
                         var result = new HashSet<ITypeSymbol>();
 
@@ -194,7 +194,7 @@ void AddLine(ISymbol from, ISymbol to, ConcurrentDictionary<ISymbol, int> degree
                     // point: The point to be added
                     // degree: The out degree of all vertices in the graph
                     // graph: The graph
-                    bool AddPoint(ISymbol point, ConcurrentDictionary<ISymbol, int> degree, ConcurrentDictionary<ISymbol, ConcurrentDictionary<ISymbol, bool>> graph)
+                    static bool AddPoint(ISymbol point, ConcurrentDictionary<ISymbol, int> degree, ConcurrentDictionary<ISymbol, ConcurrentDictionary<ISymbol, bool>> graph)
                     {
                         degree.TryAdd(point, 0);
                         return graph.TryAdd(point, new ConcurrentDictionary<ISymbol, bool>());
@@ -224,7 +224,7 @@ bool AddPointToBothGraphs(ISymbol point)
                     //
                     // degree: The in degree of all vertices in the graph
                     // graph: The graph
-                    void ModifyDegree(ConcurrentDictionary<ISymbol, int> degree, ConcurrentDictionary<ISymbol, ConcurrentDictionary<ISymbol, bool>> graph)
+                    static void ModifyDegree(ConcurrentDictionary<ISymbol, int> degree, ConcurrentDictionary<ISymbol, ConcurrentDictionary<ISymbol, bool>> graph)
                     {
                         var stack = new Stack<ISymbol>(degree.Where(s => s.Value == 0).Select(s => s.Key));
 
diff --git a/src/Microsoft.NetCore.Analyzers/Core/Security/DoNotSetSwitch.cs b/src/Microsoft.NetCore.Analyzers/Core/Security/DoNotSetSwitch.cs
index fca10da13e..a36c9d53bb 100644
--- a/src/Microsoft.NetCore.Analyzers/Core/Security/DoNotSetSwitch.cs
+++ b/src/Microsoft.NetCore.Analyzers/Core/Security/DoNotSetSwitch.cs
@@ -116,10 +116,10 @@ public override void Initialize(AnalysisContext context)
                                     methodSymbol.Name));
                         }
                     }
-                    else
+                    else if (invocationOperation.TryGetEnclosingControlFlowGraph(out var cfg))
                     {
                         var valueContentResult = ValueContentAnalysis.TryGetOrComputeResult(
-                            invocationOperation.GetEnclosingControlFlowGraph(),
+                            cfg,
                             operationAnalysisContext.ContainingSymbol,
                             operationAnalysisContext.Options,
                             wellKnownTypeProvider,
diff --git a/src/Microsoft.NetCore.Analyzers/Core/Security/Helpers/SecurityHelpers.cs b/src/Microsoft.NetCore.Analyzers/Core/Security/Helpers/SecurityHelpers.cs
index 8a4d91fda1..a90ab02798 100644
--- a/src/Microsoft.NetCore.Analyzers/Core/Security/Helpers/SecurityHelpers.cs
+++ b/src/Microsoft.NetCore.Analyzers/Core/Security/Helpers/SecurityHelpers.cs
@@ -116,7 +116,7 @@ internal static class SecurityHelpers
                 {
                     (typeof(MicrosoftNetCoreAnalyzersResources), MicrosoftNetCoreAnalyzersResources.ResourceManager),
                     (typeof(MicrosoftNetCoreAnalyzersResources), MicrosoftNetCoreAnalyzersResources.ResourceManager),
-                }.Select(o => new KeyValuePair<Type, ResourceManager>(o.Item1, o.Item2)));
+                }.Select(o => new KeyValuePair<Type, ResourceManager>(o.Item1, o.ResourceManager)));
 
         /// <summary>
         /// Methods using a <see cref="T:Newtonsoft.Json.JsonSerializerSettings"/> parameter for <see cref="T:Newtonsoft.Json.JsonSerializer"/>.
diff --git a/src/Microsoft.NetCore.Analyzers/Core/Security/SourceTriggeredTaintedDataAnalyzerBase.cs b/src/Microsoft.NetCore.Analyzers/Core/Security/SourceTriggeredTaintedDataAnalyzerBase.cs
index 1675957b45..1b223a9b9c 100644
--- a/src/Microsoft.NetCore.Analyzers/Core/Security/SourceTriggeredTaintedDataAnalyzerBase.cs
+++ b/src/Microsoft.NetCore.Analyzers/Core/Security/SourceTriggeredTaintedDataAnalyzerBase.cs
@@ -101,12 +101,17 @@ public override void Initialize(AnalysisContext context)
                                             out evaluateWithValueContentAnalysis))
                                         {
                                             IOperation rootOperation = operationAnalysisContext.Operation.GetRoot();
+                                            if (!rootOperation.TryGetEnclosingControlFlowGraph(out var cfg))
+                                            {
+                                                return;
+                                            }
+
                                             PointsToAnalysisResult pointsToAnalysisResult;
                                             ValueContentAnalysisResult valueContentAnalysisResultOpt;
                                             if (evaluateWithPointsToAnalysis != null)
                                             {
                                                 pointsToAnalysisResult = PointsToAnalysis.TryGetOrComputeResult(
-                                                    rootOperation.GetEnclosingControlFlowGraph(),
+                                                    cfg,
                                                     owningSymbol,
                                                     operationAnalysisContext.Options,
                                                     WellKnownTypeProvider.GetOrCreate(operationAnalysisContext.Compilation),
@@ -136,7 +141,7 @@ public override void Initialize(AnalysisContext context)
                                             if (evaluateWithValueContentAnalysis != null)
                                             {
                                                 valueContentAnalysisResultOpt = ValueContentAnalysis.TryGetOrComputeResult(
-                                                    rootOperation.GetEnclosingControlFlowGraph(),
+                                                    cfg,
                                                     owningSymbol,
                                                     operationAnalysisContext.Options,
                                                     WellKnownTypeProvider.GetOrCreate(operationAnalysisContext.Compilation),
@@ -213,8 +218,13 @@ public override void Initialize(AnalysisContext context)
 
                                             foreach (IOperation rootOperation in rootOperationsNeedingAnalysis)
                                             {
+                                                if (!rootOperation.TryGetEnclosingControlFlowGraph(out var cfg))
+                                                {
+                                                    continue;
+                                                }
+
                                                 TaintedDataAnalysisResult taintedDataAnalysisResult = TaintedDataAnalysis.TryGetOrComputeResult(
-                                                    rootOperation.GetEnclosingControlFlowGraph(),
+                                                    cfg,
                                                     operationBlockAnalysisContext.Compilation,
                                                     operationBlockAnalysisContext.OwningSymbol,
                                                     operationBlockAnalysisContext.Options,
diff --git a/src/Microsoft.NetCore.Analyzers/Core/Security/UseContainerLevelAccessPolicy.cs b/src/Microsoft.NetCore.Analyzers/Core/Security/UseContainerLevelAccessPolicy.cs
index 4ecb09ddd2..02596d8bca 100644
--- a/src/Microsoft.NetCore.Analyzers/Core/Security/UseContainerLevelAccessPolicy.cs
+++ b/src/Microsoft.NetCore.Analyzers/Core/Security/UseContainerLevelAccessPolicy.cs
@@ -138,30 +138,34 @@ public override void Initialize(AnalysisContext context)
 
                                 if (argumentOperation != null)
                                 {
-                                    var interproceduralAnalysisConfig = InterproceduralAnalysisConfiguration.Create(
-                                                                            operationBlockStartContext.Options,
-                                                                            SupportedDiagnostics,
-                                                                            defaultInterproceduralAnalysisKind: InterproceduralAnalysisKind.None,
-                                                                            cancellationToken: operationBlockStartContext.CancellationToken,
-                                                                            defaultMaxInterproceduralMethodCallChain: 1);
-                                    var pointsToAnalysisResult = PointsToAnalysis.TryGetOrComputeResult(
-                                                                    invocationOperation.GetTopmostParentBlock().GetEnclosingControlFlowGraph(),
-                                                                    owningSymbol,
-                                                                    operationBlockStartContext.Options,
-                                                                    wellKnownTypeProvider,
-                                                                    interproceduralAnalysisConfig,
-                                                                    interproceduralAnalysisPredicateOpt: null,
-                                                                    false);
-                                    if (pointsToAnalysisResult == null)
+                                    var cfg = invocationOperation.GetTopmostParentBlock()?.GetEnclosingControlFlowGraph();
+                                    if (cfg != null)
                                     {
-                                        return;
-                                    }
-
-                                    var pointsToAbstractValue = pointsToAnalysisResult[argumentOperation.Kind, argumentOperation.Syntax];
-
-                                    if (pointsToAbstractValue.NullState != NullAbstractValue.Null)
-                                    {
-                                        return;
+                                        var interproceduralAnalysisConfig = InterproceduralAnalysisConfiguration.Create(
+                                                                                operationBlockStartContext.Options,
+                                                                                SupportedDiagnostics,
+                                                                                defaultInterproceduralAnalysisKind: InterproceduralAnalysisKind.None,
+                                                                                cancellationToken: operationBlockStartContext.CancellationToken,
+                                                                                defaultMaxInterproceduralMethodCallChain: 1);
+                                        var pointsToAnalysisResult = PointsToAnalysis.TryGetOrComputeResult(
+                                                                        cfg,
+                                                                        owningSymbol,
+                                                                        operationBlockStartContext.Options,
+                                                                        wellKnownTypeProvider,
+                                                                        interproceduralAnalysisConfig,
+                                                                        interproceduralAnalysisPredicateOpt: null,
+                                                                        false);
+                                        if (pointsToAnalysisResult == null)
+                                        {
+                                            return;
+                                        }
+
+                                        var pointsToAbstractValue = pointsToAnalysisResult[argumentOperation.Kind, argumentOperation.Syntax];
+
+                                        if (pointsToAbstractValue.NullState != NullAbstractValue.Null)
+                                        {
+                                            return;
+                                        }
                                     }
                                 }
 
diff --git a/src/Microsoft.NetCore.Analyzers/Core/Security/UseSharedAccessProtocolHttpsOnly.cs b/src/Microsoft.NetCore.Analyzers/Core/Security/UseSharedAccessProtocolHttpsOnly.cs
index 169633a51d..70692f4f2b 100644
--- a/src/Microsoft.NetCore.Analyzers/Core/Security/UseSharedAccessProtocolHttpsOnly.cs
+++ b/src/Microsoft.NetCore.Analyzers/Core/Security/UseSharedAccessProtocolHttpsOnly.cs
@@ -135,33 +135,37 @@ public override void Initialize(AnalysisContext context)
 
                             if (protocolsArgumentOperation != null)
                             {
-                                var interproceduralAnalysisConfig = InterproceduralAnalysisConfiguration.Create(
+                                var cfg = invocationOperation.GetTopmostParentBlock()?.GetEnclosingControlFlowGraph();
+                                if (cfg != null)
+                                {
+                                    var interproceduralAnalysisConfig = InterproceduralAnalysisConfiguration.Create(
                                                                         operationBlockStartContext.Options,
                                                                         SupportedDiagnostics,
                                                                         defaultInterproceduralAnalysisKind: InterproceduralAnalysisKind.None,
                                                                         cancellationToken: operationBlockStartContext.CancellationToken,
                                                                         defaultMaxInterproceduralMethodCallChain: 1);
-                                var valueContentAnalysisResult = ValueContentAnalysis.TryGetOrComputeResult(
-                                                                                            invocationOperation.GetTopmostParentBlock().GetEnclosingControlFlowGraph(),
-                                                                                            owningSymbol,
-                                                                                            operationAnalysisContext.Options,
-                                                                                            wellKnownTypeProvider,
-                                                                                            interproceduralAnalysisConfig,
-                                                                                            out var copyAnalysisResult,
-                                                                                            out var pointsToAnalysisResult);
-                                if (valueContentAnalysisResult == null)
-                                {
-                                    return;
-                                }
-
-                                var protocolsArgument = valueContentAnalysisResult[protocolsArgumentOperation.Kind, protocolsArgumentOperation.Syntax];
-
-                                if (protocolsArgument.IsLiteralState &&
-                                    !protocolsArgument.LiteralValues.Contains(SharedAccessProtocolHttpsOnly))
-                                {
-                                    operationAnalysisContext.ReportDiagnostic(
-                                        invocationOperation.CreateDiagnostic(
-                                            Rule));
+                                    var valueContentAnalysisResult = ValueContentAnalysis.TryGetOrComputeResult(
+                                                                                                cfg,
+                                                                                                owningSymbol,
+                                                                                                operationAnalysisContext.Options,
+                                                                                                wellKnownTypeProvider,
+                                                                                                interproceduralAnalysisConfig,
+                                                                                                out var copyAnalysisResult,
+                                                                                                out var pointsToAnalysisResult);
+                                    if (valueContentAnalysisResult == null)
+                                    {
+                                        return;
+                                    }
+
+                                    var protocolsArgument = valueContentAnalysisResult[protocolsArgumentOperation.Kind, protocolsArgumentOperation.Syntax];
+
+                                    if (protocolsArgument.IsLiteralState &&
+                                        !protocolsArgument.LiteralValues.Contains(SharedAccessProtocolHttpsOnly))
+                                    {
+                                        operationAnalysisContext.ReportDiagnostic(
+                                            invocationOperation.CreateDiagnostic(
+                                                Rule));
+                                    }
                                 }
                             }
                         }
diff --git a/src/Microsoft.NetCore.Analyzers/Microsoft.NetCore.Analyzers.md b/src/Microsoft.NetCore.Analyzers/Microsoft.NetCore.Analyzers.md
index 24e1c942aa..f45a290057 100644
--- a/src/Microsoft.NetCore.Analyzers/Microsoft.NetCore.Analyzers.md
+++ b/src/Microsoft.NetCore.Analyzers/Microsoft.NetCore.Analyzers.md
@@ -46,51 +46,53 @@ Sr. No. | Rule ID | Title | Category | Enabled | CodeFix | Description |
 43 | CA2326 | Do not use TypeNameHandling values other than None | Security | False | False | Deserializing JSON when using a TypeNameHandling value other than None can be insecure.  If you need to instead detect Json.NET deserialization when a SerializationBinder isn't specified, then disable rule CA2326, and enable rules CA2327, CA2328, CA2329, and CA2330. |
 44 | CA2327 | Do not use insecure JsonSerializerSettings | Security | False | False | When deserializing untrusted input, allowing arbitrary types to be deserialized is insecure.  When using JsonSerializerSettings, use TypeNameHandling.None, or for values other than None, restrict deserialized types with a SerializationBinder. |
 45 | CA2328 | Ensure that JsonSerializerSettings are secure | Security | False | False | When deserializing untrusted input, allowing arbitrary types to be deserialized is insecure.  When using JsonSerializerSettings, ensure TypeNameHandling.None is specified, or for values other than None, ensure a SerializationBinder is specified to restrict deserialized types. |
-46 | [CA3001](https://docs.microsoft.com/visualstudio/code-quality/ca3001-review-code-for-sql-injection-vulnerabilities) | Review code for SQL injection vulnerabilities | Security | False | False | Potential SQL injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
-47 | [CA3002](https://docs.microsoft.com/visualstudio/code-quality/ca3002-review-code-for-xss-vulnerabilities) | Review code for XSS vulnerabilities | Security | False | False | Potential cross-site scripting (XSS) vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
-48 | [CA3003](https://docs.microsoft.com/visualstudio/code-quality/ca3003-review-code-for-file-path-injection-vulnerabilities) | Review code for file path injection vulnerabilities | Security | False | False | Potential file path injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
-49 | [CA3004](https://docs.microsoft.com/visualstudio/code-quality/ca3004-review-code-for-information-disclosure-vulnerabilities) | Review code for information disclosure vulnerabilities | Security | False | False | Potential information disclosure vulnerability was found where '{0}' in method '{1}' may contain unintended information from '{2}' in method '{3}'. |
-50 | [CA3005](https://docs.microsoft.com/visualstudio/code-quality/ca3005-review-code-for-ldap-injection-vulnerabilities) | Review code for LDAP injection vulnerabilities | Security | False | False | Potential LDAP injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
-51 | [CA3006](https://docs.microsoft.com/visualstudio/code-quality/ca3006-review-code-for-process-command-injection-vulnerabilities) | Review code for process command injection vulnerabilities | Security | False | False | Potential process command injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
-52 | [CA3007](https://docs.microsoft.com/visualstudio/code-quality/ca3007-review-code-for-open-redirect-vulnerabilities) | Review code for open redirect vulnerabilities | Security | False | False | Potential open redirect vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
-53 | [CA3008](https://docs.microsoft.com/visualstudio/code-quality/ca3008-review-code-for-xpath-injection-vulnerabilities) | Review code for XPath injection vulnerabilities | Security | False | False | Potential XPath injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
-54 | [CA3009](https://docs.microsoft.com/visualstudio/code-quality/ca3009-review-code-for-xml-injection-vulnerabilities) | Review code for XML injection vulnerabilities | Security | False | False | Potential XML injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
-55 | [CA3010](https://docs.microsoft.com/visualstudio/code-quality/ca3010-review-code-for-xaml-injection-vulnerabilities) | Review code for XAML injection vulnerabilities | Security | False | False | Potential XAML injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
-56 | [CA3011](https://docs.microsoft.com/visualstudio/code-quality/ca3011-review-code-for-dll-injection-vulnerabilities) | Review code for DLL injection vulnerabilities | Security | False | False | Potential DLL injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
-57 | [CA3012](https://docs.microsoft.com/visualstudio/code-quality/ca3012-review-code-for-regex-injection-vulnerabilities) | Review code for regex injection vulnerabilities | Security | False | False | Potential regex injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
-58 | CA3061 | Do Not Add Schema By URL | Security | True | False | This overload of XmlSchemaCollection.Add method internally enables DTD processing on the XML reader instance used, and uses UrlResolver for resolving external XML entities. The outcome is information disclosure. Content from file system or network shares for the machine processing the XML can be exposed to attacker. In addition, an attacker can use this as a DoS vector. |
-59 | [CA5350](https://docs.microsoft.com/visualstudio/code-quality/ca5350-do-not-use-weak-cryptographic-algorithms) | Do Not Use Weak Cryptographic Algorithms | Security | True | False | Cryptographic algorithms degrade over time as attacks become for advances to attacker get access to more computation. Depending on the type and application of this cryptographic algorithm, further degradation of the cryptographic strength of it may allow attackers to read enciphered messages, tamper with enciphered  messages, forge digital signatures, tamper with hashed content, or otherwise compromise any cryptosystem based on this algorithm. Replace encryption uses with the AES algorithm (AES-256, AES-192 and AES-128 are acceptable) with a key length greater than or equal to 128 bits. Replace hashing uses with a hashing function in the SHA-2 family, such as SHA-2 512, SHA-2 384, or SHA-2 256. |
-60 | [CA5351](https://docs.microsoft.com/visualstudio/code-quality/ca5351-do-not-use-broken-cryptographic-algorithms) | Do Not Use Broken Cryptographic Algorithms | Security | True | False | An attack making it computationally feasible to break this algorithm exists. This allows attackers to break the cryptographic guarantees it is designed to provide. Depending on the type and application of this cryptographic algorithm, this may allow attackers to read enciphered messages, tamper with enciphered  messages, forge digital signatures, tamper with hashed content, or otherwise compromise any cryptosystem based on this algorithm. Replace encryption uses with the AES algorithm (AES-256, AES-192 and AES-128 are acceptable) with a key length greater than or equal to 128 bits. Replace hashing uses with a hashing function in the SHA-2 family, such as SHA512, SHA384, or SHA256. Replace digital signature uses with RSA with a key length greater than or equal to 2048-bits, or ECDSA with a key length greater than or equal to 256 bits. |
-61 | CA5358 | Do Not Use Unsafe Cipher Modes | Security | False | False | These modes are vulnerable to attacks. Use only approved modes (CBC, CTS). |
-62 | CA5359 | Do Not Disable Certificate Validation | Security | True | False | A certificate can help authenticate the identity of the server. Clients should validate the server certificate to ensure requests are sent to the intended server. If the ServerCertificateValidationCallback always returns 'true', any certificate will pass validation. |
-63 | CA5360 | Do Not Call Dangerous Methods In Deserialization | Security | True | False | Insecure Deserialization is a vulnerability which occurs when untrusted data is used to abuse the logic of an application, inflict a Denial-of-Service (DoS) attack, or even execute arbitrary code upon it being deserialized. It’s frequently possible for malicious users to abuse these deserialization features when the application is deserializing untrusted data which is under their control. Specifically, invoke dangerous methods in the process of deserialization. Successful insecure deserialization attacks could allow an attacker to carry out attacks such as DoS attacks, authentication bypasses, and remote code execution. |
-64 | [CA5361](https://docs.microsoft.com/visualstudio/code-quality/ca5361) | Do Not Disable SChannel Use of Strong Crypto | Security | True | False | Starting with the .NET Framework 4.6, the System.Net.ServicePointManager and System.Net.Security.SslStream classes are recommeded to use new protocols. The old ones have protocol weaknesses and are not supported. Setting Switch.System.Net.DontEnableSchUseStrongCrypto with true will use the old weak crypto check and opt out of the protocol migration. |
-65 | CA5362 | Do Not Refer Self In Serializable Class | Security | False | False | This can allow an attacker to DOS or exhaust the memory of the process. |
-66 | CA5363 | Do Not Disable Request Validation | Security | True | False | Request validation is a feature in ASP.NET that examines HTTP requests and determines whether they contain potentially dangerous content. This check adds protection from markup or code in the URL query string, cookies, or posted form values that might have been added for malicious purposes. So, it is generally desirable and should be left enabled for defense in depth. |
-67 | [CA5364](https://docs.microsoft.com/visualstudio/code-quality/ca5364) | Do Not Use Deprecated Security Protocols | Security | True | False | Using a deprecated security protocol rather than the system default is risky. |
-68 | CA5365 | Do Not Disable HTTP Header Checking | Security | True | False | HTTP header checking enables encoding of the carriage return and newline characters, \r and \n, that are found in response headers. This encoding can help to avoid injection attacks that exploit an application that echoes untrusted data contained by the header. |
-69 | CA5366 | Use XmlReader For DataSet Read Xml | Security | True | False | Processing XML from untrusted data may load dangerous external references, which should be restricted by using an XmlReader with a secure resolver or with DTD processing disabled. |
-70 | CA5367 | Do Not Serialize Types With Pointer Fields | Security | False | False | Pointers are not "type safe" in the sense that you cannot guarantee the correctness of the memory they point at. So, serializing types with pointer fields is dangerous, as it may allow an attacker to control the pointer. |
-71 | CA5368 | Set ViewStateUserKey For Classes Derived From Page | Security | True | False | Setting the ViewStateUserKey property can help you prevent attacks on your application by allowing you to assign an identifier to the view-state variable for individual users so that they cannot use the variable to generate an attack. Otherwise, there will be cross-site request forgery vulnerabilities. |
-72 | CA5369 | Use XmlReader For Deserialize | Security | True | False | Processing XML from untrusted data may load dangerous external references, which should be restricted by using an XmlReader with a secure resolver or with DTD processing disabled. |
-73 | CA5370 | Use XmlReader For Validating Reader | Security | True | False | Processing XML from untrusted data may load dangerous external references, which should be restricted by using an XmlReader with a secure resolver or with DTD processing disabled. |
-74 | CA5371 | Use XmlReader For Schema Read | Security | True | False | Processing XML from untrusted data may load dangerous external references, which should be restricted by using an XmlReader with a secure resolver or with DTD processing disabled. |
-75 | CA5372 | Use XmlReader For XPathDocument | Security | True | False | Processing XML from untrusted data may load dangerous external references, which should be restricted by using an XmlReader with a secure resolver or with DTD processing disabled. |
-76 | CA5373 | Do not use obsolete key derivation function | Security | True | False | Password-based key derivation should use PBKDF2 with SHA-2. Avoid using PasswordDeriveBytes since it generates a PBKDF1 key. Avoid using Rfc2898DeriveBytes.CryptDeriveKey since it doesn't use the iteration count or salt. |
-77 | CA5374 | Do Not Use XslTransform | Security | True | False | Do not use XslTransform. It does not restrict potentially dangerous external references. |
-78 | CA5375 | Do Not Use Account Shared Access Signature | Security | False | False | Shared Access Signatures(SAS) are a vital part of the security model for any application using Azure Storage, they should provide limited and safe permissions to your storage account to clients that don't have the account key. All of the operations available via a service SAS are also available via an account SAS, that is, account SAS is too powerful. So it is recommended to use Service SAS to delegate access more carefully. |
-79 | CA5376 | Use SharedAccessProtocol HttpsOnly | Security | True | False | HTTPS encrypts network traffic. Use HttpsOnly, rather than HttpOrHttps, to ensure network traffic is always encrypted to help prevent disclosure of sensitive data. |
-80 | CA5377 | Use Container Level Access Policy | Security | True | False | No access policy identifier is specified, making tokens non-revocable. |
-81 | [CA5378](https://docs.microsoft.com/visualstudio/code-quality/ca5378) | Do not disable ServicePointManagerSecurityProtocols | Security | True | False | Do not set Switch.System.ServiceModel.DisableUsingServicePointManagerSecurityProtocols to true.  Setting this switch limits Windows Communication Framework (WCF) to using Transport Layer Security (TLS) 1.0, which is insecure and obsolete. |
-82 | CA5379 | Do Not Use Weak Key Derivation Function Algorithm | Security | True | False | Some implementations of the Rfc2898DeriveBytes class allow for a hash algorithm to be specified in a constructor parameter or overwritten in the HashAlgorithm property. If a hash algorithm is specified, then it should be SHA-256 or higher. |
-83 | CA5380 | Do Not Add Certificates To Root Store | Security | True | False | By default, the Trusted Root Certification Authorities certificate store is configured with a set of public CAs that has met the requirements of the Microsoft Root Certificate Program. Since all trusted root CAs can issue certificates for any domain, an attacker can pick a weak or coercible CA that you install by yourself to target for an attack – and a single vulnerable, malicious or coercible CA undermines the security of the entire system. To make matters worse, these attacks can go unnoticed quite easily. |
-84 | CA5381 | Ensure Certificates Are Not Added To Root Store | Security | True | False | By default, the Trusted Root Certification Authorities certificate store is configured with a set of public CAs that has met the requirements of the Microsoft Root Certificate Program. Since all trusted root CAs can issue certificates for any domain, an attacker can pick a weak or coercible CA that you install by yourself to target for an attack – and a single vulnerable, malicious or coercible CA undermines the security of the entire system. To make matters worse, these attacks can go unnoticed quite easily. |
-85 | CA5382 | Use Secure Cookies In ASP.Net Core | Security | False | False | Applications available over HTTPS must use secure cookies. |
-86 | CA5383 | Ensure Use Secure Cookies In ASP.Net Core | Security | False | False | Applications available over HTTPS must use secure cookies. |
-87 | CA5384 | Do Not Use Digital Signature Algorithm (DSA) | Security | True | False | DSA is too weak to use. |
-88 | CA5385 | Use Rivest–Shamir–Adleman (RSA) Algorithm With Sufficient Key Size | Security | True | False | Encryption algorithms are vulnerable to brute force attacks when too small a key size is used. |
-89 | [CA5386](https://docs.microsoft.com/visualstudio/code-quality/ca5386) | Avoid hardcoding SecurityProtocolType value | Security | False | False | Avoid hardcoding SecurityProtocolType {0}, and instead use SecurityProtocolType.SystemDefault to allow the operating system to choose the best Transport Layer Security protocol to use. |
-90 | CA5387 | Do Not Use Weak Key Derivation Function With Insufficient Iteration Count | Security | False | False | When deriving cryptographic keys from user-provided inputs such as password, use sufficient iteration count (at least 100k). |
-91 | CA5388 | Ensure Sufficient Iteration Count When Using Weak Key Derivation Function | Security | False | False | When deriving cryptographic keys from user-provided inputs such as password, use sufficient iteration count (at least 100k). |
-92 | CA5389 | Do Not Add Archive Item's Path To The Target File System Path | Security | True | False | When extracting files from an archive and using the archive item's path, check if the path is safe. Archive path can be relative and can lead to file system access outside of the expected file system target path, leading to malicious config changes and remote code execution via lay-and-wait technique. |
-93 | CA5390 | Do Not Hard Code Encryption Key | Security | True | False | SymmetricAlgorithm's .Key property, or a method's rgbKey parameter, should never be a hardcoded value. |
+46 | CA2329 | Do not deserialize with JsonSerializer using an insecure configuration | Security | False | False | When deserializing untrusted input, allowing arbitrary types to be deserialized is insecure. When using deserializing JsonSerializer, use TypeNameHandling.None, or for values other than None, restrict deserialized types with a SerializationBinder. |
+47 | CA2330 | Ensure that JsonSerializer has a secure configuration when deserializing | Security | False | False | When deserializing untrusted input, allowing arbitrary types to be deserialized is insecure. When using deserializing JsonSerializer, use TypeNameHandling.None, or for values other than None, restrict deserialized types with a SerializationBinder. |
+48 | [CA3001](https://docs.microsoft.com/visualstudio/code-quality/ca3001-review-code-for-sql-injection-vulnerabilities) | Review code for SQL injection vulnerabilities | Security | False | False | Potential SQL injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
+49 | [CA3002](https://docs.microsoft.com/visualstudio/code-quality/ca3002-review-code-for-xss-vulnerabilities) | Review code for XSS vulnerabilities | Security | False | False | Potential cross-site scripting (XSS) vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
+50 | [CA3003](https://docs.microsoft.com/visualstudio/code-quality/ca3003-review-code-for-file-path-injection-vulnerabilities) | Review code for file path injection vulnerabilities | Security | False | False | Potential file path injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
+51 | [CA3004](https://docs.microsoft.com/visualstudio/code-quality/ca3004-review-code-for-information-disclosure-vulnerabilities) | Review code for information disclosure vulnerabilities | Security | False | False | Potential information disclosure vulnerability was found where '{0}' in method '{1}' may contain unintended information from '{2}' in method '{3}'. |
+52 | [CA3005](https://docs.microsoft.com/visualstudio/code-quality/ca3005-review-code-for-ldap-injection-vulnerabilities) | Review code for LDAP injection vulnerabilities | Security | False | False | Potential LDAP injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
+53 | [CA3006](https://docs.microsoft.com/visualstudio/code-quality/ca3006-review-code-for-process-command-injection-vulnerabilities) | Review code for process command injection vulnerabilities | Security | False | False | Potential process command injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
+54 | [CA3007](https://docs.microsoft.com/visualstudio/code-quality/ca3007-review-code-for-open-redirect-vulnerabilities) | Review code for open redirect vulnerabilities | Security | False | False | Potential open redirect vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
+55 | [CA3008](https://docs.microsoft.com/visualstudio/code-quality/ca3008-review-code-for-xpath-injection-vulnerabilities) | Review code for XPath injection vulnerabilities | Security | False | False | Potential XPath injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
+56 | [CA3009](https://docs.microsoft.com/visualstudio/code-quality/ca3009-review-code-for-xml-injection-vulnerabilities) | Review code for XML injection vulnerabilities | Security | False | False | Potential XML injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
+57 | [CA3010](https://docs.microsoft.com/visualstudio/code-quality/ca3010-review-code-for-xaml-injection-vulnerabilities) | Review code for XAML injection vulnerabilities | Security | False | False | Potential XAML injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
+58 | [CA3011](https://docs.microsoft.com/visualstudio/code-quality/ca3011-review-code-for-dll-injection-vulnerabilities) | Review code for DLL injection vulnerabilities | Security | False | False | Potential DLL injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
+59 | [CA3012](https://docs.microsoft.com/visualstudio/code-quality/ca3012-review-code-for-regex-injection-vulnerabilities) | Review code for regex injection vulnerabilities | Security | False | False | Potential regex injection vulnerability was found where '{0}' in method '{1}' may be tainted by user-controlled data from '{2}' in method '{3}'. |
+60 | CA3061 | Do Not Add Schema By URL | Security | True | False | This overload of XmlSchemaCollection.Add method internally enables DTD processing on the XML reader instance used, and uses UrlResolver for resolving external XML entities. The outcome is information disclosure. Content from file system or network shares for the machine processing the XML can be exposed to attacker. In addition, an attacker can use this as a DoS vector. |
+61 | [CA5350](https://docs.microsoft.com/visualstudio/code-quality/ca5350-do-not-use-weak-cryptographic-algorithms) | Do Not Use Weak Cryptographic Algorithms | Security | True | False | Cryptographic algorithms degrade over time as attacks become for advances to attacker get access to more computation. Depending on the type and application of this cryptographic algorithm, further degradation of the cryptographic strength of it may allow attackers to read enciphered messages, tamper with enciphered  messages, forge digital signatures, tamper with hashed content, or otherwise compromise any cryptosystem based on this algorithm. Replace encryption uses with the AES algorithm (AES-256, AES-192 and AES-128 are acceptable) with a key length greater than or equal to 128 bits. Replace hashing uses with a hashing function in the SHA-2 family, such as SHA-2 512, SHA-2 384, or SHA-2 256. |
+62 | [CA5351](https://docs.microsoft.com/visualstudio/code-quality/ca5351-do-not-use-broken-cryptographic-algorithms) | Do Not Use Broken Cryptographic Algorithms | Security | True | False | An attack making it computationally feasible to break this algorithm exists. This allows attackers to break the cryptographic guarantees it is designed to provide. Depending on the type and application of this cryptographic algorithm, this may allow attackers to read enciphered messages, tamper with enciphered  messages, forge digital signatures, tamper with hashed content, or otherwise compromise any cryptosystem based on this algorithm. Replace encryption uses with the AES algorithm (AES-256, AES-192 and AES-128 are acceptable) with a key length greater than or equal to 128 bits. Replace hashing uses with a hashing function in the SHA-2 family, such as SHA512, SHA384, or SHA256. Replace digital signature uses with RSA with a key length greater than or equal to 2048-bits, or ECDSA with a key length greater than or equal to 256 bits. |
+63 | CA5358 | Do Not Use Unsafe Cipher Modes | Security | False | False | These modes are vulnerable to attacks. Use only approved modes (CBC, CTS). |
+64 | CA5359 | Do Not Disable Certificate Validation | Security | True | False | A certificate can help authenticate the identity of the server. Clients should validate the server certificate to ensure requests are sent to the intended server. If the ServerCertificateValidationCallback always returns 'true', any certificate will pass validation. |
+65 | CA5360 | Do Not Call Dangerous Methods In Deserialization | Security | True | False | Insecure Deserialization is a vulnerability which occurs when untrusted data is used to abuse the logic of an application, inflict a Denial-of-Service (DoS) attack, or even execute arbitrary code upon it being deserialized. It’s frequently possible for malicious users to abuse these deserialization features when the application is deserializing untrusted data which is under their control. Specifically, invoke dangerous methods in the process of deserialization. Successful insecure deserialization attacks could allow an attacker to carry out attacks such as DoS attacks, authentication bypasses, and remote code execution. |
+66 | [CA5361](https://docs.microsoft.com/visualstudio/code-quality/ca5361) | Do Not Disable SChannel Use of Strong Crypto | Security | True | False | Starting with the .NET Framework 4.6, the System.Net.ServicePointManager and System.Net.Security.SslStream classes are recommeded to use new protocols. The old ones have protocol weaknesses and are not supported. Setting Switch.System.Net.DontEnableSchUseStrongCrypto with true will use the old weak crypto check and opt out of the protocol migration. |
+67 | CA5362 | Do Not Refer Self In Serializable Class | Security | False | False | This can allow an attacker to DOS or exhaust the memory of the process. |
+68 | CA5363 | Do Not Disable Request Validation | Security | True | False | Request validation is a feature in ASP.NET that examines HTTP requests and determines whether they contain potentially dangerous content. This check adds protection from markup or code in the URL query string, cookies, or posted form values that might have been added for malicious purposes. So, it is generally desirable and should be left enabled for defense in depth. |
+69 | [CA5364](https://docs.microsoft.com/visualstudio/code-quality/ca5364) | Do Not Use Deprecated Security Protocols | Security | True | False | Using a deprecated security protocol rather than the system default is risky. |
+70 | CA5365 | Do Not Disable HTTP Header Checking | Security | True | False | HTTP header checking enables encoding of the carriage return and newline characters, \r and \n, that are found in response headers. This encoding can help to avoid injection attacks that exploit an application that echoes untrusted data contained by the header. |
+71 | CA5366 | Use XmlReader For DataSet Read Xml | Security | True | False | Processing XML from untrusted data may load dangerous external references, which should be restricted by using an XmlReader with a secure resolver or with DTD processing disabled. |
+72 | CA5367 | Do Not Serialize Types With Pointer Fields | Security | False | False | Pointers are not "type safe" in the sense that you cannot guarantee the correctness of the memory they point at. So, serializing types with pointer fields is dangerous, as it may allow an attacker to control the pointer. |
+73 | CA5368 | Set ViewStateUserKey For Classes Derived From Page | Security | True | False | Setting the ViewStateUserKey property can help you prevent attacks on your application by allowing you to assign an identifier to the view-state variable for individual users so that they cannot use the variable to generate an attack. Otherwise, there will be cross-site request forgery vulnerabilities. |
+74 | CA5369 | Use XmlReader For Deserialize | Security | True | False | Processing XML from untrusted data may load dangerous external references, which should be restricted by using an XmlReader with a secure resolver or with DTD processing disabled. |
+75 | CA5370 | Use XmlReader For Validating Reader | Security | True | False | Processing XML from untrusted data may load dangerous external references, which should be restricted by using an XmlReader with a secure resolver or with DTD processing disabled. |
+76 | CA5371 | Use XmlReader For Schema Read | Security | True | False | Processing XML from untrusted data may load dangerous external references, which should be restricted by using an XmlReader with a secure resolver or with DTD processing disabled. |
+77 | CA5372 | Use XmlReader For XPathDocument | Security | True | False | Processing XML from untrusted data may load dangerous external references, which should be restricted by using an XmlReader with a secure resolver or with DTD processing disabled. |
+78 | CA5373 | Do not use obsolete key derivation function | Security | True | False | Password-based key derivation should use PBKDF2 with SHA-2. Avoid using PasswordDeriveBytes since it generates a PBKDF1 key. Avoid using Rfc2898DeriveBytes.CryptDeriveKey since it doesn't use the iteration count or salt. |
+79 | CA5374 | Do Not Use XslTransform | Security | True | False | Do not use XslTransform. It does not restrict potentially dangerous external references. |
+80 | CA5375 | Do Not Use Account Shared Access Signature | Security | False | False | Shared Access Signatures(SAS) are a vital part of the security model for any application using Azure Storage, they should provide limited and safe permissions to your storage account to clients that don't have the account key. All of the operations available via a service SAS are also available via an account SAS, that is, account SAS is too powerful. So it is recommended to use Service SAS to delegate access more carefully. |
+81 | CA5376 | Use SharedAccessProtocol HttpsOnly | Security | True | False | HTTPS encrypts network traffic. Use HttpsOnly, rather than HttpOrHttps, to ensure network traffic is always encrypted to help prevent disclosure of sensitive data. |
+82 | CA5377 | Use Container Level Access Policy | Security | True | False | No access policy identifier is specified, making tokens non-revocable. |
+83 | [CA5378](https://docs.microsoft.com/visualstudio/code-quality/ca5378) | Do not disable ServicePointManagerSecurityProtocols | Security | True | False | Do not set Switch.System.ServiceModel.DisableUsingServicePointManagerSecurityProtocols to true.  Setting this switch limits Windows Communication Framework (WCF) to using Transport Layer Security (TLS) 1.0, which is insecure and obsolete. |
+84 | CA5379 | Do Not Use Weak Key Derivation Function Algorithm | Security | True | False | Some implementations of the Rfc2898DeriveBytes class allow for a hash algorithm to be specified in a constructor parameter or overwritten in the HashAlgorithm property. If a hash algorithm is specified, then it should be SHA-256 or higher. |
+85 | CA5380 | Do Not Add Certificates To Root Store | Security | True | False | By default, the Trusted Root Certification Authorities certificate store is configured with a set of public CAs that has met the requirements of the Microsoft Root Certificate Program. Since all trusted root CAs can issue certificates for any domain, an attacker can pick a weak or coercible CA that you install by yourself to target for an attack – and a single vulnerable, malicious or coercible CA undermines the security of the entire system. To make matters worse, these attacks can go unnoticed quite easily. |
+86 | CA5381 | Ensure Certificates Are Not Added To Root Store | Security | True | False | By default, the Trusted Root Certification Authorities certificate store is configured with a set of public CAs that has met the requirements of the Microsoft Root Certificate Program. Since all trusted root CAs can issue certificates for any domain, an attacker can pick a weak or coercible CA that you install by yourself to target for an attack – and a single vulnerable, malicious or coercible CA undermines the security of the entire system. To make matters worse, these attacks can go unnoticed quite easily. |
+87 | CA5382 | Use Secure Cookies In ASP.Net Core | Security | False | False | Applications available over HTTPS must use secure cookies. |
+88 | CA5383 | Ensure Use Secure Cookies In ASP.Net Core | Security | False | False | Applications available over HTTPS must use secure cookies. |
+89 | CA5384 | Do Not Use Digital Signature Algorithm (DSA) | Security | True | False | DSA is too weak to use. |
+90 | CA5385 | Use Rivest–Shamir–Adleman (RSA) Algorithm With Sufficient Key Size | Security | True | False | Encryption algorithms are vulnerable to brute force attacks when too small a key size is used. |
+91 | [CA5386](https://docs.microsoft.com/visualstudio/code-quality/ca5386) | Avoid hardcoding SecurityProtocolType value | Security | False | False | Avoid hardcoding SecurityProtocolType {0}, and instead use SecurityProtocolType.SystemDefault to allow the operating system to choose the best Transport Layer Security protocol to use. |
+92 | CA5387 | Do Not Use Weak Key Derivation Function With Insufficient Iteration Count | Security | False | False | When deriving cryptographic keys from user-provided inputs such as password, use sufficient iteration count (at least 100k). |
+93 | CA5388 | Ensure Sufficient Iteration Count When Using Weak Key Derivation Function | Security | False | False | When deriving cryptographic keys from user-provided inputs such as password, use sufficient iteration count (at least 100k). |
+94 | CA5389 | Do Not Add Archive Item's Path To The Target File System Path | Security | True | False | When extracting files from an archive and using the archive item's path, check if the path is safe. Archive path can be relative and can lead to file system access outside of the expected file system target path, leading to malicious config changes and remote code execution via lay-and-wait technique. |
+95 | CA5390 | Do Not Hard Code Encryption Key | Security | True | False | SymmetricAlgorithm's .Key property, or a method's rgbKey parameter, should never be a hardcoded value. |
diff --git a/src/Microsoft.NetCore.Analyzers/Microsoft.NetCore.Analyzers.sarif b/src/Microsoft.NetCore.Analyzers/Microsoft.NetCore.Analyzers.sarif
index 59c48d52be..deef38d607 100644
--- a/src/Microsoft.NetCore.Analyzers/Microsoft.NetCore.Analyzers.sarif
+++ b/src/Microsoft.NetCore.Analyzers/Microsoft.NetCore.Analyzers.sarif
@@ -5,7 +5,7 @@
     {
       "tool": {
         "name": "Microsoft.NetCore.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -744,6 +744,44 @@
             ]
           }
         },
+        "CA2329": {
+          "id": "CA2329",
+          "shortDescription": "Do not deserialize with JsonSerializer using an insecure configuration",
+          "fullDescription": "When deserializing untrusted input, allowing arbitrary types to be deserialized is insecure. When using deserializing JsonSerializer, use TypeNameHandling.None, or for values other than None, restrict deserialized types with a SerializationBinder.",
+          "defaultLevel": "warning",
+          "properties": {
+            "category": "Security",
+            "isEnabledByDefault": false,
+            "typeName": "DoNotUseInsecureDeserializerJsonNetWithoutBinder",
+            "languages": [
+              "C#",
+              "Visual Basic"
+            ],
+            "tags": [
+              "Dataflow",
+              "Telemetry"
+            ]
+          }
+        },
+        "CA2330": {
+          "id": "CA2330",
+          "shortDescription": "Ensure that JsonSerializer has a secure configuration when deserializing",
+          "fullDescription": "When deserializing untrusted input, allowing arbitrary types to be deserialized is insecure. When using deserializing JsonSerializer, use TypeNameHandling.None, or for values other than None, restrict deserialized types with a SerializationBinder.",
+          "defaultLevel": "warning",
+          "properties": {
+            "category": "Security",
+            "isEnabledByDefault": false,
+            "typeName": "DoNotUseInsecureDeserializerJsonNetWithoutBinder",
+            "languages": [
+              "C#",
+              "Visual Basic"
+            ],
+            "tags": [
+              "Dataflow",
+              "Telemetry"
+            ]
+          }
+        },
         "CA3001": {
           "id": "CA3001",
           "shortDescription": "Review code for SQL injection vulnerabilities",
@@ -1607,7 +1645,7 @@
     {
       "tool": {
         "name": "Microsoft.NetCore.CSharp.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -1742,7 +1780,7 @@
     {
       "tool": {
         "name": "Microsoft.NetCore.VisualBasic.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
diff --git a/src/Microsoft.NetCore.Analyzers/UnitTests/Security/DoNotHardCodeEncryptionKeyTests.cs b/src/Microsoft.NetCore.Analyzers/UnitTests/Security/DoNotHardCodeEncryptionKeyTests.cs
index ae3bba6ad8..e0e47617ef 100644
--- a/src/Microsoft.NetCore.Analyzers/UnitTests/Security/DoNotHardCodeEncryptionKeyTests.cs
+++ b/src/Microsoft.NetCore.Analyzers/UnitTests/Security/DoNotHardCodeEncryptionKeyTests.cs
@@ -2,6 +2,7 @@
 
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
+using Test.Utilities;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -390,6 +391,23 @@ public void TestMethod(byte[] someOtherBytesForIV)
 }");
         }
 
+        [Fact, WorkItem(2723, "https://github.com/dotnet/roslyn-analyzers/issues/2723")]
+        public void Test_ArrayInitializerInAttribute()
+        {
+            VerifyCSharpWithDependencies(@"
+using System;
+
+class MyAttr : Attribute
+{
+    public MyAttr (byte[] array) { }
+}
+
+[MyAttr(new byte[]{ 1 })]
+class C
+{
+}");
+        }
+
         protected override DiagnosticAnalyzer GetBasicDiagnosticAnalyzer()
         {
             return new DoNotHardCodeEncryptionKey();
diff --git a/src/Microsoft.NetFramework.Analyzers/Core/MarkVerbHandlersWithValidateAntiforgeryTokenAnalyzer.cs b/src/Microsoft.NetFramework.Analyzers/Core/MarkVerbHandlersWithValidateAntiforgeryTokenAnalyzer.cs
index f3234d7fd0..74d35bf135 100644
--- a/src/Microsoft.NetFramework.Analyzers/Core/MarkVerbHandlersWithValidateAntiforgeryTokenAnalyzer.cs
+++ b/src/Microsoft.NetFramework.Analyzers/Core/MarkVerbHandlersWithValidateAntiforgeryTokenAnalyzer.cs
@@ -5,6 +5,7 @@
 using Analyzer.Utilities.Extensions;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow;
 
 namespace Microsoft.NetFramework.Analyzers
 {
@@ -99,6 +100,7 @@ public override void Initialize(AnalysisContext analysisContext)
             analysisContext.RegisterCompilationStartAction(
                 (CompilationStartAnalysisContext compilationStartContext) =>
                 {
+                    WellKnownTypeProvider wellKnownTypeProvider = WellKnownTypeProvider.GetOrCreate(compilationStartContext.Compilation);
                     INamedTypeSymbol mvcControllerSymbol = WellKnownTypes.MvcController(compilationStartContext.Compilation);
                     INamedTypeSymbol mvcControllerBaseSymbol = WellKnownTypes.MvcControllerBase(compilationStartContext.Compilation);
                     INamedTypeSymbol actionResultSymbol = WellKnownTypes.ActionResult(compilationStartContext.Compilation);
@@ -114,12 +116,16 @@ public override void Initialize(AnalysisContext analysisContext)
                     compilationStartContext.RegisterSymbolAction(
                         (SymbolAnalysisContext symbolContext) =>
                         {
-                            // TODO enhancements: Consider looking at non-ActionResult-derived return types as well.
+                            // TODO enhancements: Consider looking at IAsyncResult-based action methods.
                             if (!(symbolContext.Symbol is IMethodSymbol methodSymbol)
                                 || methodSymbol.MethodKind != MethodKind.Ordinary
                                 || methodSymbol.IsStatic
                                 || !methodSymbol.IsPublic()
-                                || !methodSymbol.ReturnType.Inherits(actionResultSymbol)  // FxCop implementation only looks at ActionResult-derived return types.
+                                || !(methodSymbol.ReturnType.Inherits(actionResultSymbol)  // FxCop implementation only looked at ActionResult-derived return types.
+                                     || (methodSymbol.IsAsync
+                                         && wellKnownTypeProvider.IsTaskOfType(
+                                             methodSymbol.ReturnType,
+                                             (ITypeSymbol typeArgument) => typeArgument.Inherits(actionResultSymbol))))
                                 || (!methodSymbol.ContainingType.Inherits(mvcControllerSymbol)
                                     && !methodSymbol.ContainingType.Inherits(mvcControllerBaseSymbol)))
                             {
diff --git a/src/Microsoft.NetFramework.Analyzers/Microsoft.NetFramework.Analyzers.sarif b/src/Microsoft.NetFramework.Analyzers/Microsoft.NetFramework.Analyzers.sarif
index 01145b55f4..f4b4bcebab 100644
--- a/src/Microsoft.NetFramework.Analyzers/Microsoft.NetFramework.Analyzers.sarif
+++ b/src/Microsoft.NetFramework.Analyzers/Microsoft.NetFramework.Analyzers.sarif
@@ -5,7 +5,7 @@
     {
       "tool": {
         "name": "Microsoft.NetFramework.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -88,7 +88,7 @@
     {
       "tool": {
         "name": "Microsoft.NetFramework.CSharp.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -133,7 +133,7 @@
     {
       "tool": {
         "name": "Microsoft.NetFramework.VisualBasic.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
diff --git a/src/Microsoft.NetFramework.Analyzers/UnitTests/Security/MarkVerbHandlersWithValidateAntiforgeryTokenTests.cs b/src/Microsoft.NetFramework.Analyzers/UnitTests/Security/MarkVerbHandlersWithValidateAntiforgeryTokenTests.cs
index c9f9db1797..ed43a39ccb 100644
--- a/src/Microsoft.NetFramework.Analyzers/UnitTests/Security/MarkVerbHandlersWithValidateAntiforgeryTokenTests.cs
+++ b/src/Microsoft.NetFramework.Analyzers/UnitTests/Security/MarkVerbHandlersWithValidateAntiforgeryTokenTests.cs
@@ -786,6 +786,71 @@ public ActionResult Help(int topicId)
             );
         }
 
+        [Fact]
+        public async Task MissingVerbsAndTokenAsync_CSharp_Diagnostic()
+        {
+            await VerifyCS.VerifyAnalyzerAsync(SystemWebMvcNamespaceCSharp + @"
+namespace Blah
+{
+    using System.Threading.Tasks;
+    using System.Web.Mvc;
+
+    public class ApiController : Controller
+    {
+        public async Task<ActionResult> DoSomethingAsync(string input)
+        {
+            return null;
+        }
+    }
+}
+",
+                GetCA3147CSharpNoVerbsNoToken(SystemWebMvcNamespaceCSharpLineCount + 9, 41, "DoSomethingAsync"));
+        }
+
+        [Fact]
+        public async Task AcceptVerbsNoTokenAsync_CSharp_Diagnostic()
+        {
+            await VerifyCS.VerifyAnalyzerAsync(SystemWebMvcNamespaceCSharp + @"
+namespace Blah
+{
+    using System.Threading.Tasks;
+    using System.Web.Mvc;
+
+    public class AcceptVerbsNoTokenController : Controller
+    {
+        private const HttpVerbs AllowedVerbs = HttpVerbs.Post | HttpVerbs.Put;
 
+        [AcceptVerbs(AllowedVerbs)]
+        public async Task<ActionResult> DoSomethingAsync()
+        {
+            return null;
+        }
+    }
+}
+",
+            GetCA3147CSharpVerbsAndNoToken(SystemWebMvcNamespaceCSharpLineCount + 12, 41, "DoSomethingAsync"));
+        }
+
+        [Fact]
+        public async Task HaveAcceptStringPutAndTokenAsync_CSharp_NoDiagnostic()
+        {
+            await VerifyCS.VerifyAnalyzerAsync(SystemWebMvcNamespaceCSharp + @"
+namespace Blah
+{
+    using System.Threading.Tasks;
+    using System.Web.Mvc;
+
+    public class ApiController : Controller
+    {
+        [AcceptVerbs(""Put"")]
+        [ValidateAntiForgeryToken]
+        public async Task<ActionResult> DoSomethingAsync(string input)
+        {
+            return null;
+        }
+    }
+}"
+            );
+        }
     }
 }
diff --git a/src/PerformanceSensitiveAnalyzers/CSharp/ConcatenationAllocationAnalyzer.cs b/src/PerformanceSensitiveAnalyzers/CSharp/ConcatenationAllocationAnalyzer.cs
index 93062240b1..ed61f62941 100644
--- a/src/PerformanceSensitiveAnalyzers/CSharp/ConcatenationAllocationAnalyzer.cs
+++ b/src/PerformanceSensitiveAnalyzers/CSharp/ConcatenationAllocationAnalyzer.cs
@@ -91,18 +91,20 @@ protected override void AnalyzeNode(SyntaxNodeAnalysisContext context, in Perfor
 
         private static void CheckTypeConversion(TypeInfo typeInfo, Conversion conversionInfo, Action<Diagnostic> reportDiagnostic, Location location)
         {
-            bool IsOptimizedValueType(ITypeSymbol type)
+            if (conversionInfo.IsBoxing && !IsOptimizedValueType(typeInfo.Type))
+            {
+                reportDiagnostic(Diagnostic.Create(ValueTypeToReferenceTypeInAStringConcatenationRule, location, new[] { typeInfo.Type.ToDisplayString() }));
+            }
+
+            return;
+
+            static bool IsOptimizedValueType(ITypeSymbol type)
             {
                 return type.SpecialType == SpecialType.System_Boolean ||
                        type.SpecialType == SpecialType.System_Char ||
                        type.SpecialType == SpecialType.System_IntPtr ||
                        type.SpecialType == SpecialType.System_UIntPtr;
             }
-
-            if (conversionInfo.IsBoxing && !IsOptimizedValueType(typeInfo.Type))
-            {
-                reportDiagnostic(Diagnostic.Create(ValueTypeToReferenceTypeInAStringConcatenationRule, location, new[] { typeInfo.Type.ToDisplayString() }));
-            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/PerformanceSensitiveAnalyzers/Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers.sarif b/src/PerformanceSensitiveAnalyzers/Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers.sarif
index 2a719c26cd..62cf8f61fd 100644
--- a/src/PerformanceSensitiveAnalyzers/Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers.sarif
+++ b/src/PerformanceSensitiveAnalyzers/Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers.sarif
@@ -5,7 +5,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.CSharp.PerformanceSensitiveAnalyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -184,7 +184,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
diff --git a/src/PublicApiAnalyzers/Microsoft.CodeAnalysis.PublicApiAnalyzers.sarif b/src/PublicApiAnalyzers/Microsoft.CodeAnalysis.PublicApiAnalyzers.sarif
index 58c3312a58..523eafa901 100644
--- a/src/PublicApiAnalyzers/Microsoft.CodeAnalysis.PublicApiAnalyzers.sarif
+++ b/src/PublicApiAnalyzers/Microsoft.CodeAnalysis.PublicApiAnalyzers.sarif
@@ -5,7 +5,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.PublicApiAnalyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -147,7 +147,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.PublicApiAnalyzers.CodeFixes",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
diff --git a/src/Roslyn.Diagnostics.Analyzers/Roslyn.Diagnostics.Analyzers.sarif b/src/Roslyn.Diagnostics.Analyzers/Roslyn.Diagnostics.Analyzers.sarif
index c5d4556e22..dcd359ab5d 100644
--- a/src/Roslyn.Diagnostics.Analyzers/Roslyn.Diagnostics.Analyzers.sarif
+++ b/src/Roslyn.Diagnostics.Analyzers/Roslyn.Diagnostics.Analyzers.sarif
@@ -5,7 +5,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -14,7 +14,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.CSharp.BannedApiAnalyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -76,7 +76,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.PublicApiAnalyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -218,7 +218,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.VisualBasic.BannedApiAnalyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -280,7 +280,7 @@
     {
       "tool": {
         "name": "Roslyn.Diagnostics.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -379,7 +379,7 @@
     {
       "tool": {
         "name": "Roslyn.Diagnostics.CSharp.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
@@ -473,7 +473,7 @@
     {
       "tool": {
         "name": "Roslyn.Diagnostics.VisualBasic.Analyzers",
-        "version": "2.9.4",
+        "version": "2.9.5",
         "language": "en-US"
       },
       "rules": {
diff --git a/src/Test.Utilities/DiagnosticExtensions.cs b/src/Test.Utilities/DiagnosticExtensions.cs
index d5533e9b22..6220680658 100644
--- a/src/Test.Utilities/DiagnosticExtensions.cs
+++ b/src/Test.Utilities/DiagnosticExtensions.cs
@@ -29,8 +29,10 @@ public static class DiagnosticExtensions
 
             var diagnosticDescriptors = analyzers.SelectMany(analyzer => analyzer.SupportedDiagnostics);
             var analyzerDiagnosticIds = diagnosticDescriptors.Select(diagnosticDescriptor => diagnosticDescriptor.Id);
-            var allDiagnosticIds = new HashSet<string>(analyzerDiagnosticIds, StringComparer.Ordinal);
-            allDiagnosticIds.Add("AD0001");    // Failures caught by the Analyzer Driver.
+            var allDiagnosticIds = new HashSet<string>(analyzerDiagnosticIds, StringComparer.Ordinal)
+            {
+                "AD0001"    // Failures caught by the Analyzer Driver.
+            };
             var allDiagnostics = compilationWithAnalyzers.GetAllDiagnosticsAsync().Result;
             var resultDiagnostics = allDiagnostics.Where(diagnostic => allDiagnosticIds.Contains(diagnostic.Id));
             return resultDiagnostics.ToImmutableArray();
diff --git a/src/Tools/Program.cs b/src/Tools/Program.cs
index 9439ed1e8c..8d9e358fa6 100644
--- a/src/Tools/Program.cs
+++ b/src/Tools/Program.cs
@@ -19,22 +19,20 @@ internal sealed class Program
     {
         public static int Main(string[] args)
         {
-            using (var tokenSource = new CancellationTokenSource())
+            using var tokenSource = new CancellationTokenSource();
+            Console.CancelKeyPress += delegate
             {
-                Console.CancelKeyPress += delegate
-                {
-                    tokenSource.Cancel();
-                };
+                tokenSource.Cancel();
+            };
 
-                try
-                {
-                    return (int)RunAsync(args, tokenSource.Token).GetAwaiter().GetResult();
-                }
-                catch (OperationCanceledException)
-                {
-                    Console.WriteLine("Operation Cancelled.");
-                    return -1;
-                }
+            try
+            {
+                return (int)RunAsync(args, tokenSource.Token).GetAwaiter().GetResult();
+            }
+            catch (OperationCanceledException)
+            {
+                Console.WriteLine("Operation Cancelled.");
+                return -1;
             }
         }
 
@@ -165,7 +163,7 @@ ErrorCode parseArguments()
                 return ErrorCode.None;
             }
 
-            ErrorCode usage()
+            static ErrorCode usage()
             {
                 Console.WriteLine(@"
 Usage: Metrics.exe <arguments>
@@ -189,31 +187,31 @@ ErrorCode usage()
                 return ErrorCode.Usage;
             }
 
-            ErrorCode fileNotExists(string path)
+            static ErrorCode fileNotExists(string path)
             {
                 Console.WriteLine($"Error: File '{path}' does not exist.");
                 return ErrorCode.FileNotExists;
             }
 
-            ErrorCode requiresProjectOrSolution()
+            static ErrorCode requiresProjectOrSolution()
             {
                 Console.WriteLine($"Error: No project or solution provided.");
                 return ErrorCode.RequiresProjectOrSolution;
             }
 
-            ErrorCode notASolution(string path)
+            static ErrorCode notASolution(string path)
             {
                 Console.WriteLine($"Error: File '{path}' is not a solution file.");
                 return ErrorCode.NotASolution;
             }
 
-            ErrorCode notASupportedProject(string path)
+            static ErrorCode notASupportedProject(string path)
             {
                 Console.WriteLine($"Error: File '{path}' is not a C# or VB project file.");
                 return ErrorCode.NotASupportedProject;
             }
 
-            ErrorCode invalidOutputFile(string path)
+            static ErrorCode invalidOutputFile(string path)
             {
                 Console.WriteLine($"Error: File '{path}' is not a valid output file.");
                 return ErrorCode.InvalidOutputFile;
diff --git a/src/Utilities.UnitTests/FlowAnalysis/Analysis/PropertySetAnalysis/PropertySetAnalysisTests.cs b/src/Utilities.UnitTests/FlowAnalysis/Analysis/PropertySetAnalysis/PropertySetAnalysisTests.cs
index 6eb95e910a..d2b7f99005 100644
--- a/src/Utilities.UnitTests/FlowAnalysis/Analysis/PropertySetAnalysis/PropertySetAnalysisTests.cs
+++ b/src/Utilities.UnitTests/FlowAnalysis/Analysis/PropertySetAnalysis/PropertySetAnalysisTests.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.Diagnostics;
 using System.Linq;
 using System.Runtime.Remoting;
 using System.Threading;
@@ -68,6 +69,9 @@ public PropertySetAnalysisParameters(string typeToTrack, ConstructorMapper const
                 operation != null,
                 $"Could not find code block to analyze.  Does your test code have {StartString} and {EndString} around the braces of block to analyze?");
             ISymbol symbol = model.GetDeclaredSymbol(syntaxNode.Parent) ?? model.GetSymbolInfo(syntaxNode.Parent).Symbol;
+            var success = operation.TryGetEnclosingControlFlowGraph(out var cfg);
+            Debug.Assert(success);
+            Debug.Assert(cfg != null);
 
 #pragma warning disable CA1508 // Avoid dead conditional code - https://github.com/dotnet/roslyn-analyzers/issues/2180
             using (var cancellationSource = new CancellationTokenSource())
@@ -76,7 +80,7 @@ public PropertySetAnalysisParameters(string typeToTrack, ConstructorMapper const
                 DiagnosticDescriptor dummy = new DiagnosticDescriptor("fakeId", null, null, "fakeagory", DiagnosticSeverity.Info, true);
                 PropertySetAnalysisResult result =
                     PropertySetAnalysis.GetOrComputeResult(
-                        operation.GetEnclosingControlFlowGraph(),
+                        cfg,
                         compilation,
                         symbol,
                         new AnalyzerOptions(ImmutableArray<AdditionalText>.Empty),
@@ -146,12 +150,12 @@ public PropertySetAnalysisParameters(string typeToTrack, ConstructorMapper const
                 }
             }
 
-            string MethodSymbolOrReturnString(IMethodSymbol methodSymbol)
+            static string MethodSymbolOrReturnString(IMethodSymbol methodSymbol)
             {
                 return methodSymbol != null ? $"Method {methodSymbol.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat)}" : "Return/Initialization";
             }
 
-            string MethodOrReturnString(string method)
+            static string MethodOrReturnString(string method)
             {
                 return method != null ? $"Method {method}" : "Return/Initialization";
             }
diff --git a/src/Utilities/Compiler/CodeMetrics/CodeAnalysisMetricData.NamedTypeMetricData.cs b/src/Utilities/Compiler/CodeMetrics/CodeAnalysisMetricData.NamedTypeMetricData.cs
index 625a149707..7c7331be2c 100644
--- a/src/Utilities/Compiler/CodeMetrics/CodeAnalysisMetricData.NamedTypeMetricData.cs
+++ b/src/Utilities/Compiler/CodeMetrics/CodeAnalysisMetricData.NamedTypeMetricData.cs
@@ -98,7 +98,7 @@ ImmutableHashSet<IFieldSymbol> getFilteredFieldsForComplexity()
                             break;
                         }
 
-                        builderOpt = builderOpt ?? ImmutableHashSet.CreateBuilder<IFieldSymbol>();
+                        builderOpt ??= ImmutableHashSet.CreateBuilder<IFieldSymbol>();
                         builderOpt.Add((IFieldSymbol)fieldData.Symbol);
                         indexThreshold -= 4;
                     }
diff --git a/src/Utilities/Compiler/CodeMetrics/ComputationalComplexityMetrics.cs b/src/Utilities/Compiler/CodeMetrics/ComputationalComplexityMetrics.cs
index 18e08e7ee1..fddb8cdad3 100644
--- a/src/Utilities/Compiler/CodeMetrics/ComputationalComplexityMetrics.cs
+++ b/src/Utilities/Compiler/CodeMetrics/ComputationalComplexityMetrics.cs
@@ -112,7 +112,7 @@ public static ComputationalComplexityMetrics Compute(IOperation operationBlock)
                 if (operation.ConstantValue.HasValue)
                 {
                     constantUsageCounts++;
-                    distinctReferencedConstantsBuilder = distinctReferencedConstantsBuilder ?? ImmutableHashSet.CreateBuilder<object>();
+                    distinctReferencedConstantsBuilder ??= ImmutableHashSet.CreateBuilder<object>();
                     distinctReferencedConstantsBuilder.Add(operation.ConstantValue.Value ?? s_nullConstantPlaceholder);
                     continue;
                 }
@@ -201,7 +201,7 @@ public static ComputationalComplexityMetrics Compute(IOperation operationBlock)
                         continue;
                     case OperationKind.CaseClause:
                         var caseClauseOperation = (ICaseClauseOperation)operation;
-                        distinctCaseKindsBuilder = distinctCaseKindsBuilder ?? ImmutableHashSet.CreateBuilder<CaseKind>();
+                        distinctCaseKindsBuilder ??= ImmutableHashSet.CreateBuilder<CaseKind>();
                         distinctCaseKindsBuilder.Add(caseClauseOperation.CaseKind);
                         if (caseClauseOperation.CaseKind == CaseKind.Relational)
                         {
@@ -273,7 +273,7 @@ public static ComputationalComplexityMetrics Compute(IOperation operationBlock)
                 distinctReferencedSymbolsBuilder != null ? distinctReferencedSymbolsBuilder.ToImmutable() : ImmutableHashSet<ISymbol>.Empty,
                 distinctReferencedConstantsBuilder != null ? distinctReferencedConstantsBuilder.ToImmutable() : ImmutableHashSet<object>.Empty);
 
-            int getEffectiveLinesOfCode(IOperation operation)
+            static int getEffectiveLinesOfCode(IOperation operation)
             {
                 if (operation.Parent != null)
                 {
@@ -293,7 +293,7 @@ int getEffectiveLinesOfCode(IOperation operation)
                 return 0;
             }
 
-            bool hasAnyExplicitExpression(IOperation operation)
+            static bool hasAnyExplicitExpression(IOperation operation)
             {
                 // Check if all descendants are either implicit or are explicit with no constant value or type, indicating it is not user written code.
                 return !operation.DescendantsAndSelf().All(o => o.IsImplicit || (!o.ConstantValue.HasValue && o.Type == null));
@@ -302,28 +302,28 @@ bool hasAnyExplicitExpression(IOperation operation)
             void countOperator(IOperation operation)
             {
                 operatorUsageCounts++;
-                distinctOperatorKindsBuilder = distinctOperatorKindsBuilder ?? ImmutableHashSet.CreateBuilder<OperationKind>();
+                distinctOperatorKindsBuilder ??= ImmutableHashSet.CreateBuilder<OperationKind>();
                 distinctOperatorKindsBuilder.Add(operation.Kind);
             }
 
             void countOperand(ISymbol symbol)
             {
                 symbolUsageCounts++;
-                distinctReferencedSymbolsBuilder = distinctReferencedSymbolsBuilder ?? ImmutableHashSet.CreateBuilder<ISymbol>();
+                distinctReferencedSymbolsBuilder ??= ImmutableHashSet.CreateBuilder<ISymbol>();
                 distinctReferencedSymbolsBuilder.Add(symbol);
             }
 
             void countBinaryOperator(IOperation operation, BinaryOperatorKind operatorKind)
             {
                 countOperator(operation);
-                distinctBinaryOperatorKindsBuilder = distinctBinaryOperatorKindsBuilder ?? ImmutableHashSet.CreateBuilder<BinaryOperatorKind>();
+                distinctBinaryOperatorKindsBuilder ??= ImmutableHashSet.CreateBuilder<BinaryOperatorKind>();
                 distinctBinaryOperatorKindsBuilder.Add(operatorKind);
             }
 
             void countUnaryOperator(IOperation operation, UnaryOperatorKind operatorKind)
             {
                 countOperator(operation);
-                distinctUnaryOperatorKindsBuilder = distinctUnaryOperatorKindsBuilder ?? ImmutableHashSet.CreateBuilder<UnaryOperatorKind>();
+                distinctUnaryOperatorKindsBuilder ??= ImmutableHashSet.CreateBuilder<UnaryOperatorKind>();
                 distinctUnaryOperatorKindsBuilder.Add(operatorKind);
             }
         }
diff --git a/src/Utilities/Compiler/CodeMetrics/MetricsHelper.cs b/src/Utilities/Compiler/CodeMetrics/MetricsHelper.cs
index 71195d64bd..5278156096 100644
--- a/src/Utilities/Compiler/CodeMetrics/MetricsHelper.cs
+++ b/src/Utilities/Compiler/CodeMetrics/MetricsHelper.cs
@@ -220,8 +220,7 @@ internal static async Task<SyntaxNode> GetTopmostSyntaxNodeForDeclarationAsync(S
             }
 
             return (cyclomaticComplexity, computationalComplexityMetrics);
-
-            bool hasConditionalLogic(IOperation operation)
+            static bool hasConditionalLogic(IOperation operation)
             {
                 switch (operation.Kind)
                 {
@@ -261,7 +260,7 @@ private static void AddCoupledNamedTypesCore(ImmutableHashSet<INamedTypeSymbol>.
             }
 
             // Compat
-            bool isIgnoreableType(INamedTypeSymbol namedType)
+            static bool isIgnoreableType(INamedTypeSymbol namedType)
             {
                 switch (namedType.SpecialType)
                 {
diff --git a/src/Utilities/Compiler/DisposeMethodKind.cs b/src/Utilities/Compiler/DisposeMethodKind.cs
index 5bde133588..c534f18465 100644
--- a/src/Utilities/Compiler/DisposeMethodKind.cs
+++ b/src/Utilities/Compiler/DisposeMethodKind.cs
@@ -5,7 +5,7 @@ namespace Analyzer.Utilities
     /// <summary>
     /// Describes different kinds of Dispose-like methods.
     /// </summary>
-    public enum DisposeMethodKind
+    internal enum DisposeMethodKind
     {
         /// <summary>
         /// Not a dispose-like method.
diff --git a/src/Utilities/Compiler/Extensions/IEnumerableExtensions.cs b/src/Utilities/Compiler/Extensions/IEnumerableExtensions.cs
index 594b512158..cadf721077 100644
--- a/src/Utilities/Compiler/Extensions/IEnumerableExtensions.cs
+++ b/src/Utilities/Compiler/Extensions/IEnumerableExtensions.cs
@@ -129,18 +129,16 @@ public static bool HasExactly<TSource>(this IEnumerable<TSource> source, int cou
                 return collection.Count == count;
             }
 
-            using (var enumerator = source.GetEnumerator())
+            using var enumerator = source.GetEnumerator();
+            while (count-- > 0)
             {
-                while (count-- > 0)
+                if (!enumerator.MoveNext())
                 {
-                    if (!enumerator.MoveNext())
-                    {
-                        return false;
-                    }
+                    return false;
                 }
-
-                return !enumerator.MoveNext();
             }
+
+            return !enumerator.MoveNext();
         }
 
         /// <summary>
@@ -168,18 +166,16 @@ public static bool HasMoreThan<TSource>(this IEnumerable<TSource> source, int co
                 return collection.Count > count;
             }
 
-            using (var enumerator = source.GetEnumerator())
+            using var enumerator = source.GetEnumerator();
+            while (count-- > 0)
             {
-                while (count-- > 0)
+                if (!enumerator.MoveNext())
                 {
-                    if (!enumerator.MoveNext())
-                    {
-                        return false;
-                    }
+                    return false;
                 }
-
-                return enumerator.MoveNext();
             }
+
+            return enumerator.MoveNext();
         }
 
         /// <summary>
@@ -207,12 +203,10 @@ public static bool HasFewerThan<TSource>(this IEnumerable<TSource> source, int c
                 return collection.Count < count;
             }
 
-            using (var enumerator = source.GetEnumerator())
-            {
-                while (count > 0 && enumerator.MoveNext()) { count--; }
+            using var enumerator = source.GetEnumerator();
+            while (count > 0 && enumerator.MoveNext()) { count--; }
 
-                return count > 0;
-            }
+            return count > 0;
         }
 
         private class ComparisonComparer<T> : Comparer<T>
diff --git a/src/Utilities/Compiler/Extensions/IOperationExtensions.cs b/src/Utilities/Compiler/Extensions/IOperationExtensions.cs
index 1370153e56..7c661ba01b 100644
--- a/src/Utilities/Compiler/Extensions/IOperationExtensions.cs
+++ b/src/Utilities/Compiler/Extensions/IOperationExtensions.cs
@@ -418,11 +418,20 @@ public static IOperation GetRoot(this IOperation operation)
         private static readonly ConditionalWeakTable<Compilation, ConcurrentDictionary<IOperation, ControlFlowGraph>> s_operationToCfgCache
             = new ConditionalWeakTable<Compilation, ConcurrentDictionary<IOperation, ControlFlowGraph>>();
 
-        public static ControlFlowGraph GetEnclosingControlFlowGraph(this IOperation operation)
+        public static bool TryGetEnclosingControlFlowGraph(this IOperation operation, out ControlFlowGraph cfg)
         {
             operation = operation.GetRoot();
             var operationToCfgMap = s_operationToCfgCache.GetOrCreateValue(operation.SemanticModel.Compilation);
-            return operationToCfgMap.GetOrAdd(operation, CreateControlFlowGraph);
+            cfg = operationToCfgMap.GetOrAdd(operation, CreateControlFlowGraph);
+            return cfg != null;
+        }
+
+        public static ControlFlowGraph GetEnclosingControlFlowGraph(this IBlockOperation blockOperation)
+        {
+            var success = blockOperation.TryGetEnclosingControlFlowGraph(out var cfg);
+            Debug.Assert(success);
+            Debug.Assert(cfg != null);
+            return cfg;
         }
 
         private static ControlFlowGraph CreateControlFlowGraph(IOperation operation)
@@ -448,7 +457,11 @@ private static ControlFlowGraph CreateControlFlowGraph(IOperation operation)
                     return ControlFlowGraph.Create(parameterInitializerOperation);
 
                 default:
-                    throw new NotSupportedException($"Unexpected root operation kind: {operation.Kind.ToString()}");
+                    // Attribute blocks have OperationKind.None, but ControlFlowGraph.Create does not
+                    // have an overload for such operation roots.
+                    // Gracefully return null for this case and fire an assert for any other OperationKind.
+                    Debug.Assert(operation.Kind == OperationKind.None, $"Unexpected root operation kind: {operation.Kind.ToString()}");
+                    return null;
             }
         }
 
diff --git a/src/Utilities/Compiler/Extensions/ImmutableArrayExtensions.cs b/src/Utilities/Compiler/Extensions/ImmutableArrayExtensions.cs
index a2c3be2cda..54551e34b3 100644
--- a/src/Utilities/Compiler/Extensions/ImmutableArrayExtensions.cs
+++ b/src/Utilities/Compiler/Extensions/ImmutableArrayExtensions.cs
@@ -1,12 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace System.Collections.Immutable
 {
     internal static class ImmutableArrayExtensions
diff --git a/src/Utilities/Compiler/Extensions/OperationBlockAnalysisContextExtension.cs b/src/Utilities/Compiler/Extensions/OperationBlockAnalysisContextExtension.cs
index b5ea0b43d6..bef4f41455 100644
--- a/src/Utilities/Compiler/Extensions/OperationBlockAnalysisContextExtension.cs
+++ b/src/Utilities/Compiler/Extensions/OperationBlockAnalysisContextExtension.cs
@@ -41,7 +41,7 @@ public static bool IsMethodNotImplementedOrSupported(this OperationBlockAnalysis
 
             if (methodBlock != null)
             {
-                bool IsSingleStatementBody(IBlockOperation body)
+                static bool IsSingleStatementBody(IBlockOperation body)
                 {
                     return body.Operations.Length == 1 ||
                         (body.Operations.Length == 3 && body.Syntax.Language == LanguageNames.VisualBasic &&
diff --git a/src/Utilities/Compiler/Options/AnalyzerOptionsExtensions.cs b/src/Utilities/Compiler/Options/AnalyzerOptionsExtensions.cs
index 6120aa2f99..be72eb536c 100644
--- a/src/Utilities/Compiler/Options/AnalyzerOptionsExtensions.cs
+++ b/src/Utilities/Compiler/Options/AnalyzerOptionsExtensions.cs
@@ -59,8 +59,7 @@ internal static partial class AnalyzerOptionsExtensions
         {
             var analyzerConfigOptions = options.GetOrComputeCategorizedAnalyzerConfigOptions(cancellationToken);
             return analyzerConfigOptions.GetOptionValue(optionName, rule, TryParseValue, defaultValue);
-
-            bool TryParseValue(string value, out ImmutableHashSet<TEnum> result)
+            static bool TryParseValue(string value, out ImmutableHashSet<TEnum> result)
             {
                 var builder = ImmutableHashSet.CreateBuilder<TEnum>();
                 foreach (var kindStr in value.Split(','))
diff --git a/src/Utilities/Compiler/PooledObjects/ArrayBuilder.Enumerator.cs b/src/Utilities/Compiler/PooledObjects/ArrayBuilder.Enumerator.cs
index 688eba76cf..c828ac605c 100644
--- a/src/Utilities/Compiler/PooledObjects/ArrayBuilder.Enumerator.cs
+++ b/src/Utilities/Compiler/PooledObjects/ArrayBuilder.Enumerator.cs
@@ -6,7 +6,7 @@
 
 namespace Analyzer.Utilities.PooledObjects
 {
-    public partial class ArrayBuilder<T>
+    internal partial class ArrayBuilder<T>
     {
         /// <summary>
         /// struct enumerator used in foreach.
diff --git a/src/Utilities/Compiler/PooledObjects/ArrayBuilder.cs b/src/Utilities/Compiler/PooledObjects/ArrayBuilder.cs
index 8256a3193c..00ff1e3a50 100644
--- a/src/Utilities/Compiler/PooledObjects/ArrayBuilder.cs
+++ b/src/Utilities/Compiler/PooledObjects/ArrayBuilder.cs
@@ -12,7 +12,7 @@ namespace Analyzer.Utilities.PooledObjects
 {
     [DebuggerDisplay("Count = {Count,nq}")]
     [DebuggerTypeProxy(typeof(ArrayBuilder<>.DebuggerProxy))]
-    public sealed partial class ArrayBuilder<T> : IReadOnlyCollection<T>, IReadOnlyList<T>
+    internal sealed partial class ArrayBuilder<T> : IReadOnlyCollection<T>, IReadOnlyList<T>
     {
         #region DebuggerProxy
 #pragma warning disable CA1812 // ArrayBuilder<T>.DebuggerProxy is an internal class that is apparently never instantiated - used in DebuggerTypeProxy attribute above.
diff --git a/src/Utilities/Compiler/PooledObjects/ObjectPool.cs b/src/Utilities/Compiler/PooledObjects/ObjectPool.cs
index 94885a17f9..18fde7af5f 100644
--- a/src/Utilities/Compiler/PooledObjects/ObjectPool.cs
+++ b/src/Utilities/Compiler/PooledObjects/ObjectPool.cs
@@ -37,7 +37,7 @@ namespace Analyzer.Utilities.PooledObjects
     /// Rationale: 
     ///    If there is no intent for reusing the object, do not use pool - just use "new". 
     /// </summary>
-    public class ObjectPool<T> where T : class
+    internal class ObjectPool<T> where T : class
     {
         [DebuggerDisplay("{Value,nq}")]
 #pragma warning disable CA1815 // Override equals and operator equals on value types
diff --git a/src/Utilities/Compiler/PooledObjects/PooledHashSet.cs b/src/Utilities/Compiler/PooledObjects/PooledHashSet.cs
index c93adb8cc1..3afa30362f 100644
--- a/src/Utilities/Compiler/PooledObjects/PooledHashSet.cs
+++ b/src/Utilities/Compiler/PooledObjects/PooledHashSet.cs
@@ -12,7 +12,7 @@ namespace Analyzer.Utilities.PooledObjects
 {
     // HashSet that can be recycled via an object pool
     // NOTE: these HashSets always have the default comparer.
-    public class PooledHashSet<T> : HashSet<T>
+    internal class PooledHashSet<T> : HashSet<T>
     {
         private readonly ObjectPool<PooledHashSet<T>> _pool;
 
diff --git a/src/Utilities/Compiler/WellKnownTypeProvider.cs b/src/Utilities/Compiler/WellKnownTypeProvider.cs
index ded192a0e4..b311b9bd7c 100644
--- a/src/Utilities/Compiler/WellKnownTypeProvider.cs
+++ b/src/Utilities/Compiler/WellKnownTypeProvider.cs
@@ -135,5 +135,23 @@ private ImmutableHashSet<INamedTypeSymbol> GetWellKnownCollectionTypes()
 
             return builder.ToImmutableAndFree();
         }
+
+        /// <summary>
+        /// Determines if <paramref name="typeSymbol"/> is a <see cref="System.Threading.Tasks.Task{TResult}"/> with its type
+        /// argument satisfying <paramref name="typeArgumentPredicate"/>.
+        /// </summary>
+        /// <param name="typeSymbol">Type potentially representing a <see cref="System.Threading.Tasks.Task{TResult}"/>.</param>
+        /// <param name="typeArgumentPredicate">Predicate to check the <paramref name="typeSymbol"/>'s type argument.</param>
+        /// <returns>True if <paramref name="typeSymbol"/> is a <see cref="System.Threading.Tasks.Task{TResult}"/> with its
+        /// type argument satisfying <paramref name="typeArgumentPredicate"/>, false otherwise.</returns>
+        internal bool IsTaskOfType(ITypeSymbol typeSymbol, Func<ITypeSymbol, bool> typeArgumentPredicate)
+        {
+            return typeSymbol != null
+                && typeSymbol.OriginalDefinition != null
+                && typeSymbol.OriginalDefinition.Equals(GenericTask)
+                && typeSymbol is INamedTypeSymbol namedTypeSymbol
+                && namedTypeSymbol.TypeArguments.Length == 1
+                && typeArgumentPredicate(namedTypeSymbol.TypeArguments[0]);
+        }
     }
 }
diff --git a/src/Utilities/FlowAnalysis/Extensions/BasicBlockExtensions.cs b/src/Utilities/FlowAnalysis/Extensions/BasicBlockExtensions.cs
index c74431c9c2..02e07b2904 100644
--- a/src/Utilities/FlowAnalysis/Extensions/BasicBlockExtensions.cs
+++ b/src/Utilities/FlowAnalysis/Extensions/BasicBlockExtensions.cs
@@ -7,7 +7,7 @@
 
 namespace Microsoft.CodeAnalysis.FlowAnalysis
 {
-    public static class BasicBlockExtensions
+    internal static class BasicBlockExtensions
     {
         internal static IEnumerable<(BasicBlock predecessorBlock, BranchWithInfo branchWithInfo)> GetPredecessorsWithBranches(this BasicBlock basicBlock, ControlFlowGraph cfg)
         {
diff --git a/src/Utilities/FlowAnalysis/Extensions/ControlFlowBranchExtensions.cs b/src/Utilities/FlowAnalysis/Extensions/ControlFlowBranchExtensions.cs
index e357f163ac..17c57cb607 100644
--- a/src/Utilities/FlowAnalysis/Extensions/ControlFlowBranchExtensions.cs
+++ b/src/Utilities/FlowAnalysis/Extensions/ControlFlowBranchExtensions.cs
@@ -2,7 +2,7 @@
 
 namespace Microsoft.CodeAnalysis.FlowAnalysis
 {
-    public static class ControlFlowBranchExtensions
+    internal static class ControlFlowBranchExtensions
     {
         public static bool IsBackEdge(this ControlFlowBranch controlFlowBranch)
             => controlFlowBranch != null &&
diff --git a/src/Utilities/FlowAnalysis/Extensions/ControlFlowGraphExtensions.cs b/src/Utilities/FlowAnalysis/Extensions/ControlFlowGraphExtensions.cs
index 51dba63a78..4d37d22905 100644
--- a/src/Utilities/FlowAnalysis/Extensions/ControlFlowGraphExtensions.cs
+++ b/src/Utilities/FlowAnalysis/Extensions/ControlFlowGraphExtensions.cs
@@ -8,7 +8,7 @@
 
 namespace Microsoft.CodeAnalysis.FlowAnalysis
 {
-    public static class ControlFlowGraphExtensions
+    internal static class ControlFlowGraphExtensions
     {
         public static BasicBlock GetEntry(this ControlFlowGraph cfg) => cfg.Blocks.Single(b => b.Kind == BasicBlockKind.Entry);
         public static BasicBlock GetExit(this ControlFlowGraph cfg) => cfg.Blocks.Single(b => b.Kind == BasicBlockKind.Exit);
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/CopyAnalysis/CopyAbstractValue.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/CopyAnalysis/CopyAbstractValue.cs
index 42bd53690b..a60b2f6714 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/CopyAnalysis/CopyAbstractValue.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/CopyAnalysis/CopyAbstractValue.cs
@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Linq;
 using Analyzer.Utilities;
-using Analyzer.Utilities.PooledObjects;
 
 #pragma warning disable CA1067 // Override Object.Equals(object) when implementing IEquatable<T> - CacheBasedEquatable handles equality
 
@@ -76,10 +76,10 @@ internal CopyAbstractValue WithEntitiesRemoved(IEnumerable<AnalysisEntity> entit
         public ImmutableHashSet<AnalysisEntity> AnalysisEntities { get; }
         public CopyAbstractValueKind Kind { get; }
 
-        protected override void ComputeHashCodeParts(ArrayBuilder<int> builder)
+        protected override void ComputeHashCodeParts(Action<int> addPart)
         {
-            builder.Add(HashUtilities.Combine(AnalysisEntities));
-            builder.Add(Kind.GetHashCode());
+            addPart(HashUtilities.Combine(AnalysisEntities));
+            addPart(Kind.GetHashCode());
         }
     }
 }
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/CopyAnalysis/CopyAnalysis.CopyDataFlowOperationVisitor.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/CopyAnalysis/CopyAnalysis.CopyDataFlowOperationVisitor.cs
index 7c3d51b05e..8972279da0 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/CopyAnalysis/CopyAnalysis.CopyDataFlowOperationVisitor.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/CopyAnalysis/CopyAnalysis.CopyDataFlowOperationVisitor.cs
@@ -60,7 +60,7 @@ private void AssertValidCopyAnalysisData(CopyAnalysisData copyAnalysisData)
                 copyAnalysisData.AssertValidCopyAnalysisData(GetDefaultCopyValue);
             }
 
-            protected override void AddTrackedEntities(CopyAnalysisData analysisData, PooledHashSet<AnalysisEntity> builder, bool forInterproceduralAnalysis)
+            protected override void AddTrackedEntities(CopyAnalysisData analysisData, HashSet<AnalysisEntity> builder, bool forInterproceduralAnalysis)
                 => analysisData.AddTrackedEntities(builder);
 
             protected override bool HasAbstractValue(AnalysisEntity analysisEntity) => CurrentAnalysisData.HasAbstractValue(analysisEntity);
@@ -513,12 +513,10 @@ public override (CopyAbstractValue Value, PredicateValueKind PredicateValueKind)
 
             protected override void ApplyInterproceduralAnalysisResultCore(CopyAnalysisData resultData)
             {
-                using (var mergedData = GetClonedAnalysisData(resultData))
-                {
-                    ApplyMissingCurrentAnalysisDataCore(mergedData, predicateOpt: null);
-                    CurrentAnalysisData.CoreAnalysisData.Clear();
-                    CurrentAnalysisData.CoreAnalysisData.AddRange(mergedData.CoreAnalysisData);
-                }
+                using var mergedData = GetClonedAnalysisData(resultData);
+                ApplyMissingCurrentAnalysisDataCore(mergedData, predicateOpt: null);
+                CurrentAnalysisData.CoreAnalysisData.Clear();
+                CurrentAnalysisData.CoreAnalysisData.AddRange(mergedData.CoreAnalysisData);
             }
 
             private void ApplyMissingCurrentAnalysisDataCore(CopyAnalysisData mergedData, Func<AnalysisEntity, bool> predicateOpt)
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/CopyAnalysis/CopyAnalysis.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/CopyAnalysis/CopyAnalysis.cs
index 1434e43eef..a98ad0bd00 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/CopyAnalysis/CopyAnalysis.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/CopyAnalysis/CopyAnalysis.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System;
+using System.Diagnostics;
 using Microsoft.CodeAnalysis.Diagnostics;
 
 #pragma warning disable RS0026 // Do not add multiple public overloads with optional parameters
@@ -30,6 +31,12 @@ private CopyAnalysis(CopyDataFlowOperationVisitor operationVisitor)
             bool performPointsToAnalysis = true,
             bool exceptionPathsAnalysis = false)
         {
+            if (cfg == null)
+            {
+                Debug.Fail("Expected non-null CFG");
+                return null;
+            }
+
             var pointsToAnalysisResultOpt = performPointsToAnalysis ?
                 PointsToAnalysis.PointsToAnalysis.TryGetOrComputeResult(cfg, owningSymbol, analyzerOptions, wellKnownTypeProvider, interproceduralAnalysisConfig,
                     interproceduralAnalysisPredicateOpt, pessimisticAnalysis, performCopyAnalysis: false, exceptionPathsAnalysis) :
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/CopyAnalysis/CopyAnalysisContext.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/CopyAnalysis/CopyAnalysisContext.cs
index 202faa0a69..4d6007628e 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/CopyAnalysis/CopyAnalysisContext.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/CopyAnalysis/CopyAnalysisContext.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System;
-using Analyzer.Utilities.PooledObjects;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PointsToAnalysis;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ValueContentAnalysis;
@@ -11,8 +10,8 @@
 namespace Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.CopyAnalysis
 {
     using CopyAnalysisResult = DataFlowAnalysisResult<CopyBlockAnalysisResult, CopyAbstractValue>;
-    using ValueContentAnalysisResult = DataFlowAnalysisResult<ValueContentBlockAnalysisResult, ValueContentAbstractValue>;
     using InterproceduralCopyAnalysisData = InterproceduralAnalysisData<CopyAnalysisData, CopyAnalysisContext, CopyAbstractValue>;
+    using ValueContentAnalysisResult = DataFlowAnalysisResult<ValueContentBlockAnalysisResult, ValueContentAbstractValue>;
 
     /// <summary>
     /// Analysis context for execution of <see cref="CopyAnalysis"/> on a control flow graph.
@@ -71,7 +70,7 @@ public sealed class CopyAnalysisContext : AbstractDataFlowAnalysisContext<CopyAn
                 InterproceduralAnalysisPredicateOpt);
         }
 
-        protected override void ComputeHashCodePartsSpecific(ArrayBuilder<int> builder)
+        protected override void ComputeHashCodePartsSpecific(Action<int> addPart)
         {
         }
     }
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/DisposeAnalysis/DisposeAbstractValue.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/DisposeAnalysis/DisposeAbstractValue.cs
index 494c4ded7d..8310a30969 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/DisposeAnalysis/DisposeAbstractValue.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/DisposeAnalysis/DisposeAbstractValue.cs
@@ -4,7 +4,6 @@
 using System.Collections.Immutable;
 using System.Diagnostics;
 using Analyzer.Utilities;
-using Analyzer.Utilities.PooledObjects;
 
 #pragma warning disable CA1067 // Override Object.Equals(object) when implementing IEquatable<T> - CacheBasedEquatable handles equality
 
@@ -75,10 +74,10 @@ private static void VerifyArguments(ImmutableHashSet<IOperation> disposingOrEsca
         public ImmutableHashSet<IOperation> DisposingOrEscapingOperations { get; }
         public DisposeAbstractValueKind Kind { get; }
 
-        protected override void ComputeHashCodeParts(ArrayBuilder<int> builder)
+        protected override void ComputeHashCodeParts(Action<int> addPart)
         {
-            builder.Add(HashUtilities.Combine(DisposingOrEscapingOperations));
-            builder.Add(Kind.GetHashCode());
+            addPart(HashUtilities.Combine(DisposingOrEscapingOperations));
+            addPart(Kind.GetHashCode());
         }
     }
 }
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/DisposeAnalysis/DisposeAnalysis.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/DisposeAnalysis/DisposeAnalysis.cs
index d3da820da8..ecf592f387 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/DisposeAnalysis/DisposeAnalysis.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/DisposeAnalysis/DisposeAnalysis.cs
@@ -81,7 +81,6 @@ private DisposeAnalysis(DisposeAnalysisDomain analysisDomain, DisposeDataFlowOpe
             bool performCopyAnalysis,
             out PointsToAnalysisResult pointsToAnalysisResult)
         {
-            Debug.Assert(cfg != null);
             Debug.Assert(wellKnownTypeProvider.IDisposable != null);
             Debug.Assert(owningSymbol != null);
 
@@ -93,6 +92,12 @@ private DisposeAnalysis(DisposeAnalysisDomain analysisDomain, DisposeDataFlowOpe
                 return null;
             }
 
+            if (cfg == null)
+            {
+                Debug.Fail("Expected non-null CFG");
+                return null;
+            }
+
             var analysisContext = DisposeAnalysisContext.Create(
                 DisposeAbstractValueDomain.Default, wellKnownTypeProvider, cfg, owningSymbol, analyzerOptions, interproceduralAnalysisConfig, interproceduralAnalysisPredicateOpt,
                 PessimisticAnalysis, exceptionPathsAnalysis, pointsToAnalysisResult, TryGetOrComputeResultForAnalysisContext,
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/DisposeAnalysis/DisposeAnalysisContext.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/DisposeAnalysis/DisposeAnalysisContext.cs
index 274805b56d..6b53c4adc4 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/DisposeAnalysis/DisposeAnalysisContext.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/DisposeAnalysis/DisposeAnalysisContext.cs
@@ -4,7 +4,6 @@
 using System.Collections.Immutable;
 using System.Diagnostics;
 using Analyzer.Utilities;
-using Analyzer.Utilities.PooledObjects;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.CopyAnalysis;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PointsToAnalysis;
@@ -15,9 +14,9 @@
 namespace Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DisposeAnalysis
 {
     using CopyAnalysisResult = DataFlowAnalysisResult<CopyBlockAnalysisResult, CopyAbstractValue>;
-    using ValueContentAnalysisResult = DataFlowAnalysisResult<ValueContentBlockAnalysisResult, ValueContentAbstractValue>;
     using DisposeAnalysisData = DictionaryAnalysisData<AbstractLocation, DisposeAbstractValue>;
     using InterproceduralDisposeAnalysisData = InterproceduralAnalysisData<DictionaryAnalysisData<AbstractLocation, DisposeAbstractValue>, DisposeAnalysisContext, DisposeAbstractValue>;
+    using ValueContentAnalysisResult = DataFlowAnalysisResult<ValueContentBlockAnalysisResult, ValueContentAbstractValue>;
 
     /// <summary>
     /// Analysis context for execution of <see cref="DisposeAnalysis"/> on a control flow graph.
@@ -109,12 +108,12 @@ public sealed class DisposeAnalysisContext : AbstractDataFlowAnalysisContext<Dis
         internal bool DisposeOwnershipTransferAtMethodCall { get; }
         internal bool TrackInstanceFields { get; }
 
-        protected override void ComputeHashCodePartsSpecific(ArrayBuilder<int> builder)
+        protected override void ComputeHashCodePartsSpecific(Action<int> addPart)
         {
-            builder.Add(TrackInstanceFields.GetHashCode());
-            builder.Add(DisposeOwnershipTransferAtConstructor.GetHashCode());
-            builder.Add(DisposeOwnershipTransferAtMethodCall.GetHashCode());
-            builder.Add(HashUtilities.Combine(DisposeOwnershipTransferLikelyTypes));
+            addPart(TrackInstanceFields.GetHashCode());
+            addPart(DisposeOwnershipTransferAtConstructor.GetHashCode());
+            addPart(DisposeOwnershipTransferAtMethodCall.GetHashCode());
+            addPart(HashUtilities.Combine(DisposeOwnershipTransferLikelyTypes));
         }
     }
 }
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/DisposeAnalysis/DisposeAnalysisHelper.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/DisposeAnalysis/DisposeAnalysisHelper.cs
index 2fbb53d49c..13b2316b9b 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/DisposeAnalysis/DisposeAnalysisHelper.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/DisposeAnalysis/DisposeAnalysisHelper.cs
@@ -6,21 +6,20 @@
 using System.Runtime.CompilerServices;
 using System.Threading;
 using Analyzer.Utilities.Extensions;
+using Analyzer.Utilities.PooledObjects;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Operations;
-using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PointsToAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.DisposeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
-using System;
-using Analyzer.Utilities.PooledObjects;
+using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PointsToAnalysis;
+using Microsoft.CodeAnalysis.Operations;
 
 namespace Analyzer.Utilities
 {
     /// <summary>
     /// Helper for DisposeAnalysis.
     /// </summary>
-    public class DisposeAnalysisHelper
+    internal sealed class DisposeAnalysisHelper
     {
         private static readonly string[] s_disposeOwnershipTransferLikelyTypes = new string[]
             {
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/ParameterValidationAnalysis/ParameterValidationAnalysisContext.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/ParameterValidationAnalysis/ParameterValidationAnalysisContext.cs
index c991c37bc7..47f58350ef 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/ParameterValidationAnalysis/ParameterValidationAnalysisContext.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/ParameterValidationAnalysis/ParameterValidationAnalysisContext.cs
@@ -1,12 +1,8 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Immutable;
 using System.Diagnostics;
-using System.Linq;
 using Analyzer.Utilities;
-using Analyzer.Utilities.Extensions;
-using Analyzer.Utilities.PooledObjects;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.CopyAnalysis;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PointsToAnalysis;
@@ -105,10 +101,10 @@ public ParameterValidationAnalysisContext WithTrackHazardousParameterUsages()
         public bool IsNullCheckValidationMethod(IMethodSymbol method)
             => NullCheckValidationMethodNames.Contains(method);
 
-        protected override void ComputeHashCodePartsSpecific(ArrayBuilder<int> builder)
+        protected override void ComputeHashCodePartsSpecific(Action<int> addPart)
         {
-            builder.Add(TrackHazardousParameterUsages.GetHashCode());
-            builder.Add(NullCheckValidationMethodNames.GetHashCode());
+            addPart(TrackHazardousParameterUsages.GetHashCode());
+            addPart(NullCheckValidationMethodNames.GetHashCode());
         }
     }
 }
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/PointsToAnalysis/PointsToAbstractValue.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/PointsToAnalysis/PointsToAbstractValue.cs
index 7daf85a2af..30f2901dcc 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/PointsToAnalysis/PointsToAbstractValue.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/PointsToAnalysis/PointsToAbstractValue.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using Analyzer.Utilities;
-using Analyzer.Utilities.PooledObjects;
+using System;
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Linq;
@@ -187,12 +187,12 @@ internal PointsToAbstractValue MakeMayBeNull()
         public PointsToAbstractValueKind Kind { get; }
         public NullAbstractValue NullState { get; }
 
-        protected override void ComputeHashCodeParts(ArrayBuilder<int> builder)
+        protected override void ComputeHashCodeParts(Action<int> addPart)
         {
-            builder.Add(HashUtilities.Combine(Locations));
-            builder.Add(HashUtilities.Combine(LValueCapturedOperations));
-            builder.Add(Kind.GetHashCode());
-            builder.Add(NullState.GetHashCode());
+            addPart(HashUtilities.Combine(Locations));
+            addPart(HashUtilities.Combine(LValueCapturedOperations));
+            addPart(Kind.GetHashCode());
+            addPart(NullState.GetHashCode());
         }
     }
 }
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/PointsToAnalysis/PointsToAnalysis.PointsToDataFlowOperationVisitor.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/PointsToAnalysis/PointsToAnalysis.PointsToDataFlowOperationVisitor.cs
index beafbaa6ea..86e88c37c9 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/PointsToAnalysis/PointsToAnalysis.PointsToDataFlowOperationVisitor.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/PointsToAnalysis/PointsToAnalysis.PointsToDataFlowOperationVisitor.cs
@@ -111,7 +111,7 @@ public override (PointsToAnalysisData output, bool isFeasibleBranch) FlowBranch(
                 return result;
             }
 
-            protected override void AddTrackedEntities(PointsToAnalysisData analysisData, PooledHashSet<AnalysisEntity> builder, bool forInterproceduralAnalysis)
+            protected override void AddTrackedEntities(PointsToAnalysisData analysisData, HashSet<AnalysisEntity> builder, bool forInterproceduralAnalysis)
             {
                 if (!analysisData.HasAnyAbstractValue &&
                     (forInterproceduralAnalysis || !_defaultPointsToValueGenerator.HasAnyTrackedEntity))
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/PointsToAnalysis/PointsToAnalysis.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/PointsToAnalysis/PointsToAnalysis.cs
index 71955cbc77..ce87b5df13 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/PointsToAnalysis/PointsToAnalysis.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/PointsToAnalysis/PointsToAnalysis.cs
@@ -57,6 +57,13 @@ private PointsToAnalysis(PointsToAnalysisDomain analysisDomain, PointsToDataFlow
                 CopyAnalysis.CopyAnalysis.TryGetOrComputeResult(cfg, owningSymbol, analyzerOptions, wellKnownTypeProvider, interproceduralAnalysisConfig,
                     interproceduralAnalysisPredicateOpt, pessimisticAnalysis, performPointsToAnalysis: true, exceptionPathsAnalysis) :
                 null;
+
+            if (cfg == null)
+            {
+                Debug.Fail("Expected non-null CFG");
+                return null;
+            }
+
             var analysisContext = PointsToAnalysisContext.Create(PointsToAbstractValueDomain.Default, wellKnownTypeProvider, cfg,
                 owningSymbol, analyzerOptions, interproceduralAnalysisConfig, pessimisticAnalysis, exceptionPathsAnalysis, copyAnalysisResultOpt,
                 TryGetOrComputeResultForAnalysisContext, interproceduralAnalysisPredicateOpt);
@@ -65,14 +72,12 @@ private PointsToAnalysis(PointsToAnalysisDomain analysisDomain, PointsToDataFlow
 
         private static PointsToAnalysisResult TryGetOrComputeResultForAnalysisContext(PointsToAnalysisContext analysisContext)
         {
-            using (var trackedEntitiesBuilder = new TrackedEntitiesBuilder())
-            {
-                var defaultPointsToValueGenerator = new DefaultPointsToValueGenerator(trackedEntitiesBuilder);
-                var analysisDomain = new PointsToAnalysisDomain(defaultPointsToValueGenerator);
-                var operationVisitor = new PointsToDataFlowOperationVisitor(trackedEntitiesBuilder, defaultPointsToValueGenerator, analysisDomain, analysisContext);
-                var pointsToAnalysis = new PointsToAnalysis(analysisDomain, operationVisitor);
-                return pointsToAnalysis.TryGetOrComputeResultCore(analysisContext, cacheResult: true);
-            }
+            using var trackedEntitiesBuilder = new TrackedEntitiesBuilder();
+            var defaultPointsToValueGenerator = new DefaultPointsToValueGenerator(trackedEntitiesBuilder);
+            var analysisDomain = new PointsToAnalysisDomain(defaultPointsToValueGenerator);
+            var operationVisitor = new PointsToDataFlowOperationVisitor(trackedEntitiesBuilder, defaultPointsToValueGenerator, analysisDomain, analysisContext);
+            var pointsToAnalysis = new PointsToAnalysis(analysisDomain, operationVisitor);
+            return pointsToAnalysis.TryGetOrComputeResultCore(analysisContext, cacheResult: true);
         }
 
         internal static bool ShouldBeTracked(ITypeSymbol typeSymbol) => typeSymbol.IsReferenceTypeOrNullableValueType() ||
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/PointsToAnalysis/PointsToAnalysisContext.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/PointsToAnalysis/PointsToAnalysisContext.cs
index c3c887b010..7e64b2de71 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/PointsToAnalysis/PointsToAnalysisContext.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/PointsToAnalysis/PointsToAnalysisContext.cs
@@ -2,7 +2,6 @@
 
 using System;
 using System.Diagnostics;
-using Analyzer.Utilities.PooledObjects;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.CopyAnalysis;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ValueContentAnalysis;
@@ -75,7 +74,7 @@ public sealed class PointsToAnalysisContext : AbstractDataFlowAnalysisContext<Po
                 InterproceduralAnalysisPredicateOpt);
         }
 
-        protected override void ComputeHashCodePartsSpecific(ArrayBuilder<int> builder)
+        protected override void ComputeHashCodePartsSpecific(Action<int> addPart)
         {
         }
     }
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/PropertySetAnalysis/PropertySetAnalysis.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/PropertySetAnalysis/PropertySetAnalysis.cs
index 902aa53c6e..7af8817f7d 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/PropertySetAnalysis/PropertySetAnalysis.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/PropertySetAnalysis/PropertySetAnalysis.cs
@@ -2,9 +2,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Diagnostics;
-using System.Linq;
 using Analyzer.Utilities.Extensions;
 using Analyzer.Utilities.PooledObjects;
 using Microsoft.CodeAnalysis;
@@ -13,7 +11,6 @@
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PointsToAnalysis;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ValueContentAnalysis;
-using Microsoft.CodeAnalysis.Operations;
 
 namespace Analyzer.Utilities.FlowAnalysis.Analysis.PropertySetAnalysis
 {
@@ -161,7 +158,14 @@ private PropertySetAnalysis(PropertySetAnalysisDomain analysisDomain, PropertySe
             PooledDictionary<(Location Location, IMethodSymbol Method), HazardousUsageEvaluationResult> allResults = null;
             foreach ((IOperation Operation, ISymbol ContainingSymbol) in rootOperationsNeedingAnalysis)
             {
-                ControlFlowGraph enclosingControlFlowGraph = Operation.GetEnclosingControlFlowGraph();
+                var success = Operation.TryGetEnclosingControlFlowGraph(out ControlFlowGraph enclosingControlFlowGraph);
+                Debug.Assert(success);
+                if (enclosingControlFlowGraph == null)
+                {
+                    Debug.Fail("Expected non-null CFG");
+                    continue;
+                }
+
                 PropertySetAnalysisResult enclosingResult = InvokeDfaAndAccumulateResults(
                     enclosingControlFlowGraph,
                     ContainingSymbol);
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/PropertySetAnalysis/PropertySetAnalysisContext.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/PropertySetAnalysis/PropertySetAnalysisContext.cs
index 32c2d65285..fbb9b01995 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/PropertySetAnalysis/PropertySetAnalysisContext.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/PropertySetAnalysis/PropertySetAnalysisContext.cs
@@ -3,7 +3,6 @@
 using System;
 using System.Collections.Immutable;
 using System.Diagnostics;
-using Analyzer.Utilities.PooledObjects;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.FlowAnalysis;
@@ -160,12 +159,12 @@ internal sealed class PropertySetAnalysisContext : AbstractDataFlowAnalysisConte
         public ImmutableDictionary<INamedTypeSymbol, string> HazardousUsageTypesToNames { get; }
 
 #pragma warning disable CA1307 // Specify StringComparison - string.GetHashCode(StringComparison) not available in all projects that reference this shared project
-        protected override void ComputeHashCodePartsSpecific(ArrayBuilder<int> builder)
+        protected override void ComputeHashCodePartsSpecific(Action<int> addPart)
         {
-            builder.Add(TypeToTrackMetadataName.GetHashCode());
-            builder.Add(ConstructorMapper.GetHashCode());
-            builder.Add(PropertyMappers.GetHashCode());
-            builder.Add(HazardousUsageEvaluators.GetHashCode());
+            addPart(TypeToTrackMetadataName.GetHashCode());
+            addPart(ConstructorMapper.GetHashCode());
+            addPart(PropertyMappers.GetHashCode());
+            addPart(HazardousUsageEvaluators.GetHashCode());
         }
 #pragma warning restore CA1307 // Specify StringComparison
     }
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/SymbolAccess.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/SymbolAccess.cs
index 589e1b3775..6486a18e97 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/SymbolAccess.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/SymbolAccess.cs
@@ -50,11 +50,11 @@ public SymbolAccess(ISymbol symbol, Location location, ISymbol accessingMethod)
         /// </summary>
         public ISymbol AccessingMethod { get; }
 
-        protected override void ComputeHashCodeParts(ArrayBuilder<int> builder)
+        protected override void ComputeHashCodeParts(Action<int> addPart)
         {
-            builder.Add(Location.GetHashCode());
-            builder.Add(Symbol.GetHashCode());
-            builder.Add(AccessingMethod.GetHashCode());
+            addPart(Location.GetHashCode());
+            addPart(Symbol.GetHashCode());
+            addPart(AccessingMethod.GetHashCode());
         }
     }
 }
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/TaintedDataAbstractValue.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/TaintedDataAbstractValue.cs
index fb2c1ae48c..31bfbffcc8 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/TaintedDataAbstractValue.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/TaintedDataAbstractValue.cs
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics;
@@ -35,10 +36,10 @@ private TaintedDataAbstractValue(TaintedDataAbstractValueKind kind, ImmutableHas
         /// </summary>
         public ImmutableHashSet<SymbolAccess> SourceOrigins { get; }
 
-        protected override void ComputeHashCodeParts(ArrayBuilder<int> builder)
+        protected override void ComputeHashCodeParts(Action<int> addPart)
         {
-            builder.Add(HashUtilities.Combine(SourceOrigins));
-            builder.Add(Kind.GetHashCode());
+            addPart(HashUtilities.Combine(SourceOrigins));
+            addPart(Kind.GetHashCode());
         }
 
         /// <summary>
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/TaintedDataAnalysis.TaintedDataOperationVisitor.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/TaintedDataAnalysis.TaintedDataOperationVisitor.cs
index 0ae7919c5e..8624faf5de 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/TaintedDataAnalysis.TaintedDataOperationVisitor.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/TaintedDataAnalysis.TaintedDataOperationVisitor.cs
@@ -46,7 +46,7 @@ public ImmutableArray<TaintedDataSourceSink> GetTaintedDataSourceSinkEntries()
                 return builder.ToImmutableArray();
             }
 
-            protected override void AddTrackedEntities(TaintedDataAnalysisData analysisData, PooledHashSet<AnalysisEntity> builder, bool forInterproceduralAnalysis)
+            protected override void AddTrackedEntities(TaintedDataAnalysisData analysisData, HashSet<AnalysisEntity> builder, bool forInterproceduralAnalysis)
                 => analysisData.AddTrackedEntities(builder);
 
             protected override bool Equals(TaintedDataAnalysisData value1, TaintedDataAnalysisData value2)
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/TaintedDataAnalysis.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/TaintedDataAnalysis.cs
index 617c52cd65..4d824c562b 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/TaintedDataAnalysis.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/TaintedDataAnalysis.cs
@@ -9,6 +9,7 @@
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.CopyAnalysis;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PointsToAnalysis;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ValueContentAnalysis;
+using System.Diagnostics;
 
 namespace Analyzer.Utilities.FlowAnalysis.Analysis.TaintedDataAnalysis
 {
@@ -51,6 +52,12 @@ private TaintedDataAnalysis(TaintedDataOperationVisitor operationVisitor)
             TaintedDataSymbolMap<SinkInfo> taintedSinkInfos,
             InterproceduralAnalysisConfiguration interproceduralAnalysisConfig)
         {
+            if (cfg == null)
+            {
+                Debug.Fail("Expected non-null CFG");
+                return null;
+            }
+
             WellKnownTypeProvider wellKnownTypeProvider = WellKnownTypeProvider.GetOrCreate(compilation);
             ValueContentAnalysisResult valueContentAnalysisResult = null;
             CopyAnalysisResult copyAnalysisResult = null;
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/TaintedDataAnalysisContext.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/TaintedDataAnalysisContext.cs
index ffcaebf0fb..eafc298d20 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/TaintedDataAnalysisContext.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/TaintedDataAnalysis/TaintedDataAnalysisContext.cs
@@ -2,7 +2,6 @@
 
 using System;
 using System.Diagnostics;
-using Analyzer.Utilities.PooledObjects;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.FlowAnalysis;
@@ -15,8 +14,8 @@
 
 namespace Analyzer.Utilities.FlowAnalysis.Analysis.TaintedDataAnalysis
 {
-    using InterproceduralTaintedDataAnalysisData = InterproceduralAnalysisData<TaintedDataAnalysisData, TaintedDataAnalysisContext, TaintedDataAbstractValue>;
     using CopyAnalysisResult = DataFlowAnalysisResult<CopyBlockAnalysisResult, CopyAbstractValue>;
+    using InterproceduralTaintedDataAnalysisData = InterproceduralAnalysisData<TaintedDataAnalysisData, TaintedDataAnalysisContext, TaintedDataAbstractValue>;
     using ValueContentAnalysisResult = DataFlowAnalysisResult<ValueContentBlockAnalysisResult, ValueContentAbstractValue>;
 
     internal sealed class TaintedDataAnalysisContext : AbstractDataFlowAnalysisContext<TaintedDataAnalysisData, TaintedDataAnalysisContext, TaintedDataAnalysisResult, TaintedDataAbstractValue>
@@ -143,11 +142,11 @@ internal sealed class TaintedDataAnalysisContext : AbstractDataFlowAnalysisConte
         /// </summary>
         public TaintedDataSymbolMap<SinkInfo> SinkInfos { get; }
 
-        protected override void ComputeHashCodePartsSpecific(ArrayBuilder<int> builder)
+        protected override void ComputeHashCodePartsSpecific(Action<int> addPart)
         {
-            builder.Add(SourceInfos.GetHashCode());
-            builder.Add(SanitizerInfos.GetHashCode());
-            builder.Add(SinkInfos.GetHashCode());
+            addPart(SourceInfos.GetHashCode());
+            addPart(SanitizerInfos.GetHashCode());
+            addPart(SinkInfos.GetHashCode());
         }
     }
 }
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/ValueContentAnalysis/ValueContentAbstractValue.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/ValueContentAnalysis/ValueContentAbstractValue.cs
index c3f61a2fc8..bb54585374 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/ValueContentAnalysis/ValueContentAbstractValue.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/ValueContentAnalysis/ValueContentAbstractValue.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Globalization;
@@ -151,10 +150,10 @@ internal static bool IsSupportedType(ITypeSymbol type, out ITypeSymbol valueType
         /// </summary>
         public ImmutableHashSet<object> LiteralValues { get; }
 
-        protected override void ComputeHashCodeParts(ArrayBuilder<int> builder)
+        protected override void ComputeHashCodeParts(Action<int> addPart)
         {
-            builder.Add(HashUtilities.Combine(LiteralValues));
-            builder.Add(NonLiteralState.GetHashCode());
+            addPart(HashUtilities.Combine(LiteralValues));
+            addPart(NonLiteralState.GetHashCode());
         }
 
         /// <summary>
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/ValueContentAnalysis/ValueContentAnalysis.ValueContentDataFlowOperationVisitor.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/ValueContentAnalysis/ValueContentAnalysis.ValueContentDataFlowOperationVisitor.cs
index 0763228302..83fd91230a 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/ValueContentAnalysis/ValueContentAnalysis.ValueContentDataFlowOperationVisitor.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/ValueContentAnalysis/ValueContentAnalysis.ValueContentDataFlowOperationVisitor.cs
@@ -3,8 +3,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Diagnostics;
-using Analyzer.Utilities.PooledObjects;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.CopyAnalysis;
 using Microsoft.CodeAnalysis.Operations;
 
@@ -24,7 +22,7 @@ public ValueContentDataFlowOperationVisitor(ValueContentAnalysisContext analysis
             {
             }
 
-            protected override void AddTrackedEntities(ValueContentAnalysisData analysisData, PooledHashSet<AnalysisEntity> builder, bool forInterproceduralAnalysis)
+            protected override void AddTrackedEntities(ValueContentAnalysisData analysisData, HashSet<AnalysisEntity> builder, bool forInterproceduralAnalysis)
                 => analysisData.AddTrackedEntities(builder);
 
             protected override void ResetAbstractValue(AnalysisEntity analysisEntity)
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/ValueContentAnalysis/ValueContentAnalysis.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/ValueContentAnalysis/ValueContentAnalysis.cs
index f0069735a8..60996c594f 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/ValueContentAnalysis/ValueContentAnalysis.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/ValueContentAnalysis/ValueContentAnalysis.cs
@@ -83,6 +83,13 @@ private ValueContentAnalysis(ValueContentDataFlowOperationVisitor operationVisit
                 PointsToAnalysis.PointsToAnalysis.TryGetOrComputeResult(cfg, owningSymbol, analyzerOptions, wellKnownTypeProvider, out copyAnalysisResultOpt,
                     interproceduralAnalysisConfig, interproceduralAnalysisPredicateOpt, pessimisticAnalysis, performCopyAnalysis) :
                 null;
+
+            if (cfg == null)
+            {
+                Debug.Fail("Expected non-null CFG");
+                return null;
+            }
+
             var analysisContext = ValueContentAnalysisContext.Create(
                 ValueContentAbstractValueDomain.Default, wellKnownTypeProvider, cfg, owningSymbol, analyzerOptions,
                 interproceduralAnalysisConfig, pessimisticAnalysis, copyAnalysisResultOpt,
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/ValueContentAnalysis/ValueContentAnalysisContext.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/ValueContentAnalysis/ValueContentAnalysisContext.cs
index c280c4236f..9d236726e1 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/ValueContentAnalysis/ValueContentAnalysisContext.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Analysis/ValueContentAnalysis/ValueContentAnalysisContext.cs
@@ -2,7 +2,6 @@
 
 using System;
 using System.Diagnostics;
-using Analyzer.Utilities.PooledObjects;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.CopyAnalysis;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PointsToAnalysis;
@@ -11,9 +10,9 @@
 
 namespace Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.ValueContentAnalysis
 {
+    using CopyAnalysisResult = DataFlowAnalysisResult<CopyBlockAnalysisResult, CopyAbstractValue>;
     using InterproceduralValueContentAnalysisData = InterproceduralAnalysisData<ValueContentAnalysisData, ValueContentAnalysisContext, ValueContentAbstractValue>;
     using ValueContentAnalysisResult = DataFlowAnalysisResult<ValueContentBlockAnalysisResult, ValueContentAbstractValue>;
-    using CopyAnalysisResult = DataFlowAnalysisResult<CopyBlockAnalysisResult, CopyAbstractValue>;
 
     /// <summary>
     /// Analysis context for execution of <see cref="ValueContentAnalysis"/> on a control flow graph.
@@ -76,7 +75,7 @@ public sealed class ValueContentAnalysisContext : AbstractDataFlowAnalysisContex
                 InterproceduralAnalysisPredicateOpt);
         }
 
-        protected override void ComputeHashCodePartsSpecific(ArrayBuilder<int> builder)
+        protected override void ComputeHashCodePartsSpecific(Action<int> addPart)
         {
         }
     }
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AbstractDataFlowAnalysisContext.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AbstractDataFlowAnalysisContext.cs
index 5f39fcb953..758c68292a 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AbstractDataFlowAnalysisContext.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AbstractDataFlowAnalysisContext.cs
@@ -4,7 +4,6 @@
 using System.Diagnostics;
 using System.Linq;
 using Analyzer.Utilities;
-using Analyzer.Utilities.PooledObjects;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.CopyAnalysis;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PointsToAnalysis;
@@ -149,24 +148,24 @@ public ControlFlowGraph GetAnonymousFunctionControlFlowGraph(IFlowAnonymousFunct
             }
         }
 
-        protected abstract void ComputeHashCodePartsSpecific(ArrayBuilder<int> builder);
+        protected abstract void ComputeHashCodePartsSpecific(Action<int> builder);
 
-        protected sealed override void ComputeHashCodeParts(ArrayBuilder<int> builder)
+        protected sealed override void ComputeHashCodeParts(Action<int> addPart)
         {
-            builder.Add(ValueDomain.GetHashCode());
-            builder.Add(OwningSymbol.GetHashCode());
-            builder.Add(ControlFlowGraph.OriginalOperation.GetHashCode());
-            builder.Add(AnalyzerOptions.GetHashCode());
-            builder.Add(InterproceduralAnalysisConfiguration.GetHashCode());
-            builder.Add(PessimisticAnalysis.GetHashCode());
-            builder.Add(PredicateAnalysis.GetHashCode());
-            builder.Add(ExceptionPathsAnalysis.GetHashCode());
-            builder.Add(CopyAnalysisResultOpt.GetHashCodeOrDefault());
-            builder.Add(PointsToAnalysisResultOpt.GetHashCodeOrDefault());
-            builder.Add(ValueContentAnalysisResultOpt.GetHashCodeOrDefault());
-            builder.Add(InterproceduralAnalysisDataOpt.GetHashCodeOrDefault());
-            builder.Add(InterproceduralAnalysisPredicateOpt.GetHashCodeOrDefault());
-            ComputeHashCodePartsSpecific(builder);
+            addPart(ValueDomain.GetHashCode());
+            addPart(OwningSymbol.GetHashCode());
+            addPart(ControlFlowGraph.OriginalOperation.GetHashCode());
+            addPart(AnalyzerOptions.GetHashCode());
+            addPart(InterproceduralAnalysisConfiguration.GetHashCode());
+            addPart(PessimisticAnalysis.GetHashCode());
+            addPart(PredicateAnalysis.GetHashCode());
+            addPart(ExceptionPathsAnalysis.GetHashCode());
+            addPart(CopyAnalysisResultOpt.GetHashCodeOrDefault());
+            addPart(PointsToAnalysisResultOpt.GetHashCodeOrDefault());
+            addPart(ValueContentAnalysisResultOpt.GetHashCodeOrDefault());
+            addPart(InterproceduralAnalysisDataOpt.GetHashCodeOrDefault());
+            addPart(InterproceduralAnalysisPredicateOpt.GetHashCodeOrDefault());
+            ComputeHashCodePartsSpecific(addPart);
         }
     }
 }
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AbstractIndex.ConstantValueIndex.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AbstractIndex.ConstantValueIndex.cs
index 3dc878d4a3..9088e4be30 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AbstractIndex.ConstantValueIndex.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AbstractIndex.ConstantValueIndex.cs
@@ -2,7 +2,7 @@
 
 #pragma warning disable CA1067 // Override Object.Equals(object) when implementing IEquatable<T>
 
-using Analyzer.Utilities.PooledObjects;
+using System;
 
 namespace Microsoft.CodeAnalysis.FlowAnalysis.DataFlow
 {
@@ -18,10 +18,10 @@ public ConstantValueIndex(int index)
             public int Index { get; }
 
 #pragma warning disable CA1307 // Specify StringComparison - string.GetHashCode(StringComparison) not available in all projects that reference this shared project
-            protected override void ComputeHashCodeParts(ArrayBuilder<int> builder)
+            protected override void ComputeHashCodeParts(Action<int> addPart)
             {
-                builder.Add(Index.GetHashCode());
-                builder.Add(nameof(ConstantValueIndex).GetHashCode());
+                addPart(Index.GetHashCode());
+                addPart(nameof(ConstantValueIndex).GetHashCode());
             }
 #pragma warning restore CA1307 // Specify StringComparison
         }
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AbstractIndex.OperationBasedIndex.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AbstractIndex.OperationBasedIndex.cs
index f1c10e1a9e..5af242f87f 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AbstractIndex.OperationBasedIndex.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AbstractIndex.OperationBasedIndex.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
+using System;
 using System.Diagnostics;
-using Analyzer.Utilities.PooledObjects;
 
 #pragma warning disable CA1067 // Override Object.Equals(object) when implementing IEquatable<T> - CacheBasedEquatable handles equality
 
@@ -20,10 +20,10 @@ public OperationBasedIndex(IOperation operation)
             public IOperation Operation { get; }
 
 #pragma warning disable CA1307 // Specify StringComparison - string.GetHashCode(StringComparison) not available in all projects that reference this shared project
-            protected override void ComputeHashCodeParts(ArrayBuilder<int> builder)
+            protected override void ComputeHashCodeParts(Action<int> addPart)
             {
-                builder.Add(Operation.GetHashCode());
-                builder.Add(nameof(OperationBasedIndex).GetHashCode());
+                addPart(Operation.GetHashCode());
+                addPart(nameof(OperationBasedIndex).GetHashCode());
             }
 #pragma warning restore CA1307 // Specify StringComparison
         }
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AbstractIndex.SymbolBasedIndex.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AbstractIndex.SymbolBasedIndex.cs
index d4bb6955ae..a3749202d0 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AbstractIndex.SymbolBasedIndex.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AbstractIndex.SymbolBasedIndex.cs
@@ -2,7 +2,7 @@
 
 #pragma warning disable CA1067 // Override Object.Equals(object) when implementing IEquatable<T> - CacheBasedEquatable handles equality
 
-using Analyzer.Utilities.PooledObjects;
+using System;
 
 namespace Microsoft.CodeAnalysis.FlowAnalysis.DataFlow
 {
@@ -18,10 +18,10 @@ public AnalysisEntityBasedIndex(AnalysisEntity analysisEntity)
             public AnalysisEntity AnalysisEntity { get; }
 
 #pragma warning disable CA1307 // Specify StringComparison - string.GetHashCode(StringComparison) not available in all projects that reference this shared project
-            protected override void ComputeHashCodeParts(ArrayBuilder<int> builder)
+            protected override void ComputeHashCodeParts(Action<int> addPart)
             {
-                builder.Add(AnalysisEntity.GetHashCode());
-                builder.Add(nameof(AnalysisEntityBasedIndex).GetHashCode());
+                addPart(AnalysisEntity.GetHashCode());
+                addPart(nameof(AnalysisEntityBasedIndex).GetHashCode());
             }
 #pragma warning restore CA1307 // Specify StringComparison
         }
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AbstractLocation.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AbstractLocation.cs
index ed715425ca..64ba029e74 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AbstractLocation.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AbstractLocation.cs
@@ -1,11 +1,10 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Immutable;
 using System.Diagnostics;
-using System.Linq;
 using Analyzer.Utilities;
 using Analyzer.Utilities.Extensions;
-using Analyzer.Utilities.PooledObjects;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PointsToAnalysis;
 using Microsoft.CodeAnalysis.Operations;
 
@@ -93,16 +92,16 @@ public IOperation GetTopOfCreationCallStackOrCreation()
         public bool IsNoLocation => ReferenceEquals(this, NoLocation);
         public bool IsAnalysisEntityDefaultLocation => AnalysisEntityOpt != null;
 
-        protected override void ComputeHashCodeParts(ArrayBuilder<int> builder)
+        protected override void ComputeHashCodeParts(Action<int> addPart)
         {
-            builder.Add(CreationOpt.GetHashCodeOrDefault());
-            builder.Add(HashUtilities.Combine(CreationCallStack));
-            builder.Add(SymbolOpt.GetHashCodeOrDefault());
-            builder.Add(CaptureIdOpt.GetHashCodeOrDefault());
-            builder.Add(AnalysisEntityOpt.GetHashCodeOrDefault());
-            builder.Add(LocationTypeOpt.GetHashCodeOrDefault());
-            builder.Add(_isSpecialSingleton.GetHashCode());
-            builder.Add(IsNull.GetHashCode());
+            addPart(CreationOpt.GetHashCodeOrDefault());
+            addPart(HashUtilities.Combine(CreationCallStack));
+            addPart(SymbolOpt.GetHashCodeOrDefault());
+            addPart(CaptureIdOpt.GetHashCodeOrDefault());
+            addPart(AnalysisEntityOpt.GetHashCodeOrDefault());
+            addPart(LocationTypeOpt.GetHashCodeOrDefault());
+            addPart(_isSpecialSingleton.GetHashCode());
+            addPart(IsNull.GetHashCode());
         }
 
         /// <summary>
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AddressSharedEntitiesProvider.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AddressSharedEntitiesProvider.cs
index 0e7d0735fa..ac5722ee3e 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AddressSharedEntitiesProvider.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AddressSharedEntitiesProvider.cs
@@ -79,7 +79,7 @@ ImmutableHashSet<AnalysisEntity> ComputeAddressSharedEntities()
                 return builder.ToImmutableAndFree();
             }
 
-            void AddIfHasKnownInstanceLocation(AnalysisEntity entity, PooledHashSet<AnalysisEntity> builder)
+            static void AddIfHasKnownInstanceLocation(AnalysisEntity entity, PooledHashSet<AnalysisEntity> builder)
             {
                 // Only add entity to address shared entities if they have known instance location.
                 if (!entity.HasUnknownInstanceLocation)
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AnalysisEntity.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AnalysisEntity.cs
index 716df9feda..5fe7b1a72d 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AnalysisEntity.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AnalysisEntity.cs
@@ -235,27 +235,27 @@ public bool EqualsIgnoringInstanceLocation(AnalysisEntity other)
 
         public int EqualsIgnoringInstanceLocationId => _ignoringLocationHashCode;
 
-        protected override void ComputeHashCodeParts(ArrayBuilder<int> builder)
+        protected override void ComputeHashCodeParts(Action<int> addPart)
         {
-            builder.Add(InstanceLocation.GetHashCode());
-            ComputeHashCodePartsIgnoringLocation(builder);
+            addPart(InstanceLocation.GetHashCode());
+            ComputeHashCodePartsIgnoringLocation(addPart);
         }
 
-        private void ComputeHashCodePartsIgnoringLocation(ArrayBuilder<int> builder)
+        private void ComputeHashCodePartsIgnoringLocation(Action<int> addPart)
         {
-            builder.Add(SymbolOpt.GetHashCodeOrDefault());
-            builder.Add(HashUtilities.Combine(Indices));
-            builder.Add(InstanceReferenceOperationSyntaxOpt.GetHashCodeOrDefault());
-            builder.Add(CaptureIdOpt.GetHashCodeOrDefault());
-            builder.Add(Type.GetHashCode());
-            builder.Add(ParentOpt.GetHashCodeOrDefault());
-            builder.Add(IsThisOrMeInstance.GetHashCode());
+            addPart(SymbolOpt.GetHashCodeOrDefault());
+            addPart(HashUtilities.Combine(Indices));
+            addPart(InstanceReferenceOperationSyntaxOpt.GetHashCodeOrDefault());
+            addPart(CaptureIdOpt.GetHashCodeOrDefault());
+            addPart(Type.GetHashCode());
+            addPart(ParentOpt.GetHashCodeOrDefault());
+            addPart(IsThisOrMeInstance.GetHashCode());
         }
 
         private ImmutableArray<int> ComputeIgnoringLocationHashCodeParts()
         {
             var builder = ArrayBuilder<int>.GetInstance(7);
-            ComputeHashCodePartsIgnoringLocation(builder);
+            ComputeHashCodePartsIgnoringLocation(builder.Add);
             return builder.ToImmutableAndFree();
         }
 
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AnalysisEntityBasedPredicateAnalysisData.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AnalysisEntityBasedPredicateAnalysisData.cs
index b3a810fa0e..522c049c13 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AnalysisEntityBasedPredicateAnalysisData.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AnalysisEntityBasedPredicateAnalysisData.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics;
-using Analyzer.Utilities.PooledObjects;
 
 namespace Microsoft.CodeAnalysis.FlowAnalysis.DataFlow
 {
@@ -157,7 +156,7 @@ public PredicateValueKind ApplyPredicatedDataForEntity(AnalysisEntity predicated
             return result;
         }
 
-        public void AddTrackedEntities(PooledHashSet<AnalysisEntity> builder) => builder.UnionWith(CoreAnalysisData.Keys);
+        public void AddTrackedEntities(HashSet<AnalysisEntity> builder) => builder.UnionWith(CoreAnalysisData.Keys);
 
         protected override void Dispose(bool disposing)
         {
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AnalysisEntityDataFlowOperationVisitor.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AnalysisEntityDataFlowOperationVisitor.cs
index 6c8321daf0..6e9329ee30 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AnalysisEntityDataFlowOperationVisitor.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AnalysisEntityDataFlowOperationVisitor.cs
@@ -30,9 +30,9 @@ protected AnalysisEntityDataFlowOperationVisitor(TAnalysisContext analysisContex
         {
         }
 
-        protected void AddTrackedEntities(PooledHashSet<AnalysisEntity> builder, bool forInterproceduralAnalysis = false)
+        protected void AddTrackedEntities(HashSet<AnalysisEntity> builder, bool forInterproceduralAnalysis = false)
             => AddTrackedEntities(CurrentAnalysisData, builder, forInterproceduralAnalysis);
-        protected abstract void AddTrackedEntities(TAnalysisData analysisData, PooledHashSet<AnalysisEntity> builder, bool forInterproceduralAnalysis = false);
+        protected abstract void AddTrackedEntities(TAnalysisData analysisData, HashSet<AnalysisEntity> builder, bool forInterproceduralAnalysis = false);
         protected abstract void SetAbstractValue(AnalysisEntity analysisEntity, TAbstractAnalysisValue value);
         protected abstract void ResetAbstractValue(AnalysisEntity analysisEntity);
         protected abstract TAbstractAnalysisValue GetAbstractValue(AnalysisEntity analysisEntity);
@@ -405,7 +405,7 @@ private ImmutableHashSet<AnalysisEntity> GetChildAnalysisEntities(AnalysisEntity
             return GetChildAnalysisEntities(analysisEntity.InstanceLocation, entity => IsChildAnalysisEntity(entity, analysisEntity));
         }
 
-        protected static IEnumerable<AnalysisEntity> GetChildAnalysisEntities(AnalysisEntity analysisEntity, PooledHashSet<AnalysisEntity> allEntities)
+        protected static IEnumerable<AnalysisEntity> GetChildAnalysisEntities(AnalysisEntity analysisEntity, HashSet<AnalysisEntity> allEntities)
         {
             foreach (var entity in allEntities)
             {
@@ -663,7 +663,7 @@ void AddWorklistPointsToValue(PointsToAbstractValue pointsToValue)
                 }
             }
 
-            bool ShouldProcessPointsToValue(PointsToAbstractValue pointsToValue)
+            static bool ShouldProcessPointsToValue(PointsToAbstractValue pointsToValue)
                 => pointsToValue.Kind == PointsToAbstractValueKind.KnownLocations &&
                    pointsToValue != PointsToAbstractValue.NoLocation;
         }
@@ -830,7 +830,7 @@ private void HandleDeconstructionAssignment(IOperation target, ImmutableHashSet<
             return;
 
             // Local function
-            bool IsMatchingAssignedEntity(AnalysisEntity tupleElementEntity, AnalysisEntity childEntity)
+            static bool IsMatchingAssignedEntity(AnalysisEntity tupleElementEntity, AnalysisEntity childEntity)
             {
                 Debug.Assert(tupleElementEntity != null);
                 if (childEntity == null)
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AnalysisEntityFactory.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AnalysisEntityFactory.cs
index f87b8e7c5b..1ddcd03467 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AnalysisEntityFactory.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AnalysisEntityFactory.cs
@@ -388,7 +388,7 @@ public bool TryGetForInterproceduralAnalysis(IOperation operation, out AnalysisE
         private AnalysisEntity GetOrCreateForFlowCapture(CaptureId captureId, ITypeSymbol type, IOperation flowCaptureOrReference)
         {
             // Type can be null for capture of operations with OperationKind.None
-            type = type ?? _wellKnownTypeProvider.Compilation.GetSpecialType(SpecialType.System_Object);
+            type ??= _wellKnownTypeProvider.Compilation.GetSpecialType(SpecialType.System_Object);
 
             var interproceduralFlowCaptureEntityOpt = _interproceduralGetAnalysisEntityForFlowCaptureOpt?.Invoke(flowCaptureOrReference);
             if (interproceduralFlowCaptureEntityOpt != null)
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AnalysisEntityMapAbstractDomain.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AnalysisEntityMapAbstractDomain.cs
index 21e00978c6..e52b22749e 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AnalysisEntityMapAbstractDomain.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/AnalysisEntityMapAbstractDomain.cs
@@ -190,8 +190,7 @@ TValue GetMergedValueForEntityPresentInOneMap(AnalysisEntity key, TValue value)
             AssertValidAnalysisData(resultMap);
 
             return resultMap;
-
-            bool IsAnalysisEntityForFieldOrProperty(AnalysisEntity entity)
+            static bool IsAnalysisEntityForFieldOrProperty(AnalysisEntity entity)
                 => entity.SymbolOpt?.Kind == SymbolKind.Field || entity.SymbolOpt?.Kind == SymbolKind.Property;
         }
     }
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/ArgumentInfo.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/ArgumentInfo.cs
index 689dac617d..404cd76dc5 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/ArgumentInfo.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/ArgumentInfo.cs
@@ -1,8 +1,7 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using System.Collections.Immutable;
+using System;
 using Analyzer.Utilities;
-using Analyzer.Utilities.PooledObjects;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PointsToAnalysis;
 
 #pragma warning disable CA1067 // Override Object.Equals(object) when implementing IEquatable<T>
@@ -32,12 +31,12 @@ public sealed class ArgumentInfo<TAbstractAnalysisValue> : CacheBasedEquatable<A
         public PointsToAbstractValue InstanceLocation { get; }
         public TAbstractAnalysisValue Value { get; }
 
-        protected override void ComputeHashCodeParts(ArrayBuilder<int> builder)
+        protected override void ComputeHashCodeParts(Action<int> addPart)
         {
-            builder.Add(Operation.GetHashCode());
-            builder.Add(AnalysisEntityOpt.GetHashCodeOrDefault());
-            builder.Add(InstanceLocation.GetHashCode());
-            builder.Add(Value.GetHashCode());
+            addPart(Operation.GetHashCode());
+            addPart(AnalysisEntityOpt.GetHashCodeOrDefault());
+            addPart(InstanceLocation.GetHashCode());
+            addPart(Value.GetHashCode());
         }
     }
 }
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/CacheBasedEquatable.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/CacheBasedEquatable.cs
index a81315dd38..a19ebd5c48 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/CacheBasedEquatable.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/CacheBasedEquatable.cs
@@ -45,11 +45,11 @@ private int GetOrComputeHashCode()
         private ImmutableArray<int> ComputeHashCodeParts()
         {
             var builder = ArrayBuilder<int>.GetInstance();
-            ComputeHashCodeParts(builder);
+            ComputeHashCodeParts(builder.Add);
             return builder.ToImmutableAndFree();
         }
 
-        protected abstract void ComputeHashCodeParts(ArrayBuilder<int> builder);
+        protected abstract void ComputeHashCodeParts(Action<int> addPart);
 
         public sealed override int GetHashCode() => GetOrComputeHashCode();
 
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/DataFlowAnalysis.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/DataFlowAnalysis.cs
index 1785376c7b..c0550b8c04 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/DataFlowAnalysis.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/DataFlowAnalysis.cs
@@ -53,7 +53,7 @@ protected TAnalysisResult TryGetOrComputeResultCore(TAnalysisContext analysisCon
         private TAnalysisResult Run(TAnalysisContext analysisContext)
         {
             var cfg = analysisContext.ControlFlowGraph;
-            if (!cfg.SupportsFlowAnalysis())
+            if (cfg?.SupportsFlowAnalysis() != true)
             {
                 return default;
             }
@@ -486,7 +486,7 @@ void UpdateUnreachableBlocks()
                 }
             }
 
-            ControlFlowRegion TryGetReachableCatchRegionStartingHandler(ControlFlowRegion tryAndCatchRegion, BasicBlock sourceBlock)
+            static ControlFlowRegion TryGetReachableCatchRegionStartingHandler(ControlFlowRegion tryAndCatchRegion, BasicBlock sourceBlock)
             {
                 Debug.Assert(tryAndCatchRegion.Kind == ControlFlowRegionKind.TryAndCatch);
 
@@ -588,7 +588,7 @@ bool HasUnprocessedPredecessorBlock(BasicBlock block)
             }
 
             // If this block starts a catch/filter region, return the enclosing TryAndCatch region.
-            ControlFlowRegion GetEnclosingTryAndCatchRegionIfStartsHandler(BasicBlock block)
+            static ControlFlowRegion GetEnclosingTryAndCatchRegionIfStartsHandler(BasicBlock block)
             {
                 if (block.EnclosingRegion?.FirstBlockOrdinal == block.Ordinal)
                 {
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/DataFlowOperationVisitor.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/DataFlowOperationVisitor.cs
index 1d100aad3e..ae8250e961 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/DataFlowOperationVisitor.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/DataFlowOperationVisitor.cs
@@ -166,7 +166,7 @@ private ThrownExceptionInfo DefaultThrownExceptionInfo
             {
                 Debug.Assert(WellKnownTypeProvider.Exception != null);
 
-                _exceptionPathsThrownExceptionInfoMapOpt = _exceptionPathsThrownExceptionInfoMapOpt ?? new Dictionary<BasicBlock, ThrownExceptionInfo>();
+                _exceptionPathsThrownExceptionInfoMapOpt ??= new Dictionary<BasicBlock, ThrownExceptionInfo>();
                 if (!_exceptionPathsThrownExceptionInfoMapOpt.TryGetValue(CurrentBasicBlock, out var info))
                 {
                     info = ThrownExceptionInfo.CreateDefaultInfoForExceptionsPathAnalysis(
@@ -574,7 +574,7 @@ protected bool IsParameterEntityForCurrentMethod(AnalysisEntity analysisEntity)
                     if (branch.BranchValueOpt?.GetThrowExceptionType(CurrentBasicBlock) is INamedTypeSymbol exceptionType &&
                         exceptionType.DerivesFrom(WellKnownTypeProvider.Exception, baseTypesOnly: true))
                     {
-                        AnalysisDataForUnhandledThrowOperations = AnalysisDataForUnhandledThrowOperations ?? new Dictionary<ThrownExceptionInfo, TAnalysisData>();
+                        AnalysisDataForUnhandledThrowOperations ??= new Dictionary<ThrownExceptionInfo, TAnalysisData>();
                         var info = ThrownExceptionInfo.Create(CurrentBasicBlock, exceptionType, DataFlowAnalysisContext.InterproceduralAnalysisDataOpt?.CallStack);
                         AnalysisDataForUnhandledThrowOperations[info] = GetClonedCurrentAnalysisData();
                     }
@@ -764,7 +764,7 @@ protected virtual void HandlePossibleThrowingOperation(IOperation operation)
             }
 
             // This operation can throw, so update the analysis data for unhandled exception with 'System.Exception' type.
-            AnalysisDataForUnhandledThrowOperations = AnalysisDataForUnhandledThrowOperations ?? new Dictionary<ThrownExceptionInfo, TAnalysisData>();
+            AnalysisDataForUnhandledThrowOperations ??= new Dictionary<ThrownExceptionInfo, TAnalysisData>();
             if (!AnalysisDataForUnhandledThrowOperations.TryGetValue(DefaultThrownExceptionInfo, out var data) ||
                 CurrentBasicBlock.IsContainedInRegionOfKind(ControlFlowRegionKind.Finally))
             {
@@ -1142,8 +1142,6 @@ internal bool TryInferConversion(IIsPatternOperation operation, out ConversionIn
                 }
 
                 // Infer if a cast will always fail.
-                // We are currently bailing out if an interface or type parameter is involved.
-                bool IsInterfaceOrTypeParameter(ITypeSymbol type) => type.TypeKind == TypeKind.Interface || type.TypeKind == TypeKind.TypeParameter;
                 if (!inference.IsBoxing &&
                     !inference.IsUnboxing &&
                     !IsInterfaceOrTypeParameter(targetType) &&
@@ -1184,6 +1182,9 @@ internal bool TryInferConversion(IIsPatternOperation operation, out ConversionIn
             }
 
             return false;
+
+            // We are currently bailing out if an interface or type parameter is involved.
+            static bool IsInterfaceOrTypeParameter(ITypeSymbol type) => type.TypeKind == TypeKind.Interface || type.TypeKind == TypeKind.TypeParameter;
         }
 
         #endregion
@@ -1874,7 +1875,7 @@ private void ApplyInterproceduralAnalysisDataForUnhandledThrowOperations(Diction
                 return;
             }
 
-            AnalysisDataForUnhandledThrowOperations = AnalysisDataForUnhandledThrowOperations ?? new Dictionary<ThrownExceptionInfo, TAnalysisData>();
+            AnalysisDataForUnhandledThrowOperations ??= new Dictionary<ThrownExceptionInfo, TAnalysisData>();
             foreach (var (exceptionInfo, analysisDataAtException) in interproceduralUnhandledThrowOperationsData)
             {
                 // Adjust the thrown exception info from the interprocedural context to current context.
@@ -2834,7 +2835,7 @@ void AddMethodTarget(IMethodSymbol method, IOperation instance)
             {
                 Debug.Assert(knownTargetInvocations);
 
-                methodTargetsOptBuilder = methodTargetsOptBuilder ?? new HashSet<(IMethodSymbol method, IOperation instance)>();
+                methodTargetsOptBuilder ??= new HashSet<(IMethodSymbol method, IOperation instance)>();
                 methodTargetsOptBuilder.Add((method, instance));
             }
 
@@ -2842,7 +2843,7 @@ void AddLambdaTarget(IFlowAnonymousFunctionOperation lambda)
             {
                 Debug.Assert(knownTargetInvocations);
 
-                lambdaTargetsOpt = lambdaTargetsOpt ?? new HashSet<IFlowAnonymousFunctionOperation>();
+                lambdaTargetsOpt ??= new HashSet<IFlowAnonymousFunctionOperation>();
                 lambdaTargetsOpt.Add(lambda);
             }
 
@@ -2896,43 +2897,41 @@ void AnalyzePossibleTargetInvocations()
                 var first = true;
                 var defaultValue = value;
 
-                using (var savedCurrentAnalysisData = GetClonedCurrentAnalysisData())
+                using var savedCurrentAnalysisData = GetClonedCurrentAnalysisData();
+                if (methodTargetsOptBuilder != null)
                 {
-                    if (methodTargetsOptBuilder != null)
+                    foreach ((IMethodSymbol method, IOperation instance) in methodTargetsOptBuilder)
                     {
-                        foreach ((IMethodSymbol method, IOperation instance) in methodTargetsOptBuilder)
-                        {
-                            var oldMergedAnalysisData = mergedCurrentAnalysisData;
-                            mergedCurrentAnalysisData = AnalyzePossibleTargetInvocation(
-                                computeValueForInvocation: () => method.MethodKind == MethodKind.LocalFunction ?
-                                    VisitInvocation_LocalFunction(method, operation.Arguments, operation, defaultValue) :
-                                    VisitInvocation_NonLambdaOrDelegateOrLocalFunction(method, instance, operation.Arguments,
-                                        invokedAsDelegate: true, originalOperation: operation, defaultValue: defaultValue),
-                                inputAnalysisData: savedCurrentAnalysisData,
-                                mergedAnalysisData: mergedCurrentAnalysisData,
-                                first: ref first);
-                            Debug.Assert(!ReferenceEquals(oldMergedAnalysisData, CurrentAnalysisData));
-                            oldMergedAnalysisData?.Dispose();
-                        }
+                        var oldMergedAnalysisData = mergedCurrentAnalysisData;
+                        mergedCurrentAnalysisData = AnalyzePossibleTargetInvocation(
+                            computeValueForInvocation: () => method.MethodKind == MethodKind.LocalFunction ?
+                                VisitInvocation_LocalFunction(method, operation.Arguments, operation, defaultValue) :
+                                VisitInvocation_NonLambdaOrDelegateOrLocalFunction(method, instance, operation.Arguments,
+                                    invokedAsDelegate: true, originalOperation: operation, defaultValue: defaultValue),
+                            inputAnalysisData: savedCurrentAnalysisData,
+                            mergedAnalysisData: mergedCurrentAnalysisData,
+                            first: ref first);
+                        Debug.Assert(!ReferenceEquals(oldMergedAnalysisData, CurrentAnalysisData));
+                        oldMergedAnalysisData?.Dispose();
                     }
+                }
 
-                    if (lambdaTargetsOpt != null)
+                if (lambdaTargetsOpt != null)
+                {
+                    foreach (var lambda in lambdaTargetsOpt)
                     {
-                        foreach (var lambda in lambdaTargetsOpt)
-                        {
-                            var oldMergedAnalysisData = mergedCurrentAnalysisData;
-                            mergedCurrentAnalysisData = AnalyzePossibleTargetInvocation(
-                                computeValueForInvocation: () => VisitInvocation_Lambda(lambda, operation.Arguments, operation, defaultValue),
-                                inputAnalysisData: savedCurrentAnalysisData,
-                                mergedAnalysisData: mergedCurrentAnalysisData,
-                                first: ref first);
-                            Debug.Assert(!ReferenceEquals(oldMergedAnalysisData, CurrentAnalysisData));
-                            oldMergedAnalysisData?.Dispose();
-                        }
+                        var oldMergedAnalysisData = mergedCurrentAnalysisData;
+                        mergedCurrentAnalysisData = AnalyzePossibleTargetInvocation(
+                            computeValueForInvocation: () => VisitInvocation_Lambda(lambda, operation.Arguments, operation, defaultValue),
+                            inputAnalysisData: savedCurrentAnalysisData,
+                            mergedAnalysisData: mergedCurrentAnalysisData,
+                            first: ref first);
+                        Debug.Assert(!ReferenceEquals(oldMergedAnalysisData, CurrentAnalysisData));
+                        oldMergedAnalysisData?.Dispose();
                     }
-
-                    Debug.Assert(mergedCurrentAnalysisData == null || ReferenceEquals(mergedCurrentAnalysisData, CurrentAnalysisData));
                 }
+
+                Debug.Assert(mergedCurrentAnalysisData == null || ReferenceEquals(mergedCurrentAnalysisData, CurrentAnalysisData));
             }
 
             TAnalysisData AnalyzePossibleTargetInvocation(Func<TAbstractAnalysisValue> computeValueForInvocation, TAnalysisData inputAnalysisData, TAnalysisData mergedAnalysisData, ref bool first)
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/InterproceduralAnalysisData.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/InterproceduralAnalysisData.cs
index c1f071493a..1eaa9b45ee 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/InterproceduralAnalysisData.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/InterproceduralAnalysisData.cs
@@ -4,7 +4,6 @@
 using System.Collections.Immutable;
 using System.Diagnostics;
 using Analyzer.Utilities;
-using Analyzer.Utilities.PooledObjects;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.CopyAnalysis;
 using Microsoft.CodeAnalysis.FlowAnalysis.DataFlow.PointsToAnalysis;
 
@@ -78,30 +77,30 @@ public sealed class InterproceduralAnalysisData<TAnalysisData, TAnalysisContext,
         public Func<IOperation, AnalysisEntity> GetAnalysisEntityForFlowCapture { get; }
         public Func<ISymbol, ImmutableStack<IOperation>> GetInterproceduralCallStackForOwningSymbol { get; }
 
-        protected override void ComputeHashCodeParts(ArrayBuilder<int> builder)
+        protected override void ComputeHashCodeParts(Action<int> addPart)
         {
-            builder.Add(InitialAnalysisData.GetHashCodeOrDefault());
-            AddHashCodeParts(InvocationInstanceOpt, builder);
-            AddHashCodeParts(ThisOrMeInstanceForCallerOpt, builder);
-            builder.Add(HashUtilities.Combine(ArgumentValuesMap));
-            builder.Add(HashUtilities.Combine(CapturedVariablesMap));
-            builder.Add(HashUtilities.Combine(AddressSharedEntities));
-            builder.Add(HashUtilities.Combine(CallStack));
-            builder.Add(HashUtilities.Combine(MethodsBeingAnalyzed));
+            addPart(InitialAnalysisData.GetHashCodeOrDefault());
+            AddHashCodeParts(InvocationInstanceOpt, addPart);
+            AddHashCodeParts(ThisOrMeInstanceForCallerOpt, addPart);
+            addPart(HashUtilities.Combine(ArgumentValuesMap));
+            addPart(HashUtilities.Combine(CapturedVariablesMap));
+            addPart(HashUtilities.Combine(AddressSharedEntities));
+            addPart(HashUtilities.Combine(CallStack));
+            addPart(HashUtilities.Combine(MethodsBeingAnalyzed));
         }
 
         private static void AddHashCodeParts(
             (AnalysisEntity InstanceOpt, PointsToAbstractValue PointsToValue)? instanceAndPointsToValueOpt,
-            ArrayBuilder<int> builder)
+            Action<int> addPart)
         {
             if (instanceAndPointsToValueOpt.HasValue)
             {
-                builder.Add(instanceAndPointsToValueOpt.Value.InstanceOpt.GetHashCodeOrDefault());
-                builder.Add(instanceAndPointsToValueOpt.Value.PointsToValue.GetHashCode());
+                addPart(instanceAndPointsToValueOpt.Value.InstanceOpt.GetHashCodeOrDefault());
+                addPart(instanceAndPointsToValueOpt.Value.PointsToValue.GetHashCode());
             }
             else
             {
-                builder.Add(0);
+                addPart(0);
             }
         }
     }
diff --git a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/PredicatedAnalysisData.cs b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/PredicatedAnalysisData.cs
index 8536324178..87fbd4dea3 100644
--- a/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/PredicatedAnalysisData.cs
+++ b/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/PredicatedAnalysisData.cs
@@ -82,7 +82,7 @@ private void AssertValidAnalysisData()
 
         private void EnsurePredicatedData()
         {
-            _lazyPredicateDataMap = _lazyPredicateDataMap ?? new DictionaryAnalysisData<AnalysisEntity, PerEntityPredicatedAnalysisData>();
+            _lazyPredicateDataMap ??= new DictionaryAnalysisData<AnalysisEntity, PerEntityPredicatedAnalysisData>();
         }
 
         protected void StartTrackingPredicatedData(AnalysisEntity predicatedEntity, DictionaryAnalysisData<TKey, TValue> truePredicatedData, DictionaryAnalysisData<TKey, TValue> falsePredicatedData)
diff --git a/src/Utilities/FlowAnalysis/Options/DisposeAnalysisKind.cs b/src/Utilities/FlowAnalysis/Options/DisposeAnalysisKind.cs
index 6146ea38ae..8106a3eb07 100644
--- a/src/Utilities/FlowAnalysis/Options/DisposeAnalysisKind.cs
+++ b/src/Utilities/FlowAnalysis/Options/DisposeAnalysisKind.cs
@@ -7,7 +7,7 @@ namespace Analyzer.Utilities
     /// <summary>
     /// Describes a group of effective <see cref="SymbolVisibility"/> for symbols.
     /// </summary>
-    public enum DisposeAnalysisKind
+    internal enum DisposeAnalysisKind
     {
         // NOTE: Below fields names are used in the .editorconfig specification
         //       for DisposeAnalysisKind option. Hence the names should *not* be modified,
@@ -42,7 +42,7 @@ public enum DisposeAnalysisKind
         NonExceptionPathsOnlyNotDisposed,
     }
 
-    public static class DisposeAnalysisKindExtensions
+    internal static class DisposeAnalysisKindExtensions
     {
         public static bool AreExceptionPathsAndMayBeNotDisposedViolationsEnabled(this DisposeAnalysisKind disposeAnalysisKind)
             => disposeAnalysisKind.AreExceptionPathsEnabled() && disposeAnalysisKind.AreMayBeNotDisposedViolationsEnabled();