Skip to content
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

fixed issue 206, added tests #207

Closed
wants to merge 24 commits into from
Closed

fixed issue 206, added tests #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
4adc990
Update supported TargetFramework
wieslawsoltes Feb 18, 2024
71bfbcd
fixed issue 206, added tests
RomanKalachik Feb 29, 2024
69924b7
restore CacheOriginalStream flag
RomanKalachik Feb 29, 2024
d42b46d
refactoring
RomanKalachik Feb 29, 2024
21739c2
moved UiTests
RomanKalachik Feb 29, 2024
c4d9561
UiTests
RomanKalachik Feb 29, 2024
7cf5487
fixed addembly name
RomanKalachik Feb 29, 2024
8dee9a4
multiple net version support
RomanKalachik Mar 1, 2024
6ca397a
Revert "Update supported TargetFramework"
wieslawsoltes Mar 1, 2024
fcabd83
Revert "Revert "Update supported TargetFramework""
wieslawsoltes Mar 2, 2024
2685a92
Remove
wieslawsoltes Mar 2, 2024
25e0879
Remove
wieslawsoltes Mar 2, 2024
8924a58
Update README.md
wieslawsoltes Mar 2, 2024
e9ded3a
Merge remote-tracking branch 'source/master'
RomanKalachik Mar 2, 2024
e691451
merged changes from master
RomanKalachik Mar 2, 2024
b0ff0de
refactoring
RomanKalachik Mar 2, 2024
ae25be5
samples support only net 8
RomanKalachik Mar 2, 2024
76fbe4a
refactoring
RomanKalachik Mar 2, 2024
84bba50
Refactor code
wieslawsoltes Mar 2, 2024
bb9d2c5
Update Base.props
wieslawsoltes Mar 2, 2024
613d93c
fix after merge
RomanKalachik Mar 2, 2024
4edc02c
fix after merge
RomanKalachik Mar 2, 2024
80de336
refactoring
RomanKalachik Mar 2, 2024
17e6f96
Merge branch 'master' into master
wieslawsoltes Mar 14, 2024
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
132 changes: 1 addition & 131 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,80 +320,6 @@ SVGC compiles SVG drawing markup to C# using SkiaSharp as rendering engine. SVGC

[![Demo](images/Demo.png)](images/Demo.png)

### Source Generator Usage

Add NuGet package reference to your `csproj`.

```xml
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>latest</LangVersion>
</PropertyGroup>
```

```xml
<ItemGroup>
<PackageReference Include="Svg.SourceGenerator.Skia" Version="0.5.0" />
</ItemGroup>
```

Include `svg` assets file in your `csproj`.

```xml
<ItemGroup>
<AdditionalFiles Include="Assets/Sample.svg" NamespaceName="Assets" ClassName="Sample" />
</ItemGroup>
```

Use generated `SKPicture` using static `Picture` property from `Sample` class.

```C#
using SkiaSharp;
using Assets;

public void Draw(SKCanvas canvas)
{
canvas.DrawPicture(Sample.Picture);
}
```

### Avalonia Usage

`csproj`
```xml
<ItemGroup>
<AdditionalFiles Include="Assets/__tiger.svg" NamespaceName="AvaloniaSample" ClassName="Tiger" />
</ItemGroup>
```
```xml
<ItemGroup>
<PackageReference Include="Svg.SourceGenerator.Skia" Version="0.5.0" />
<PackageReference Include="Avalonia.Controls.Skia" Version="0.5.0" />
</ItemGroup>
```

`xaml`
```xaml
<Window xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:AvaloniaSample;assembly=AvaloniaSample"
xmlns:skp="clr-namespace:Avalonia.Controls.Skia;assembly=Avalonia.Controls.Skia"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
Width="900" Height="650" WindowStartupLocation="CenterScreen"
x:Class="AvaloniaSample.MainWindow"
Title="AvaloniaSample">
<Window.Resources>
<skp:SKPictureImage x:Key="TigeImage" Source="{x:Static local:Tiger.Picture}" />
</Window.Resources>
<Grid>
<Image Source="{StaticResource TigeImage}" />
</Grid>
</Window>
```

### svgc Usage

```
Expand Down Expand Up @@ -421,16 +347,9 @@ Json File Format
]
```

### Links

* [Source Generators Cookbook](https://github.com/dotnet/roslyn/blob/master/docs/features/source-generators.cookbook.md)
* [Source Generators](https://github.com/dotnet/roslyn/blob/master/docs/features/source-generators.md)
* [Source Generators Samples](https://github.com/dotnet/roslyn-sdk/tree/master/samples/CSharp/SourceGenerators)
* [Introducing C# Source Generators](https://devblogs.microsoft.com/dotnet/introducing-c-source-generators/)

## Build

To build the projects you need to install [.NET 5.0](https://dotnet.microsoft.com/download/dotnet/5.0) version `SDK 5.0.100`.
To build the projects you need to install [.NET 8.0](https://dotnet.microsoft.com/download/dotnet/8.0) version `SDK 8.0.100`.

```
git clone [email protected]:wieslawsoltes/Svg.Skia.git
Expand All @@ -439,55 +358,6 @@ git submodule update --init --recursive
dotnet build -c Release
```

### Publish Managed

```
cd ./src/Svg.Skia.Converter
dotnet publish -c Release -f net6.0 -r win7-x64 /p:PublishTrimmed=True /p:PublishReadyToRun=True -o Svg.Skia.Converter_net6.0_win7-x64
```

```
cd ./src/Svg.Skia.Converter
dotnet publish -c Release -f net6.0 -r ubuntu.14.04-x64 /p:PublishTrimmed=True /p:PublishReadyToRun=True -o Svg.Skia.Converter_net6.0_ubuntu.14.04-x64
```

```
cd ./src/Svg.Skia.Converter
dotnet publish -c Release -f net6.0 -r osx.10.12-x64 /p:PublishTrimmed=True /p:PublishReadyToRun=True -o Svg.Skia.Converter_net6.0_osx.10.12-x64
```

```
cd ./src/Svg.Skia.Converter
dotnet publish -c Release -f net6.0 -r debian.8-x64 /p:PublishTrimmed=True /p:PublishReadyToRun=True -o Svg.Skia.Converter_net6.0_debian.8-x64
```

```
cd ./src/SvgToPng
dotnet publish -c Release -f net6.0 -r win7-x64 -o SvgToPng_net6.0_win7-x64
```

```
cd ./src/SvgXml.Diagnostics
dotnet publish -c Release -f net6.0 -r win7-x64 -o SvgXml.Diagnostics_net6.0_win7-x64
```

### Publish Native

```
cd ./src/Svg.Skia.Converter
dotnet publish -c Release -f net6.0 -r win-x64 -o Svg.Skia.Converter_net6.0_win-x64
```

```
cd ./src/Svg.Skia.Converter
dotnet publish -c Release -f net6.0 -r linux-x64 -o Svg.Skia.Converter_net6.0_linux-x64
```

```
cd ./src/Svg.Skia.Converter
dotnet publish -c Release -f net6.0 -r osx-x64 -o Svg.Skia.Converter_net6.0_osx-x64
```

## Externals

The `Svg.Skia` library is using code from the https://github.com/vvvv/SVG
Expand Down
22 changes: 0 additions & 22 deletions Svg.Skia.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "props", "props", "{5BFEF4F8
build\Avalonia.ReactiveUI.props = build\Avalonia.ReactiveUI.props
build\Avalonia.Skia.props = build\Avalonia.Skia.props
build\Avalonia.Themes.Fluent.props = build\Avalonia.Themes.Fluent.props
build\Avalonia.Web.props = build\Avalonia.Web.props
build\Base.props = build\Base.props
build\HarfBuzzSharp.NativeAssets.Linux.props = build\HarfBuzzSharp.NativeAssets.Linux.props
build\Newtonsoft.Json.props = build\Newtonsoft.Json.props
Expand Down Expand Up @@ -99,16 +98,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "github", "github", "{380E75
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "svgc", "samples\svgc\svgc.csproj", "{6B758C64-5BDA-4842-B0F5-A124D65D83F9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Svg.SourceGenerator.Skia.Sample", "samples\Svg.SourceGenerator.Skia.Sample\Svg.SourceGenerator.Skia.Sample.csproj", "{89FD53A6-8DE6-4733-AF87-EF8660C8EBD3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Svg.Skia.Converter", "samples\Svg.Skia.Converter\Svg.Skia.Converter.csproj", "{68F9524C-BA9F-451D-881D-6192EF2FAAAA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvaloniaSvgSample", "samples\AvaloniaSvgSample\AvaloniaSvgSample.csproj", "{C3BCD2D5-DFC2-43C1-922D-2E76E6AEF122}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvaloniaSKPictureImageSample", "samples\AvaloniaSKPictureImageSample\AvaloniaSKPictureImageSample.csproj", "{5A3BC87E-F3F6-4F89-B412-1324CCA2C32B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Svg.SourceGenerator.Skia", "src\Svg.SourceGenerator.Skia\Svg.SourceGenerator.Skia.csproj", "{3049C672-8A3F-4FE4-9973-515B8323B546}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Svg", "src\Avalonia.Svg\Avalonia.Svg.csproj", "{B742F260-0EC6-4805-AE9F-987818CE3CF4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvaloniaSvgSkiaStylingSample", "samples\AvaloniaSvgSkiaStylingSample\AvaloniaSvgSkiaStylingSample.csproj", "{8A938DC2-1634-4387-BAB3-69F871D54FB5}"
Expand Down Expand Up @@ -179,10 +172,6 @@ Global
{6B758C64-5BDA-4842-B0F5-A124D65D83F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6B758C64-5BDA-4842-B0F5-A124D65D83F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6B758C64-5BDA-4842-B0F5-A124D65D83F9}.Release|Any CPU.Build.0 = Release|Any CPU
{89FD53A6-8DE6-4733-AF87-EF8660C8EBD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{89FD53A6-8DE6-4733-AF87-EF8660C8EBD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{89FD53A6-8DE6-4733-AF87-EF8660C8EBD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{89FD53A6-8DE6-4733-AF87-EF8660C8EBD3}.Release|Any CPU.Build.0 = Release|Any CPU
{68F9524C-BA9F-451D-881D-6192EF2FAAAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{68F9524C-BA9F-451D-881D-6192EF2FAAAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{68F9524C-BA9F-451D-881D-6192EF2FAAAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -191,14 +180,6 @@ Global
{C3BCD2D5-DFC2-43C1-922D-2E76E6AEF122}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C3BCD2D5-DFC2-43C1-922D-2E76E6AEF122}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C3BCD2D5-DFC2-43C1-922D-2E76E6AEF122}.Release|Any CPU.Build.0 = Release|Any CPU
{5A3BC87E-F3F6-4F89-B412-1324CCA2C32B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5A3BC87E-F3F6-4F89-B412-1324CCA2C32B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5A3BC87E-F3F6-4F89-B412-1324CCA2C32B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5A3BC87E-F3F6-4F89-B412-1324CCA2C32B}.Release|Any CPU.Build.0 = Release|Any CPU
{3049C672-8A3F-4FE4-9973-515B8323B546}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3049C672-8A3F-4FE4-9973-515B8323B546}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3049C672-8A3F-4FE4-9973-515B8323B546}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3049C672-8A3F-4FE4-9973-515B8323B546}.Release|Any CPU.Build.0 = Release|Any CPU
{B742F260-0EC6-4805-AE9F-987818CE3CF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B742F260-0EC6-4805-AE9F-987818CE3CF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B742F260-0EC6-4805-AE9F-987818CE3CF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -231,11 +212,8 @@ Global
{BE25FC07-9A8C-4494-A6AE-F2561CF89010} = {B65D5B3A-77BE-4AFF-B502-A136B9C932F8}
{380E7565-C6FF-45C1-A683-E4E1FC744DCC} = {32B4A27D-6FC0-498C-9AD8-5510ACF2C4A1}
{6B758C64-5BDA-4842-B0F5-A124D65D83F9} = {B65D5B3A-77BE-4AFF-B502-A136B9C932F8}
{89FD53A6-8DE6-4733-AF87-EF8660C8EBD3} = {B65D5B3A-77BE-4AFF-B502-A136B9C932F8}
{68F9524C-BA9F-451D-881D-6192EF2FAAAA} = {B65D5B3A-77BE-4AFF-B502-A136B9C932F8}
{C3BCD2D5-DFC2-43C1-922D-2E76E6AEF122} = {B65D5B3A-77BE-4AFF-B502-A136B9C932F8}
{5A3BC87E-F3F6-4F89-B412-1324CCA2C32B} = {B65D5B3A-77BE-4AFF-B502-A136B9C932F8}
{3049C672-8A3F-4FE4-9973-515B8323B546} = {4C42912C-9F8C-43D9-A4B5-4427F7EC8F18}
{B742F260-0EC6-4805-AE9F-987818CE3CF4} = {4C42912C-9F8C-43D9-A4B5-4427F7EC8F18}
{8A938DC2-1634-4387-BAB3-69F871D54FB5} = {B65D5B3A-77BE-4AFF-B502-A136B9C932F8}
EndGlobalSection
Expand Down
6 changes: 0 additions & 6 deletions build/Avalonia.Web.props
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions samples/AvaloniaSKPictureImageSample/App.axaml.cs
View file
Open in desktop

This file was deleted.

Loading
Loading