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

Upped the NuGet version number to v1.52

This commit is contained in:
Matthew Leibowitz 2016-07-14 01:28:32 +02:00
Родитель 793834abc7
Коммит e2e7de0b54
25 изменённых файлов: 35 добавлений и 35 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -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.49.0.0")]
[assembly: AssemblyFileVersion ("1.49.4.0")]
[assembly: AssemblyInformationalVersion ("1.49.4.0-{GIT_SHA}")]
[assembly: AssemblyVersion ("1.52.0.0")]
[assembly: AssemblyFileVersion ("1.52.0.0")]
[assembly: AssemblyInformationalVersion ("1.52.0.0-{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.

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

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

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

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

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

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

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

@ -31,7 +31,7 @@ namespace Skia.Forms.Demo.Droid
try
{
using (var surface = SKSurface.Create (canvas.Width, canvas.Height, SKColorType.Rgba_8888, SKAlphaType.Premul, bitmap.LockPixels (), canvas.Width * 4)) {
using (var surface = SKSurface.Create (canvas.Width, canvas.Height, SKImageInfo.PlatformColorType, SKAlphaType.Premul, bitmap.LockPixels (), canvas.Width * 4)) {
var skcanvas = surface.Canvas;
skcanvas.Scale (((float)canvas.Width)/(float)skiaView.Width, ((float)canvas.Height)/(float)skiaView.Height);
iskiaView.SendDraw (skcanvas);

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

@ -44,15 +44,15 @@
<WarningLevel>4</WarningLevel>
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
<ConsolePause>false</ConsolePause>
<AndroidSupportedAbis>armeabi-v7a;armeabi;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
<AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
</PropertyGroup>
<ItemGroup>
<Reference Include="FormsViewGroup, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xamarin.Forms.2.3.0.46-pre3\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SkiaSharp.1.49.4-beta\lib\MonoAndroid\SkiaSharp.dll</HintPath>
<Reference Include="SkiaSharp, Version=1.52.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SkiaSharp.1.52.0-beta\lib\MonoAndroid\SkiaSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.49.4-beta" targetFramework="monoandroid60" />
<package id="SkiaSharp" version="1.52.0-beta" 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" />

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

@ -32,8 +32,8 @@
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\SkiaSharp.1.49.4-beta\lib\portable-net45+xamarinmac+xamarinios+monotouch+monoandroid+win8+wpa81+wp8+xamarin.watchos+xamarin.tvos\SkiaSharp.dll</HintPath>
<Reference Include="SkiaSharp, Version=1.52.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\SkiaSharp.1.52.0-beta\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">

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

@ -36,7 +36,7 @@ namespace Skia.Forms.Demo.UWP
IntPtr buff = Marshal.AllocCoTaskMem (width * height * 4);
try {
using (var surface = SKSurface.Create (width, height, SKColorType.N_32, SKAlphaType.Premul, buff, width * 4)) {
using (var surface = SKSurface.Create (width, height, SKImageInfo.PlatformColorType, SKAlphaType.Premul, buff, width * 4)) {
var skcanvas = surface.Canvas;
skcanvas.Scale (screenScale, screenScale);
using (new SKAutoCanvasRestore (skcanvas, true)) {

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

@ -4,7 +4,7 @@
<NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
</PropertyGroup>
<ImportGroup>
<Import Project="$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.49.4-beta\build\uap10.0\SkiaSharp.targets')" />
<Import Project="$(NuGetPackageRoot)\SkiaSharp\1.52.0-beta\build\uap10.0\SkiaSharp.targets" Condition="Exists('$(NuGetPackageRoot)\SkiaSharp\1.52.0-beta\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>

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

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

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

@ -28,7 +28,7 @@ namespace Skia.Forms.Demo.iOS
IntPtr buff = System.Runtime.InteropServices.Marshal.AllocCoTaskMem (width * height * 4);
try {
using (var surface = SKSurface.Create (width, height, SKColorType.N_32, SKAlphaType.Premul, buff, width * 4)) {
using (var surface = SKSurface.Create (width, height, SKImageInfo.PlatformColorType, SKAlphaType.Premul, buff, width * 4)) {
var skcanvas = surface.Canvas;
skcanvas.Scale ((float)screenScale, (float)screenScale);
using (new SKAutoCanvasRestore (skcanvas, true)) {

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

@ -78,8 +78,8 @@
<MtouchProfiling>true</MtouchProfiling>
</PropertyGroup>
<ItemGroup>
<Reference Include="SkiaSharp, Version=1.49.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SkiaSharp.1.49.4-beta\lib\XamariniOS\SkiaSharp.dll</HintPath>
<Reference Include="SkiaSharp, Version=1.52.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SkiaSharp.1.52.0-beta\lib\XamariniOS\SkiaSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.49.4-beta" targetFramework="xamarinios10" />
<package id="SkiaSharp" version="1.52.0-beta" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="2.3.0.46-pre3" targetFramework="xamarinios10" />
</packages>

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.49.4-beta" targetFramework="portable45-net45+win8+wp8" />
<package id="SkiaSharp" version="1.52.0-beta" targetFramework="portable45-net45+win8+wp8" />
<package id="Xamarin.Forms" version="2.3.0.46-pre3" targetFramework="portable45-net45+win8+wp8" />
</packages>

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

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

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

@ -33,7 +33,7 @@ namespace Skia.OSX.Demo
IntPtr buff = System.Runtime.InteropServices.Marshal.AllocCoTaskMem (width * height * 4);
try {
using (var surface = SKSurface.Create (width, height, SKColorType.Rgba_8888, SKAlphaType.Premul, buff, width * 4)) {
using (var surface = SKSurface.Create (width, height, SKImageInfo.PlatformColorType, SKAlphaType.Premul, buff, width * 4)) {
var skcanvas = surface.Canvas;
skcanvas.Scale (screenScale, screenScale);

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

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

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

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

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

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

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

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

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

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

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

@ -86,7 +86,7 @@
<Reference Include="System.Core" />
<Reference Include="Xamarin.TVOS" />
<Reference Include="SkiaSharp">
<HintPath>packages\SkiaSharp.1.49.4-beta\lib\XamarintvOS\SkiaSharp.dll</HintPath>
<HintPath>packages\SkiaSharp.1.52.0-beta\lib\XamarintvOS\SkiaSharp.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

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

@ -31,7 +31,7 @@ namespace Skia.tvOS.Demo
IntPtr buff = System.Runtime.InteropServices.Marshal.AllocCoTaskMem(width * height * 4);
try
{
using (var surface = SKSurface.Create(width, height, SKColorType.N_32, SKAlphaType.Premul, buff, width * 4))
using (var surface = SKSurface.Create(width, height, SKImageInfo.PlatformColorType, SKAlphaType.Premul, buff, width * 4))
{
var skcanvas = surface.Canvas;
skcanvas.Scale((float)screenScale, (float)screenScale);

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

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