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

Updated the packaging version to v1.57.0

This commit is contained in:
Matthew Leibowitz 2017-03-18 17:08:10 +04:00
Родитель 462cba2bf7
Коммит 7dc39e9770
36 изменённых файлов: 134 добавлений и 125 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -9,9 +9,9 @@ using System.Reflection;
[assembly: AssemblyDescription("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SkiaSharp")]
[assembly: AssemblyVersion("1.56.0.0")]
[assembly: AssemblyFileVersion("1.56.2.0")]
[assembly: AssemblyInformationalVersion("1.56.2.0-{GIT_SHA}")]
[assembly: AssemblyVersion("1.57.0.0")]
[assembly: AssemblyFileVersion("1.57.0.0")]
[assembly: AssemblyInformationalVersion("1.57.0.0-{GIT_SHA}")]
[assembly: AssemblyCopyright("Xamarin Inc.")]
[assembly: AssemblyTrademark("")]

14
build.cake
Просмотреть файл

@ -23,15 +23,15 @@ var GenApiToolPath = GetToolPath ("Microsoft.DotNet.BuildTools.GenAPI/tools/GenA
var MDocPath = GetToolPath ("mdoc/mdoc.exe");
var SNToolPath = GetSNToolPath (EnvironmentVariable ("SN_EXE"));
var VERSION_ASSEMBLY = "1.56.0.0";
var VERSION_FILE = "1.56.2.0";
var VERSION_ASSEMBLY = "1.57.0.0";
var VERSION_FILE = "1.57.0.0";
var VERSION_SONAME = VERSION_FILE.Substring(VERSION_FILE.IndexOf(".") + 1);
var VERSION_PACKAGES = new Dictionary<string, string> {
{ "SkiaSharp", "1.56.2" },
{ "SkiaSharp.Views", "1.56.2" },
{ "SkiaSharp.Views.Forms", "1.56.2" },
{ "SkiaSharp.Svg", "1.56.2" },
{ "SkiaSharp.Extended", "1.56.2-beta" },
{ "SkiaSharp", "1.57.0-beta" },
{ "SkiaSharp.Views", "1.57.0-beta" },
{ "SkiaSharp.Views.Forms", "1.57.0-beta" },
{ "SkiaSharp.Svg", "1.57.0-beta" },
{ "SkiaSharp.Extended", "1.57.0-beta" },
};
var CI_TARGETS = new string[] { "CI", "WINDOWS-CI", "LINUX-CI", "MAC-CI" };

14
cake/UtilsMSBuild.cake
Просмотреть файл

@ -261,6 +261,20 @@ var UpdateSkiaSharpVersion = new Action<FilePath, Dictionary<string, string>> ((
hint.Value = replace (hint.Value);
}
}
var packageReferences = xdoc.Root
.Elements ("ItemGroup")
.Elements ("PackageReference");
foreach (var package in packageReferences) {
var id = package.Attribute ("Include").Value;
// check to see what it matches
string version;
if (versions.TryGetValue (id, out version) &&
version != package.Attribute ("Version").Value) {
// replace with the new version
package.Attribute ("Version").Value = version;
modified = true;
}
}
var imports = xdoc.Root
.Elements (MSBuildNS + "Import");
foreach (var package in imports) {

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

@ -3,7 +3,7 @@
<metadata>
<id>SkiaSharp.Extended</id>
<title>SkiaSharp.Extended</title>
<version>1.56.2-beta</version>
<version>1.57.0-beta</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.56.2" />
<dependency id="SkiaSharp" version="1.57.0-beta" />
</dependencies>
</metadata>
<files>

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

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

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

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

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

@ -3,7 +3,7 @@
<metadata>
<id>SkiaSharp.Svg</id>
<title>SVG Support for SkiaSharp</title>
<version>1.56.2</version>
<version>1.57.0-beta</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.56.2" />
<dependency id="SkiaSharp" version="1.57.0-beta" />
</dependencies>
</metadata>
<files>

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

@ -3,7 +3,7 @@
<metadata>
<id>SkiaSharp.Views.Forms</id>
<title>SkiaSharp for Xamarin.Forms (for macOS)</title>
<version>1.56.2</version>
<version>1.57.0-beta</version>
<authors>Xamarin Inc.</authors>
<owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
@ -15,17 +15,17 @@
<dependencies>
<group>
<dependency id="Xamarin.Forms" version="2.3.0" />
<dependency id="SkiaSharp" version="1.56.2" />
<dependency id="SkiaSharp" version="1.57.0-beta" />
</group>
<group targetFramework="MonoAndroid">
<dependency id="Xamarin.Forms" version="2.3.0" />
<dependency id="SkiaSharp" version="1.56.2" />
<dependency id="SkiaSharp.Views" version="1.56.2" />
<dependency id="SkiaSharp" version="1.57.0-beta" />
<dependency id="SkiaSharp.Views" version="1.57.0-beta" />
</group>
<group targetFramework="XamariniOS">
<dependency id="Xamarin.Forms" version="2.3.0" />
<dependency id="SkiaSharp" version="1.56.2" />
<dependency id="SkiaSharp.Views" version="1.56.2" />
<dependency id="SkiaSharp" version="1.57.0-beta" />
<dependency id="SkiaSharp.Views" version="1.57.0-beta" />
</group>
</dependencies>
</metadata>

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

@ -3,7 +3,7 @@
<metadata>
<id>SkiaSharp.Views.Forms</id>
<title>SkiaSharp for Xamarin.Forms (for Windows)</title>
<version>1.56.2</version>
<version>1.57.0-beta</version>
<authors>Xamarin Inc.</authors>
<owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
@ -15,12 +15,12 @@
<dependencies>
<group>
<dependency id="Xamarin.Forms" version="2.3.0" />
<dependency id="SkiaSharp" version="1.56.2" />
<dependency id="SkiaSharp" version="1.57.0-beta" />
</group>
<group targetFramework="uap10.0">
<dependency id="Xamarin.Forms" version="2.3.0" />
<dependency id="SkiaSharp" version="1.56.2" />
<dependency id="SkiaSharp.Views" version="1.56.2" />
<dependency id="SkiaSharp" version="1.57.0-beta" />
<dependency id="SkiaSharp.Views" version="1.57.0-beta" />
</group>
</dependencies>
</metadata>

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

@ -3,7 +3,7 @@
<metadata>
<id>SkiaSharp.Views.Forms</id>
<title>SkiaSharp for Xamarin.Forms</title>
<version>1.56.2</version>
<version>1.57.0-beta</version>
<authors>Xamarin Inc.</authors>
<owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
@ -15,22 +15,22 @@
<dependencies>
<group>
<dependency id="Xamarin.Forms" version="2.3.0" />
<dependency id="SkiaSharp" version="1.56.2" />
<dependency id="SkiaSharp" version="1.57.0-beta" />
</group>
<group targetFramework="MonoAndroid">
<dependency id="Xamarin.Forms" version="2.3.0" />
<dependency id="SkiaSharp" version="1.56.2" />
<dependency id="SkiaSharp.Views" version="1.56.2" />
<dependency id="SkiaSharp" version="1.57.0-beta" />
<dependency id="SkiaSharp.Views" version="1.57.0-beta" />
</group>
<group targetFramework="XamariniOS">
<dependency id="Xamarin.Forms" version="2.3.0" />
<dependency id="SkiaSharp" version="1.56.2" />
<dependency id="SkiaSharp.Views" version="1.56.2" />
<dependency id="SkiaSharp" version="1.57.0-beta" />
<dependency id="SkiaSharp.Views" version="1.57.0-beta" />
</group>
<group targetFramework="uap10.0">
<dependency id="Xamarin.Forms" version="2.3.0" />
<dependency id="SkiaSharp" version="1.56.2" />
<dependency id="SkiaSharp.Views" version="1.56.2" />
<dependency id="SkiaSharp" version="1.57.0-beta" />
<dependency id="SkiaSharp.Views" version="1.57.0-beta" />
</group>
</dependencies>
</metadata>

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

@ -3,7 +3,7 @@
<metadata>
<id>SkiaSharp.Views</id>
<title>SkiaSharp Views &amp; Layers (for macOS)</title>
<version>1.56.2</version>
<version>1.57.0-beta</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.56.2" />
<dependency id="SkiaSharp" version="1.57.0-beta" />
</dependencies>
</metadata>
<files>

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

@ -3,7 +3,7 @@
<metadata>
<id>SkiaSharp.Views</id>
<title>SkiaSharp Views &amp; Layers (for Windows)</title>
<version>1.56.2</version>
<version>1.57.0-beta</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.56.2" />
<dependency id="SkiaSharp" version="1.57.0-beta" />
</dependencies>
</metadata>
<files>

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

@ -3,7 +3,7 @@
<metadata>
<id>SkiaSharp.Views</id>
<title>SkiaSharp Views &amp; Layers</title>
<version>1.56.2</version>
<version>1.57.0-beta</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.56.2" />
<dependency id="SkiaSharp" version="1.57.0-beta" />
</dependencies>
</metadata>
<files>

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

@ -3,7 +3,7 @@
<metadata>
<id>SkiaSharp</id>
<title>SkiaSharp (for Windows)</title>
<version>1.56.2</version>
<version>1.57.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.56.2</version>
<version>1.57.0-beta</version>
<authors>Xamarin Inc.</authors>
<owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>

8
samples/FormsSample/Android/Android.csproj
Просмотреть файл

@ -65,19 +65,19 @@
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp">
<HintPath>..\packages\SkiaSharp.1.56.2\lib\MonoAndroid\SkiaSharp.dll</HintPath>
<HintPath>..\packages\SkiaSharp.1.57.0-beta\lib\MonoAndroid\SkiaSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp.Svg">
<HintPath>..\packages\SkiaSharp.Svg.1.56.2\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.Svg.dll</HintPath>
<HintPath>..\packages\SkiaSharp.Svg.1.57.0-beta\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.Svg.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp.Views.Android">
<HintPath>..\packages\SkiaSharp.Views.1.56.2\lib\MonoAndroid\SkiaSharp.Views.Android.dll</HintPath>
<HintPath>..\packages\SkiaSharp.Views.1.57.0-beta\lib\MonoAndroid\SkiaSharp.Views.Android.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp.Views.Forms">
<HintPath>..\packages\SkiaSharp.Views.Forms.1.56.2\lib\MonoAndroid\SkiaSharp.Views.Forms.dll</HintPath>
<HintPath>..\packages\SkiaSharp.Views.Forms.1.57.0-beta\lib\MonoAndroid\SkiaSharp.Views.Forms.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />

8
samples/FormsSample/Android/packages.config
Просмотреть файл

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="PCLStorage" version="1.0.2" targetFramework="monoandroid60" />
<package id="SkiaSharp" version="1.56.2" targetFramework="monoandroid60" />
<package id="SkiaSharp.Svg" version="1.56.2" targetFramework="monoandroid60" />
<package id="SkiaSharp.Views" version="1.56.2" targetFramework="monoandroid60" />
<package id="SkiaSharp.Views.Forms" version="1.56.2" targetFramework="monoandroid60" />
<package id="SkiaSharp" version="1.57.0-beta" targetFramework="monoandroid60" />
<package id="SkiaSharp.Svg" version="1.57.0-beta" targetFramework="monoandroid60" />
<package id="SkiaSharp.Views" version="1.57.0-beta" targetFramework="monoandroid60" />
<package id="SkiaSharp.Views.Forms" version="1.57.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" />

6
samples/FormsSample/Core/Core.csproj
Просмотреть файл

@ -74,15 +74,15 @@
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp">
<HintPath>..\packages\SkiaSharp.1.56.2\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.dll</HintPath>
<HintPath>..\packages\SkiaSharp.1.57.0-beta\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp.Svg">
<HintPath>..\packages\SkiaSharp.Svg.1.56.2\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.Svg.dll</HintPath>
<HintPath>..\packages\SkiaSharp.Svg.1.57.0-beta\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.Svg.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp.Views.Forms">
<HintPath>..\packages\SkiaSharp.Views.Forms.1.56.2\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.Views.Forms.dll</HintPath>
<HintPath>..\packages\SkiaSharp.Views.Forms.1.57.0-beta\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.Views.Forms.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.Forms.Core">

6
samples/FormsSample/Core/packages.config
Просмотреть файл

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="PCLStorage" version="1.0.2" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="SkiaSharp" version="1.56.2" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="SkiaSharp.Svg" version="1.56.2" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="SkiaSharp.Views.Forms" version="1.56.2" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="SkiaSharp" version="1.57.0-beta" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="SkiaSharp.Svg" version="1.57.0-beta" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="SkiaSharp.Views.Forms" version="1.57.0-beta" targetFramework="portable45-net45+win8+wp8+wpa81" />
<package id="Xamarin.Forms" version="2.3.3.193" targetFramework="portable45-net45+win8+wp8+wpa81" />
</packages>

8
samples/FormsSample/UWP/project.json
Просмотреть файл

@ -2,10 +2,10 @@
"dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "5.0.0",
"PCLStorage": "1.0.2",
"SkiaSharp": "1.56.2",
"SkiaSharp.Svg": "1.56.2",
"SkiaSharp.Views": "1.56.2",
"SkiaSharp.Views.Forms": "1.56.2",
"SkiaSharp": "1.57.0-beta",
"SkiaSharp.Svg": "1.57.0-beta",
"SkiaSharp.Views": "1.57.0-beta",
"SkiaSharp.Views.Forms": "1.57.0-beta",
"Xamarin.Forms": "2.3.3.193"
},
"frameworks": {

8
samples/FormsSample/iOS/iOS.csproj
Просмотреть файл

@ -145,19 +145,19 @@
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp">
<HintPath>..\packages\SkiaSharp.1.56.2\lib\XamariniOS\SkiaSharp.dll</HintPath>
<HintPath>..\packages\SkiaSharp.1.57.0-beta\lib\XamariniOS\SkiaSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp.Svg">
<HintPath>..\packages\SkiaSharp.Svg.1.56.2\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.Svg.dll</HintPath>
<HintPath>..\packages\SkiaSharp.Svg.1.57.0-beta\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.Svg.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp.Views.Forms">
<HintPath>..\packages\SkiaSharp.Views.Forms.1.56.2\lib\XamariniOS\SkiaSharp.Views.Forms.dll</HintPath>
<HintPath>..\packages\SkiaSharp.Views.Forms.1.57.0-beta\lib\XamariniOS\SkiaSharp.Views.Forms.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp.Views.iOS">
<HintPath>..\packages\SkiaSharp.Views.1.56.2\lib\XamariniOS\SkiaSharp.Views.iOS.dll</HintPath>
<HintPath>..\packages\SkiaSharp.Views.1.57.0-beta\lib\XamariniOS\SkiaSharp.Views.iOS.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />

8
samples/FormsSample/iOS/packages.config
Просмотреть файл

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="PCLStorage" version="1.0.2" targetFramework="xamarinios10" />
<package id="SkiaSharp" version="1.56.2" targetFramework="xamarinios10" />
<package id="SkiaSharp.Svg" version="1.56.2" targetFramework="xamarinios10" />
<package id="SkiaSharp.Views" version="1.56.2" targetFramework="xamarinios10" />
<package id="SkiaSharp.Views.Forms" version="1.56.2" targetFramework="xamarinios10" />
<package id="SkiaSharp" version="1.57.0-beta" targetFramework="xamarinios10" />
<package id="SkiaSharp.Svg" version="1.57.0-beta" targetFramework="xamarinios10" />
<package id="SkiaSharp.Views" version="1.57.0-beta" targetFramework="xamarinios10" />
<package id="SkiaSharp.Views.Forms" version="1.57.0-beta" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="2.3.3.193" targetFramework="xamarinios10" />
</packages>

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

@ -50,14 +50,14 @@
<Reference Include="System.Core" />
<Reference Include="Xamarin.Mac" />
<Reference Include="SkiaSharp">
<HintPath>..\packages\SkiaSharp.1.56.2\lib\XamarinMac\SkiaSharp.dll</HintPath>
<HintPath>..\packages\SkiaSharp.1.57.0-beta\lib\XamarinMac\SkiaSharp.dll</HintPath>
</Reference>
<Reference Include="SkiaSharp.Svg">
<HintPath>..\packages\SkiaSharp.Svg.1.56.2\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.Svg.dll</HintPath>
<HintPath>..\packages\SkiaSharp.Svg.1.57.0-beta\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.Svg.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp.Views.Mac">
<HintPath>..\packages\SkiaSharp.Views.1.56.2\lib\XamarinMac\SkiaSharp.Views.Mac.dll</HintPath>
<HintPath>..\packages\SkiaSharp.Views.1.57.0-beta\lib\XamarinMac\SkiaSharp.Views.Mac.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@ -99,5 +99,5 @@
<Import Project="..\..\SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems" Label="Shared" Condition="Exists('..\..\SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems')" />
<Import Project="..\..\SkiaSharpSample.Platform.Shared\SkiaSharpSample.Platform.Shared.projitems" Label="Shared" Condition="Exists('..\..\SkiaSharpSample.Platform.Shared\SkiaSharpSample.Platform.Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
<Import Project="..\packages\SkiaSharp.1.56.2\build\XamarinMac\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.56.2\build\XamarinMac\SkiaSharp.targets')" />
<Import Project="..\packages\SkiaSharp.1.57.0-beta\build\XamarinMac\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.57.0-beta\build\XamarinMac\SkiaSharp.targets')" />
</Project>

6
samples/MacSample/MacSample/packages.config
Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.56.2" targetFramework="xamarinmac20" />
<package id="SkiaSharp.Svg" version="1.56.2" targetFramework="xamarinmac20" />
<package id="SkiaSharp.Views" version="1.56.2" targetFramework="xamarinmac20" />
<package id="SkiaSharp" version="1.57.0-beta" targetFramework="xamarinmac20" />
<package id="SkiaSharp.Svg" version="1.57.0-beta" targetFramework="xamarinmac20" />
<package id="SkiaSharp.Views" version="1.57.0-beta" targetFramework="xamarinmac20" />
</packages>

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

@ -93,14 +93,14 @@
<Reference Include="System.Core" />
<Reference Include="Xamarin.TVOS" />
<Reference Include="SkiaSharp">
<HintPath>..\packages\SkiaSharp.1.56.2\lib\XamarintvOS\SkiaSharp.dll</HintPath>
<HintPath>..\packages\SkiaSharp.1.57.0-beta\lib\XamarintvOS\SkiaSharp.dll</HintPath>
</Reference>
<Reference Include="SkiaSharp.Svg">
<HintPath>..\packages\SkiaSharp.Svg.1.56.2\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.Svg.dll</HintPath>
<HintPath>..\packages\SkiaSharp.Svg.1.57.0-beta\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.Svg.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp.Views.tvOS">
<HintPath>..\packages\SkiaSharp.Views.1.56.2\lib\XamarintvOS\SkiaSharp.Views.tvOS.dll</HintPath>
<HintPath>..\packages\SkiaSharp.Views.1.57.0-beta\lib\XamarintvOS\SkiaSharp.Views.tvOS.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

6
samples/TvSample/TvSample/packages.config
Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SkiaSharp" version="1.56.2" targetFramework="xamarintvos10" />
<package id="SkiaSharp.Svg" version="1.56.2" targetFramework="xamarintvos10" />
<package id="SkiaSharp.Views" version="1.56.2" targetFramework="xamarintvos10" />
<package id="SkiaSharp" version="1.57.0-beta" targetFramework="xamarintvos10" />
<package id="SkiaSharp.Svg" version="1.57.0-beta" targetFramework="xamarintvos10" />
<package id="SkiaSharp.Views" version="1.57.0-beta" targetFramework="xamarintvos10" />
</packages>

6
samples/UWPSample/UWPSample/project.json
Просмотреть файл

@ -2,9 +2,9 @@
"dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0",
"PCLStorage": "1.0.2",
"SkiaSharp": "1.56.2",
"SkiaSharp.Svg": "1.56.2",
"SkiaSharp.Views": "1.56.2"
"SkiaSharp": "1.57.0-beta",
"SkiaSharp.Svg": "1.57.0-beta",
"SkiaSharp.Views": "1.57.0-beta"
},
"frameworks": {
"uap10.0": {}

12
samples/WPFSample/WPFSample/WPFSample.csproj
Просмотреть файл

@ -92,19 +92,19 @@
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp">
<HintPath>..\packages\SkiaSharp.1.56.2\lib\net45\SkiaSharp.dll</HintPath>
<HintPath>..\packages\SkiaSharp.1.57.0-beta\lib\net45\SkiaSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp.Svg">
<HintPath>..\packages\SkiaSharp.Svg.1.56.2\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.Svg.dll</HintPath>
<HintPath>..\packages\SkiaSharp.Svg.1.57.0-beta\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.Svg.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp.Views.Desktop">
<HintPath>..\packages\SkiaSharp.Views.1.56.2\lib\net45\SkiaSharp.Views.Desktop.dll</HintPath>
<HintPath>..\packages\SkiaSharp.Views.1.57.0-beta\lib\net45\SkiaSharp.Views.Desktop.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp.Views.WPF">
<HintPath>..\packages\SkiaSharp.Views.1.56.2\lib\net45\SkiaSharp.Views.WPF.dll</HintPath>
<HintPath>..\packages\SkiaSharp.Views.1.57.0-beta\lib\net45\SkiaSharp.Views.WPF.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
@ -180,12 +180,12 @@
<Import Project="..\..\SkiaSharpSample.Platform.Shared\SkiaSharpSample.Platform.Shared.projitems" Label="Shared" />
<Import Project="..\..\SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems" Label="Shared" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\SkiaSharp.1.56.2\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.56.2\build\net45\SkiaSharp.targets')" />
<Import Project="..\packages\SkiaSharp.1.57.0-beta\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.57.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.56.2\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.56.2\build\net45\SkiaSharp.targets'))" />
<Error Condition="!Exists('..\packages\SkiaSharp.1.57.0-beta\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.57.0-beta\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.

6
samples/WPFSample/WPFSample/packages.config
Просмотреть файл

@ -3,7 +3,7 @@
<package id="OpenTK" version="1.1.2349.61993" targetFramework="net45" />
<package id="OpenTK.GLControl" version="1.1.2349.61993" targetFramework="net45" />
<package id="PCLStorage" version="1.0.2" targetFramework="net45" />
<package id="SkiaSharp" version="1.56.2" targetFramework="net45" />
<package id="SkiaSharp.Svg" version="1.56.2" targetFramework="net45" />
<package id="SkiaSharp.Views" version="1.56.2" targetFramework="net45" />
<package id="SkiaSharp" version="1.57.0-beta" targetFramework="net45" />
<package id="SkiaSharp.Svg" version="1.57.0-beta" targetFramework="net45" />
<package id="SkiaSharp.Views" version="1.57.0-beta" targetFramework="net45" />
</packages>

12
samples/WindowsSample/WindowsSample/WindowsSample.csproj
Просмотреть файл

@ -93,19 +93,19 @@
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp">
<HintPath>..\packages\SkiaSharp.1.56.2\lib\net45\SkiaSharp.dll</HintPath>
<HintPath>..\packages\SkiaSharp.1.57.0-beta\lib\net45\SkiaSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp.Svg">
<HintPath>..\packages\SkiaSharp.Svg.1.56.2\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.Svg.dll</HintPath>
<HintPath>..\packages\SkiaSharp.Svg.1.57.0-beta\lib\portable-net45+win8+wpa81+wp8\SkiaSharp.Svg.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp.Views.Desktop">
<HintPath>..\packages\SkiaSharp.Views.1.56.2\lib\net45\SkiaSharp.Views.Desktop.dll</HintPath>
<HintPath>..\packages\SkiaSharp.Views.1.57.0-beta\lib\net45\SkiaSharp.Views.Desktop.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SkiaSharp.Views.WPF">
<HintPath>..\packages\SkiaSharp.Views.1.56.2\lib\net45\SkiaSharp.Views.WPF.dll</HintPath>
<HintPath>..\packages\SkiaSharp.Views.1.57.0-beta\lib\net45\SkiaSharp.Views.WPF.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
@ -163,12 +163,12 @@
<Import Project="..\..\SkiaSharpSample.Platform.Shared\SkiaSharpSample.Platform.Shared.projitems" Label="Shared" />
<Import Project="..\..\SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems" Label="Shared" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\SkiaSharp.1.56.2\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.56.2\build\net45\SkiaSharp.targets')" />
<Import Project="..\packages\SkiaSharp.1.57.0-beta\build\net45\SkiaSharp.targets" Condition="Exists('..\packages\SkiaSharp.1.57.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.56.2\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.56.2\build\net45\SkiaSharp.targets'))" />
<Error Condition="!Exists('..\packages\SkiaSharp.1.57.0-beta\build\net45\SkiaSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SkiaSharp.1.57.0-beta\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.

6
samples/WindowsSample/WindowsSample/packages.config
Просмотреть файл

@ -3,7 +3,7 @@
<package id="OpenTK" version="1.1.2349.61993" targetFramework="net45" />
<package id="OpenTK.GLControl" version="1.1.2349.61993" targetFramework="net45" />
<package id="PCLStorage" version="1.0.2" targetFramework="net45" />
<package id="SkiaSharp" version="1.56.2" targetFramework="net45" />
<package id="SkiaSharp.Svg" version="1.56.2" targetFramework="net45" />
<package id="SkiaSharp.Views" version="1.56.2" targetFramework="net45" />
<package id="SkiaSharp" version="1.57.0-beta" targetFramework="net45" />
<package id="SkiaSharp.Svg" version="1.57.0-beta" targetFramework="net45" />
<package id="SkiaSharp.Views" version="1.57.0-beta" targetFramework="net45" />
</packages>

6
source/SkiaSharp.Extended/SkiaSharp.Extended.Shared/Properties/SkiaSharpExtendedAssemblyInfo.cs
Просмотреть файл

@ -9,9 +9,9 @@ using System.Reflection;
[assembly: AssemblyDescription("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SkiaSharp.Extended")]
[assembly: AssemblyVersion("1.56.0.0")]
[assembly: AssemblyFileVersion("1.56.2.0")]
[assembly: AssemblyInformationalVersion("1.56.2.0-{GIT_SHA}")]
[assembly: AssemblyVersion("1.57.0.0")]
[assembly: AssemblyFileVersion("1.57.0.0")]
[assembly: AssemblyInformationalVersion("1.57.0.0-{GIT_SHA}")]
[assembly: AssemblyCopyright("Xamarin Inc.")]
[assembly: AssemblyTrademark("")]

6
source/SkiaSharp.Svg/SkiaSharp.Svg.Shared/Properties/SkiaSharpSvgAssemblyInfo.cs
Просмотреть файл

@ -9,9 +9,9 @@ using System.Reflection;
[assembly: AssemblyDescription("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SkiaSharp.Svg")]
[assembly: AssemblyVersion("1.56.0.0")]
[assembly: AssemblyFileVersion("1.56.2.0")]
[assembly: AssemblyInformationalVersion("1.56.2.0-{GIT_SHA}")]
[assembly: AssemblyVersion("1.57.0.0")]
[assembly: AssemblyFileVersion("1.57.0.0")]
[assembly: AssemblyInformationalVersion("1.57.0.0-{GIT_SHA}")]
[assembly: AssemblyCopyright("Xamarin Inc.")]
[assembly: AssemblyTrademark("")]

6
source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Shared/Properties/SkiaSharpViewsFormsAssemblyInfo.cs
Просмотреть файл

@ -9,9 +9,9 @@ using System.Reflection;
[assembly: AssemblyDescription("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SkiaSharp.Views.Forms")]
[assembly: AssemblyVersion("1.56.0.0")]
[assembly: AssemblyFileVersion("1.56.2.0")]
[assembly: AssemblyInformationalVersion("1.56.2.0-{GIT_SHA}")]
[assembly: AssemblyVersion("1.57.0.0")]
[assembly: AssemblyFileVersion("1.57.0.0")]
[assembly: AssemblyInformationalVersion("1.57.0.0-{GIT_SHA}")]
[assembly: AssemblyCopyright("Xamarin Inc.")]
[assembly: AssemblyTrademark("")]

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

@ -9,9 +9,9 @@ using System.Reflection;
[assembly: AssemblyDescription("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SkiaSharp.Views")]
[assembly: AssemblyVersion("1.56.0.0")]
[assembly: AssemblyFileVersion("1.56.2.0")]
[assembly: AssemblyInformationalVersion("1.56.2.0-{GIT_SHA}")]
[assembly: AssemblyVersion("1.57.0.0")]
[assembly: AssemblyFileVersion("1.57.0.0")]
[assembly: AssemblyInformationalVersion("1.57.0.0-{GIT_SHA}")]
[assembly: AssemblyCopyright("Xamarin Inc.")]
[assembly: AssemblyTrademark("")]

17
tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.csproj
Просмотреть файл

@ -1,5 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp1.1</TargetFramework>
<DefineConstants>$(DefineConstants);NET_STANDARD</DefineConstants>
@ -12,7 +12,6 @@
<PackageTargetFallback>$(PackageTargetFallback);portable-net451+win8</PackageTargetFallback>
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Tests\*.cs" Link="%(FileName)%(Extension)" />
<Compile Include="..\Tests\GlContexts\*.cs" Link="GlContexts\%(FileName)%(Extension)" />
@ -20,11 +19,9 @@
<Compile Include="..\Tests\GlContexts\Glx\*.cs" Link="GlContexts\Glx\%(FileName)%(Extension)" />
<Compile Include="..\Tests\GlContexts\Wgl\*.cs" Link="GlContexts\Wgl\%(FileName)%(Extension)" />
</ItemGroup>
<ItemGroup>
<Compile Remove="..\Tests\SKSurfaceTest.cs" />
</ItemGroup>
<ItemGroup>
<None Include="..\Content\images\*" Link="images/%(FileName)%(Extension)">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@ -33,12 +30,10 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="NUnit" Version="3.6.1" />
<PackageReference Include="SkiaSharp" Version="1.56.2" />
<PackageReference Include="SkiaSharp.Svg" Version="1.56.2" />
<PackageReference Include="SkiaSharp.Extended" Version="1.56.2-beta" />
<PackageReference Include="SkiaSharp" Version="1.57.0-beta" />
<PackageReference Include="SkiaSharp.Svg" Version="1.57.0-beta" />
<PackageReference Include="SkiaSharp.Extended" Version="1.57.0-beta" />
</ItemGroup>
</Project>
</Project>