Skip to content

XmlSerializer support for IsDynamicCodeSupported=false #59386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eerhardt merged 5 commits into from
Sep 23, 2021
Merged

XmlSerializer support for IsDynamicCodeSupported=false #59386

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9a82ac3
XmlSerializer support for IsDynamicCodeSupported=false
eerhardt Sep 21, 2021
ccb3aa0
Fix a bug in XmlSerializer.CanDeserialize when in ReflectionOnly mode.
eerhardt Sep 21, 2021
cdd1d14
Port UAP code for CanDeserialize
eerhardt Sep 21, 2021
f1b0cac
PR feedback
eerhardt Sep 22, 2021
d6fb135
Add a linker test to ensure linker option '--enable-opt sealer' works…
eerhardt Sep 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
PR feedback
  • Loading branch information
@eerhardt
eerhardt committed Sep 22, 2021
commit f1b0cac71f39aa139e69cda3f7dd7fffc32153b7
12 changes: 8 additions & 4 deletions src/libraries/System.Private.Xml/src/System/Xml/Serialization/XmlSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,13 +542,17 @@ public virtual bool CanDeserialize(XmlReader xmlReader)
TypeDesc typeDesc = (TypeDesc)TypeScope.PrimtiveTypes[_primitiveType]!;
return xmlReader.IsStartElement(typeDesc.DataType!.Name!, string.Empty);
}
else if (_tempAssembly != null)
else if (ShouldUseReflectionBasedSerialization(_mapping) || _isReflectionBasedSerializer)
{
return _tempAssembly.CanRead(_mapping, xmlReader);
// If we should use reflection, we will try to do reflection-based deserialization, without fallback.
// Don't check xmlReader.IsStartElement to avoid having to duplicate SOAP deserialization logic here.
// It is better to return an incorrect 'true', which will throw during Deserialize than to return an
// incorrect 'false', and the caller won't even try to Deserialize when it would succeed.
return true;
}
else if (ShouldUseReflectionBasedSerialization(_mapping) || _isReflectionBasedSerializer)
else if (_tempAssembly != null)
{
return ReflectionMethodEnabled;
return _tempAssembly.CanRead(_mapping, xmlReader);
}
else
{
Expand Down