diff --git a/binding/SkiaSharp.Android/SkiaSharp.Android.csproj b/binding/SkiaSharp.Android/SkiaSharp.Android.csproj index 06bd88f2c..26b46932a 100644 --- a/binding/SkiaSharp.Android/SkiaSharp.Android.csproj +++ b/binding/SkiaSharp.Android/SkiaSharp.Android.csproj @@ -7,10 +7,13 @@ monoandroid1.0 - - - - + + + + + + + diff --git a/binding/SkiaSharp.Android/nuget/build/monoandroid1.0/SkiaSharp.targets b/binding/SkiaSharp.Android/nuget/build/monoandroid1.0/SkiaSharp.targets new file mode 100644 index 000000000..7b870e572 --- /dev/null +++ b/binding/SkiaSharp.Android/nuget/build/monoandroid1.0/SkiaSharp.targets @@ -0,0 +1,16 @@ + + + + + + True + + + + + + + + + + \ No newline at end of file diff --git a/binding/SkiaSharp.OSX/ApiDefinition.cs b/binding/SkiaSharp.OSX/ApiDefinition.cs deleted file mode 100644 index e69de29bb..000000000 diff --git a/binding/SkiaSharp.OSX/Properties/AssemblyInfo.cs b/binding/SkiaSharp.OSX/Properties/AssemblyInfo.cs index 635974455..efc6ea06d 100644 --- a/binding/SkiaSharp.OSX/Properties/AssemblyInfo.cs +++ b/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)] diff --git a/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj b/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj index 481bc76cb..6e936183c 100644 --- a/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj +++ b/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj @@ -4,16 +4,15 @@ SkiaSharp SkiaSharp SkiaSharp - $(DefineConstants);__MACOS__ - true - - - - + + + + + diff --git a/binding/SkiaSharp.OSX/Structs.cs b/binding/SkiaSharp.OSX/Structs.cs deleted file mode 100644 index e69de29bb..000000000 diff --git a/binding/SkiaSharp.OSX/nuget/build/xamarinmac2.0/SkiaSharp.targets b/binding/SkiaSharp.OSX/nuget/build/xamarinmac2.0/SkiaSharp.targets new file mode 100644 index 000000000..3079c1ea8 --- /dev/null +++ b/binding/SkiaSharp.OSX/nuget/build/xamarinmac2.0/SkiaSharp.targets @@ -0,0 +1,13 @@ + + + + + + True + + + + + + + \ No newline at end of file diff --git a/binding/SkiaSharp.iOS/ApiDefinition.cs b/binding/SkiaSharp.iOS/ApiDefinition.cs deleted file mode 100644 index e69de29bb..000000000 diff --git a/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj b/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj index 39cdf9bac..bb2f3aedd 100644 --- a/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj +++ b/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj @@ -4,15 +4,15 @@ SkiaSharp SkiaSharp SkiaSharp - true - - - - + + + + + diff --git a/binding/SkiaSharp.iOS/StructsAndEnums.cs b/binding/SkiaSharp.iOS/StructsAndEnums.cs deleted file mode 100644 index e69de29bb..000000000 diff --git a/binding/SkiaSharp.iOS/nuget/build/xamarinios1.0/SkiaSharp.targets b/binding/SkiaSharp.iOS/nuget/build/xamarinios1.0/SkiaSharp.targets new file mode 100644 index 000000000..eb3a98e67 --- /dev/null +++ b/binding/SkiaSharp.iOS/nuget/build/xamarinios1.0/SkiaSharp.targets @@ -0,0 +1,13 @@ + + + + + + True + + + + + + + \ No newline at end of file diff --git a/binding/SkiaSharp.tvOS/ApiDefinition.cs b/binding/SkiaSharp.tvOS/ApiDefinition.cs deleted file mode 100644 index e69de29bb..000000000 diff --git a/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj b/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj index 2c9b39da9..78eb86351 100644 --- a/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj +++ b/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj @@ -4,15 +4,15 @@ SkiaSharp SkiaSharp SkiaSharp - true - - - - + + + + + diff --git a/binding/SkiaSharp.tvOS/StructsAndEnums.cs b/binding/SkiaSharp.tvOS/StructsAndEnums.cs deleted file mode 100644 index e69de29bb..000000000 diff --git a/binding/SkiaSharp.tvOS/nuget/build/xamarintvos1.0/SkiaSharp.targets b/binding/SkiaSharp.tvOS/nuget/build/xamarintvos1.0/SkiaSharp.targets new file mode 100644 index 000000000..a53c27312 --- /dev/null +++ b/binding/SkiaSharp.tvOS/nuget/build/xamarintvos1.0/SkiaSharp.targets @@ -0,0 +1,13 @@ + + + + + + True + + + + + + + \ No newline at end of file diff --git a/binding/SkiaSharp.watchOS/ApiDefinition.cs b/binding/SkiaSharp.watchOS/ApiDefinition.cs deleted file mode 100644 index e69de29bb..000000000 diff --git a/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj b/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj index 978b1579b..1a56a7291 100644 --- a/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj +++ b/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj @@ -4,15 +4,15 @@ SkiaSharp SkiaSharp SkiaSharp - true - - - - + + + + + diff --git a/binding/SkiaSharp.watchOS/StructsAndEnums.cs b/binding/SkiaSharp.watchOS/StructsAndEnums.cs deleted file mode 100644 index e69de29bb..000000000 diff --git a/binding/SkiaSharp.watchOS/nuget/build/xamarinwatchos1.0/SkiaSharp.targets b/binding/SkiaSharp.watchOS/nuget/build/xamarinwatchos1.0/SkiaSharp.targets new file mode 100644 index 000000000..749476e1f --- /dev/null +++ b/binding/SkiaSharp.watchOS/nuget/build/xamarinwatchos1.0/SkiaSharp.targets @@ -0,0 +1,13 @@ + + + + + + True + + + + + + + \ No newline at end of file diff --git a/cake/UtilsManaged.cake b/cake/UtilsManaged.cake index 9b29566e0..857a529df 100644 --- a/cake/UtilsManaged.cake +++ b/cake/UtilsManaged.cake @@ -5,6 +5,12 @@ void PackageNuGet(FilePath nuspecPath, DirectoryPath outputPath) OutputDirectory = MakeAbsolute(outputPath), BasePath = nuspecPath.GetDirectory(), ToolPath = NuGetToolPath, + Properties = new Dictionary { + // 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" } + }, }); } diff --git a/nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec b/nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec index 66f9c27c4..95142579e 100644 --- a/nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec +++ b/nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec @@ -27,7 +27,12 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release © Microsoft Corporation. All rights reserved. - + + + + + + @@ -42,7 +47,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + diff --git a/nuget/SkiaSharp.HarfBuzz.nuspec b/nuget/SkiaSharp.HarfBuzz.nuspec index dca67e631..f2809e2e3 100644 --- a/nuget/SkiaSharp.HarfBuzz.nuspec +++ b/nuget/SkiaSharp.HarfBuzz.nuspec @@ -27,8 +27,18 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release © Microsoft Corporation. All rights reserved. - - + + + + + + + + + + + + diff --git a/nuget/SkiaSharp.NativeAssets.Linux.NoDependencies.nuspec b/nuget/SkiaSharp.NativeAssets.Linux.NoDependencies.nuspec index 6638e9c16..c675d2a63 100644 --- a/nuget/SkiaSharp.NativeAssets.Linux.NoDependencies.nuspec +++ b/nuget/SkiaSharp.NativeAssets.Linux.NoDependencies.nuspec @@ -40,7 +40,12 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release © Microsoft Corporation. All rights reserved. - + + + + + + @@ -55,7 +60,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + diff --git a/nuget/SkiaSharp.NativeAssets.Linux.nuspec b/nuget/SkiaSharp.NativeAssets.Linux.nuspec index 43278587a..22e7dabc6 100644 --- a/nuget/SkiaSharp.NativeAssets.Linux.nuspec +++ b/nuget/SkiaSharp.NativeAssets.Linux.nuspec @@ -28,7 +28,12 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release © Microsoft Corporation. All rights reserved. - + + + + + + @@ -43,7 +48,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + diff --git a/nuget/SkiaSharp.NativeAssets.NanoServer.nuspec b/nuget/SkiaSharp.NativeAssets.NanoServer.nuspec index dc6d99600..31f54e519 100644 --- a/nuget/SkiaSharp.NativeAssets.NanoServer.nuspec +++ b/nuget/SkiaSharp.NativeAssets.NanoServer.nuspec @@ -30,7 +30,12 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release © Microsoft Corporation. All rights reserved. - + + + + + + @@ -45,7 +50,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + diff --git a/nuget/SkiaSharp.Views.Desktop.Common.nuspec b/nuget/SkiaSharp.Views.Desktop.Common.nuspec index d693a7ce6..a7d901033 100644 --- a/nuget/SkiaSharp.Views.Desktop.Common.nuspec +++ b/nuget/SkiaSharp.Views.Desktop.Common.nuspec @@ -27,7 +27,15 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release © Microsoft Corporation. All rights reserved. - + + + + + + + + + diff --git a/nuget/SkiaSharp.Views.Forms.GTK.nuspec b/nuget/SkiaSharp.Views.Forms.GTK.nuspec index 443e658d7..74fd2205b 100644 --- a/nuget/SkiaSharp.Views.Forms.GTK.nuspec +++ b/nuget/SkiaSharp.Views.Forms.GTK.nuspec @@ -27,13 +27,15 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release © Microsoft Corporation. All rights reserved. - - - - - - - + + + + + + + + + diff --git a/nuget/SkiaSharp.Views.Forms.WPF.nuspec b/nuget/SkiaSharp.Views.Forms.WPF.nuspec index 3581cfdff..967ba8ac5 100644 --- a/nuget/SkiaSharp.Views.Forms.WPF.nuspec +++ b/nuget/SkiaSharp.Views.Forms.WPF.nuspec @@ -27,15 +27,17 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release © Microsoft Corporation. All rights reserved. - - - - - - - - - + + + + + + + + + + + diff --git a/nuget/SkiaSharp.Views.Forms.nuspec b/nuget/SkiaSharp.Views.Forms.nuspec index cf5872421..8c4dee71b 100644 --- a/nuget/SkiaSharp.Views.Forms.nuspec +++ b/nuget/SkiaSharp.Views.Forms.nuspec @@ -26,6 +26,37 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release true © Microsoft Corporation. All rights reserved. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -89,12 +120,19 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release + + + + + + + diff --git a/nuget/SkiaSharp.Views.Gtk2.nuspec b/nuget/SkiaSharp.Views.Gtk2.nuspec index bbdfc03e1..ee4b58ce8 100644 --- a/nuget/SkiaSharp.Views.Gtk2.nuspec +++ b/nuget/SkiaSharp.Views.Gtk2.nuspec @@ -27,8 +27,10 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release © Microsoft Corporation. All rights reserved. - - + + + + diff --git a/nuget/SkiaSharp.Views.Gtk3.nuspec b/nuget/SkiaSharp.Views.Gtk3.nuspec index 34352b6fb..d43e7432b 100644 --- a/nuget/SkiaSharp.Views.Gtk3.nuspec +++ b/nuget/SkiaSharp.Views.Gtk3.nuspec @@ -27,9 +27,11 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release © Microsoft Corporation. All rights reserved. - - - + + + + + diff --git a/nuget/SkiaSharp.Views.WPF.nuspec b/nuget/SkiaSharp.Views.WPF.nuspec index 83e3a8ccd..8964a222f 100644 --- a/nuget/SkiaSharp.Views.WPF.nuspec +++ b/nuget/SkiaSharp.Views.WPF.nuspec @@ -27,8 +27,14 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release © Microsoft Corporation. All rights reserved. - - + + + + + + + + diff --git a/nuget/SkiaSharp.Views.WindowsForms.nuspec b/nuget/SkiaSharp.Views.WindowsForms.nuspec index 5215257f8..ee4574005 100644 --- a/nuget/SkiaSharp.Views.WindowsForms.nuspec +++ b/nuget/SkiaSharp.Views.WindowsForms.nuspec @@ -27,10 +27,18 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release © Microsoft Corporation. All rights reserved. - - - - + + + + + + + + + + + + diff --git a/nuget/SkiaSharp.Vulkan.SharpVk.nuspec b/nuget/SkiaSharp.Vulkan.SharpVk.nuspec index 03ab91521..8a80ecfa3 100644 --- a/nuget/SkiaSharp.Vulkan.SharpVk.nuspec +++ b/nuget/SkiaSharp.Vulkan.SharpVk.nuspec @@ -27,8 +27,10 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release © Microsoft Corporation. All rights reserved. - - + + + + diff --git a/nuget/SkiaSharp.nuspec b/nuget/SkiaSharp.nuspec index 4e5930ea7..969035537 100644 --- a/nuget/SkiaSharp.nuspec +++ b/nuget/SkiaSharp.nuspec @@ -92,16 +92,26 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release + + + + + + + + + + @@ -114,8 +124,20 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release + + + + + + + + + + + + diff --git a/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj index 1958e2ac4..f8b47e76b 100644 --- a/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Android/SkiaSharpSample/SkiaSharpSample.csproj @@ -72,4 +72,5 @@ + \ No newline at end of file diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj index ac6999670..f459b4778 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj @@ -81,4 +81,5 @@ + \ No newline at end of file diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj index 34decf916..ad60a2449 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj @@ -108,4 +108,5 @@ + \ No newline at end of file diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj index 029495186..2f3e0cd14 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj @@ -97,4 +97,5 @@ + \ No newline at end of file diff --git a/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj index 9cc72d512..ed0faf6fe 100644 --- a/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -121,4 +121,5 @@ + \ No newline at end of file diff --git a/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj index 0f6233fa7..89aac0122 100644 --- a/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -89,4 +89,5 @@ + \ No newline at end of file diff --git a/samples/Basic/tvOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/tvOS/SkiaSharpSample/SkiaSharpSample.csproj index 881660e12..82cdf59bd 100644 --- a/samples/Basic/tvOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/tvOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -140,4 +140,5 @@ + \ No newline at end of file diff --git a/samples/Basic/watchOS/SkiaSharpSample.OnWatch/SkiaSharpSample.OnWatch.csproj b/samples/Basic/watchOS/SkiaSharpSample.OnWatch/SkiaSharpSample.OnWatch.csproj index f42df9de2..915722d26 100644 --- a/samples/Basic/watchOS/SkiaSharpSample.OnWatch/SkiaSharpSample.OnWatch.csproj +++ b/samples/Basic/watchOS/SkiaSharpSample.OnWatch/SkiaSharpSample.OnWatch.csproj @@ -115,4 +115,5 @@ + \ No newline at end of file diff --git a/samples/Basic/watchOS/SkiaSharpSample.OnWatchExtension/SkiaSharpSample.OnWatchExtension.csproj b/samples/Basic/watchOS/SkiaSharpSample.OnWatchExtension/SkiaSharpSample.OnWatchExtension.csproj index 2745f0299..da02c4e83 100644 --- a/samples/Basic/watchOS/SkiaSharpSample.OnWatchExtension/SkiaSharpSample.OnWatchExtension.csproj +++ b/samples/Basic/watchOS/SkiaSharpSample.OnWatchExtension/SkiaSharpSample.OnWatchExtension.csproj @@ -112,4 +112,5 @@ + \ No newline at end of file diff --git a/samples/Gallery/Xamarin.Forms/Android/Android.csproj b/samples/Gallery/Xamarin.Forms/Android/Android.csproj index 0364a82a3..0bff8a6a3 100644 --- a/samples/Gallery/Xamarin.Forms/Android/Android.csproj +++ b/samples/Gallery/Xamarin.Forms/Android/Android.csproj @@ -103,4 +103,5 @@ + \ No newline at end of file diff --git a/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj b/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj index 0b27964f0..ad9a61f5f 100644 --- a/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj +++ b/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj @@ -122,4 +122,5 @@ + \ No newline at end of file diff --git a/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj b/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj index 99850302e..21c2404ee 100644 --- a/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj +++ b/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj @@ -181,4 +181,5 @@ + \ No newline at end of file diff --git a/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj index 4aa1b2bbb..9733f1e98 100644 --- a/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -108,4 +108,5 @@ + \ No newline at end of file diff --git a/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj index 96a5c9880..df8fb77c1 100644 --- a/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -152,4 +152,5 @@ + \ No newline at end of file