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

Updated the samples to use beta4

This commit is contained in:
Matthew Leibowitz 2016-06-14 10:21:54 +02:00
Родитель 7e1c27d65e
Коммит 4d7ccd7c04
14 изменённых файлов: 17 добавлений и 17 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
samples/Skia.Forms.Demo/Droid/Skia.Forms.Demo.Droid.csproj
Просмотреть файл

@ -52,7 +52,7 @@
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SkiaSharp.1.49.4-beta3\lib\MonoAndroid\SkiaSharp.dll</HintPath> <HintPath>..\packages\SkiaSharp.1.49.4-beta4\lib\MonoAndroid\SkiaSharp.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />

2
samples/Skia.Forms.Demo/Droid/packages.config
Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="SkiaSharp" version="1.49.4-beta3" targetFramework="monoandroid60" /> <package id="SkiaSharp" version="1.49.4-beta4" targetFramework="monoandroid60" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" /> <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" />
<package id="Xamarin.Android.Support.Design" version="23.3.0" targetFramework="monoandroid60" /> <package id="Xamarin.Android.Support.Design" version="23.3.0" targetFramework="monoandroid60" />
<package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid60" /> <package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid60" />

2
samples/Skia.Forms.Demo/Skia.Forms.Demo.csproj
Просмотреть файл

@ -33,7 +33,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\SkiaSharp.1.49.4-beta3\lib\portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos\SkiaSharp.dll</HintPath> <HintPath>packages\SkiaSharp.1.49.4-beta4\lib\portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos\SkiaSharp.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">

2
samples/Skia.Forms.Demo/UWP/Skia.Forms.Demo.UWP.nuget.targets
Просмотреть файл

@ -4,7 +4,7 @@
<NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot> <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
</PropertyGroup> </PropertyGroup>
<ImportGroup> <ImportGroup>
<Import Project="$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta3\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta3\build\uap10.0\SkiaSharp.targets')" /> <Import Project="$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta4\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta4\build\uap10.0\SkiaSharp.targets')" />
<Import Project="$(NuGetPackageRoot)\Xamarin.Forms\2.3.0.38-pre2\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)\Xamarin.Forms\2.3.0.38-pre2\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" /> <Import Project="$(NuGetPackageRoot)\Xamarin.Forms\2.3.0.38-pre2\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)\Xamarin.Forms\2.3.0.38-pre2\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
</ImportGroup> </ImportGroup>
</Project> </Project>

2
samples/Skia.Forms.Demo/UWP/project.json
Просмотреть файл

@ -1,7 +1,7 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0", "Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0",
"SkiaSharp": "1.49.4-beta3", "SkiaSharp": "1.49.4-beta4",
"Xamarin.Forms": "2.3.0.38-pre2" "Xamarin.Forms": "2.3.0.38-pre2"
}, },
"frameworks": { "frameworks": {

2
samples/Skia.Forms.Demo/iOS/Skia.Forms.Demo.iOS.csproj
Просмотреть файл

@ -79,7 +79,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SkiaSharp.1.49.4-beta3\lib\XamariniOS\SkiaSharp.dll</HintPath> <HintPath>..\packages\SkiaSharp.1.49.4-beta4\lib\XamariniOS\SkiaSharp.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />

2
samples/Skia.Forms.Demo/iOS/packages.config
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="SkiaSharp" version="1.49.4-beta3" targetFramework="xamarinios10" /> <package id="SkiaSharp" version="1.49.4-beta4" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="2.3.0.38-pre2" targetFramework="xamarinios10" /> <package id="Xamarin.Forms" version="2.3.0.38-pre2" targetFramework="xamarinios10" />
</packages> </packages>

2
samples/Skia.Forms.Demo/packages.config
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="SkiaSharp" version="1.49.4-beta3" targetFramework="portable45-net45+win8+wp8" /> <package id="SkiaSharp" version="1.49.4-beta4" targetFramework="portable45-net45+win8+wp8" />
<package id="Xamarin.Forms" version="2.3.0.38-pre2" targetFramework="portable45-net45+win8+wp8" /> <package id="Xamarin.Forms" version="2.3.0.38-pre2" targetFramework="portable45-net45+win8+wp8" />
</packages> </packages>

4
samples/Skia.OSX.Demo/Skia.OSX.Demo.csproj
Просмотреть файл

@ -56,7 +56,7 @@
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="Xamarin.Mac" /> <Reference Include="Xamarin.Mac" />
<Reference Include="SkiaSharp"> <Reference Include="SkiaSharp">
<HintPath>packages\SkiaSharp.1.49.4-beta3\lib\XamarinMac\SkiaSharp.dll</HintPath> <HintPath>packages\SkiaSharp.1.49.4-beta4\lib\XamarinMac\SkiaSharp.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
@ -115,5 +115,5 @@
</BundleResource> </BundleResource>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
<Import Project="packages\SkiaSharp.1.49.4-beta3\build\XamarinMac\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.49.4-beta3\build\XamarinMac\SkiaSharp.targets')" /> <Import Project="packages\SkiaSharp.1.49.4-beta4\build\XamarinMac\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.49.4-beta4\build\XamarinMac\SkiaSharp.targets')" />
</Project> </Project>

2
samples/Skia.OSX.Demo/packages.config
Просмотреть файл

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

2
samples/Skia.UWP.Demo/Skia.UWP.Demo.nuget.targets
Просмотреть файл

@ -4,6 +4,6 @@
<NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot> <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
</PropertyGroup> </PropertyGroup>
<ImportGroup> <ImportGroup>
<Import Project="$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta3\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta3\build\uap10.0\SkiaSharp.targets')" /> <Import Project="$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta4\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta4\build\uap10.0\SkiaSharp.targets')" />
</ImportGroup> </ImportGroup>
</Project> </Project>

2
samples/Skia.UWP.Demo/project.json
Просмотреть файл

@ -4,7 +4,7 @@
"Microsoft.ApplicationInsights.PersistenceChannel": "1.0.0", "Microsoft.ApplicationInsights.PersistenceChannel": "1.0.0",
"Microsoft.ApplicationInsights.WindowsApps": "1.0.0", "Microsoft.ApplicationInsights.WindowsApps": "1.0.0",
"Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0", "Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0",
"SkiaSharp": "1.49.4-beta3" "SkiaSharp": "1.49.4-beta4"
}, },
"frameworks": { "frameworks": {
"uap10.0": {} "uap10.0": {}

6
samples/Skia.WindowsDesktop.Demo/Skia.WindowsDesktop.Demo.csproj
Просмотреть файл

@ -87,7 +87,7 @@
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\SkiaSharp.1.49.4-beta3\lib\net45\SkiaSharp.dll</HintPath> <HintPath>packages\SkiaSharp.1.49.4-beta4\lib\net45\SkiaSharp.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
@ -133,11 +133,11 @@
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="packages\SkiaSharp.1.49.4-beta3\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.49.4-beta3\build\net45\SkiaSharp.targets')" /> <Import Project="packages\SkiaSharp.1.49.4-beta4\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.49.4-beta4\build\net45\SkiaSharp.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup> <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> <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> </PropertyGroup>
<Error Condition="!Exists('packages\SkiaSharp.1.49.4-beta3\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.49.4-beta3\build\net45\SkiaSharp.targets'))" /> <Error Condition="!Exists('packages\SkiaSharp.1.49.4-beta4\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.49.4-beta4\build\net45\SkiaSharp.targets'))" />
</Target> </Target>
</Project> </Project>

2
samples/Skia.WindowsDesktop.Demo/packages.config
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="SkiaSharp" version="1.49.4-beta3" targetFramework="net45" /> <package id="SkiaSharp" version="1.49.4-beta4" targetFramework="net45" />
</packages> </packages>