deps: Bump the build-tools group with 3 updates (#418)

dependabot[bot] · eiriktsarpalis · Copilot · web-flow · commit c75c5517d7ab · 2026-04-21T14:45:38.000+03:00
* deps: Bump the build-tools group with 3 updates Bumps Microsoft.CodeAnalysis.Analyzers from 3.11.0 to 5.3.0 Bumps Microsoft.CodeAnalysis.CSharp from 4.8.0 to 5.3.0 Bumps Microsoft.CodeAnalysis.CSharp.CodeFix.Testing from 1.1.2 to 1.1.3 --- updated-dependencies: - dependency-name: Microsoft.CodeAnalysis.Analyzers dependency-version: 5.3.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: build-tools - dependency-name: Microsoft.CodeAnalysis.CSharp dependency-version: 5.3.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: build-tools - dependency-name: Microsoft.CodeAnalysis.CSharp.CodeFix.Testing dependency-version: 1.1.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: build-tools ... Signed-off-by: dependabot[bot] <support@github.com> * Bump transitive BCL package versions for Roslyn 5.3.0 and ignore CS1701/CS1702 binding-redirect warnings on .NET Framework Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Bump JsonSchema.Net to 9.2.0 and update for new API Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Remove CS1701/CS1702 suppressions The underlying cause (mismatched BCL transitive package versions pulled in by Microsoft.CodeAnalysis.CSharp 5.3.0) is fully addressed by the central package bumps; the suppressions are no longer needed. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Address format-validation by declaring $schema dialect Replaces the format-error filter with the proper fix: prepend a draft 2020-12 $schema declaration so JsonSchema.Net 9.x treats the ormat keyword as an annotation rather than an assertion. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Emit $schema dialect from JsonSchemaGenerator Generated root schemas now declare the JSON Schema 2020-12 dialect, ensuring spec-compliant interpretation of keywords like `format` (annotation, not assertion) by validators such as JsonSchema.Net 9.x. Tests that compare root schemas to nested sub-schemas strip `\` before structural comparison. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Inline $schema dialect emission via depth tracking Replaces the post-processing AddSchemaDialect helper (which allocated a second JsonObject solely to insert $schema as the first keyword) with depth tracking inside GenerateSchema. Root schemas are preallocated with the $schema keyword in place; recursive calls bump depth so nested subschemas do not redundantly emit it. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Construct $schema dialect at the point of root JsonObject creation Replaces the post-construction EnsureSchemaDialect helper with a NewSchema(depth) factory used by every switch-case construction. When depth == 0 the factory preallocates the JsonObject with $schema as the first keyword, so the dialect is set at construction time rather than reordered after the fact. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Remove `$schema` mutations from JsonSchema test assertions Replaces the `.Remove("$schema")` calls with a non-mutating `RootEqualsSubschema` helper used where a regenerated root schema is compared against a nested sub-schema (enumerable items / dictionary additionalProperties). For IOptionalTypeShape and ISurrogateTypeShape both sides are roots with identical `$schema` entries, so `JsonNode.DeepEquals` handles them directly. The default-case assertion now verifies `$schema` is the sole key rather than stripping it first. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Simplify $schema dialect emission via JsonObject.Insert Replace the NewSchema(depth) factory and preallocation sites with a single InsertDialectIfRoot helper invoked at root-level exit points. Uses JsonObject.Insert on net9+ and a clear-and-reassign polyfill on earlier TFMs to keep $schema as the first keyword. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Reference System.Text.Json on net8.0 to enable JsonObject.Insert Extends the System.Text.Json package reference (already at v10.0.5) to net8.0 so JsonObject.Insert is available everywhere PolyType.Examples is built. This removes the need for the polyfill in JsonSchemaGenerator.InsertDialectIfRoot. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Merge ApplyNullability and InsertDialectIfRoot into CompleteDocument Consolidates the post-construction nullability and root $schema insertion logic into a single CompleteDocument helper invoked at every exit point. The IOptionalTypeShape case now sets allowNull=true so the merged helper handles its nullability (eliminating the previous double-application). Also drops the "dialect" terminology in favor of MetaSchemaUri. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Drop CompleteDocument implementation comments Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Make MetaSchemaUri private Inline the literal in tests since the constant is no longer part of the public API. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Share a single Generator instance across IMethodShape sub-schemas Move the IMethodShape orchestration into Generator.GenerateMethodSchema so a single Generator instance (and its $ref location cache) spans the parameter and return sub-schemas. Push/Pop the JSON pointer path around each sub-schema so cached references stay valid within the function document. Reduces per-method allocations from N+1 Generator instances to 1. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Revert RoslynVersion to 4.8.0 to keep VS 2022 source generator support Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Scope JsonSchema.Net and BCL 10 deps to PolyType.Tests Keep root Directory.Packages.props at conservative versions matching main so library-shipped packages do not force higher BCL minima on consumers. JsonSchema.Net 9.2 (and the BCL 10 minima it pulls in transitively) only need to be visible to PolyType.Tests, so move those overrides into a scoped tests/PolyType.Tests/Directory.Packages.props. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Move tests Directory.Packages.props up to tests/ Shield PolyType.SourceGenerator.UnitTests with a pass-through Directory.Packages.props that imports the repo root directly, so its CompilationTests do not pick up the higher BCL minima from tests/Directory.Packages.props (which would cause CS1702 assembly-version mismatches in synthesized compilations). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Move test-only package versions out of the root central props Move xunit/TUnit/Microsoft.Testing.Extensions/BenchmarkDotNet/CodeFix.Testing and the JsonSchema.Net + BCL 10 overrides into tests/Directory.Packages.props. The benchmarks and source-generator unit tests projects keep their own scoped Directory.Packages.props (now imported into the slnx and noted in the root props) for project-specific overrides. Update Benchmarks props to import the tests/ scoped file so it picks up BenchmarkDotNet. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Bump System.* packages to .NET 10 baseline Bump System.Memory/Unsafe/Tasks.Extensions to 4.6.3/6.1.2/4.6.3 and System.Collections.Immutable/System.Formats.Cbor/System.Text.Json to 10.0.5/10.0.0/10.0.5. Removes the redundant BCL Update entries (including STJ) from tests/Directory.Packages.props and the no-longer-needed pass-through props in tests/PolyType.SourceGenerator.UnitTests. Microsoft.Extensions.Configuration is intentionally kept at 9.0.8 because 10.x changes object binding behavior in a way that triggers infinite recursion in the example ConfigurationBinder. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Document and trim Benchmarks scoped Directory.Packages.props Drop the now-redundant System.Collections.Immutable override (root is at 10.0.5 which is higher than the 9.0.0 BenchmarkDotNet pulls in transitively). Keep the Microsoft.CodeAnalysis.CSharp override and add a comment explaining why the project-scoped CPM file is necessary: BenchmarkDotNet 0.15.8 transitively requires Roslyn >= 4.14.0 while the solution-wide RoslynVersion is pinned at 4.8.0 to keep the source generator usable in VS 2022. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Pin Microsoft.Extensions.Configuration to 9.0.8 In Microsoft.Extensions.Configuration.Json 10.x, a JSON `null` literal and an empty object `{}` produce identical IConfigurationSection state (Value=null, no children) and are no longer distinguishable at the IConfiguration API surface. The PolyType example ConfigurationBinder relies on this distinction to bind null vs empty objects correctly. Since this cannot be worked around without changing the binder contract, and PolyType.Examples is a packable library where conservative dependency versions are preferred, keep MEC at 9.0.8. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Simplify JsonSchema test helper by stripping $schema before DeepEquals Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Restore original Push/Pop method positions Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Replace project-scoped CPM with VersionOverride in Benchmarks csproj Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Restore conservative product dependency versions in root props BCL packages bumped by JsonSchema.Net 9.x transitive requirements are scoped to tests/Directory.Packages.props via Update overrides, keeping the packable PolyType.Examples and core projects on the minimum-supported BCL versions. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Soften MEC pin comment (no documented breaking change) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Cite official .NET 10 breaking change in MEC pin comment Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Adopt Microsoft.Extensions.Configuration 10.x semantics MEC 10.x preserves JSON null literals as IConfigurationSection.Value=null instead of collapsing them to empty strings (https://learn.microsoft.com/dotnet/core/compatibility/extensions/10.0/configuration-null-values-preserved). Drop the empty-string-to-null workarounds from the example ConfigurationBinder and align IsNullConfiguration with the new semantics. Empty objects '{}' remain indistinguishable from nulls at the IConfigurationSection level; the test suite accommodates this by skipping equality assertions for nested empty objects. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Move Roslyn version override into tests/Directory.Packages.props Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Bump central System.* package versions, pin core PolyType conservatively Inverts the earlier policy: the root Directory.Packages.props now declares bleeding-edge versions for System.Memory, System.Runtime.CompilerServices.Unsafe, System.Threading.Tasks.Extensions, System.Collections.Immutable, System.Formats.Cbor, and System.Text.Json. The core PolyType library opts back down to conservative minima via VersionOverride in src/PolyType/PolyType.csproj. This cleans up redundant overrides scattered across PolyType.Examples.csproj and tests/Directory.Packages.props. Suppress CS1702 in PolyType.SourceGenerator.UnitTests, which surfaced on net472 once the test compilations started referencing the bumped System.Memory while PolyType itself remained pinned to the older assembly version. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Disable global transitive pinning for package compatibility Stop centrally pinning transitive dependencies solution-wide. This keeps analyzer packages like PolyType.SourceGenerator from advertising newer System.* transitive dependencies than their direct Roslyn references require, which is important for older Visual Studio compatibility. Keep the conservative runtime BCL floor pinned only in src/PolyType/PolyType.csproj via VersionOverride. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Fix netfx unit test restore Add a direct reference to Microsoft.CodeAnalysis.CSharp.Workspaces in the source generator unit test project so NuGet resolves the modern Roslyn workspace stack during net472 test runs, without reintroducing global transitive pinning. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Fix netfx tests without warning suppression Pin the full Roslyn test stack in tests/Directory.Packages.props and remove the temporary CS1702 suppression from CompilationHelpers. The net472 source-generator unit test leg now passes cleanly by resolving the intended package versions rather than hiding the warning. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Fix up * Remove unnecesary dependency --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Eirik Tsarpalis <eirik.tsarpalis@gmail.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,54 +1,52 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
-    <RoslynVersion>4.8.0</RoslynVersion>
+    <RoslynVersion>5.3.0</RoslynVersion>
     <RoslynVersionForAnalyzers>4.3.0</RoslynVersionForAnalyzers>
   </PropertyGroup>
   <ItemGroup>
     <!-- Product dependencies -->
-    <PackageVersion Include="System.Memory" Version="4.5.5" />
+    <PackageVersion Include="System.Memory" Version="4.5.4" />
     <PackageVersion Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
     <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
     <!-- Source Generator dependencies -->
-    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="$(RoslynVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(RoslynVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(RoslynVersion)" />
     <!-- Build Infra & Packaging -->
     <PackageVersion Include="PolySharp" Version="1.15.0" />
     <PackageVersion Include="Nerdbank.GitVersioning" Version="3.10.8-alpha" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
-    <!-- Testing dependencies -->
-    <PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.2" />
-    <PackageVersion Include="TUnit" Version="1.12.65" />
-    <PackageVersion Include="TUnit.Assertions" Version="1.12.65" />
-    <PackageVersion Include="TUnit.Engine" Version="1.12.65" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.0.2" />
-    <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.3.2" />
-    <PackageVersion Include="Microsoft.Testing.Extensions.CrashDump" Version="2.0.2" />
-    <PackageVersion Include="Microsoft.Testing.Extensions.HangDump" Version="2.0.2" />
-    <PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
-    <!-- Earliest version of the library supporting literals and frozen collections -->
-    <PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
-    <PackageVersion Include="System.Formats.Cbor" Version="9.0.8" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.8" />
+    <!-- Used by PolyType.Examples and PolyType.TestCases -->
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.5" />
+    <PackageVersion Include="System.Collections.Immutable" Version="10.0.5" />
+    <PackageVersion Include="System.Formats.Cbor" Version="10.0.5" />
+    <PackageVersion Include="System.Text.Json" Version="10.0.5" />
     <PackageVersion Include="YamlDotNet" Version="17.0.1" />
     <PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
-    <PackageVersion Include="JsonSchema.Net" Version="7.4.0" />
     <PackageVersion Include="FSharp.Core" Version="10.1.202" />
+    <!-- Test infrastructure -->
+    <PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.2" />
+    <PackageVersion Include="TUnit" Version="1.37.10" />
+    <PackageVersion Include="TUnit.Assertions" Version="1.37.10" />
+    <PackageVersion Include="TUnit.Engine" Version="1.37.10" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.2.1" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.6.2" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.CrashDump" Version="2.2.1" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.HangDump" Version="2.2.1" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
+    <PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
+    <PackageVersion Include="JsonSchema.Net" Version="9.2.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(IsAnalyzerProject)'=='true'">
     <!-- Keep these versions in sync with what Unity documents as supported at 
          https://docs.unity3d.com/6000.1/Documentation/Manual/create-source-generator.html (or a newer version of that doc). -->
+    <PackageVersion Update="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
     <PackageVersion Update="Microsoft.CodeAnalysis.CSharp" Version="$(RoslynVersionForAnalyzers)" />
     <PackageVersion Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(RoslynVersionForAnalyzers)" />
     <PackageVersion Update="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(RoslynVersionForAnalyzers)" />
-    <PackageVersion Update="System.Collections.Immutable" Version="6.0.0" />
-    <PackageVersion Update="System.Memory" Version="4.5.4" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/PolyType.Examples/ConfigurationBinder/ConfigurationBinder.Builder.cs b/src/PolyType.Examples/ConfigurationBinder/ConfigurationBinder.Builder.cs
@@ -313,15 +313,15 @@ private static IEnumerable<KeyValuePair<Type, object>> GetBuiltInParsers()
             yield return Create(text => float.Parse(text, NumberStyles.Float, CultureInfo.InvariantCulture));
             yield return Create(text => double.Parse(text, NumberStyles.Float, CultureInfo.InvariantCulture));
             yield return Create(text => decimal.Parse(text, NumberStyles.Float, CultureInfo.InvariantCulture));
-            yield return Create(text => string.IsNullOrEmpty(text) ? null : text);
+            yield return Create<string?>(text => text);
             yield return Create(char.Parse);
             yield return Create(Guid.Parse);
             yield return Create(text => TimeSpan.Parse(text, CultureInfo.InvariantCulture));
             yield return Create(text => DateTime.Parse(text, CultureInfo.InvariantCulture));
             yield return Create(text => DateTimeOffset.Parse(text, CultureInfo.InvariantCulture));
-            yield return Create(text => text is "" ? null : new Uri(text, UriKind.RelativeOrAbsolute));
-            yield return Create(text => text is "" ? null : Version.Parse(text));
-            yield return Create(text => text is "" ? null : Convert.FromBase64String(text));
+            yield return Create(text => new Uri(text, UriKind.RelativeOrAbsolute));
+            yield return Create(Version.Parse);
+            yield return Create(Convert.FromBase64String);
 #if NET
             yield return Create(text => UInt128.Parse(text, NumberStyles.Integer, CultureInfo.InvariantCulture));
             yield return Create(text => Int128.Parse(text, NumberStyles.Integer, CultureInfo.InvariantCulture));
@@ -332,8 +332,6 @@ private static IEnumerable<KeyValuePair<Type, object>> GetBuiltInParsers()
 #endif
 
             yield return Create<object?>(text =>
-                text is null ? new object() :
-                text is "" ? null :
                 bool.TryParse(text, out bool boolResult) ? boolResult :
                 int.TryParse(text, out int intResult) ? intResult :
                 double.TryParse(text, out double doubleResult) ? doubleResult :
@@ -367,6 +365,11 @@ private static Func<IConfiguration, T> CreateValueBinder<T>(Func<string, T> pars
                     throw new InvalidOperationException();
                 }
 
+                if (section.Value is null && default(T) is null)
+                {
+                    return default!;
+                }
+
                 try
                 {
                     return parser(section.Value!);
@@ -379,11 +382,10 @@ private static Func<IConfiguration, T> CreateValueBinder<T>(Func<string, T> pars
         }
 
         private static Func<IConfiguration, T> CreateNotSupportedBinder<T>() =>
-            config => default(T) is null && IsNullConfiguration(config) ? default! : throw new NotSupportedException($"Type '{typeof(T)}' is not supported.");
+            config => IsNullConfiguration(config) ? default! : throw new NotSupportedException($"Type '{typeof(T)}' is not supported.");
 
         private static bool IsNullConfiguration(IConfiguration configuration) =>
-            // https://github.com/dotnet/runtime/issues/36510
-            configuration is IConfigurationSection { Value: "" } &&
+            configuration is IConfigurationSection { Value: null } &&
             !configuration.GetChildren().Any();
     }
 
diff --git a/src/PolyType.Examples/JsonSchema/JsonSchemaGenerator.cs b/src/PolyType.Examples/JsonSchema/JsonSchemaGenerator.cs
@@ -18,6 +18,8 @@ public static class JsonSchemaGenerator
     public static JsonObject Generate<T>(ITypeShapeProvider typeShapeProvider)
         => Generate(typeShapeProvider.GetTypeShapeOrThrow<T>());
 
+    private const string MetaSchemaUri = "https://json-schema.org/draft/2020-12/schema";
+
     /// <summary>
     /// Generates a JSON schema using the specified shape.
     /// </summary>
@@ -28,42 +30,7 @@ public static JsonObject Generate(ITypeShape typeShape)
     /// Generates a JSON schema using the specified method shape.
     /// </summary>
     public static JsonObject Generate(IMethodShape methodShape)
-    {
-        JsonObject? parameterSchemas = null;
-        JsonArray? requiredParams = null;
-        foreach (var parameter in methodShape.Parameters)
-        {
-            if (parameter.ParameterType.Type == typeof(CancellationToken))
-            {
-                continue;
-            }
-
-            (parameterSchemas ??= []).Add(parameter.Name, Generate(parameter.ParameterType));
-            if (parameter.IsRequired)
-            {
-                (requiredParams ??= []).Add((JsonNode)parameter.Name);
-            }
-        }
-
-        JsonObject functionSchema = new JsonObject
-        {
-            ["name"] = methodShape.Name,
-            ["type"] = "object",
-        };
-
-        if (parameterSchemas is not null)
-        {
-            functionSchema["properties"] = parameterSchemas;
-        }
-
-        if (requiredParams is not null)
-        {
-            functionSchema["required"] = requiredParams;
-        }
-
-        functionSchema["output"] = Generate(methodShape.ReturnType);
-        return functionSchema;
-    }
+        => new Generator().GenerateMethodSchema(methodShape);
 
 #if NET
     /// <summary>
@@ -87,13 +54,57 @@ private sealed class Generator
         private readonly Dictionary<(Type, bool AllowNull), string> _locations = new();
         private readonly List<string> _path = new();
 
-        public JsonObject GenerateSchema(ITypeShape typeShape, bool allowNull = true, bool cacheLocation = true)
+        public JsonObject GenerateMethodSchema(IMethodShape methodShape)
+        {
+            JsonObject? parameterSchemas = null;
+            JsonArray? requiredParams = null;
+            foreach (var parameter in methodShape.Parameters)
+            {
+                if (parameter.ParameterType.Type == typeof(CancellationToken))
+                {
+                    continue;
+                }
+
+                Push("properties");
+                Push(parameter.Name);
+                (parameterSchemas ??= []).Add(parameter.Name, GenerateSchema(parameter.ParameterType, depth: 1));
+                Pop();
+                Pop();
+                if (parameter.IsRequired)
+                {
+                    (requiredParams ??= []).Add((JsonNode)parameter.Name);
+                }
+            }
+
+            JsonObject functionSchema = new JsonObject
+            {
+                ["name"] = methodShape.Name,
+                ["type"] = "object",
+            };
+
+            if (parameterSchemas is not null)
+            {
+                functionSchema["properties"] = parameterSchemas;
+            }
+
+            if (requiredParams is not null)
+            {
+                functionSchema["required"] = requiredParams;
+            }
+
+            Push("output");
+            functionSchema["output"] = GenerateSchema(methodShape.ReturnType, depth: 1);
+            Pop();
+            return CompleteDocument(functionSchema, allowNull: false, depth: 0);
+        }
+
+        public JsonObject GenerateSchema(ITypeShape typeShape, bool allowNull = true, bool cacheLocation = true, int depth = 0)
         {
             allowNull = allowNull && IsNullableType(typeShape.Type);
 
             if (s_simpleTypeInfo.TryGetValue(typeShape.Type, out SimpleTypeJsonSchema simpleType))
             {
-                return ApplyNullability(simpleType.ToSchemaDocument(), allowNull);
+                return CompleteDocument(simpleType.ToSchemaDocument(), allowNull, depth);
             }
 
             if (cacheLocation)
@@ -125,20 +136,20 @@ public JsonObject GenerateSchema(ITypeShape typeShape, bool allowNull = true, bo
                     break;
 
                 case IOptionalTypeShape optionalShape:
-                    schema = GenerateSchema(optionalShape.ElementType, cacheLocation: false);
-                    ApplyNullability(schema, allowNull: true);
+                    schema = GenerateSchema(optionalShape.ElementType, cacheLocation: false, depth: depth + 1);
+                    allowNull = true;
                     break;
                 
                 case ISurrogateTypeShape surrogateShape:
-                    return GenerateSchema(surrogateShape.SurrogateType, cacheLocation: false);
+                    return CompleteDocument(GenerateSchema(surrogateShape.SurrogateType, cacheLocation: false, depth: depth + 1), allowNull: false, depth);
 
                 case IEnumerableTypeShape enumerableShape:
                     for (int i = 0; i < enumerableShape.Rank; i++)
                     {
                         Push("items");
                     }
 
-                    schema = GenerateSchema(enumerableShape.ElementType);
+                    schema = GenerateSchema(enumerableShape.ElementType, depth: depth + 1);
 
                     for (int i = 0; i < enumerableShape.Rank; i++)
                     {
@@ -155,7 +166,7 @@ public JsonObject GenerateSchema(ITypeShape typeShape, bool allowNull = true, bo
 
                 case IDictionaryTypeShape dictionaryShape:
                     Push("additionalProperties");
-                    JsonObject additionalPropertiesSchema = GenerateSchema(dictionaryShape.ValueType);
+                    JsonObject additionalPropertiesSchema = GenerateSchema(dictionaryShape.ValueType, depth: depth + 1);
                     Pop();
 
                     schema = new JsonObject
@@ -191,7 +202,7 @@ public JsonObject GenerateSchema(ITypeShape typeShape, bool allowNull = true, bo
                                 (associatedParameter is null || associatedParameter.IsNonNullable);
                             
                             Push(prop.Name);
-                            JsonObject propSchema = GenerateSchema(prop.PropertyType, allowNull: !isNonNullable);
+                            JsonObject propSchema = GenerateSchema(prop.PropertyType, allowNull: !isNonNullable, depth: depth + 1);
                             Pop();
 
                             properties.Add(prop.Name, propSchema);
@@ -220,7 +231,7 @@ public JsonObject GenerateSchema(ITypeShape typeShape, bool allowNull = true, bo
                     foreach (IUnionCaseShape caseShape in unionShape.UnionCases)
                     {
                         Push($"{anyOf.Count}");
-                        JsonObject caseSchema = GenerateSchema(caseShape.UnionCaseType, cacheLocation: false);
+                        JsonObject caseSchema = GenerateSchema(caseShape.UnionCaseType, cacheLocation: false, depth: depth + 1);
                         Pop();
 
                         if (caseShape.UnionCaseType is IObjectTypeShape or IDictionaryTypeShape)
@@ -274,7 +285,7 @@ public JsonObject GenerateSchema(ITypeShape typeShape, bool allowNull = true, bo
                     if (!unionCasesContainBaseType)
                     {
                         Push($"{anyOf.Count}");
-                        JsonNode caseSchema = GenerateSchema(unionShape.BaseType, cacheLocation: false);
+                        JsonNode caseSchema = GenerateSchema(unionShape.BaseType, cacheLocation: false, depth: depth + 1);
                         Pop();
 
                         anyOf.Add(caseSchema);
@@ -293,7 +304,7 @@ public JsonObject GenerateSchema(ITypeShape typeShape, bool allowNull = true, bo
                     break;
             }
 
-            return ApplyNullability(schema, allowNull);
+            return CompleteDocument(schema, allowNull, depth);
         }
 
         private void Push(string name)
@@ -306,11 +317,11 @@ private void Pop()
             _path.RemoveAt(_path.Count - 1);
         }
 
-        private static JsonObject ApplyNullability(JsonObject schema, bool allowNull)
+        private static JsonObject CompleteDocument(JsonObject schema, bool allowNull, int depth)
         {
             if (allowNull && schema.TryGetPropertyValue("type", out JsonNode? typeValue))
             {
-                if (schema["type"] is JsonArray types)
+                if (typeValue is JsonArray types)
                 {
                     types.Add((JsonNode)"null");
                 }
@@ -320,6 +331,11 @@ private static JsonObject ApplyNullability(JsonObject schema, bool allowNull)
                 }
             }
 
+            if (depth == 0)
+            {
+                schema.Insert(0, "$schema", MetaSchemaUri);
+            }
+
             return schema;
         }
 
diff --git a/src/PolyType.Examples/PolyType.Examples.csproj b/src/PolyType.Examples/PolyType.Examples.csproj
@@ -29,8 +29,11 @@
     <PackageReference Include="YamlDotNet" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)','net10.0'))">
     <PackageReference Include="System.Text.Json" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Microsoft.Bcl.HashCode" />
   </ItemGroup>
 
diff --git a/tests/PolyType.Benchmarks/Directory.Packages.props b/tests/PolyType.Benchmarks/Directory.Packages.props
diff --git a/tests/PolyType.SourceGenerator.UnitTests/CompilationHelpers.cs b/tests/PolyType.SourceGenerator.UnitTests/CompilationHelpers.cs
@@ -104,11 +104,18 @@ public static Compilation CreateCompilation(
             .. additionalReferences,
         ];
 
+        var options = new CSharpCompilationOptions(outputKind, nullableContextOptions: nullableContextOptions, allowUnsafe: true);
+#if !NET
+        // On .NET Framework the test process may load newer BCL assemblies (e.g. System.Memory)
+        // than those PolyType was compiled against. CS1702 warns about the version mismatch,
+        // which is benign in an in-memory compilation used for source-generator testing.
+        options = options.WithSpecificDiagnosticOptions([new("CS1702", ReportDiagnostic.Suppress)]);
+#endif
         return CSharpCompilation.Create(
             assemblyName,
             syntaxTrees: syntaxTrees,
             references: references,
-            options: new CSharpCompilationOptions(outputKind, nullableContextOptions: nullableContextOptions, allowUnsafe: true)
+            options: options
         );
     }
 
diff --git a/tests/PolyType.SourceGenerator.UnitTests/PolyType.SourceGenerator.UnitTests.csproj b/tests/PolyType.SourceGenerator.UnitTests/PolyType.SourceGenerator.UnitTests.csproj
@@ -26,6 +26,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/tests/PolyType.Tests/ConfigurationBinderTests.cs b/tests/PolyType.Tests/ConfigurationBinderTests.cs
diff --git a/tests/PolyType.Tests/JsonSchemaTests.cs b/tests/PolyType.Tests/JsonSchemaTests.cs
