Browse Source
Merge pull request #10066 from abpframework/NumberHandling
Remove NumberHandling setting.
pull/10068/head
liangshiwei
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
0 additions and
12 deletions
-
framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Json/AbpJsonOptionsSetup.cs
-
framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueConverters/ExtraPropertiesValueConverter.cs
-
framework/src/Volo.Abp.Json/Volo/Abp/Json/SystemTextJson/AbpSystemTextJsonSerializerOptionsSetup.cs
|
|
|
@ -30,10 +30,6 @@ namespace Volo.Abp.AspNetCore.Mvc.Json |
|
|
|
|
|
|
|
options.JsonSerializerOptions.Converters.Add(new ObjectToInferredTypesConverter()); |
|
|
|
options.JsonSerializerOptions.Converters.Add(new AbpHasExtraPropertiesJsonConverterFactory()); |
|
|
|
|
|
|
|
// Remove after this PR.
|
|
|
|
// https://github.com/dotnet/runtime/pull/57525
|
|
|
|
options.JsonSerializerOptions.NumberHandling = JsonNumberHandling.AllowReadingFromString; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -51,10 +51,6 @@ namespace Volo.Abp.EntityFrameworkCore.ValueConverters |
|
|
|
var deserializeOptions = new JsonSerializerOptions(); |
|
|
|
deserializeOptions.Converters.Add(new ObjectToInferredTypesConverter()); |
|
|
|
|
|
|
|
// Remove after this PR.
|
|
|
|
// https://github.com/dotnet/runtime/pull/57525
|
|
|
|
deserializeOptions.NumberHandling = JsonNumberHandling.AllowReadingFromString; |
|
|
|
|
|
|
|
var dictionary = JsonSerializer.Deserialize<ExtraPropertyDictionary>(extraPropertiesAsJson, deserializeOptions) ?? |
|
|
|
new ExtraPropertyDictionary(); |
|
|
|
|
|
|
|
|
|
|
|
@ -29,10 +29,6 @@ namespace Volo.Abp.Json.SystemTextJson |
|
|
|
|
|
|
|
// If the user hasn't explicitly configured the encoder, use the less strict encoder that does not encode all non-ASCII characters.
|
|
|
|
options.JsonSerializerOptions.Encoder ??= JavaScriptEncoder.UnsafeRelaxedJsonEscaping; |
|
|
|
|
|
|
|
// Remove after this PR.
|
|
|
|
// https://github.com/dotnet/runtime/pull/57525
|
|
|
|
options.JsonSerializerOptions.NumberHandling = JsonNumberHandling.AllowReadingFromString; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|