Merge pull request #43195 from dotnet/merges/release/dev16.5-to-release/dev16.5-vs-deps

Merge release/dev16.5 to release/dev16.5-vs-deps

Author: msftbot[bot]

.editorconfig

@@ -136,6 +136,9 @@ dotnet_naming_symbols.all_members.applicable_kinds = *
 
 dotnet_naming_style.pascal_case_style.capitalization = pascal_case
 
+# error RS2008: Enable analyzer release tracking for the analyzer project containing rule '{0}'
+dotnet_diagnostic.RS2008.severity = none
+
 # CSharp code style settings:
 [*.cs]
 # Newline settings

eng/Versions.props

@@ -54,7 +54,12 @@
     <MicrosoftBuildLocatorVersion>1.2.2</MicrosoftBuildLocatorVersion>
     <MicrosoftBuildRuntimeVersion>15.1.548</MicrosoftBuildRuntimeVersion>
     <MicrosoftBuildTasksCoreVersion>15.1.548</MicrosoftBuildTasksCoreVersion>
-    <MicrosoftCodeAnalysisAnalyzersVersion>$(RoslynDiagnosticsNugetPackageVersion)</MicrosoftCodeAnalysisAnalyzersVersion>
+    <!-- 
+      Since the Microsoft.CodeAnalysis.Analyzers package is a public dependency of our NuGet
+      packages we will keep it untied to the RoslynDiagnosticsNugetPackageVersion we use for
+      other analyzers to ensure it stays on a release version.
+    -->
+    <MicrosoftCodeAnalysisAnalyzersVersion>3.0.0</MicrosoftCodeAnalysisAnalyzersVersion>
     <MicrosoftCodeAnalysisBuildTasksVersion>2.0.0-rc2-61102-09</MicrosoftCodeAnalysisBuildTasksVersion>
     <MicrosoftCodeAnalysisCSharpCodeFixTestingXUnitVersion>$(MicrosoftCodeAnalysisTestingVersion)</MicrosoftCodeAnalysisCSharpCodeFixTestingXUnitVersion>
     <MicrosoftCodeAnalysisCSharpCodeStyleVersion>$(CodeStyleAnalyzerVersion)</MicrosoftCodeAnalysisCSharpCodeStyleVersion>

src/Features/CSharp/Portable/UseAutoProperty/CSharpUseAutoPropertyAnalyzer.cs

@@ -66,15 +66,13 @@ protected override void RegisterIneligibleFieldsAction(
             List<AnalysisResult> analysisResults, HashSet<IFieldSymbol> ineligibleFields,
             Compilation compilation, CancellationToken cancellationToken)
         {
-            var groups = analysisResults.Select(r => (TypeDeclarationSyntax)r.PropertyDeclaration.Parent)
+            var groups = analysisResults.Select(r => (typeDeclaration: (TypeDeclarationSyntax)r.PropertyDeclaration.Parent, r.SemanticModel))
                                         .Distinct()
-                                        .GroupBy(n => n.SyntaxTree);
+                                        .GroupBy(n => n.typeDeclaration.SyntaxTree);
 
             foreach (var (tree, typeDeclarations) in groups)
             {
-                var semanticModel = compilation.GetSemanticModel(tree);
-
-                foreach (var typeDeclaration in typeDeclarations)
+                foreach (var (typeDeclaration, semanticModel) in typeDeclarations)
                 {
                     foreach (var argument in typeDeclaration.DescendantNodesAndSelf().OfType<ArgumentSyntax>())
                     {

src/Features/CSharp/Portable/UsePatternMatching/CSharpIsAndCastCheckWithoutNameDiagnosticAnalyzer.cs

@@ -223,7 +223,9 @@ public SemanticModel ReplaceMatches(
 
             var updatedCompilation = semanticModel.Compilation.ReplaceSyntaxTree(
                 semanticModel.SyntaxTree, updatedSyntaxTree);
+#pragma warning disable RS1030 // Do not invoke Compilation.GetSemanticModel() method within a diagnostic analyzer
             return updatedCompilation.GetSemanticModel(updatedSyntaxTree);
+#pragma warning restore RS1030 // Do not invoke Compilation.GetSemanticModel() method within a diagnostic analyzer
         }
 
         private SyntaxNode GetContainer(BinaryExpressionSyntax isExpression)

src/Features/Core/Portable/UseAutoProperty/AbstractUseAutoPropertyAnalyzer.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Threading;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeStyle;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Shared.Extensions;
@@ -230,7 +231,7 @@ protected void AnalyzeProperty(
 
             // Looks like a viable property/field to convert into an auto property.
             analysisResults.Add(new AnalysisResult(property, getterField, propertyDeclaration,
-                fieldDeclaration, variableDeclarator, property.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)));
+                fieldDeclaration, variableDeclarator, semanticModel, property.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)));
         }
 
         protected virtual bool CanConvert(IPropertySymbol property)
@@ -358,6 +359,7 @@ internal class AnalysisResult
             public readonly TPropertyDeclaration PropertyDeclaration;
             public readonly TFieldDeclaration FieldDeclaration;
             public readonly TVariableDeclarator VariableDeclarator;
+            public readonly SemanticModel SemanticModel;
             public readonly string SymbolEquivalenceKey;
 
             public AnalysisResult(
@@ -366,13 +368,15 @@ public AnalysisResult(
                 TPropertyDeclaration propertyDeclaration,
                 TFieldDeclaration fieldDeclaration,
                 TVariableDeclarator variableDeclarator,
+                SemanticModel semanticModel,
                 string symbolEquivalenceKey)
             {
                 Property = property;
                 Field = field;
                 PropertyDeclaration = propertyDeclaration;
                 FieldDeclaration = fieldDeclaration;
                 VariableDeclarator = variableDeclarator;
+                SemanticModel = semanticModel;
                 SymbolEquivalenceKey = symbolEquivalenceKey;
             }
         }

src/Features/Core/Portable/UseThrowExpression/AbstractUseThrowExpressionDiagnosticAnalyzer.cs

@@ -74,8 +74,7 @@ private void AnalyzeOperation(OperationAnalysisContext context, INamedTypeSymbol
             var throwOperation = (IThrowOperation)context.Operation;
             var throwStatementSyntax = throwOperation.Syntax;
 
-            var compilation = context.Compilation;
-            var semanticModel = compilation.GetSemanticModel(throwStatementSyntax.SyntaxTree);
+            var semanticModel = context.Operation.SemanticModel;
 
             var ifOperation = GetContainingIfOperation(
                 semanticModel, throwOperation, cancellationToken);

src/Features/VisualBasic/Portable/UseAutoProperty/VisualBasicUseAutoPropertyAnalyzer.vb

@@ -172,7 +172,9 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.UseAutoProperty
             For Each ref In containingType.DeclaringSyntaxReferences
                 Dim containingNode = ref.GetSyntax(cancellationToken)?.Parent
                 If containingNode IsNot Nothing Then
+#Disable Warning RS1030 ' Do not invoke Compilation.GetSemanticModel() method within a diagnostic analyzer
                     Dim semanticModel = compilation.GetSemanticModel(containingNode.SyntaxTree)
+#Enable Warning RS1030 ' Do not invoke Compilation.GetSemanticModel() method within a diagnostic analyzer
                     If IsWrittenOutsideOfConstructorOrProperty(field, propertyDeclaration, containingNode, semanticModel, cancellationToken) Then
                         Return False
                     End If

src/Test/Utilities/Portable/Diagnostics/CouldHaveMoreSpecificTypeAnalyzer.cs

@@ -65,7 +65,7 @@ public sealed override void Initialize(AnalysisContext context)
                                            ITypeSymbol type = increment.Type;
                                            Optional<object> constantValue = new Optional<object>(1);
                                            bool isImplicit = increment.IsImplicit;
-                                           var value = new LiteralOperation(operationContext.Compilation.GetSemanticModel(syntax.SyntaxTree), syntax, type, constantValue, isImplicit);
+                                           var value = new LiteralOperation(increment.SemanticModel, syntax, type, constantValue, isImplicit);
 
                                            AssignTo(increment.Target, localsSourceTypes, fieldsSourceTypes, value);
                                        }