wieslawsoltes
/
SkiaSharp
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge branch 'master' into dev/update-docs

This commit is contained in:
Matthew Leibowitz 2018-04-21 02:01:27 +02:00
Родитель bfbd358167 f0cea333c5
Коммит bafc3368dc
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 3650EBE4AA155AF9
20 изменённых файлов: 39 добавлений и 65 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
samples/Gallery/Desktop/SkiaSharpSample.sln
Просмотреть файл

@ -19,7 +19,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.Desktop", "..
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.HarfBuzz.Shared", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.Shared\SkiaSharp.HarfBuzz.Shared.shproj", "{C3E63B2D-95D4-4C3F-B10F-7A0AACF94980}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz.NetStandard", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PlatformShared", "..\PlatformShared\PlatformShared.shproj", "{0CC41AB0-0C4C-4DAA-8F10-A249725EBF5D}"
EndProject

4
samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj
Просмотреть файл

@ -97,9 +97,9 @@
<Project>{eb1bbdcc-fb07-40d5-8b9e-0079e2c2f2df}</Project>
<Name>SkiaSharp.Desktop</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj">
<ProjectReference Include="..\..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj">
<Project>{233220cc-f0f3-4c44-9736-ed2cfc363fd3}</Project>
<Name>SkiaSharp.HarfBuzz.NetStandard</Name>
<Name>SkiaSharp.HarfBuzz</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Desktop\SkiaSharp.Views.Desktop.csproj">
<Project>{e5a90865-c185-45ad-88d1-6da7d6004b03}</Project>

2
samples/Gallery/UWP/SkiaSharpSample.sln
Просмотреть файл

@ -17,7 +17,7 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HarfBuzzSharp.Shared", "..\
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.HarfBuzz.Shared", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.Shared\SkiaSharp.HarfBuzz.Shared.shproj", "{C3E63B2D-95D4-4C3F-B10F-7A0AACF94980}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz.NetStandard", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.UWP", "..\..\..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj", "{6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}"
EndProject

4
samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj
Просмотреть файл

@ -101,9 +101,9 @@
<Project>{bab615aa-956e-4079-b260-dd7b1f52ec7d}</Project>
<Name>SkiaSharp.UWP</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj">
<ProjectReference Include="..\..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj">
<Project>{233220cc-f0f3-4c44-9736-ed2cfc363fd3}</Project>
<Name>SkiaSharp.HarfBuzz.NetStandard</Name>
<Name>SkiaSharp.HarfBuzz</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.UWP\SkiaSharp.Views.UWP.csproj">
<Project>{8bb20362-91a2-4206-944d-634070eac6f3}</Project>

2
samples/Gallery/WPF/SkiaSharpSample.sln
Просмотреть файл

@ -27,7 +27,7 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared", "..\Shared\Shared.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample", "SkiaSharpSample\SkiaSharpSample.csproj", "{74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz.NetStandard", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj", "{156FADFB-602E-4658-A235-D4D24CD46F09}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{156FADFB-602E-4658-A235-D4D24CD46F09}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution

4
samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj
Просмотреть файл

@ -105,9 +105,9 @@
<Project>{eb1bbdcc-fb07-40d5-8b9e-0079e2c2f2df}</Project>
<Name>SkiaSharp.Desktop</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj">
<ProjectReference Include="..\..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj">
<Project>{156fadfb-602e-4658-a235-d4d24cd46f09}</Project>
<Name>SkiaSharp.HarfBuzz.NetStandard</Name>
<Name>SkiaSharp.HarfBuzz</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Desktop\SkiaSharp.Views.Desktop.csproj">
<Project>{e5a90865-c185-45ad-88d1-6da7d6004b03}</Project>

4
samples/Gallery/Xamarin.Forms/Android/Android.csproj
Просмотреть файл

@ -63,9 +63,9 @@
<Project>{c737dc80-5b71-4b26-a2dc-da30421788b0}</Project>
<Name>SkiaSharp.Android</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj">
<ProjectReference Include="..\..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj">
<Project>{233220cc-f0f3-4c44-9736-ed2cfc363fd3}</Project>
<Name>SkiaSharp.HarfBuzz.NetStandard</Name>
<Name>SkiaSharp.HarfBuzz</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Android\SkiaSharp.Views.Forms.Android.csproj">
<Project>{2f94f024-1841-47e8-b521-74aa4e3eba54}</Project>

2
samples/Gallery/Xamarin.Forms/Core/Core.csproj
Просмотреть файл

@ -12,7 +12,7 @@
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.NetStandard\HarfBuzzSharp.NetStandard.csproj" />
<ProjectReference Include="..\..\..\..\binding\SkiaSharp.NetStandard\SkiaSharp.NetStandard.csproj" />
<ProjectReference Include="..\..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj" />
<ProjectReference Include="..\..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj" />
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.csproj" />
</ItemGroup>

4
samples/Gallery/Xamarin.Forms/Mac/Mac.csproj
Просмотреть файл

@ -66,9 +66,9 @@
<Project>{4588A759-3853-49B8-8A68-6C7917BE9220}</Project>
<Name>SkiaSharp.OSX</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj">
<ProjectReference Include="..\..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj">
<Project>{233220cc-f0f3-4c44-9736-ed2cfc363fd3}</Project>
<Name>SkiaSharp.HarfBuzz.NetStandard</Name>
<Name>SkiaSharp.HarfBuzz</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Mac\SkiaSharp.Views.Forms.Mac.csproj">
<Project>{da5da4d8-4885-4af2-96bb-ae803c344ab0}</Project>

2
samples/Gallery/Xamarin.Forms/SkiaSharpSample.Mac.sln
Просмотреть файл

@ -27,7 +27,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.NetStandard", "..
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.HarfBuzz.Shared", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.Shared\SkiaSharp.HarfBuzz.Shared.shproj", "{C3E63B2D-95D4-4C3F-B10F-7A0AACF94980}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz.NetStandard", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.iOS", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.iOS\SkiaSharp.Views.iOS.csproj", "{74C78108-9199-4A7A-928C-FC4DC57D0AE4}"
EndProject

2
samples/Gallery/Xamarin.Forms/SkiaSharpSample.Windows.sln
Просмотреть файл

@ -27,7 +27,7 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.HarfBuzz.Shared",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.NetStandard", "..\..\..\binding\HarfBuzzSharp.NetStandard\HarfBuzzSharp.NetStandard.csproj", "{DD3EAFFF-E420-4AC3-925D-501EAE140B49}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz.NetStandard", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.csproj", "{99411A8A-1F8C-469C-AC10-E72F28EDB376}"
EndProject

2
samples/Gallery/Xamarin.Forms/SkiaSharpSample.sln
Просмотреть файл

@ -49,7 +49,7 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.HarfBuzz.Shared",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.NetStandard", "..\..\..\binding\HarfBuzzSharp.NetStandard\HarfBuzzSharp.NetStandard.csproj", "{DD3EAFFF-E420-4AC3-925D-501EAE140B49}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz.NetStandard", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.OSX", "..\..\..\binding\HarfBuzzSharp.OSX\HarfBuzzSharp.OSX.csproj", "{30952C22-D566-488F-9D7A-2411B027D6CA}"
EndProject

4
samples/Gallery/Xamarin.Forms/UWP/UWP.csproj
Просмотреть файл

@ -103,9 +103,9 @@
<Project>{bab615aa-956e-4079-b260-dd7b1f52ec7d}</Project>
<Name>SkiaSharp.UWP</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj">
<ProjectReference Include="..\..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj">
<Project>{233220cc-f0f3-4c44-9736-ed2cfc363fd3}</Project>
<Name>SkiaSharp.HarfBuzz.NetStandard</Name>
<Name>SkiaSharp.HarfBuzz</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.UWP\SkiaSharp.Views.Forms.UWP.csproj">
<Project>{3a1277b5-cfae-48cc-b64b-4dae1222a3eb}</Project>

4
samples/Gallery/Xamarin.Forms/iOS/iOS.csproj
Просмотреть файл

@ -123,9 +123,9 @@
<Project>{6a678cfb-21a7-4e81-8909-fd72abbfd408}</Project>
<Name>SkiaSharp.iOS</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj">
<ProjectReference Include="..\..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj">
<Project>{233220cc-f0f3-4c44-9736-ed2cfc363fd3}</Project>
<Name>SkiaSharp.HarfBuzz.NetStandard</Name>
<Name>SkiaSharp.HarfBuzz</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.iOS\SkiaSharp.Views.Forms.iOS.csproj">
<Project>{4ac36d63-bf11-445f-81ee-107c0cef4fc9}</Project>

2
samples/Gallery/macOS/SkiaSharpSample.sln
Просмотреть файл

@ -21,7 +21,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Mac", "..\.
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.HarfBuzz.Shared", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.Shared\SkiaSharp.HarfBuzz.Shared.shproj", "{C3E63B2D-95D4-4C3F-B10F-7A0AACF94980}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz.NetStandard", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PlatformShared", "..\PlatformShared\PlatformShared.shproj", "{0CC41AB0-0C4C-4DAA-8F10-A249725EBF5D}"
EndProject

4
samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj
Просмотреть файл

@ -57,9 +57,9 @@
<Project>{30952C22-D566-488F-9D7A-2411B027D6CA}</Project>
<Name>HarfBuzzSharp.OSX</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj">
<ProjectReference Include="..\..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj">
<Project>{233220cc-f0f3-4c44-9736-ed2cfc363fd3}</Project>
<Name>SkiaSharp.HarfBuzz.NetStandard</Name>
<Name>SkiaSharp.HarfBuzz</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj">
<Project>{4588A759-3853-49B8-8A68-6C7917BE9220}</Project>

2
samples/Gallery/tvOS/SkiaSharpSample.sln
Просмотреть файл

@ -23,7 +23,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.tvOS", "..\
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.HarfBuzz.Shared", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.Shared\SkiaSharp.HarfBuzz.Shared.shproj", "{C3E63B2D-95D4-4C3F-B10F-7A0AACF94980}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz.NetStandard", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PlatformShared", "..\PlatformShared\PlatformShared.shproj", "{0CC41AB0-0C4C-4DAA-8F10-A249725EBF5D}"
EndProject

4
samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj
Просмотреть файл

@ -94,9 +94,9 @@
<Project>{5180e370-a455-42bb-99f9-97bd269b8a52}</Project>
<Name>SkiaSharp.tvOS</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.NetStandard\SkiaSharp.HarfBuzz.NetStandard.csproj">
<ProjectReference Include="..\..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj">
<Project>{233220cc-f0f3-4c44-9736-ed2cfc363fd3}</Project>
<Name>SkiaSharp.HarfBuzz.NetStandard</Name>
<Name>SkiaSharp.HarfBuzz</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.tvOS\SkiaSharp.Views.tvOS.csproj">
<Project>{e5973829-6c8b-43e4-b81b-c8492df26c90}</Project>

29
source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.NetStandard/SkiaSharp.HarfBuzz.NetStandard.csproj
Просмотреть файл

@ -1,29 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard1.3</TargetFramework>
<OutputTypeEx>library</OutputTypeEx>
<RootNamespace>SkiaSharp.HarfBuzz</RootNamespace>
<AssemblyName>SkiaSharp.HarfBuzz</AssemblyName>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
<AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
<!-- TODO: remove this when CoreCLR supports signing on non-Windows -->
<!--<SignAssembly Condition=" '$(OS)' == 'Windows_NT' ">true</SignAssembly>-->
<SignAssembly>true</SignAssembly>
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
<AssemblyOriginatorKeyFile>..\..\..\mono.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DefineConstants>TRACE;DEBUG;NET_STANDARD</DefineConstants>
<OutputPath>bin\Debug\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DefineConstants>TRACE;NET_STANDARD</DefineConstants>
<OutputPath>bin\Release\</OutputPath>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp.NetStandard\SkiaSharp.NetStandard.csproj" />
<ProjectReference Include="..\..\..\binding\HarfBuzzSharp.NetStandard\HarfBuzzSharp.NetStandard.csproj" />
</ItemGroup>
<Import Project="..\SkiaSharp.HarfBuzz.Shared\SkiaSharp.HarfBuzz.Shared.projitems" Label="Shared" />
</Project>

21
source/SkiaSharp.Views/SkiaSharp.Views.AppleiOS/SKCanvasView.cs
Просмотреть файл

@ -85,17 +85,20 @@ namespace SkiaSharp.Views.iOS
if (designMode || drawable == null)
return;
var ctx = UIGraphics.GetCurrentContext();
using (var ctx = UIGraphics.GetCurrentContext())
{
// create the skia context
SKImageInfo info;
using (var surface = drawable.CreateSurface(Bounds, IgnorePixelScaling ? 1 : ContentScaleFactor, out info))
{
// create the skia context
SKImageInfo info;
var surface = drawable.CreateSurface(Bounds, IgnorePixelScaling ? 1 : ContentScaleFactor, out info);
// draw on the image using SKiaSharp
DrawInSurface(surface, info);
// draw on the image using SKiaSharp
DrawInSurface(surface, info);
// draw the surface to the context
drawable.DrawSurface(ctx, Bounds, info, surface);
// draw the surface to the context
drawable.DrawSurface(ctx, Bounds, info, surface);
}
}
}
public event EventHandler<SKPaintSurfaceEventArgs> PaintSurface;