From a4fff257bba39a1881bb630edabdcbbe06f01a9e Mon Sep 17 00:00:00 2001 From: jolov Date: Thu, 11 Dec 2025 11:34:27 -0800 Subject: [PATCH 1/2] Always pass CSharpType to DeserializeJsonValue --- .../src/Providers/MrwSerializationTypeDefinition.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/MrwSerializationTypeDefinition.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/MrwSerializationTypeDefinition.cs index e3b74b65f12..fb1c487ca70 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/MrwSerializationTypeDefinition.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/MrwSerializationTypeDefinition.cs @@ -1439,10 +1439,10 @@ private ValueExpression CreateDeserializeValueExpression( { { IsFrameworkType: true } when valueType.FrameworkType == typeof(Nullable<>) => ScmCodeModelGenerator.Instance.TypeFactory.DeserializeJsonValue( - valueType.Arguments[0].FrameworkType, jsonElement, data, + valueType.Arguments[0], jsonElement, data, _mrwOptionsParameterSnippet, serializationFormat), { IsFrameworkType: true } => - ScmCodeModelGenerator.Instance.TypeFactory.DeserializeJsonValue(valueType.FrameworkType, + ScmCodeModelGenerator.Instance.TypeFactory.DeserializeJsonValue(valueType, jsonElement, data, _mrwOptionsParameterSnippet, serializationFormat), { IsEnum: true } => From 806d09cb6eef8726a7f8e6f711e57fd4b9fdeccf Mon Sep 17 00:00:00 2001 From: jolov Date: Thu, 11 Dec 2025 11:36:57 -0800 Subject: [PATCH 2/2] one more --- .../src/Providers/ScmMethodProviderCollection.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ScmMethodProviderCollection.cs b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ScmMethodProviderCollection.cs index 7089a0d2e4a..22f202f9210 100644 --- a/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ScmMethodProviderCollection.cs +++ b/packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.ClientModel/src/Providers/ScmMethodProviderCollection.cs @@ -150,7 +150,7 @@ .. GetStackVariablesForReturnValueConversion(result, responseBodyType, isAsync, Declare("element", jsonDocument.RootElement(), out var jsonElement), Return(result.FromValue( ScmCodeModelGenerator.Instance.TypeFactory.DeserializeJsonValue( - responseBodyType.FrameworkType, + responseBodyType, jsonElement, data, ScmCodeModelGenerator.Instance.ModelSerializationExtensionsDefinition.WireOptionsField.As(),