Bring XmlReader{Async} to one behavior (#51736)

* Replace XmlUntypedStringConverter to XmlUntypedConverter * Add more test * add more tests * remove unssoprt test * feedback review Co-authored-by: kronic <kronic@softland.ru>
dotnet · Sep 20, 2021 · 6c9921d · 6c9921d
1 parent e804766
commit 6c9921d
Show file tree

Hide file tree

Showing 4 changed files with 569 additions and 253 deletions.
diff --git a/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj b/src/libraries/System.Private.Xml/src/System.Private.Xml.csproj
@@ -433,7 +433,6 @@
     <Compile Include="System\Xml\Schema\XmlTokenizedType.cs" />
     <Compile Include="System\Xml\Schema\XmlTypeCode.cs" />
     <Compile Include="System\Xml\Schema\XmlValueConverter.cs" />
-    <Compile Include="System\Xml\Schema\XmlUntypedStringConverter.cs" />
     <Compile Include="System\Xml\Schema\XsdBuilder.cs" />
     <Compile Include="System\Xml\Schema\XsdDateTime.cs" />
     <Compile Include="System\Xml\Schema\XsdDuration.cs" />

diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Core/XmlReader.cs b/src/libraries/System.Private.Xml/src/System/Xml/Core/XmlReader.cs
@@ -328,7 +328,7 @@ public virtual object ReadContentAs(Type returnType, IXmlNamespaceResolver? name
 
             try
             {
-                return XmlUntypedStringConverter.Instance.FromString(strContentValue, returnType, (namespaceResolver ?? this as IXmlNamespaceResolver)!);
+                return XmlUntypedConverter.Untyped.ChangeType(strContentValue, returnType, namespaceResolver ?? this as IXmlNamespaceResolver);
             }
             catch (FormatException e)
             {
@@ -534,7 +534,7 @@ public virtual object ReadElementContentAs(Type returnType, IXmlNamespaceResolve
                 return value;
             }
 
-            return returnType == typeof(string) ? string.Empty : XmlUntypedStringConverter.Instance.FromString(string.Empty, returnType, namespaceResolver);
+            return returnType == typeof(string) ? string.Empty : XmlUntypedConverter.Untyped.ChangeType(string.Empty, returnType, namespaceResolver);
         }
 
         // Checks local name and namespace of the current element and returns its content as the requested type.

diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Schema/XmlUntypedStringConverter.cs b/src/libraries/System.Private.Xml/src/System/Xml/Schema/XmlUntypedStringConverter.cs