Skip to content

Use ReflectionOnly as data contract serializer option for iOS/tvOS/MacCatalyst #55503

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
MaximLipnin merged 6 commits into from
Jul 13, 2021
Merged

Use ReflectionOnly as data contract serializer option for iOS/tvOS/MacCatalyst #55503

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f289f98
Use ReflectionOnly as data contract serializer option for iOS/tvOS/Ma…
MaximLipnin Jul 12, 2021
d34d451
Use more appropriate method name
MaximLipnin Jul 12, 2021
3756ea5
Directly overwrite Option property to make it linker-friendly
MaximLipnin Jul 12, 2021
39b2451
Merge branch 'main' into jit_compile_method_in_aot_on_ios
MaximLipnin Jul 12, 2021
f27e6e7
Merge branch 'main' into jit_compile_method_in_aot_on_ios
MaximLipnin Jul 13, 2021
e9e0959
Change the Option property
MaximLipnin Jul 13, 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
Directly overwrite Option property to make it linker-friendly
  • Loading branch information
@MaximLipnin
MaximLipnin committed Jul 12, 2021
commit 3756ea55216a0635bce915661760de5e3cd866bd
5 changes: 5 additions & 0 deletions src/libraries/System.Private.DataContractSerialization/src/ILLink/ILLink.Substitutions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<linker>
<type fullname="System.Runtime.Serialization.DataContractSerializer" featurevalue="true" feature="System.Runtime.CompilerServices.RuntimeFeature.IsDynamicCodeSupported">
<method signature="System.Runtime.Serialization.DataContractSerializer.SerializationOption get_Option()" body="stub" value="1" />
</type>
</linker>
3 changes: 3 additions & 0 deletions ...tem.Private.DataContractSerialization/src/System.Private.DataContractSerialization.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
<ILLinkTrimAssembly>false</ILLinkTrimAssembly>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ILLinkSubstitutionsXmls Include="ILLink\ILLink.Substitutions.xml" />
</ItemGroup>
<PropertyGroup>
<RuntimeSerializationSources>System\Runtime\Serialization</RuntimeSerializationSources>
<JsonSources>System\Runtime\Serialization\Json</JsonSources>
Expand Down
11 changes: 1 addition & 10 deletions ...vate.DataContractSerialization/src/System/Runtime/Serialization/DataContractSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,7 @@ public sealed class DataContractSerializer : XmlObjectSerializer
private ISerializationSurrogateProvider? _serializationSurrogateProvider;
private bool _serializeReadOnlyTypes;

private static SerializationOption _option = GetDefaultSerializationOption();
private static SerializationOption GetDefaultSerializationOption()
{
if (OperatingSystem.IsIOS() || OperatingSystem.IsTvOS() || OperatingSystem.IsMacCatalyst())
{
return SerializationOption.ReflectionOnly;
}

return IsReflectionBackupAllowed() ? SerializationOption.ReflectionAsBackup : SerializationOption.CodeGenOnly;
}
private static SerializationOption _option = IsReflectionBackupAllowed() ? SerializationOption.ReflectionAsBackup : SerializationOption.CodeGenOnly;
private static bool _optionAlreadySet;
internal static SerializationOption Option
{
Expand Down