The samples use the new NuGet package and added the 9-patch file

This commit is contained in:
Matthew Leibowitz 2016-09-02 04:45:37 +02:00
Родитель e2bce89620
Коммит 683e4e8c88
9 изменённых файлов: 28 добавлений и 7 удалений

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

@ -118,6 +118,9 @@
<EmbeddedResource Include="..\SharedDemo\adobe-dng.dng">
<Link>adobe-dng.dng</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\SharedDemo\nine-patch.png">
<Link>nine-patch.png</Link>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<BundleResource Include="..\SharedDemo\content-font.ttf">

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

@ -56,7 +56,7 @@
<Reference Include="System.Core" />
<Reference Include="Xamarin.Mac" />
<Reference Include="SkiaSharp">
<HintPath>packages\SkiaSharp.1.53.2-gpu2\lib\XamarinMac\SkiaSharp.dll</HintPath>
<HintPath>packages\SkiaSharp.1.54.0\lib\XamarinMac\SkiaSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="OpenTK" />
@ -119,6 +119,9 @@
<EmbeddedResource Include="..\SharedDemo\adobe-dng.dng">
<Link>adobe-dng.dng</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\SharedDemo\nine-patch.png">
<Link>nine-patch.png</Link>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<BundleResource Include="..\SharedDemo\content-font.ttf">
@ -126,5 +129,5 @@
</BundleResource>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
<Import Project="packages\SkiaSharp.1.53.2-gpu2\build\XamarinMac\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.53.2-gpu2\build\XamarinMac\SkiaSharp.targets')" />
<Import Project="packages\SkiaSharp.1.54.0\build\XamarinMac\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.0\build\XamarinMac\SkiaSharp.targets')" />
</Project>

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

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.53.2-gpu2" targetFramework="xamarinmac20" />
<package id="SkiaSharp" version="1.54.0" targetFramework="xamarinmac20" />
</packages>

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

@ -105,6 +105,9 @@
<EmbeddedResource Include="..\SharedDemo\embedded-font.ttf">
<Link>embedded-font.ttf</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\SharedDemo\nine-patch.png">
<Link>nine-patch.png</Link>
</EmbeddedResource>
<None Include="project.json" />
<None Include="Skia.UWP.Demo_TemporaryKey.pfx" />
</ItemGroup>

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

@ -148,6 +148,9 @@
<EmbeddedResource Include="..\SharedDemo\adobe-dng.dng">
<Link>adobe-dng.dng</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\SharedDemo\nine-patch.png">
<Link>nine-patch.png</Link>
</EmbeddedResource>
<Content Include="..\SharedDemo\content-font.ttf">
<Link>Content\content-font.ttf</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

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

@ -127,6 +127,9 @@
<EmbeddedResource Include="..\SharedDemo\adobe-dng.dng">
<Link>adobe-dng.dng</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\SharedDemo\nine-patch.png">
<Link>nine-patch.png</Link>
</EmbeddedResource>
<Content Include="..\SharedDemo\content-font.ttf">
<Link>Content\content-font.ttf</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

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

@ -83,7 +83,7 @@
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="SkiaSharp">
<HintPath>packages\SkiaSharp.1.53.2-gpu2\lib\net45\SkiaSharp.dll</HintPath>
<HintPath>packages\SkiaSharp.1.54.0\lib\net45\SkiaSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
@ -128,6 +128,9 @@
<EmbeddedResource Include="..\SharedDemo\adobe-dng.dng">
<Link>adobe-dng.dng</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\SharedDemo\nine-patch.png">
<Link>nine-patch.png</Link>
</EmbeddedResource>
<Content Include="..\SharedDemo\content-font.ttf">
<Link>Content\content-font.ttf</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@ -138,11 +141,11 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="packages\SkiaSharp.1.53.2-gpu2\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.53.2-gpu2\build\net45\SkiaSharp.targets')" />
<Import Project="packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('packages\SkiaSharp.1.53.2-gpu2\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.53.2-gpu2\build\net45\SkiaSharp.targets'))" />
<Error Condition="!Exists('packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.54.0\build\net45\SkiaSharp.targets'))" />
</Target>
</Project>

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

@ -2,5 +2,5 @@
<packages>
<package id="OpenTK" version="1.1.2349.61993" targetFramework="net45" />
<package id="OpenTK.GLControl" version="1.1.2349.61993" targetFramework="net45" />
<package id="SkiaSharp" version="1.53.2-gpu2" targetFramework="net45" />
<package id="SkiaSharp" version="1.54.0" targetFramework="net45" />
</packages>

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

@ -148,6 +148,9 @@
<EmbeddedResource Include="..\SharedDemo\adobe-dng.dng">
<Link>adobe-dng.dng</Link>
</EmbeddedResource>
<EmbeddedResource Include="..\SharedDemo\nine-patch.png">
<Link>nine-patch.png</Link>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<BundleResource Include="..\SharedDemo\content-font.ttf">