From 3a9443d46d9d54dcb617a6f3268a97ab48d146e8 Mon Sep 17 00:00:00 2001 From: menes97 <38889017+menes97@users.noreply.github.com> Date: Wed, 18 Nov 2026 11:51:01 +0300 Subject: [PATCH] Use the configured Culture when XmlDeserializer converts primitive values XmlDeserializer.Culture (invariant by default) was ignored for primitive properties and list items, which went through Convert.ChangeType with the current culture. Under tr-TR, de-DE, etc. "1234.5" became 12345 for a double, or threw a FormatException (fr-FR). Co-Authored-By: Claude Opus 5.5 --- .../XmlDeserializer.cs | 4 +- .../Extensions/ReflectionExtensions.cs | 2 +- .../XmlDeserializerTests.cs | 47 +++++++++++++++++++ 3 files changed, 50 insertions(+), 3 deletions(-) diff --git a/src/RestSharp.Serializers.Xml/XmlDeserializer.cs b/src/RestSharp.Serializers.Xml/XmlDeserializer.cs index 4b5a43d35..10f6e7f0a 100644 --- a/src/RestSharp.Serializers.Xml/XmlDeserializer.cs +++ b/src/RestSharp.Serializers.Xml/XmlDeserializer.cs @@ -179,7 +179,7 @@ protected virtual object Map(object x, XElement? root) { } else if (type.IsPrimitive) { try { - prop.SetValue(x, value.ChangeType(asType), null); + prop.SetValue(x, value.ChangeType(asType, Culture), null); } catch (FormatException ex) { throw new FormatException( @@ -444,7 +444,7 @@ IList TryFindElementsByNameVariations(XElement source, string typeName item = element.Value; } else if (t.GetTypeInfo().IsPrimitive) { - item = element.Value.ChangeType(t); + item = element.Value.ChangeType(t, Culture); } else { item = Activator.CreateInstance(t)!; diff --git a/src/RestSharp/Extensions/ReflectionExtensions.cs b/src/RestSharp/Extensions/ReflectionExtensions.cs index 01a7e2b96..1febdfe30 100644 --- a/src/RestSharp/Extensions/ReflectionExtensions.cs +++ b/src/RestSharp/Extensions/ReflectionExtensions.cs @@ -57,7 +57,7 @@ public static bool IsSubclassOfRawGeneric(this Type? toCheck, Type generic) { return false; } - internal static object? ChangeType(this object? source, Type newType) => Convert.ChangeType(source, newType); + internal static object? ChangeType(this object? source, Type newType, IFormatProvider provider) => Convert.ChangeType(source, newType, provider); /// /// Find a value from a System.Enum by trying several possible variants diff --git a/test/RestSharp.Tests.Serializers.Xml/XmlDeserializerTests.cs b/test/RestSharp.Tests.Serializers.Xml/XmlDeserializerTests.cs index 1c3454356..d5cd64909 100644 --- a/test/RestSharp.Tests.Serializers.Xml/XmlDeserializerTests.cs +++ b/test/RestSharp.Tests.Serializers.Xml/XmlDeserializerTests.cs @@ -1240,4 +1240,51 @@ public void Deserialize_Nested_Items_Should_Also_Use_Direct_Children() { Assert.Equal(2, topItem.SubItems[0].Id); Assert.Equal(3, topItem.SubItems[1].Id); } + + [Theory] + [InlineData("tr-TR")] + [InlineData("de-DE")] + [InlineData("fr-FR")] + public void Should_deserialize_floating_point_numbers_with_invariant_culture_by_default(string currentCulture) { + const string xml = "1234.52.51.52.25"; + + var previous = CultureInfo.CurrentCulture; + CultureInfo.CurrentCulture = new CultureInfo(currentCulture); + + try { + var result = new XmlDeserializer().Deserialize(new() { Content = xml })!; + + Assert.Equal(1234.5, result.Double); + Assert.Equal(2.5f, result.Float); + Assert.Equal(new[] { 1.5, 2.25 }, result.Numbers); + } + finally { + CultureInfo.CurrentCulture = previous; + } + } + + [Fact] + public void Should_deserialize_floating_point_numbers_with_configured_culture() { + const string xml = "1234,52,51,52,25"; + + var previous = CultureInfo.CurrentCulture; + CultureInfo.CurrentCulture = CultureInfo.InvariantCulture; + + try { + var result = new XmlDeserializer { Culture = new CultureInfo("de-DE") }.Deserialize(new() { Content = xml })!; + + Assert.Equal(1234.5, result.Double); + Assert.Equal(2.5f, result.Float); + Assert.Equal(new[] { 1.5, 2.25 }, result.Numbers); + } + finally { + CultureInfo.CurrentCulture = previous; + } + } + + class FloatingPointValues { + public double Double { get; set; } + public float Float { get; set; } + public List Numbers { get; set; } = []; + } }