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

Add support for Xamarin.Forms on netcoreapp3.1 (#1774)

This commit is contained in:
Matthew Leibowitz 2021-08-19 06:38:17 +02:00 коммит произвёл GitHub
Родитель cacdbd7144
Коммит 83b8b2c274
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
41 изменённых файлов: 97 добавлений и 456 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -4,9 +4,9 @@ harfbuzz release 2.6.1
skia release m88
xunit release 2.4.1
xunit.runner.console release 2.4.1
Xamarin.Forms release 4.5.0.725
Xamarin.Forms.Platform.WPF release 4.5.0.725
Xamarin.Forms.Platform.GTK release 4.5.0.725
Xamarin.Forms release 4.8.0.1821
Xamarin.Forms.Platform.WPF release 4.8.0.1821
Xamarin.Forms.Platform.GTK release 4.8.0.1821
Tizen.NET release 4.0.0
Tizen.NET.Sdk release 1.0.9
OpenTK release 3.1.0
@ -87,6 +87,6 @@ HarfBuzzSharp.NativeAssets.Linux nuget 2.6.1.9
HarfBuzzSharp.NativeAssets.WebAssembly nuget 2.6.1.9
# nuget replacement versions
Xamarin.Forms nuget 4.6.0.772
Xamarin.Forms.Platform.WPF nuget 4.6.0.772
Xamarin.Forms.Platform.GTK nuget 4.6.0.772
Xamarin.Forms nuget 4.8.0.1821
Xamarin.Forms.Platform.WPF nuget 4.8.0.1821
Xamarin.Forms.Platform.GTK nuget 4.8.0.1821

2
cake/UtilsManaged.cake
Просмотреть файл

@ -242,7 +242,7 @@ async Task<NuGetDiff> CreateNuGetDiffAsync()
await AddDep("Xamarin.Forms", "Xamarin.Mac");
await AddDep("Xamarin.Forms", "tizen40");
await AddDep("Xamarin.Forms", "uap10.0.16299");
await AddDep("Xamarin.Forms.Platform.WPF", "net45");
await AddDep("Xamarin.Forms.Platform.WPF", "net461");
await AddDep("Xamarin.Forms.Platform.GTK", "net45");
await AddDep("GtkSharp", "netstandard2.0");
await AddDep("GdkSharp", "netstandard2.0");

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

@ -38,6 +38,17 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<dependency id="OpenTK" version="1.0.0" />
<dependency id="OpenTK.GLControl" version="1.0.0" />
</group>
<group targetFramework="netcoreapp3.1">
<dependency id="Xamarin.Forms" version="1.0.0" />
<dependency id="Xamarin.Forms.Platform.WPF" version="1.0.0" />
<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" />
<dependency id="SkiaSharp.Views.WPF" version="1.0.0" />
<dependency id="SkiaSharp.Views.Forms" version="1.0.0" />
<dependency id="OpenTK" version="1.0.0" />
<dependency id="OpenTK.GLControl" version="1.0.0" />
</group>
</dependencies>
</metadata>
@ -46,9 +57,11 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<!-- SkiaSharp.Views.Forms.dll -->
<file src="lib/net462/SkiaSharp.Views.Forms.dll" />
<file src="lib/net462/SkiaSharp.Views.Forms.xml" />
<file src="lib/netcoreapp3.1/SkiaSharp.Views.Forms.dll" />
<file src="lib/netcoreapp3.1/SkiaSharp.Views.Forms.xml" />
<!-- the build bits -->
<file src="build/net462/SkiaSharp.Views.Forms.WPF.props" />
<file src="build/SkiaSharp.Views.Forms.WPF.props" />
<!-- legal -->
<file src="LICENSE.txt" />

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

@ -95,6 +95,11 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<dependency id="Xamarin.Forms" version="1.0.0" />
<dependency id="SkiaSharp" version="1.0.0" />
</group>
<group targetFramework="netcoreapp3.1">
<dependency id="Xamarin.Forms" version="1.0.0" />
<dependency id="Xamarin.Forms.Platform.WPF" version="1.0.0" />
<dependency id="SkiaSharp" version="1.0.0" />
</group>
</dependencies>
</metadata>
@ -133,7 +138,10 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<!-- the build bits -->
<file src="_._" target="lib/net462/_._" />
<file src="_._" target="ref/net462/_._" />
<file src="build/net462/SkiaSharp.Views.Forms.targets" />
<file src="_._" target="lib/netcoreapp3.1/_._" />
<file src="_._" target="ref/netcoreapp3.1/_._" />
<file src="build/net462/SkiaSharp.Views.Forms.targets" target="build/net462/SkiaSharp.Views.Forms.targets" />
<file src="build/net462/SkiaSharp.Views.Forms.targets" target="build/netcoreapp3.1/SkiaSharp.Views.Forms.targets" />
<!-- legal -->
<file src="LICENSE.txt" />

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>

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

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.5.0.725" />
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1821" />
</ItemGroup>
<ItemGroup>

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

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

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

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

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

@ -12,7 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.5.0.725" />
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1821" />
</ItemGroup>
<ItemGroup>

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

@ -116,7 +116,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.9" />
<PackageReference Include="Xamarin.Forms" Version="4.5.0.725" />
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1821" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj">

47
samples/Basic/Xamarin.Forms/SkiaSharpSample.WPF/Properties/AssemblyInfo.cs
Просмотреть файл

@ -1,35 +1,4 @@
using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Windows;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("SkiaSharpSample.WPF")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SkiaSharpSample.WPF")]
[assembly: AssemblyCopyright("Copyright © 2018")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
//In order to begin building localizable applications, set
//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
//inside a <PropertyGroup>. For example, if you are using US english
//in your source files, set the <UICulture> to en-US. Then uncomment
//the NeutralResourceLanguage attribute below. Update the "en-US" in
//the line below to match the UICulture setting in the project file.
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
using System.Windows;
[assembly: ThemeInfo(
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
@ -39,17 +8,3 @@ using System.Windows;
//(used if a resource is not found in the page,
// app, or any theme specific resource dictionaries)
)]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

71
samples/Basic/Xamarin.Forms/SkiaSharpSample.WPF/Properties/Resources.Designer.cs сгенерированный
Просмотреть файл

@ -1,71 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace SkiaSharpSample.WPF.Properties
{
/// <summary>
/// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
// This class was auto-generated by the StronglyTypedResourceBuilder
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources
{
private static global::System.Resources.ResourceManager resourceMan;
private static global::System.Globalization.CultureInfo resourceCulture;
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources()
{
}
/// <summary>
/// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager
{
get
{
if ((resourceMan == null))
{
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SkiaSharpSample.WPF.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
/// <summary>
/// Overrides the current thread's CurrentUICulture property for all
/// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture
{
get
{
return resourceCulture;
}
set
{
resourceCulture = value;
}
}
}
}

117
samples/Basic/Xamarin.Forms/SkiaSharpSample.WPF/Properties/Resources.resx
Просмотреть файл

@ -1,117 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

30
samples/Basic/Xamarin.Forms/SkiaSharpSample.WPF/Properties/Settings.Designer.cs сгенерированный
Просмотреть файл

@ -1,30 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace SkiaSharpSample.WPF.Properties
{
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
{
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
public static Settings Default
{
get
{
return defaultInstance;
}
}
}
}

7
samples/Basic/Xamarin.Forms/SkiaSharpSample.WPF/Properties/Settings.settings
Просмотреть файл

@ -1,7 +0,0 @@
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
<Profiles>
<Profile Name="(Default)" />
</Profiles>
<Settings />
</SettingsFile>

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

@ -1,135 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import Project="..\..\..\..\output\SkiaSharp.Views.Forms.WPF\nuget\build\net462\SkiaSharp.Views.Forms.WPF.props" Condition="Exists('..\..\..\..\output\SkiaSharp.Views.Forms.WPF\nuget\build\net462\SkiaSharp.Views.Forms.WPF.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\..\output\SkiaSharp.Views.Forms.WPF\nuget\build\SkiaSharp.Views.Forms.WPF.props" Condition="Exists('..\..\..\..\output\SkiaSharp.Views.Forms.WPF\nuget\build\SkiaSharp.Views.Forms.WPF.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{748981C3-5D0F-462A-9F56-A3C6D792ED30}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>SkiaSharpSample.WPF</RootNamespace>
<AssemblyName>SkiaSharpSample.WPF</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
<LangVersion>8.0</LangVersion>
<ApplicationIcon>icon.ico</ApplicationIcon>
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
<EnableDefaultXamlItems>false</EnableDefaultXamlItems>
<EnableDefaultCssItems>false</EnableDefaultCssItems>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>portable</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>portable</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="4.8.0.1821" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="4.5.0.725" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\SkiaSharp\SkiaSharp.csproj">
<Project>{eb1bbdcc-fb07-40d5-8b9e-0079e2c2f2df}</Project>
<Name>SkiaSharp</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Desktop.Common\SkiaSharp.Views.Desktop.Common.csproj">
<Project>{e5a90865-c185-45ad-88d1-6da7d6004b03}</Project>
<Name>SkiaSharp.Views.Desktop.Common</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.WindowsForms\SkiaSharp.Views.WindowsForms.csproj">
<Project>{409e8a73-82c5-4f7a-9b9d-71a537466dd9}</Project>
<Name>SkiaSharp.Views.WindowsForms</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.WPF\SkiaSharp.Views.WPF.csproj">
<Project>{743cf830-d458-41a9-865a-f85126562015}</Project>
<Name>SkiaSharp.Views.WPF</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.WPF\SkiaSharp.Views.Forms.WPF.csproj">
<Project>{27059729-96a9-4313-b2a4-b10798450519}</Project>
<Name>SkiaSharp.Views.Forms.WPF</Name>
</ProjectReference>
<ProjectReference Include="..\SkiaSharpSample\SkiaSharpSample.csproj">
<Project>{b178e8e3-a5ad-4c98-b365-86e05ee53643}</Project>
<Name>SkiaSharpSample</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<ProjectReference Include="..\..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Desktop.Common\SkiaSharp.Views.Desktop.Common.csproj" />
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.WindowsForms\SkiaSharp.Views.WindowsForms.csproj" />
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.WPF\SkiaSharp.Views.WPF.csproj" />
<ProjectReference Include="..\..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.WPF\SkiaSharp.Views.Forms.WPF.csproj" />
<ProjectReference Include="..\SkiaSharpSample\SkiaSharpSample.csproj" />
</ItemGroup>
<ItemGroup>
<None Remove="icon.ico" />
<Resource Include="icon.ico" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\..\..\output\SkiaSharp\nuget\build\net462\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\net462\SkiaSharp.targets')" />
<ItemGroup Condition="!$(TargetFramework.StartsWith('net4'))">
<None Include="..\..\..\..\output\native\windows\x64\libSkiaSharp.dll" Condition="Exists('..\..\..\..\output\native\windows\x64\libSkiaSharp.dll')">
<Link>libSkiaSharp.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<Import Project="..\..\..\..\output\SkiaSharp\nuget\build\net462\SkiaSharp.targets" Condition="$(TargetFramework.StartsWith('net4')) and Exists('..\..\..\..\output\SkiaSharp\nuget\build\net462\SkiaSharp.targets')" />
<Import Project="..\..\..\..\output\SkiaSharp.Views.Forms\nuget\build\net462\SkiaSharp.Views.Forms.targets" Condition="Exists('..\..\..\..\output\SkiaSharp.Views.Forms\nuget\build\net462\SkiaSharp.Views.Forms.targets')" />
</Project>

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

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

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

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

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

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

4
samples/Directory.Build.props
Просмотреть файл

@ -5,10 +5,6 @@
<SkipImportNetSdk>true</SkipImportNetSdk>
</PropertyGroup>
<PropertyGroup>
<GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
</PropertyGroup>
<!-- Workaround: https://github.com/dotnet/sdk/issues/19050 -->
<PropertyGroup>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
<OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>

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

@ -55,7 +55,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.5.1" />
<PackageReference Include="Xamarin.Forms" Version="4.5.0.725" />
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1821" />
</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.5.0.725" />
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1821" />
</ItemGroup>
<ItemGroup>

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

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

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

@ -11,7 +11,7 @@
<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.5.1" />
<PackageReference Include="Xamarin.Forms" Version="4.5.0.725" />
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1821" />
</ItemGroup>
<ItemGroup>

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

@ -117,7 +117,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.9" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.1" />
<PackageReference Include="Xamarin.Forms" Version="4.5.0.725" />
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1821" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj">

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

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

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

@ -111,7 +111,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.5.1" />
<PackageReference Include="Xamarin.Forms" Version="4.5.0.725" />
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1821" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.iOS\HarfBuzzSharp.iOS.csproj">

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.5.0.725" />
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1821" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj" />

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

@ -23,8 +23,8 @@
<Reference Include="atk-sharp" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.5.0.725" />
<PackageReference Include="Xamarin.Forms.Platform.Gtk" Version="4.5.0.725" />
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1821" />
<PackageReference Include="Xamarin.Forms.Platform.Gtk" Version="4.8.0.1821" />
</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.5.0.725" />
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1821" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj" />

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.5.0.725" />
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1821" />
</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.5.0.725" />
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1821" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj" />

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

@ -1,33 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net462</TargetFramework>
<TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
<RootNamespace>SkiaSharp.Views.Forms</RootNamespace>
<AssemblyName>SkiaSharp.Views.Forms</AssemblyName>
<AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
<SignAssembly>false</SignAssembly>
<PackagingGroup>SkiaSharp.Views.Forms.WPF</PackagingGroup>
<DefineConstants>$(DefineConstants);__DESKTOP__;__WPF__;</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
<Reference Include="WindowsFormsIntegration" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.5.0.725" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="4.5.0.725" />
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1821" />
<PackageReference Include="Xamarin.Forms.Platform.WPF" Version="4.8.0.1821" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />
<ProjectReference Include="..\..\SkiaSharp.Views\SkiaSharp.Views.WPF\SkiaSharp.Views.WPF.csproj" />
<ProjectReference Include="..\..\SkiaSharp.Views\SkiaSharp.Views.WindowsForms\SkiaSharp.Views.WindowsForms.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="nuget\build\net462\SkiaSharp.Views.Forms.WPF.props" Link="nuget\build\$(TargetFramework)\SkiaSharp.Views.Forms.WPF.props" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\SkiaSharp.Views.Forms.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
<Compile Include="..\SkiaSharp.Views.Forms.Native.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />

0
source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.WPF/nuget/build/net462/SkiaSharp.Views.Forms.WPF.props → source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.WPF/nuget/build/SkiaSharp.Views.Forms.WPF.props
Просмотреть файл

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.5.0.725" />
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1821" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj" />

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

@ -7,14 +7,11 @@
<PackagingGroup>SkiaSharp.Views.Forms</PackagingGroup>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.5.0.725" />
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1821" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="nuget\build\net462\SkiaSharp.Views.Forms.targets" Link="nuget\build\$(TargetFramework)\SkiaSharp.Views.Forms.targets" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\SkiaSharp.Views.Forms.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>

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

@ -1,17 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
<UseWpf>true</UseWpf>
<UseWPF>true</UseWPF>
<RootNamespace>SkiaSharp.Views.WPF</RootNamespace>
<AssemblyName>SkiaSharp.Views.WPF</AssemblyName>
<PackagingGroup>SkiaSharp.Views.WPF</PackagingGroup>
<DefineConstants>$(DefineConstants);__DESKTOP__;__WPF__</DefineConstants>
</PropertyGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />
<ProjectReference Include="..\SkiaSharp.Views.Desktop.Common\SkiaSharp.Views.Desktop.Common.csproj" />

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
<UseWindowsForms>true</UseWindowsForms>

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

@ -64,7 +64,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
<PackageReference Include="Xamarin.Forms" Version="4.5.0.725" />
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1821" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.devices" Version="2.5.25" />
<PackageReference Include="xunit.skippablefact" Version="1.4.13" />

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

@ -84,7 +84,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
<PackageReference Include="Xamarin.Forms" Version="4.5.0.725" />
<PackageReference Include="Xamarin.Forms" Version="4.8.0.1821" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.devices" Version="2.5.25" />
<PackageReference Include="xunit.skippablefact" Version="1.4.13" />