fb

Author: BrennanConroy

docs/list-of-diagnostics.md

@@ -35,6 +35,7 @@
 |  __`ASP0027`__ | Unnecessary public Program class declaration |
 |  __`ASP0028`__ | Consider using ListenAnyIP() instead of Listen(IPAddress.Any) |
 |  __`ASP0029`__ | Experimental warning for validations resolver APIs |
+|  __`ASP0030`__ | Use Host.CreateDefaultBuilder instead of WebHost.CreateDefaultBuilder |
 
 ### API (`API1000-API1003`)
 

src/Framework/AspNetCoreAnalyzers/src/Analyzers/DiagnosticDescriptors.cs

@@ -250,7 +250,7 @@ internal static class DiagnosticDescriptors
         helpLinkUri: AnalyzersLink);
 
     internal static readonly DiagnosticDescriptor UseCreateHostBuilderInsteadOfCreateWebHostBuilder = new(
-        "ASP0029",
+        "ASP0030",
         CreateLocalizableResourceString(nameof(Resources.Analyzer_UseCreateHostBuilderInsteadOfCreateWebHostBuilder_Title)),
         CreateLocalizableResourceString(nameof(Resources.Analyzer_UseCreateHostBuilderInsteadOfCreateWebHostBuilder_Message)),
         Usage,

src/Framework/AspNetCoreAnalyzers/src/Analyzers/WebApplicationBuilder/UseCreateHostBuilderInsteadOfCreateWebHostBuilderAnalyzer.cs

@@ -10,6 +10,8 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Operations;
 
+using WellKnownType = Microsoft.AspNetCore.App.Analyzers.Infrastructure.WellKnownTypeData.WellKnownType;
+
 namespace Microsoft.AspNetCore.Analyzers.WebApplicationBuilder;
 
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
@@ -34,7 +36,7 @@ public override void Initialize(AnalysisContext context)
                 var targetMethod = invocation.TargetMethod;
 
                 // Check if this is WebHost.CreateDefaultBuilder
-                if (IsWebHostCreateDefaultBuilderCall(targetMethod))
+                if (IsWebHostCreateDefaultBuilderCall(targetMethod, wellKnownTypes))
                 {
                     var diagnostic = Diagnostic.Create(
                         DiagnosticDescriptors.UseCreateHostBuilderInsteadOfCreateWebHostBuilder,
@@ -51,7 +53,7 @@ public override void Initialize(AnalysisContext context)
                 var symbol = semantic.GetDeclaredSymbol(methodDeclaration);
 
                 // Check if this method returns IWebHostBuilder
-                if (symbol != null && IsWebHostBuilderReturnType(symbol))
+                if (symbol != null && IsWebHostBuilderReturnType(symbol, wellKnownTypes))
                 {
                     // Check if the method body contains WebHost.CreateDefaultBuilder
                     if (ContainsWebHostCreateDefaultBuilder(methodDeclaration))
@@ -67,25 +69,23 @@ public override void Initialize(AnalysisContext context)
         });
     }
 
-    private static bool IsWebHostCreateDefaultBuilderCall(IMethodSymbol method)
+    private static bool IsWebHostCreateDefaultBuilderCall(IMethodSymbol method, WellKnownTypes wellKnownTypes)
     {
         // Check if this is WebHost.CreateDefaultBuilder (not other WebHost methods)
-        if (method.Name == "CreateDefaultBuilder" && 
-            method.ContainingType?.Name == "WebHost" &&
-            method.ContainingType?.ContainingNamespace?.ToDisplayString() == "Microsoft.AspNetCore")
+        if (method.Name == "CreateDefaultBuilder" &&
+            SymbolEqualityComparer.Default.Equals(method.ContainingType, wellKnownTypes.Get(WellKnownType.Microsoft_AspNetCore_WebHost)))
         {
             return true;
         }
 
         return false;
     }
 
-    private static bool IsWebHostBuilderReturnType(IMethodSymbol method)
+    private static bool IsWebHostBuilderReturnType(IMethodSymbol method, WellKnownTypes wellKnownTypes)
     {
         // Check if the return type is IWebHostBuilder
         var returnType = method.ReturnType;
-        return returnType.Name == "IWebHostBuilder" && 
-               returnType.ContainingNamespace?.ToDisplayString() == "Microsoft.AspNetCore.Hosting";
+        return SymbolEqualityComparer.Default.Equals(returnType, wellKnownTypes.Get(WellKnownType.Microsoft_AspNetCore_Hosting_IWebHostBuilder));
     }
 
     private static bool ContainsWebHostCreateDefaultBuilder(MethodDeclarationSyntax methodDeclaration)

src/Framework/AspNetCoreAnalyzers/src/CodeFixes/UseCreateHostBuilderInsteadOfCreateWebHostBuilderFixer.cs

@@ -129,7 +129,7 @@ private static async Task<Document> ConvertWebHostBuilderMethod(Document documen
 
     private static bool IsWebHostBuilderType(TypeSyntax typeSyntax)
     {
-        return typeSyntax.ToString().Contains("IWebHostBuilder");
+        return typeSyntax.ToString().Equals("IWebHostBuilder");
     }
 
     private static async Task<Document> ConvertWebHostCreateDefaultBuilder(Document document, InvocationExpressionSyntax invocation, CancellationToken cancellationToken)
@@ -257,7 +257,7 @@ private static ExpressionSyntax TransformExpression(ExpressionSyntax expression)
                     hostCreateCall.WithTrailingTrivia(),
                     SyntaxFactory.IdentifierName("ConfigureWebHostDefaults"))
                     .WithOperatorToken(SyntaxFactory.Token(SyntaxKind.DotToken)
-                        .WithLeadingTrivia(SyntaxFactory.EndOfLine("\r\n"))
+                        .WithLeadingTrivia(SyntaxFactory.ElasticCarriageReturnLineFeed)
                         .WithTrailingTrivia()))
                 .WithArgumentList(SyntaxFactory.ArgumentList(
                     SyntaxFactory.SingletonSeparatedList(
@@ -267,11 +267,13 @@ private static ExpressionSyntax TransformExpression(ExpressionSyntax expression)
             ExpressionSyntax result = configureCall;
             if (remainingChain != null)
             {
-                // Replace the placeholder with the actual configure call
-                result = remainingChain.ReplaceNode(
-                    remainingChain.DescendantNodes().OfType<IdentifierNameSyntax>()
-                        .First(n => n.Identifier.ValueText == "HOST_PLACEHOLDER"),
-                    configureCall);
+                var placeHolder = remainingChain.DescendantNodes().OfType<IdentifierNameSyntax>()
+                        .FirstOrDefault(n => n.Identifier.ValueText == "HOST_PLACEHOLDER");
+                if (placeHolder != null)
+                {
+                    // Replace the placeholder with the actual configure call
+                    result = remainingChain.ReplaceNode(placeHolder, configureCall);
+                }
             }
 
             return result.WithTrailingTrivia(expression.GetTrailingTrivia())