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

Don't embed libSkiaSharp in the assemblies (#1296) 

* Don't embed libSkiaSharp in the dlls
* Update the samples to use the new .targets
* Update forms
This commit is contained in:
Matthew Leibowitz 2020-06-10 21:03:56 +02:00 коммит произвёл GitHub
Родитель b7f02a67fe
Коммит 69c89d555e
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
49 изменённых файлов: 281 добавлений и 67 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

11
binding/SkiaSharp.Android/SkiaSharp.Android.csproj
Просмотреть файл

@ -7,10 +7,13 @@
<PackagingPlatform>monoandroid1.0</PackagingPlatform>
</PropertyGroup>
<ItemGroup>
<EmbeddedNativeLibrary Include="..\..\output\native\android\arm64-v8a\libSkiaSharp.so" Link="libs\arm64-v8a\libSkiaSharp.so" />
<EmbeddedNativeLibrary Include="..\..\output\native\android\armeabi-v7a\libSkiaSharp.so" Link="libs\armeabi-v7a\libSkiaSharp.so" />
<EmbeddedNativeLibrary Include="..\..\output\native\android\x86\libSkiaSharp.so" Link="libs\x86\libSkiaSharp.so" />
<EmbeddedNativeLibrary Include="..\..\output\native\android\x86_64\libSkiaSharp.so" Link="libs\x86_64\libSkiaSharp.so" />
<None Include="..\..\output\native\android\x86\libSkiaSharp.so" Link="nuget\runtimes\android-x86\native\libSkiaSharp.so" />
<None Include="..\..\output\native\android\x86_64\libSkiaSharp.so" Link="nuget\runtimes\android-x64\native\libSkiaSharp.so" />
<None Include="..\..\output\native\android\armeabi-v7a\libSkiaSharp.so" Link="nuget\runtimes\android-arm\native\libSkiaSharp.so" />
<None Include="..\..\output\native\android\arm64-v8a\libSkiaSharp.so" Link="nuget\runtimes\android-arm64\native\libSkiaSharp.so" />
</ItemGroup>
<ItemGroup>
<None Include="nuget\build\monoandroid1.0\SkiaSharp.targets" Link="nuget\build\$(PackagingPlatform)\SkiaSharp.targets" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Binding.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />

16
binding/SkiaSharp.Android/nuget/build/monoandroid1.0/SkiaSharp.targets Normal file
Просмотреть файл

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- if ShouldIncludeNativeSkiaSharp == False then don't include the native libSkiaSharp -->
<PropertyGroup>
<ShouldIncludeNativeSkiaSharp Condition=" '$(ShouldIncludeNativeSkiaSharp)' == '' ">True</ShouldIncludeNativeSkiaSharp>
</PropertyGroup>
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' ">
<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x86\native\libSkiaSharp.so" Abi="x86" />
<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-x64\native\libSkiaSharp.so" Abi="x86_64" />
<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-arm\native\libSkiaSharp.so" Abi="armeabi-v7a" />
<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)..\..\runtimes\android-arm64\native\libSkiaSharp.so" Abi="arm64-v8a" />
</ItemGroup>
</Project>

0
binding/SkiaSharp.OSX/ApiDefinition.cs
Просмотреть файл

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

@ -1,5 +1,7 @@
using Foundation;
using ObjCRuntime;
// This attribute allows you to mark your assemblies as “safe to link”.
// When the attribute is present, the linker—if enabled—will process the assembly
// even if you’re using the “Link SDK assemblies only” option, which is the default for device builds.
[assembly: LinkerSafe]
[assembly: LinkWith("libSkiaSharp.dylib", IsCxx = true, ForceLoad = true, SmartLink = true)]

11
binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj
Просмотреть файл

@ -4,16 +4,15 @@
<RootNamespace>SkiaSharp</RootNamespace>
<AssemblyName>SkiaSharp</AssemblyName>
<PackagingGroup>SkiaSharp</PackagingGroup>
<DefineConstants>$(DefineConstants);__MACOS__</DefineConstants>
<IsBindingProject Condition=" '$(IsMacOS)' == 'true' ">true</IsBindingProject>
</PropertyGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<ObjcBindingApiDefinition Include="ApiDefinition.cs" />
<ObjcBindingCoreSource Include="Structs.cs" />
<ObjcBindingNativeLibrary Include="..\..\output\native\osx\libSkiaSharp.dylib" Link="libSkiaSharp.dylib" />
<None Include="..\..\output\native\osx\libSkiaSharp.dylib" Link="nuget\runtimes\osx\native\libSkiaSharp.dylib" />
</ItemGroup>
<ItemGroup>
<None Include="nuget\build\xamarinmac2.0\SkiaSharp.targets" Link="nuget\build\$(TargetFramework)\SkiaSharp.targets" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="..\Binding.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
<Compile Include="..\Binding\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>

0
binding/SkiaSharp.OSX/Structs.cs
Просмотреть файл

13
binding/SkiaSharp.OSX/nuget/build/xamarinmac2.0/SkiaSharp.targets Normal file
Просмотреть файл

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- if ShouldIncludeNativeSkiaSharp == False then don't include the native libSkiaSharp -->
<PropertyGroup>
<ShouldIncludeNativeSkiaSharp Condition=" '$(ShouldIncludeNativeSkiaSharp)' == '' ">True</ShouldIncludeNativeSkiaSharp>
</PropertyGroup>
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' ">
<NativeReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\osx\native\libSkiaSharp.dylib" Kind="Dynamic" />
</ItemGroup>
</Project>

0
binding/SkiaSharp.iOS/ApiDefinition.cs
Просмотреть файл

10
binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj
Просмотреть файл

@ -4,15 +4,15 @@
<RootNamespace>SkiaSharp</RootNamespace>
<AssemblyName>SkiaSharp</AssemblyName>
<PackagingGroup>SkiaSharp</PackagingGroup>
<IsBindingProject Condition=" '$(IsMacOS)' == 'true' ">true</IsBindingProject>
</PropertyGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<ObjcBindingApiDefinition Include="ApiDefinition.cs" />
<ObjcBindingCoreSource Include="StructsAndEnums.cs" />
<NativeReference Include="..\..\output\native\ios\libSkiaSharp.framework" Kind="Framework" />
<None Include="..\..\output\native\ios\libSkiaSharp.framework\**" Link="nuget\runtimes\ios\native\libSkiaSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<ItemGroup>
<None Include="nuget\build\xamarinios1.0\SkiaSharp.targets" Link="nuget\build\$(TargetFramework)\SkiaSharp.targets" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="..\Binding.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
<Compile Include="..\Binding\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>

0
binding/SkiaSharp.iOS/StructsAndEnums.cs
Просмотреть файл

13
binding/SkiaSharp.iOS/nuget/build/xamarinios1.0/SkiaSharp.targets Normal file
Просмотреть файл

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- if ShouldIncludeNativeSkiaSharp == False then don't include the native libSkiaSharp -->
<PropertyGroup>
<ShouldIncludeNativeSkiaSharp Condition=" '$(ShouldIncludeNativeSkiaSharp)' == '' ">True</ShouldIncludeNativeSkiaSharp>
</PropertyGroup>
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' ">
<NativeReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\ios\native\libSkiaSharp.framework" Kind="Framework" />
</ItemGroup>
</Project>

0
binding/SkiaSharp.tvOS/ApiDefinition.cs
Просмотреть файл

10
binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj
Просмотреть файл

@ -4,15 +4,15 @@
<RootNamespace>SkiaSharp</RootNamespace>
<AssemblyName>SkiaSharp</AssemblyName>
<PackagingGroup>SkiaSharp</PackagingGroup>
<IsBindingProject Condition=" '$(IsMacOS)' == 'true' ">true</IsBindingProject>
</PropertyGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<ObjcBindingApiDefinition Include="ApiDefinition.cs" />
<ObjcBindingCoreSource Include="StructsAndEnums.cs" />
<NativeReference Include="..\..\output\native\tvos\libSkiaSharp.framework" Kind="Framework" />
<None Include="..\..\output\native\tvos\libSkiaSharp.framework\**" Link="nuget\runtimes\tvos\native\libSkiaSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<ItemGroup>
<None Include="nuget\build\xamarintvos1.0\SkiaSharp.targets" Link="nuget\build\$(TargetFramework)\SkiaSharp.targets" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="..\Binding.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
<Compile Include="..\Binding\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>

0
binding/SkiaSharp.tvOS/StructsAndEnums.cs
Просмотреть файл

13
binding/SkiaSharp.tvOS/nuget/build/xamarintvos1.0/SkiaSharp.targets Normal file
Просмотреть файл

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- if ShouldIncludeNativeSkiaSharp == False then don't include the native libSkiaSharp -->
<PropertyGroup>
<ShouldIncludeNativeSkiaSharp Condition=" '$(ShouldIncludeNativeSkiaSharp)' == '' ">True</ShouldIncludeNativeSkiaSharp>
</PropertyGroup>
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' ">
<NativeReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\tvos\native\libSkiaSharp.framework" Kind="Framework" />
</ItemGroup>
</Project>

0
binding/SkiaSharp.watchOS/ApiDefinition.cs
Просмотреть файл

10
binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj
Просмотреть файл

@ -4,15 +4,15 @@
<RootNamespace>SkiaSharp</RootNamespace>
<AssemblyName>SkiaSharp</AssemblyName>
<PackagingGroup>SkiaSharp</PackagingGroup>
<IsBindingProject Condition=" '$(IsMacOS)' == 'true' ">true</IsBindingProject>
</PropertyGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<ObjcBindingApiDefinition Include="ApiDefinition.cs" />
<ObjcBindingCoreSource Include="StructsAndEnums.cs" />
<NativeReference Include="..\..\output\native\watchos\libSkiaSharp.framework" Kind="Framework" />
<None Include="..\..\output\native\watchos\libSkiaSharp.framework\**" Link="nuget\runtimes\watchos\native\libSkiaSharp.framework\%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>
<ItemGroup>
<None Include="nuget\build\xamarinwatchos1.0\SkiaSharp.targets" Link="nuget\build\$(TargetFramework)\SkiaSharp.targets" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="..\Binding.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
<Compile Include="..\Binding\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>

0
binding/SkiaSharp.watchOS/StructsAndEnums.cs
Просмотреть файл

13
binding/SkiaSharp.watchOS/nuget/build/xamarinwatchos1.0/SkiaSharp.targets Normal file
Просмотреть файл

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- if ShouldIncludeNativeSkiaSharp == False then don't include the native libSkiaSharp -->
<PropertyGroup>
<ShouldIncludeNativeSkiaSharp Condition=" '$(ShouldIncludeNativeSkiaSharp)' == '' ">True</ShouldIncludeNativeSkiaSharp>
</PropertyGroup>
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' ">
<NativeReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\watchos\native\libSkiaSharp.framework" Kind="Framework" />
</ItemGroup>
</Project>

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

@ -5,6 +5,12 @@ void PackageNuGet(FilePath nuspecPath, DirectoryPath outputPath)
OutputDirectory = MakeAbsolute(outputPath),
BasePath = nuspecPath.GetDirectory(),
ToolPath = NuGetToolPath,
Properties = new Dictionary<string, string> {
// NU5048: The 'PackageIconUrl'/'iconUrl' element is deprecated. Consider using the 'PackageIcon'/'icon' element instead.
// NU5105: The package version 'xxx' uses SemVer 2.0.0 or components of SemVer 1.0.0 that are not supported on legacy clients.
// NU5125: The 'licenseUrl' element will be deprecated. Consider using the 'license' element instead.
{ "NoWarn", "NU5048,NU5105,NU5125" }
},
});
}

9
nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec
Просмотреть файл

@ -27,7 +27,12 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<dependencies>
<dependency id="HarfBuzzSharp" version="1.0.0" />
<group targetFramework="net45">
<dependency id="HarfBuzzSharp" version="1.0.0" />
</group>
<group targetFramework="netstandard1.3">
<dependency id="HarfBuzzSharp" version="1.0.0" />
</group>
</dependencies>
</metadata>
@ -42,7 +47,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<!-- placeholders -->
<file src="_._" target="lib/net45/_._" />
<file src="_._" target="lib/netstandard/_._" />
<file src="_._" target="lib/netstandard1.3/_._" />
<!-- legal -->
<file src="LICENSE.txt" />

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

@ -27,8 +27,18 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<dependencies>
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="HarfBuzzSharp" version="1.0.0" />
<group targetFramework="net45">
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="HarfBuzzSharp" version="1.0.0" />
</group>
<group targetFramework="netstandard1.3">
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="HarfBuzzSharp" version="1.0.0" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="HarfBuzzSharp" version="1.0.0" />
</group>
</dependencies>
</metadata>

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

@ -40,7 +40,12 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<dependencies>
<dependency id="SkiaSharp" version="1.0.0" />
<group targetFramework="net45">
<dependency id="SkiaSharp" version="1.0.0" />
</group>
<group targetFramework="netstandard1.3">
<dependency id="SkiaSharp" version="1.0.0" />
</group>
</dependencies>
</metadata>
@ -55,7 +60,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<!-- placeholders -->
<file src="_._" target="lib/net45/_._" />
<file src="_._" target="lib/netstandard/_._" />
<file src="_._" target="lib/netstandard1.3/_._" />
<!-- legal -->
<file src="LICENSE.txt" />

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

@ -28,7 +28,12 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<dependencies>
<dependency id="SkiaSharp" version="1.0.0" />
<group targetFramework="net45">
<dependency id="SkiaSharp" version="1.0.0" />
</group>
<group targetFramework="netstandard1.3">
<dependency id="SkiaSharp" version="1.0.0" />
</group>
</dependencies>
</metadata>
@ -43,7 +48,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<!-- placeholders -->
<file src="_._" target="lib/net45/_._" />
<file src="_._" target="lib/netstandard/_._" />
<file src="_._" target="lib/netstandard1.3/_._" />
<!-- legal -->
<file src="LICENSE.txt" />

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

@ -30,7 +30,12 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<dependencies>
<dependency id="SkiaSharp" version="1.0.0" />
<group targetFramework="net45">
<dependency id="SkiaSharp" version="1.0.0" />
</group>
<group targetFramework="netstandard1.3">
<dependency id="SkiaSharp" version="1.0.0" />
</group>
</dependencies>
</metadata>
@ -45,7 +50,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<!-- placeholders -->
<file src="_._" target="lib/net45/_._" />
<file src="_._" target="lib/netstandard/_._" />
<file src="_._" target="lib/netstandard1.3/_._" />
<!-- legal -->
<file src="LICENSE.txt" />

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

@ -27,7 +27,15 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<dependencies>
<dependency id="SkiaSharp" version="1.0.0" />
<group targetFramework="net45">
<dependency id="SkiaSharp" version="1.0.0" />
</group>
<group targetFramework="netcoreapp3.0">
<dependency id="SkiaSharp" version="1.0.0" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="SkiaSharp" version="1.0.0" />
</group>
</dependencies>
</metadata>

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

@ -27,13 +27,15 @@ 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.5.0.725" />
<dependency id="Xamarin.Forms.Platform.GTK" version="4.5.0.725" />
<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" />
<dependency id="SkiaSharp.Views.Forms" version="1.0.0" />
<dependency id="OpenTK" version="3.0.1" />
<group targetFramework="net45">
<dependency id="Xamarin.Forms" version="4.5.0.725" />
<dependency id="Xamarin.Forms.Platform.GTK" version="4.5.0.725" />
<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" />
<dependency id="SkiaSharp.Views.Forms" version="1.0.0" />
<dependency id="OpenTK" version="3.0.1" />
</group>
</dependencies>
</metadata>

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

@ -27,15 +27,17 @@ 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.5.0.725" />
<dependency id="Xamarin.Forms.Platform.WPF" version="4.5.0.725" />
<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="3.0.1" />
<dependency id="OpenTK.GLControl" version="3.0.1" />
<group targetFramework="net45">
<dependency id="Xamarin.Forms" version="4.5.0.725" />
<dependency id="Xamarin.Forms.Platform.WPF" version="4.5.0.725" />
<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="3.0.1" />
<dependency id="OpenTK.GLControl" version="3.0.1" />
</group>
</dependencies>
</metadata>

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

@ -26,6 +26,37 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<references>
<group targetFramework="netstandard1.3">
<reference file="SkiaSharp.Views.Forms.dll" />
<reference file="SkiaSharp.Views.Forms.xml" />
</group>
<group targetFramework="netstandard2.0">
<reference file="SkiaSharp.Views.Forms.dll" />
<reference file="SkiaSharp.Views.Forms.xml" />
</group>
<group targetFramework="monoandroid1.0">
<reference file="SkiaSharp.Views.Forms.dll" />
<reference file="SkiaSharp.Views.Forms.xml" />
</group>
<group targetFramework="xamarinios1.0">
<reference file="SkiaSharp.Views.Forms.dll" />
<reference file="SkiaSharp.Views.Forms.xml" />
</group>
<group targetFramework="xamarinmac2.0">
<reference file="SkiaSharp.Views.Forms.dll" />
<reference file="SkiaSharp.Views.Forms.xml" />
</group>
<group targetFramework="uap10.0">
<reference file="SkiaSharp.Views.Forms.dll" />
<reference file="SkiaSharp.Views.Forms.xml" />
</group>
<group targetFramework="tizen40">
<reference file="SkiaSharp.Views.Forms.dll" />
<reference file="SkiaSharp.Views.Forms.xml" />
</group>
</references>
<dependencies>
<group targetFramework="netstandard1.3">
<dependency id="Xamarin.Forms" version="4.5.0.725" />
@ -89,12 +120,19 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<!-- SkiaSharp.Views.Forms.dll -->
<file platform="macos,windows" src="lib/monoandroid1.0/SkiaSharp.Views.Forms.dll" />
<file platform="macos,windows" src="lib/monoandroid1.0/SkiaSharp.Views.Forms.xml" />
<file platform="macos" src="lib/xamarinios1.0/SkiaSharp.Views.Forms.dll" />
<file platform="macos" src="lib/xamarinios1.0/SkiaSharp.Views.Forms.xml" />
<file platform="macos" src="lib/xamarinmac2.0/SkiaSharp.Views.Forms.dll" />
<file platform="macos" src="lib/xamarinmac2.0/SkiaSharp.Views.Forms.xml" />
<file platform="windows" src="lib/uap10.0/SkiaSharp.Views.Forms.dll" />
<file platform="windows" src="lib/uap10.0/SkiaSharp.Views.Forms.xml" />
<file src="lib/tizen40/SkiaSharp.Views.Forms.dll" />
<file src="lib/tizen40/SkiaSharp.Views.Forms.xml" />
<!-- the build bits -->
<file src="_._" target="lib/net45/_._" />
<file src="_._" target="ref/net45/_._" />
<file src="build/net45/SkiaSharp.Views.Forms.targets" />
<!-- legal -->

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

@ -27,8 +27,10 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<dependencies>
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views.Desktop.Common" version="1.0.0" />
<group targetFramework="net45">
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views.Desktop.Common" version="1.0.0" />
</group>
</dependencies>
</metadata>

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

@ -27,9 +27,11 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<dependencies>
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views.Desktop.Common" version="1.0.0" />
<dependency id="GtkSharp" version="3.22.24.37" />
<group targetFramework="netstandard2.0">
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views.Desktop.Common" version="1.0.0" />
<dependency id="GtkSharp" version="3.22.24.37" />
</group>
</dependencies>
</metadata>

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

@ -27,8 +27,14 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<dependencies>
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views.Desktop.Common" version="1.0.0" />
<group targetFramework="net45">
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views.Desktop.Common" version="1.0.0" />
</group>
<group targetFramework="netcoreapp3.0">
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views.Desktop.Common" version="1.0.0" />
</group>
</dependencies>
</metadata>

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

@ -27,10 +27,18 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<dependencies>
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views.Desktop.Common" version="1.0.0" />
<dependency id="OpenTK" version="3.0.1" />
<dependency id="OpenTK.GLControl" version="3.0.1" />
<group targetFramework="net45">
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views.Desktop.Common" version="1.0.0" />
<dependency id="OpenTK" version="3.0.1" />
<dependency id="OpenTK.GLControl" version="3.0.1" />
</group>
<group targetFramework="netcoreapp3.0">
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views.Desktop.Common" version="1.0.0" />
<dependency id="OpenTK" version="3.0.1" />
<dependency id="OpenTK.GLControl" version="3.0.1" />
</group>
</dependencies>
</metadata>

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

@ -27,8 +27,10 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
<dependencies>
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SharpVk" version="0.4.2" />
<group targetFramework="netstandard2.0">
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SharpVk" version="0.4.2" />
</group>
</dependencies>
</metadata>

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

@ -92,16 +92,26 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<file src="lib/tizen40/SkiaSharp.xml" />
<!-- the build bits -->
<!-- net4x (win32/macos/linux) -->
<file src="build/net45/SkiaSharp.targets" />
<file src="build/net45/SkiaSharp.targets" target="buildTransitive/net45/SkiaSharp.targets" />
<file src="build/net462/SkiaSharp.targets" />
<file src="build/net462/SkiaSharp.targets" target="buildTransitive/net462/SkiaSharp.targets" />
<!-- others -->
<file src="build/monoandroid1.0/SkiaSharp.targets" />
<file src="build/xamarinios1.0/SkiaSharp.targets" />
<file src="build/xamarintvos1.0/SkiaSharp.targets" />
<file src="build/xamarinwatchos1.0/SkiaSharp.targets" />
<file src="build/xamarinmac2.0/SkiaSharp.targets" />
<file src="build/tizen40/SkiaSharp.targets" />
<!-- libSkiaSharp.dll and other native files -->
<!-- win -->
<file platform="windows" src="runtimes/win-x64/native/libSkiaSharp.dll" />
<file platform="windows" src="runtimes/win-x86/native/libSkiaSharp.dll" />
<!-- macos -->
<file platform="macos" src="runtimes/osx/native/libSkiaSharp.dylib" />
<!-- win10 -->
<file platform="windows" src="runtimes/win10-x64/nativeassets/uap10.0/libSkiaSharp.dll" />
<file platform="windows" src="runtimes/win10-x86/nativeassets/uap10.0/libSkiaSharp.dll" />
<file platform="windows" src="runtimes/win10-arm/nativeassets/uap10.0/libSkiaSharp.dll" />
@ -114,8 +124,20 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<file platform="windows" src="runtimes/win10-x86/nativeassets/uap10.0/libEGL.dll" />
<file platform="windows" src="runtimes/win10-arm/nativeassets/uap10.0/libEGL.dll" />
<file platform="windows" src="runtimes/win10-arm64/nativeassets/uap10.0/libEGL.dll" />
<!-- tizen -->
<file src="runtimes/tizen-armel/native/libSkiaSharp.so" />
<file src="runtimes/tizen-x86/native/libSkiaSharp.so" />
<!-- android -->
<file platform="macos,windows" src="runtimes/android-x64/native/libSkiaSharp.so" />
<file platform="macos,windows" src="runtimes/android-x86/native/libSkiaSharp.so" />
<file platform="macos,windows" src="runtimes/android-arm/native/libSkiaSharp.so" />
<file platform="macos,windows" src="runtimes/android-arm64/native/libSkiaSharp.so" />
<!-- ios -->
<file platform="macos" src="runtimes/ios/native/libSkiaSharp.framework/" target="/" />
<!-- tvos -->
<file platform="macos" src="runtimes/tvos/native/libSkiaSharp.framework/" target="/" />
<!-- watchos -->
<file platform="macos" src="runtimes/watchos/native/libSkiaSharp.framework/" target="/" />
<!-- Workbooks integration -->
<file src="xamarin.interactive/SkiaSharp.Workbooks.dll" />

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

@ -72,4 +72,5 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\..\..\..\output\SkiaSharp\nuget\build\monoandroid1.0\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\monoandroid1.0\SkiaSharp.targets')" />
</Project>

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

@ -81,4 +81,5 @@
<AndroidResource Include="Resources\**\*" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\..\..\..\output\SkiaSharp\nuget\build\monoandroid1.0\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\monoandroid1.0\SkiaSharp.targets')" />
</Project>

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

@ -108,4 +108,5 @@
<InterfaceDefinition Include="Resources\LaunchScreen.storyboard" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\..\..\..\output\SkiaSharp\nuget\build\xamarinios1.0\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\xamarinios1.0\SkiaSharp.targets')" />
</Project>

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

@ -97,4 +97,5 @@
<Compile Include="AppDelegate.cs" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
<Import Project="..\..\..\..\output\SkiaSharp\nuget\build\xamarinmac2.0\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\xamarinmac2.0\SkiaSharp.targets')" />
</Project>

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

@ -121,4 +121,5 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\..\..\..\output\SkiaSharp\nuget\build\xamarinios1.0\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\xamarinios1.0\SkiaSharp.targets')" />
</Project>

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

@ -89,4 +89,5 @@
<InterfaceDefinition Include="Main.storyboard" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
<Import Project="..\..\..\..\output\SkiaSharp\nuget\build\xamarinmac2.0\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\xamarinmac2.0\SkiaSharp.targets')" />
</Project>

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

@ -140,4 +140,5 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\TVOS\Xamarin.TVOS.CSharp.targets" />
<Import Project="..\..\..\..\output\SkiaSharp\nuget\build\xamarintvos1.0\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\xamarintvos1.0\SkiaSharp.targets')" />
</Project>

1
samples/Basic/watchOS/SkiaSharpSample.OnWatch/SkiaSharpSample.OnWatch.csproj
Просмотреть файл

@ -115,4 +115,5 @@
<InterfaceDefinition Include="Interface.storyboard" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\WatchOS\Xamarin.WatchOS.App.CSharp.targets" />
<Import Project="..\..\..\..\output\SkiaSharp\nuget\build\xamarinwatchos1.0\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\xamarinwatchos1.0\SkiaSharp.targets')" />
</Project>

1
samples/Basic/watchOS/SkiaSharpSample.OnWatchExtension/SkiaSharpSample.OnWatchExtension.csproj
Просмотреть файл

@ -112,4 +112,5 @@
</Compile>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\WatchOS\Xamarin.WatchOS.AppExtension.CSharp.targets" />
<Import Project="..\..\..\..\output\SkiaSharp\nuget\build\xamarinwatchos1.0\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\xamarinwatchos1.0\SkiaSharp.targets')" />
</Project>

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

@ -103,4 +103,5 @@
<Compile Include="..\..\PlatformShared\*.cs" Link="PlatformShared\%(Filename)%(Extension)" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\..\..\..\output\SkiaSharp\nuget\build\monoandroid1.0\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\monoandroid1.0\SkiaSharp.targets')" />
</Project>

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

@ -122,4 +122,5 @@
<Compile Include="..\..\PlatformShared\*.cs" Link="PlatformShared\%(Filename)%(Extension)" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
<Import Project="..\..\..\..\output\SkiaSharp\nuget\build\xamarinmac2.0\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\xamarinmac2.0\SkiaSharp.targets')" />
</Project>

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

@ -181,4 +181,5 @@
<Compile Include="..\..\PlatformShared\*.cs" Link="PlatformShared\%(Filename)%(Extension)" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\..\..\..\output\SkiaSharp\nuget\build\xamarinios1.0\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\xamarinios1.0\SkiaSharp.targets')" />
</Project>

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

@ -108,4 +108,5 @@
<EmbeddedResource Remove="..\..\Shared\Media\content-font.ttf" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
<Import Project="..\..\..\..\output\SkiaSharp\nuget\build\xamarinmac2.0\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\xamarinmac2.0\SkiaSharp.targets')" />
</Project>

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

@ -152,4 +152,5 @@
<EmbeddedResource Remove="..\..\Shared\Media\content-font.ttf" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\TVOS\Xamarin.TVOS.CSharp.targets" />
<Import Project="..\..\..\..\output\SkiaSharp\nuget\build\xamarintvos1.0\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\xamarintvos1.0\SkiaSharp.targets')" />
</Project>