Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't embed libSkiaSharp in the assemblies #1296

Merged
merged 24 commits into from
Jun 10, 2020
Merged

Don't embed libSkiaSharp in the assemblies #1296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
347345a
Don't embed libSkiaSharp in the dlls
mattleibow May 17, 2020
1d5ad21
Update the samples to use the new .targets
mattleibow May 17, 2020
4aadc89
Don't build the native for now
mattleibow May 17, 2020
5de98aa
Merge remote-tracking branch 'origin/develop' into dev/no-embed
mattleibow May 18, 2020
d1c9762
More things
mattleibow May 19, 2020
ee01bc5
Doing too much in my life
mattleibow May 19, 2020
8e1a168
Merge branch 'develop' into dev/no-embed
mattleibow May 19, 2020
69a5fa0
Don't even show this yet
mattleibow May 19, 2020
d0074b2
Not true
mattleibow May 19, 2020
0b764ab
Interesting...
mattleibow May 19, 2020
f6afd71
Merge branch 'develop' into dev/no-embed
mattleibow May 19, 2020
0781967
Merge remote-tracking branch 'origin/develop' into dev/no-embed
mattleibow May 20, 2020
1f87cf0
Merge remote-tracking branch 'origin/develop' into dev/no-embed
mattleibow May 20, 2020
cbcaf12
iOS is still a bit shaky
mattleibow May 20, 2020
332cdae
Update forms
mattleibow Jun 8, 2020
b941ce4
Merge branch 'master' into dev/no-embed
mattleibow Jun 8, 2020
ac05551
Later version of the build
mattleibow Jun 8, 2020
0a1d706
Remove the old attribute
mattleibow Jun 8, 2020
3b850a3
Use the correct file
mattleibow Jun 8, 2020
d800c93
Expose SKPath.ToWinding
mattleibow Jun 9, 2020
144a6af
Merge remote-tracking branch 'origin/master' into dev/path-winding
mattleibow Jun 10, 2020
6106438
Merge branch 'dev/path-winding' into dev/no-embed
mattleibow Jun 10, 2020
28fd64c
Build everything now
mattleibow Jun 10, 2020
5895921
Merge branch 'master' into dev/no-embed
mattleibow Jun 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions binding/SkiaSharp.Android/SkiaSharp.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)" />
Expand Down
16 changes: 16 additions & 0 deletions binding/SkiaSharp.Android/nuget/build/monoandroid1.0/SkiaSharp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Empty file removed binding/SkiaSharp.OSX/ApiDefinition.cs
View file
Open in desktop
Empty file.
6 changes: 4 additions & 2 deletions binding/SkiaSharp.OSX/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 5 additions & 6 deletions binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Empty file removed binding/SkiaSharp.OSX/Structs.cs
View file
Open in desktop
Empty file.
13 changes: 13 additions & 0 deletions binding/SkiaSharp.OSX/nuget/build/xamarinmac2.0/SkiaSharp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Empty file removed binding/SkiaSharp.iOS/ApiDefinition.cs
View file
Open in desktop
Empty file.
10 changes: 5 additions & 5 deletions binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Empty file removed binding/SkiaSharp.iOS/StructsAndEnums.cs
View file
Open in desktop
Empty file.
13 changes: 13 additions & 0 deletions binding/SkiaSharp.iOS/nuget/build/xamarinios1.0/SkiaSharp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Empty file removed binding/SkiaSharp.tvOS/ApiDefinition.cs
View file
Open in desktop
Empty file.
10 changes: 5 additions & 5 deletions binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Empty file removed binding/SkiaSharp.tvOS/StructsAndEnums.cs
View file
Open in desktop
Empty file.
13 changes: 13 additions & 0 deletions binding/SkiaSharp.tvOS/nuget/build/xamarintvos1.0/SkiaSharp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Empty file removed binding/SkiaSharp.watchOS/ApiDefinition.cs
View file
Open in desktop
Empty file.
10 changes: 5 additions & 5 deletions binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Empty file removed binding/SkiaSharp.watchOS/StructsAndEnums.cs
View file
Open in desktop
Empty file.
13 changes: 13 additions & 0 deletions binding/SkiaSharp.watchOS/nuget/build/xamarinwatchos1.0/SkiaSharp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 6 additions & 0 deletions cake/UtilsManaged.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
},
});
}

Expand Down
9 changes: 7 additions & 2 deletions nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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" />
Expand Down
14 changes: 12 additions & 2 deletions nuget/SkiaSharp.HarfBuzz.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
9 changes: 7 additions & 2 deletions nuget/SkiaSharp.NativeAssets.Linux.NoDependencies.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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" />
Expand Down
9 changes: 7 additions & 2 deletions nuget/SkiaSharp.NativeAssets.Linux.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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" />
Expand Down
9 changes: 7 additions & 2 deletions nuget/SkiaSharp.NativeAssets.NanoServer.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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" />
Expand Down
10 changes: 9 additions & 1 deletion nuget/SkiaSharp.Views.Desktop.Common.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
16 changes: 9 additions & 7 deletions nuget/SkiaSharp.Views.Forms.GTK.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
20 changes: 11 additions & 9 deletions nuget/SkiaSharp.Views.Forms.WPF.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading