Skip to content

Ensure svg model has no trimmer warnings #551

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
wieslawsoltes merged 2 commits into from
Aug 5, 2026
Merged

Ensure svg model has no trimmer warnings #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
875a133
fix: Use trimmer compatible path to extract an SvgUnit
OleRoss Jul 21, 2026
adfb0e6
build: Mark Svg.Controls.*Avalonia projects and dependencies as aot c…
OleRoss Jul 21, 2026
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
13 changes: 13 additions & 0 deletions src/Svg.Controls.Avalonia/Svg.Controls.Avalonia.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,19 @@
<PackageTags>svg;vector graphics;rendering;2d;graphics;geometry;shapes;control;avalonia;avaloniaui</PackageTags>
</PropertyGroup>

<!-- Trimmer parameters -->
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
<IsTrimmable>true</IsTrimmable>
<SuppressTrimAnalysisWarnings>false</SuppressTrimAnalysisWarnings>
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
</PropertyGroup>

<!-- AOT parameters -->
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
<IsAotCompatible>true</IsAotCompatible>
<EnableAotAnalyzer>true</EnableAotAnalyzer>
</PropertyGroup>

<Import Project="..\..\build\SourceLink.props" />
<!--<Import Project="..\..\build\SignAssembly.props" />-->
<Import Project="..\..\build\ReferenceAssemblies.props" />
Expand Down
13 changes: 13 additions & 0 deletions src/Svg.Controls.Skia.Avalonia/Svg.Controls.Skia.Avalonia.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,19 @@
<PackageTags>svg;vector graphics;rendering;2d;graphics;geometry;shapes;skiasharp;skia;control;avalonia;avaloniaui</PackageTags>
</PropertyGroup>

<!-- Trimmer parameters -->
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
<IsTrimmable>true</IsTrimmable>
<SuppressTrimAnalysisWarnings>false</SuppressTrimAnalysisWarnings>
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
</PropertyGroup>

<!-- AOT parameters -->
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
<IsAotCompatible>true</IsAotCompatible>
<EnableAotAnalyzer>true</EnableAotAnalyzer>
</PropertyGroup>

<Import Project="..\..\build\SourceLink.props" />
<!--<Import Project="..\..\build\SignAssembly.props" />-->
<Import Project="..\..\build\ReferenceAssemblies.props" />
Expand Down
13 changes: 13 additions & 0 deletions src/Svg.Editor.Core/Svg.Editor.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,19 @@
<PackageTags>svg;editor;state;session;avalonia;skia</PackageTags>
</PropertyGroup>

<!-- Trimmer parameters -->
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
<IsTrimmable>true</IsTrimmable>
<SuppressTrimAnalysisWarnings>false</SuppressTrimAnalysisWarnings>
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
</PropertyGroup>

<!-- AOT parameters -->
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
<IsAotCompatible>true</IsAotCompatible>
<EnableAotAnalyzer>true</EnableAotAnalyzer>
</PropertyGroup>

<Import Project="..\..\build\SourceLink.props" />
<Import Project="..\..\build\SignAssembly.props" />
<Import Project="..\..\build\ReferenceAssemblies.props" />
Expand Down
18 changes: 8 additions & 10 deletions src/Svg.Model/Services/SvgGeometryService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,20 +194,18 @@ private static SvgUnit GetComputedUnit(

try
{
if (TypeDescriptor.GetConverter(typeof(SvgUnit)).ConvertFromInvariantString(rawValue) is SvgUnit unit)
{
isAuto = false;
isAuthorSpecified = true;
return unit;
}
var unit = SvgUnitConverter.Parse(rawValue.AsSpan().Trim());

isAuto = false;
isAuthorSpecified = true;
return unit;
}
catch
{
isAuto = false;
isAuthorSpecified = element.ContainsAttribute(propertyName);
return fallback;
}

isAuto = false;
isAuthorSpecified = element.ContainsAttribute(propertyName);
return fallback;
}

private static SKPath? CreateRectanglePath(SvgRectangle svgRectangle, SvgFillRule fillRule, SKRect viewport)
Expand Down
29 changes: 15 additions & 14 deletions src/Svg.Model/Services/TransformsService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,26 +343,27 @@ private static bool TryResolveTransformOriginComponent(

try
{
if (TypeDescriptor.GetConverter(typeof(SvgUnit)).ConvertFromInvariantString(token) is SvgUnit unit)
{
value = unit.ToDeviceValue(
isHorizontal ? UnitRenderingType.HorizontalOffset : UnitRenderingType.VerticalOffset,
svgElement,
referenceBox);
if (unit.Type != SvgUnitType.Percentage)
{
value += isHorizontal ? referenceBox.Left : referenceBox.Top;
}
var unit = SvgUnitConverter.Parse(token.AsSpan().Trim());

return true;
value = unit.ToDeviceValue(
isHorizontal
? UnitRenderingType.HorizontalOffset
: UnitRenderingType.VerticalOffset,
svgElement,
referenceBox);

if (unit.Type != SvgUnitType.Percentage)
{
value += isHorizontal ? referenceBox.Left : referenceBox.Top;
}

return true;
}
catch
{
value = 0f;
return false;
}

value = 0f;
return false;
}

private static bool TryGetTransformOriginKeywordUnit(string token, bool isHorizontal, out SvgUnit unit)
Expand Down
13 changes: 13 additions & 0 deletions src/Svg.Model/Svg.Model.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,19 @@
<PackageTags>svg;vector graphics;rendering;2d;graphics;geometry;shapes;skiasharp;skia;model</PackageTags>
</PropertyGroup>

<!-- Trimmer parameters -->
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
<IsTrimmable>true</IsTrimmable>
<SuppressTrimAnalysisWarnings>false</SuppressTrimAnalysisWarnings>
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
</PropertyGroup>

<!-- AOT parameters -->
<PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
<IsAotCompatible>true</IsAotCompatible>
<EnableAotAnalyzer>true</EnableAotAnalyzer>
</PropertyGroup>

<PropertyGroup>
<!--<DefineConstants>$(DefineConstants);USE_DEBUG_DRAW_BOUNDS</DefineConstants>-->
<!--<DefineConstants>$(DefineConstants);USE_DEBUG_DRAW_FILTER_BOUNDS</DefineConstants>-->
Expand Down
Loading