Skip to content

Commit 1e6af3d

Browse files
authored
Update the version of SkiaSharp used by SVG (#28233)
1 parent f024b72 commit 1e6af3d

File tree

2 files changed

+26
-1
lines changed

2 files changed

+26
-1
lines changed

src/SingleProject/Resizetizer/src/Resizetizer.csproj

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,27 @@
3131

3232
<Import Project="ResizetizerPackages.projitems" />
3333

34+
<!-- A small task to make sure everything depends on the same version of SkiaSharp -->
35+
<ItemGroup>
36+
<PackageReference Include="Mono.ApiTools.MSBuildTasks" Version="0.3.0" PrivateAssets="all" />
37+
</ItemGroup>
38+
<PropertyGroup>
39+
<_AdjustmentsAssembly>$(PkgSvg_Skia)\lib\netstandard2.0\Svg.Skia.dll</_AdjustmentsAssembly>
40+
<_AdjustmentsReferencedAssembly>$(PkgSkiaSharp)\lib\net462\SkiaSharp.dll</_AdjustmentsReferencedAssembly>
41+
</PropertyGroup>
42+
<Target Name="_AdjustSkiaSharpVersion" BeforeTargets="Build;AssignTargetPaths"
43+
Inputs="$(MSBuildProjectFile);$(_AdjustmentsAssembly);$(_AdjustmentsReferencedAssembly)" Outputs="$(IntermediateOutputPath)adjustments\Svg.Skia.dll">
44+
<MakeDir Directories="$(IntermediateOutputPath)adjustments" />
45+
<AdjustReferencedAssemblyVersion
46+
Assembly="$(_AdjustmentsAssembly)"
47+
ReferencedAssembly="$(_AdjustmentsReferencedAssembly)"
48+
OutputAssembly="$(IntermediateOutputPath)adjustments\Svg.Skia.dll" />
49+
<ItemGroup>
50+
<None Include="$(IntermediateOutputPath)adjustments\Svg.Skia.dll" Visible="false" Pack="true" PackagePath="buildTransitive" />
51+
<FileWrites Include="$(IntermediateOutputPath)adjustments\Svg.Skia.dll" />
52+
</ItemGroup>
53+
</Target>
54+
3455
<Import Project="$(MauiRootDirectory)eng\ILRepack.targets" />
3556
<Target Name="AfterILRepack">
3657
<ItemGroup>
@@ -51,6 +72,10 @@
5172
<_CopyItems Include="@(_ResizetizerFiles)" />
5273
</ItemGroup>
5374
<Copy SourceFiles="@(_CopyItems)" DestinationFolder="$(_MauiBuildTasksLocation)%(RecursiveDir)%(_CopyItems.Arch)" ContinueOnError="true" Retries="0" />
75+
<AdjustReferencedAssemblyVersion
76+
Assembly="$(_AdjustmentsAssembly)"
77+
ReferencedAssembly="$(_AdjustmentsReferencedAssembly)"
78+
OutputAssembly="$(_MauiBuildTasksLocation)Svg.Skia.dll" />
5479
</Target>
5580

5681
<Import Project="$(MauiSrcDirectory)Workload\Shared\LibraryPacks.targets" />

src/SingleProject/Resizetizer/src/ResizetizerPackages.projitems

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<_ResizetizerFiles Include="$(PkgSvg_Custom)\lib\netstandard2.0\Svg.Custom.dll" />
4141
<_ResizetizerFiles Include="$(PkgSvg_Model)\lib\netstandard2.0\Svg.Model.dll" />
4242
<_ResizetizerFiles Include="$(PkgShimSkiaSharp)\lib\netstandard2.0\ShimSkiaSharp.dll" />
43-
<_ResizetizerFiles Include="$(PkgSvg_Skia)\lib\netstandard2.0\Svg.Skia.dll" />
43+
<!-- <_ResizetizerFiles Include="$(PkgSvg_Skia)\lib\netstandard2.0\Svg.Skia.dll" /> -->
4444
<_ResizetizerFiles Include="$(PkgFizzler)\lib\netstandard2.0\Fizzler.dll" />
4545
<_ResizetizerFiles Include="$(PkgExCSS)\lib\netstandard2.0\ExCSS.dll" />
4646
<_ResizetizerFiles Include="$(PkgSystem_IO_UnmanagedMemoryStream)\lib\netstandard1.3\System.IO.UnmanagedMemoryStream.dll" />

0 commit comments

Comments
 (0)