.Net: Update JsonSchemaMapper to latest version (#8988)

Including the fix for #8983
microsoft · Sep 25, 2024 · 04ca656 · 04ca656
1 parent 7de14ef
commit 04ca656
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 1 deletion.
diff --git a/dotnet/src/InternalUtilities/src/Schema/JsonSchemaGenerationContext.cs b/dotnet/src/InternalUtilities/src/Schema/JsonSchemaGenerationContext.cs
@@ -1,5 +1,9 @@
 // Copyright (c) Microsoft. All rights reserved.
 
+// Source copied from https://github.com/eiriktsarpalis/stj-schema-mapper
+// It should be kept in sync with any changes made in that repo,
+// and should be removed once the relevant replacements are available in STJv9.
+
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/dotnet/src/InternalUtilities/src/Schema/JsonSchemaMapper.STJv8.JsonSchema.cs b/dotnet/src/InternalUtilities/src/Schema/JsonSchemaMapper.STJv8.JsonSchema.cs
@@ -1,5 +1,9 @@
 // Copyright (c) Microsoft. All rights reserved.
 
+// Source copied from https://github.com/eiriktsarpalis/stj-schema-mapper
+// It should be kept in sync with any changes made in that repo,
+// and should be removed once the relevant replacements are available in STJv9.
+
 #if !NET9_0_OR_GREATER && !SYSTEM_TEXT_JSON_V9
 using System;
 using System.Collections.Generic;

diff --git a/dotnet/src/InternalUtilities/src/Schema/JsonSchemaMapper.STJv8.cs b/dotnet/src/InternalUtilities/src/Schema/JsonSchemaMapper.STJv8.cs
@@ -1,5 +1,9 @@
 // Copyright (c) Microsoft. All rights reserved.
 
+// Source copied from https://github.com/eiriktsarpalis/stj-schema-mapper
+// It should be kept in sync with any changes made in that repo,
+// and should be removed once the relevant replacements are available in STJv9.
+
 #if !NET9_0_OR_GREATER && !SYSTEM_TEXT_JSON_V9
 using System;
 using System.Collections.Generic;
@@ -74,6 +78,7 @@ private static partial JsonNode MapMethodParameterJsonSchema(
 
         if (hasDefaultValue)
         {
+            JsonSchema.EnsureMutable(ref paramSchema);
             paramSchema.DefaultValue = defaultValue;
             paramSchema.HasDefaultValue = true;
         }
@@ -243,7 +248,8 @@ private static JsonSchema MapJsonSchemaCore(
                 List<string>? required = null;
                 JsonSchema? additionalProperties = null;
 
-                if (typeInfo.UnmappedMemberHandling is JsonUnmappedMemberHandling.Disallow)
+                JsonUnmappedMemberHandling effectiveUnmappedMemberHandling = typeInfo.UnmappedMemberHandling ?? typeInfo.Options.UnmappedMemberHandling;
+                if (effectiveUnmappedMemberHandling is JsonUnmappedMemberHandling.Disallow)
                 {
                     // Disallow unspecified properties.
                     additionalProperties = JsonSchema.False;
@@ -328,6 +334,7 @@ private static JsonSchema MapJsonSchemaCore(
 
                     if (hasDefaultValue)
                     {
+                        JsonSchema.EnsureMutable(ref propertySchema);
                         propertySchema.DefaultValue = defaultValue;
                         propertySchema.HasDefaultValue = true;
                     }

diff --git a/dotnet/src/InternalUtilities/src/Schema/JsonSchemaMapper.STJv9.cs b/dotnet/src/InternalUtilities/src/Schema/JsonSchemaMapper.STJv9.cs
@@ -1,5 +1,9 @@
 // Copyright (c) Microsoft. All rights reserved.
 
+// Source copied from https://github.com/eiriktsarpalis/stj-schema-mapper
+// It should be kept in sync with any changes made in that repo,
+// and should be removed once the relevant replacements are available in STJv9.
+
 #if NET9_0_OR_GREATER || SYSTEM_TEXT_JSON_V9
 using System;
 using System.Collections.Generic;

diff --git a/dotnet/src/InternalUtilities/src/Schema/JsonSchemaMapper.cs b/dotnet/src/InternalUtilities/src/Schema/JsonSchemaMapper.cs
@@ -1,5 +1,9 @@
 // Copyright (c) Microsoft. All rights reserved.
 
+// Source copied from https://github.com/eiriktsarpalis/stj-schema-mapper
+// It should be kept in sync with any changes made in that repo,
+// and should be removed once the relevant replacements are available in STJv9.
+
 using System;
 using System.ComponentModel;
 using System.Diagnostics;

diff --git a/dotnet/src/InternalUtilities/src/Schema/JsonSchemaMapperConfiguration.cs b/dotnet/src/InternalUtilities/src/Schema/JsonSchemaMapperConfiguration.cs
@@ -1,5 +1,9 @@
 // Copyright (c) Microsoft. All rights reserved.
 
+// Source copied from https://github.com/eiriktsarpalis/stj-schema-mapper
+// It should be kept in sync with any changes made in that repo,
+// and should be removed once the relevant replacements are available in STJv9.
+
 using System;
 using System.ComponentModel;
 using System.Text.Json.Nodes;