diff --git a/VERSIONS.txt b/VERSIONS.txt index 91b6d86e8e0..d06a19adcd4 100644 --- a/VERSIONS.txt +++ b/VERSIONS.txt @@ -83,6 +83,7 @@ SkiaSharp.Views.Maui.Controls nuget 2.88.1 SkiaSharp.Views.Maui.Controls.Compatibility nuget 2.88.1 SkiaSharp.Views.Blazor nuget 2.88.1 SkiaSharp.HarfBuzz nuget 2.88.1 +SkiaSharp.Skottie nuget 2.88.1 SkiaSharp.Vulkan.SharpVk nuget 2.88.1 HarfBuzzSharp nuget 2.8.2.1 HarfBuzzSharp.NativeAssets.Android nuget 2.8.2.1 diff --git a/binding/Binding/Properties/SkiaSharpAssemblyInfo.cs b/binding/Binding/Properties/SkiaSharpAssemblyInfo.cs index a1c6c5d6d67..0560243338a 100644 --- a/binding/Binding/Properties/SkiaSharpAssemblyInfo.cs +++ b/binding/Binding/Properties/SkiaSharpAssemblyInfo.cs @@ -37,6 +37,20 @@ "dafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef00" + "65d016df")] +[assembly: InternalsVisibleTo("SkiaSharp.SceneGraph, PublicKey=" + + "002400000480000094000000060200000024000052534131000400000100010079159977d2d03a" + + "8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c" + + "3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fd" + + "dafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef00" + + "65d016df")] + +[assembly: InternalsVisibleTo("SkiaSharp.Skottie, PublicKey=" + + "002400000480000094000000060200000024000052534131000400000100010079159977d2d03a" + + "8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c" + + "3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fd" + + "dafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef00" + + "65d016df")] + [assembly: AssemblyMetadata("IsTrimmable", "True")] #if __IOS__ || __TVOS__ || __WATCHOS__ || __MACOS__ diff --git a/binding/Binding/SkiaApi.generated.cs b/binding/Binding/SkiaApi.generated.cs index ea8f053613d..8a70b541341 100644 --- a/binding/Binding/SkiaApi.generated.cs +++ b/binding/Binding/SkiaApi.generated.cs @@ -3,8 +3,6 @@ #region Namespaces -using SkiaSharp.SceneGraph; -using SkiaSharp.Skottie; #endregion @@ -13012,364 +13010,6 @@ internal static sk_xmlstreamwriter_t sk_xmlstreamwriter_new (sk_wstream_t stream #endregion - #region skottie_animation.h - - // void skottie_animation_delete(skottie_animation_t* instance) - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern void skottie_animation_delete (skottie_animation_t instance); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate void skottie_animation_delete (skottie_animation_t instance); - } - private static Delegates.skottie_animation_delete skottie_animation_delete_delegate; - internal static void skottie_animation_delete (skottie_animation_t instance) => - (skottie_animation_delete_delegate ??= GetSymbol ("skottie_animation_delete")).Invoke (instance); - #endif - - // double skottie_animation_get_duration(skottie_animation_t* instance) - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern Double skottie_animation_get_duration (skottie_animation_t instance); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate Double skottie_animation_get_duration (skottie_animation_t instance); - } - private static Delegates.skottie_animation_get_duration skottie_animation_get_duration_delegate; - internal static Double skottie_animation_get_duration (skottie_animation_t instance) => - (skottie_animation_get_duration_delegate ??= GetSymbol ("skottie_animation_get_duration")).Invoke (instance); - #endif - - // double skottie_animation_get_fps(skottie_animation_t* instance) - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern Double skottie_animation_get_fps (skottie_animation_t instance); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate Double skottie_animation_get_fps (skottie_animation_t instance); - } - private static Delegates.skottie_animation_get_fps skottie_animation_get_fps_delegate; - internal static Double skottie_animation_get_fps (skottie_animation_t instance) => - (skottie_animation_get_fps_delegate ??= GetSymbol ("skottie_animation_get_fps")).Invoke (instance); - #endif - - // double skottie_animation_get_in_point(skottie_animation_t* instance) - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern Double skottie_animation_get_in_point (skottie_animation_t instance); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate Double skottie_animation_get_in_point (skottie_animation_t instance); - } - private static Delegates.skottie_animation_get_in_point skottie_animation_get_in_point_delegate; - internal static Double skottie_animation_get_in_point (skottie_animation_t instance) => - (skottie_animation_get_in_point_delegate ??= GetSymbol ("skottie_animation_get_in_point")).Invoke (instance); - #endif - - // double skottie_animation_get_out_point(skottie_animation_t* instance) - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern Double skottie_animation_get_out_point (skottie_animation_t instance); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate Double skottie_animation_get_out_point (skottie_animation_t instance); - } - private static Delegates.skottie_animation_get_out_point skottie_animation_get_out_point_delegate; - internal static Double skottie_animation_get_out_point (skottie_animation_t instance) => - (skottie_animation_get_out_point_delegate ??= GetSymbol ("skottie_animation_get_out_point")).Invoke (instance); - #endif - - // void skottie_animation_get_size(skottie_animation_t* instance, sk_size_t* size) - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern void skottie_animation_get_size (skottie_animation_t instance, SKSize* size); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate void skottie_animation_get_size (skottie_animation_t instance, SKSize* size); - } - private static Delegates.skottie_animation_get_size skottie_animation_get_size_delegate; - internal static void skottie_animation_get_size (skottie_animation_t instance, SKSize* size) => - (skottie_animation_get_size_delegate ??= GetSymbol ("skottie_animation_get_size")).Invoke (instance, size); - #endif - - // void skottie_animation_get_version(skottie_animation_t* instance, sk_string_t* version) - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern void skottie_animation_get_version (skottie_animation_t instance, sk_string_t version); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate void skottie_animation_get_version (skottie_animation_t instance, sk_string_t version); - } - private static Delegates.skottie_animation_get_version skottie_animation_get_version_delegate; - internal static void skottie_animation_get_version (skottie_animation_t instance, sk_string_t version) => - (skottie_animation_get_version_delegate ??= GetSymbol ("skottie_animation_get_version")).Invoke (instance, version); - #endif - - // void skottie_animation_keepalive() - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern void skottie_animation_keepalive (); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate void skottie_animation_keepalive (); - } - private static Delegates.skottie_animation_keepalive skottie_animation_keepalive_delegate; - internal static void skottie_animation_keepalive () => - (skottie_animation_keepalive_delegate ??= GetSymbol ("skottie_animation_keepalive")).Invoke (); - #endif - - // skottie_animation_t* skottie_animation_make_from_file(const char* path) - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern skottie_animation_t skottie_animation_make_from_file ([MarshalAs (UnmanagedType.LPStr)] String path); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate skottie_animation_t skottie_animation_make_from_file ([MarshalAs (UnmanagedType.LPStr)] String path); - } - private static Delegates.skottie_animation_make_from_file skottie_animation_make_from_file_delegate; - internal static skottie_animation_t skottie_animation_make_from_file ([MarshalAs (UnmanagedType.LPStr)] String path) => - (skottie_animation_make_from_file_delegate ??= GetSymbol ("skottie_animation_make_from_file")).Invoke (path); - #endif - - // skottie_animation_t* skottie_animation_make_from_stream(sk_stream_t* stream) - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern skottie_animation_t skottie_animation_make_from_stream (sk_stream_t stream); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate skottie_animation_t skottie_animation_make_from_stream (sk_stream_t stream); - } - private static Delegates.skottie_animation_make_from_stream skottie_animation_make_from_stream_delegate; - internal static skottie_animation_t skottie_animation_make_from_stream (sk_stream_t stream) => - (skottie_animation_make_from_stream_delegate ??= GetSymbol ("skottie_animation_make_from_stream")).Invoke (stream); - #endif - - // skottie_animation_t* skottie_animation_make_from_string(const char* data, size_t length) - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern skottie_animation_t skottie_animation_make_from_string ([MarshalAs (UnmanagedType.LPStr)] String data, int length); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate skottie_animation_t skottie_animation_make_from_string ([MarshalAs (UnmanagedType.LPStr)] String data, int length); - } - private static Delegates.skottie_animation_make_from_string skottie_animation_make_from_string_delegate; - internal static skottie_animation_t skottie_animation_make_from_string ([MarshalAs (UnmanagedType.LPStr)] String data, int length) => - (skottie_animation_make_from_string_delegate ??= GetSymbol ("skottie_animation_make_from_string")).Invoke (data, length); - #endif - - // void skottie_animation_ref(skottie_animation_t* instance) - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern void skottie_animation_ref (skottie_animation_t instance); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate void skottie_animation_ref (skottie_animation_t instance); - } - private static Delegates.skottie_animation_ref skottie_animation_ref_delegate; - internal static void skottie_animation_ref (skottie_animation_t instance) => - (skottie_animation_ref_delegate ??= GetSymbol ("skottie_animation_ref")).Invoke (instance); - #endif - - // void skottie_animation_render(skottie_animation_t* instance, sk_canvas_t* canvas, sk_rect_t* dst) - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern void skottie_animation_render (skottie_animation_t instance, sk_canvas_t canvas, SKRect* dst); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate void skottie_animation_render (skottie_animation_t instance, sk_canvas_t canvas, SKRect* dst); - } - private static Delegates.skottie_animation_render skottie_animation_render_delegate; - internal static void skottie_animation_render (skottie_animation_t instance, sk_canvas_t canvas, SKRect* dst) => - (skottie_animation_render_delegate ??= GetSymbol ("skottie_animation_render")).Invoke (instance, canvas, dst); - #endif - - // void skottie_animation_render_with_flags(skottie_animation_t* instance, sk_canvas_t* canvas, sk_rect_t* dst, skottie_animation_renderflags_t flags) - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern void skottie_animation_render_with_flags (skottie_animation_t instance, sk_canvas_t canvas, SKRect* dst, AnimationRenderFlags flags); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate void skottie_animation_render_with_flags (skottie_animation_t instance, sk_canvas_t canvas, SKRect* dst, AnimationRenderFlags flags); - } - private static Delegates.skottie_animation_render_with_flags skottie_animation_render_with_flags_delegate; - internal static void skottie_animation_render_with_flags (skottie_animation_t instance, sk_canvas_t canvas, SKRect* dst, AnimationRenderFlags flags) => - (skottie_animation_render_with_flags_delegate ??= GetSymbol ("skottie_animation_render_with_flags")).Invoke (instance, canvas, dst, flags); - #endif - - // void skottie_animation_seek(skottie_animation_t* instance, float t, sksg_invalidation_controller_t* ic) - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern void skottie_animation_seek (skottie_animation_t instance, Single t, sksg_invalidation_controller_t ic); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate void skottie_animation_seek (skottie_animation_t instance, Single t, sksg_invalidation_controller_t ic); - } - private static Delegates.skottie_animation_seek skottie_animation_seek_delegate; - internal static void skottie_animation_seek (skottie_animation_t instance, Single t, sksg_invalidation_controller_t ic) => - (skottie_animation_seek_delegate ??= GetSymbol ("skottie_animation_seek")).Invoke (instance, t, ic); - #endif - - // void skottie_animation_seek_frame(skottie_animation_t* instance, float t, sksg_invalidation_controller_t* ic) - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern void skottie_animation_seek_frame (skottie_animation_t instance, Single t, sksg_invalidation_controller_t ic); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate void skottie_animation_seek_frame (skottie_animation_t instance, Single t, sksg_invalidation_controller_t ic); - } - private static Delegates.skottie_animation_seek_frame skottie_animation_seek_frame_delegate; - internal static void skottie_animation_seek_frame (skottie_animation_t instance, Single t, sksg_invalidation_controller_t ic) => - (skottie_animation_seek_frame_delegate ??= GetSymbol ("skottie_animation_seek_frame")).Invoke (instance, t, ic); - #endif - - // void skottie_animation_seek_frame_time(skottie_animation_t* instance, float t, sksg_invalidation_controller_t* ic) - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern void skottie_animation_seek_frame_time (skottie_animation_t instance, Single t, sksg_invalidation_controller_t ic); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate void skottie_animation_seek_frame_time (skottie_animation_t instance, Single t, sksg_invalidation_controller_t ic); - } - private static Delegates.skottie_animation_seek_frame_time skottie_animation_seek_frame_time_delegate; - internal static void skottie_animation_seek_frame_time (skottie_animation_t instance, Single t, sksg_invalidation_controller_t ic) => - (skottie_animation_seek_frame_time_delegate ??= GetSymbol ("skottie_animation_seek_frame_time")).Invoke (instance, t, ic); - #endif - - // void skottie_animation_unref(skottie_animation_t* instance) - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern void skottie_animation_unref (skottie_animation_t instance); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate void skottie_animation_unref (skottie_animation_t instance); - } - private static Delegates.skottie_animation_unref skottie_animation_unref_delegate; - internal static void skottie_animation_unref (skottie_animation_t instance) => - (skottie_animation_unref_delegate ??= GetSymbol ("skottie_animation_unref")).Invoke (instance); - #endif - - #endregion - - #region sksg_invalidation_controller.h - - // void sksg_invalidation_controller_begin(sksg_invalidation_controller_t* instance) - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern void sksg_invalidation_controller_begin (sksg_invalidation_controller_t instance); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate void sksg_invalidation_controller_begin (sksg_invalidation_controller_t instance); - } - private static Delegates.sksg_invalidation_controller_begin sksg_invalidation_controller_begin_delegate; - internal static void sksg_invalidation_controller_begin (sksg_invalidation_controller_t instance) => - (sksg_invalidation_controller_begin_delegate ??= GetSymbol ("sksg_invalidation_controller_begin")).Invoke (instance); - #endif - - // void sksg_invalidation_controller_delete(sksg_invalidation_controller_t* instance) - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern void sksg_invalidation_controller_delete (sksg_invalidation_controller_t instance); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate void sksg_invalidation_controller_delete (sksg_invalidation_controller_t instance); - } - private static Delegates.sksg_invalidation_controller_delete sksg_invalidation_controller_delete_delegate; - internal static void sksg_invalidation_controller_delete (sksg_invalidation_controller_t instance) => - (sksg_invalidation_controller_delete_delegate ??= GetSymbol ("sksg_invalidation_controller_delete")).Invoke (instance); - #endif - - // void sksg_invalidation_controller_end(sksg_invalidation_controller_t* instance) - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern void sksg_invalidation_controller_end (sksg_invalidation_controller_t instance); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate void sksg_invalidation_controller_end (sksg_invalidation_controller_t instance); - } - private static Delegates.sksg_invalidation_controller_end sksg_invalidation_controller_end_delegate; - internal static void sksg_invalidation_controller_end (sksg_invalidation_controller_t instance) => - (sksg_invalidation_controller_end_delegate ??= GetSymbol ("sksg_invalidation_controller_end")).Invoke (instance); - #endif - - // void sksg_invalidation_controller_get_bounds(sksg_invalidation_controller_t* instance, sk_rect_t* bounds) - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern void sksg_invalidation_controller_get_bounds (sksg_invalidation_controller_t instance, SKRect* bounds); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate void sksg_invalidation_controller_get_bounds (sksg_invalidation_controller_t instance, SKRect* bounds); - } - private static Delegates.sksg_invalidation_controller_get_bounds sksg_invalidation_controller_get_bounds_delegate; - internal static void sksg_invalidation_controller_get_bounds (sksg_invalidation_controller_t instance, SKRect* bounds) => - (sksg_invalidation_controller_get_bounds_delegate ??= GetSymbol ("sksg_invalidation_controller_get_bounds")).Invoke (instance, bounds); - #endif - - // void sksg_invalidation_controller_inval(sksg_invalidation_controller_t* instance, sk_rect_t* rect, sk_matrix_t* matrix) - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern void sksg_invalidation_controller_inval (sksg_invalidation_controller_t instance, SKRect* rect, SKMatrix* matrix); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate void sksg_invalidation_controller_inval (sksg_invalidation_controller_t instance, SKRect* rect, SKMatrix* matrix); - } - private static Delegates.sksg_invalidation_controller_inval sksg_invalidation_controller_inval_delegate; - internal static void sksg_invalidation_controller_inval (sksg_invalidation_controller_t instance, SKRect* rect, SKMatrix* matrix) => - (sksg_invalidation_controller_inval_delegate ??= GetSymbol ("sksg_invalidation_controller_inval")).Invoke (instance, rect, matrix); - #endif - - // sksg_invalidation_controller_t* sksg_invalidation_controller_new() - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern sksg_invalidation_controller_t sksg_invalidation_controller_new (); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate sksg_invalidation_controller_t sksg_invalidation_controller_new (); - } - private static Delegates.sksg_invalidation_controller_new sksg_invalidation_controller_new_delegate; - internal static sksg_invalidation_controller_t sksg_invalidation_controller_new () => - (sksg_invalidation_controller_new_delegate ??= GetSymbol ("sksg_invalidation_controller_new")).Invoke (); - #endif - - // void sksg_invalidation_controller_reset(sksg_invalidation_controller_t* instance) - #if !USE_DELEGATES - [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] - internal static extern void sksg_invalidation_controller_reset (sksg_invalidation_controller_t instance); - #else - private partial class Delegates { - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - internal delegate void sksg_invalidation_controller_reset (sksg_invalidation_controller_t instance); - } - private static Delegates.sksg_invalidation_controller_reset sksg_invalidation_controller_reset_delegate; - internal static void sksg_invalidation_controller_reset (sksg_invalidation_controller_t instance) => - (sksg_invalidation_controller_reset_delegate ??= GetSymbol ("sksg_invalidation_controller_reset")).Invoke (instance); - #endif - - #endregion - #region sk_compatpaint.h // sk_compatpaint_t* sk_compatpaint_clone(const sk_compatpaint_t* paint) @@ -16682,16 +16322,4 @@ public enum SKWebpEncoderCompression { } } -namespace SkiaSharp.Skottie { - - // skottie_animation_renderflags_t - [Flags] - public enum AnimationRenderFlags { - // SKIP_TOP_LEVEL_ISOLATION = 0x01 - SkipTopLevelIsolation = 1, - // DISABLE_TOP_LEVEL_CLIPPING = 0x02 - DisableTopLevelClipping = 2, - } -} - #endregion diff --git a/binding/SkiaSharp.SceneGraph.Classic/SkiaSharp.SceneGraph.Classic.csproj b/binding/SkiaSharp.SceneGraph.Classic/SkiaSharp.SceneGraph.Classic.csproj new file mode 100644 index 00000000000..037df3466c3 --- /dev/null +++ b/binding/SkiaSharp.SceneGraph.Classic/SkiaSharp.SceneGraph.Classic.csproj @@ -0,0 +1,14 @@ + + + $(ClassicTargetFrameworks) + SkiaSharp.SceneGraph + SkiaSharp.SceneGraph + SkiaSharp.Skottie + + + + + + + + \ No newline at end of file diff --git a/binding/Binding/SceneGraph/InvalidationController.cs b/binding/SkiaSharp.SceneGraph/InvalidationController.cs similarity index 51% rename from binding/Binding/SceneGraph/InvalidationController.cs rename to binding/SkiaSharp.SceneGraph/InvalidationController.cs index b399aafe709..5239602c3fd 100644 --- a/binding/Binding/SceneGraph/InvalidationController.cs +++ b/binding/SkiaSharp.SceneGraph/InvalidationController.cs @@ -8,7 +8,7 @@ namespace SkiaSharp.SceneGraph public unsafe class InvalidationController : SKObject, ISKSkipObjectRegistration { public InvalidationController () - : this (SkiaApi.sksg_invalidation_controller_new (), true) + : this (SceneGraphApi.sksg_invalidation_controller_new (), true) { } @@ -19,36 +19,35 @@ internal InvalidationController (IntPtr handle, bool owns) protected override void DisposeNative () { - SkiaApi.sksg_invalidation_controller_delete (Handle); + SceneGraphApi.sksg_invalidation_controller_delete (Handle); } - public unsafe void Invalidate(SKRect rect, SKMatrix matrix) + public unsafe void Invalidate (SKRect rect, SKMatrix matrix) { - SkiaApi.sksg_invalidation_controller_inval (Handle, &rect, &matrix); + SceneGraphApi.sksg_invalidation_controller_inval (Handle, &rect, &matrix); } - public unsafe SKRect Bounds - { + public unsafe SKRect Bounds { get { SKRect rect; - SkiaApi.sksg_invalidation_controller_get_bounds (Handle, &rect); + SceneGraphApi.sksg_invalidation_controller_get_bounds (Handle, &rect); return rect; } } public unsafe void Begin () { - SkiaApi.sksg_invalidation_controller_begin (Handle); + SceneGraphApi.sksg_invalidation_controller_begin (Handle); } public unsafe void End () { - SkiaApi.sksg_invalidation_controller_end (Handle); + SceneGraphApi.sksg_invalidation_controller_end (Handle); } public unsafe void Reset () { - SkiaApi.sksg_invalidation_controller_reset (Handle); + SceneGraphApi.sksg_invalidation_controller_reset (Handle); } } } diff --git a/binding/SkiaSharp.SceneGraph/Properties/SkiaSharpSceneGraphAssemblyInfo.cs b/binding/SkiaSharp.SceneGraph/Properties/SkiaSharpSceneGraphAssemblyInfo.cs new file mode 100644 index 00000000000..162516bc016 --- /dev/null +++ b/binding/SkiaSharp.SceneGraph/Properties/SkiaSharpSceneGraphAssemblyInfo.cs @@ -0,0 +1,41 @@ +using System; +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; + +[assembly: AssemblyTitle("SkiaSharp.SceneGraph")] +[assembly: AssemblyCompany("Microsoft Corporation")] +[assembly: AssemblyProduct("SkiaSharp")] +[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] +[assembly: NeutralResourcesLanguage("en")] + +#if DEBUG +[assembly: AssemblyConfiguration("Debug")] +#else +[assembly: AssemblyConfiguration("Release")] +#endif + +[assembly: InternalsVisibleTo("SkiaSharp.Tests, PublicKey=" + + "002400000480000094000000060200000024000052534131000400000100010079159977d2d03a" + + "8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c" + + "3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fd" + + "dafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef00" + + "65d016df")] + +[assembly: InternalsVisibleTo("SkiaSharp.Skottie, PublicKey=" + + "002400000480000094000000060200000024000052534131000400000100010079159977d2d03a" + + "8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c" + + "3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fd" + + "dafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef00" + + "65d016df")] + +[assembly: AssemblyMetadata("IsTrimmable", "True")] + +#if __IOS__ || __TVOS__ || __WATCHOS__ || __MACOS__ +// 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. +#pragma warning disable CS0618 // Type or member is obsolete +[assembly: Foundation.LinkerSafe] +#pragma warning restore CS0618 // Type or member is obsolete +#endif diff --git a/binding/SkiaSharp.SceneGraph/SceneGraphApi.cs b/binding/SkiaSharp.SceneGraph/SceneGraphApi.cs new file mode 100644 index 00000000000..53edff97064 --- /dev/null +++ b/binding/SkiaSharp.SceneGraph/SceneGraphApi.cs @@ -0,0 +1,21 @@ +using System; + +namespace SkiaSharp +{ + internal partial class SceneGraphApi + { +#if __IOS__ || __TVOS__ || __WATCHOS__ + private const string SKIA = "@rpath/libSkiaSharp.framework/libSkiaSharp"; +#else + private const string SKIA = "libSkiaSharp"; +#endif + +#if USE_DELEGATES + private static readonly Lazy libSkiaSharpHandle = + new Lazy (() => LibraryLoader.LoadLocalLibrary (SKIA)); + + private static T GetSymbol (string name) where T : Delegate => + LibraryLoader.GetSymbolDelegate (libSkiaSharpHandle.Value, name); +#endif + } +} diff --git a/binding/SkiaSharp.SceneGraph/SceneGraphApi.generated.cs b/binding/SkiaSharp.SceneGraph/SceneGraphApi.generated.cs new file mode 100644 index 00000000000..78696991b79 --- /dev/null +++ b/binding/SkiaSharp.SceneGraph/SceneGraphApi.generated.cs @@ -0,0 +1,227 @@ +using System; +using System.Runtime.InteropServices; + +#region Namespaces + +using SkiaSharp.SceneGraph; + +#endregion + +#region Class declarations + +using gr_backendrendertarget_t = System.IntPtr; +using gr_backendtexture_t = System.IntPtr; +using gr_direct_context_t = System.IntPtr; +using gr_glinterface_t = System.IntPtr; +using gr_recording_context_t = System.IntPtr; +using gr_vk_extensions_t = System.IntPtr; +using gr_vk_memory_allocator_t = System.IntPtr; +using gr_vkinterface_t = System.IntPtr; +using sk_3dview_t = System.IntPtr; +using sk_bitmap_t = System.IntPtr; +using sk_canvas_t = System.IntPtr; +using sk_codec_t = System.IntPtr; +using sk_colorfilter_t = System.IntPtr; +using sk_colorspace_icc_profile_t = System.IntPtr; +using sk_colorspace_t = System.IntPtr; +using sk_colortable_t = System.IntPtr; +using sk_compatpaint_t = System.IntPtr; +using sk_data_t = System.IntPtr; +using sk_document_t = System.IntPtr; +using sk_drawable_t = System.IntPtr; +using sk_font_t = System.IntPtr; +using sk_fontmgr_t = System.IntPtr; +using sk_fontstyle_t = System.IntPtr; +using sk_fontstyleset_t = System.IntPtr; +using sk_image_t = System.IntPtr; +using sk_imagefilter_croprect_t = System.IntPtr; +using sk_imagefilter_t = System.IntPtr; +using sk_manageddrawable_t = System.IntPtr; +using sk_managedtracememorydump_t = System.IntPtr; +using sk_maskfilter_t = System.IntPtr; +using sk_matrix44_t = System.IntPtr; +using sk_nodraw_canvas_t = System.IntPtr; +using sk_nvrefcnt_t = System.IntPtr; +using sk_nway_canvas_t = System.IntPtr; +using sk_opbuilder_t = System.IntPtr; +using sk_overdraw_canvas_t = System.IntPtr; +using sk_paint_t = System.IntPtr; +using sk_path_effect_t = System.IntPtr; +using sk_path_iterator_t = System.IntPtr; +using sk_path_rawiterator_t = System.IntPtr; +using sk_path_t = System.IntPtr; +using sk_pathmeasure_t = System.IntPtr; +using sk_picture_recorder_t = System.IntPtr; +using sk_picture_t = System.IntPtr; +using sk_pixelref_factory_t = System.IntPtr; +using sk_pixmap_t = System.IntPtr; +using sk_refcnt_t = System.IntPtr; +using sk_region_cliperator_t = System.IntPtr; +using sk_region_iterator_t = System.IntPtr; +using sk_region_spanerator_t = System.IntPtr; +using sk_region_t = System.IntPtr; +using sk_rrect_t = System.IntPtr; +using sk_runtimeeffect_t = System.IntPtr; +using sk_runtimeeffect_uniform_t = System.IntPtr; +using sk_shader_t = System.IntPtr; +using sk_stream_asset_t = System.IntPtr; +using sk_stream_filestream_t = System.IntPtr; +using sk_stream_managedstream_t = System.IntPtr; +using sk_stream_memorystream_t = System.IntPtr; +using sk_stream_streamrewindable_t = System.IntPtr; +using sk_stream_t = System.IntPtr; +using sk_string_t = System.IntPtr; +using sk_surface_t = System.IntPtr; +using sk_surfaceprops_t = System.IntPtr; +using sk_svgcanvas_t = System.IntPtr; +using sk_textblob_builder_t = System.IntPtr; +using sk_textblob_t = System.IntPtr; +using sk_tracememorydump_t = System.IntPtr; +using sk_typeface_t = System.IntPtr; +using sk_vertices_t = System.IntPtr; +using sk_wstream_dynamicmemorystream_t = System.IntPtr; +using sk_wstream_filestream_t = System.IntPtr; +using sk_wstream_managedstream_t = System.IntPtr; +using sk_wstream_t = System.IntPtr; +using sk_xmlstreamwriter_t = System.IntPtr; +using sk_xmlwriter_t = System.IntPtr; +using skottie_animation_builder_t = System.IntPtr; +using skottie_animation_t = System.IntPtr; +using skottie_logger_t = System.IntPtr; +using skottie_marker_observer_t = System.IntPtr; +using skottie_property_observer_t = System.IntPtr; +using skottie_resource_provider_t = System.IntPtr; +using sksg_invalidation_controller_t = System.IntPtr; +using vk_device_t = System.IntPtr; +using vk_instance_t = System.IntPtr; +using vk_physical_device_features_2_t = System.IntPtr; +using vk_physical_device_features_t = System.IntPtr; +using vk_physical_device_t = System.IntPtr; +using vk_queue_t = System.IntPtr; + +#endregion + +#region Functions + +namespace SkiaSharp +{ + internal unsafe partial class SceneGraphApi + { + #region sksg_invalidation_controller.h + + // void sksg_invalidation_controller_begin(sksg_invalidation_controller_t* instance) + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern void sksg_invalidation_controller_begin (sksg_invalidation_controller_t instance); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate void sksg_invalidation_controller_begin (sksg_invalidation_controller_t instance); + } + private static Delegates.sksg_invalidation_controller_begin sksg_invalidation_controller_begin_delegate; + internal static void sksg_invalidation_controller_begin (sksg_invalidation_controller_t instance) => + (sksg_invalidation_controller_begin_delegate ??= GetSymbol ("sksg_invalidation_controller_begin")).Invoke (instance); + #endif + + // void sksg_invalidation_controller_delete(sksg_invalidation_controller_t* instance) + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern void sksg_invalidation_controller_delete (sksg_invalidation_controller_t instance); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate void sksg_invalidation_controller_delete (sksg_invalidation_controller_t instance); + } + private static Delegates.sksg_invalidation_controller_delete sksg_invalidation_controller_delete_delegate; + internal static void sksg_invalidation_controller_delete (sksg_invalidation_controller_t instance) => + (sksg_invalidation_controller_delete_delegate ??= GetSymbol ("sksg_invalidation_controller_delete")).Invoke (instance); + #endif + + // void sksg_invalidation_controller_end(sksg_invalidation_controller_t* instance) + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern void sksg_invalidation_controller_end (sksg_invalidation_controller_t instance); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate void sksg_invalidation_controller_end (sksg_invalidation_controller_t instance); + } + private static Delegates.sksg_invalidation_controller_end sksg_invalidation_controller_end_delegate; + internal static void sksg_invalidation_controller_end (sksg_invalidation_controller_t instance) => + (sksg_invalidation_controller_end_delegate ??= GetSymbol ("sksg_invalidation_controller_end")).Invoke (instance); + #endif + + // void sksg_invalidation_controller_get_bounds(sksg_invalidation_controller_t* instance, sk_rect_t* bounds) + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern void sksg_invalidation_controller_get_bounds (sksg_invalidation_controller_t instance, SKRect* bounds); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate void sksg_invalidation_controller_get_bounds (sksg_invalidation_controller_t instance, SKRect* bounds); + } + private static Delegates.sksg_invalidation_controller_get_bounds sksg_invalidation_controller_get_bounds_delegate; + internal static void sksg_invalidation_controller_get_bounds (sksg_invalidation_controller_t instance, SKRect* bounds) => + (sksg_invalidation_controller_get_bounds_delegate ??= GetSymbol ("sksg_invalidation_controller_get_bounds")).Invoke (instance, bounds); + #endif + + // void sksg_invalidation_controller_inval(sksg_invalidation_controller_t* instance, sk_rect_t* rect, sk_matrix_t* matrix) + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern void sksg_invalidation_controller_inval (sksg_invalidation_controller_t instance, SKRect* rect, SKMatrix* matrix); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate void sksg_invalidation_controller_inval (sksg_invalidation_controller_t instance, SKRect* rect, SKMatrix* matrix); + } + private static Delegates.sksg_invalidation_controller_inval sksg_invalidation_controller_inval_delegate; + internal static void sksg_invalidation_controller_inval (sksg_invalidation_controller_t instance, SKRect* rect, SKMatrix* matrix) => + (sksg_invalidation_controller_inval_delegate ??= GetSymbol ("sksg_invalidation_controller_inval")).Invoke (instance, rect, matrix); + #endif + + // sksg_invalidation_controller_t* sksg_invalidation_controller_new() + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern sksg_invalidation_controller_t sksg_invalidation_controller_new (); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate sksg_invalidation_controller_t sksg_invalidation_controller_new (); + } + private static Delegates.sksg_invalidation_controller_new sksg_invalidation_controller_new_delegate; + internal static sksg_invalidation_controller_t sksg_invalidation_controller_new () => + (sksg_invalidation_controller_new_delegate ??= GetSymbol ("sksg_invalidation_controller_new")).Invoke (); + #endif + + // void sksg_invalidation_controller_reset(sksg_invalidation_controller_t* instance) + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern void sksg_invalidation_controller_reset (sksg_invalidation_controller_t instance); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate void sksg_invalidation_controller_reset (sksg_invalidation_controller_t instance); + } + private static Delegates.sksg_invalidation_controller_reset sksg_invalidation_controller_reset_delegate; + internal static void sksg_invalidation_controller_reset (sksg_invalidation_controller_t instance) => + (sksg_invalidation_controller_reset_delegate ??= GetSymbol ("sksg_invalidation_controller_reset")).Invoke (instance); + #endif + + #endregion + + } +} + +#endregion Functions + +#region Delegates + +#endregion + +#region Structs + +#endregion + +#region Enums + +#endregion diff --git a/binding/SkiaSharp.SceneGraph/SkiaSharp.SceneGraph.csproj b/binding/SkiaSharp.SceneGraph/SkiaSharp.SceneGraph.csproj new file mode 100644 index 00000000000..f605ffda846 --- /dev/null +++ b/binding/SkiaSharp.SceneGraph/SkiaSharp.SceneGraph.csproj @@ -0,0 +1,17 @@ + + + $(BasicTargetFrameworks) + SkiaSharp.SceneGraph + SkiaSharp.SceneGraph + SkiaSharp.Skottie + + + $(DefineConstants);USE_DELEGATES + + + + + + + + \ No newline at end of file diff --git a/binding/SkiaSharp.Skottie.Classic/SkiaSharp.Skottie.Classic.csproj b/binding/SkiaSharp.Skottie.Classic/SkiaSharp.Skottie.Classic.csproj new file mode 100644 index 00000000000..e3129e2b3c5 --- /dev/null +++ b/binding/SkiaSharp.Skottie.Classic/SkiaSharp.Skottie.Classic.csproj @@ -0,0 +1,15 @@ + + + $(ClassicTargetFrameworks) + SkiaSharp.Skottie + SkiaSharp.Skottie + SkiaSharp.Skottie + + + + + + + + + \ No newline at end of file diff --git a/binding/Binding/Skottie/Animation.cs b/binding/SkiaSharp.Skottie/Animation.cs similarity index 52% rename from binding/Binding/Skottie/Animation.cs rename to binding/SkiaSharp.Skottie/Animation.cs index 9805e715621..e831627e28a 100644 --- a/binding/Binding/Skottie/Animation.cs +++ b/binding/SkiaSharp.Skottie/Animation.cs @@ -14,17 +14,17 @@ internal Animation (IntPtr handle, bool owns) } void ISKNonVirtualReferenceCounted.ReferenceNative () - => SkiaApi.skottie_animation_ref (Handle); + => SkottieApi.skottie_animation_ref (Handle); void ISKNonVirtualReferenceCounted.UnreferenceNative () - => SkiaApi.skottie_animation_unref (Handle); + => SkottieApi.skottie_animation_unref (Handle); protected override void DisposeNative () - => SkiaApi.skottie_animation_delete (Handle); + => SkottieApi.skottie_animation_delete (Handle); public static bool TryParse (string data, out Animation animation) { - animation = GetObject (SkiaApi.skottie_animation_make_from_string (data, data.Length)); + animation = GetObject (SkottieApi.skottie_animation_make_from_string (data, data.Length)); return animation != null; } @@ -37,57 +37,57 @@ public static bool TryCreate (Stream stream, out Animation animation) public static bool TryCreate (SKStream stream, out Animation animation) { - animation = GetObject (SkiaApi.skottie_animation_make_from_stream (stream.Handle)); + animation = GetObject (SkottieApi.skottie_animation_make_from_stream (stream.Handle)); return animation != null; } public static bool TryCreate (string path, out Animation animation) { - animation = GetObject (SkiaApi.skottie_animation_make_from_file (path)); + animation = GetObject (SkottieApi.skottie_animation_make_from_file (path)); return animation != null; } - public unsafe void Render(SKCanvas canvas, SKRect dst) - => SkiaApi.skottie_animation_render (Handle, canvas.Handle, &dst); + public unsafe void Render (SKCanvas canvas, SKRect dst) + => SkottieApi.skottie_animation_render (Handle, canvas.Handle, &dst); public void Render (SKCanvas canvas, SKRect dst, AnimationRenderFlags flags) - => SkiaApi.skottie_animation_render_with_flags (Handle, canvas.Handle, &dst, flags); + => SkottieApi.skottie_animation_render_with_flags (Handle, canvas.Handle, &dst, flags); public void Seek (double t, InvalidationController ic = null) - => SkiaApi.skottie_animation_seek (Handle, (float)t, ic?.Handle ?? IntPtr.Zero); + => SkottieApi.skottie_animation_seek (Handle, (float)t, ic?.Handle ?? IntPtr.Zero); - public void SeekFrame(double t, InvalidationController ic = null) - => SkiaApi.skottie_animation_seek_frame (Handle, (float)t, ic?.Handle ?? IntPtr.Zero); + public void SeekFrame (double t, InvalidationController ic = null) + => SkottieApi.skottie_animation_seek_frame (Handle, (float)t, ic?.Handle ?? IntPtr.Zero); - public void SeekFrameTime(double t, InvalidationController ic = null) - => SkiaApi.skottie_animation_seek_frame_time (Handle, (float)t, ic?.Handle ?? IntPtr.Zero); + public void SeekFrameTime (double t, InvalidationController ic = null) + => SkottieApi.skottie_animation_seek_frame_time (Handle, (float)t, ic?.Handle ?? IntPtr.Zero); public double Duration - => SkiaApi.skottie_animation_get_duration (Handle); + => SkottieApi.skottie_animation_get_duration (Handle); public double Fps - => SkiaApi.skottie_animation_get_fps (Handle); + => SkottieApi.skottie_animation_get_fps (Handle); public double InPoint - => SkiaApi.skottie_animation_get_in_point (Handle); + => SkottieApi.skottie_animation_get_in_point (Handle); public double OutPoint - => SkiaApi.skottie_animation_get_out_point (Handle); + => SkottieApi.skottie_animation_get_out_point (Handle); public string Version { get { using var str = new SKString (); - SkiaApi.skottie_animation_get_version (Handle, str.Handle); + SkottieApi.skottie_animation_get_version (Handle, str.Handle); - return str.ToString(); + return str.ToString (); } } public unsafe SKSize Size { get { SKSize size; - SkiaApi.skottie_animation_get_size (Handle, &size); + SkottieApi.skottie_animation_get_size (Handle, &size); return size; } } diff --git a/binding/SkiaSharp.Skottie/Properties/SkiaSharpSkottieAssemblyInfo.cs b/binding/SkiaSharp.Skottie/Properties/SkiaSharpSkottieAssemblyInfo.cs new file mode 100644 index 00000000000..d38691c28db --- /dev/null +++ b/binding/SkiaSharp.Skottie/Properties/SkiaSharpSkottieAssemblyInfo.cs @@ -0,0 +1,35 @@ +using System; +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; + +[assembly: AssemblyTitle("SkiaSharp.SceneGraph")] +[assembly: AssemblyDescription("This package adds lottie support to SkiaSharp via skottie.")] +[assembly: AssemblyCompany("Microsoft Corporation")] +[assembly: AssemblyProduct("SkiaSharp")] +[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] +[assembly: NeutralResourcesLanguage("en")] + +#if DEBUG +[assembly: AssemblyConfiguration("Debug")] +#else +[assembly: AssemblyConfiguration("Release")] +#endif + +[assembly: InternalsVisibleTo("SkiaSharp.Tests, PublicKey=" + + "002400000480000094000000060200000024000052534131000400000100010079159977d2d03a" + + "8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c" + + "3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fd" + + "dafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef00" + + "65d016df")] + +[assembly: AssemblyMetadata("IsTrimmable", "True")] + +#if __IOS__ || __TVOS__ || __WATCHOS__ || __MACOS__ +// 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. +#pragma warning disable CS0618 // Type or member is obsolete +[assembly: Foundation.LinkerSafe] +#pragma warning restore CS0618 // Type or member is obsolete +#endif diff --git a/binding/SkiaSharp.Skottie/SkiaSharp.Skottie.csproj b/binding/SkiaSharp.Skottie/SkiaSharp.Skottie.csproj new file mode 100644 index 00000000000..4d56a8ba7af --- /dev/null +++ b/binding/SkiaSharp.Skottie/SkiaSharp.Skottie.csproj @@ -0,0 +1,18 @@ + + + $(BasicTargetFrameworks) + SkiaSharp.Skottie + SkiaSharp.Skottie + SkiaSharp.Skottie + + + $(DefineConstants);USE_DELEGATES + + + + + + + + + \ No newline at end of file diff --git a/binding/SkiaSharp.Skottie/SkottieApi.cs b/binding/SkiaSharp.Skottie/SkottieApi.cs new file mode 100644 index 00000000000..a67bea3abc0 --- /dev/null +++ b/binding/SkiaSharp.Skottie/SkottieApi.cs @@ -0,0 +1,21 @@ +using System; + +namespace SkiaSharp +{ + internal partial class SkottieApi + { +#if __IOS__ || __TVOS__ || __WATCHOS__ + private const string SKIA = "@rpath/libSkiaSharp.framework/libSkiaSharp"; +#else + private const string SKIA = "libSkiaSharp"; +#endif + +#if USE_DELEGATES + private static readonly Lazy libSkiaSharpHandle = + new Lazy (() => LibraryLoader.LoadLocalLibrary (SKIA)); + + private static T GetSymbol (string name) where T : Delegate => + LibraryLoader.GetSymbolDelegate (libSkiaSharpHandle.Value, name); +#endif + } +} diff --git a/binding/SkiaSharp.Skottie/SkottieApi.generated.cs b/binding/SkiaSharp.Skottie/SkottieApi.generated.cs new file mode 100644 index 00000000000..41d0bf78976 --- /dev/null +++ b/binding/SkiaSharp.Skottie/SkottieApi.generated.cs @@ -0,0 +1,393 @@ +using System; +using System.Runtime.InteropServices; + +#region Namespaces + +using SkiaSharp.Skottie; + +#endregion + +#region Class declarations + +using gr_backendrendertarget_t = System.IntPtr; +using gr_backendtexture_t = System.IntPtr; +using gr_direct_context_t = System.IntPtr; +using gr_glinterface_t = System.IntPtr; +using gr_recording_context_t = System.IntPtr; +using gr_vk_extensions_t = System.IntPtr; +using gr_vk_memory_allocator_t = System.IntPtr; +using gr_vkinterface_t = System.IntPtr; +using sk_3dview_t = System.IntPtr; +using sk_bitmap_t = System.IntPtr; +using sk_canvas_t = System.IntPtr; +using sk_codec_t = System.IntPtr; +using sk_colorfilter_t = System.IntPtr; +using sk_colorspace_icc_profile_t = System.IntPtr; +using sk_colorspace_t = System.IntPtr; +using sk_colortable_t = System.IntPtr; +using sk_compatpaint_t = System.IntPtr; +using sk_data_t = System.IntPtr; +using sk_document_t = System.IntPtr; +using sk_drawable_t = System.IntPtr; +using sk_font_t = System.IntPtr; +using sk_fontmgr_t = System.IntPtr; +using sk_fontstyle_t = System.IntPtr; +using sk_fontstyleset_t = System.IntPtr; +using sk_image_t = System.IntPtr; +using sk_imagefilter_croprect_t = System.IntPtr; +using sk_imagefilter_t = System.IntPtr; +using sk_manageddrawable_t = System.IntPtr; +using sk_managedtracememorydump_t = System.IntPtr; +using sk_maskfilter_t = System.IntPtr; +using sk_matrix44_t = System.IntPtr; +using sk_nodraw_canvas_t = System.IntPtr; +using sk_nvrefcnt_t = System.IntPtr; +using sk_nway_canvas_t = System.IntPtr; +using sk_opbuilder_t = System.IntPtr; +using sk_overdraw_canvas_t = System.IntPtr; +using sk_paint_t = System.IntPtr; +using sk_path_effect_t = System.IntPtr; +using sk_path_iterator_t = System.IntPtr; +using sk_path_rawiterator_t = System.IntPtr; +using sk_path_t = System.IntPtr; +using sk_pathmeasure_t = System.IntPtr; +using sk_picture_recorder_t = System.IntPtr; +using sk_picture_t = System.IntPtr; +using sk_pixelref_factory_t = System.IntPtr; +using sk_pixmap_t = System.IntPtr; +using sk_refcnt_t = System.IntPtr; +using sk_region_cliperator_t = System.IntPtr; +using sk_region_iterator_t = System.IntPtr; +using sk_region_spanerator_t = System.IntPtr; +using sk_region_t = System.IntPtr; +using sk_rrect_t = System.IntPtr; +using sk_runtimeeffect_t = System.IntPtr; +using sk_runtimeeffect_uniform_t = System.IntPtr; +using sk_shader_t = System.IntPtr; +using sk_stream_asset_t = System.IntPtr; +using sk_stream_filestream_t = System.IntPtr; +using sk_stream_managedstream_t = System.IntPtr; +using sk_stream_memorystream_t = System.IntPtr; +using sk_stream_streamrewindable_t = System.IntPtr; +using sk_stream_t = System.IntPtr; +using sk_string_t = System.IntPtr; +using sk_surface_t = System.IntPtr; +using sk_surfaceprops_t = System.IntPtr; +using sk_svgcanvas_t = System.IntPtr; +using sk_textblob_builder_t = System.IntPtr; +using sk_textblob_t = System.IntPtr; +using sk_tracememorydump_t = System.IntPtr; +using sk_typeface_t = System.IntPtr; +using sk_vertices_t = System.IntPtr; +using sk_wstream_dynamicmemorystream_t = System.IntPtr; +using sk_wstream_filestream_t = System.IntPtr; +using sk_wstream_managedstream_t = System.IntPtr; +using sk_wstream_t = System.IntPtr; +using sk_xmlstreamwriter_t = System.IntPtr; +using sk_xmlwriter_t = System.IntPtr; +using skottie_animation_builder_t = System.IntPtr; +using skottie_animation_t = System.IntPtr; +using skottie_logger_t = System.IntPtr; +using skottie_marker_observer_t = System.IntPtr; +using skottie_property_observer_t = System.IntPtr; +using skottie_resource_provider_t = System.IntPtr; +using sksg_invalidation_controller_t = System.IntPtr; +using vk_device_t = System.IntPtr; +using vk_instance_t = System.IntPtr; +using vk_physical_device_features_2_t = System.IntPtr; +using vk_physical_device_features_t = System.IntPtr; +using vk_physical_device_t = System.IntPtr; +using vk_queue_t = System.IntPtr; + +#endregion + +#region Functions + +namespace SkiaSharp +{ + internal unsafe partial class SkottieApi + { + #region skottie_animation.h + + // void skottie_animation_delete(skottie_animation_t* instance) + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern void skottie_animation_delete (skottie_animation_t instance); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate void skottie_animation_delete (skottie_animation_t instance); + } + private static Delegates.skottie_animation_delete skottie_animation_delete_delegate; + internal static void skottie_animation_delete (skottie_animation_t instance) => + (skottie_animation_delete_delegate ??= GetSymbol ("skottie_animation_delete")).Invoke (instance); + #endif + + // double skottie_animation_get_duration(skottie_animation_t* instance) + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern Double skottie_animation_get_duration (skottie_animation_t instance); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate Double skottie_animation_get_duration (skottie_animation_t instance); + } + private static Delegates.skottie_animation_get_duration skottie_animation_get_duration_delegate; + internal static Double skottie_animation_get_duration (skottie_animation_t instance) => + (skottie_animation_get_duration_delegate ??= GetSymbol ("skottie_animation_get_duration")).Invoke (instance); + #endif + + // double skottie_animation_get_fps(skottie_animation_t* instance) + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern Double skottie_animation_get_fps (skottie_animation_t instance); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate Double skottie_animation_get_fps (skottie_animation_t instance); + } + private static Delegates.skottie_animation_get_fps skottie_animation_get_fps_delegate; + internal static Double skottie_animation_get_fps (skottie_animation_t instance) => + (skottie_animation_get_fps_delegate ??= GetSymbol ("skottie_animation_get_fps")).Invoke (instance); + #endif + + // double skottie_animation_get_in_point(skottie_animation_t* instance) + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern Double skottie_animation_get_in_point (skottie_animation_t instance); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate Double skottie_animation_get_in_point (skottie_animation_t instance); + } + private static Delegates.skottie_animation_get_in_point skottie_animation_get_in_point_delegate; + internal static Double skottie_animation_get_in_point (skottie_animation_t instance) => + (skottie_animation_get_in_point_delegate ??= GetSymbol ("skottie_animation_get_in_point")).Invoke (instance); + #endif + + // double skottie_animation_get_out_point(skottie_animation_t* instance) + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern Double skottie_animation_get_out_point (skottie_animation_t instance); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate Double skottie_animation_get_out_point (skottie_animation_t instance); + } + private static Delegates.skottie_animation_get_out_point skottie_animation_get_out_point_delegate; + internal static Double skottie_animation_get_out_point (skottie_animation_t instance) => + (skottie_animation_get_out_point_delegate ??= GetSymbol ("skottie_animation_get_out_point")).Invoke (instance); + #endif + + // void skottie_animation_get_size(skottie_animation_t* instance, sk_size_t* size) + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern void skottie_animation_get_size (skottie_animation_t instance, SKSize* size); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate void skottie_animation_get_size (skottie_animation_t instance, SKSize* size); + } + private static Delegates.skottie_animation_get_size skottie_animation_get_size_delegate; + internal static void skottie_animation_get_size (skottie_animation_t instance, SKSize* size) => + (skottie_animation_get_size_delegate ??= GetSymbol ("skottie_animation_get_size")).Invoke (instance, size); + #endif + + // void skottie_animation_get_version(skottie_animation_t* instance, sk_string_t* version) + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern void skottie_animation_get_version (skottie_animation_t instance, sk_string_t version); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate void skottie_animation_get_version (skottie_animation_t instance, sk_string_t version); + } + private static Delegates.skottie_animation_get_version skottie_animation_get_version_delegate; + internal static void skottie_animation_get_version (skottie_animation_t instance, sk_string_t version) => + (skottie_animation_get_version_delegate ??= GetSymbol ("skottie_animation_get_version")).Invoke (instance, version); + #endif + + // void skottie_animation_keepalive() + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern void skottie_animation_keepalive (); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate void skottie_animation_keepalive (); + } + private static Delegates.skottie_animation_keepalive skottie_animation_keepalive_delegate; + internal static void skottie_animation_keepalive () => + (skottie_animation_keepalive_delegate ??= GetSymbol ("skottie_animation_keepalive")).Invoke (); + #endif + + // skottie_animation_t* skottie_animation_make_from_file(const char* path) + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern skottie_animation_t skottie_animation_make_from_file ([MarshalAs (UnmanagedType.LPStr)] String path); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate skottie_animation_t skottie_animation_make_from_file ([MarshalAs (UnmanagedType.LPStr)] String path); + } + private static Delegates.skottie_animation_make_from_file skottie_animation_make_from_file_delegate; + internal static skottie_animation_t skottie_animation_make_from_file ([MarshalAs (UnmanagedType.LPStr)] String path) => + (skottie_animation_make_from_file_delegate ??= GetSymbol ("skottie_animation_make_from_file")).Invoke (path); + #endif + + // skottie_animation_t* skottie_animation_make_from_stream(sk_stream_t* stream) + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern skottie_animation_t skottie_animation_make_from_stream (sk_stream_t stream); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate skottie_animation_t skottie_animation_make_from_stream (sk_stream_t stream); + } + private static Delegates.skottie_animation_make_from_stream skottie_animation_make_from_stream_delegate; + internal static skottie_animation_t skottie_animation_make_from_stream (sk_stream_t stream) => + (skottie_animation_make_from_stream_delegate ??= GetSymbol ("skottie_animation_make_from_stream")).Invoke (stream); + #endif + + // skottie_animation_t* skottie_animation_make_from_string(const char* data, size_t length) + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern skottie_animation_t skottie_animation_make_from_string ([MarshalAs (UnmanagedType.LPStr)] String data, int length); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate skottie_animation_t skottie_animation_make_from_string ([MarshalAs (UnmanagedType.LPStr)] String data, int length); + } + private static Delegates.skottie_animation_make_from_string skottie_animation_make_from_string_delegate; + internal static skottie_animation_t skottie_animation_make_from_string ([MarshalAs (UnmanagedType.LPStr)] String data, int length) => + (skottie_animation_make_from_string_delegate ??= GetSymbol ("skottie_animation_make_from_string")).Invoke (data, length); + #endif + + // void skottie_animation_ref(skottie_animation_t* instance) + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern void skottie_animation_ref (skottie_animation_t instance); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate void skottie_animation_ref (skottie_animation_t instance); + } + private static Delegates.skottie_animation_ref skottie_animation_ref_delegate; + internal static void skottie_animation_ref (skottie_animation_t instance) => + (skottie_animation_ref_delegate ??= GetSymbol ("skottie_animation_ref")).Invoke (instance); + #endif + + // void skottie_animation_render(skottie_animation_t* instance, sk_canvas_t* canvas, sk_rect_t* dst) + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern void skottie_animation_render (skottie_animation_t instance, sk_canvas_t canvas, SKRect* dst); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate void skottie_animation_render (skottie_animation_t instance, sk_canvas_t canvas, SKRect* dst); + } + private static Delegates.skottie_animation_render skottie_animation_render_delegate; + internal static void skottie_animation_render (skottie_animation_t instance, sk_canvas_t canvas, SKRect* dst) => + (skottie_animation_render_delegate ??= GetSymbol ("skottie_animation_render")).Invoke (instance, canvas, dst); + #endif + + // void skottie_animation_render_with_flags(skottie_animation_t* instance, sk_canvas_t* canvas, sk_rect_t* dst, skottie_animation_renderflags_t flags) + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern void skottie_animation_render_with_flags (skottie_animation_t instance, sk_canvas_t canvas, SKRect* dst, AnimationRenderFlags flags); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate void skottie_animation_render_with_flags (skottie_animation_t instance, sk_canvas_t canvas, SKRect* dst, AnimationRenderFlags flags); + } + private static Delegates.skottie_animation_render_with_flags skottie_animation_render_with_flags_delegate; + internal static void skottie_animation_render_with_flags (skottie_animation_t instance, sk_canvas_t canvas, SKRect* dst, AnimationRenderFlags flags) => + (skottie_animation_render_with_flags_delegate ??= GetSymbol ("skottie_animation_render_with_flags")).Invoke (instance, canvas, dst, flags); + #endif + + // void skottie_animation_seek(skottie_animation_t* instance, float t, sksg_invalidation_controller_t* ic) + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern void skottie_animation_seek (skottie_animation_t instance, Single t, sksg_invalidation_controller_t ic); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate void skottie_animation_seek (skottie_animation_t instance, Single t, sksg_invalidation_controller_t ic); + } + private static Delegates.skottie_animation_seek skottie_animation_seek_delegate; + internal static void skottie_animation_seek (skottie_animation_t instance, Single t, sksg_invalidation_controller_t ic) => + (skottie_animation_seek_delegate ??= GetSymbol ("skottie_animation_seek")).Invoke (instance, t, ic); + #endif + + // void skottie_animation_seek_frame(skottie_animation_t* instance, float t, sksg_invalidation_controller_t* ic) + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern void skottie_animation_seek_frame (skottie_animation_t instance, Single t, sksg_invalidation_controller_t ic); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate void skottie_animation_seek_frame (skottie_animation_t instance, Single t, sksg_invalidation_controller_t ic); + } + private static Delegates.skottie_animation_seek_frame skottie_animation_seek_frame_delegate; + internal static void skottie_animation_seek_frame (skottie_animation_t instance, Single t, sksg_invalidation_controller_t ic) => + (skottie_animation_seek_frame_delegate ??= GetSymbol ("skottie_animation_seek_frame")).Invoke (instance, t, ic); + #endif + + // void skottie_animation_seek_frame_time(skottie_animation_t* instance, float t, sksg_invalidation_controller_t* ic) + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern void skottie_animation_seek_frame_time (skottie_animation_t instance, Single t, sksg_invalidation_controller_t ic); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate void skottie_animation_seek_frame_time (skottie_animation_t instance, Single t, sksg_invalidation_controller_t ic); + } + private static Delegates.skottie_animation_seek_frame_time skottie_animation_seek_frame_time_delegate; + internal static void skottie_animation_seek_frame_time (skottie_animation_t instance, Single t, sksg_invalidation_controller_t ic) => + (skottie_animation_seek_frame_time_delegate ??= GetSymbol ("skottie_animation_seek_frame_time")).Invoke (instance, t, ic); + #endif + + // void skottie_animation_unref(skottie_animation_t* instance) + #if !USE_DELEGATES + [DllImport (SKIA, CallingConvention = CallingConvention.Cdecl)] + internal static extern void skottie_animation_unref (skottie_animation_t instance); + #else + private partial class Delegates { + [UnmanagedFunctionPointer (CallingConvention.Cdecl)] + internal delegate void skottie_animation_unref (skottie_animation_t instance); + } + private static Delegates.skottie_animation_unref skottie_animation_unref_delegate; + internal static void skottie_animation_unref (skottie_animation_t instance) => + (skottie_animation_unref_delegate ??= GetSymbol ("skottie_animation_unref")).Invoke (instance); + #endif + + #endregion + + } +} + +#endregion Functions + +#region Delegates + +#endregion + +#region Structs + +#endregion + +#region Enums + +namespace SkiaSharp.Skottie { + + // skottie_animation_renderflags_t + [Flags] + public enum AnimationRenderFlags { + // SKIP_TOP_LEVEL_ISOLATION = 0x01 + SkipTopLevelIsolation = 1, + // DISABLE_TOP_LEVEL_CLIPPING = 0x02 + DisableTopLevelClipping = 2, + } +} + +#endregion diff --git a/binding/libSkiaSharp.SceneGraph.json b/binding/libSkiaSharp.SceneGraph.json new file mode 100644 index 00000000000..f90dc8e63d1 --- /dev/null +++ b/binding/libSkiaSharp.SceneGraph.json @@ -0,0 +1,42 @@ +// configuration for the libSkiaSharp binary +{ + "dllName": "SKIA", + "namespace": "SkiaSharp", + "namespaces": { + "sk_": { + "prefix": "SK", + "exclude": true + }, + "gr_": { + "exclude": true + }, + "vk_": { + "exclude": true + }, + "sksg_": { + "cs": "SceneGraph", + "prefix": "" + }, + "skottie_": { + "exclude": true + } + }, + "className": "SceneGraphApi", + "includeDirs": [ + "." + ], + "headers": { + "include/c": [ "sk_*", "gr_*", "skottie*", "sksg_*" ], + "include/xamarin": [ "sk_*" ] + }, + "source": { + "src/c": [ "sk_*", "gr_*", "skottie*", "sksg_*" ], + "src/xamarin": [ "sk_*" ] + }, + "mappings": { + "types": { + }, + "functions": { + } + } +} \ No newline at end of file diff --git a/binding/libSkiaSharp.Skottie.json b/binding/libSkiaSharp.Skottie.json new file mode 100644 index 00000000000..e887c28e656 --- /dev/null +++ b/binding/libSkiaSharp.Skottie.json @@ -0,0 +1,58 @@ +// configuration for the libSkiaSharp binary +{ + "dllName": "SKIA", + "namespace": "SkiaSharp", + "namespaces": { + "sk_": { + "prefix": "SK", + "exclude": true + }, + "gr_": { + "exclude": true + }, + "vk_": { + "exclude": true + }, + "sksg_": { + "exclude": true + }, + "skottie_": { + "cs": "Skottie", + "prefix": "" + } + }, + "className": "SkottieApi", + "includeDirs": [ + "." + ], + "headers": { + "include/c": [ "sk_*", "gr_*", "skottie*", "sksg_*" ], + "include/xamarin": [ "sk_*" ] + }, + "source": { + "src/c": [ "sk_*", "gr_*", "skottie*", "sksg_*" ], + "src/xamarin": [ "sk_*" ] + }, + "mappings": { + "types": { + "skottie_animation_renderflags_t": { + "cs": "AnimationRenderFlags", + "flags": true + } + }, + "functions": { + "skottie_animation_make_from_string": { + "parameters": { + "0": "[MarshalAs (UnmanagedType.LPStr)] String", + "1": "int" + + } + }, + "skottie_animation_make_from_file": { + "parameters": { + "0": "[MarshalAs (UnmanagedType.LPStr)] String" + } + } + } + } +} \ No newline at end of file diff --git a/binding/libSkiaSharp.json b/binding/libSkiaSharp.json index 35bb6f4302c..cf4cc509887 100644 --- a/binding/libSkiaSharp.json +++ b/binding/libSkiaSharp.json @@ -13,12 +13,10 @@ "prefix": "GR" }, "sksg_": { - "cs": "SceneGraph", - "prefix": "" + "exclude": true }, "skottie_": { - "cs": "Skottie", - "prefix": "" + "exclude": true } }, "className": "SkiaApi", @@ -374,10 +372,6 @@ "sk_lattice_t": { "cs": "SKLatticeInternal", "internal": true - }, - "skottie_animation_renderflags_t": { - "cs": "AnimationRenderFlags", - "flags": true } }, "functions": { @@ -456,18 +450,6 @@ "parameters": { "1": "[MarshalAs (UnmanagedType.LPStr)] String" } - }, - "skottie_animation_make_from_string": { - "parameters": { - "0": "[MarshalAs (UnmanagedType.LPStr)] String", - "1": "int" - - } - }, - "skottie_animation_make_from_file": { - "parameters": { - "0": "[MarshalAs (UnmanagedType.LPStr)] String" - } } } } diff --git a/build.cake b/build.cake index ca311c7693f..95d3198196a 100644 --- a/build.cake +++ b/build.cake @@ -109,6 +109,7 @@ var TRACKED_NUGETS = new Dictionary { { "HarfBuzzSharp.NativeAssets.WebAssembly", new Version (1, 0, 0) }, { "HarfBuzzSharp.NativeAssets.Win32", new Version (1, 0, 0) }, { "SkiaSharp.HarfBuzz", new Version (1, 60, 0) }, + { "SkiaSharp.Skottie", new Version (1, 60, 0) }, { "SkiaSharp.Vulkan.SharpVk", new Version (1, 60, 0) }, }; diff --git a/cake/samples.cake b/cake/samples.cake index 9da2ea9f823..41885d4e999 100644 --- a/cake/samples.cake +++ b/cake/samples.cake @@ -124,7 +124,7 @@ void CreateSamplesDirectory(DirectoryPath samplesDirPath, DirectoryPath outputDi new XAttribute("Version", version), })); } else { - Warning($"Unable to find version information for package '{packagingGroup}'."); + Warning($"Unable to find version information for project '{packagingGroup}'."); } } else { Debug($"Removing the file '{relFilePath}' for project '{rel}'."); diff --git a/docs b/docs index d9a9879d680..1b6a018f403 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit d9a9879d680cbc50ab8c30114b51919b6e00ad4d +Subproject commit 1b6a018f40336f28c460e98e3bff86510cd92af3 diff --git a/nuget/SkiaSharp.Skottie.nuspec b/nuget/SkiaSharp.Skottie.nuspec new file mode 100644 index 00000000000..fbece249b0a --- /dev/null +++ b/nuget/SkiaSharp.Skottie.nuspec @@ -0,0 +1,99 @@ + + + + + + SkiaSharp.Skottie + SkiaSharp.Skottie + 1.0.0 + +SkiaSharp Skottie provides a Lottie implementation using the SkiaSharp library. + + +SkiaSharp Skottie provides a Lottie implementation using the SkiaSharp library. + + +Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release notes. + + https://go.microsoft.com/fwlink/?linkid=868515 + https://go.microsoft.com/fwlink/?linkid=2130524 + xamarin graphics ios android linux windows uwp tvos watchos macos tizen cross-platform skiasharp + + + https://go.microsoft.com/fwlink/?linkid=868514 + Microsoft + Microsoft + true + © Microsoft Corporation. All rights reserved. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/Gallery/Desktop/SkiaSharpSample.sln b/samples/Gallery/Desktop/SkiaSharpSample.sln index bce2d50ca31..f73d0d9dbad 100644 --- a/samples/Gallery/Desktop/SkiaSharpSample.sln +++ b/samples/Gallery/Desktop/SkiaSharpSample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29027.242 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32515.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}" EndProject @@ -15,6 +15,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Desktop.Com EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.WindowsForms", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.WindowsForms\SkiaSharp.Views.WindowsForms.csproj", "{6F752AA5-4676-4092-A219-CBA38F1B7954}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph", "..\..\..\binding\SkiaSharp.SceneGraph\SkiaSharp.SceneGraph.csproj", "{8D7B03C8-4A24-498E-9B71-DE5EC2F3BD55}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie", "..\..\..\binding\SkiaSharp.Skottie\SkiaSharp.Skottie.csproj", "{4827DE25-DB28-44FD-A03C-35315AE5DED3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -97,6 +101,30 @@ Global {6F752AA5-4676-4092-A219-CBA38F1B7954}.Release|x64.Build.0 = Release|Any CPU {6F752AA5-4676-4092-A219-CBA38F1B7954}.Release|x86.ActiveCfg = Release|Any CPU {6F752AA5-4676-4092-A219-CBA38F1B7954}.Release|x86.Build.0 = Release|Any CPU + {8D7B03C8-4A24-498E-9B71-DE5EC2F3BD55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8D7B03C8-4A24-498E-9B71-DE5EC2F3BD55}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8D7B03C8-4A24-498E-9B71-DE5EC2F3BD55}.Debug|x64.ActiveCfg = Debug|Any CPU + {8D7B03C8-4A24-498E-9B71-DE5EC2F3BD55}.Debug|x64.Build.0 = Debug|Any CPU + {8D7B03C8-4A24-498E-9B71-DE5EC2F3BD55}.Debug|x86.ActiveCfg = Debug|Any CPU + {8D7B03C8-4A24-498E-9B71-DE5EC2F3BD55}.Debug|x86.Build.0 = Debug|Any CPU + {8D7B03C8-4A24-498E-9B71-DE5EC2F3BD55}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8D7B03C8-4A24-498E-9B71-DE5EC2F3BD55}.Release|Any CPU.Build.0 = Release|Any CPU + {8D7B03C8-4A24-498E-9B71-DE5EC2F3BD55}.Release|x64.ActiveCfg = Release|Any CPU + {8D7B03C8-4A24-498E-9B71-DE5EC2F3BD55}.Release|x64.Build.0 = Release|Any CPU + {8D7B03C8-4A24-498E-9B71-DE5EC2F3BD55}.Release|x86.ActiveCfg = Release|Any CPU + {8D7B03C8-4A24-498E-9B71-DE5EC2F3BD55}.Release|x86.Build.0 = Release|Any CPU + {4827DE25-DB28-44FD-A03C-35315AE5DED3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4827DE25-DB28-44FD-A03C-35315AE5DED3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4827DE25-DB28-44FD-A03C-35315AE5DED3}.Debug|x64.ActiveCfg = Debug|Any CPU + {4827DE25-DB28-44FD-A03C-35315AE5DED3}.Debug|x64.Build.0 = Debug|Any CPU + {4827DE25-DB28-44FD-A03C-35315AE5DED3}.Debug|x86.ActiveCfg = Debug|Any CPU + {4827DE25-DB28-44FD-A03C-35315AE5DED3}.Debug|x86.Build.0 = Debug|Any CPU + {4827DE25-DB28-44FD-A03C-35315AE5DED3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4827DE25-DB28-44FD-A03C-35315AE5DED3}.Release|Any CPU.Build.0 = Release|Any CPU + {4827DE25-DB28-44FD-A03C-35315AE5DED3}.Release|x64.ActiveCfg = Release|Any CPU + {4827DE25-DB28-44FD-A03C-35315AE5DED3}.Release|x64.Build.0 = Release|Any CPU + {4827DE25-DB28-44FD-A03C-35315AE5DED3}.Release|x86.ActiveCfg = Release|Any CPU + {4827DE25-DB28-44FD-A03C-35315AE5DED3}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj index 90612c642d0..f17547f375a 100644 --- a/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj @@ -95,6 +95,14 @@ {2ae5d8c5-eac6-4515-89f2-a4994b41c925} HarfBuzzSharp + + {8d7b03c8-4a24-498e-9b71-de5ec2f3bd55} + SkiaSharp.SceneGraph + + + {4827de25-db28-44fd-a03c-35315ae5ded3} + SkiaSharp.Skottie + {eb1bbdcc-fb07-40d5-8b9e-0079e2c2f2df} SkiaSharp diff --git a/samples/Gallery/UWP/SkiaSharpSample.sln b/samples/Gallery/UWP/SkiaSharpSample.sln index c02dd94fe9e..7304b434db5 100644 --- a/samples/Gallery/UWP/SkiaSharpSample.sln +++ b/samples/Gallery/UWP/SkiaSharpSample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30126.178 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32515.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.UWP", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.UWP\SkiaSharp.Views.UWP.csproj", "{8BB20362-91A2-4206-944D-634070EAC6F3}" EndProject @@ -17,6 +17,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\..\..\b EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{7B8EC15C-BC89-4A83-8FFB-15F19EBCA66C}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph.Classic", "..\..\..\binding\SkiaSharp.SceneGraph.Classic\SkiaSharp.SceneGraph.Classic.csproj", "{4B6BE6C3-6034-44BB-BDDB-9207BD417205}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie.Classic", "..\..\..\binding\SkiaSharp.Skottie.Classic\SkiaSharp.Skottie.Classic.csproj", "{C223484F-26FD-4016-8FF5-F58EFF623046}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -181,6 +185,46 @@ Global {7B8EC15C-BC89-4A83-8FFB-15F19EBCA66C}.Release|x64.Build.0 = Release|Any CPU {7B8EC15C-BC89-4A83-8FFB-15F19EBCA66C}.Release|x86.ActiveCfg = Release|Any CPU {7B8EC15C-BC89-4A83-8FFB-15F19EBCA66C}.Release|x86.Build.0 = Release|Any CPU + {4B6BE6C3-6034-44BB-BDDB-9207BD417205}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4B6BE6C3-6034-44BB-BDDB-9207BD417205}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4B6BE6C3-6034-44BB-BDDB-9207BD417205}.Debug|ARM.ActiveCfg = Debug|Any CPU + {4B6BE6C3-6034-44BB-BDDB-9207BD417205}.Debug|ARM.Build.0 = Debug|Any CPU + {4B6BE6C3-6034-44BB-BDDB-9207BD417205}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {4B6BE6C3-6034-44BB-BDDB-9207BD417205}.Debug|ARM64.Build.0 = Debug|Any CPU + {4B6BE6C3-6034-44BB-BDDB-9207BD417205}.Debug|x64.ActiveCfg = Debug|Any CPU + {4B6BE6C3-6034-44BB-BDDB-9207BD417205}.Debug|x64.Build.0 = Debug|Any CPU + {4B6BE6C3-6034-44BB-BDDB-9207BD417205}.Debug|x86.ActiveCfg = Debug|Any CPU + {4B6BE6C3-6034-44BB-BDDB-9207BD417205}.Debug|x86.Build.0 = Debug|Any CPU + {4B6BE6C3-6034-44BB-BDDB-9207BD417205}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4B6BE6C3-6034-44BB-BDDB-9207BD417205}.Release|Any CPU.Build.0 = Release|Any CPU + {4B6BE6C3-6034-44BB-BDDB-9207BD417205}.Release|ARM.ActiveCfg = Release|Any CPU + {4B6BE6C3-6034-44BB-BDDB-9207BD417205}.Release|ARM.Build.0 = Release|Any CPU + {4B6BE6C3-6034-44BB-BDDB-9207BD417205}.Release|ARM64.ActiveCfg = Release|Any CPU + {4B6BE6C3-6034-44BB-BDDB-9207BD417205}.Release|ARM64.Build.0 = Release|Any CPU + {4B6BE6C3-6034-44BB-BDDB-9207BD417205}.Release|x64.ActiveCfg = Release|Any CPU + {4B6BE6C3-6034-44BB-BDDB-9207BD417205}.Release|x64.Build.0 = Release|Any CPU + {4B6BE6C3-6034-44BB-BDDB-9207BD417205}.Release|x86.ActiveCfg = Release|Any CPU + {4B6BE6C3-6034-44BB-BDDB-9207BD417205}.Release|x86.Build.0 = Release|Any CPU + {C223484F-26FD-4016-8FF5-F58EFF623046}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C223484F-26FD-4016-8FF5-F58EFF623046}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C223484F-26FD-4016-8FF5-F58EFF623046}.Debug|ARM.ActiveCfg = Debug|Any CPU + {C223484F-26FD-4016-8FF5-F58EFF623046}.Debug|ARM.Build.0 = Debug|Any CPU + {C223484F-26FD-4016-8FF5-F58EFF623046}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {C223484F-26FD-4016-8FF5-F58EFF623046}.Debug|ARM64.Build.0 = Debug|Any CPU + {C223484F-26FD-4016-8FF5-F58EFF623046}.Debug|x64.ActiveCfg = Debug|Any CPU + {C223484F-26FD-4016-8FF5-F58EFF623046}.Debug|x64.Build.0 = Debug|Any CPU + {C223484F-26FD-4016-8FF5-F58EFF623046}.Debug|x86.ActiveCfg = Debug|Any CPU + {C223484F-26FD-4016-8FF5-F58EFF623046}.Debug|x86.Build.0 = Debug|Any CPU + {C223484F-26FD-4016-8FF5-F58EFF623046}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C223484F-26FD-4016-8FF5-F58EFF623046}.Release|Any CPU.Build.0 = Release|Any CPU + {C223484F-26FD-4016-8FF5-F58EFF623046}.Release|ARM.ActiveCfg = Release|Any CPU + {C223484F-26FD-4016-8FF5-F58EFF623046}.Release|ARM.Build.0 = Release|Any CPU + {C223484F-26FD-4016-8FF5-F58EFF623046}.Release|ARM64.ActiveCfg = Release|Any CPU + {C223484F-26FD-4016-8FF5-F58EFF623046}.Release|ARM64.Build.0 = Release|Any CPU + {C223484F-26FD-4016-8FF5-F58EFF623046}.Release|x64.ActiveCfg = Release|Any CPU + {C223484F-26FD-4016-8FF5-F58EFF623046}.Release|x64.Build.0 = Release|Any CPU + {C223484F-26FD-4016-8FF5-F58EFF623046}.Release|x86.ActiveCfg = Release|Any CPU + {C223484F-26FD-4016-8FF5-F58EFF623046}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj index 3ce0ac8d4e3..b0d73142181 100644 --- a/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj @@ -126,6 +126,14 @@ {bab615aa-956e-4079-b260-dd7b1f52ec7d} SkiaSharp.Classic + + {71c2fb6d-a0ce-4190-a4ff-4ec11161125e} + SkiaSharp.SceneGraph.Classic + + + {bbc2a850-4e09-4ae8-9455-1b9f2b0ba3ff} + SkiaSharp.Skottie.Classic + {233220cc-f0f3-4c44-9736-ed2cfc363fd3} SkiaSharp.HarfBuzz diff --git a/samples/Gallery/Uno.WinUI/SkiaSharpSample.Linux.sln b/samples/Gallery/Uno.WinUI/SkiaSharpSample.Linux.sln index ffa87d2c96d..db26fb59818 100644 --- a/samples/Gallery/Uno.WinUI/SkiaSharpSample.Linux.sln +++ b/samples/Gallery/Uno.WinUI/SkiaSharpSample.Linux.sln @@ -16,6 +16,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\..\..\b EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharpSample.WinUI.Shared", "SkiaSharpSample.WinUI.Shared\SkiaSharpSample.WinUI.Shared.shproj", "{6279C845-92F8-4333-AB99-3D213163593C}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph", "..\..\..\binding\SkiaSharp.SceneGraph\SkiaSharp.SceneGraph.csproj", "{8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie", "..\..\..\binding\SkiaSharp.Skottie\SkiaSharp.Skottie.csproj", "{AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -202,6 +206,62 @@ Global {C04D3F70-6E1D-459F-A00B-1E8E647F09C2}.Release|x64.Build.0 = Release|Any CPU {C04D3F70-6E1D-459F-A00B-1E8E647F09C2}.Release|x86.ActiveCfg = Release|Any CPU {C04D3F70-6E1D-459F-A00B-1E8E647F09C2}.Release|x86.Build.0 = Release|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Debug|ARM.ActiveCfg = Debug|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Debug|ARM.Build.0 = Debug|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Debug|ARM64.Build.0 = Debug|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Debug|iPhone.Build.0 = Debug|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Debug|x64.ActiveCfg = Debug|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Debug|x64.Build.0 = Debug|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Debug|x86.ActiveCfg = Debug|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Debug|x86.Build.0 = Debug|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Release|Any CPU.Build.0 = Release|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Release|ARM.ActiveCfg = Release|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Release|ARM.Build.0 = Release|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Release|ARM64.ActiveCfg = Release|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Release|ARM64.Build.0 = Release|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Release|iPhone.ActiveCfg = Release|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Release|iPhone.Build.0 = Release|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Release|x64.ActiveCfg = Release|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Release|x64.Build.0 = Release|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Release|x86.ActiveCfg = Release|Any CPU + {8E5E4DF1-81A6-4CB3-B95A-FFF3DCEC599B}.Release|x86.Build.0 = Release|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Debug|ARM.ActiveCfg = Debug|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Debug|ARM.Build.0 = Debug|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Debug|ARM64.Build.0 = Debug|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Debug|iPhone.Build.0 = Debug|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Debug|x64.ActiveCfg = Debug|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Debug|x64.Build.0 = Debug|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Debug|x86.ActiveCfg = Debug|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Debug|x86.Build.0 = Debug|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Release|Any CPU.Build.0 = Release|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Release|ARM.ActiveCfg = Release|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Release|ARM.Build.0 = Release|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Release|ARM64.ActiveCfg = Release|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Release|ARM64.Build.0 = Release|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Release|iPhone.ActiveCfg = Release|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Release|iPhone.Build.0 = Release|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Release|x64.ActiveCfg = Release|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Release|x64.Build.0 = Release|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Release|x86.ActiveCfg = Release|Any CPU + {AC6D0AB2-3C4C-4308-A7B2-AF3747E6A376}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/Gallery/Uno.WinUI/SkiaSharpSample.Mac.sln b/samples/Gallery/Uno.WinUI/SkiaSharpSample.Mac.sln index cfad1f964b3..91faa845460 100644 --- a/samples/Gallery/Uno.WinUI/SkiaSharpSample.Mac.sln +++ b/samples/Gallery/Uno.WinUI/SkiaSharpSample.Mac.sln @@ -16,6 +16,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\..\..\b EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharpSample.WinUI.Shared", "SkiaSharpSample.WinUI.Shared\SkiaSharpSample.WinUI.Shared.shproj", "{6279C845-92F8-4333-AB99-3D213163593C}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph", "..\..\..\binding\SkiaSharp.SceneGraph\SkiaSharp.SceneGraph.csproj", "{797FB65C-E658-438C-BFFD-3E937D566100}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie", "..\..\..\binding\SkiaSharp.Skottie\SkiaSharp.Skottie.csproj", "{03B4653F-6975-4B0E-96A7-DAD70FF22957}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -202,6 +206,62 @@ Global {C04D3F70-6E1D-459F-A00B-1E8E647F09C2}.Release|x64.Build.0 = Release|Any CPU {C04D3F70-6E1D-459F-A00B-1E8E647F09C2}.Release|x86.ActiveCfg = Release|Any CPU {C04D3F70-6E1D-459F-A00B-1E8E647F09C2}.Release|x86.Build.0 = Release|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Debug|Any CPU.Build.0 = Debug|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Debug|ARM.ActiveCfg = Debug|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Debug|ARM.Build.0 = Debug|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Debug|ARM64.Build.0 = Debug|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Debug|iPhone.Build.0 = Debug|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Debug|x64.ActiveCfg = Debug|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Debug|x64.Build.0 = Debug|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Debug|x86.ActiveCfg = Debug|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Debug|x86.Build.0 = Debug|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Release|Any CPU.ActiveCfg = Release|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Release|Any CPU.Build.0 = Release|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Release|ARM.ActiveCfg = Release|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Release|ARM.Build.0 = Release|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Release|ARM64.ActiveCfg = Release|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Release|ARM64.Build.0 = Release|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Release|iPhone.ActiveCfg = Release|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Release|iPhone.Build.0 = Release|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Release|x64.ActiveCfg = Release|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Release|x64.Build.0 = Release|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Release|x86.ActiveCfg = Release|Any CPU + {797FB65C-E658-438C-BFFD-3E937D566100}.Release|x86.Build.0 = Release|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Debug|Any CPU.Build.0 = Debug|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Debug|ARM.ActiveCfg = Debug|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Debug|ARM.Build.0 = Debug|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Debug|ARM64.Build.0 = Debug|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Debug|iPhone.Build.0 = Debug|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Debug|x64.ActiveCfg = Debug|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Debug|x64.Build.0 = Debug|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Debug|x86.ActiveCfg = Debug|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Debug|x86.Build.0 = Debug|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Release|Any CPU.ActiveCfg = Release|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Release|Any CPU.Build.0 = Release|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Release|ARM.ActiveCfg = Release|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Release|ARM.Build.0 = Release|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Release|ARM64.ActiveCfg = Release|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Release|ARM64.Build.0 = Release|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Release|iPhone.ActiveCfg = Release|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Release|iPhone.Build.0 = Release|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Release|x64.ActiveCfg = Release|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Release|x64.Build.0 = Release|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Release|x86.ActiveCfg = Release|Any CPU + {03B4653F-6975-4B0E-96A7-DAD70FF22957}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/Gallery/Uno.WinUI/SkiaSharpSample.Mobile/SkiaSharpSample.Mobile.csproj b/samples/Gallery/Uno.WinUI/SkiaSharpSample.Mobile/SkiaSharpSample.Mobile.csproj index 4b25a74a05a..d7327735200 100644 --- a/samples/Gallery/Uno.WinUI/SkiaSharpSample.Mobile/SkiaSharpSample.Mobile.csproj +++ b/samples/Gallery/Uno.WinUI/SkiaSharpSample.Mobile/SkiaSharpSample.Mobile.csproj @@ -42,6 +42,8 @@ + + @@ -61,7 +63,7 @@ iOS\Resources\content-font.ttf - + diff --git a/samples/Gallery/Uno.WinUI/SkiaSharpSample.Skia.Gtk/SkiaSharpSample.Skia.Gtk.csproj b/samples/Gallery/Uno.WinUI/SkiaSharpSample.Skia.Gtk/SkiaSharpSample.Skia.Gtk.csproj index a059d81d74e..227d06bbe67 100644 --- a/samples/Gallery/Uno.WinUI/SkiaSharpSample.Skia.Gtk/SkiaSharpSample.Skia.Gtk.csproj +++ b/samples/Gallery/Uno.WinUI/SkiaSharpSample.Skia.Gtk/SkiaSharpSample.Skia.Gtk.csproj @@ -1,4 +1,4 @@ - + WinExe Exe @@ -25,6 +25,8 @@ + + diff --git a/samples/Gallery/Uno.WinUI/SkiaSharpSample.Skia.WPF/SkiaSharpSample.Skia.WPF.csproj b/samples/Gallery/Uno.WinUI/SkiaSharpSample.Skia.WPF/SkiaSharpSample.Skia.WPF.csproj index ccf4b0b9cd9..da7f551f3a9 100644 --- a/samples/Gallery/Uno.WinUI/SkiaSharpSample.Skia.WPF/SkiaSharpSample.Skia.WPF.csproj +++ b/samples/Gallery/Uno.WinUI/SkiaSharpSample.Skia.WPF/SkiaSharpSample.Skia.WPF.csproj @@ -19,6 +19,8 @@ + + diff --git a/samples/Gallery/Uno.WinUI/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj b/samples/Gallery/Uno.WinUI/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj index 304a72fba3b..dbe09b71358 100644 --- a/samples/Gallery/Uno.WinUI/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj +++ b/samples/Gallery/Uno.WinUI/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj @@ -55,6 +55,8 @@ + + diff --git a/samples/Gallery/Uno.WinUI/SkiaSharpSample.sln b/samples/Gallery/Uno.WinUI/SkiaSharpSample.sln index 33af205c5b7..3597d088d21 100644 --- a/samples/Gallery/Uno.WinUI/SkiaSharpSample.sln +++ b/samples/Gallery/Uno.WinUI/SkiaSharpSample.sln @@ -26,6 +26,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\..\..\b EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharpSample.WinUI.Shared", "SkiaSharpSample.WinUI.Shared\SkiaSharpSample.WinUI.Shared.shproj", "{6279C845-92F8-4333-AB99-3D213163593C}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph", "..\..\..\binding\SkiaSharp.SceneGraph\SkiaSharp.SceneGraph.csproj", "{ECF52E6D-7AA3-4F70-923E-7812280C979C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie", "..\..\..\binding\SkiaSharp.Skottie\SkiaSharp.Skottie.csproj", "{6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -378,6 +382,62 @@ Global {C04D3F70-6E1D-459F-A00B-1E8E647F09C2}.Release|x64.Build.0 = Release|Any CPU {C04D3F70-6E1D-459F-A00B-1E8E647F09C2}.Release|x86.ActiveCfg = Release|Any CPU {C04D3F70-6E1D-459F-A00B-1E8E647F09C2}.Release|x86.Build.0 = Release|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Debug|ARM.ActiveCfg = Debug|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Debug|ARM.Build.0 = Debug|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Debug|ARM64.Build.0 = Debug|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Debug|iPhone.Build.0 = Debug|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Debug|x64.ActiveCfg = Debug|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Debug|x64.Build.0 = Debug|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Debug|x86.ActiveCfg = Debug|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Debug|x86.Build.0 = Debug|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Release|Any CPU.Build.0 = Release|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Release|ARM.ActiveCfg = Release|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Release|ARM.Build.0 = Release|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Release|ARM64.ActiveCfg = Release|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Release|ARM64.Build.0 = Release|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Release|iPhone.ActiveCfg = Release|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Release|iPhone.Build.0 = Release|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Release|x64.ActiveCfg = Release|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Release|x64.Build.0 = Release|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Release|x86.ActiveCfg = Release|Any CPU + {ECF52E6D-7AA3-4F70-923E-7812280C979C}.Release|x86.Build.0 = Release|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Debug|ARM.ActiveCfg = Debug|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Debug|ARM.Build.0 = Debug|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Debug|ARM64.Build.0 = Debug|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Debug|iPhone.Build.0 = Debug|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Debug|x64.ActiveCfg = Debug|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Debug|x64.Build.0 = Debug|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Debug|x86.ActiveCfg = Debug|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Debug|x86.Build.0 = Debug|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Release|Any CPU.Build.0 = Release|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Release|ARM.ActiveCfg = Release|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Release|ARM.Build.0 = Release|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Release|ARM64.ActiveCfg = Release|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Release|ARM64.Build.0 = Release|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Release|iPhone.ActiveCfg = Release|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Release|iPhone.Build.0 = Release|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Release|x64.ActiveCfg = Release|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Release|x64.Build.0 = Release|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Release|x86.ActiveCfg = Release|Any CPU + {6BFFCE29-9688-4BF7-A0C2-B63FF6E4EB3F}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/Gallery/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj b/samples/Gallery/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj index a2fd4c35e1c..34ea75659b5 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj @@ -75,6 +75,14 @@ {C737DC80-5B71-4B26-A2DC-DA30421788B0} SkiaSharp.Classic + + {74a027d9-90f4-487e-afc5-6aa96f3406a9} + SkiaSharp.SceneGraph.Classic + + + {63f51f9f-e67d-47e3-9861-99a91927c166} + SkiaSharp.Skottie.Classic + {731bccc9-4e61-4410-aaf2-897d7e1e88ad} SkiaSharp.HarfBuzz diff --git a/samples/Gallery/Uno/SkiaSharpSample.Gtk/SkiaSharpSample.Gtk.csproj b/samples/Gallery/Uno/SkiaSharpSample.Gtk/SkiaSharpSample.Gtk.csproj index 664d737d304..112e0cee732 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.Gtk/SkiaSharpSample.Gtk.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.Gtk/SkiaSharpSample.Gtk.csproj @@ -26,6 +26,8 @@ + + diff --git a/samples/Gallery/Uno/SkiaSharpSample.Linux.sln b/samples/Gallery/Uno/SkiaSharpSample.Linux.sln index b5f9ceb7a80..b89e45c318f 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.Linux.sln +++ b/samples/Gallery/Uno/SkiaSharpSample.Linux.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30229.9 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32515.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharpSample.Shared", "SkiaSharpSample.Shared\SkiaSharpSample.Shared.shproj", "{6279C845-92F8-4333-AB99-3D213163593C}" EndProject @@ -17,11 +17,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\.. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\..\..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj", "{42F0E7DE-941E-4348-ACDE-7DCF61D05E6B}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph", "..\..\..\binding\SkiaSharp.SceneGraph\SkiaSharp.SceneGraph.csproj", "{DA475B74-72B7-4CA3-8F5B-CBBB68489ACB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie", "..\..\..\binding\SkiaSharp.Skottie\SkiaSharp.Skottie.csproj", "{6FBC2164-3AAE-4978-88B6-A0779C62A22D}" +EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13 - SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{9726301d-8a93-4a06-88df-92ba01cf80ad}*SharedItemsImports = 5 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU @@ -51,6 +51,14 @@ Global {42F0E7DE-941E-4348-ACDE-7DCF61D05E6B}.Debug|Any CPU.Build.0 = Debug|Any CPU {42F0E7DE-941E-4348-ACDE-7DCF61D05E6B}.Release|Any CPU.ActiveCfg = Release|Any CPU {42F0E7DE-941E-4348-ACDE-7DCF61D05E6B}.Release|Any CPU.Build.0 = Release|Any CPU + {DA475B74-72B7-4CA3-8F5B-CBBB68489ACB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DA475B74-72B7-4CA3-8F5B-CBBB68489ACB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DA475B74-72B7-4CA3-8F5B-CBBB68489ACB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DA475B74-72B7-4CA3-8F5B-CBBB68489ACB}.Release|Any CPU.Build.0 = Release|Any CPU + {6FBC2164-3AAE-4978-88B6-A0779C62A22D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6FBC2164-3AAE-4978-88B6-A0779C62A22D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6FBC2164-3AAE-4978-88B6-A0779C62A22D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6FBC2164-3AAE-4978-88B6-A0779C62A22D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -58,4 +66,8 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {ADE449F3-A69B-4F43-BB03-E0C3C98E83BB} EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13 + SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{9726301d-8a93-4a06-88df-92ba01cf80ad}*SharedItemsImports = 5 + EndGlobalSection EndGlobal diff --git a/samples/Gallery/Uno/SkiaSharpSample.Mac.sln b/samples/Gallery/Uno/SkiaSharpSample.Mac.sln index ca85dff83b9..7487a33a3a2 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.Mac.sln +++ b/samples/Gallery/Uno/SkiaSharpSample.Mac.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30229.9 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32515.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharpSample.Shared", "SkiaSharpSample.Shared\SkiaSharpSample.Shared.shproj", "{6279C845-92F8-4333-AB99-3D213163593C}" EndProject @@ -29,13 +29,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\.. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.Skia", "..\..\..\source\SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.Skia\SkiaSharp.Views.Uno.Skia.csproj", "{48DE405A-9432-40D1-AE6E-86CE2E0CE89A}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph.Classic", "..\..\..\binding\SkiaSharp.SceneGraph.Classic\SkiaSharp.SceneGraph.Classic.csproj", "{74A027D9-90F4-487E-AFC5-6AA96F3406A9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie.Classic", "..\..\..\binding\SkiaSharp.Skottie.Classic\SkiaSharp.Skottie.Classic.csproj", "{63F51F9F-E67D-47E3-9861-99A91927C166}" +EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{2a19c71c-d1ab-4c70-b821-6a7c7c4abe66}*SharedItemsImports = 4 - SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13 - SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{8b8db39e-c0ff-4edc-83a6-0b6a4ab763ee}*SharedItemsImports = 4 - SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{b3a30dc3-0e2d-4f46-97c5-fdc6ab8062e6}*SharedItemsImports = 4 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|iPhone = Debug|iPhone @@ -195,6 +193,30 @@ Global {48DE405A-9432-40D1-AE6E-86CE2E0CE89A}.Release|iPhone.Build.0 = Release|Any CPU {48DE405A-9432-40D1-AE6E-86CE2E0CE89A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {48DE405A-9432-40D1-AE6E-86CE2E0CE89A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {74A027D9-90F4-487E-AFC5-6AA96F3406A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {74A027D9-90F4-487E-AFC5-6AA96F3406A9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {74A027D9-90F4-487E-AFC5-6AA96F3406A9}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {74A027D9-90F4-487E-AFC5-6AA96F3406A9}.Debug|iPhone.Build.0 = Debug|Any CPU + {74A027D9-90F4-487E-AFC5-6AA96F3406A9}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {74A027D9-90F4-487E-AFC5-6AA96F3406A9}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {74A027D9-90F4-487E-AFC5-6AA96F3406A9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {74A027D9-90F4-487E-AFC5-6AA96F3406A9}.Release|Any CPU.Build.0 = Release|Any CPU + {74A027D9-90F4-487E-AFC5-6AA96F3406A9}.Release|iPhone.ActiveCfg = Release|Any CPU + {74A027D9-90F4-487E-AFC5-6AA96F3406A9}.Release|iPhone.Build.0 = Release|Any CPU + {74A027D9-90F4-487E-AFC5-6AA96F3406A9}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {74A027D9-90F4-487E-AFC5-6AA96F3406A9}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {63F51F9F-E67D-47E3-9861-99A91927C166}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {63F51F9F-E67D-47E3-9861-99A91927C166}.Debug|Any CPU.Build.0 = Debug|Any CPU + {63F51F9F-E67D-47E3-9861-99A91927C166}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {63F51F9F-E67D-47E3-9861-99A91927C166}.Debug|iPhone.Build.0 = Debug|Any CPU + {63F51F9F-E67D-47E3-9861-99A91927C166}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {63F51F9F-E67D-47E3-9861-99A91927C166}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {63F51F9F-E67D-47E3-9861-99A91927C166}.Release|Any CPU.ActiveCfg = Release|Any CPU + {63F51F9F-E67D-47E3-9861-99A91927C166}.Release|Any CPU.Build.0 = Release|Any CPU + {63F51F9F-E67D-47E3-9861-99A91927C166}.Release|iPhone.ActiveCfg = Release|Any CPU + {63F51F9F-E67D-47E3-9861-99A91927C166}.Release|iPhone.Build.0 = Release|Any CPU + {63F51F9F-E67D-47E3-9861-99A91927C166}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {63F51F9F-E67D-47E3-9861-99A91927C166}.Release|iPhoneSimulator.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -202,4 +224,10 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {ADE449F3-A69B-4F43-BB03-E0C3C98E83BB} EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{2a19c71c-d1ab-4c70-b821-6a7c7c4abe66}*SharedItemsImports = 4 + SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13 + SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{8b8db39e-c0ff-4edc-83a6-0b6a4ab763ee}*SharedItemsImports = 4 + SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{b3a30dc3-0e2d-4f46-97c5-fdc6ab8062e6}*SharedItemsImports = 4 + EndGlobalSection EndGlobal diff --git a/samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj b/samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj index 7061a57a3da..6d409779a39 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj @@ -129,6 +129,14 @@ {bab615aa-956e-4079-b260-dd7b1f52ec7d} SkiaSharp.Classic + + {74a027d9-90f4-487e-afc5-6aa96f3406a9} + SkiaSharp.SceneGraph.Classic + + + {63f51f9f-e67d-47e3-9861-99a91927c166} + SkiaSharp.Skottie.Classic + {233220cc-f0f3-4c44-9736-ed2cfc363fd3} SkiaSharp.HarfBuzz diff --git a/samples/Gallery/Uno/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj b/samples/Gallery/Uno/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj index 520a716e878..c261bc31970 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj @@ -19,6 +19,8 @@ + + diff --git a/samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj b/samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj index 3cc8ef799db..af189cce35b 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj @@ -35,6 +35,8 @@ + + diff --git a/samples/Gallery/Uno/SkiaSharpSample.Windows.sln b/samples/Gallery/Uno/SkiaSharpSample.Windows.sln index 5d78031224d..cd16ad7c11e 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.Windows.sln +++ b/samples/Gallery/Uno/SkiaSharpSample.Windows.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30229.9 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32515.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharpSample.Shared", "SkiaSharpSample.Shared\SkiaSharpSample.Shared.shproj", "{6279C845-92F8-4333-AB99-3D213163593C}" EndProject @@ -35,15 +35,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpSample.WPF", "Skia EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpSample.WPF.Host", "SkiaSharpSample.WPF.Host\SkiaSharpSample.WPF.Host.csproj", "{524B2E63-2C4A-4723-B5C0-1E9DA2768A85}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph", "..\..\..\binding\SkiaSharp.SceneGraph\SkiaSharp.SceneGraph.csproj", "{74B5990D-A176-4A2A-AFDF-B750F0C5D722}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph.Classic", "..\..\..\binding\SkiaSharp.SceneGraph.Classic\SkiaSharp.SceneGraph.Classic.csproj", "{9349846D-AD08-42D4-A1B6-1C3BBD7A6914}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie", "..\..\..\binding\SkiaSharp.Skottie\SkiaSharp.Skottie.csproj", "{8477CFCD-6B85-4E01-B8D4-EFC246B77D1B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie.Classic", "..\..\..\binding\SkiaSharp.Skottie.Classic\SkiaSharp.Skottie.Classic.csproj", "{A7DE35DA-E363-4019-9AF6-7B2923A62D08}" +EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13 - SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{76800b1b-ac93-4451-aa67-9b5f867dad35}*SharedItemsImports = 5 - SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{8b8db39e-c0ff-4edc-83a6-0b6a4ab763ee}*SharedItemsImports = 4 - SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{9726301d-8a93-4a06-88df-92ba01cf80ad}*SharedItemsImports = 5 - SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{ae39aa1d-32c8-482b-9395-ad5493c98f7e}*SharedItemsImports = 4 - SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{d4e1bd04-f37b-432e-89d7-98595fba6d11}*SharedItemsImports = 5 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|ARM = Debug|ARM @@ -377,6 +377,86 @@ Global {524B2E63-2C4A-4723-B5C0-1E9DA2768A85}.Release|x64.Build.0 = Release|Any CPU {524B2E63-2C4A-4723-B5C0-1E9DA2768A85}.Release|x86.ActiveCfg = Release|Any CPU {524B2E63-2C4A-4723-B5C0-1E9DA2768A85}.Release|x86.Build.0 = Release|Any CPU + {74B5990D-A176-4A2A-AFDF-B750F0C5D722}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {74B5990D-A176-4A2A-AFDF-B750F0C5D722}.Debug|Any CPU.Build.0 = Debug|Any CPU + {74B5990D-A176-4A2A-AFDF-B750F0C5D722}.Debug|ARM.ActiveCfg = Debug|Any CPU + {74B5990D-A176-4A2A-AFDF-B750F0C5D722}.Debug|ARM.Build.0 = Debug|Any CPU + {74B5990D-A176-4A2A-AFDF-B750F0C5D722}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {74B5990D-A176-4A2A-AFDF-B750F0C5D722}.Debug|ARM64.Build.0 = Debug|Any CPU + {74B5990D-A176-4A2A-AFDF-B750F0C5D722}.Debug|x64.ActiveCfg = Debug|Any CPU + {74B5990D-A176-4A2A-AFDF-B750F0C5D722}.Debug|x64.Build.0 = Debug|Any CPU + {74B5990D-A176-4A2A-AFDF-B750F0C5D722}.Debug|x86.ActiveCfg = Debug|Any CPU + {74B5990D-A176-4A2A-AFDF-B750F0C5D722}.Debug|x86.Build.0 = Debug|Any CPU + {74B5990D-A176-4A2A-AFDF-B750F0C5D722}.Release|Any CPU.ActiveCfg = Release|Any CPU + {74B5990D-A176-4A2A-AFDF-B750F0C5D722}.Release|Any CPU.Build.0 = Release|Any CPU + {74B5990D-A176-4A2A-AFDF-B750F0C5D722}.Release|ARM.ActiveCfg = Release|Any CPU + {74B5990D-A176-4A2A-AFDF-B750F0C5D722}.Release|ARM.Build.0 = Release|Any CPU + {74B5990D-A176-4A2A-AFDF-B750F0C5D722}.Release|ARM64.ActiveCfg = Release|Any CPU + {74B5990D-A176-4A2A-AFDF-B750F0C5D722}.Release|ARM64.Build.0 = Release|Any CPU + {74B5990D-A176-4A2A-AFDF-B750F0C5D722}.Release|x64.ActiveCfg = Release|Any CPU + {74B5990D-A176-4A2A-AFDF-B750F0C5D722}.Release|x64.Build.0 = Release|Any CPU + {74B5990D-A176-4A2A-AFDF-B750F0C5D722}.Release|x86.ActiveCfg = Release|Any CPU + {74B5990D-A176-4A2A-AFDF-B750F0C5D722}.Release|x86.Build.0 = Release|Any CPU + {9349846D-AD08-42D4-A1B6-1C3BBD7A6914}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9349846D-AD08-42D4-A1B6-1C3BBD7A6914}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9349846D-AD08-42D4-A1B6-1C3BBD7A6914}.Debug|ARM.ActiveCfg = Debug|Any CPU + {9349846D-AD08-42D4-A1B6-1C3BBD7A6914}.Debug|ARM.Build.0 = Debug|Any CPU + {9349846D-AD08-42D4-A1B6-1C3BBD7A6914}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {9349846D-AD08-42D4-A1B6-1C3BBD7A6914}.Debug|ARM64.Build.0 = Debug|Any CPU + {9349846D-AD08-42D4-A1B6-1C3BBD7A6914}.Debug|x64.ActiveCfg = Debug|Any CPU + {9349846D-AD08-42D4-A1B6-1C3BBD7A6914}.Debug|x64.Build.0 = Debug|Any CPU + {9349846D-AD08-42D4-A1B6-1C3BBD7A6914}.Debug|x86.ActiveCfg = Debug|Any CPU + {9349846D-AD08-42D4-A1B6-1C3BBD7A6914}.Debug|x86.Build.0 = Debug|Any CPU + {9349846D-AD08-42D4-A1B6-1C3BBD7A6914}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9349846D-AD08-42D4-A1B6-1C3BBD7A6914}.Release|Any CPU.Build.0 = Release|Any CPU + {9349846D-AD08-42D4-A1B6-1C3BBD7A6914}.Release|ARM.ActiveCfg = Release|Any CPU + {9349846D-AD08-42D4-A1B6-1C3BBD7A6914}.Release|ARM.Build.0 = Release|Any CPU + {9349846D-AD08-42D4-A1B6-1C3BBD7A6914}.Release|ARM64.ActiveCfg = Release|Any CPU + {9349846D-AD08-42D4-A1B6-1C3BBD7A6914}.Release|ARM64.Build.0 = Release|Any CPU + {9349846D-AD08-42D4-A1B6-1C3BBD7A6914}.Release|x64.ActiveCfg = Release|Any CPU + {9349846D-AD08-42D4-A1B6-1C3BBD7A6914}.Release|x64.Build.0 = Release|Any CPU + {9349846D-AD08-42D4-A1B6-1C3BBD7A6914}.Release|x86.ActiveCfg = Release|Any CPU + {9349846D-AD08-42D4-A1B6-1C3BBD7A6914}.Release|x86.Build.0 = Release|Any CPU + {8477CFCD-6B85-4E01-B8D4-EFC246B77D1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8477CFCD-6B85-4E01-B8D4-EFC246B77D1B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8477CFCD-6B85-4E01-B8D4-EFC246B77D1B}.Debug|ARM.ActiveCfg = Debug|Any CPU + {8477CFCD-6B85-4E01-B8D4-EFC246B77D1B}.Debug|ARM.Build.0 = Debug|Any CPU + {8477CFCD-6B85-4E01-B8D4-EFC246B77D1B}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {8477CFCD-6B85-4E01-B8D4-EFC246B77D1B}.Debug|ARM64.Build.0 = Debug|Any CPU + {8477CFCD-6B85-4E01-B8D4-EFC246B77D1B}.Debug|x64.ActiveCfg = Debug|Any CPU + {8477CFCD-6B85-4E01-B8D4-EFC246B77D1B}.Debug|x64.Build.0 = Debug|Any CPU + {8477CFCD-6B85-4E01-B8D4-EFC246B77D1B}.Debug|x86.ActiveCfg = Debug|Any CPU + {8477CFCD-6B85-4E01-B8D4-EFC246B77D1B}.Debug|x86.Build.0 = Debug|Any CPU + {8477CFCD-6B85-4E01-B8D4-EFC246B77D1B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8477CFCD-6B85-4E01-B8D4-EFC246B77D1B}.Release|Any CPU.Build.0 = Release|Any CPU + {8477CFCD-6B85-4E01-B8D4-EFC246B77D1B}.Release|ARM.ActiveCfg = Release|Any CPU + {8477CFCD-6B85-4E01-B8D4-EFC246B77D1B}.Release|ARM.Build.0 = Release|Any CPU + {8477CFCD-6B85-4E01-B8D4-EFC246B77D1B}.Release|ARM64.ActiveCfg = Release|Any CPU + {8477CFCD-6B85-4E01-B8D4-EFC246B77D1B}.Release|ARM64.Build.0 = Release|Any CPU + {8477CFCD-6B85-4E01-B8D4-EFC246B77D1B}.Release|x64.ActiveCfg = Release|Any CPU + {8477CFCD-6B85-4E01-B8D4-EFC246B77D1B}.Release|x64.Build.0 = Release|Any CPU + {8477CFCD-6B85-4E01-B8D4-EFC246B77D1B}.Release|x86.ActiveCfg = Release|Any CPU + {8477CFCD-6B85-4E01-B8D4-EFC246B77D1B}.Release|x86.Build.0 = Release|Any CPU + {A7DE35DA-E363-4019-9AF6-7B2923A62D08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A7DE35DA-E363-4019-9AF6-7B2923A62D08}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A7DE35DA-E363-4019-9AF6-7B2923A62D08}.Debug|ARM.ActiveCfg = Debug|Any CPU + {A7DE35DA-E363-4019-9AF6-7B2923A62D08}.Debug|ARM.Build.0 = Debug|Any CPU + {A7DE35DA-E363-4019-9AF6-7B2923A62D08}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {A7DE35DA-E363-4019-9AF6-7B2923A62D08}.Debug|ARM64.Build.0 = Debug|Any CPU + {A7DE35DA-E363-4019-9AF6-7B2923A62D08}.Debug|x64.ActiveCfg = Debug|Any CPU + {A7DE35DA-E363-4019-9AF6-7B2923A62D08}.Debug|x64.Build.0 = Debug|Any CPU + {A7DE35DA-E363-4019-9AF6-7B2923A62D08}.Debug|x86.ActiveCfg = Debug|Any CPU + {A7DE35DA-E363-4019-9AF6-7B2923A62D08}.Debug|x86.Build.0 = Debug|Any CPU + {A7DE35DA-E363-4019-9AF6-7B2923A62D08}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A7DE35DA-E363-4019-9AF6-7B2923A62D08}.Release|Any CPU.Build.0 = Release|Any CPU + {A7DE35DA-E363-4019-9AF6-7B2923A62D08}.Release|ARM.ActiveCfg = Release|Any CPU + {A7DE35DA-E363-4019-9AF6-7B2923A62D08}.Release|ARM.Build.0 = Release|Any CPU + {A7DE35DA-E363-4019-9AF6-7B2923A62D08}.Release|ARM64.ActiveCfg = Release|Any CPU + {A7DE35DA-E363-4019-9AF6-7B2923A62D08}.Release|ARM64.Build.0 = Release|Any CPU + {A7DE35DA-E363-4019-9AF6-7B2923A62D08}.Release|x64.ActiveCfg = Release|Any CPU + {A7DE35DA-E363-4019-9AF6-7B2923A62D08}.Release|x64.Build.0 = Release|Any CPU + {A7DE35DA-E363-4019-9AF6-7B2923A62D08}.Release|x86.ActiveCfg = Release|Any CPU + {A7DE35DA-E363-4019-9AF6-7B2923A62D08}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -384,4 +464,12 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {ADE449F3-A69B-4F43-BB03-E0C3C98E83BB} EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13 + SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{76800b1b-ac93-4451-aa67-9b5f867dad35}*SharedItemsImports = 5 + SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{8b8db39e-c0ff-4edc-83a6-0b6a4ab763ee}*SharedItemsImports = 4 + SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{9726301d-8a93-4a06-88df-92ba01cf80ad}*SharedItemsImports = 5 + SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{ae39aa1d-32c8-482b-9395-ad5493c98f7e}*SharedItemsImports = 4 + SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{d4e1bd04-f37b-432e-89d7-98595fba6d11}*SharedItemsImports = 5 + EndGlobalSection EndGlobal diff --git a/samples/Gallery/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj b/samples/Gallery/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj index f3545ea6ef2..0b4f2751b82 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj @@ -118,6 +118,14 @@ {6A678CFB-21A7-4E81-8909-FD72ABBFD408} SkiaSharp.Classic + + {74a027d9-90f4-487e-afc5-6aa96f3406a9} + SkiaSharp.SceneGraph.Classic + + + {63f51f9f-e67d-47e3-9861-99a91927c166} + SkiaSharp.Skottie.Classic + {731bccc9-4e61-4410-aaf2-897d7e1e88ad} SkiaSharp.HarfBuzz diff --git a/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj index 63c8964ddca..4cc9b216773 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj @@ -59,6 +59,14 @@ {816e7ec5-91af-4bce-acb7-52725ee475b8} SkiaSharp.Classic + + {74a027d9-90f4-487e-afc5-6aa96f3406a9} + SkiaSharp.SceneGraph.Classic + + + {63f51f9f-e67d-47e3-9861-99a91927c166} + SkiaSharp.Skottie.Classic + {731bccc9-4e61-4410-aaf2-897d7e1e88ad} SkiaSharp.HarfBuzz diff --git a/samples/Gallery/Uno/SkiaSharpSample.sln b/samples/Gallery/Uno/SkiaSharpSample.sln index 399aa494160..00bd23352d5 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.sln +++ b/samples/Gallery/Uno/SkiaSharpSample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30229.9 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32515.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharpSample.Shared", "SkiaSharpSample.Shared\SkiaSharpSample.Shared.shproj", "{6279C845-92F8-4333-AB99-3D213163593C}" EndProject @@ -45,17 +45,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpSample.WPF.Host", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.Skia", "..\..\..\source\SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.Skia\SkiaSharp.Views.Uno.Skia.csproj", "{F5700942-5F78-4D24-828E-07C46A0F2C8A}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph", "..\..\..\binding\SkiaSharp.SceneGraph\SkiaSharp.SceneGraph.csproj", "{064B80CF-9D7B-4495-9A6E-4C52807F938F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph.Classic", "..\..\..\binding\SkiaSharp.SceneGraph.Classic\SkiaSharp.SceneGraph.Classic.csproj", "{8A5F0949-BD38-43FD-A0E9-58725D8CF300}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie", "..\..\..\binding\SkiaSharp.Skottie\SkiaSharp.Skottie.csproj", "{3182137A-8E09-4C45-9DAC-2A987B987C9F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie.Classic", "..\..\..\binding\SkiaSharp.Skottie.Classic\SkiaSharp.Skottie.Classic.csproj", "{467DABA6-8AAA-4C0F-9B65-626CF134B80B}" +EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{2a19c71c-d1ab-4c70-b821-6a7c7c4abe66}*SharedItemsImports = 4 - SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{3ca0ee89-76c2-4a8e-96d6-9c5f2b05905e}*SharedItemsImports = 5 - SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13 - SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{8b8db39e-c0ff-4edc-83a6-0b6a4ab763ee}*SharedItemsImports = 4 - SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{9726301d-8a93-4a06-88df-92ba01cf80ad}*SharedItemsImports = 5 - SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{ae39aa1d-32c8-482b-9395-ad5493c98f7e}*SharedItemsImports = 4 - SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{b3a30dc3-0e2d-4f46-97c5-fdc6ab8062e6}*SharedItemsImports = 4 - SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{ff61f844-f706-4503-8074-dcd0bfa57125}*SharedItemsImports = 5 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|ARM = Debug|ARM @@ -670,6 +668,118 @@ Global {F5700942-5F78-4D24-828E-07C46A0F2C8A}.Release|x64.Build.0 = Release|Any CPU {F5700942-5F78-4D24-828E-07C46A0F2C8A}.Release|x86.ActiveCfg = Release|Any CPU {F5700942-5F78-4D24-828E-07C46A0F2C8A}.Release|x86.Build.0 = Release|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Debug|ARM.ActiveCfg = Debug|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Debug|ARM.Build.0 = Debug|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Debug|ARM64.Build.0 = Debug|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Debug|iPhone.Build.0 = Debug|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Debug|x64.ActiveCfg = Debug|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Debug|x64.Build.0 = Debug|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Debug|x86.ActiveCfg = Debug|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Debug|x86.Build.0 = Debug|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Release|Any CPU.Build.0 = Release|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Release|ARM.ActiveCfg = Release|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Release|ARM.Build.0 = Release|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Release|ARM64.ActiveCfg = Release|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Release|ARM64.Build.0 = Release|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Release|iPhone.ActiveCfg = Release|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Release|iPhone.Build.0 = Release|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Release|x64.ActiveCfg = Release|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Release|x64.Build.0 = Release|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Release|x86.ActiveCfg = Release|Any CPU + {064B80CF-9D7B-4495-9A6E-4C52807F938F}.Release|x86.Build.0 = Release|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Debug|ARM.ActiveCfg = Debug|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Debug|ARM.Build.0 = Debug|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Debug|ARM64.Build.0 = Debug|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Debug|iPhone.Build.0 = Debug|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Debug|x64.ActiveCfg = Debug|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Debug|x64.Build.0 = Debug|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Debug|x86.ActiveCfg = Debug|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Debug|x86.Build.0 = Debug|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Release|Any CPU.Build.0 = Release|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Release|ARM.ActiveCfg = Release|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Release|ARM.Build.0 = Release|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Release|ARM64.ActiveCfg = Release|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Release|ARM64.Build.0 = Release|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Release|iPhone.ActiveCfg = Release|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Release|iPhone.Build.0 = Release|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Release|x64.ActiveCfg = Release|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Release|x64.Build.0 = Release|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Release|x86.ActiveCfg = Release|Any CPU + {8A5F0949-BD38-43FD-A0E9-58725D8CF300}.Release|x86.Build.0 = Release|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Debug|ARM.ActiveCfg = Debug|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Debug|ARM.Build.0 = Debug|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Debug|ARM64.Build.0 = Debug|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Debug|iPhone.Build.0 = Debug|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Debug|x64.ActiveCfg = Debug|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Debug|x64.Build.0 = Debug|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Debug|x86.ActiveCfg = Debug|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Debug|x86.Build.0 = Debug|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Release|Any CPU.Build.0 = Release|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Release|ARM.ActiveCfg = Release|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Release|ARM.Build.0 = Release|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Release|ARM64.ActiveCfg = Release|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Release|ARM64.Build.0 = Release|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Release|iPhone.ActiveCfg = Release|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Release|iPhone.Build.0 = Release|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Release|x64.ActiveCfg = Release|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Release|x64.Build.0 = Release|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Release|x86.ActiveCfg = Release|Any CPU + {3182137A-8E09-4C45-9DAC-2A987B987C9F}.Release|x86.Build.0 = Release|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Debug|ARM.ActiveCfg = Debug|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Debug|ARM.Build.0 = Debug|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Debug|ARM64.Build.0 = Debug|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Debug|iPhone.Build.0 = Debug|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Debug|x64.ActiveCfg = Debug|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Debug|x64.Build.0 = Debug|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Debug|x86.ActiveCfg = Debug|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Debug|x86.Build.0 = Debug|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Release|Any CPU.Build.0 = Release|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Release|ARM.ActiveCfg = Release|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Release|ARM.Build.0 = Release|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Release|ARM64.ActiveCfg = Release|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Release|ARM64.Build.0 = Release|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Release|iPhone.ActiveCfg = Release|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Release|iPhone.Build.0 = Release|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Release|x64.ActiveCfg = Release|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Release|x64.Build.0 = Release|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Release|x86.ActiveCfg = Release|Any CPU + {467DABA6-8AAA-4C0F-9B65-626CF134B80B}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -677,4 +787,14 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {ADE449F3-A69B-4F43-BB03-E0C3C98E83BB} EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{2a19c71c-d1ab-4c70-b821-6a7c7c4abe66}*SharedItemsImports = 4 + SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{3ca0ee89-76c2-4a8e-96d6-9c5f2b05905e}*SharedItemsImports = 5 + SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13 + SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{8b8db39e-c0ff-4edc-83a6-0b6a4ab763ee}*SharedItemsImports = 4 + SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{9726301d-8a93-4a06-88df-92ba01cf80ad}*SharedItemsImports = 5 + SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{ae39aa1d-32c8-482b-9395-ad5493c98f7e}*SharedItemsImports = 4 + SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{b3a30dc3-0e2d-4f46-97c5-fdc6ab8062e6}*SharedItemsImports = 4 + SkiaSharpSample.Shared\SkiaSharpSample.Shared.projitems*{ff61f844-f706-4503-8074-dcd0bfa57125}*SharedItemsImports = 5 + EndGlobalSection EndGlobal diff --git a/samples/Gallery/WPF/SkiaSharpSample.sln b/samples/Gallery/WPF/SkiaSharpSample.sln index c6d80bfb4d3..4f8ad1973fb 100644 --- a/samples/Gallery/WPF/SkiaSharpSample.sln +++ b/samples/Gallery/WPF/SkiaSharpSample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29027.242 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32515.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample", "SkiaSharpSample\SkiaSharpSample.csproj", "{74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}" EndProject @@ -17,6 +17,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Desktop.Com EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.WindowsForms", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.WindowsForms\SkiaSharp.Views.WindowsForms.csproj", "{A1334727-7CC6-43AC-A617-EEFE2174F454}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph", "..\..\..\binding\SkiaSharp.SceneGraph\SkiaSharp.SceneGraph.csproj", "{BA751723-BBC5-4B13-9194-1E0DD7CEB489}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie", "..\..\..\binding\SkiaSharp.Skottie\SkiaSharp.Skottie.csproj", "{FA4BBFB9-DC9E-48FF-8632-B3383C0689E5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -27,6 +31,18 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}.Debug|x64.ActiveCfg = Debug|x64 + {74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}.Debug|x64.Build.0 = Debug|x64 + {74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}.Debug|x86.ActiveCfg = Debug|x86 + {74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}.Debug|x86.Build.0 = Debug|x86 + {74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}.Release|Any CPU.Build.0 = Release|Any CPU + {74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}.Release|x64.ActiveCfg = Release|x64 + {74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}.Release|x64.Build.0 = Release|x64 + {74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}.Release|x86.ActiveCfg = Release|x86 + {74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}.Release|x86.Build.0 = Release|x86 {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.Build.0 = Debug|Any CPU {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -63,18 +79,6 @@ Global {2AE5D8C5-EAC6-4515-89F2-A4994B41C925}.Release|x64.Build.0 = Release|Any CPU {2AE5D8C5-EAC6-4515-89F2-A4994B41C925}.Release|x86.ActiveCfg = Release|Any CPU {2AE5D8C5-EAC6-4515-89F2-A4994B41C925}.Release|x86.Build.0 = Release|Any CPU - {74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}.Debug|x64.ActiveCfg = Debug|x64 - {74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}.Debug|x64.Build.0 = Debug|x64 - {74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}.Debug|x86.ActiveCfg = Debug|x86 - {74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}.Debug|x86.Build.0 = Debug|x86 - {74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}.Release|Any CPU.Build.0 = Release|Any CPU - {74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}.Release|x64.ActiveCfg = Release|x64 - {74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}.Release|x64.Build.0 = Release|x64 - {74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}.Release|x86.ActiveCfg = Release|x86 - {74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}.Release|x86.Build.0 = Release|x86 {156FADFB-602E-4658-A235-D4D24CD46F09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {156FADFB-602E-4658-A235-D4D24CD46F09}.Debug|Any CPU.Build.0 = Debug|Any CPU {156FADFB-602E-4658-A235-D4D24CD46F09}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -111,6 +115,30 @@ Global {A1334727-7CC6-43AC-A617-EEFE2174F454}.Release|x64.Build.0 = Release|Any CPU {A1334727-7CC6-43AC-A617-EEFE2174F454}.Release|x86.ActiveCfg = Release|Any CPU {A1334727-7CC6-43AC-A617-EEFE2174F454}.Release|x86.Build.0 = Release|Any CPU + {BA751723-BBC5-4B13-9194-1E0DD7CEB489}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BA751723-BBC5-4B13-9194-1E0DD7CEB489}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BA751723-BBC5-4B13-9194-1E0DD7CEB489}.Debug|x64.ActiveCfg = Debug|Any CPU + {BA751723-BBC5-4B13-9194-1E0DD7CEB489}.Debug|x64.Build.0 = Debug|Any CPU + {BA751723-BBC5-4B13-9194-1E0DD7CEB489}.Debug|x86.ActiveCfg = Debug|Any CPU + {BA751723-BBC5-4B13-9194-1E0DD7CEB489}.Debug|x86.Build.0 = Debug|Any CPU + {BA751723-BBC5-4B13-9194-1E0DD7CEB489}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BA751723-BBC5-4B13-9194-1E0DD7CEB489}.Release|Any CPU.Build.0 = Release|Any CPU + {BA751723-BBC5-4B13-9194-1E0DD7CEB489}.Release|x64.ActiveCfg = Release|Any CPU + {BA751723-BBC5-4B13-9194-1E0DD7CEB489}.Release|x64.Build.0 = Release|Any CPU + {BA751723-BBC5-4B13-9194-1E0DD7CEB489}.Release|x86.ActiveCfg = Release|Any CPU + {BA751723-BBC5-4B13-9194-1E0DD7CEB489}.Release|x86.Build.0 = Release|Any CPU + {FA4BBFB9-DC9E-48FF-8632-B3383C0689E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FA4BBFB9-DC9E-48FF-8632-B3383C0689E5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FA4BBFB9-DC9E-48FF-8632-B3383C0689E5}.Debug|x64.ActiveCfg = Debug|Any CPU + {FA4BBFB9-DC9E-48FF-8632-B3383C0689E5}.Debug|x64.Build.0 = Debug|Any CPU + {FA4BBFB9-DC9E-48FF-8632-B3383C0689E5}.Debug|x86.ActiveCfg = Debug|Any CPU + {FA4BBFB9-DC9E-48FF-8632-B3383C0689E5}.Debug|x86.Build.0 = Debug|Any CPU + {FA4BBFB9-DC9E-48FF-8632-B3383C0689E5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FA4BBFB9-DC9E-48FF-8632-B3383C0689E5}.Release|Any CPU.Build.0 = Release|Any CPU + {FA4BBFB9-DC9E-48FF-8632-B3383C0689E5}.Release|x64.ActiveCfg = Release|Any CPU + {FA4BBFB9-DC9E-48FF-8632-B3383C0689E5}.Release|x64.Build.0 = Release|Any CPU + {FA4BBFB9-DC9E-48FF-8632-B3383C0689E5}.Release|x86.ActiveCfg = Release|Any CPU + {FA4BBFB9-DC9E-48FF-8632-B3383C0689E5}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj index 2fdec42c396..1236280093e 100644 --- a/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj @@ -103,6 +103,14 @@ {2ae5d8c5-eac6-4515-89f2-a4994b41c925} HarfBuzzSharp + + {ba751723-bbc5-4b13-9194-1e0dd7ceb489} + SkiaSharp.SceneGraph + + + {fa4bbfb9-dc9e-48ff-8632-b3383c0689e5} + SkiaSharp.Skottie + {eb1bbdcc-fb07-40d5-8b9e-0079e2c2f2df} SkiaSharp diff --git a/samples/Gallery/Xamarin.Forms/Android/Android.csproj b/samples/Gallery/Xamarin.Forms/Android/Android.csproj index 1b2bcf27bcf..10379ac24fa 100644 --- a/samples/Gallery/Xamarin.Forms/Android/Android.csproj +++ b/samples/Gallery/Xamarin.Forms/Android/Android.csproj @@ -66,6 +66,14 @@ {c737dc80-5b71-4b26-a2dc-da30421788b0} SkiaSharp.Classic + + {3097eb28-2628-47d9-be0e-ba080100a4d0} + SkiaSharp.SceneGraph.Classic + + + {be1f1262-cbbf-45f8-8768-761305bc4f72} + SkiaSharp.Skottie.Classic + {233220cc-f0f3-4c44-9736-ed2cfc363fd3} SkiaSharp.HarfBuzz diff --git a/samples/Gallery/Xamarin.Forms/Core/Core.csproj b/samples/Gallery/Xamarin.Forms/Core/Core.csproj index ee5a2c60b45..5ec8c3c11b9 100644 --- a/samples/Gallery/Xamarin.Forms/Core/Core.csproj +++ b/samples/Gallery/Xamarin.Forms/Core/Core.csproj @@ -11,6 +11,8 @@ + + diff --git a/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj b/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj index 0796f7bd5e2..899f551f1be 100644 --- a/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj +++ b/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj @@ -69,6 +69,14 @@ {4588A759-3853-49B8-8A68-6C7917BE9220} SkiaSharp.Classic + + {3097eb28-2628-47d9-be0e-ba080100a4d0} + SkiaSharp.SceneGraph.Classic + + + {be1f1262-cbbf-45f8-8768-761305bc4f72} + SkiaSharp.Skottie.Classic + {233220cc-f0f3-4c44-9736-ed2cfc363fd3} SkiaSharp.HarfBuzz diff --git a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Linux.sln b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Linux.sln index 9590fcb21bb..9d3974c0866 100644 --- a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Linux.sln +++ b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Linux.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2024 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32515.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{4E0924F8-D546-4428-9412-4B9411FBA5FF}" EndProject @@ -21,6 +21,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\.. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Classic", "..\..\..\binding\HarfBuzzSharp.Classic\HarfBuzzSharp.Classic.csproj", "{4D4FD6E5-6956-437E-A2FD-425D5E309192}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph", "..\..\..\binding\SkiaSharp.SceneGraph\SkiaSharp.SceneGraph.csproj", "{A31995CC-0D30-4718-95D9-4CEC89F46DEF}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph.Classic", "..\..\..\binding\SkiaSharp.SceneGraph.Classic\SkiaSharp.SceneGraph.Classic.csproj", "{D3051754-B083-4F2D-A497-14ED170A68AD}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie", "..\..\..\binding\SkiaSharp.Skottie\SkiaSharp.Skottie.csproj", "{9E10F9D8-922B-42AD-AA51-36D575B22EC8}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie.Classic", "..\..\..\binding\SkiaSharp.Skottie.Classic\SkiaSharp.Skottie.Classic.csproj", "{A25AD8E4-6472-42E0-9C42-3CD51420BBE5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -253,6 +261,102 @@ Global {4D4FD6E5-6956-437E-A2FD-425D5E309192}.Release|x64.Build.0 = Release|Any CPU {4D4FD6E5-6956-437E-A2FD-425D5E309192}.Release|x86.ActiveCfg = Release|Any CPU {4D4FD6E5-6956-437E-A2FD-425D5E309192}.Release|x86.Build.0 = Release|Any CPU + {A31995CC-0D30-4718-95D9-4CEC89F46DEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A31995CC-0D30-4718-95D9-4CEC89F46DEF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A31995CC-0D30-4718-95D9-4CEC89F46DEF}.Debug|ARM.ActiveCfg = Debug|Any CPU + {A31995CC-0D30-4718-95D9-4CEC89F46DEF}.Debug|ARM.Build.0 = Debug|Any CPU + {A31995CC-0D30-4718-95D9-4CEC89F46DEF}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {A31995CC-0D30-4718-95D9-4CEC89F46DEF}.Debug|iPhone.Build.0 = Debug|Any CPU + {A31995CC-0D30-4718-95D9-4CEC89F46DEF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {A31995CC-0D30-4718-95D9-4CEC89F46DEF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {A31995CC-0D30-4718-95D9-4CEC89F46DEF}.Debug|x64.ActiveCfg = Debug|Any CPU + {A31995CC-0D30-4718-95D9-4CEC89F46DEF}.Debug|x64.Build.0 = Debug|Any CPU + {A31995CC-0D30-4718-95D9-4CEC89F46DEF}.Debug|x86.ActiveCfg = Debug|Any CPU + {A31995CC-0D30-4718-95D9-4CEC89F46DEF}.Debug|x86.Build.0 = Debug|Any CPU + {A31995CC-0D30-4718-95D9-4CEC89F46DEF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A31995CC-0D30-4718-95D9-4CEC89F46DEF}.Release|Any CPU.Build.0 = Release|Any CPU + {A31995CC-0D30-4718-95D9-4CEC89F46DEF}.Release|ARM.ActiveCfg = Release|Any CPU + {A31995CC-0D30-4718-95D9-4CEC89F46DEF}.Release|ARM.Build.0 = Release|Any CPU + {A31995CC-0D30-4718-95D9-4CEC89F46DEF}.Release|iPhone.ActiveCfg = Release|Any CPU + {A31995CC-0D30-4718-95D9-4CEC89F46DEF}.Release|iPhone.Build.0 = Release|Any CPU + {A31995CC-0D30-4718-95D9-4CEC89F46DEF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {A31995CC-0D30-4718-95D9-4CEC89F46DEF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {A31995CC-0D30-4718-95D9-4CEC89F46DEF}.Release|x64.ActiveCfg = Release|Any CPU + {A31995CC-0D30-4718-95D9-4CEC89F46DEF}.Release|x64.Build.0 = Release|Any CPU + {A31995CC-0D30-4718-95D9-4CEC89F46DEF}.Release|x86.ActiveCfg = Release|Any CPU + {A31995CC-0D30-4718-95D9-4CEC89F46DEF}.Release|x86.Build.0 = Release|Any CPU + {D3051754-B083-4F2D-A497-14ED170A68AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D3051754-B083-4F2D-A497-14ED170A68AD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D3051754-B083-4F2D-A497-14ED170A68AD}.Debug|ARM.ActiveCfg = Debug|Any CPU + {D3051754-B083-4F2D-A497-14ED170A68AD}.Debug|ARM.Build.0 = Debug|Any CPU + {D3051754-B083-4F2D-A497-14ED170A68AD}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {D3051754-B083-4F2D-A497-14ED170A68AD}.Debug|iPhone.Build.0 = Debug|Any CPU + {D3051754-B083-4F2D-A497-14ED170A68AD}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {D3051754-B083-4F2D-A497-14ED170A68AD}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {D3051754-B083-4F2D-A497-14ED170A68AD}.Debug|x64.ActiveCfg = Debug|Any CPU + {D3051754-B083-4F2D-A497-14ED170A68AD}.Debug|x64.Build.0 = Debug|Any CPU + {D3051754-B083-4F2D-A497-14ED170A68AD}.Debug|x86.ActiveCfg = Debug|Any CPU + {D3051754-B083-4F2D-A497-14ED170A68AD}.Debug|x86.Build.0 = Debug|Any CPU + {D3051754-B083-4F2D-A497-14ED170A68AD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D3051754-B083-4F2D-A497-14ED170A68AD}.Release|Any CPU.Build.0 = Release|Any CPU + {D3051754-B083-4F2D-A497-14ED170A68AD}.Release|ARM.ActiveCfg = Release|Any CPU + {D3051754-B083-4F2D-A497-14ED170A68AD}.Release|ARM.Build.0 = Release|Any CPU + {D3051754-B083-4F2D-A497-14ED170A68AD}.Release|iPhone.ActiveCfg = Release|Any CPU + {D3051754-B083-4F2D-A497-14ED170A68AD}.Release|iPhone.Build.0 = Release|Any CPU + {D3051754-B083-4F2D-A497-14ED170A68AD}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {D3051754-B083-4F2D-A497-14ED170A68AD}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {D3051754-B083-4F2D-A497-14ED170A68AD}.Release|x64.ActiveCfg = Release|Any CPU + {D3051754-B083-4F2D-A497-14ED170A68AD}.Release|x64.Build.0 = Release|Any CPU + {D3051754-B083-4F2D-A497-14ED170A68AD}.Release|x86.ActiveCfg = Release|Any CPU + {D3051754-B083-4F2D-A497-14ED170A68AD}.Release|x86.Build.0 = Release|Any CPU + {9E10F9D8-922B-42AD-AA51-36D575B22EC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9E10F9D8-922B-42AD-AA51-36D575B22EC8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9E10F9D8-922B-42AD-AA51-36D575B22EC8}.Debug|ARM.ActiveCfg = Debug|Any CPU + {9E10F9D8-922B-42AD-AA51-36D575B22EC8}.Debug|ARM.Build.0 = Debug|Any CPU + {9E10F9D8-922B-42AD-AA51-36D575B22EC8}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {9E10F9D8-922B-42AD-AA51-36D575B22EC8}.Debug|iPhone.Build.0 = Debug|Any CPU + {9E10F9D8-922B-42AD-AA51-36D575B22EC8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {9E10F9D8-922B-42AD-AA51-36D575B22EC8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {9E10F9D8-922B-42AD-AA51-36D575B22EC8}.Debug|x64.ActiveCfg = Debug|Any CPU + {9E10F9D8-922B-42AD-AA51-36D575B22EC8}.Debug|x64.Build.0 = Debug|Any CPU + {9E10F9D8-922B-42AD-AA51-36D575B22EC8}.Debug|x86.ActiveCfg = Debug|Any CPU + {9E10F9D8-922B-42AD-AA51-36D575B22EC8}.Debug|x86.Build.0 = Debug|Any CPU + {9E10F9D8-922B-42AD-AA51-36D575B22EC8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9E10F9D8-922B-42AD-AA51-36D575B22EC8}.Release|Any CPU.Build.0 = Release|Any CPU + {9E10F9D8-922B-42AD-AA51-36D575B22EC8}.Release|ARM.ActiveCfg = Release|Any CPU + {9E10F9D8-922B-42AD-AA51-36D575B22EC8}.Release|ARM.Build.0 = Release|Any CPU + {9E10F9D8-922B-42AD-AA51-36D575B22EC8}.Release|iPhone.ActiveCfg = Release|Any CPU + {9E10F9D8-922B-42AD-AA51-36D575B22EC8}.Release|iPhone.Build.0 = Release|Any CPU + {9E10F9D8-922B-42AD-AA51-36D575B22EC8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {9E10F9D8-922B-42AD-AA51-36D575B22EC8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {9E10F9D8-922B-42AD-AA51-36D575B22EC8}.Release|x64.ActiveCfg = Release|Any CPU + {9E10F9D8-922B-42AD-AA51-36D575B22EC8}.Release|x64.Build.0 = Release|Any CPU + {9E10F9D8-922B-42AD-AA51-36D575B22EC8}.Release|x86.ActiveCfg = Release|Any CPU + {9E10F9D8-922B-42AD-AA51-36D575B22EC8}.Release|x86.Build.0 = Release|Any CPU + {A25AD8E4-6472-42E0-9C42-3CD51420BBE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A25AD8E4-6472-42E0-9C42-3CD51420BBE5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A25AD8E4-6472-42E0-9C42-3CD51420BBE5}.Debug|ARM.ActiveCfg = Debug|Any CPU + {A25AD8E4-6472-42E0-9C42-3CD51420BBE5}.Debug|ARM.Build.0 = Debug|Any CPU + {A25AD8E4-6472-42E0-9C42-3CD51420BBE5}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {A25AD8E4-6472-42E0-9C42-3CD51420BBE5}.Debug|iPhone.Build.0 = Debug|Any CPU + {A25AD8E4-6472-42E0-9C42-3CD51420BBE5}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {A25AD8E4-6472-42E0-9C42-3CD51420BBE5}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {A25AD8E4-6472-42E0-9C42-3CD51420BBE5}.Debug|x64.ActiveCfg = Debug|Any CPU + {A25AD8E4-6472-42E0-9C42-3CD51420BBE5}.Debug|x64.Build.0 = Debug|Any CPU + {A25AD8E4-6472-42E0-9C42-3CD51420BBE5}.Debug|x86.ActiveCfg = Debug|Any CPU + {A25AD8E4-6472-42E0-9C42-3CD51420BBE5}.Debug|x86.Build.0 = Debug|Any CPU + {A25AD8E4-6472-42E0-9C42-3CD51420BBE5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A25AD8E4-6472-42E0-9C42-3CD51420BBE5}.Release|Any CPU.Build.0 = Release|Any CPU + {A25AD8E4-6472-42E0-9C42-3CD51420BBE5}.Release|ARM.ActiveCfg = Release|Any CPU + {A25AD8E4-6472-42E0-9C42-3CD51420BBE5}.Release|ARM.Build.0 = Release|Any CPU + {A25AD8E4-6472-42E0-9C42-3CD51420BBE5}.Release|iPhone.ActiveCfg = Release|Any CPU + {A25AD8E4-6472-42E0-9C42-3CD51420BBE5}.Release|iPhone.Build.0 = Release|Any CPU + {A25AD8E4-6472-42E0-9C42-3CD51420BBE5}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {A25AD8E4-6472-42E0-9C42-3CD51420BBE5}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {A25AD8E4-6472-42E0-9C42-3CD51420BBE5}.Release|x64.ActiveCfg = Release|Any CPU + {A25AD8E4-6472-42E0-9C42-3CD51420BBE5}.Release|x64.Build.0 = Release|Any CPU + {A25AD8E4-6472-42E0-9C42-3CD51420BBE5}.Release|x86.ActiveCfg = Release|Any CPU + {A25AD8E4-6472-42E0-9C42-3CD51420BBE5}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Mac.sln b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Mac.sln index c82900813e5..9f1b179f1d8 100644 --- a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Mac.sln +++ b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Mac.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2010 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32515.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\..\..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj", "{DD3EAFFF-E420-4AC3-925D-501EAE140B49}" EndProject @@ -13,19 +13,19 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\bindi EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.iOS", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.iOS\SkiaSharp.Views.iOS.csproj", "{74C78108-9199-4A7A-928C-FC4DC57D0AE4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.iOS", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.iOS\SkiaSharp.Views.iOS.csproj", "{74C78108-9199-4A7A-928C-FC4DC57D0AE4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Android", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Android\SkiaSharp.Views.Android.csproj", "{926C8D29-E047-4F4E-8B35-852E47BFA9F5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Android", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Android\SkiaSharp.Views.Android.csproj", "{926C8D29-E047-4F4E-8B35-852E47BFA9F5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Mac", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Mac\SkiaSharp.Views.Mac.csproj", "{809A15DC-E675-4A24-83FA-DF13160F7E4C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Mac", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Mac\SkiaSharp.Views.Mac.csproj", "{809A15DC-E675-4A24-83FA-DF13160F7E4C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Forms.Mac", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Mac\SkiaSharp.Views.Forms.Mac.csproj", "{DA5DA4D8-4885-4AF2-96BB-AE803C344AB0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.Mac", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Mac\SkiaSharp.Views.Forms.Mac.csproj", "{DA5DA4D8-4885-4AF2-96BB-AE803C344AB0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.csproj", "{99411A8A-1F8C-469C-AC10-E72F28EDB376}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Forms.Android", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Android\SkiaSharp.Views.Forms.Android.csproj", "{2F94F024-1841-47E8-B521-74AA4E3EBA54}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.Android", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Android\SkiaSharp.Views.Forms.Android.csproj", "{2F94F024-1841-47E8-B521-74AA4E3EBA54}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Forms.iOS", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.iOS\SkiaSharp.Views.Forms.iOS.csproj", "{4AC36D63-BF11-445F-81EE-107C0CEF4FC9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.iOS", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.iOS\SkiaSharp.Views.Forms.iOS.csproj", "{4AC36D63-BF11-445F-81EE-107C0CEF4FC9}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Android", "Android\Android.csproj", "{B8A92B38-B7DB-450B-8D16-301404E9EADC}" EndProject @@ -35,6 +35,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iOS", "iOS\iOS.csproj", "{0 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mac", "Mac\Mac.csproj", "{91F5C72A-74D7-4C3F-8761-F692D4300660}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph", "..\..\..\binding\SkiaSharp.SceneGraph\SkiaSharp.SceneGraph.csproj", "{71E86AE7-8C5C-4622-9BF2-6652350AFF8F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph.Classic", "..\..\..\binding\SkiaSharp.SceneGraph.Classic\SkiaSharp.SceneGraph.Classic.csproj", "{3097EB28-2628-47D9-BE0E-BA080100A4D0}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie", "..\..\..\binding\SkiaSharp.Skottie\SkiaSharp.Skottie.csproj", "{3FC9E16E-4289-4F1D-8A58-29196809E174}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie.Classic", "..\..\..\binding\SkiaSharp.Skottie.Classic\SkiaSharp.Skottie.Classic.csproj", "{BE1F1262-CBBF-45F8-8768-761305BC4F72}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -459,6 +467,102 @@ Global {91F5C72A-74D7-4C3F-8761-F692D4300660}.Release|x64.Build.0 = Release|Any CPU {91F5C72A-74D7-4C3F-8761-F692D4300660}.Release|x86.ActiveCfg = Release|Any CPU {91F5C72A-74D7-4C3F-8761-F692D4300660}.Release|x86.Build.0 = Release|Any CPU + {71E86AE7-8C5C-4622-9BF2-6652350AFF8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {71E86AE7-8C5C-4622-9BF2-6652350AFF8F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {71E86AE7-8C5C-4622-9BF2-6652350AFF8F}.Debug|ARM.ActiveCfg = Debug|Any CPU + {71E86AE7-8C5C-4622-9BF2-6652350AFF8F}.Debug|ARM.Build.0 = Debug|Any CPU + {71E86AE7-8C5C-4622-9BF2-6652350AFF8F}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {71E86AE7-8C5C-4622-9BF2-6652350AFF8F}.Debug|iPhone.Build.0 = Debug|Any CPU + {71E86AE7-8C5C-4622-9BF2-6652350AFF8F}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {71E86AE7-8C5C-4622-9BF2-6652350AFF8F}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {71E86AE7-8C5C-4622-9BF2-6652350AFF8F}.Debug|x64.ActiveCfg = Debug|Any CPU + {71E86AE7-8C5C-4622-9BF2-6652350AFF8F}.Debug|x64.Build.0 = Debug|Any CPU + {71E86AE7-8C5C-4622-9BF2-6652350AFF8F}.Debug|x86.ActiveCfg = Debug|Any CPU + {71E86AE7-8C5C-4622-9BF2-6652350AFF8F}.Debug|x86.Build.0 = Debug|Any CPU + {71E86AE7-8C5C-4622-9BF2-6652350AFF8F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {71E86AE7-8C5C-4622-9BF2-6652350AFF8F}.Release|Any CPU.Build.0 = Release|Any CPU + {71E86AE7-8C5C-4622-9BF2-6652350AFF8F}.Release|ARM.ActiveCfg = Release|Any CPU + {71E86AE7-8C5C-4622-9BF2-6652350AFF8F}.Release|ARM.Build.0 = Release|Any CPU + {71E86AE7-8C5C-4622-9BF2-6652350AFF8F}.Release|iPhone.ActiveCfg = Release|Any CPU + {71E86AE7-8C5C-4622-9BF2-6652350AFF8F}.Release|iPhone.Build.0 = Release|Any CPU + {71E86AE7-8C5C-4622-9BF2-6652350AFF8F}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {71E86AE7-8C5C-4622-9BF2-6652350AFF8F}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {71E86AE7-8C5C-4622-9BF2-6652350AFF8F}.Release|x64.ActiveCfg = Release|Any CPU + {71E86AE7-8C5C-4622-9BF2-6652350AFF8F}.Release|x64.Build.0 = Release|Any CPU + {71E86AE7-8C5C-4622-9BF2-6652350AFF8F}.Release|x86.ActiveCfg = Release|Any CPU + {71E86AE7-8C5C-4622-9BF2-6652350AFF8F}.Release|x86.Build.0 = Release|Any CPU + {3097EB28-2628-47D9-BE0E-BA080100A4D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3097EB28-2628-47D9-BE0E-BA080100A4D0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3097EB28-2628-47D9-BE0E-BA080100A4D0}.Debug|ARM.ActiveCfg = Debug|Any CPU + {3097EB28-2628-47D9-BE0E-BA080100A4D0}.Debug|ARM.Build.0 = Debug|Any CPU + {3097EB28-2628-47D9-BE0E-BA080100A4D0}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {3097EB28-2628-47D9-BE0E-BA080100A4D0}.Debug|iPhone.Build.0 = Debug|Any CPU + {3097EB28-2628-47D9-BE0E-BA080100A4D0}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {3097EB28-2628-47D9-BE0E-BA080100A4D0}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {3097EB28-2628-47D9-BE0E-BA080100A4D0}.Debug|x64.ActiveCfg = Debug|Any CPU + {3097EB28-2628-47D9-BE0E-BA080100A4D0}.Debug|x64.Build.0 = Debug|Any CPU + {3097EB28-2628-47D9-BE0E-BA080100A4D0}.Debug|x86.ActiveCfg = Debug|Any CPU + {3097EB28-2628-47D9-BE0E-BA080100A4D0}.Debug|x86.Build.0 = Debug|Any CPU + {3097EB28-2628-47D9-BE0E-BA080100A4D0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3097EB28-2628-47D9-BE0E-BA080100A4D0}.Release|Any CPU.Build.0 = Release|Any CPU + {3097EB28-2628-47D9-BE0E-BA080100A4D0}.Release|ARM.ActiveCfg = Release|Any CPU + {3097EB28-2628-47D9-BE0E-BA080100A4D0}.Release|ARM.Build.0 = Release|Any CPU + {3097EB28-2628-47D9-BE0E-BA080100A4D0}.Release|iPhone.ActiveCfg = Release|Any CPU + {3097EB28-2628-47D9-BE0E-BA080100A4D0}.Release|iPhone.Build.0 = Release|Any CPU + {3097EB28-2628-47D9-BE0E-BA080100A4D0}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {3097EB28-2628-47D9-BE0E-BA080100A4D0}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {3097EB28-2628-47D9-BE0E-BA080100A4D0}.Release|x64.ActiveCfg = Release|Any CPU + {3097EB28-2628-47D9-BE0E-BA080100A4D0}.Release|x64.Build.0 = Release|Any CPU + {3097EB28-2628-47D9-BE0E-BA080100A4D0}.Release|x86.ActiveCfg = Release|Any CPU + {3097EB28-2628-47D9-BE0E-BA080100A4D0}.Release|x86.Build.0 = Release|Any CPU + {3FC9E16E-4289-4F1D-8A58-29196809E174}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3FC9E16E-4289-4F1D-8A58-29196809E174}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3FC9E16E-4289-4F1D-8A58-29196809E174}.Debug|ARM.ActiveCfg = Debug|Any CPU + {3FC9E16E-4289-4F1D-8A58-29196809E174}.Debug|ARM.Build.0 = Debug|Any CPU + {3FC9E16E-4289-4F1D-8A58-29196809E174}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {3FC9E16E-4289-4F1D-8A58-29196809E174}.Debug|iPhone.Build.0 = Debug|Any CPU + {3FC9E16E-4289-4F1D-8A58-29196809E174}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {3FC9E16E-4289-4F1D-8A58-29196809E174}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {3FC9E16E-4289-4F1D-8A58-29196809E174}.Debug|x64.ActiveCfg = Debug|Any CPU + {3FC9E16E-4289-4F1D-8A58-29196809E174}.Debug|x64.Build.0 = Debug|Any CPU + {3FC9E16E-4289-4F1D-8A58-29196809E174}.Debug|x86.ActiveCfg = Debug|Any CPU + {3FC9E16E-4289-4F1D-8A58-29196809E174}.Debug|x86.Build.0 = Debug|Any CPU + {3FC9E16E-4289-4F1D-8A58-29196809E174}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3FC9E16E-4289-4F1D-8A58-29196809E174}.Release|Any CPU.Build.0 = Release|Any CPU + {3FC9E16E-4289-4F1D-8A58-29196809E174}.Release|ARM.ActiveCfg = Release|Any CPU + {3FC9E16E-4289-4F1D-8A58-29196809E174}.Release|ARM.Build.0 = Release|Any CPU + {3FC9E16E-4289-4F1D-8A58-29196809E174}.Release|iPhone.ActiveCfg = Release|Any CPU + {3FC9E16E-4289-4F1D-8A58-29196809E174}.Release|iPhone.Build.0 = Release|Any CPU + {3FC9E16E-4289-4F1D-8A58-29196809E174}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {3FC9E16E-4289-4F1D-8A58-29196809E174}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {3FC9E16E-4289-4F1D-8A58-29196809E174}.Release|x64.ActiveCfg = Release|Any CPU + {3FC9E16E-4289-4F1D-8A58-29196809E174}.Release|x64.Build.0 = Release|Any CPU + {3FC9E16E-4289-4F1D-8A58-29196809E174}.Release|x86.ActiveCfg = Release|Any CPU + {3FC9E16E-4289-4F1D-8A58-29196809E174}.Release|x86.Build.0 = Release|Any CPU + {BE1F1262-CBBF-45F8-8768-761305BC4F72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BE1F1262-CBBF-45F8-8768-761305BC4F72}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BE1F1262-CBBF-45F8-8768-761305BC4F72}.Debug|ARM.ActiveCfg = Debug|Any CPU + {BE1F1262-CBBF-45F8-8768-761305BC4F72}.Debug|ARM.Build.0 = Debug|Any CPU + {BE1F1262-CBBF-45F8-8768-761305BC4F72}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {BE1F1262-CBBF-45F8-8768-761305BC4F72}.Debug|iPhone.Build.0 = Debug|Any CPU + {BE1F1262-CBBF-45F8-8768-761305BC4F72}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {BE1F1262-CBBF-45F8-8768-761305BC4F72}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {BE1F1262-CBBF-45F8-8768-761305BC4F72}.Debug|x64.ActiveCfg = Debug|Any CPU + {BE1F1262-CBBF-45F8-8768-761305BC4F72}.Debug|x64.Build.0 = Debug|Any CPU + {BE1F1262-CBBF-45F8-8768-761305BC4F72}.Debug|x86.ActiveCfg = Debug|Any CPU + {BE1F1262-CBBF-45F8-8768-761305BC4F72}.Debug|x86.Build.0 = Debug|Any CPU + {BE1F1262-CBBF-45F8-8768-761305BC4F72}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BE1F1262-CBBF-45F8-8768-761305BC4F72}.Release|Any CPU.Build.0 = Release|Any CPU + {BE1F1262-CBBF-45F8-8768-761305BC4F72}.Release|ARM.ActiveCfg = Release|Any CPU + {BE1F1262-CBBF-45F8-8768-761305BC4F72}.Release|ARM.Build.0 = Release|Any CPU + {BE1F1262-CBBF-45F8-8768-761305BC4F72}.Release|iPhone.ActiveCfg = Release|Any CPU + {BE1F1262-CBBF-45F8-8768-761305BC4F72}.Release|iPhone.Build.0 = Release|Any CPU + {BE1F1262-CBBF-45F8-8768-761305BC4F72}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {BE1F1262-CBBF-45F8-8768-761305BC4F72}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {BE1F1262-CBBF-45F8-8768-761305BC4F72}.Release|x64.ActiveCfg = Release|Any CPU + {BE1F1262-CBBF-45F8-8768-761305BC4F72}.Release|x64.Build.0 = Release|Any CPU + {BE1F1262-CBBF-45F8-8768-761305BC4F72}.Release|x86.ActiveCfg = Release|Any CPU + {BE1F1262-CBBF-45F8-8768-761305BC4F72}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Windows.sln b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Windows.sln index f2fecd25128..81995f5706e 100644 --- a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Windows.sln +++ b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Windows.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29118.114 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32515.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.UWP", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.UWP\SkiaSharp.Views.Forms.UWP.csproj", "{3A1277B5-CFAE-48CC-B64B-4DAE1222A3EB}" EndProject @@ -39,6 +39,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.WindowsForm EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.WPF", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.WPF\SkiaSharp.Views.Forms.WPF.csproj", "{B24C9E89-0D1A-4210-A554-C37085761919}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph", "..\..\..\binding\SkiaSharp.SceneGraph\SkiaSharp.SceneGraph.csproj", "{41B35CA0-C73B-4C43-8CC8-A08B2168EE6B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph.Classic", "..\..\..\binding\SkiaSharp.SceneGraph.Classic\SkiaSharp.SceneGraph.Classic.csproj", "{728C080A-9338-46C4-A9C5-43A34759EA96}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie", "..\..\..\binding\SkiaSharp.Skottie\SkiaSharp.Skottie.csproj", "{DD90BFC2-E302-417D-856F-C8C6C9B36FF0}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie.Classic", "..\..\..\binding\SkiaSharp.Skottie.Classic\SkiaSharp.Skottie.Classic.csproj", "{C69A2B8F-37D7-488B-BB85-B83CB7A275C2}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -433,6 +441,86 @@ Global {B24C9E89-0D1A-4210-A554-C37085761919}.Release|x64.Build.0 = Release|Any CPU {B24C9E89-0D1A-4210-A554-C37085761919}.Release|x86.ActiveCfg = Release|Any CPU {B24C9E89-0D1A-4210-A554-C37085761919}.Release|x86.Build.0 = Release|Any CPU + {41B35CA0-C73B-4C43-8CC8-A08B2168EE6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {41B35CA0-C73B-4C43-8CC8-A08B2168EE6B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {41B35CA0-C73B-4C43-8CC8-A08B2168EE6B}.Debug|ARM.ActiveCfg = Debug|Any CPU + {41B35CA0-C73B-4C43-8CC8-A08B2168EE6B}.Debug|ARM.Build.0 = Debug|Any CPU + {41B35CA0-C73B-4C43-8CC8-A08B2168EE6B}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {41B35CA0-C73B-4C43-8CC8-A08B2168EE6B}.Debug|ARM64.Build.0 = Debug|Any CPU + {41B35CA0-C73B-4C43-8CC8-A08B2168EE6B}.Debug|x64.ActiveCfg = Debug|Any CPU + {41B35CA0-C73B-4C43-8CC8-A08B2168EE6B}.Debug|x64.Build.0 = Debug|Any CPU + {41B35CA0-C73B-4C43-8CC8-A08B2168EE6B}.Debug|x86.ActiveCfg = Debug|Any CPU + {41B35CA0-C73B-4C43-8CC8-A08B2168EE6B}.Debug|x86.Build.0 = Debug|Any CPU + {41B35CA0-C73B-4C43-8CC8-A08B2168EE6B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {41B35CA0-C73B-4C43-8CC8-A08B2168EE6B}.Release|Any CPU.Build.0 = Release|Any CPU + {41B35CA0-C73B-4C43-8CC8-A08B2168EE6B}.Release|ARM.ActiveCfg = Release|Any CPU + {41B35CA0-C73B-4C43-8CC8-A08B2168EE6B}.Release|ARM.Build.0 = Release|Any CPU + {41B35CA0-C73B-4C43-8CC8-A08B2168EE6B}.Release|ARM64.ActiveCfg = Release|Any CPU + {41B35CA0-C73B-4C43-8CC8-A08B2168EE6B}.Release|ARM64.Build.0 = Release|Any CPU + {41B35CA0-C73B-4C43-8CC8-A08B2168EE6B}.Release|x64.ActiveCfg = Release|Any CPU + {41B35CA0-C73B-4C43-8CC8-A08B2168EE6B}.Release|x64.Build.0 = Release|Any CPU + {41B35CA0-C73B-4C43-8CC8-A08B2168EE6B}.Release|x86.ActiveCfg = Release|Any CPU + {41B35CA0-C73B-4C43-8CC8-A08B2168EE6B}.Release|x86.Build.0 = Release|Any CPU + {728C080A-9338-46C4-A9C5-43A34759EA96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {728C080A-9338-46C4-A9C5-43A34759EA96}.Debug|Any CPU.Build.0 = Debug|Any CPU + {728C080A-9338-46C4-A9C5-43A34759EA96}.Debug|ARM.ActiveCfg = Debug|Any CPU + {728C080A-9338-46C4-A9C5-43A34759EA96}.Debug|ARM.Build.0 = Debug|Any CPU + {728C080A-9338-46C4-A9C5-43A34759EA96}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {728C080A-9338-46C4-A9C5-43A34759EA96}.Debug|ARM64.Build.0 = Debug|Any CPU + {728C080A-9338-46C4-A9C5-43A34759EA96}.Debug|x64.ActiveCfg = Debug|Any CPU + {728C080A-9338-46C4-A9C5-43A34759EA96}.Debug|x64.Build.0 = Debug|Any CPU + {728C080A-9338-46C4-A9C5-43A34759EA96}.Debug|x86.ActiveCfg = Debug|Any CPU + {728C080A-9338-46C4-A9C5-43A34759EA96}.Debug|x86.Build.0 = Debug|Any CPU + {728C080A-9338-46C4-A9C5-43A34759EA96}.Release|Any CPU.ActiveCfg = Release|Any CPU + {728C080A-9338-46C4-A9C5-43A34759EA96}.Release|Any CPU.Build.0 = Release|Any CPU + {728C080A-9338-46C4-A9C5-43A34759EA96}.Release|ARM.ActiveCfg = Release|Any CPU + {728C080A-9338-46C4-A9C5-43A34759EA96}.Release|ARM.Build.0 = Release|Any CPU + {728C080A-9338-46C4-A9C5-43A34759EA96}.Release|ARM64.ActiveCfg = Release|Any CPU + {728C080A-9338-46C4-A9C5-43A34759EA96}.Release|ARM64.Build.0 = Release|Any CPU + {728C080A-9338-46C4-A9C5-43A34759EA96}.Release|x64.ActiveCfg = Release|Any CPU + {728C080A-9338-46C4-A9C5-43A34759EA96}.Release|x64.Build.0 = Release|Any CPU + {728C080A-9338-46C4-A9C5-43A34759EA96}.Release|x86.ActiveCfg = Release|Any CPU + {728C080A-9338-46C4-A9C5-43A34759EA96}.Release|x86.Build.0 = Release|Any CPU + {DD90BFC2-E302-417D-856F-C8C6C9B36FF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DD90BFC2-E302-417D-856F-C8C6C9B36FF0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DD90BFC2-E302-417D-856F-C8C6C9B36FF0}.Debug|ARM.ActiveCfg = Debug|Any CPU + {DD90BFC2-E302-417D-856F-C8C6C9B36FF0}.Debug|ARM.Build.0 = Debug|Any CPU + {DD90BFC2-E302-417D-856F-C8C6C9B36FF0}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {DD90BFC2-E302-417D-856F-C8C6C9B36FF0}.Debug|ARM64.Build.0 = Debug|Any CPU + {DD90BFC2-E302-417D-856F-C8C6C9B36FF0}.Debug|x64.ActiveCfg = Debug|Any CPU + {DD90BFC2-E302-417D-856F-C8C6C9B36FF0}.Debug|x64.Build.0 = Debug|Any CPU + {DD90BFC2-E302-417D-856F-C8C6C9B36FF0}.Debug|x86.ActiveCfg = Debug|Any CPU + {DD90BFC2-E302-417D-856F-C8C6C9B36FF0}.Debug|x86.Build.0 = Debug|Any CPU + {DD90BFC2-E302-417D-856F-C8C6C9B36FF0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DD90BFC2-E302-417D-856F-C8C6C9B36FF0}.Release|Any CPU.Build.0 = Release|Any CPU + {DD90BFC2-E302-417D-856F-C8C6C9B36FF0}.Release|ARM.ActiveCfg = Release|Any CPU + {DD90BFC2-E302-417D-856F-C8C6C9B36FF0}.Release|ARM.Build.0 = Release|Any CPU + {DD90BFC2-E302-417D-856F-C8C6C9B36FF0}.Release|ARM64.ActiveCfg = Release|Any CPU + {DD90BFC2-E302-417D-856F-C8C6C9B36FF0}.Release|ARM64.Build.0 = Release|Any CPU + {DD90BFC2-E302-417D-856F-C8C6C9B36FF0}.Release|x64.ActiveCfg = Release|Any CPU + {DD90BFC2-E302-417D-856F-C8C6C9B36FF0}.Release|x64.Build.0 = Release|Any CPU + {DD90BFC2-E302-417D-856F-C8C6C9B36FF0}.Release|x86.ActiveCfg = Release|Any CPU + {DD90BFC2-E302-417D-856F-C8C6C9B36FF0}.Release|x86.Build.0 = Release|Any CPU + {C69A2B8F-37D7-488B-BB85-B83CB7A275C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C69A2B8F-37D7-488B-BB85-B83CB7A275C2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C69A2B8F-37D7-488B-BB85-B83CB7A275C2}.Debug|ARM.ActiveCfg = Debug|Any CPU + {C69A2B8F-37D7-488B-BB85-B83CB7A275C2}.Debug|ARM.Build.0 = Debug|Any CPU + {C69A2B8F-37D7-488B-BB85-B83CB7A275C2}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {C69A2B8F-37D7-488B-BB85-B83CB7A275C2}.Debug|ARM64.Build.0 = Debug|Any CPU + {C69A2B8F-37D7-488B-BB85-B83CB7A275C2}.Debug|x64.ActiveCfg = Debug|Any CPU + {C69A2B8F-37D7-488B-BB85-B83CB7A275C2}.Debug|x64.Build.0 = Debug|Any CPU + {C69A2B8F-37D7-488B-BB85-B83CB7A275C2}.Debug|x86.ActiveCfg = Debug|Any CPU + {C69A2B8F-37D7-488B-BB85-B83CB7A275C2}.Debug|x86.Build.0 = Debug|Any CPU + {C69A2B8F-37D7-488B-BB85-B83CB7A275C2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C69A2B8F-37D7-488B-BB85-B83CB7A275C2}.Release|Any CPU.Build.0 = Release|Any CPU + {C69A2B8F-37D7-488B-BB85-B83CB7A275C2}.Release|ARM.ActiveCfg = Release|Any CPU + {C69A2B8F-37D7-488B-BB85-B83CB7A275C2}.Release|ARM.Build.0 = Release|Any CPU + {C69A2B8F-37D7-488B-BB85-B83CB7A275C2}.Release|ARM64.ActiveCfg = Release|Any CPU + {C69A2B8F-37D7-488B-BB85-B83CB7A275C2}.Release|ARM64.Build.0 = Release|Any CPU + {C69A2B8F-37D7-488B-BB85-B83CB7A275C2}.Release|x64.ActiveCfg = Release|Any CPU + {C69A2B8F-37D7-488B-BB85-B83CB7A275C2}.Release|x64.Build.0 = Release|Any CPU + {C69A2B8F-37D7-488B-BB85-B83CB7A275C2}.Release|x86.ActiveCfg = Release|Any CPU + {C69A2B8F-37D7-488B-BB85-B83CB7A275C2}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.sln b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.sln index 04d05e51ab8..27b0d920f05 100644 --- a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.sln +++ b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29118.114 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32515.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.UWP", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.UWP\SkiaSharp.Views.Forms.UWP.csproj", "{3A1277B5-CFAE-48CC-B64B-4DAE1222A3EB}" EndProject @@ -57,6 +57,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.WPF", "..\. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.WPF", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.WPF\SkiaSharp.Views.Forms.WPF.csproj", "{88149207-012F-4804-B5BF-1247F77639DC}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph", "..\..\..\binding\SkiaSharp.SceneGraph\SkiaSharp.SceneGraph.csproj", "{E76935C2-B4EB-4863-A1B0-68C10E1AD16C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph.Classic", "..\..\..\binding\SkiaSharp.SceneGraph.Classic\SkiaSharp.SceneGraph.Classic.csproj", "{99F93341-D5CD-4B29-9132-B638438F55AE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie", "..\..\..\binding\SkiaSharp.Skottie\SkiaSharp.Skottie.csproj", "{7183A826-064D-46EE-BCEE-35D4A0AEE230}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie.Classic", "..\..\..\binding\SkiaSharp.Skottie.Classic\SkiaSharp.Skottie.Classic.csproj", "{E149A390-48C4-4334-8FC2-E8A6B273327B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -873,6 +881,118 @@ Global {88149207-012F-4804-B5BF-1247F77639DC}.Release|x64.Build.0 = Release|Any CPU {88149207-012F-4804-B5BF-1247F77639DC}.Release|x86.ActiveCfg = Release|Any CPU {88149207-012F-4804-B5BF-1247F77639DC}.Release|x86.Build.0 = Release|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Debug|ARM.ActiveCfg = Debug|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Debug|ARM.Build.0 = Debug|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Debug|ARM64.Build.0 = Debug|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Debug|iPhone.Build.0 = Debug|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Debug|x64.ActiveCfg = Debug|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Debug|x64.Build.0 = Debug|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Debug|x86.ActiveCfg = Debug|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Debug|x86.Build.0 = Debug|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Release|Any CPU.Build.0 = Release|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Release|ARM.ActiveCfg = Release|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Release|ARM.Build.0 = Release|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Release|ARM64.ActiveCfg = Release|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Release|ARM64.Build.0 = Release|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Release|iPhone.ActiveCfg = Release|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Release|iPhone.Build.0 = Release|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Release|x64.ActiveCfg = Release|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Release|x64.Build.0 = Release|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Release|x86.ActiveCfg = Release|Any CPU + {E76935C2-B4EB-4863-A1B0-68C10E1AD16C}.Release|x86.Build.0 = Release|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Debug|ARM.ActiveCfg = Debug|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Debug|ARM.Build.0 = Debug|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Debug|ARM64.Build.0 = Debug|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Debug|iPhone.Build.0 = Debug|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Debug|x64.ActiveCfg = Debug|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Debug|x64.Build.0 = Debug|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Debug|x86.ActiveCfg = Debug|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Debug|x86.Build.0 = Debug|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Release|Any CPU.Build.0 = Release|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Release|ARM.ActiveCfg = Release|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Release|ARM.Build.0 = Release|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Release|ARM64.ActiveCfg = Release|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Release|ARM64.Build.0 = Release|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Release|iPhone.ActiveCfg = Release|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Release|iPhone.Build.0 = Release|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Release|x64.ActiveCfg = Release|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Release|x64.Build.0 = Release|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Release|x86.ActiveCfg = Release|Any CPU + {99F93341-D5CD-4B29-9132-B638438F55AE}.Release|x86.Build.0 = Release|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Debug|ARM.ActiveCfg = Debug|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Debug|ARM.Build.0 = Debug|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Debug|ARM64.Build.0 = Debug|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Debug|iPhone.Build.0 = Debug|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Debug|x64.ActiveCfg = Debug|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Debug|x64.Build.0 = Debug|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Debug|x86.ActiveCfg = Debug|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Debug|x86.Build.0 = Debug|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Release|Any CPU.Build.0 = Release|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Release|ARM.ActiveCfg = Release|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Release|ARM.Build.0 = Release|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Release|ARM64.ActiveCfg = Release|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Release|ARM64.Build.0 = Release|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Release|iPhone.ActiveCfg = Release|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Release|iPhone.Build.0 = Release|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Release|x64.ActiveCfg = Release|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Release|x64.Build.0 = Release|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Release|x86.ActiveCfg = Release|Any CPU + {7183A826-064D-46EE-BCEE-35D4A0AEE230}.Release|x86.Build.0 = Release|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Debug|ARM.ActiveCfg = Debug|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Debug|ARM.Build.0 = Debug|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Debug|ARM64.Build.0 = Debug|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Debug|iPhone.Build.0 = Debug|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Debug|x64.ActiveCfg = Debug|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Debug|x64.Build.0 = Debug|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Debug|x86.ActiveCfg = Debug|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Debug|x86.Build.0 = Debug|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Release|Any CPU.Build.0 = Release|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Release|ARM.ActiveCfg = Release|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Release|ARM.Build.0 = Release|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Release|ARM64.ActiveCfg = Release|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Release|ARM64.Build.0 = Release|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Release|iPhone.ActiveCfg = Release|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Release|iPhone.Build.0 = Release|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Release|x64.ActiveCfg = Release|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Release|x64.Build.0 = Release|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Release|x86.ActiveCfg = Release|Any CPU + {E149A390-48C4-4334-8FC2-E8A6B273327B}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj b/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj index 5aa6dc1641a..35d2bed2e7a 100644 --- a/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj +++ b/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj @@ -15,6 +15,8 @@ + + diff --git a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj index 515f9b62a3d..59de6fb0a82 100644 --- a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj +++ b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj @@ -127,6 +127,14 @@ {bab615aa-956e-4079-b260-dd7b1f52ec7d} SkiaSharp.Classic + + {3097eb28-2628-47d9-be0e-ba080100a4d0} + SkiaSharp.SceneGraph.Classic + + + {be1f1262-cbbf-45f8-8768-761305bc4f72} + SkiaSharp.Skottie.Classic + {233220cc-f0f3-4c44-9736-ed2cfc363fd3} SkiaSharp.HarfBuzz diff --git a/samples/Gallery/Xamarin.Forms/WPF/WPF.csproj b/samples/Gallery/Xamarin.Forms/WPF/WPF.csproj index 81ca673be52..4fb47d44c65 100644 --- a/samples/Gallery/Xamarin.Forms/WPF/WPF.csproj +++ b/samples/Gallery/Xamarin.Forms/WPF/WPF.csproj @@ -62,6 +62,14 @@ {eb1bbdcc-fb07-40d5-8b9e-0079e2c2f2df} HarfBuzzSharp + + {e76935c2-b4eb-4863-a1b0-68c10e1ad16c} + SkiaSharp.SceneGraph + + + {7183a826-064d-46ee-bcee-35d4a0aee230} + SkiaSharp.Skottie + {27059729-96a9-4313-b2a4-b10798450519} SkiaSharp.Views.Forms.WPF diff --git a/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj b/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj index 9c090da1969..127703681ac 100644 --- a/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj +++ b/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj @@ -122,6 +122,14 @@ {6a678cfb-21a7-4e81-8909-fd72abbfd408} SkiaSharp.Classic + + {3097eb28-2628-47d9-be0e-ba080100a4d0} + SkiaSharp.SceneGraph.Classic + + + {be1f1262-cbbf-45f8-8768-761305bc4f72} + SkiaSharp.Skottie.Classic + {233220cc-f0f3-4c44-9736-ed2cfc363fd3} SkiaSharp.HarfBuzz diff --git a/samples/Gallery/macOS/SkiaSharpSample.sln b/samples/Gallery/macOS/SkiaSharpSample.sln index afccf0956ab..4c679b08854 100644 --- a/samples/Gallery/macOS/SkiaSharpSample.sln +++ b/samples/Gallery/macOS/SkiaSharpSample.sln @@ -1,18 +1,22 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2010 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32515.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{4588A759-3853-49B8-8A68-6C7917BE9220}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.Classic", "..\..\..\binding\HarfBuzzSharp.Classic\HarfBuzzSharp.Classic.csproj", "{30952C22-D566-488F-9D7A-2411B027D6CA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Mac", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Mac\SkiaSharp.Views.Mac.csproj", "{809A15DC-E675-4A24-83FA-DF13160F7E4C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Mac", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Mac\SkiaSharp.Views.Mac.csproj", "{809A15DC-E675-4A24-83FA-DF13160F7E4C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample", "SkiaSharpSample\SkiaSharpSample.csproj", "{1BCAB142-0AEF-4ED1-A9A2-271D0A84C56A}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph.Classic", "..\..\..\binding\SkiaSharp.SceneGraph.Classic\SkiaSharp.SceneGraph.Classic.csproj", "{717B9536-923F-4747-8ED9-EE0155CA0C28}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie.Classic", "..\..\..\binding\SkiaSharp.Skottie.Classic\SkiaSharp.Skottie.Classic.csproj", "{24F85D4F-2D21-4194-B7F1-074E301153FF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -39,6 +43,14 @@ Global {1BCAB142-0AEF-4ED1-A9A2-271D0A84C56A}.Debug|Any CPU.Build.0 = Debug|Any CPU {1BCAB142-0AEF-4ED1-A9A2-271D0A84C56A}.Release|Any CPU.ActiveCfg = Release|Any CPU {1BCAB142-0AEF-4ED1-A9A2-271D0A84C56A}.Release|Any CPU.Build.0 = Release|Any CPU + {717B9536-923F-4747-8ED9-EE0155CA0C28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {717B9536-923F-4747-8ED9-EE0155CA0C28}.Debug|Any CPU.Build.0 = Debug|Any CPU + {717B9536-923F-4747-8ED9-EE0155CA0C28}.Release|Any CPU.ActiveCfg = Release|Any CPU + {717B9536-923F-4747-8ED9-EE0155CA0C28}.Release|Any CPU.Build.0 = Release|Any CPU + {24F85D4F-2D21-4194-B7F1-074E301153FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {24F85D4F-2D21-4194-B7F1-074E301153FF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {24F85D4F-2D21-4194-B7F1-074E301153FF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {24F85D4F-2D21-4194-B7F1-074E301153FF}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj index c8f84a0f359..d3dcb43527c 100644 --- a/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -60,6 +60,14 @@ {30952C22-D566-488F-9D7A-2411B027D6CA} HarfBuzzSharp.Classic + + {717b9536-923f-4747-8ed9-ee0155ca0c28} + SkiaSharp.SceneGraph.Classic + + + {24f85d4f-2d21-4194-b7f1-074e301153ff} + SkiaSharp.Skottie.Classic + {233220cc-f0f3-4c44-9736-ed2cfc363fd3} SkiaSharp.HarfBuzz diff --git a/samples/Gallery/tvOS/SkiaSharpSample.sln b/samples/Gallery/tvOS/SkiaSharpSample.sln index 0818fa86253..39b3aca8dd4 100644 --- a/samples/Gallery/tvOS/SkiaSharpSample.sln +++ b/samples/Gallery/tvOS/SkiaSharpSample.sln @@ -1,18 +1,22 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2010 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32515.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Classic", "..\..\..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{5180E370-A455-42BB-99F9-97BD269B8A52}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.Classic", "..\..\..\binding\HarfBuzzSharp.Classic\HarfBuzzSharp.Classic.csproj", "{8D646738-458A-441F-B69B-253EF058A812}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.tvOS", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.tvOS\SkiaSharp.Views.tvOS.csproj", "{E5973829-6C8B-43E4-B81B-C8492DF26C90}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.tvOS", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.tvOS\SkiaSharp.Views.tvOS.csproj", "{E5973829-6C8B-43E4-B81B-C8492DF26C90}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample", "SkiaSharpSample\SkiaSharpSample.csproj", "{28E3F6BA-ECCD-4925-B322-2BB47304A76C}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph.Classic", "..\..\..\binding\SkiaSharp.SceneGraph.Classic\SkiaSharp.SceneGraph.Classic.csproj", "{71C2FB6D-A0CE-4190-A4FF-4EC11161125E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie.Classic", "..\..\..\binding\SkiaSharp.Skottie.Classic\SkiaSharp.Skottie.Classic.csproj", "{BBC2A850-4E09-4AE8-9455-1B9F2B0BA3FF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -83,6 +87,30 @@ Global {28E3F6BA-ECCD-4925-B322-2BB47304A76C}.Release|iPhone.Build.0 = Release|iPhone {28E3F6BA-ECCD-4925-B322-2BB47304A76C}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator {28E3F6BA-ECCD-4925-B322-2BB47304A76C}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator + {71C2FB6D-A0CE-4190-A4FF-4EC11161125E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {71C2FB6D-A0CE-4190-A4FF-4EC11161125E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {71C2FB6D-A0CE-4190-A4FF-4EC11161125E}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {71C2FB6D-A0CE-4190-A4FF-4EC11161125E}.Debug|iPhone.Build.0 = Debug|Any CPU + {71C2FB6D-A0CE-4190-A4FF-4EC11161125E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {71C2FB6D-A0CE-4190-A4FF-4EC11161125E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {71C2FB6D-A0CE-4190-A4FF-4EC11161125E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {71C2FB6D-A0CE-4190-A4FF-4EC11161125E}.Release|Any CPU.Build.0 = Release|Any CPU + {71C2FB6D-A0CE-4190-A4FF-4EC11161125E}.Release|iPhone.ActiveCfg = Release|Any CPU + {71C2FB6D-A0CE-4190-A4FF-4EC11161125E}.Release|iPhone.Build.0 = Release|Any CPU + {71C2FB6D-A0CE-4190-A4FF-4EC11161125E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {71C2FB6D-A0CE-4190-A4FF-4EC11161125E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {BBC2A850-4E09-4AE8-9455-1B9F2B0BA3FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BBC2A850-4E09-4AE8-9455-1B9F2B0BA3FF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BBC2A850-4E09-4AE8-9455-1B9F2B0BA3FF}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {BBC2A850-4E09-4AE8-9455-1B9F2B0BA3FF}.Debug|iPhone.Build.0 = Debug|Any CPU + {BBC2A850-4E09-4AE8-9455-1B9F2B0BA3FF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {BBC2A850-4E09-4AE8-9455-1B9F2B0BA3FF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {BBC2A850-4E09-4AE8-9455-1B9F2B0BA3FF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BBC2A850-4E09-4AE8-9455-1B9F2B0BA3FF}.Release|Any CPU.Build.0 = Release|Any CPU + {BBC2A850-4E09-4AE8-9455-1B9F2B0BA3FF}.Release|iPhone.ActiveCfg = Release|Any CPU + {BBC2A850-4E09-4AE8-9455-1B9F2B0BA3FF}.Release|iPhone.Build.0 = Release|Any CPU + {BBC2A850-4E09-4AE8-9455-1B9F2B0BA3FF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {BBC2A850-4E09-4AE8-9455-1B9F2B0BA3FF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj index 69732a874c5..72050dc923c 100644 --- a/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/tvOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -94,6 +94,14 @@ {5180e370-a455-42bb-99f9-97bd269b8a52} SkiaSharp.Classic + + {71c2fb6d-a0ce-4190-a4ff-4ec11161125e} + SkiaSharp.SceneGraph.Classic + + + {bbc2a850-4e09-4ae8-9455-1b9f2b0ba3ff} + SkiaSharp.Skottie.Classic + {233220cc-f0f3-4c44-9736-ed2cfc363fd3} SkiaSharp.HarfBuzz @@ -112,25 +120,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Mobile/SkiaSharp.Views.Uno.WinUI.Mobile.csproj b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Mobile/SkiaSharp.Views.Uno.WinUI.Mobile.csproj index 5a861a20e52..764148fa980 100644 --- a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Mobile/SkiaSharp.Views.Uno.WinUI.Mobile.csproj +++ b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Mobile/SkiaSharp.Views.Uno.WinUI.Mobile.csproj @@ -5,6 +5,7 @@ SkiaSharp.Views.Windows SkiaSharp.Views.Uno.WinUI SkiaSharp.Views.Uno.WinUI + false $(NoWarn);CA1416 diff --git a/source/SkiaSharpSource.Linux.sln b/source/SkiaSharpSource.Linux.sln index 4e65771216d..577ee424837 100644 --- a/source/SkiaSharpSource.Linux.sln +++ b/source/SkiaSharpSource.Linux.sln @@ -59,6 +59,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.WinUI.S EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.WinUI.Wasm", "SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.WinUI.Wasm\SkiaSharp.Views.Uno.WinUI.Wasm.csproj", "{130722A9-BF7A-4EB9-A15B-6C57F1B85A0D}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.SceneGraph", "SkiaSharp.SceneGraph", "{5EB04E9F-7D24-4514-B1AA-85522F3FF191}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph", "..\binding\SkiaSharp.SceneGraph\SkiaSharp.SceneGraph.csproj", "{4C9A9D21-048D-42F3-BFD2-3AB9A73EA845}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph.Classic", "..\binding\SkiaSharp.SceneGraph.Classic\SkiaSharp.SceneGraph.Classic.csproj", "{CC13888E-1ADD-44F9-A921-8166B50B4C7D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Skottie", "SkiaSharp.Skottie", "{4E3F2893-F4D1-445A-9C32-6DFC361B588F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie", "..\binding\SkiaSharp.Skottie\SkiaSharp.Skottie.csproj", "{174F6006-3F36-4138-A49D-97E8ED060A27}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie.Classic", "..\binding\SkiaSharp.Skottie.Classic\SkiaSharp.Skottie.Classic.csproj", "{25A96A91-B961-4360-AFB2-DF459180D5D5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -145,6 +157,22 @@ Global {130722A9-BF7A-4EB9-A15B-6C57F1B85A0D}.Debug|Any CPU.Build.0 = Debug|Any CPU {130722A9-BF7A-4EB9-A15B-6C57F1B85A0D}.Release|Any CPU.ActiveCfg = Release|Any CPU {130722A9-BF7A-4EB9-A15B-6C57F1B85A0D}.Release|Any CPU.Build.0 = Release|Any CPU + {4C9A9D21-048D-42F3-BFD2-3AB9A73EA845}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4C9A9D21-048D-42F3-BFD2-3AB9A73EA845}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4C9A9D21-048D-42F3-BFD2-3AB9A73EA845}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4C9A9D21-048D-42F3-BFD2-3AB9A73EA845}.Release|Any CPU.Build.0 = Release|Any CPU + {CC13888E-1ADD-44F9-A921-8166B50B4C7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CC13888E-1ADD-44F9-A921-8166B50B4C7D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CC13888E-1ADD-44F9-A921-8166B50B4C7D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CC13888E-1ADD-44F9-A921-8166B50B4C7D}.Release|Any CPU.Build.0 = Release|Any CPU + {174F6006-3F36-4138-A49D-97E8ED060A27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {174F6006-3F36-4138-A49D-97E8ED060A27}.Debug|Any CPU.Build.0 = Debug|Any CPU + {174F6006-3F36-4138-A49D-97E8ED060A27}.Release|Any CPU.ActiveCfg = Release|Any CPU + {174F6006-3F36-4138-A49D-97E8ED060A27}.Release|Any CPU.Build.0 = Release|Any CPU + {25A96A91-B961-4360-AFB2-DF459180D5D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {25A96A91-B961-4360-AFB2-DF459180D5D5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {25A96A91-B961-4360-AFB2-DF459180D5D5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {25A96A91-B961-4360-AFB2-DF459180D5D5}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -170,6 +198,10 @@ Global {22AB3E3B-B753-465D-BED6-2BB7A0887085} = {E13F3D9A-BC92-4F6E-8D62-1FB24CE189DA} {2FD315FC-CA6A-4762-9746-1F18540A94D6} = {E13F3D9A-BC92-4F6E-8D62-1FB24CE189DA} {130722A9-BF7A-4EB9-A15B-6C57F1B85A0D} = {E13F3D9A-BC92-4F6E-8D62-1FB24CE189DA} + {4C9A9D21-048D-42F3-BFD2-3AB9A73EA845} = {5EB04E9F-7D24-4514-B1AA-85522F3FF191} + {CC13888E-1ADD-44F9-A921-8166B50B4C7D} = {5EB04E9F-7D24-4514-B1AA-85522F3FF191} + {174F6006-3F36-4138-A49D-97E8ED060A27} = {4E3F2893-F4D1-445A-9C32-6DFC361B588F} + {25A96A91-B961-4360-AFB2-DF459180D5D5} = {4E3F2893-F4D1-445A-9C32-6DFC361B588F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B4229170-607D-4886-9990-8FD5D86220B9} diff --git a/source/SkiaSharpSource.Mac.slnf b/source/SkiaSharpSource.Mac.slnf index 56b2fdbd19c..2d14b8a92cd 100644 --- a/source/SkiaSharpSource.Mac.slnf +++ b/source/SkiaSharpSource.Mac.slnf @@ -5,6 +5,10 @@ "..\\binding\\HarfBuzzSharp.Classic\\HarfBuzzSharp.Classic.csproj", "..\\binding\\HarfBuzzSharp\\HarfBuzzSharp.csproj", "..\\binding\\SkiaSharp.Classic\\SkiaSharp.Classic.csproj", + "..\\binding\\SkiaSharp.SceneGraph.Classic\\SkiaSharp.SceneGraph.Classic.csproj", + "..\\binding\\SkiaSharp.SceneGraph\\SkiaSharp.SceneGraph.csproj", + "..\\binding\\SkiaSharp.Skottie.Classic\\SkiaSharp.Skottie.Classic.csproj", + "..\\binding\\SkiaSharp.Skottie\\SkiaSharp.Skottie.csproj", "..\\binding\\SkiaSharp\\SkiaSharp.csproj", "SkiaSharp.DotNet.Interactive\\SkiaSharp.DotNet.Interactive.csproj", "SkiaSharp.HarfBuzz\\SkiaSharp.HarfBuzz\\SkiaSharp.HarfBuzz.csproj", diff --git a/source/SkiaSharpSource.Windows-net6.slnf b/source/SkiaSharpSource.Windows-net6.slnf index 343794f25ce..8d90e73f822 100644 --- a/source/SkiaSharpSource.Windows-net6.slnf +++ b/source/SkiaSharpSource.Windows-net6.slnf @@ -3,6 +3,8 @@ "path": "SkiaSharpSource.sln", "projects": [ "..\\binding\\HarfBuzzSharp\\HarfBuzzSharp.csproj", + "..\\binding\\SkiaSharp.SceneGraph\\SkiaSharp.SceneGraph.csproj", + "..\\binding\\SkiaSharp.Skottie\\SkiaSharp.Skottie.csproj", "..\\binding\\SkiaSharp\\SkiaSharp.csproj", "SkiaSharp.Views.Blazor\\SkiaSharp.Views.Blazor\\SkiaSharp.Views.Blazor.csproj", "SkiaSharp.Views.Maui\\SkiaSharp.Views.Maui.Controls.Compatibility\\SkiaSharp.Views.Maui.Controls.Compatibility.csproj", diff --git a/source/SkiaSharpSource.Windows-netfx.slnf b/source/SkiaSharpSource.Windows-netfx.slnf index 829105ac635..03061d110a2 100644 --- a/source/SkiaSharpSource.Windows-netfx.slnf +++ b/source/SkiaSharpSource.Windows-netfx.slnf @@ -5,6 +5,10 @@ "..\\binding\\HarfBuzzSharp.Classic\\HarfBuzzSharp.Classic.csproj", "..\\binding\\HarfBuzzSharp\\HarfBuzzSharp.csproj", "..\\binding\\SkiaSharp.Classic\\SkiaSharp.Classic.csproj", + "..\\binding\\SkiaSharp.SceneGraph.Classic\\SkiaSharp.SceneGraph.Classic.csproj", + "..\\binding\\SkiaSharp.SceneGraph\\SkiaSharp.SceneGraph.csproj", + "..\\binding\\SkiaSharp.Skottie.Classic\\SkiaSharp.Skottie.Classic.csproj", + "..\\binding\\SkiaSharp.Skottie\\SkiaSharp.Skottie.csproj", "..\\binding\\SkiaSharp\\SkiaSharp.csproj", "SkiaSharp.DotNet.Interactive\\SkiaSharp.DotNet.Interactive.csproj", "SkiaSharp.HarfBuzz\\SkiaSharp.HarfBuzz\\SkiaSharp.HarfBuzz.csproj", diff --git a/source/SkiaSharpSource.Windows.slnf b/source/SkiaSharpSource.Windows.slnf index 8d1f7a06d3a..1f784a433e2 100644 --- a/source/SkiaSharpSource.Windows.slnf +++ b/source/SkiaSharpSource.Windows.slnf @@ -5,6 +5,8 @@ "..\\binding\\HarfBuzzSharp.Classic\\HarfBuzzSharp.Classic.csproj", "..\\binding\\HarfBuzzSharp\\HarfBuzzSharp.csproj", "..\\binding\\SkiaSharp.Classic\\SkiaSharp.Classic.csproj", + "..\\binding\\SkiaSharp.SceneGraph\\SkiaSharp.SceneGraph.csproj", + "..\\binding\\SkiaSharp.Skottie\\SkiaSharp.Skottie.csproj", "..\\binding\\SkiaSharp\\SkiaSharp.csproj", "SkiaSharp.DotNet.Interactive\\SkiaSharp.DotNet.Interactive.csproj", "SkiaSharp.HarfBuzz\\SkiaSharp.HarfBuzz\\SkiaSharp.HarfBuzz.csproj", diff --git a/source/SkiaSharpSource.sln b/source/SkiaSharpSource.sln index fc9af0cf8d4..52a98ec711d 100644 --- a/source/SkiaSharpSource.sln +++ b/source/SkiaSharpSource.sln @@ -109,6 +109,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.WinUI.M EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Uno.WinUI.Reference", "SkiaSharp.Views.Uno\SkiaSharp.Views.Uno.WinUI.Reference\SkiaSharp.Views.Uno.WinUI.Reference.csproj", "{E5D299A3-548F-4529-B804-436228685E8D}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.SceneGraph", "SkiaSharp.SceneGraph", "{5EB04E9F-7D24-4514-B1AA-85522F3FF191}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph", "..\binding\SkiaSharp.SceneGraph\SkiaSharp.SceneGraph.csproj", "{4C9A9D21-048D-42F3-BFD2-3AB9A73EA845}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph.Classic", "..\binding\SkiaSharp.SceneGraph.Classic\SkiaSharp.SceneGraph.Classic.csproj", "{CC13888E-1ADD-44F9-A921-8166B50B4C7D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Skottie", "SkiaSharp.Skottie", "{4E3F2893-F4D1-445A-9C32-6DFC361B588F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie", "..\binding\SkiaSharp.Skottie\SkiaSharp.Skottie.csproj", "{174F6006-3F36-4138-A49D-97E8ED060A27}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie.Classic", "..\binding\SkiaSharp.Skottie.Classic\SkiaSharp.Skottie.Classic.csproj", "{25A96A91-B961-4360-AFB2-DF459180D5D5}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Views.Blazor", "SkiaSharp.Views.Blazor", "{A534A8E1-BC73-40FD-A1F2-4D0BFC1C3B9B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Blazor", "SkiaSharp.Views.Blazor\SkiaSharp.Views.Blazor\SkiaSharp.Views.Blazor.csproj", "{49CD7B31-1E15-4843-97CF-829449D1180E}" @@ -293,6 +305,22 @@ Global {E5D299A3-548F-4529-B804-436228685E8D}.Debug|Any CPU.Build.0 = Debug|Any CPU {E5D299A3-548F-4529-B804-436228685E8D}.Release|Any CPU.ActiveCfg = Release|Any CPU {E5D299A3-548F-4529-B804-436228685E8D}.Release|Any CPU.Build.0 = Release|Any CPU + {4C9A9D21-048D-42F3-BFD2-3AB9A73EA845}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4C9A9D21-048D-42F3-BFD2-3AB9A73EA845}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4C9A9D21-048D-42F3-BFD2-3AB9A73EA845}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4C9A9D21-048D-42F3-BFD2-3AB9A73EA845}.Release|Any CPU.Build.0 = Release|Any CPU + {CC13888E-1ADD-44F9-A921-8166B50B4C7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CC13888E-1ADD-44F9-A921-8166B50B4C7D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CC13888E-1ADD-44F9-A921-8166B50B4C7D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CC13888E-1ADD-44F9-A921-8166B50B4C7D}.Release|Any CPU.Build.0 = Release|Any CPU + {174F6006-3F36-4138-A49D-97E8ED060A27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {174F6006-3F36-4138-A49D-97E8ED060A27}.Debug|Any CPU.Build.0 = Debug|Any CPU + {174F6006-3F36-4138-A49D-97E8ED060A27}.Release|Any CPU.ActiveCfg = Release|Any CPU + {174F6006-3F36-4138-A49D-97E8ED060A27}.Release|Any CPU.Build.0 = Release|Any CPU + {25A96A91-B961-4360-AFB2-DF459180D5D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {25A96A91-B961-4360-AFB2-DF459180D5D5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {25A96A91-B961-4360-AFB2-DF459180D5D5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {25A96A91-B961-4360-AFB2-DF459180D5D5}.Release|Any CPU.Build.0 = Release|Any CPU {49CD7B31-1E15-4843-97CF-829449D1180E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {49CD7B31-1E15-4843-97CF-829449D1180E}.Debug|Any CPU.Build.0 = Debug|Any CPU {49CD7B31-1E15-4843-97CF-829449D1180E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -345,6 +373,10 @@ Global {70257CDC-1D0E-4C40-A6C1-7043FAFBBE3B} = {E53351EA-FE40-47D2-B388-4A75DA6CCD71} {7F5BA5C1-F3AF-468F-97B2-EE20ECC5A9C3} = {E53351EA-FE40-47D2-B388-4A75DA6CCD71} {E5D299A3-548F-4529-B804-436228685E8D} = {E53351EA-FE40-47D2-B388-4A75DA6CCD71} + {4C9A9D21-048D-42F3-BFD2-3AB9A73EA845} = {5EB04E9F-7D24-4514-B1AA-85522F3FF191} + {CC13888E-1ADD-44F9-A921-8166B50B4C7D} = {5EB04E9F-7D24-4514-B1AA-85522F3FF191} + {174F6006-3F36-4138-A49D-97E8ED060A27} = {4E3F2893-F4D1-445A-9C32-6DFC361B588F} + {25A96A91-B961-4360-AFB2-DF459180D5D5} = {4E3F2893-F4D1-445A-9C32-6DFC361B588F} {49CD7B31-1E15-4843-97CF-829449D1180E} = {A534A8E1-BC73-40FD-A1F2-4D0BFC1C3B9B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/tests/SkiaSharp.Android.Tests.sln b/tests/SkiaSharp.Android.Tests.sln index d88ee5bdf94..71078dfd8c9 100644 --- a/tests/SkiaSharp.Android.Tests.sln +++ b/tests/SkiaSharp.Android.Tests.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31004.235 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32515.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Android.Tests", "SkiaSharp.Android.Tests\SkiaSharp.Android.Tests.csproj", "{CB2072E0-A437-4811-AE17-16CAE0DDA1B1}" EndProject @@ -19,6 +19,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\binding EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\binding\SkiaSharp\SkiaSharp.csproj", "{B9C1E6E5-D56B-4B10-946C-6493AE1C57FA}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph", "..\binding\SkiaSharp.SceneGraph\SkiaSharp.SceneGraph.csproj", "{939AED60-90A8-464C-A096-D718BC2E3B16}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie", "..\binding\SkiaSharp.Skottie\SkiaSharp.Skottie.csproj", "{473DBF64-6F98-4AFE-A9BC-2D3942660341}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -59,6 +63,14 @@ Global {B9C1E6E5-D56B-4B10-946C-6493AE1C57FA}.Debug|Any CPU.Build.0 = Debug|Any CPU {B9C1E6E5-D56B-4B10-946C-6493AE1C57FA}.Release|Any CPU.ActiveCfg = Release|Any CPU {B9C1E6E5-D56B-4B10-946C-6493AE1C57FA}.Release|Any CPU.Build.0 = Release|Any CPU + {939AED60-90A8-464C-A096-D718BC2E3B16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {939AED60-90A8-464C-A096-D718BC2E3B16}.Debug|Any CPU.Build.0 = Debug|Any CPU + {939AED60-90A8-464C-A096-D718BC2E3B16}.Release|Any CPU.ActiveCfg = Release|Any CPU + {939AED60-90A8-464C-A096-D718BC2E3B16}.Release|Any CPU.Build.0 = Release|Any CPU + {473DBF64-6F98-4AFE-A9BC-2D3942660341}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {473DBF64-6F98-4AFE-A9BC-2D3942660341}.Debug|Any CPU.Build.0 = Debug|Any CPU + {473DBF64-6F98-4AFE-A9BC-2D3942660341}.Release|Any CPU.ActiveCfg = Release|Any CPU + {473DBF64-6F98-4AFE-A9BC-2D3942660341}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/tests/SkiaSharp.Android.Tests/SkiaSharp.Android.Tests.csproj b/tests/SkiaSharp.Android.Tests/SkiaSharp.Android.Tests.csproj index 1ed0e50d969..5cde13e7180 100644 --- a/tests/SkiaSharp.Android.Tests/SkiaSharp.Android.Tests.csproj +++ b/tests/SkiaSharp.Android.Tests/SkiaSharp.Android.Tests.csproj @@ -80,6 +80,14 @@ {d7e86b8f-4e7d-4be9-a740-d0f5ac9392e5} SkiaSharp.Classic + + {939aed60-90a8-464c-a096-d718bc2e3b16} + SkiaSharp.SceneGraph + + + {473dbf64-6f98-4afe-a9bc-2d3942660341} + SkiaSharp.Skottie + {4c5f53b5-9dfd-4cc6-8fae-98b4f40cb33a} SkiaSharp.HarfBuzz diff --git a/tests/SkiaSharp.Desktop.Tests.sln b/tests/SkiaSharp.Desktop.Tests.sln index 786e40faaf7..bd9adfd9861 100644 --- a/tests/SkiaSharp.Desktop.Tests.sln +++ b/tests/SkiaSharp.Desktop.Tests.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29930.152 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32515.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Desktop.Tests", "SkiaSharp.Desktop.Tests\SkiaSharp.Desktop.Tests.csproj", "{F0179CDB-9435-4FB4-8E52-DBF191079491}" EndProject @@ -15,6 +15,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Vulkan.Desktop.Te EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Vulkan.SharpVk", "..\source\SkiaSharp.Vulkan\SkiaSharp.Vulkan.SharpVk\SkiaSharp.Vulkan.SharpVk.csproj", "{A53DD2E5-55C4-4F7C-9316-D7FAD9A6F19F}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie", "..\binding\SkiaSharp.Skottie\SkiaSharp.Skottie.csproj", "{4641900B-98CB-4694-BB73-F855F37AB3BF}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph", "..\binding\SkiaSharp.SceneGraph\SkiaSharp.SceneGraph.csproj", "{A7DF85DD-0533-44AB-86E7-BB848AC4D949}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -97,6 +101,30 @@ Global {A53DD2E5-55C4-4F7C-9316-D7FAD9A6F19F}.Release|x64.Build.0 = Release|Any CPU {A53DD2E5-55C4-4F7C-9316-D7FAD9A6F19F}.Release|x86.ActiveCfg = Release|Any CPU {A53DD2E5-55C4-4F7C-9316-D7FAD9A6F19F}.Release|x86.Build.0 = Release|Any CPU + {4641900B-98CB-4694-BB73-F855F37AB3BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4641900B-98CB-4694-BB73-F855F37AB3BF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4641900B-98CB-4694-BB73-F855F37AB3BF}.Debug|x64.ActiveCfg = Debug|Any CPU + {4641900B-98CB-4694-BB73-F855F37AB3BF}.Debug|x64.Build.0 = Debug|Any CPU + {4641900B-98CB-4694-BB73-F855F37AB3BF}.Debug|x86.ActiveCfg = Debug|Any CPU + {4641900B-98CB-4694-BB73-F855F37AB3BF}.Debug|x86.Build.0 = Debug|Any CPU + {4641900B-98CB-4694-BB73-F855F37AB3BF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4641900B-98CB-4694-BB73-F855F37AB3BF}.Release|Any CPU.Build.0 = Release|Any CPU + {4641900B-98CB-4694-BB73-F855F37AB3BF}.Release|x64.ActiveCfg = Release|Any CPU + {4641900B-98CB-4694-BB73-F855F37AB3BF}.Release|x64.Build.0 = Release|Any CPU + {4641900B-98CB-4694-BB73-F855F37AB3BF}.Release|x86.ActiveCfg = Release|Any CPU + {4641900B-98CB-4694-BB73-F855F37AB3BF}.Release|x86.Build.0 = Release|Any CPU + {A7DF85DD-0533-44AB-86E7-BB848AC4D949}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A7DF85DD-0533-44AB-86E7-BB848AC4D949}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A7DF85DD-0533-44AB-86E7-BB848AC4D949}.Debug|x64.ActiveCfg = Debug|Any CPU + {A7DF85DD-0533-44AB-86E7-BB848AC4D949}.Debug|x64.Build.0 = Debug|Any CPU + {A7DF85DD-0533-44AB-86E7-BB848AC4D949}.Debug|x86.ActiveCfg = Debug|Any CPU + {A7DF85DD-0533-44AB-86E7-BB848AC4D949}.Debug|x86.Build.0 = Debug|Any CPU + {A7DF85DD-0533-44AB-86E7-BB848AC4D949}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A7DF85DD-0533-44AB-86E7-BB848AC4D949}.Release|Any CPU.Build.0 = Release|Any CPU + {A7DF85DD-0533-44AB-86E7-BB848AC4D949}.Release|x64.ActiveCfg = Release|Any CPU + {A7DF85DD-0533-44AB-86E7-BB848AC4D949}.Release|x64.Build.0 = Release|Any CPU + {A7DF85DD-0533-44AB-86E7-BB848AC4D949}.Release|x86.ActiveCfg = Release|Any CPU + {A7DF85DD-0533-44AB-86E7-BB848AC4D949}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/tests/SkiaSharp.Desktop.Tests/SkiaSharp.Desktop.Tests.csproj b/tests/SkiaSharp.Desktop.Tests/SkiaSharp.Desktop.Tests.csproj index 7b63795d0f0..7a49e496df6 100644 --- a/tests/SkiaSharp.Desktop.Tests/SkiaSharp.Desktop.Tests.csproj +++ b/tests/SkiaSharp.Desktop.Tests/SkiaSharp.Desktop.Tests.csproj @@ -82,6 +82,14 @@ {e1ec00b1-6cae-4e80-80ca-dbd300fb699f} HarfBuzzSharp + + {a7df85dd-0533-44ab-86e7-bb848ac4d949} + SkiaSharp.SceneGraph + + + {4641900b-98cb-4694-bb73-f855f37ab3bf} + SkiaSharp.Skottie + {e0fcc609-2cd1-4b35-ba81-80c3f25410b0} SkiaSharp diff --git a/tests/SkiaSharp.NetCore.Tests.sln b/tests/SkiaSharp.NetCore.Tests.sln index 295fd384fa3..cd4bd0c3b2a 100644 --- a/tests/SkiaSharp.NetCore.Tests.sln +++ b/tests/SkiaSharp.NetCore.Tests.sln @@ -15,6 +15,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Vulkan.NetCore.Te EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Vulkan.SharpVk", "..\source\SkiaSharp.Vulkan\SkiaSharp.Vulkan.SharpVk\SkiaSharp.Vulkan.SharpVk.csproj", "{A53DD2E5-55C4-4F7C-9316-D7FAD9A6F19F}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph", "..\binding\SkiaSharp.SceneGraph\SkiaSharp.SceneGraph.csproj", "{978AD2C6-E592-4F5E-B565-26C357877B2C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie", "..\binding\SkiaSharp.Skottie\SkiaSharp.Skottie.csproj", "{D35696BA-3038-41F2-9BE9-181439E6EF9E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -45,6 +49,14 @@ Global {A53DD2E5-55C4-4F7C-9316-D7FAD9A6F19F}.Debug|Any CPU.Build.0 = Debug|Any CPU {A53DD2E5-55C4-4F7C-9316-D7FAD9A6F19F}.Release|Any CPU.ActiveCfg = Release|Any CPU {A53DD2E5-55C4-4F7C-9316-D7FAD9A6F19F}.Release|Any CPU.Build.0 = Release|Any CPU + {978AD2C6-E592-4F5E-B565-26C357877B2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {978AD2C6-E592-4F5E-B565-26C357877B2C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {978AD2C6-E592-4F5E-B565-26C357877B2C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {978AD2C6-E592-4F5E-B565-26C357877B2C}.Release|Any CPU.Build.0 = Release|Any CPU + {D35696BA-3038-41F2-9BE9-181439E6EF9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D35696BA-3038-41F2-9BE9-181439E6EF9E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D35696BA-3038-41F2-9BE9-181439E6EF9E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D35696BA-3038-41F2-9BE9-181439E6EF9E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.csproj b/tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.csproj index 99f1c9d410b..725f87ac2da 100644 --- a/tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.csproj +++ b/tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.csproj @@ -17,6 +17,8 @@ + + diff --git a/tests/SkiaSharp.Vulkan.NetCore.Tests/SkiaSharp.Vulkan.NetCore.Tests.csproj b/tests/SkiaSharp.Vulkan.NetCore.Tests/SkiaSharp.Vulkan.NetCore.Tests.csproj index 519741c2323..b372156930e 100644 --- a/tests/SkiaSharp.Vulkan.NetCore.Tests/SkiaSharp.Vulkan.NetCore.Tests.csproj +++ b/tests/SkiaSharp.Vulkan.NetCore.Tests/SkiaSharp.Vulkan.NetCore.Tests.csproj @@ -20,6 +20,8 @@ + + diff --git a/tests/SkiaSharp.Wasm.Tests/SkiaSharp.Wasm.Tests.csproj b/tests/SkiaSharp.Wasm.Tests/SkiaSharp.Wasm.Tests.csproj index 98c932cb1c2..b6cee03ef80 100644 --- a/tests/SkiaSharp.Wasm.Tests/SkiaSharp.Wasm.Tests.csproj +++ b/tests/SkiaSharp.Wasm.Tests/SkiaSharp.Wasm.Tests.csproj @@ -25,6 +25,8 @@ + + diff --git a/tests/SkiaSharp.iOS.Tests.sln b/tests/SkiaSharp.iOS.Tests.sln index 07639ab648e..843d6699761 100644 --- a/tests/SkiaSharp.iOS.Tests.sln +++ b/tests/SkiaSharp.iOS.Tests.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.808.5 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32515.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Classic", "..\binding\SkiaSharp.Classic\SkiaSharp.Classic.csproj", "{A4146A87-DB60-4A17-A179-0E2E4255A08E}" EndProject @@ -19,6 +19,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\binding EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\binding\SkiaSharp\SkiaSharp.csproj", "{A694283C-FE40-4049-88AB-2CAE678FC087}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.SceneGraph.Classic", "..\binding\SkiaSharp.SceneGraph.Classic\SkiaSharp.SceneGraph.Classic.csproj", "{0090DD8B-33F1-4660-B1B1-6D06FB7F2C65}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Skottie.Classic", "..\binding\SkiaSharp.Skottie.Classic\SkiaSharp.Skottie.Classic.csproj", "{0829C9E6-D694-4024-8F10-921CF90156B7}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -125,6 +129,30 @@ Global {A694283C-FE40-4049-88AB-2CAE678FC087}.Release|iPhone.Build.0 = Release|Any CPU {A694283C-FE40-4049-88AB-2CAE678FC087}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {A694283C-FE40-4049-88AB-2CAE678FC087}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {0090DD8B-33F1-4660-B1B1-6D06FB7F2C65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0090DD8B-33F1-4660-B1B1-6D06FB7F2C65}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0090DD8B-33F1-4660-B1B1-6D06FB7F2C65}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {0090DD8B-33F1-4660-B1B1-6D06FB7F2C65}.Debug|iPhone.Build.0 = Debug|Any CPU + {0090DD8B-33F1-4660-B1B1-6D06FB7F2C65}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {0090DD8B-33F1-4660-B1B1-6D06FB7F2C65}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {0090DD8B-33F1-4660-B1B1-6D06FB7F2C65}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0090DD8B-33F1-4660-B1B1-6D06FB7F2C65}.Release|Any CPU.Build.0 = Release|Any CPU + {0090DD8B-33F1-4660-B1B1-6D06FB7F2C65}.Release|iPhone.ActiveCfg = Release|Any CPU + {0090DD8B-33F1-4660-B1B1-6D06FB7F2C65}.Release|iPhone.Build.0 = Release|Any CPU + {0090DD8B-33F1-4660-B1B1-6D06FB7F2C65}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {0090DD8B-33F1-4660-B1B1-6D06FB7F2C65}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {0829C9E6-D694-4024-8F10-921CF90156B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0829C9E6-D694-4024-8F10-921CF90156B7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0829C9E6-D694-4024-8F10-921CF90156B7}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {0829C9E6-D694-4024-8F10-921CF90156B7}.Debug|iPhone.Build.0 = Debug|Any CPU + {0829C9E6-D694-4024-8F10-921CF90156B7}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {0829C9E6-D694-4024-8F10-921CF90156B7}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {0829C9E6-D694-4024-8F10-921CF90156B7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0829C9E6-D694-4024-8F10-921CF90156B7}.Release|Any CPU.Build.0 = Release|Any CPU + {0829C9E6-D694-4024-8F10-921CF90156B7}.Release|iPhone.ActiveCfg = Release|Any CPU + {0829C9E6-D694-4024-8F10-921CF90156B7}.Release|iPhone.Build.0 = Release|Any CPU + {0829C9E6-D694-4024-8F10-921CF90156B7}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {0829C9E6-D694-4024-8F10-921CF90156B7}.Release|iPhoneSimulator.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/tests/SkiaSharp.iOS.Tests/SkiaSharp.iOS.Tests.csproj b/tests/SkiaSharp.iOS.Tests/SkiaSharp.iOS.Tests.csproj index caf66393e7b..26ba98716b4 100644 --- a/tests/SkiaSharp.iOS.Tests/SkiaSharp.iOS.Tests.csproj +++ b/tests/SkiaSharp.iOS.Tests/SkiaSharp.iOS.Tests.csproj @@ -119,6 +119,14 @@ {D958E2E9-DE32-42E8-AB10-D25E4186C4E1} HarfBuzzSharp.Classic + + {0090dd8b-33f1-4660-b1b1-6d06fb7f2c65} + SkiaSharp.SceneGraph.Classic + + + {0829c9e6-d694-4024-8f10-921cf90156b7} + SkiaSharp.Skottie.Classic + {A5614B8C-31C8-43A3-9BF9-2719E4BE4D36} SkiaSharp.HarfBuzz diff --git a/tests/Tests/ApiTests.cs b/tests/Tests/ApiTests.cs index 20e9e76a47f..03d555367ab 100644 --- a/tests/Tests/ApiTests.cs +++ b/tests/Tests/ApiTests.cs @@ -13,14 +13,18 @@ public class ApiTest : BaseTest { private static IEnumerable InteropApiTypes => new[] { - typeof(SkiaSharp.SKNativeObject).Assembly.GetType("SkiaSharp.SkiaApi"), - typeof(HarfBuzzSharp.NativeObject).Assembly.GetType("HarfBuzzSharp.HarfBuzzApi") + typeof(SkiaSharp.SkiaApi), + typeof(HarfBuzzSharp.HarfBuzzApi), + typeof(SkiaSharp.SceneGraphApi), + typeof(SkiaSharp.SkottieApi), }; private static IEnumerable InteropApiDelegatesTypes => new[] { - typeof(SkiaSharp.SKNativeObject).Assembly.GetType("SkiaSharp.SkiaApi+Delegates"), - typeof(HarfBuzzSharp.NativeObject).Assembly.GetType("HarfBuzzSharp.HarfBuzzApi+Delegates") + typeof(SkiaSharp.SkiaApi).Assembly.GetType("SkiaSharp.SkiaApi+Delegates"), + typeof(HarfBuzzSharp.HarfBuzzApi).Assembly.GetType("HarfBuzzSharp.HarfBuzzApi+Delegates"), + typeof(SkiaSharp.SceneGraphApi).Assembly.GetType("SkiaSharp.SceneGraphApi+Delegates"), + typeof(SkiaSharp.SkottieApi).Assembly.GetType("SkiaSharp.SkottieApi+Delegates"), }; private static IEnumerable InteropMembers => diff --git a/utils/README.md b/utils/README.md index 00e0a87469c..896c4bf2d38 100644 --- a/utils/README.md +++ b/utils/README.md @@ -12,11 +12,8 @@ This can be run with: ```pwsh dotnet run --project=utils/SkiaSharpGenerator/SkiaSharpGenerator.csproj -- generate --config binding/libSkiaSharp.json --skia externals/skia --output binding/Binding/SkiaApi.generated.cs -``` - -Or: - -```pwsh +dotnet run --project=utils/SkiaSharpGenerator/SkiaSharpGenerator.csproj -- generate --config binding/libSkiaSharp.Skottie.json --skia externals/skia --output binding/SkiaSharp.Skottie/SkottieApi.generated.cs +dotnet run --project=utils/SkiaSharpGenerator/SkiaSharpGenerator.csproj -- generate --config binding/libSkiaSharp.SceneGraph.json --skia externals/skia --output binding/SkiaSharp.SceneGraph/SceneGraphApi.generated.cs dotnet run --project=utils/SkiaSharpGenerator/SkiaSharpGenerator.csproj -- generate --config binding/libHarfBuzzSharp.json --skia externals/skia/third_party/externals/harfbuzz --output binding/HarfBuzzSharp.Shared/HarfBuzzApi.generated.cs ```