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.

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

Development #52

Merged
merged 10 commits into from
Oct 25, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions SkiaSharp.Extended.Iconify/SkiaSharp.Extended.Iconify.sln
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{FA22
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharpDemo", "SkiaSharpDemo", "{C4AA0B15-DFFB-4BD1-A6B7-BA183C1580BA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpDemo", "samples\SkiaSharpDemo\SkiaSharpDemo\SkiaSharpDemo.csproj", "{6F5C7A8D-8B31-40FE-A48B-7441810658AE}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpDemo", "samples\SkiaSharpDemo\SkiaSharpDemo.csproj", "{6F5C7A8D-8B31-40FE-A48B-7441810658AE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.Droid", "samples\SkiaSharpDemo\SkiaSharpDemo.Droid\SkiaSharpDemo.Droid.csproj", "{9B960D09-426D-4D5A-90AC-8971D255E48F}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.Droid", "samples\SkiaSharpDemo.Droid\SkiaSharpDemo.Droid.csproj", "{9B960D09-426D-4D5A-90AC-8971D255E48F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.iOS", "samples\SkiaSharpDemo\SkiaSharpDemo.iOS\SkiaSharpDemo.iOS.csproj", "{C9938859-CB05-4AAD-909A-8118F3D6B47A}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.iOS", "samples\SkiaSharpDemo.iOS\SkiaSharpDemo.iOS.csproj", "{C9938859-CB05-4AAD-909A-8118F3D6B47A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.macOS", "samples\SkiaSharpDemo\SkiaSharpDemo.macOS\SkiaSharpDemo.macOS.csproj", "{F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.macOS", "samples\SkiaSharpDemo.macOS\SkiaSharpDemo.macOS.csproj", "{F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.UWP", "samples\SkiaSharpDemo\SkiaSharpDemo.UWP\SkiaSharpDemo.UWP.csproj", "{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.UWP", "samples\SkiaSharpDemo.UWP\SkiaSharpDemo.UWP.csproj", "{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<PackageCertificateKeyFile>..\..\..\..\keys\UWP_App_Key.pfx</PackageCertificateKeyFile>
<PackageCertificateKeyFile>..\..\..\keys\UWP_App_Key.pfx</PackageCertificateKeyFile>
<PackageCertificateThumbprint>B78C3BAF61B65EE64B6B4EDB0B18039E968078B2</PackageCertificateThumbprint>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
Expand Down Expand Up @@ -115,7 +115,7 @@
<AppxManifest Include="Package.appxmanifest">
<SubType>Designer</SubType>
</AppxManifest>
<None Include="..\..\..\..\keys\UWP_App_Key.pfx" />
<None Include="..\..\..\keys\UWP_App_Key.pfx" />
</ItemGroup>
<ItemGroup>
<Content Include="Properties\Default.rd.xml" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.3</TargetFramework>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DefineConstants>TRACE;DEBUG;NET_STANDARD</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>TRACE;NET_STANDARD</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="SkiaSharp" Version="1.60.0" />
<PackageReference Include="SkiaSharp.Views.Forms" Version="1.60.0" />
<PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\source\SkiaSharp.Extended.Iconify.FontAwesome\SkiaSharp.Extended.Iconify.FontAwesome.csproj" />
<ProjectReference Include="..\..\source\SkiaSharp.Extended.Iconify.IonIcons\SkiaSharp.Extended.Iconify.IonIcons.csproj" />
<ProjectReference Include="..\..\source\SkiaSharp.Extended.Iconify.MaterialDesignIcons\SkiaSharp.Extended.Iconify.MaterialDesignIcons.csproj" />
<ProjectReference Include="..\..\source\SkiaSharp.Extended.Iconify.MaterialIcons\SkiaSharp.Extended.Iconify.MaterialIcons.csproj" />
<ProjectReference Include="..\..\source\SkiaSharp.Extended.Iconify.Meteocons\SkiaSharp.Extended.Iconify.Meteocons.csproj" />
<ProjectReference Include="..\..\source\SkiaSharp.Extended.Iconify.SimpleLineIcons\SkiaSharp.Extended.Iconify.SimpleLineIcons.csproj" />
<ProjectReference Include="..\..\source\SkiaSharp.Extended.Iconify.Typicons\SkiaSharp.Extended.Iconify.Typicons.csproj" />
<ProjectReference Include="..\..\source\SkiaSharp.Extended.Iconify.WeatherIcons\SkiaSharp.Extended.Iconify.WeatherIcons.csproj" />
<ProjectReference Include="..\..\source\SkiaSharp.Extended.Iconify\SkiaSharp.Extended.Iconify.csproj" />
</ItemGroup>

<ItemGroup>
<Compile Condition=" '$(EnableDefaultCompileItems)' == 'true' " Update="App.xaml.cs">
<DependentUpon>*.xaml</DependentUpon>
</Compile>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Update="**\*.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
</ItemGroup>

</Project>

This file was deleted.

10 changes: 5 additions & 5 deletions SkiaSharp.Extended.Svg/SkiaSharp.Extended.Svg.sln
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Svg.Test
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{51B0C2C7-732B-4A5C-A4F2-55655D147866}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpDemo", "samples\SkiaSharpDemo\SkiaSharpDemo\SkiaSharpDemo.csproj", "{A2563433-9CE0-42ED-BB51-640A0FFA9D0F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpDemo", "samples\SkiaSharpDemo\SkiaSharpDemo.csproj", "{A2563433-9CE0-42ED-BB51-640A0FFA9D0F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharpDemo", "SkiaSharpDemo", "{D3D0D6EA-99FE-4C5B-AD21-31E6332F0199}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.Droid", "samples\SkiaSharpDemo\SkiaSharpDemo.Droid\SkiaSharpDemo.Droid.csproj", "{9B960D09-426D-4D5A-90AC-8971D255E48F}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.Droid", "samples\SkiaSharpDemo.Droid\SkiaSharpDemo.Droid.csproj", "{9B960D09-426D-4D5A-90AC-8971D255E48F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.iOS", "samples\SkiaSharpDemo\SkiaSharpDemo.iOS\SkiaSharpDemo.iOS.csproj", "{C9938859-CB05-4AAD-909A-8118F3D6B47A}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.iOS", "samples\SkiaSharpDemo.iOS\SkiaSharpDemo.iOS.csproj", "{C9938859-CB05-4AAD-909A-8118F3D6B47A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.macOS", "samples\SkiaSharpDemo\SkiaSharpDemo.macOS\SkiaSharpDemo.macOS.csproj", "{F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.macOS", "samples\SkiaSharpDemo.macOS\SkiaSharpDemo.macOS.csproj", "{F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.UWP", "samples\SkiaSharpDemo\SkiaSharpDemo.UWP\SkiaSharpDemo.UWP.csproj", "{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.UWP", "samples\SkiaSharpDemo.UWP\SkiaSharpDemo.UWP.csproj", "{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Svg", "source\SkiaSharp.Extended.Svg.csproj", "{5F472166-361D-4D45-84C9-72B8566D03A2}"
EndProject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<PackageCertificateKeyFile>..\..\..\..\keys\UWP_App_Key.pfx</PackageCertificateKeyFile>
<PackageCertificateKeyFile>..\..\..\keys\UWP_App_Key.pfx</PackageCertificateKeyFile>
<PackageCertificateThumbprint>B78C3BAF61B65EE64B6B4EDB0B18039E968078B2</PackageCertificateThumbprint>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
Expand Down Expand Up @@ -118,7 +118,7 @@
<AppxManifest Include="Package.appxmanifest">
<SubType>Designer</SubType>
</AppxManifest>
<None Include="..\..\..\..\keys\UWP_App_Key.pfx" />
<None Include="..\..\..\keys\UWP_App_Key.pfx" />
</ItemGroup>
<ItemGroup>
<Content Include="Properties\Default.rd.xml" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\source\SkiaSharp.Extended.Svg.csproj" />
<ProjectReference Include="..\..\source\SkiaSharp.Extended.Svg.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</ItemGroup>

<Target Name="Test">
<xunit Assemblies="$(TargetPath)" NUnit="$(TargetDir)TestResult.xml" />
<xunit Assemblies="$(TargetPath)" Xml="$(TargetDir)TestResult.xml" />
</Target>

</Project>
10 changes: 5 additions & 5 deletions SkiaSharp.Extended/SkiaSharp.Extended.sln
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended", "sourc
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{51B0C2C7-732B-4A5C-A4F2-55655D147866}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpDemo", "samples\SkiaSharpDemo\SkiaSharpDemo\SkiaSharpDemo.csproj", "{A2563433-9CE0-42ED-BB51-640A0FFA9D0F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpDemo", "samples\SkiaSharpDemo\SkiaSharpDemo.csproj", "{A2563433-9CE0-42ED-BB51-640A0FFA9D0F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharpDemo", "SkiaSharpDemo", "{D3D0D6EA-99FE-4C5B-AD21-31E6332F0199}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.Droid", "samples\SkiaSharpDemo\SkiaSharpDemo.Droid\SkiaSharpDemo.Droid.csproj", "{9B960D09-426D-4D5A-90AC-8971D255E48F}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.Droid", "samples\SkiaSharpDemo.Droid\SkiaSharpDemo.Droid.csproj", "{9B960D09-426D-4D5A-90AC-8971D255E48F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.iOS", "samples\SkiaSharpDemo\SkiaSharpDemo.iOS\SkiaSharpDemo.iOS.csproj", "{C9938859-CB05-4AAD-909A-8118F3D6B47A}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.iOS", "samples\SkiaSharpDemo.iOS\SkiaSharpDemo.iOS.csproj", "{C9938859-CB05-4AAD-909A-8118F3D6B47A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.macOS", "samples\SkiaSharpDemo\SkiaSharpDemo.macOS\SkiaSharpDemo.macOS.csproj", "{F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.macOS", "samples\SkiaSharpDemo.macOS\SkiaSharpDemo.macOS.csproj", "{F9CC0B31-7A41-46A6-9A23-EECF765F4E2C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.UWP", "samples\SkiaSharpDemo\SkiaSharpDemo.UWP\SkiaSharpDemo.UWP.csproj", "{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpDemo.UWP", "samples\SkiaSharpDemo.UWP\SkiaSharpDemo.UWP.csproj", "{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<PackageCertificateKeyFile>..\..\..\..\keys\UWP_App_Key.pfx</PackageCertificateKeyFile>
<PackageCertificateKeyFile>..\..\..\keys\UWP_App_Key.pfx</PackageCertificateKeyFile>
<PackageCertificateThumbprint>B78C3BAF61B65EE64B6B4EDB0B18039E968078B2</PackageCertificateThumbprint>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
Expand Down Expand Up @@ -115,7 +115,7 @@
<AppxManifest Include="Package.appxmanifest">
<SubType>Designer</SubType>
</AppxManifest>
<None Include="..\..\..\..\keys\UWP_App_Key.pfx" />
<None Include="..\..\..\keys\UWP_App_Key.pfx" />
</ItemGroup>
<ItemGroup>
<Content Include="Properties\Default.rd.xml" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\source\SkiaSharp.Extended.csproj" />
<ProjectReference Include="..\..\source\SkiaSharp.Extended.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion SkiaSharp.Extended/tests/SkiaSharp.Extended.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</ItemGroup>

<Target Name="Test">
<xunit Assemblies="$(TargetPath)" NUnit="$(TargetDir)TestResult.xml" />
<xunit Assemblies="$(TargetPath)" Xml="$(TargetDir)TestResult.xml" />
</Target>

</Project>
Loading