Skip to content

Preserve type converters for aot/trimmer #3

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

Closed
maxkatz6 wants to merge 1 commit into from
Closed

Preserve type converters for aot/trimmer #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions Source/DataTypes/SvgAspectRatio.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
using Svg.DataTypes;

namespace Svg
Expand Down Expand Up @@ -54,6 +55,11 @@ public object Clone()
return MemberwiseClone();
}

#if NET6_0_OR_GREATER
[DynamicDependency(DynamicallyAccessedMemberTypes.PublicMethods, typeof(SvgPreserveAspectRatioConverter))]
[UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "DynamicDependency keeps converter safe")]
[UnconditionalSuppressMessage("AOT", "IL3050")]
#endif
public override string ToString()
{
return TypeDescriptor.GetConverter(typeof(SvgPreserveAspectRatio)).ConvertToString(this.Align) + (Slice ? " slice" : "");
Expand Down
10 changes: 8 additions & 2 deletions Source/DataTypes/SvgPoint.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using System.ComponentModel;
using System.Diagnostics.CodeAnalysis;
using Svg.DataTypes;

namespace Svg
{
Expand Down Expand Up @@ -39,12 +41,16 @@ public override int GetHashCode()
return base.GetHashCode();
}

#if NET6_0_OR_GREATER
[DynamicDependency(DynamicallyAccessedMemberTypes.PublicMethods, typeof(SvgUnitConverter))]
[UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "DynamicDependency keeps converter safe")]
#endif
public SvgPoint(string x, string y)
{
TypeConverter converter = TypeDescriptor.GetConverter(typeof(SvgUnit));

this.x = (SvgUnit)converter.ConvertFrom(x);
this.y = (SvgUnit)converter.ConvertFrom(y);
this.x = (SvgUnit)converter.ConvertFrom(x)!;
this.y = (SvgUnit)converter.ConvertFrom(y)!;
}

public SvgPoint(SvgUnit x, SvgUnit y)
Expand Down