unoplatform
/
Uno.SkiaSharp
зеркало из https://github.com/unoplatform/Uno.SkiaSharp.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Dropping the version for the merge

This commit is contained in:
Matthew Leibowitz 2016-09-14 09:32:46 +02:00
Родитель d57050f7ee
Коммит 6570c1cb49
62 изменённых файлов: 88 добавлений и 88 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
binding/SkiaSharp/Properties/SkiaSharpAssemblyInfo.cs
Просмотреть файл

@ -16,9 +16,9 @@
// The form "{Major}.{Minor}.*" will automatically update the build and revision, // The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision. // and "{Major}.{Minor}.{Build}.*" will update just the revision.
[assembly: AssemblyVersion ("1.54.1.0")] [assembly: AssemblyVersion ("1.54.0.1")]
[assembly: AssemblyFileVersion ("1.54.1.0")] [assembly: AssemblyFileVersion ("1.54.0.1")]
[assembly: AssemblyInformationalVersion ("1.54.1.0-{GIT_SHA}")] [assembly: AssemblyInformationalVersion ("1.54.0.1-{GIT_SHA}")]
// The following attributes are used to specify the signing key for the assembly, // The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing. // if desired. See the Mono documentation for more information about signing.

2
nuget/SkiaSharp.Mac.nuspec
Просмотреть файл

@ -3,7 +3,7 @@
<metadata> <metadata>
<id>SkiaSharp</id> <id>SkiaSharp</id>
<title>SkiaSharp (for OSX)</title> <title>SkiaSharp (for OSX)</title>
<version>1.54.1</version> <version>1.54.0.1</version>
<authors>Xamarin Inc.</authors> <authors>Xamarin Inc.</authors>
<owners>Xamarin Inc.</owners> <owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance> <requireLicenseAcceptance>false</requireLicenseAcceptance>

4
nuget/SkiaSharp.Views.Mac.nuspec
Просмотреть файл

@ -3,7 +3,7 @@
<metadata> <metadata>
<id>SkiaSharp.Views</id> <id>SkiaSharp.Views</id>
<title>SkiaSharp Views &amp; Layers (for macOS)</title> <title>SkiaSharp Views &amp; Layers (for macOS)</title>
<version>1.54.1-beta1</version> <version>1.54.0.1-beta1</version>
<authors>Xamarin Inc.</authors> <authors>Xamarin Inc.</authors>
<owners>Xamarin Inc.</owners> <owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance> <requireLicenseAcceptance>false</requireLicenseAcceptance>
@ -13,7 +13,7 @@
<projectUrl>https://github.com/mono/SkiaSharp</projectUrl> <projectUrl>https://github.com/mono/SkiaSharp</projectUrl>
<iconUrl>https://cdn.rawgit.com/mono/SkiaSharp/v1.53.0/images/skia_256x256.png</iconUrl> <iconUrl>https://cdn.rawgit.com/mono/SkiaSharp/v1.53.0/images/skia_256x256.png</iconUrl>
<dependencies> <dependencies>
<dependency id="SkiaSharp" version="1.54.1" /> <dependency id="SkiaSharp" version="1.54.0.1" />
</dependencies> </dependencies>
</metadata> </metadata>
<files> <files>

4
nuget/SkiaSharp.Views.Windows.nuspec
Просмотреть файл

@ -3,7 +3,7 @@
<metadata> <metadata>
<id>SkiaSharp.Views</id> <id>SkiaSharp.Views</id>
<title>SkiaSharp Views &amp; Layers (for Windows)</title> <title>SkiaSharp Views &amp; Layers (for Windows)</title>
<version>1.54.1-beta1</version> <version>1.54.0.1-beta1</version>
<authors>Xamarin Inc.</authors> <authors>Xamarin Inc.</authors>
<owners>Xamarin Inc.</owners> <owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance> <requireLicenseAcceptance>false</requireLicenseAcceptance>
@ -13,7 +13,7 @@
<projectUrl>https://github.com/mono/SkiaSharp</projectUrl> <projectUrl>https://github.com/mono/SkiaSharp</projectUrl>
<iconUrl>https://cdn.rawgit.com/mono/SkiaSharp/v1.53.0/images/skia_256x256.png</iconUrl> <iconUrl>https://cdn.rawgit.com/mono/SkiaSharp/v1.53.0/images/skia_256x256.png</iconUrl>
<dependencies> <dependencies>
<dependency id="SkiaSharp" version="1.54.1" /> <dependency id="SkiaSharp" version="1.54.0.1" />
</dependencies> </dependencies>
</metadata> </metadata>
<files> <files>

4
nuget/SkiaSharp.Views.nuspec
Просмотреть файл

@ -3,7 +3,7 @@
<metadata> <metadata>
<id>SkiaSharp.Views</id> <id>SkiaSharp.Views</id>
<title>SkiaSharp Views &amp; Layers (for macOS)</title> <title>SkiaSharp Views &amp; Layers (for macOS)</title>
<version>1.54.1-beta1</version> <version>1.54.0.1-beta1</version>
<authors>Xamarin Inc.</authors> <authors>Xamarin Inc.</authors>
<owners>Xamarin Inc.</owners> <owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance> <requireLicenseAcceptance>false</requireLicenseAcceptance>
@ -13,7 +13,7 @@
<projectUrl>https://github.com/mono/SkiaSharp</projectUrl> <projectUrl>https://github.com/mono/SkiaSharp</projectUrl>
<iconUrl>https://cdn.rawgit.com/mono/SkiaSharp/v1.53.0/images/skia_256x256.png</iconUrl> <iconUrl>https://cdn.rawgit.com/mono/SkiaSharp/v1.53.0/images/skia_256x256.png</iconUrl>
<dependencies> <dependencies>
<dependency id="SkiaSharp" version="1.54.1" /> <dependency id="SkiaSharp" version="1.54.0.1" />
</dependencies> </dependencies>
</metadata> </metadata>
<files> <files>

2
nuget/SkiaSharp.Windows.nuspec
Просмотреть файл

@ -3,7 +3,7 @@
<metadata> <metadata>
<id>SkiaSharp</id> <id>SkiaSharp</id>
<title>SkiaSharp (for Windows)</title> <title>SkiaSharp (for Windows)</title>
<version>1.54.1</version> <version>1.54.0.1</version>
<authors>Xamarin Inc.</authors> <authors>Xamarin Inc.</authors>
<owners>Xamarin Inc.</owners> <owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance> <requireLicenseAcceptance>false</requireLicenseAcceptance>

2
nuget/SkiaSharp.nuspec
Просмотреть файл

@ -3,7 +3,7 @@
<metadata> <metadata>
<id>SkiaSharp</id> <id>SkiaSharp</id>
<title>SkiaSharp</title> <title>SkiaSharp</title>
<version>1.54.1</version> <version>1.54.0.1</version>
<authors>Xamarin Inc.</authors> <authors>Xamarin Inc.</authors>
<owners>Xamarin Inc.</owners> <owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance> <requireLicenseAcceptance>false</requireLicenseAcceptance>

2
samples/BasicSamples/BasicSkiaSharp-Android/BasicSkiaSharp.csproj
Просмотреть файл

@ -50,7 +50,7 @@
<HintPath>packages\Xamarin.Android.Support.v7.AppCompat.23.1.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath> <HintPath>packages\Xamarin.Android.Support.v7.AppCompat.23.1.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
</Reference> </Reference>
<Reference Include="SkiaSharp"> <Reference Include="SkiaSharp">
<HintPath>packages\SkiaSharp.1.54.1\lib\MonoAndroid\SkiaSharp.dll</HintPath> <HintPath>packages\SkiaSharp.1.54.0.1\lib\MonoAndroid\SkiaSharp.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
samples/BasicSamples/BasicSkiaSharp-Android/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.54.1" targetFramework="monoandroid60" /> <package id="SkiaSharp" version="1.54.0.1" targetFramework="monoandroid60" />
<package id="Xamarin.Android.Support.v4" version="23.1.1.0" targetFramework="monoandroid60" /> <package id="Xamarin.Android.Support.v4" version="23.1.1.0" targetFramework="monoandroid60" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="23.1.1.0" targetFramework="monoandroid60" /> <package id="Xamarin.Android.Support.v7.AppCompat" version="23.1.1.0" targetFramework="monoandroid60" />
</packages> </packages>

8
samples/BasicSamples/BasicSkiaSharp-Desktop/BasicSkiaSharp.csproj
Просмотреть файл

@ -85,8 +85,8 @@
<HintPath>packages\OpenTK.GLControl.1.1.2349.61993\lib\NET40\OpenTK.GLControl.dll</HintPath> <HintPath>packages\OpenTK.GLControl.1.1.2349.61993\lib\NET40\OpenTK.GLControl.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="SkiaSharp, Version=1.54.1.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL"> <Reference Include="SkiaSharp, Version=1.54.0.1, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>packages\SkiaSharp.1.54.1\lib\net45\SkiaSharp.dll</HintPath> <HintPath>packages\SkiaSharp.1.54.0.1\lib\net45\SkiaSharp.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
@ -145,12 +145,12 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" /> <Import Project="packages\SkiaSharp.1.54.0.1\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.0.1\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.54.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets'))" /> <Error Condition="!Exists('packages\SkiaSharp.1.54.0.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.54.0.1\build\net45\SkiaSharp.targets'))" />
</Target> </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

2
samples/BasicSamples/BasicSkiaSharp-Desktop/packages.config
Просмотреть файл

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

4
samples/BasicSamples/BasicSkiaSharp-Mac/BasicSkiaSharp.csproj
Просмотреть файл

@ -51,7 +51,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.54.1\lib\XamarinMac\SkiaSharp.dll</HintPath> <HintPath>packages\SkiaSharp.1.54.0.1\lib\XamarinMac\SkiaSharp.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -95,5 +95,5 @@
</ProjectReference> </ProjectReference>
</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.54.1\build\XamarinMac\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.1\build\XamarinMac\SkiaSharp.targets')" /> <Import Project="packages\SkiaSharp.1.54.0.1\build\XamarinMac\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.0.1\build\XamarinMac\SkiaSharp.targets')" />
</Project> </Project>

2
samples/BasicSamples/BasicSkiaSharp-Mac/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.54.1" targetFramework="xamarinmac20" /> <package id="SkiaSharp" version="1.54.0.1" targetFramework="xamarinmac20" />
</packages> </packages>

2
samples/BasicSamples/BasicSkiaSharp-UWP/BasicSkiaSharp.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.54.1\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.54.1\build\uap10.0\SkiaSharp.targets')" /> <Import Project="$(NuGetPackageRoot)\SkiaSharp\1.54.0.1\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.54.0.1\build\uap10.0\SkiaSharp.targets')" />
</ImportGroup> </ImportGroup>
</Project> </Project>

2
samples/BasicSamples/BasicSkiaSharp-UWP/project.json
Просмотреть файл

@ -1,7 +1,7 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0", "Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0",
"SkiaSharp": "1.54.1" "SkiaSharp": "1.54.0.1"
}, },
"frameworks": { "frameworks": {
"uap10.0": {} "uap10.0": {}

8
samples/BasicSamples/BasicSkiaSharp-WPF/BasicSkiaSharp.csproj
Просмотреть файл

@ -84,8 +84,8 @@
<HintPath>packages\OpenTK.GLControl.1.1.2349.61993\lib\NET40\OpenTK.GLControl.dll</HintPath> <HintPath>packages\OpenTK.GLControl.1.1.2349.61993\lib\NET40\OpenTK.GLControl.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="SkiaSharp, Version=1.54.1.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL"> <Reference Include="SkiaSharp, Version=1.54.0.1, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>packages\SkiaSharp.1.54.1\lib\net45\SkiaSharp.dll</HintPath> <HintPath>packages\SkiaSharp.1.54.0.1\lib\net45\SkiaSharp.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
@ -160,12 +160,12 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" /> <Import Project="packages\SkiaSharp.1.54.0.1\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.0.1\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.54.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets'))" /> <Error Condition="!Exists('packages\SkiaSharp.1.54.0.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.54.0.1\build\net45\SkiaSharp.targets'))" />
</Target> </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

2
samples/BasicSamples/BasicSkiaSharp-WPF/packages.config
Просмотреть файл

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

2
samples/BasicSamples/BasicSkiaSharp-iOS/BasicSkiaSharp.csproj
Просмотреть файл

@ -93,7 +93,7 @@
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" /> <Reference Include="Xamarin.iOS" />
<Reference Include="SkiaSharp"> <Reference Include="SkiaSharp">
<HintPath>packages\SkiaSharp.1.54.1\lib\XamariniOS\SkiaSharp.dll</HintPath> <HintPath>packages\SkiaSharp.1.54.0.1\lib\XamariniOS\SkiaSharp.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
samples/BasicSamples/BasicSkiaSharp-iOS/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.54.1" targetFramework="xamarinios10" /> <package id="SkiaSharp" version="1.54.0.1" targetFramework="xamarinios10" />
</packages> </packages>

2
samples/BasicSamples/BasicSkiaSharp-tvOS/BasicSkiaSharp/BasicSkiaSharp.csproj
Просмотреть файл

@ -93,7 +93,7 @@
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="Xamarin.TVOS" /> <Reference Include="Xamarin.TVOS" />
<Reference Include="SkiaSharp"> <Reference Include="SkiaSharp">
<HintPath>..\packages\SkiaSharp.1.54.1\lib\XamarintvOS\SkiaSharp.dll</HintPath> <HintPath>..\packages\SkiaSharp.1.54.0.1\lib\XamarintvOS\SkiaSharp.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
samples/BasicSamples/BasicSkiaSharp-tvOS/BasicSkiaSharp/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.54.1" targetFramework="xamarintvos10" /> <package id="SkiaSharp" version="1.54.0.1" targetFramework="xamarintvos10" />
</packages> </packages>

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="4" android:versionName="1.54.1" package="com.xamarin.skia_forms_demo" android:installLocation="auto"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="4" android:versionName="1.54.0.1" package="com.xamarin.skia_forms_demo" android:installLocation="auto">
<uses-sdk android:minSdkVersion="15" /> <uses-sdk android:minSdkVersion="15" />
<application android:label="SkiaSharp for Xamarin.Forms" android:icon="@drawable/ic_launcher" android:theme="@style/MyTheme"></application> <application android:label="SkiaSharp for Xamarin.Forms" android:icon="@drawable/ic_launcher" android:theme="@style/MyTheme"></application>
</manifest> </manifest>

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

@ -51,7 +51,7 @@
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="SkiaSharp"> <Reference Include="SkiaSharp">
<HintPath>..\packages\SkiaSharp.1.54.1\lib\MonoAndroid\SkiaSharp.dll</HintPath> <HintPath>..\packages\SkiaSharp.1.54.0.1\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.54.1" targetFramework="monoandroid60" /> <package id="SkiaSharp" version="1.54.0.1" 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"> <Reference Include="SkiaSharp">
<HintPath>packages\SkiaSharp.1.54.1\lib\portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos\SkiaSharp.dll</HintPath> <HintPath>packages\SkiaSharp.1.54.0.1\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.54.1\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.54.1\build\uap10.0\SkiaSharp.targets')" /> <Import Project="$(NuGetPackageRoot)\SkiaSharp\1.54.0.1\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.54.0.1\build\uap10.0\SkiaSharp.targets')" />
<Import Project="$(NuGetPackageRoot)\Xamarin.Forms\2.3.0.46-pre3\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)\Xamarin.Forms\2.3.0.46-pre3\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" /> <Import Project="$(NuGetPackageRoot)\Xamarin.Forms\2.3.0.46-pre3\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)\Xamarin.Forms\2.3.0.46-pre3\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.54.1", "SkiaSharp": "1.54.0.1",
"Xamarin.Forms": "2.3.0.46-pre3" "Xamarin.Forms": "2.3.0.46-pre3"
}, },
"frameworks": { "frameworks": {

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

@ -7,7 +7,7 @@
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>com.xamarin.skia-forms-demo</string> <string>com.xamarin.skia-forms-demo</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.54.1</string> <string>1.54.0.1</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.1</string> <string>1.1</string>
<key>LSRequiresIPhoneOS</key> <key>LSRequiresIPhoneOS</key>

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

@ -80,7 +80,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="SkiaSharp"> <Reference Include="SkiaSharp">
<HintPath>..\packages\SkiaSharp.1.54.1\lib\XamariniOS\SkiaSharp.dll</HintPath> <HintPath>..\packages\SkiaSharp.1.54.0.1\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.54.1" targetFramework="xamarinios10" /> <package id="SkiaSharp" version="1.54.0.1" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="2.3.0.46-pre3" targetFramework="xamarinios10" /> <package id="Xamarin.Forms" version="2.3.0.46-pre3" 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.54.1" targetFramework="portable45-net45+win8+wp8" /> <package id="SkiaSharp" version="1.54.0.1" targetFramework="portable45-net45+win8+wp8" />
<package id="Xamarin.Forms" version="2.3.0.46-pre3" targetFramework="portable45-net45+win8+wp8" /> <package id="Xamarin.Forms" version="2.3.0.46-pre3" targetFramework="portable45-net45+win8+wp8" />
</packages> </packages>

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

@ -5,7 +5,7 @@
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>com.xamarin.skia-osx-demo</string> <string>com.xamarin.skia-osx-demo</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.54.1</string> <string>1.54.0.1</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.1</string> <string>1.1</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>

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.54.1\lib\XamarinMac\SkiaSharp.dll</HintPath> <HintPath>packages\SkiaSharp.1.54.0.1\lib\XamarinMac\SkiaSharp.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
@ -128,5 +128,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.54.1\build\XamarinMac\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.1\build\XamarinMac\SkiaSharp.targets')" /> <Import Project="packages\SkiaSharp.1.54.0.1\build\XamarinMac\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.0.1\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.54.1" targetFramework="xamarinmac20" /> <package id="SkiaSharp" version="1.54.0.1" targetFramework="xamarinmac20" />
</packages> </packages>

2
samples/Skia.OSX.GLDemo/Info.plist
Просмотреть файл

@ -7,7 +7,7 @@
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>com.xamarin.skia-osx-demo</string> <string>com.xamarin.skia-osx-demo</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.54.1</string> <string>1.54.0.1</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.1</string> <string>1.1</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>

4
samples/Skia.OSX.GLDemo/Skia.OSX.GLDemo.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.54.1\lib\XamarinMac\SkiaSharp.dll</HintPath> <HintPath>packages\SkiaSharp.1.54.0.1\lib\XamarinMac\SkiaSharp.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="OpenTK" /> <Reference Include="OpenTK" />
@ -129,5 +129,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.54.1\build\XamarinMac\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.1\build\XamarinMac\SkiaSharp.targets')" /> <Import Project="packages\SkiaSharp.1.54.0.1\build\XamarinMac\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.0.1\build\XamarinMac\SkiaSharp.targets')" />
</Project> </Project>

2
samples/Skia.OSX.GLDemo/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.54.1" targetFramework="xamarinmac20" /> <package id="SkiaSharp" version="1.54.0.1" targetFramework="xamarinmac20" />
</packages> </packages>

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp"> <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
<Identity Name="51681.NETDevelopmentAddic.Skia.UWP.Demo" Publisher="CN=B0BB84CF-0033-49C8-BB54-7D95062245A2" Version="1.54.1.0" /> <Identity Name="51681.NETDevelopmentAddic.Skia.UWP.Demo" Publisher="CN=B0BB84CF-0033-49C8-BB54-7D95062245A2" Version="1.54.0.1" />
<mp:PhoneIdentity PhoneProductId="ba3af39c-4820-4731-a149-e78facd8bdff" PhonePublisherId="00000000-0000-0000-0000-000000000000" /> <mp:PhoneIdentity PhoneProductId="ba3af39c-4820-4731-a149-e78facd8bdff" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties> <Properties>
<DisplayName>SkiaSharp for Windows</DisplayName> <DisplayName>SkiaSharp for Windows</DisplayName>

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.54.1\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.54.1\build\uap10.0\SkiaSharp.targets')" /> <Import Project="$(NuGetPackageRoot)\SkiaSharp\1.54.0.1\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.54.0.1\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.54.1" "SkiaSharp": "1.54.0.1"
}, },
"frameworks": { "frameworks": {
"uap10.0": {} "uap10.0": {}

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

@ -78,7 +78,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="SkiaSharp"> <Reference Include="SkiaSharp">
<HintPath>packages\SkiaSharp.1.54.1\lib\net45\SkiaSharp.dll</HintPath> <HintPath>packages\SkiaSharp.1.54.0.1\lib\net45\SkiaSharp.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
@ -166,12 +166,12 @@
<None Include="App.config" /> <None Include="App.config" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" /> <Import Project="packages\SkiaSharp.1.54.0.1\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.0.1\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.54.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets'))" /> <Error Condition="!Exists('packages\SkiaSharp.1.54.0.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.54.0.1\build\net45\SkiaSharp.targets'))" />
</Target> </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

2
samples/Skia.WPF.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.54.1" targetFramework="net45" /> <package id="SkiaSharp" version="1.54.0.1" targetFramework="net45" />
</packages> </packages>

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"> <Reference Include="SkiaSharp">
<HintPath>packages\SkiaSharp.1.54.1\lib\net45\SkiaSharp.dll</HintPath> <HintPath>packages\SkiaSharp.1.54.0.1\lib\net45\SkiaSharp.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
@ -139,11 +139,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.54.1\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" /> <Import Project="packages\SkiaSharp.1.54.0.1\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.0.1\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.54.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets'))" /> <Error Condition="!Exists('packages\SkiaSharp.1.54.0.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.54.0.1\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.54.1" targetFramework="net45" /> <package id="SkiaSharp" version="1.54.0.1" targetFramework="net45" />
</packages> </packages>

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

@ -83,7 +83,7 @@
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="SkiaSharp"> <Reference Include="SkiaSharp">
<HintPath>packages\SkiaSharp.1.54.1\lib\net45\SkiaSharp.dll</HintPath> <HintPath>packages\SkiaSharp.1.54.0.1\lib\net45\SkiaSharp.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL"> <Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
@ -141,11 +141,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.54.1\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" /> <Import Project="packages\SkiaSharp.1.54.0.1\build\net45\SkiaSharp.targets" Condition="Exists('packages\SkiaSharp.1.54.0.1\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.54.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets'))" /> <Error Condition="!Exists('packages\SkiaSharp.1.54.0.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SkiaSharp.1.54.0.1\build\net45\SkiaSharp.targets'))" />
</Target> </Target>
</Project> </Project>

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

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

2
samples/Skia.tvOS.Demo/Info.plist
Просмотреть файл

@ -9,7 +9,7 @@
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>com.companyname.skia-tvos-demo</string> <string>com.companyname.skia-tvos-demo</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.54.1</string> <string>1.54.0.1</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.1</string> <string>1.1</string>
<key>MinimumOSVersion</key> <key>MinimumOSVersion</key>

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

@ -88,7 +88,7 @@
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="Xamarin.TVOS" /> <Reference Include="Xamarin.TVOS" />
<Reference Include="SkiaSharp"> <Reference Include="SkiaSharp">
<HintPath>packages\SkiaSharp.1.54.1\lib\XamarintvOS\SkiaSharp.dll</HintPath> <HintPath>packages\SkiaSharp.1.54.0.1\lib\XamarintvOS\SkiaSharp.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
samples/Skia.tvOS.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.54.1" targetFramework="xamarintvos10" /> <package id="SkiaSharp" version="1.54.0.1" targetFramework="xamarintvos10" />
</packages> </packages>

2
views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj
Просмотреть файл

@ -44,7 +44,7 @@
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="Mono.Android" /> <Reference Include="Mono.Android" />
<Reference Include="SkiaSharp"> <Reference Include="SkiaSharp">
<HintPath>..\packages\SkiaSharp.1.54.1\lib\MonoAndroid\SkiaSharp.dll</HintPath> <HintPath>..\packages\SkiaSharp.1.54.0.1\lib\MonoAndroid\SkiaSharp.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
views/SkiaSharp.Views.Android/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.54.1" targetFramework="monoandroid23" /> <package id="SkiaSharp" version="1.54.0.1" targetFramework="monoandroid23" />
</packages> </packages>

8
views/SkiaSharp.Views.Desktop/SkiaSharp.Views.Desktop.csproj
Просмотреть файл

@ -41,8 +41,8 @@
<HintPath>..\packages\OpenTK.GLControl.1.1.2349.61993\lib\NET40\OpenTK.GLControl.dll</HintPath> <HintPath>..\packages\OpenTK.GLControl.1.1.2349.61993\lib\NET40\OpenTK.GLControl.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="SkiaSharp, Version=1.54.1.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL"> <Reference Include="SkiaSharp, Version=1.54.0.1, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\packages\SkiaSharp.1.54.1\lib\net45\SkiaSharp.dll</HintPath> <HintPath>..\packages\SkiaSharp.1.54.0.1\lib\net45\SkiaSharp.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
@ -72,12 +72,12 @@
<Import Project="..\SkiaSharp.Views.OpenTK\SkiaSharp.Views.OpenTK.projitems" Label="Shared" /> <Import Project="..\SkiaSharp.Views.OpenTK\SkiaSharp.Views.OpenTK.projitems" Label="Shared" />
<Import Project="..\SkiaSharp.Views.Windows\SkiaSharp.Views.Windows.projitems" Label="Shared" /> <Import Project="..\SkiaSharp.Views.Windows\SkiaSharp.Views.Windows.projitems" Label="Shared" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets')" /> <Import Project="..\packages\SkiaSharp.1.54.0.1\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.54.0.1\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.54.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.54.1\build\net45\SkiaSharp.targets'))" /> <Error Condition="!Exists('..\packages\SkiaSharp.1.54.0.1\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.54.0.1\build\net45\SkiaSharp.targets'))" />
</Target> </Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

2
views/SkiaSharp.Views.Desktop/packages.config
Просмотреть файл

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

4
views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj
Просмотреть файл

@ -55,7 +55,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.54.1\lib\XamarinMac\SkiaSharp.dll</HintPath> <HintPath>..\packages\SkiaSharp.1.54.0.1\lib\XamarinMac\SkiaSharp.dll</HintPath>
</Reference> </Reference>
<Reference Include="OpenTK" /> <Reference Include="OpenTK" />
</ItemGroup> </ItemGroup>
@ -73,5 +73,5 @@
<Import Project="..\SkiaSharp.Views.Apple\SkiaSharp.Views.Apple.projitems" Label="Shared" /> <Import Project="..\SkiaSharp.Views.Apple\SkiaSharp.Views.Apple.projitems" Label="Shared" />
<Import Project="..\SkiaSharp.Views.OpenTK\SkiaSharp.Views.OpenTK.projitems" Label="Shared" /> <Import Project="..\SkiaSharp.Views.OpenTK\SkiaSharp.Views.OpenTK.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
<Import Project="..\packages\SkiaSharp.1.54.1\build\XamarinMac\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.54.1\build\XamarinMac\SkiaSharp.targets')" /> <Import Project="..\packages\SkiaSharp.1.54.0.1\build\XamarinMac\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.54.0.1\build\XamarinMac\SkiaSharp.targets')" />
</Project> </Project>

2
views/SkiaSharp.Views.Mac/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.54.1" targetFramework="xamarinmac20" /> <package id="SkiaSharp" version="1.54.0.1" targetFramework="xamarinmac20" />
</packages> </packages>

2
views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.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.54.1\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.54.1\build\uap10.0\SkiaSharp.targets')" /> <Import Project="$(NuGetPackageRoot)\SkiaSharp\1.54.0.1\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.54.0.1\build\uap10.0\SkiaSharp.targets')" />
</ImportGroup> </ImportGroup>
</Project> </Project>

2
views/SkiaSharp.Views.UWP/project.json
Просмотреть файл

@ -1,7 +1,7 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0", "Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0",
"SkiaSharp": "1.54.1" "SkiaSharp": "1.54.0.1"
}, },
"frameworks": { "frameworks": {
"uap10.0": {} "uap10.0": {}

2
views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj
Просмотреть файл

@ -45,7 +45,7 @@
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" /> <Reference Include="Xamarin.iOS" />
<Reference Include="SkiaSharp"> <Reference Include="SkiaSharp">
<HintPath>..\packages\SkiaSharp.1.54.1\lib\XamariniOS\SkiaSharp.dll</HintPath> <HintPath>..\packages\SkiaSharp.1.54.0.1\lib\XamariniOS\SkiaSharp.dll</HintPath>
</Reference> </Reference>
<Reference Include="OpenTK-1.0" /> <Reference Include="OpenTK-1.0" />
</ItemGroup> </ItemGroup>

2
views/SkiaSharp.Views.iOS/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.54.1" targetFramework="xamarinios10" /> <package id="SkiaSharp" version="1.54.0.1" targetFramework="xamarinios10" />
</packages> </packages>

2
views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj
Просмотреть файл

@ -44,7 +44,7 @@
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="Xamarin.TVOS" /> <Reference Include="Xamarin.TVOS" />
<Reference Include="SkiaSharp"> <Reference Include="SkiaSharp">
<HintPath>..\packages\SkiaSharp.1.54.1\lib\XamarintvOS\SkiaSharp.dll</HintPath> <HintPath>..\packages\SkiaSharp.1.54.0.1\lib\XamarintvOS\SkiaSharp.dll</HintPath>
</Reference> </Reference>
<Reference Include="OpenTK-1.0" /> <Reference Include="OpenTK-1.0" />
</ItemGroup> </ItemGroup>

2
views/SkiaSharp.Views.tvOS/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.54.1" targetFramework="xamarintvos10" /> <package id="SkiaSharp" version="1.54.0.1" targetFramework="xamarintvos10" />
</packages> </packages>

6
views/SkiaSharp.Views/Properties/SkiaSharpViewsAssemblyInfo.cs
Просмотреть файл

@ -16,9 +16,9 @@
// The form "{Major}.{Minor}.*" will automatically update the build and revision, // The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision. // and "{Major}.{Minor}.{Build}.*" will update just the revision.
[assembly: AssemblyVersion ("1.54.1.0")] [assembly: AssemblyVersion ("1.54.0.1")]
[assembly: AssemblyFileVersion ("1.54.1.0")] [assembly: AssemblyFileVersion ("1.54.0.1")]
[assembly: AssemblyInformationalVersion ("1.54.1.0-{GIT_SHA}")] [assembly: AssemblyInformationalVersion ("1.54.0.1-{GIT_SHA}")]
// The following attributes are used to specify the signing key for the assembly, // The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing. // if desired. See the Mono documentation for more information about signing.