Fixup

Author: pranavkm

AspNetCore.sln

@@ -1642,11 +1642,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Identity.DefaultUI.WebSite", "src\Identity\testassets\Identity.DefaultUI.WebSite\Identity.DefaultUI.WebSite.csproj", "{835A4E0F-A697-4B69-9736-3E99D163C4B9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.App.Analyzer", "src\Framework\Analyzer\src\Microsoft.AspNetCore.App.Analyzer.csproj", "{564CABB8-1B3F-4D9E-909D-260EF2B8614A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.App.Analyzer", "src\Framework\Analyzer\src\Microsoft.AspNetCore.App.Analyzers.csproj", "{564CABB8-1B3F-4D9E-909D-260EF2B8614A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Analyzer", "Analyzer", "{EE39397E-E4AF-4D3F-9B9C-D637F9222CDD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.App.Analyzer.Test", "src\Framework\Analyzer\test\Microsoft.AspNetCore.App.Analyzer.Test.csproj", "{CF4CEC18-798D-46EC-B0A0-98D97496590F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.App.Analyzer.Test", "src\Framework\Analyzer\test\Microsoft.AspNetCore.App.Analyzers.Test.csproj", "{CF4CEC18-798D-46EC-B0A0-98D97496590F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/Analyzers/Analyzers/src/StartupAnalysisBuilder.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Generic;
@@ -18,7 +18,9 @@ public StartupAnalysisBuilder(StartupAnalyzer analyzer, StartupSymbols startupSy
             _analyzer = analyzer;
             StartupSymbols = startupSymbols;
 
-            _analysesByType = new Dictionary<INamedTypeSymbol, List<object>>();
+#pragma warning disable RS1024 // Compare symbols correctly
+            _analysesByType = new Dictionary<INamedTypeSymbol, List<object>>(SymbolEqualityComparer.Default);
+#pragma warning restore RS1024 // Compare symbols correctly
             _lock = new object();
         }
 

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

@@ -38,7 +38,7 @@ static Diagnostics()
 
             internal static readonly DiagnosticDescriptor UnsupportedUseMvcWithEndpointRouting = new DiagnosticDescriptor(
                 "MVC1005",
-                "Cannot use UseMvc with Endpoint Routing.",
+                "Cannot use UseMvc with Endpoint Routing",
                 "Using '{0}' to configure MVC is not supported while using Endpoint Routing. To continue using '{0}', please set 'MvcOptions.EnableEndpointRouting = false' inside '{1}'.",
                 "Usage",
                 DiagnosticSeverity.Warning,
@@ -47,8 +47,8 @@ static Diagnostics()
 
             internal static readonly DiagnosticDescriptor IncorrectlyConfiguredAuthorizationMiddleware = new DiagnosticDescriptor(
                 "ASP0001",
-                "Authorization middleware is incorrectly configured.",
-                "The call to UseAuthorization should appear between app.UseRouting() and app.UseEndpoints(..) for authorization to be correctly evaluated.",
+                "Authorization middleware is incorrectly configured",
+                "The call to UseAuthorization should appear between app.UseRouting() and app.UseEndpoints(..) for authorization to be correctly evaluated",
                 "Usage",
                 DiagnosticSeverity.Warning,
                 isEnabledByDefault: true,

src/Components/Web.JS/dist/Release/blazor.server.js

@@ -13,7 +13,7 @@
     <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" PrivateAssets="All" />
     <Reference Include="System.Memory" />
 
-    <InternalsVisibleTo Include="Microsoft.AspNetCore.App.Analyzer.Test" />
+    <InternalsVisibleTo Include="Microsoft.AspNetCore.App.Analyzers.Test" />
   </ItemGroup>
 
   <ItemGroup>

src/Framework/Analyzer/src/Microsoft.AspNetCore.App.Analyzer.csproj renamed to src/Framework/Analyzer/src/Microsoft.AspNetCore.App.Analyzers.csproj

@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Collections.Immutable;
 using Microsoft.CodeAnalysis;
 
 namespace Microsoft.AspNetCore.Analyzers.MinimalActions
@@ -11,31 +10,11 @@ internal static class DiagnosticDescriptors
     {
         internal static readonly DiagnosticDescriptor DoNotUseModelBindingAttributesOnMinimalActionParameters = new(
             "ASP0003",
-            "Do not use model binding attributes with minimal actions",
-            "Attribute '{0}' should not be specified for a minimal action parameter",
+            "Do not use model binding attributes with Map actions",
+            "{0} should not be specified for a {1} delegate parameter",
             "Usage",
             DiagnosticSeverity.Warning,
             isEnabledByDefault: true,
             helpLinkUri: "https://aka.ms/minimal-action/analyzer");
-
-        internal static readonly DiagnosticDescriptor RouteValueIsUnused = new(
-            "ASP0004",
-            "Route value is unused",
-            "The route value '{0}' does not get bound and can be removed",
-            "Usage",
-            DiagnosticSeverity.Warning,
-            isEnabledByDefault: true,
-            helpLinkUri: "https://aka.ms/minimal-action/analyzer");
-
-        internal static readonly DiagnosticDescriptor RouteParameterCannotBeBound = new(
-            "ASP0005",
-            "Route parameter is not bound",
-            "Route parameter does not have a corresponding route token and cannot be bound",
-            "Usage",
-            DiagnosticSeverity.Warning,
-            isEnabledByDefault: true,
-            helpLinkUri: "https://aka.ms/minimal-action/analyzer");
-
-
     }
 }

src/Framework/Analyzer/src/MinimalActions/DiagnosticDescriptors.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Operations;
 
 namespace Microsoft.AspNetCore.Analyzers.MinimalActions;
 
@@ -12,6 +13,7 @@ public partial class MinimalActionAnalyzer : DiagnosticAnalyzer
     private static void DisallowMvcBindArgumentsOnParameters(
         in OperationAnalysisContext context,
         WellKnownTypes wellKnownTypes,
+        IInvocationOperation invocation,
         IMethodSymbol methodSymbol)
     {
         foreach (var parameter in methodSymbol.Parameters)
@@ -28,10 +30,13 @@ private static void DisallowMvcBindArgumentsOnParameters(
                     location = syntax.GetLocation();
                 }
 
+                var methodName = invocation.TargetMethod.Name;
+
                 context.ReportDiagnostic(Diagnostic.Create(
                     DiagnosticDescriptors.DoNotUseModelBindingAttributesOnMinimalActionParameters,
                     location,
-                    modelBindingAttribute.AttributeClass.Name));
+                    modelBindingAttribute.AttributeClass.Name,
+                    methodName));
             }
         }
     }

src/Framework/Analyzer/src/MinimalActions/DisallowMvcBindArgumentsOnParameters.cs

@@ -16,8 +16,6 @@ public partial class MinimalActionAnalyzer : DiagnosticAnalyzer
     public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics { get; } = ImmutableArray.Create(new[]
     {
         DiagnosticDescriptors.DoNotUseModelBindingAttributesOnMinimalActionParameters,
-        DiagnosticDescriptors.RouteValueIsUnused,
-        DiagnosticDescriptors.RouteParameterCannotBeBound,
     });
 
     public override void Initialize(AnalysisContext context)
@@ -51,13 +49,12 @@ public override void Initialize(AnalysisContext context)
                 if (delegateCreation.Target.Kind == OperationKind.AnonymousFunction)
                 {
                     var lambda = ((IAnonymousFunctionOperation)delegateCreation.Target);
-                    DisallowMvcBindArgumentsOnParameters(in operationAnalysisContext, wellKnownTypes, lambda.Symbol);
-                    RouteAttributeMismatch(in operationAnalysisContext, wellKnownTypes, invocation, lambda.Symbol);
+                    DisallowMvcBindArgumentsOnParameters(in operationAnalysisContext, wellKnownTypes, invocation, lambda.Symbol);
                 }
                 else if (delegateCreation.Target.Kind == OperationKind.MethodReference)
                 {
                     var methodReference = (IMethodReferenceOperation)delegateCreation.Target;
-                    DisallowMvcBindArgumentsOnParameters(in operationAnalysisContext, wellKnownTypes, methodReference.Method);
+                    DisallowMvcBindArgumentsOnParameters(in operationAnalysisContext, wellKnownTypes, invocation, methodReference.Method);
                 }
             }, OperationKind.Invocation);
         });

src/Framework/Analyzer/src/MinimalActions/MinimalActionAnalyzer.cs

@@ -31,18 +31,11 @@ public static bool TryCreate(Compilation compilation, [NotNullWhen(true)] out We
             return false;
         }
 
-        const string IFromRouteMetadata = "Microsoft.AspNetCore.Http.Metadata.IFromRouteMetadata";
-        if (compilation.GetTypeByMetadataName(IFromRouteMetadata) is not { } iFromRouteMetadata)
-        {
-            return false;
-        }
-
         wellKnownTypes = new WellKnownTypes
         {
             MinimalActionEndpointRouteBuilderExtensions = minimalActionEndpointRouteBuilderExtensions,
             IBinderTypeProviderMetadata = ibinderTypeProviderMetadata,
             BindAttribute = bindAttribute,
-            IFromRouteMetadata = iFromRouteMetadata,
         };
 
         return true;
@@ -51,5 +44,4 @@ public static bool TryCreate(Compilation compilation, [NotNullWhen(true)] out We
     public ITypeSymbol MinimalActionEndpointRouteBuilderExtensions { get; private init; }
     public INamedTypeSymbol IBinderTypeProviderMetadata { get; private init; }
     public INamedTypeSymbol BindAttribute { get; private init; }
-    public INamedTypeSymbol IFromRouteMetadata { get; private init; }
 }

src/Framework/Analyzer/src/MinimalActions/RouteAttributeMismatch.cs

@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\src\Microsoft.AspNetCore.App.Analyzer.csproj" />
+    <ProjectReference Include="..\src\Microsoft.AspNetCore.App.Analyzers.csproj" />
     <ProjectReference Include="$(RepoRoot)src\Analyzers\Microsoft.AspNetCore.Analyzer.Testing\src\Microsoft.AspNetCore.Analyzer.Testing.csproj" />
     <Reference Include="Microsoft.AspNetCore" />
     <Reference Include="Microsoft.AspNetCore.Mvc" />

src/Framework/Analyzer/src/MinimalActions/WellKnownTypes.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Globalization;
 using Microsoft.AspNetCore.Analyzer.Testing;
 using Xunit;
 
@@ -60,6 +61,7 @@ public async Task MinimalAction_Lambda_WithBindAttributes_ProducesDiagnostics()
         var diagnostic = Assert.Single(diagnostics);
         Assert.Same(DiagnosticDescriptors.DoNotUseModelBindingAttributesOnMinimalActionParameters, diagnostic.Descriptor);
         AnalyzerAssert.DiagnosticLocation(source.DefaultMarkerLocation, diagnostic.Location);
+        Assert.Equal("BindAttribute should not be specified for a MapGet delegate parameter", diagnostic.GetMessage(CultureInfo.InvariantCulture));
     }
 
     [Fact]
@@ -72,7 +74,7 @@ public async Task MinimalAction_MethodReference_WithBindAttributes_ProducesDiagn
 var webApp = WebApplication.Create();
 webApp.MapPost(""/"", PostWithBind);
 
-static void PostWithBind(/*MM*/[Bind] string name) {}
+static void PostWithBind(/*MM*/[ModelBinder] string name) {}
 ");
         // Act
         var diagnostics = await Runner.GetDiagnosticsAsync(source.Source);
@@ -81,6 +83,7 @@ static void PostWithBind(/*MM*/[Bind] string name) {}
         var diagnostic = Assert.Single(diagnostics);
         Assert.Same(DiagnosticDescriptors.DoNotUseModelBindingAttributesOnMinimalActionParameters, diagnostic.Descriptor);
         AnalyzerAssert.DiagnosticLocation(source.DefaultMarkerLocation, diagnostic.Location);
+        Assert.Equal("ModelBinderAttribute should not be specified for a MapPost delegate parameter", diagnostic.GetMessage(CultureInfo.InvariantCulture));
     }
 }