SkiaSharp.Views.Forms is .NET Standard, so use that.

This commit is contained in:
Matthew Leibowitz 2018-04-16 13:40:29 +02:00
Родитель 8811f783bc
Коммит c7110098ed
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 00A672181E6BF432
11 изменённых файлов: 8 добавлений и 45 удалений

Просмотреть файл

@ -39,7 +39,7 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.Views.Forms.Nativ
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Forms.Mac", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Mac\SkiaSharp.Views.Forms.Mac.csproj", "{DA5DA4D8-4885-4AF2-96BB-AE803C344AB0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.NetStandard", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.NetStandard\SkiaSharp.Views.Forms.NetStandard.csproj", "{99411A8A-1F8C-469C-AC10-E72F28EDB376}"
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
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Forms.Android", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Android\SkiaSharp.Views.Forms.Android.csproj", "{2F94F024-1841-47E8-B521-74AA4E3EBA54}"
EndProject

Просмотреть файл

@ -27,7 +27,7 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.Views.Forms.Nativ
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Binding.Shared", "..\..\..\binding\Binding.Shared\Binding.Shared.shproj", "{6F8349DC-90AC-441D-8B8B-BE623F46BE6D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.NetStandard", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.NetStandard\SkiaSharp.Views.Forms.NetStandard.csproj", "{99411A8A-1F8C-469C-AC10-E72F28EDB376}"
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
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample.UWP", "SkiaSharpSample.UWP\SkiaSharpSample.UWP.csproj", "{8D2128D5-9893-4869-8F69-6AD16779AC64}"
EndProject

Просмотреть файл

@ -49,7 +49,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Forms.Mac",
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Binding.Shared", "..\..\..\binding\Binding.Shared\Binding.Shared.shproj", "{6F8349DC-90AC-441D-8B8B-BE623F46BE6D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.NetStandard", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.NetStandard\SkiaSharp.Views.Forms.NetStandard.csproj", "{99411A8A-1F8C-469C-AC10-E72F28EDB376}"
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
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Gtk", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Gtk\SkiaSharp.Views.Gtk.csproj", "{67A502A4-E8B2-419A-811E-5A634B29C8D7}"
EndProject

Просмотреть файл

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

Просмотреть файл

@ -13,7 +13,7 @@
<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.Views.Forms\SkiaSharp.Views.Forms.NetStandard\SkiaSharp.Views.Forms.NetStandard.csproj" />
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.csproj" />
</ItemGroup>
<Import Project="..\..\Shared\Shared.projitems" Label="Shared" />

Просмотреть файл

@ -47,7 +47,7 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.Views.Forms.Nativ
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Forms.Mac", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Mac\SkiaSharp.Views.Forms.Mac.csproj", "{DA5DA4D8-4885-4AF2-96BB-AE803C344AB0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.NetStandard", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.NetStandard\SkiaSharp.Views.Forms.NetStandard.csproj", "{99411A8A-1F8C-469C-AC10-E72F28EDB376}"
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
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Forms.Android", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Android\SkiaSharp.Views.Forms.Android.csproj", "{2F94F024-1841-47E8-B521-74AA4E3EBA54}"
EndProject

Просмотреть файл

@ -29,7 +29,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.NetStandard",
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}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.NetStandard", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.NetStandard\SkiaSharp.Views.Forms.NetStandard.csproj", "{99411A8A-1F8C-469C-AC10-E72F28EDB376}"
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
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.UWP", "..\..\..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj", "{6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}"
EndProject

Просмотреть файл

@ -57,7 +57,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.iOS", "..\..\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.Android", "..\..\..\binding\HarfBuzzSharp.Android\HarfBuzzSharp.Android.csproj", "{E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.NetStandard", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.NetStandard\SkiaSharp.Views.Forms.NetStandard.csproj", "{99411A8A-1F8C-469C-AC10-E72F28EDB376}"
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
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.UWP", "..\..\..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj", "{6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}"
EndProject

Просмотреть файл

@ -1,6 +0,0 @@
namespace SkiaSharp.Views.Forms
{
internal class SKCanvasViewRenderer
{
}
}

Просмотреть файл

@ -1,6 +0,0 @@
namespace SkiaSharp.Views.Forms
{
internal class SKGLViewRenderer
{
}
}

Просмотреть файл

@ -1,25 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard1.3</TargetFramework>
<OutputTypeEx>library</OutputTypeEx>
<AssemblyName>SkiaSharp.Views.Forms</AssemblyName>
<RootNamespace>SkiaSharp.Views.Forms</RootNamespace>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
<AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
</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;RELEASE;NET_STANDARD</DefineConstants>
<OutputPath>bin\Release\</OutputPath>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp.NetStandard\SkiaSharp.NetStandard.csproj" />
</ItemGroup>
<Import Project="..\SkiaSharp.Views.Forms.Shared\SkiaSharp.Views.Forms.Shared.projitems" Label="Shared" />
</Project>