Fix Types.Analyzers node resolver ID parameter handling for non-id names

dictionary.txt

@@ -206,3 +206,4 @@ websockets
 Wilhuff
 Wunder
 xunit
+Expando

src/CookieCrumble/src/CookieCrumble/Snapshot.cs

@@ -469,6 +469,12 @@ private void WriteMarkdownSegments(IBufferWriter<byte> writer)
         foreach (var segment in _segments)
         {
             i++;
+
+            if (i > 1)
+            {
+                writer.AppendLine();
+            }
+
             writer.Append(
                 string.IsNullOrEmpty(segment.Name)
                     ? $"## Result {i}"
@@ -499,8 +505,6 @@ private void WriteMarkdownSegments(IBufferWriter<byte> writer)
                 default:
                     throw new NotSupportedException();
             }
-
-            writer.AppendLine();
         }
     }
 

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperIntegrationTests.BatchPaging_First_5.md

@@ -150,4 +150,3 @@ ORDER BY p1."BrandId", p3."BrandId", p3."Name", p3."Id"
 ```text
 [Microsoft.EntityFrameworkCore.Query.EntityQueryRootExpression].Where(t => (((t.BrandId == 1) OrElse (t.BrandId == 2)) OrElse (t.BrandId == 3))).GroupBy(k => k.BrandId).Select(g => new Group`2() {Key = g.Key, Items = g.OrderBy(p => p.Name).ThenBy(p => p.Id).Take(3).ToList()})
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperIntegrationTests.BatchPaging_First_5_NET8_0.md

@@ -150,4 +150,3 @@ ORDER BY t."BrandId", t0."BrandId", t0."Name", t0."Id"
 ```text
 [Microsoft.EntityFrameworkCore.Query.EntityQueryRootExpression].Where(t => (((t.BrandId == 1) OrElse (t.BrandId == 2)) OrElse (t.BrandId == 3))).GroupBy(k => k.BrandId).Select(g => new Group`2() {Key = g.Key, Items = g.OrderBy(p => p.Name).ThenBy(p => p.Id).Take(3).ToList()})
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperIntegrationTests.BatchPaging_Last_5.md

@@ -150,4 +150,3 @@ ORDER BY p1."BrandId", p3."BrandId", p3."Id" DESC
 ```text
 [Microsoft.EntityFrameworkCore.Query.EntityQueryRootExpression].Where(t => (((t.BrandId == 1) OrElse (t.BrandId == 2)) OrElse (t.BrandId == 3))).GroupBy(k => k.BrandId).Select(g => new Group`2() {Key = g.Key, Items = g.OrderByDescending(p => p.Id).Take(3).ToList()})
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperIntegrationTests.BatchPaging_Last_5_NET8_0.md

@@ -150,4 +150,3 @@ ORDER BY t."BrandId", t0."BrandId", t0."Id" DESC
 ```text
 [Microsoft.EntityFrameworkCore.Query.EntityQueryRootExpression].Where(t => (((t.BrandId == 1) OrElse (t.BrandId == 2)) OrElse (t.BrandId == 3))).GroupBy(k => k.BrandId).Select(g => new Group`2() {Key = g.Key, Items = g.OrderByDescending(p => p.Id).Take(3).ToList()})
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperIntegrationTests.BatchPaging_With_Relative_Cursor.md

@@ -165,4 +165,3 @@ ORDER BY p1."BrandId", p3."BrandId", p3."Id"
 ```text
 [Microsoft.EntityFrameworkCore.Query.EntityQueryRootExpression].Where(t => (((t.BrandId == 1) OrElse (t.BrandId == 2)) OrElse (t.BrandId == 3))).GroupBy(k => k.BrandId).Select(g => new Group`2() {Key = g.Key, Items = g.OrderBy(p => p.Id).Take(3).ToList()})
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperIntegrationTests.BatchPaging_With_Relative_Cursor_NET8_0.md

@@ -165,4 +165,3 @@ ORDER BY t."BrandId", t0."BrandId", t0."Id"
 ```text
 [Microsoft.EntityFrameworkCore.Query.EntityQueryRootExpression].Where(t => (((t.BrandId == 1) OrElse (t.BrandId == 2)) OrElse (t.BrandId == 3))).GroupBy(k => k.BrandId).Select(g => new Group`2() {Key = g.Key, Items = g.OrderBy(p => p.Id).Take(3).ToList()})
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperIntegrationTests.Paging_Empty_PagingArgs_NET10_0.md

@@ -155,4 +155,3 @@ LIMIT @p
   }
 ]
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperIntegrationTests.Paging_Empty_PagingArgs_NET8_0.md

@@ -155,4 +155,3 @@ LIMIT @__p_0
   }
 ]
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperIntegrationTests.Paging_Empty_PagingArgs_NET9_0.md

@@ -155,4 +155,3 @@ LIMIT @__p_0
   }
 ]
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperIntegrationTests.Paging_First_5_After_Id_13_NET10_0.md

@@ -98,4 +98,3 @@ LIMIT @p
   }
 ]
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperIntegrationTests.Paging_First_5_After_Id_13_NET8_0.md

@@ -98,4 +98,3 @@ LIMIT @__p_2
   }
 ]
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperIntegrationTests.Paging_First_5_After_Id_13_NET9_0.md

@@ -98,4 +98,3 @@ LIMIT @__p_2
   }
 ]
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperIntegrationTests.Paging_First_5_Before_Id_96_NET10_0.md

@@ -98,4 +98,3 @@ LIMIT @p
   }
 ]
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperIntegrationTests.Paging_First_5_Before_Id_96_NET8_0.md

@@ -98,4 +98,3 @@ LIMIT @__p_2
   }
 ]
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperIntegrationTests.Paging_First_5_Before_Id_96_NET9_0.md

@@ -98,4 +98,3 @@ LIMIT @__p_2
   }
 ]
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperIntegrationTests.Paging_First_5_NET10_0.md

@@ -95,4 +95,3 @@ LIMIT @p
   }
 ]
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperIntegrationTests.Paging_First_5_NET8_0.md

@@ -95,4 +95,3 @@ LIMIT @__p_0
   }
 ]
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperIntegrationTests.Paging_First_5_NET9_0.md

@@ -95,4 +95,3 @@ LIMIT @__p_0
   }
 ]
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperIntegrationTests.Paging_Last_5_NET10_0.md

@@ -97,4 +97,3 @@ LIMIT @p
   }
 ]
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperIntegrationTests.Paging_Last_5_NET8_0.md

@@ -97,4 +97,3 @@ LIMIT @__p_0
   }
 ]
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperIntegrationTests.Paging_Last_5_NET9_0.md

@@ -97,4 +97,3 @@ LIMIT @__p_0
   }
 ]
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperIntegrationTests.Paging_WithChildCollectionProjectionExpression_First_5_NET10_0.md

@@ -2070,4 +2070,3 @@ ORDER BY b0."Name", b0."Id"
   }
 ]
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperIntegrationTests.Paging_WithChildCollectionProjectionExpression_First_5_NET8_0.md

@@ -2070,4 +2070,3 @@ ORDER BY t."Name", t."Id"
   }
 ]
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperIntegrationTests.Paging_WithChildCollectionProjectionExpression_First_5_NET9_0.md

@@ -2070,4 +2070,3 @@ ORDER BY b0."Name", b0."Id"
   }
 ]
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperTests.Batch_Fetch_First_2_Items.md

@@ -122,4 +122,3 @@
   ]
 }
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperTests.QueryContext_Simple_Selector_Include_Brand_NET10_0.md

@@ -3,15 +3,15 @@
 ## SQL 0
 
 ```sql
--- @p='3'
-SELECT p0."Id", p0."Name", b."Id", b."AlwaysNull", b."DisplayName", b."Name", b."BrandDetails_Country_Name"
-FROM (
-    SELECT p."Id", p."BrandId", p."Name"
-    FROM "Products" AS p
-    ORDER BY p."Id"
-    LIMIT @p
-) AS p0
-INNER JOIN "Brands" AS b ON p0."BrandId" = b."Id"
+-- @p='3'
+SELECT p0."Id", p0."Name", b."Id", b."AlwaysNull", b."DisplayName", b."Name", b."BrandDetails_Country_Name"
+FROM (
+    SELECT p."Id", p."BrandId", p."Name"
+    FROM "Products" AS p
+    ORDER BY p."Id"
+    LIMIT @p
+) AS p0
+INNER JOIN "Brands" AS b ON p0."BrandId" = b."Id"
 ORDER BY p0."Id"
 ```
 
@@ -20,4 +20,3 @@ ORDER BY p0."Id"
 ```text
 [Microsoft.EntityFrameworkCore.Query.EntityQueryRootExpression].OrderBy(t => t.Id).Select(root => new Product() {Id = root.Id, Name = root.Name, Brand = root.Brand}).Take(3)
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperTests.QueryContext_Simple_Selector_Include_Brand_NET8_0.md

@@ -20,4 +20,3 @@ ORDER BY t."Id"
 ```text
 [Microsoft.EntityFrameworkCore.Query.EntityQueryRootExpression].OrderBy(t => t.Id).Select(root => new Product() {Id = root.Id, Name = root.Name, Brand = root.Brand}).Take(3)
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperTests.QueryContext_Simple_Selector_Include_Brand_NET9_0.md

@@ -3,15 +3,15 @@
 ## SQL 0
 
 ```sql
--- @__p_0='3'
-SELECT p0."Id", p0."Name", b."Id", b."AlwaysNull", b."DisplayName", b."Name", b."BrandDetails_Country_Name"
-FROM (
-    SELECT p."Id", p."BrandId", p."Name"
-    FROM "Products" AS p
-    ORDER BY p."Id"
-    LIMIT @__p_0
-) AS p0
-INNER JOIN "Brands" AS b ON p0."BrandId" = b."Id"
+-- @__p_0='3'
+SELECT p0."Id", p0."Name", b."Id", b."AlwaysNull", b."DisplayName", b."Name", b."BrandDetails_Country_Name"
+FROM (
+    SELECT p."Id", p."BrandId", p."Name"
+    FROM "Products" AS p
+    ORDER BY p."Id"
+    LIMIT @__p_0
+) AS p0
+INNER JOIN "Brands" AS b ON p0."BrandId" = b."Id"
 ORDER BY p0."Id"
 ```
 
@@ -20,4 +20,3 @@ ORDER BY p0."Id"
 ```text
 [Microsoft.EntityFrameworkCore.Query.EntityQueryRootExpression].OrderBy(t => t.Id).Select(root => new Product() {Id = root.Id, Name = root.Name, Brand = root.Brand}).Take(3)
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperTests.QueryContext_Simple_Selector_Include_Brand_Name_NET10_0.md

@@ -3,15 +3,15 @@
 ## SQL 0
 
 ```sql
--- @p='3'
-SELECT p0."Id", p0."Name", b."Name"
-FROM (
-    SELECT p."Id", p."BrandId", p."Name"
-    FROM "Products" AS p
-    ORDER BY p."Id"
-    LIMIT @p
-) AS p0
-INNER JOIN "Brands" AS b ON p0."BrandId" = b."Id"
+-- @p='3'
+SELECT p0."Id", p0."Name", b."Name"
+FROM (
+    SELECT p."Id", p."BrandId", p."Name"
+    FROM "Products" AS p
+    ORDER BY p."Id"
+    LIMIT @p
+) AS p0
+INNER JOIN "Brands" AS b ON p0."BrandId" = b."Id"
 ORDER BY p0."Id"
 ```
 
@@ -20,4 +20,3 @@ ORDER BY p0."Id"
 ```text
 [Microsoft.EntityFrameworkCore.Query.EntityQueryRootExpression].OrderBy(t => t.Id).Select(root => new Product() {Id = root.Id, Name = root.Name, Brand = new Brand() {Name = root.Brand.Name}}).Take(3)
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperTests.QueryContext_Simple_Selector_Include_Brand_Name_NET8_0.md

@@ -20,4 +20,3 @@ ORDER BY t."Id"
 ```text
 [Microsoft.EntityFrameworkCore.Query.EntityQueryRootExpression].OrderBy(t => t.Id).Select(root => new Product() {Id = root.Id, Name = root.Name, Brand = new Brand() {Name = root.Brand.Name}}).Take(3)
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperTests.QueryContext_Simple_Selector_Include_Brand_Name_NET9_0.md

@@ -3,15 +3,15 @@
 ## SQL 0
 
 ```sql
--- @__p_0='3'
-SELECT p0."Id", p0."Name", b."Name"
-FROM (
-    SELECT p."Id", p."BrandId", p."Name"
-    FROM "Products" AS p
-    ORDER BY p."Id"
-    LIMIT @__p_0
-) AS p0
-INNER JOIN "Brands" AS b ON p0."BrandId" = b."Id"
+-- @__p_0='3'
+SELECT p0."Id", p0."Name", b."Name"
+FROM (
+    SELECT p."Id", p."BrandId", p."Name"
+    FROM "Products" AS p
+    ORDER BY p."Id"
+    LIMIT @__p_0
+) AS p0
+INNER JOIN "Brands" AS b ON p0."BrandId" = b."Id"
 ORDER BY p0."Id"
 ```
 
@@ -20,4 +20,3 @@ ORDER BY p0."Id"
 ```text
 [Microsoft.EntityFrameworkCore.Query.EntityQueryRootExpression].OrderBy(t => t.Id).Select(root => new Product() {Id = root.Id, Name = root.Name, Brand = new Brand() {Name = root.Brand.Name}}).Take(3)
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperTests.QueryContext_Simple_Selector_Include_Product_List_NET10_0.md

@@ -3,15 +3,15 @@
 ## SQL 0
 
 ```sql
--- @p='3'
-SELECT b0."Id", b0."Name", p."Id", p."Name"
-FROM (
-    SELECT b."Id", b."Name"
-    FROM "Brands" AS b
-    ORDER BY b."Id"
-    LIMIT @p
-) AS b0
-LEFT JOIN "Products" AS p ON b0."Id" = p."BrandId"
+-- @p='3'
+SELECT b0."Id", b0."Name", p."Id", p."Name"
+FROM (
+    SELECT b."Id", b."Name"
+    FROM "Brands" AS b
+    ORDER BY b."Id"
+    LIMIT @p
+) AS b0
+LEFT JOIN "Products" AS p ON b0."Id" = p."BrandId"
 ORDER BY b0."Id"
 ```
 
@@ -20,4 +20,3 @@ ORDER BY b0."Id"
 ```text
 [Microsoft.EntityFrameworkCore.Query.EntityQueryRootExpression].OrderBy(t => t.Id).Select(root => new Brand() {Id = root.Id, Name = root.Name, Products = root.Products.Select(p => new Product() {Id = p.Id, Name = p.Name}).ToList()}).Take(3)
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperTests.QueryContext_Simple_Selector_Include_Product_List_NET8_0.md

@@ -20,4 +20,3 @@ ORDER BY t."Id"
 ```text
 [Microsoft.EntityFrameworkCore.Query.EntityQueryRootExpression].OrderBy(t => t.Id).Select(root => new Brand() {Id = root.Id, Name = root.Name, Products = root.Products.Select(p => new Product() {Id = p.Id, Name = p.Name}).ToList()}).Take(3)
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperTests.QueryContext_Simple_Selector_Include_Product_List_NET9_0.md

@@ -3,15 +3,15 @@
 ## SQL 0
 
 ```sql
--- @__p_0='3'
-SELECT b0."Id", b0."Name", p."Id", p."Name"
-FROM (
-    SELECT b."Id", b."Name"
-    FROM "Brands" AS b
-    ORDER BY b."Id"
-    LIMIT @__p_0
-) AS b0
-LEFT JOIN "Products" AS p ON b0."Id" = p."BrandId"
+-- @__p_0='3'
+SELECT b0."Id", b0."Name", p."Id", p."Name"
+FROM (
+    SELECT b."Id", b."Name"
+    FROM "Brands" AS b
+    ORDER BY b."Id"
+    LIMIT @__p_0
+) AS b0
+LEFT JOIN "Products" AS p ON b0."Id" = p."BrandId"
 ORDER BY b0."Id"
 ```
 
@@ -20,4 +20,3 @@ ORDER BY b0."Id"
 ```text
 [Microsoft.EntityFrameworkCore.Query.EntityQueryRootExpression].OrderBy(t => t.Id).Select(root => new Brand() {Id = root.Id, Name = root.Name, Products = root.Products.Select(p => new Product() {Id = p.Id, Name = p.Name}).ToList()}).Take(3)
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperTests.QueryContext_Simple_Selector_NET10_0.md

@@ -15,4 +15,3 @@ LIMIT @p
 ```text
 [Microsoft.EntityFrameworkCore.Query.EntityQueryRootExpression].OrderBy(t => t.Id).Select(t => new Product() {Id = t.Id, Name = t.Name}).Take(3)
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperTests.QueryContext_Simple_Selector_NET8_0.md

@@ -15,4 +15,3 @@ LIMIT @__p_0
 ```text
 [Microsoft.EntityFrameworkCore.Query.EntityQueryRootExpression].OrderBy(t => t.Id).Select(t => new Product() {Id = t.Id, Name = t.Name}).Take(3)
 ```
-

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/__snapshots__/PagingHelperTests.QueryContext_Simple_Selector_NET9_0.md

@@ -3,10 +3,10 @@
 ## SQL 0
 
 ```sql
--- @__p_0='3'
-SELECT p."Id", p."Name"
-FROM "Products" AS p
-ORDER BY p."Id"
+-- @__p_0='3'
+SELECT p."Id", p."Name"
+FROM "Products" AS p
+ORDER BY p."Id"
 LIMIT @__p_0
 ```
 
@@ -15,4 +15,3 @@ LIMIT @__p_0
 ```text
 [Microsoft.EntityFrameworkCore.Query.EntityQueryRootExpression].OrderBy(t => t.Id).Select(t => new Product() {Id = t.Id, Name = t.Name}).Take(3)
 ```
-

src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Extensions/ServiceCollectionExtensions.cs

@@ -30,11 +30,7 @@ public static void AddMcpServices(this IServiceCollection services, string schem
                 static (sp, name) => new McpRequestExecutorProxy(
                     sp.GetRequiredService<IRequestExecutorProvider>(),
                     sp.GetRequiredService<IRequestExecutorEvents>(),
-#if NET10_0_OR_GREATER
-                    (string)name))
-#else
                     (string)name!))
-#endif
             .AddKeyedSingleton(
                 schemaName,
                 static (sp, name) => new StreamableHttpHandlerProxy(