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

Add the expected overload for newer versions XF.Tizen (#1117) 

- Updating Xamarin.Forms to v4.4.0.991757
- Work around the portable PDB issue for UWP for now
This commit is contained in:
Matthew Leibowitz 2020-03-15 15:24:45 +02:00 коммит произвёл GitHub
Родитель 34b6018ad7
Коммит 5e48f0dea2
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
33 изменённых файлов: 62 добавлений и 62 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
VERSIONS.txt
Просмотреть файл

@ -6,9 +6,9 @@ harfbuzz release 2.6.1
skia release m68
xunit release 2.4.1
xunit.runner.console release 2.4.1
Xamarin.Forms release 4.2.0.910310
Xamarin.Forms.Platform.WPF release 4.2.0.910310
Xamarin.Forms.Platform.GTK release 4.2.0.910310
Xamarin.Forms release 4.4.0.991757
Xamarin.Forms.Platform.WPF release 4.4.0.991757
Xamarin.Forms.Platform.GTK release 4.4.0.991757
Tizen.NET release 4.0.0
OpenTK release 3.0.1
OpenTK.GLControl release 3.0.1

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

@ -27,8 +27,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<dependencies>
<dependency id="Xamarin.Forms" version="4.2.0.910310" />
<dependency id="Xamarin.Forms.Platform.GTK" version="4.2.0.910310" />
<dependency id="Xamarin.Forms" version="4.4.0.991757" />
<dependency id="Xamarin.Forms.Platform.GTK" version="4.4.0.991757" />
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views.Desktop.Common" version="1.0.0" />
<dependency id="SkiaSharp.Views.Gtk2" version="1.0.0" />

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

@ -27,8 +27,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<dependencies>
<dependency id="Xamarin.Forms" version="4.2.0.910310" />
<dependency id="Xamarin.Forms.Platform.WPF" version="4.2.0.910310" />
<dependency id="Xamarin.Forms" version="4.4.0.991757" />
<dependency id="Xamarin.Forms.Platform.WPF" version="4.4.0.991757" />
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views.Desktop.Common" version="1.0.0" />
<dependency id="SkiaSharp.Views.WindowsForms" version="1.0.0" />

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

@ -28,40 +28,40 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<dependencies>
<group targetFramework="netstandard1.3">
<dependency id="Xamarin.Forms" version="4.2.0.910310" />
<dependency id="Xamarin.Forms" version="4.4.0.991757" />
<dependency id="SkiaSharp" version="1.0.0" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="Xamarin.Forms" version="4.2.0.910310" />
<dependency id="Xamarin.Forms" version="4.4.0.991757" />
<dependency id="SkiaSharp" version="1.0.0" />
</group>
<group targetFramework="monoandroid1.0">
<dependency id="Xamarin.Forms" version="4.2.0.910310" />
<dependency id="Xamarin.Forms" version="4.4.0.991757" />
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views" version="1.0.0" />
</group>
<group targetFramework="xamarinios1.0">
<dependency id="Xamarin.Forms" version="4.2.0.910310" />
<dependency id="Xamarin.Forms" version="4.4.0.991757" />
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views" version="1.0.0" />
</group>
<group targetFramework="xamarinmac2.0">
<dependency id="Xamarin.Forms" version="4.2.0.910310" />
<dependency id="Xamarin.Forms" version="4.4.0.991757" />
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views" version="1.0.0" />
</group>
<group targetFramework="uap10.0">
<dependency id="Xamarin.Forms" version="4.2.0.910310" />
<dependency id="Xamarin.Forms" version="4.4.0.991757" />
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views" version="1.0.0" />
</group>
<group targetFramework="tizen40">
<dependency id="Xamarin.Forms" version="4.2.0.910310" />
<dependency id="Xamarin.Forms" version="4.4.0.991757" />
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views" version="1.0.0" />
</group>
<group targetFramework="net45">
<dependency id="Xamarin.Forms" version="4.2.0.910310" />
<dependency id="Xamarin.Forms" version="4.4.0.991757" />
<dependency id="SkiaSharp" version="1.0.0" />
</group>
</dependencies>

2
samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj
Просмотреть файл

@ -16,7 +16,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991757" />
</ItemGroup>
<ItemGroup>

4
samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj
Просмотреть файл

@ -11,7 +11,7 @@
<AssemblyName>SkiaSharpSample</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.16299.0</TargetPlatformVersion>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
@ -90,7 +90,7 @@
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.8" />
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.9" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj">

2
samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj
Просмотреть файл

@ -49,7 +49,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991757" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj">

2
samples/Basic/Xamarin.Forms/SkiaSharpSample.GTK/SkiaSharpSample.GTK.csproj
Просмотреть файл

@ -37,7 +37,7 @@
<Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms.Platform.GTK" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Forms.Platform.GTK" Version="4.4.0.991757" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\SkiaSharp\SkiaSharp.csproj">

2
samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj
Просмотреть файл

@ -20,7 +20,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991757" />
</ItemGroup>
<ItemGroup>

7
samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj
Просмотреть файл

@ -11,10 +11,9 @@
<AssemblyName>SkiaSharpSample.UWP</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.16299.0</TargetPlatformVersion>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<PackageCertificateKeyFile>..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx</PackageCertificateKeyFile>
@ -91,8 +90,8 @@
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.8" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.9" />
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991757" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj">

2
samples/Basic/Xamarin.Forms/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj
Просмотреть файл

@ -52,7 +52,7 @@
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="4.4.0.991757" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\SkiaSharp\SkiaSharp.csproj">

2
samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj
Просмотреть файл

@ -70,7 +70,7 @@
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991757" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj">

2
samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj
Просмотреть файл

@ -57,7 +57,7 @@
<Reference Include="Xamarin.Mac" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991757" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Mac\SkiaSharp.Views.Mac.csproj">

2
samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj
Просмотреть файл

@ -5,7 +5,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991757" />
</ItemGroup>
<ItemGroup>

10
samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj
Просмотреть файл

@ -11,7 +11,7 @@
<AssemblyName>SkiaSharpSample</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.16299.0</TargetPlatformVersion>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
@ -90,8 +90,8 @@
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.8" />
<PackageReference Include="Xamarin.Essentials" Version="1.3.0" />
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.9" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj">
@ -119,10 +119,10 @@
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll')" />
</ItemGroup>
<ItemGroup>
<SDKReference Include="WindowsDesktop, Version=10.0.16299.0">
<SDKReference Include="WindowsDesktop, Version=10.0.18362.0">
<Name>Windows Desktop Extensions for the UWP</Name>
</SDKReference>
<SDKReference Include="WindowsMobile, Version=10.0.16299.0">
<SDKReference Include="WindowsMobile, Version=10.0.18362.0">
<Name>Windows Mobile Extensions for the UWP</Name>
</SDKReference>
</ItemGroup>

4
samples/Gallery/Xamarin.Forms/Android/Android.csproj
Просмотреть файл

@ -53,8 +53,8 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.3.0" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.1" />
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991757" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.Android\HarfBuzzSharp.Android.csproj">

2
samples/Gallery/Xamarin.Forms/Core/Core.csproj
Просмотреть файл

@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991757" />
</ItemGroup>
<ItemGroup>

2
samples/Gallery/Xamarin.Forms/Mac/Mac.csproj
Просмотреть файл

@ -57,7 +57,7 @@
<Reference Include="Xamarin.Mac" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991757" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.OSX\HarfBuzzSharp.OSX.csproj">

4
samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj
Просмотреть файл

@ -18,8 +18,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.3.0" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.1" />
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991757" />
</ItemGroup>
<ItemGroup>

11
samples/Gallery/Xamarin.Forms/UWP/UWP.csproj
Просмотреть файл

@ -11,10 +11,9 @@
<AssemblyName>SkiaSharpSample.UWP</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.16299.0</TargetPlatformVersion>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<PackageCertificateKeyFile>..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx</PackageCertificateKeyFile>
@ -91,9 +90,9 @@
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.8" />
<PackageReference Include="Xamarin.Essentials" Version="1.3.0" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.9" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.1" />
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991757" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj">
@ -129,7 +128,7 @@
<Content Include="..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll" Condition="Exists('..\..\..\..\output\native\uwp\$(Platform)\SkiaSharp.Views.Interop.UWP.dll')" />
</ItemGroup>
<ItemGroup>
<SDKReference Include="WindowsMobile, Version=10.0.16299.0">
<SDKReference Include="WindowsMobile, Version=10.0.18362.0">
<Name>Windows Mobile Extensions for the UWP</Name>
</SDKReference>
</ItemGroup>

2
samples/Gallery/Xamarin.Forms/WPF/WPF.csproj
Просмотреть файл

@ -53,7 +53,7 @@
<Reference Include="WindowsFormsIntegration" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="4.4.0.991757" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj">

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

@ -109,8 +109,8 @@
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.3.0" />
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.1" />
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991757" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.iOS\HarfBuzzSharp.iOS.csproj">

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

@ -82,7 +82,7 @@
<Reference Include="Xamarin.TVOS" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.3.0" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.tvOS\HarfBuzzSharp.tvOS.csproj">

2
scripts/azure-templates-bootstrapper.yml
Просмотреть файл

@ -139,6 +139,8 @@ jobs:
env:
JavaSdkDirectory: $(JAVA_HOME)
LLVM_HOME: $(LLVM_HOME)
# There seems to be a bug in some verions of mspdbcmf.exe. This looks to be fixed in a VS preview.
AppxSymbolPackageEnabled: false
displayName: Run the bootstrapper for ${{ parameters.target }}
- ${{ if not(endsWith(parameters.name, '_windows')) }}:
- bash: ./scripts/retry-command.sh ${{ parameters.retryCount }} ./bootstrapper.sh -t ${{ parameters.target }} -v ${{ parameters.verbosity }} -c ${{ coalesce(parameters.configuration, 'Release') }} ${{ parameters.additionalArgs }}

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

@ -8,7 +8,7 @@
<PackagingPlatform>monoandroid1.0</PackagingPlatform>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991757" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj" />

4
source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.GTK/SkiaSharp.Views.Forms.GTK.csproj
Просмотреть файл

@ -25,8 +25,8 @@
<Reference Include="netstandard" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Forms.Platform.Gtk" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991757" />
<PackageReference Include="Xamarin.Forms.Platform.Gtk" Version="4.4.0.991757" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />

2
source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj
Просмотреть файл

@ -11,7 +11,7 @@
<Reference Include="netstandard" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991757" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj" />

4
source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SKImageSourceHandler.cs
Просмотреть файл

@ -4,7 +4,7 @@ using System.Threading.Tasks;
using Xamarin.Forms;
using Xamarin.Forms.Platform.Tizen;
using NativeImage = Xamarin.Forms.Platform.Tizen.Native.Image;
using ElmImage = ElmSharp.Image;
[assembly: ExportImageSourceHandler(typeof(SkiaSharp.Views.Forms.SKImageImageSource), typeof(SkiaSharp.Views.Forms.SKImageSourceHandler))]
[assembly: ExportImageSourceHandler(typeof(SkiaSharp.Views.Forms.SKBitmapImageSource), typeof(SkiaSharp.Views.Forms.SKImageSourceHandler))]
@ -17,7 +17,7 @@ namespace SkiaSharp.Views.Forms
{
private StreamImageSourceHandler handler = new StreamImageSourceHandler();
public Task<bool> LoadImageAsync(NativeImage image, ImageSource imageSource, CancellationToken cancelationToken = default(CancellationToken))
public Task<bool> LoadImageAsync(ElmImage image, ImageSource imageSource, CancellationToken cancelationToken = default(CancellationToken))
{
ImageSource newSource = null;

2
source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj
Просмотреть файл

@ -10,7 +10,7 @@
<DefineConstants>$(DefineConstants);__TIZEN__;</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991757" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp.Tizen\SkiaSharp.Tizen.csproj" />

2
source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj
Просмотреть файл

@ -8,7 +8,7 @@
<PackagingPlatform>uap10.0</PackagingPlatform>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991757" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj" />

4
source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.WPF/SkiaSharp.Views.Forms.WPF.csproj
Просмотреть файл

@ -18,8 +18,8 @@
<Reference Include="WindowsFormsIntegration" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991757" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="4.4.0.991757" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />

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

@ -7,7 +7,7 @@
<PackagingGroup>SkiaSharp.Views.Forms</PackagingGroup>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991757" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj" />

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

@ -8,7 +8,7 @@
<DefineConstants>$(DefineConstants);NET_STANDARD</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.2.0.910310" />
<PackageReference Include="Xamarin.Forms" Version="4.4.0.991757" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />