Skip to content

Commit

Permalink
Move to Svg package
Browse files Browse the repository at this point in the history
  • Loading branch information
@wieslawsoltes
wieslawsoltes committed Nov 25, 2023
1 parent ffd827b commit 3087628
Show file tree
Hide file tree
Showing 14 changed files with 6 additions and 143 deletions.
6 changes: 0 additions & 6 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,6 +0,0 @@
[submodule "externals/SVG"]
path = externals/SVG
url = https://github.com/wieslawsoltes/SVG.git
[submodule "externals/resvg"]
path = externals/resvg
url = https://github.com/wieslawsoltes/resvg.git
16 changes: 0 additions & 16 deletions Svg.Skia.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Svg.Skia", "src\Av
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvaloniaSvgSkiaSample", "samples\AvaloniaSvgSkiaSample\AvaloniaSvgSkiaSample.csproj", "{81724F00-B7C3-4E25-B473-C7433BABDC81}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Svg.Custom", "src\Svg.Custom\Svg.Custom.csproj", "{CFA46E73-0050-4C57-85CE-6C5868A2483C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Svg.Skia.UnitTests", "tests\Avalonia.Svg.Skia.UnitTests\Avalonia.Svg.Skia.UnitTests.csproj", "{D4467DCA-494D-4C32-9525-4A9713221A53}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Svg.Model", "src\Svg.Model\Svg.Model.csproj", "{4C970B2C-6C96-445B-B80B-4EFBF803FD5F}"
Expand All @@ -82,12 +80,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Svg.CodeGen.Skia", "src\Svg
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Controls.Skia", "src\Avalonia.Controls.Skia\Avalonia.Controls.Skia.csproj", "{223B7A5A-E263-4D40-9A6E-FE31EAE92F45}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Svg.Generators", "externals\SVG\Generators\Svg.Generators.csproj", "{AF8AEF5B-0664-4106-9BD3-389758F39B12}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApp", "samples\TestApp\TestApp.csproj", "{B4BC7C90-09C3-46CB-B8B1-0450CC7EAAB0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "externals", "externals", "{C5FFCF4B-86DC-453E-8006-44EE9EEFEE39}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShimSkiaSharp", "src\ShimSkiaSharp\ShimSkiaSharp.csproj", "{6D2786A1-F110-4448-9CBF-D3CC9D803F31}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvaloniaControlsSample", "samples\AvaloniaControlsSample\AvaloniaControlsSample.csproj", "{BE25FC07-9A8C-4494-A6AE-F2561CF89010}"
Expand Down Expand Up @@ -137,10 +131,6 @@ Global
{81724F00-B7C3-4E25-B473-C7433BABDC81}.Debug|Any CPU.Build.0 = Debug|Any CPU
{81724F00-B7C3-4E25-B473-C7433BABDC81}.Release|Any CPU.ActiveCfg = Release|Any CPU
{81724F00-B7C3-4E25-B473-C7433BABDC81}.Release|Any CPU.Build.0 = Release|Any CPU
{CFA46E73-0050-4C57-85CE-6C5868A2483C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CFA46E73-0050-4C57-85CE-6C5868A2483C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CFA46E73-0050-4C57-85CE-6C5868A2483C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CFA46E73-0050-4C57-85CE-6C5868A2483C}.Release|Any CPU.Build.0 = Release|Any CPU
{D4467DCA-494D-4C32-9525-4A9713221A53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D4467DCA-494D-4C32-9525-4A9713221A53}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D4467DCA-494D-4C32-9525-4A9713221A53}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -157,10 +147,6 @@ Global
{223B7A5A-E263-4D40-9A6E-FE31EAE92F45}.Debug|Any CPU.Build.0 = Debug|Any CPU
{223B7A5A-E263-4D40-9A6E-FE31EAE92F45}.Release|Any CPU.ActiveCfg = Release|Any CPU
{223B7A5A-E263-4D40-9A6E-FE31EAE92F45}.Release|Any CPU.Build.0 = Release|Any CPU
{AF8AEF5B-0664-4106-9BD3-389758F39B12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AF8AEF5B-0664-4106-9BD3-389758F39B12}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AF8AEF5B-0664-4106-9BD3-389758F39B12}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AF8AEF5B-0664-4106-9BD3-389758F39B12}.Release|Any CPU.Build.0 = Release|Any CPU
{B4BC7C90-09C3-46CB-B8B1-0450CC7EAAB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B4BC7C90-09C3-46CB-B8B1-0450CC7EAAB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B4BC7C90-09C3-46CB-B8B1-0450CC7EAAB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -219,8 +205,6 @@ Global
{29F59C87-EAE6-4DD3-8666-B79BFAF6B34D} = {4C42912C-9F8C-43D9-A4B5-4427F7EC8F18}
{223B7A5A-E263-4D40-9A6E-FE31EAE92F45} = {4C42912C-9F8C-43D9-A4B5-4427F7EC8F18}
{B4BC7C90-09C3-46CB-B8B1-0450CC7EAAB0} = {B65D5B3A-77BE-4AFF-B502-A136B9C932F8}
{CFA46E73-0050-4C57-85CE-6C5868A2483C} = {C5FFCF4B-86DC-453E-8006-44EE9EEFEE39}
{AF8AEF5B-0664-4106-9BD3-389758F39B12} = {C5FFCF4B-86DC-453E-8006-44EE9EEFEE39}
{6D2786A1-F110-4448-9CBF-D3CC9D803F31} = {4C42912C-9F8C-43D9-A4B5-4427F7EC8F18}
{BE25FC07-9A8C-4494-A6AE-F2561CF89010} = {B65D5B3A-77BE-4AFF-B502-A136B9C932F8}
{380E7565-C6FF-45C1-A683-E4E1FC744DCC} = {32B4A27D-6FC0-498C-9AD8-5510ACF2C4A1}
Expand Down
2 changes: 1 addition & 1 deletion build/Svg.props
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Svg" Version="3.4.4" />
<PackageReference Include="Svg" Version="3.4.6" />
</ItemGroup>
</Project>
1 change: 0 additions & 1 deletion externals/SVG
Submodule SVG deleted from c21c91
1 change: 0 additions & 1 deletion externals/resvg
Submodule resvg deleted from a739ae
1 change: 0 additions & 1 deletion samples/TestApp/Views/MainWindow.axaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
Expand Down
1 change: 0 additions & 1 deletion samples/svgc/svgc.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Svg.Custom\Svg.Custom.csproj" />
<ProjectReference Include="..\..\src\Svg.Model\Svg.Model.csproj" />
</ItemGroup>

Expand Down
31 changes: 0 additions & 31 deletions src/Svg.Custom/LICENSE.TXT
View file

This file was deleted.

3 changes: 0 additions & 3 deletions src/Svg.Custom/Properties/AssemblyInfo.cs
View file

This file was deleted.

73 changes: 0 additions & 73 deletions src/Svg.Custom/Svg.Custom.csproj
View file

This file was deleted.

4 changes: 1 addition & 3 deletions src/Svg.Model/Svg.Model.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,10 @@
<Import Project="..\..\build\SourceLink.props" />
<Import Project="..\..\build\SignAssembly.props" />
<Import Project="..\..\build\ReferenceAssemblies.props" />
<!--<Import Project="..\..\build\Svg.props" />-->
<Import Project="..\..\build\Svg.props" />

<ItemGroup>
<!--<ProjectReference Include="..\..\externals\SVG\Source\Svg.csproj" />-->
<ProjectReference Include="..\ShimSkiaSharp\ShimSkiaSharp.csproj" />
<ProjectReference Include="..\Svg.Custom\Svg.Custom.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
0 src/Svg.Skia/SKSvg.Model.cs → src/Svg.Skia/SKSvg.cs
View file
File renamed without changes.
4 changes: 1 addition & 3 deletions src/Svg.Skia/Svg.Skia.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,10 @@
<Import Project="..\..\build\ReferenceAssemblies.props" />
<Import Project="..\..\build\SkiaSharp.props" />
<Import Project="..\..\build\SkiaSharp.HarfBuzz.props" />
<Import Project="..\..\build\Svg.props" />

<!--<Import Project="..\..\build\Svg.props" />-->
<ItemGroup>
<!--<ProjectReference Include="..\..\externals\SVG\Source\Svg.csproj" />-->
<ProjectReference Include="..\Svg.Model\Svg.Model.csproj" />
<ProjectReference Include="..\Svg.Custom\Svg.Custom.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/Svg.SourceGenerator.Skia/Svg.SourceGenerator.Skia.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,23 +37,23 @@
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" PrivateAssets="all" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-4.final" PrivateAssets="all" />
<PackageReference Include="Svg" Version="3.4.6" GeneratePathProperty="true" PrivateAssets="all" />
<PackageReference Include="ExCSS" Version="4.2.3" GeneratePathProperty="true" PrivateAssets="all" />
<PackageReference Include="SkiaSharp" Version="2.88.6" GeneratePathProperty="true" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ShimSkiaSharp\ShimSkiaSharp.csproj" PrivateAssets="all" />
<ProjectReference Include="..\Svg.Custom\Svg.Custom.csproj" PrivateAssets="all" />
<ProjectReference Include="..\Svg.Model\Svg.Model.csproj" PrivateAssets="all" />
<ProjectReference Include="..\Svg.Skia\Svg.Skia.csproj" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<None Include="Svg.SourceGenerator.Skia.props" Pack="true" PackagePath="build" Visible="false" />
<None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
<None Include="$(PKGSvg)\lib\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
<None Include="$(PKGExCSS)\lib\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
<None Include="..\ShimSkiaSharp\bin\$(Configuration)\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
<None Include="..\Svg.Custom\bin\$(Configuration)\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
<None Include="..\Svg.Model\bin\$(Configuration)\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
<None Include="..\Svg.Skia\bin\$(Configuration)\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
</ItemGroup>
Expand All @@ -64,10 +64,10 @@

<Target Name="GetDependencyTargetPaths">
<ItemGroup>
<TargetPathWithTargetPlatformMoniker Include="$(PKGSvg)\lib\netstandard2.0\Svg.dll" IncludeRuntimeDependency="false" />
<TargetPathWithTargetPlatformMoniker Include="$(PKGExCSS)\lib\netstandard2.0\ExCSS.dll" IncludeRuntimeDependency="false" />
<TargetPathWithTargetPlatformMoniker Include="$(PKGSkiaSharp)\lib\netstandard2.0\SkiaSharp.dll" IncludeRuntimeDependency="false" />
<TargetPathWithTargetPlatformMoniker Include="$(MSBuildThisFileDirectory)\..\ShimSkiaSharp\bin\$(Configuration)\netstandard2.0\ShimSkiaSharp.dll" IncludeRuntimeDependency="false" />
<TargetPathWithTargetPlatformMoniker Include="$(MSBuildThisFileDirectory)\..\Svg.Custom\bin\$(Configuration)\netstandard2.0\Svg.Custom.dll" IncludeRuntimeDependency="false" />
<TargetPathWithTargetPlatformMoniker Include="$(MSBuildThisFileDirectory)\..\Svg.Model\bin\$(Configuration)\netstandard2.0\Svg.Model.dll" IncludeRuntimeDependency="false" />
<TargetPathWithTargetPlatformMoniker Include="$(MSBuildThisFileDirectory)\..\Svg.Skia\bin\$(Configuration)\netstandard2.0\Svg.Skia.dll" IncludeRuntimeDependency="false" />
</ItemGroup>
Expand Down

0 comments on commit 3087628

Please sign in to comment.