Merge pull request #23717 from dotnet-maestro-bot/merge/release/5.0-preview7-to-master

[automated] Merge branch 'release/5.0-preview7' => 'master'

Author: msftbot[bot]

eng/Versions.props

@@ -185,9 +185,9 @@
     <MicrosoftBuildFrameworkPackageVersion>15.8.166</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildLocatorPackageVersion>1.2.6</MicrosoftBuildLocatorPackageVersion>
     <MicrosoftBuildUtilitiesCorePackageVersion>15.8.166</MicrosoftBuildUtilitiesCorePackageVersion>
-    <MicrosoftCodeAnalysisCommonPackageVersion>3.4.0</MicrosoftCodeAnalysisCommonPackageVersion>
-    <MicrosoftCodeAnalysisCSharpPackageVersion>3.4.0</MicrosoftCodeAnalysisCSharpPackageVersion>
-    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>3.4.0</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
+    <MicrosoftCodeAnalysisCommonPackageVersion>3.7.0-4.20351.7</MicrosoftCodeAnalysisCommonPackageVersion>
+    <MicrosoftCodeAnalysisCSharpPackageVersion>3.7.0-4.20351.7</MicrosoftCodeAnalysisCSharpPackageVersion>
+    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>3.7.0-4.20351.7</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
     <MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>3.19.8</MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>
     <MicrosoftIdentityModelLoggingPackageVersion>5.5.0</MicrosoftIdentityModelLoggingPackageVersion>
     <MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>5.5.0</MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>

src/Analyzers/Analyzers/src/MiddlewareAnalyzer.cs

@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. 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;
@@ -33,7 +33,7 @@ public void AnalyzeConfigureMethod(OperationBlockStartAnalysisContext context)
                 if (context.Operation is IInvocationOperation invocation &&
                     invocation.Instance == null &&
                     invocation.Arguments.Length >= 1 &&
-                    invocation.Arguments[0].Parameter?.Type == _context.StartupSymbols.IApplicationBuilder)
+                    SymbolEqualityComparer.Default.Equals(invocation.Arguments[0].Parameter?.Type, _context.StartupSymbols.IApplicationBuilder))
                 {
                     middleware.Add(new MiddlewareItem(invocation));
                 }

src/Analyzers/Analyzers/src/ServicesAnalyzer.cs

@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. 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;
@@ -28,7 +28,7 @@ public void AnalyzeConfigureServices(OperationBlockStartAnalysisContext context)
                 if (context.Operation is IInvocationOperation invocation &&
                     invocation.Instance == null &&
                     invocation.Arguments.Length >= 1 &&
-                    invocation.Arguments[0].Parameter?.Type == _context.StartupSymbols.IServiceCollection)
+                    SymbolEqualityComparer.Default.Equals(invocation.Arguments[0].Parameter?.Type, _context.StartupSymbols.IServiceCollection))
                 {
                     services.Add(new ServicesItem(invocation));
                 }

src/Analyzers/Analyzers/src/StartupAnalyzer.Diagnostics.cs

@@ -9,6 +9,7 @@ namespace Microsoft.AspNetCore.Analyzers
 {
     public partial class StartupAnalyzer : DiagnosticAnalyzer
     {
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("MicrosoftCodeAnalysisReleaseTracking", "RS2008:Enable analyzer release tracking")]
         internal static class Diagnostics
         {
             public static readonly ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics;

src/Analyzers/Analyzers/src/StartupFacts.cs

@@ -74,12 +74,7 @@ public static bool IsConfigureServices(StartupSymbols symbols, IMethodSymbol sym
                 return false;
             }
 
-            if (symbol.Parameters[0].Type != symbols.IServiceCollection)
-            {
-                return false;
-            }
-
-            return true;
+            return SymbolEqualityComparer.Default.Equals(symbol.Parameters[0].Type, symbols.IServiceCollection);
         }
 
         // Based on StartupLoader. The philosophy is that we want to do analysis only on things
@@ -114,7 +109,7 @@ public static bool IsConfigure(StartupSymbols symbols, IMethodSymbol symbol)
             // IApplicationBuilder can appear in any parameter, but must appear.
             for (var i = 0; i < symbol.Parameters.Length; i++)
             {
-                if (symbol.Parameters[i].Type == symbols.IApplicationBuilder)
+                if (SymbolEqualityComparer.Default.Equals(symbol.Parameters[i].Type, symbols.IApplicationBuilder))
                 {
                     return true;
                 }

src/Components/Analyzers/src/DiagnosticDescriptors.cs

@@ -5,6 +5,7 @@
 
 namespace Microsoft.AspNetCore.Components.Analyzers
 {
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("MicrosoftCodeAnalysisReleaseTracking", "RS2008:Enable analyzer release tracking")]
     internal static class DiagnosticDescriptors
     {
         // Note: The Razor Compiler (including Components features) use the RZ prefix for diagnostics, so there's currently

src/Mvc/Mvc.Analyzers/src/DiagnosticDescriptors.cs

@@ -5,6 +5,7 @@
 
 namespace Microsoft.AspNetCore.Mvc.Analyzers
 {
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("MicrosoftCodeAnalysisReleaseTracking", "RS2008:Enable analyzer release tracking")]
     public static class DiagnosticDescriptors
     {
         public static readonly DiagnosticDescriptor MVC1000_HtmlHelperPartialShouldBeAvoided =

src/Mvc/Mvc.Api.Analyzers/src/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzer.cs

@@ -84,7 +84,9 @@ private void InitializeWorker(CompilationStartAnalysisContext context, ApiContro
                     return;
                 }
 
+#pragma warning disable RS1030 // Do not invoke Compilation.GetSemanticModel() method within a diagnostic analyzer
                 var semanticModel = operationAnalysisContext.Compilation.GetSemanticModel(methodSyntax.SyntaxTree);
+#pragma warning restore RS1030 // Do not invoke Compilation.GetSemanticModel() method within a diagnostic analyzer
                 var methodSymbol = semanticModel.GetDeclaredSymbol(methodSyntax, operationAnalysisContext.CancellationToken);
 
                 if (!ApiControllerFacts.IsApiControllerAction(symbolCache, methodSymbol))

src/Mvc/Mvc.Api.Analyzers/src/ApiDiagnosticDescriptors.cs

@@ -5,6 +5,7 @@
 
 namespace Microsoft.AspNetCore.Mvc.Api.Analyzers
 {
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("MicrosoftCodeAnalysisReleaseTracking", "RS2008:Enable analyzer release tracking")]
     internal static class ApiDiagnosticDescriptors
     {
         public static readonly DiagnosticDescriptor API1000_ActionReturnsUndocumentedStatusCode =

src/Mvc/Mvc.Razor.RuntimeCompilation/test/RuntimeViewCompilerTest.cs

@@ -765,7 +765,7 @@ public void Compile_ReturnsGeneratedCodePath_IfLinePragmaIsNotAvailable()
             // Arrange
             var viewPath = "some-relative-path";
             var fileContent = "file content";
-            var content = "this should fail";
+            var content = "public class Bad { this should fail }";
 
             var compiler = GetViewCompiler(new TestFileProvider());
             var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create(fileContent, viewPath));