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 удалений

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

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

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

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

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

@ -3,7 +3,7 @@
<metadata>
<id>SkiaSharp.Views</id>
<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>
<owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
@ -13,7 +13,7 @@
<projectUrl>https://github.com/mono/SkiaSharp</projectUrl>
<iconUrl>https://cdn.rawgit.com/mono/SkiaSharp/v1.53.0/images/skia_256x256.png</iconUrl>
<dependencies>
<dependency id="SkiaSharp" version="1.54.1" />
<dependency id="SkiaSharp" version="1.54.0.1" />
</dependencies>
</metadata>
<files>

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

@ -3,7 +3,7 @@
<metadata>
<id>SkiaSharp.Views</id>
<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>
<owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
@ -13,7 +13,7 @@
<projectUrl>https://github.com/mono/SkiaSharp</projectUrl>
<iconUrl>https://cdn.rawgit.com/mono/SkiaSharp/v1.53.0/images/skia_256x256.png</iconUrl>
<dependencies>
<dependency id="SkiaSharp" version="1.54.1" />
<dependency id="SkiaSharp" version="1.54.0.1" />
</dependencies>
</metadata>
<files>

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

@ -3,7 +3,7 @@
<metadata>
<id>SkiaSharp.Views</id>
<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>
<owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
@ -13,7 +13,7 @@
<projectUrl>https://github.com/mono/SkiaSharp</projectUrl>
<iconUrl>https://cdn.rawgit.com/mono/SkiaSharp/v1.53.0/images/skia_256x256.png</iconUrl>
<dependencies>
<dependency id="SkiaSharp" version="1.54.1" />
<dependency id="SkiaSharp" version="1.54.0.1" />
</dependencies>
</metadata>
<files>

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

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

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

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

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

@ -50,7 +50,7 @@
<HintPath>packages\Xamarin.Android.Support.v7.AppCompat.23.1.1.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
</Reference>
<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>
</ItemGroup>
<ItemGroup>

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<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.v7.AppCompat" version="23.1.1.0" targetFramework="monoandroid60" />
</packages>

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

@ -85,8 +85,8 @@
<HintPath>packages\OpenTK.GLControl.1.1.2349.61993\lib\NET40\OpenTK.GLControl.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp, Version=1.54.1.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>packages\SkiaSharp.1.54.1\lib\net45\SkiaSharp.dll</HintPath>
<Reference Include="SkiaSharp, Version=1.54.0.1, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>packages\SkiaSharp.1.54.0.1\lib\net45\SkiaSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
@ -145,12 +145,12 @@
</ProjectReference>
</ItemGroup>
<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">
<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.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>
<!-- 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.

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

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

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

@ -51,7 +51,7 @@
<Reference Include="System.Core" />
<Reference Include="Xamarin.Mac" />
<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>
</ItemGroup>
<ItemGroup>
@ -95,5 +95,5 @@
</ProjectReference>
</ItemGroup>
<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>

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

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

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

@ -4,6 +4,6 @@
<NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
</PropertyGroup>
<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>
</Project>

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

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

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

@ -84,8 +84,8 @@
<HintPath>packages\OpenTK.GLControl.1.1.2349.61993\lib\NET40\OpenTK.GLControl.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp, Version=1.54.1.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>packages\SkiaSharp.1.54.1\lib\net45\SkiaSharp.dll</HintPath>
<Reference Include="SkiaSharp, Version=1.54.0.1, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>packages\SkiaSharp.1.54.0.1\lib\net45\SkiaSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
@ -160,12 +160,12 @@
</ProjectReference>
</ItemGroup>
<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">
<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.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>
<!-- 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.

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

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

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

@ -93,7 +93,7 @@
<Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" />
<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>
</ItemGroup>
<ItemGroup>

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

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.54.1" targetFramework="xamarinios10" />
<package id="SkiaSharp" version="1.54.0.1" targetFramework="xamarinios10" />
</packages>

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

@ -93,7 +93,7 @@
<Reference Include="System.Core" />
<Reference Include="Xamarin.TVOS" />
<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>
</ItemGroup>
<ItemGroup>

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

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.54.1" targetFramework="xamarintvos10" />
<package id="SkiaSharp" version="1.54.0.1" targetFramework="xamarintvos10" />
</packages>

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

@ -1,5 +1,5 @@
<?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" />
<application android:label="SkiaSharp for Xamarin.Forms" android:icon="@drawable/ic_launcher" android:theme="@style/MyTheme"></application>
</manifest>

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

@ -51,7 +51,7 @@
<Private>True</Private>
</Reference>
<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>
</Reference>
<Reference Include="System" />

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<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.Design" version="23.3.0" targetFramework="monoandroid60" />
<package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="monoandroid60" />

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

@ -33,7 +33,7 @@
</PropertyGroup>
<ItemGroup>
<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>
</Reference>
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">

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

@ -4,7 +4,7 @@
<NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
</PropertyGroup>
<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')" />
</ImportGroup>
</Project>

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

@ -1,7 +1,7 @@
{
"dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0",
"SkiaSharp": "1.54.1",
"SkiaSharp": "1.54.0.1",
"Xamarin.Forms": "2.3.0.46-pre3"
},
"frameworks": {

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

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

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

@ -80,7 +80,7 @@
</PropertyGroup>
<ItemGroup>
<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>
</Reference>
<Reference Include="System" />

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<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" />
</packages>

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<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" />
</packages>

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

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

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

@ -56,7 +56,7 @@
<Reference Include="System.Core" />
<Reference Include="Xamarin.Mac" />
<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>
</Reference>
</ItemGroup>
@ -128,5 +128,5 @@
</BundleResource>
</ItemGroup>
<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>

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

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

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

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

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

@ -56,7 +56,7 @@
<Reference Include="System.Core" />
<Reference Include="Xamarin.Mac" />
<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>
</Reference>
<Reference Include="OpenTK" />
@ -129,5 +129,5 @@
</BundleResource>
</ItemGroup>
<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>

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

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

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

@ -1,6 +1,6 @@
<?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">
<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" />
<Properties>
<DisplayName>SkiaSharp for Windows</DisplayName>

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

@ -4,6 +4,6 @@
<NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
</PropertyGroup>
<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>
</Project>

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

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

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

@ -78,7 +78,7 @@
</PropertyGroup>
<ItemGroup>
<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>
</Reference>
<Reference Include="System" />
@ -166,12 +166,12 @@
<None Include="App.config" />
</ItemGroup>
<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">
<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.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>
<!-- 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.

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

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

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

@ -87,7 +87,7 @@
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<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>
</Reference>
<Reference Include="System" />
@ -139,11 +139,11 @@
<None Include="packages.config" />
</ItemGroup>
<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">
<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.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>
</Project>

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

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

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

@ -83,7 +83,7 @@
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<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>
</Reference>
<Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
@ -141,11 +141,11 @@
<None Include="packages.config" />
</ItemGroup>
<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">
<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.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>
</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.54.1" targetFramework="net45" />
<package id="SkiaSharp" version="1.54.0.1" targetFramework="net45" />
</packages>

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

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

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

@ -88,7 +88,7 @@
<Reference Include="System.Core" />
<Reference Include="Xamarin.TVOS" />
<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>
</ItemGroup>
<ItemGroup>

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

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.54.1" targetFramework="xamarintvos10" />
<package id="SkiaSharp" version="1.54.0.1" targetFramework="xamarintvos10" />
</packages>

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

@ -44,7 +44,7 @@
<Reference Include="System.Core" />
<Reference Include="Mono.Android" />
<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>
</ItemGroup>
<ItemGroup>

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

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.54.1" targetFramework="monoandroid23" />
<package id="SkiaSharp" version="1.54.0.1" targetFramework="monoandroid23" />
</packages>

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

@ -41,8 +41,8 @@
<HintPath>..\packages\OpenTK.GLControl.1.1.2349.61993\lib\NET40\OpenTK.GLControl.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp, Version=1.54.1.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\packages\SkiaSharp.1.54.1\lib\net45\SkiaSharp.dll</HintPath>
<Reference Include="SkiaSharp, Version=1.54.0.1, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\packages\SkiaSharp.1.54.0.1\lib\net45\SkiaSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
@ -72,12 +72,12 @@
<Import Project="..\SkiaSharp.Views.OpenTK\SkiaSharp.Views.OpenTK.projitems" Label="Shared" />
<Import Project="..\SkiaSharp.Views.Windows\SkiaSharp.Views.Windows.projitems" Label="Shared" />
<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">
<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.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>
<!-- 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.

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

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

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

@ -55,7 +55,7 @@
<Reference Include="System.Core" />
<Reference Include="Xamarin.Mac" />
<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 Include="OpenTK" />
</ItemGroup>
@ -73,5 +73,5 @@
<Import Project="..\SkiaSharp.Views.Apple\SkiaSharp.Views.Apple.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="..\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>

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

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

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

@ -4,6 +4,6 @@
<NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
</PropertyGroup>
<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>
</Project>

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

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

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

@ -45,7 +45,7 @@
<Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" />
<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 Include="OpenTK-1.0" />
</ItemGroup>

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

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.54.1" targetFramework="xamarinios10" />
<package id="SkiaSharp" version="1.54.0.1" targetFramework="xamarinios10" />
</packages>

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

@ -44,7 +44,7 @@
<Reference Include="System.Core" />
<Reference Include="Xamarin.TVOS" />
<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 Include="OpenTK-1.0" />
</ItemGroup>

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

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.54.1" targetFramework="xamarintvos10" />
<package id="SkiaSharp" version="1.54.0.1" targetFramework="xamarintvos10" />
</packages>

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

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