Skip to content

Commit

Permalink
Update Docs for v2.80.2 (#1493)
Browse files Browse the repository at this point in the history
- updated the version of mono used to compile
- fixed an issue with the watchOS Xcode project and the new Xcode
  • Loading branch information
mattleibow authored Sep 10, 2020
1 parent 0ab468b commit 2019706
Show file tree
Hide file tree
Showing 27 changed files with 372 additions and 14 deletions.
19 changes: 10 additions & 9 deletions binding/Binding/SkiaSharpVersion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,34 +33,35 @@ public static Version Native {
public static bool CheckNativeLibraryCompatible (bool throwIfIncompatible = false) =>
CheckNativeLibraryCompatible (NativeMinimum, Native, throwIfIncompatible);

internal static bool CheckNativeLibraryCompatible (Version minimum, Version current, bool throwIfIncompatible = false)
internal static bool CheckNativeLibraryCompatible (Version minSupported, Version current, bool throwIfIncompatible = false)
{
minimum ??= Zero;
minSupported ??= Zero;
current ??= Zero;

// fail fast to success if SkiaSharp is compiled without a minimum
if (minimum <= Zero)
if (minSupported <= Zero)
return true;

var max = new Version (minimum.Major + 1, 0);
// get the next MAJOR version which is always incompatible
var maxSupported = new Version (minSupported.Major + 1, 0);

// fail fast if a pre-2.80 version of libSkiaSharp is loaded
if (current <= Zero) {
if (throwIfIncompatible)
throw new InvalidOperationException (
$"The version of the native libSkiaSharp library is incompatible with this version of SkiaSharp. " +
$"Supported versions of the native libSkiaSharp library are in the range [{minimum.ToString (2)}, {max.ToString (2)}).");
$"Supported versions of the native libSkiaSharp library are in the range [{minSupported.ToString (2)}, {maxSupported.ToString (2)}).");
return false;
}

var compat = current >= minimum && current < max;
var isIncompatible = current < minSupported || current >= maxSupported;

if (!compat && throwIfIncompatible)
if (isIncompatible && throwIfIncompatible)
throw new InvalidOperationException (
$"The version of the native libSkiaSharp library ({current.ToString (2)}) is incompatible with this version of SkiaSharp. " +
$"Supported versions of the native libSkiaSharp library are in the range [{minimum.ToString (2)}, {max.ToString (2)}).");
$"Supported versions of the native libSkiaSharp library are in the range [{minSupported.ToString (2)}, {maxSupported.ToString (2)}).");

return compat;
return !isIncompatible;
}
}
}
5 changes: 5 additions & 0 deletions changelogs/HarfBuzzSharp/2.6.1.7/HarfBuzzSharp.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# API diff: HarfBuzzSharp.dll

## HarfBuzzSharp.dll

> No changes.
5 changes: 5 additions & 0 deletions changelogs/SkiaSharp.HarfBuzz/2.80.2/SkiaSharp.HarfBuzz.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# API diff: SkiaSharp.HarfBuzz.dll

## SkiaSharp.HarfBuzz.dll

> No changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# API diff: SkiaSharp.Views.Desktop.Common.dll

## SkiaSharp.Views.Desktop.Common.dll

> No changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# API diff: SkiaSharp.Views.Forms.dll

## SkiaSharp.Views.Forms.dll

### Namespace SkiaSharp.Views.Forms

#### Type Changed: SkiaSharp.Views.Forms.Extensions

Added methods:

```csharp
public static Xamarin.Forms.Color ToFormsColor (this SkiaSharp.SKColorF color);
public static SkiaSharp.SKColorF ToSKColorF (this Xamarin.Forms.Color color);
```


#### Type Changed: SkiaSharp.Views.Forms.SKCanvasViewRenderer

Added method:

```csharp
protected override SkiaSharp.Views.Gtk.SKWidget CreateNativeControl ();
```



Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# API diff: SkiaSharp.Views.Forms.dll

## SkiaSharp.Views.Forms.dll

### Namespace SkiaSharp.Views.Forms

#### Type Changed: SkiaSharp.Views.Forms.Extensions

Added methods:

```csharp
public static Xamarin.Forms.Color ToFormsColor (this SkiaSharp.SKColorF color);
public static SkiaSharp.SKColorF ToSKColorF (this Xamarin.Forms.Color color);
```


#### Type Changed: SkiaSharp.Views.Forms.SKCanvasViewRenderer

Added method:

```csharp
protected override SkiaSharp.Views.WPF.SKElement CreateNativeControl ();
```


#### Type Changed: SkiaSharp.Views.Forms.SKGLViewRenderer

Added method:

```csharp
protected override SKHostedGLControl CreateNativeControl ();
```



17 changes: 17 additions & 0 deletions changelogs/SkiaSharp.Views.Forms/2.80.2/SkiaSharp.Views.Forms.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# API diff: SkiaSharp.Views.Forms.dll

## SkiaSharp.Views.Forms.dll

### Namespace SkiaSharp.Views.Forms

#### Type Changed: SkiaSharp.Views.Forms.Extensions

Added methods:

```csharp
public static Xamarin.Forms.Color ToFormsColor (this SkiaSharp.SKColorF color);
public static SkiaSharp.SKColorF ToSKColorF (this Xamarin.Forms.Color color);
```



5 changes: 5 additions & 0 deletions changelogs/SkiaSharp.Views.Gtk2/2.80.2/SkiaSharp.Views.Gtk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# API diff: SkiaSharp.Views.Gtk.dll

## SkiaSharp.Views.Gtk.dll

> No changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# API diff: SkiaSharp.Views.Gtk3.dll

## SkiaSharp.Views.Gtk3.dll

> No changes.
28 changes: 28 additions & 0 deletions changelogs/SkiaSharp.Views.Uno/2.80.2/SkiaSharp.Views.UWP.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# API diff: SkiaSharp.Views.UWP.dll

## SkiaSharp.Views.UWP.dll

### Namespace SkiaSharp.Views.UWP

#### New Type: SkiaSharp.Views.UWP.SKSwapChainPanel

```csharp
public class SKSwapChainPanel : Windows.UI.Xaml.FrameworkElement, System.Collections.IEnumerable, System.IDisposable, Uno.UI.DataBinding.IWeakReferenceProvider, Windows.UI.Composition.IAnimationObject, Windows.UI.Xaml.DependencyObject, Windows.UI.Xaml.IDataContextProvider, Windows.UI.Xaml.IDependencyObjectStoreProvider, Windows.UI.Xaml.IFrameworkElement, Windows.UI.Xaml.ILayoutConstraints, Windows.UI.Xaml.IUIElement {
// constructors
public SKSwapChainPanel ();
// properties
public SkiaSharp.SKSize CanvasSize { get; }
public double ContentsScale { get; }
public bool DrawInBackground { get; set; }
public bool EnableRenderLoop { get; set; }
public SkiaSharp.GRContext GRContext { get; }
// events
public event System.EventHandler<SKPaintGLSurfaceEventArgs> PaintSurface;
// methods
public void Invalidate ();
protected virtual void OnPaintSurface (SKPaintGLSurfaceEventArgs e);
}
```



5 changes: 5 additions & 0 deletions changelogs/SkiaSharp.Views.WPF/2.80.2/SkiaSharp.Views.WPF.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# API diff: SkiaSharp.Views.WPF.dll

## SkiaSharp.Views.WPF.dll

> No changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# API diff: SkiaSharp.Views.WindowsForms.dll

## SkiaSharp.Views.WindowsForms.dll

> No changes.
5 changes: 5 additions & 0 deletions changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.Android.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# API diff: SkiaSharp.Views.Android.dll

## SkiaSharp.Views.Android.dll

> No changes.
5 changes: 5 additions & 0 deletions changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.Desktop.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# API diff: SkiaSharp.Views.Desktop.dll

## SkiaSharp.Views.Desktop.dll

> No changes.
29 changes: 29 additions & 0 deletions changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.Mac.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# API diff: SkiaSharp.Views.Mac.dll

## SkiaSharp.Views.Mac.dll

### Namespace SkiaSharp.Views.Mac

#### Type Changed: SkiaSharp.Views.Mac.AppleExtensions

Added methods:

```csharp
public static CoreGraphics.CGColor ToCGColor (this SkiaSharp.SKColorF color);
public static CoreImage.CIColor ToCIColor (this SkiaSharp.SKColorF color);
public static SkiaSharp.SKColorF ToSKColorF (this CoreGraphics.CGColor color);
public static SkiaSharp.SKColorF ToSKColorF (this CoreImage.CIColor color);
```


#### Type Changed: SkiaSharp.Views.Mac.MacExtensions

Added methods:

```csharp
public static AppKit.NSColor ToNSColor (this SkiaSharp.SKColorF color);
public static SkiaSharp.SKColorF ToSKColorF (this AppKit.NSColor color);
```



5 changes: 5 additions & 0 deletions changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.Tizen.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# API diff: SkiaSharp.Views.Tizen.dll

## SkiaSharp.Views.Tizen.dll

> No changes.
5 changes: 5 additions & 0 deletions changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.UWP.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# API diff: SkiaSharp.Views.UWP.dll

## SkiaSharp.Views.UWP.dll

> No changes.
29 changes: 29 additions & 0 deletions changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.iOS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# API diff: SkiaSharp.Views.iOS.dll

## SkiaSharp.Views.iOS.dll

### Namespace SkiaSharp.Views.iOS

#### Type Changed: SkiaSharp.Views.iOS.AppleExtensions

Added methods:

```csharp
public static CoreGraphics.CGColor ToCGColor (this SkiaSharp.SKColorF color);
public static CoreImage.CIColor ToCIColor (this SkiaSharp.SKColorF color);
public static SkiaSharp.SKColorF ToSKColorF (this CoreGraphics.CGColor color);
public static SkiaSharp.SKColorF ToSKColorF (this CoreImage.CIColor color);
```


#### Type Changed: SkiaSharp.Views.iOS.iOSExtensions

Added methods:

```csharp
public static SkiaSharp.SKColorF ToSKColorF (this UIKit.UIColor color);
public static UIKit.UIColor ToUIColor (this SkiaSharp.SKColorF color);
```



29 changes: 29 additions & 0 deletions changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.tvOS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# API diff: SkiaSharp.Views.tvOS.dll

## SkiaSharp.Views.tvOS.dll

### Namespace SkiaSharp.Views.tvOS

#### Type Changed: SkiaSharp.Views.tvOS.AppleExtensions

Added methods:

```csharp
public static CoreGraphics.CGColor ToCGColor (this SkiaSharp.SKColorF color);
public static CoreImage.CIColor ToCIColor (this SkiaSharp.SKColorF color);
public static SkiaSharp.SKColorF ToSKColorF (this CoreGraphics.CGColor color);
public static SkiaSharp.SKColorF ToSKColorF (this CoreImage.CIColor color);
```


#### Type Changed: SkiaSharp.Views.tvOS.iOSExtensions

Added methods:

```csharp
public static SkiaSharp.SKColorF ToSKColorF (this UIKit.UIColor color);
public static UIKit.UIColor ToUIColor (this SkiaSharp.SKColorF color);
```



27 changes: 27 additions & 0 deletions changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.watchOS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# API diff: SkiaSharp.Views.watchOS.dll

## SkiaSharp.Views.watchOS.dll

### Namespace SkiaSharp.Views.watchOS

#### Type Changed: SkiaSharp.Views.watchOS.AppleExtensions

Added methods:

```csharp
public static CoreGraphics.CGColor ToCGColor (this SkiaSharp.SKColorF color);
public static SkiaSharp.SKColorF ToSKColorF (this CoreGraphics.CGColor color);
```


#### Type Changed: SkiaSharp.Views.watchOS.iOSExtensions

Added methods:

```csharp
public static SkiaSharp.SKColorF ToSKColorF (this UIKit.UIColor color);
public static UIKit.UIColor ToUIColor (this SkiaSharp.SKColorF color);
```



Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# API diff: SkiaSharp.Vulkan.SharpVk.dll

## SkiaSharp.Vulkan.SharpVk.dll

> No changes.
Loading

0 comments on commit 2019706

Please sign in to comment.