diff --git a/binding/Binding/SkiaSharpVersion.cs b/binding/Binding/SkiaSharpVersion.cs index a8b941128f..bbec94040f 100644 --- a/binding/Binding/SkiaSharpVersion.cs +++ b/binding/Binding/SkiaSharpVersion.cs @@ -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; } } } diff --git a/changelogs/HarfBuzzSharp/2.6.1.7/HarfBuzzSharp.md b/changelogs/HarfBuzzSharp/2.6.1.7/HarfBuzzSharp.md new file mode 100644 index 0000000000..c043585d33 --- /dev/null +++ b/changelogs/HarfBuzzSharp/2.6.1.7/HarfBuzzSharp.md @@ -0,0 +1,5 @@ +# API diff: HarfBuzzSharp.dll + +## HarfBuzzSharp.dll + +> No changes. diff --git a/changelogs/SkiaSharp.HarfBuzz/2.80.2/SkiaSharp.HarfBuzz.md b/changelogs/SkiaSharp.HarfBuzz/2.80.2/SkiaSharp.HarfBuzz.md new file mode 100644 index 0000000000..9e28861657 --- /dev/null +++ b/changelogs/SkiaSharp.HarfBuzz/2.80.2/SkiaSharp.HarfBuzz.md @@ -0,0 +1,5 @@ +# API diff: SkiaSharp.HarfBuzz.dll + +## SkiaSharp.HarfBuzz.dll + +> No changes. diff --git a/changelogs/SkiaSharp.Views.Desktop.Common/2.80.2/SkiaSharp.Views.Desktop.Common.md b/changelogs/SkiaSharp.Views.Desktop.Common/2.80.2/SkiaSharp.Views.Desktop.Common.md new file mode 100644 index 0000000000..0feaabb146 --- /dev/null +++ b/changelogs/SkiaSharp.Views.Desktop.Common/2.80.2/SkiaSharp.Views.Desktop.Common.md @@ -0,0 +1,5 @@ +# API diff: SkiaSharp.Views.Desktop.Common.dll + +## SkiaSharp.Views.Desktop.Common.dll + +> No changes. diff --git a/changelogs/SkiaSharp.Views.Forms.GTK/2.80.2/SkiaSharp.Views.Forms.md b/changelogs/SkiaSharp.Views.Forms.GTK/2.80.2/SkiaSharp.Views.Forms.md new file mode 100644 index 0000000000..7c4328c936 --- /dev/null +++ b/changelogs/SkiaSharp.Views.Forms.GTK/2.80.2/SkiaSharp.Views.Forms.md @@ -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 (); +``` + + + diff --git a/changelogs/SkiaSharp.Views.Forms.WPF/2.80.2/SkiaSharp.Views.Forms.md b/changelogs/SkiaSharp.Views.Forms.WPF/2.80.2/SkiaSharp.Views.Forms.md new file mode 100644 index 0000000000..1ec0007781 --- /dev/null +++ b/changelogs/SkiaSharp.Views.Forms.WPF/2.80.2/SkiaSharp.Views.Forms.md @@ -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 (); +``` + + + diff --git a/changelogs/SkiaSharp.Views.Forms/2.80.2/SkiaSharp.Views.Forms.md b/changelogs/SkiaSharp.Views.Forms/2.80.2/SkiaSharp.Views.Forms.md new file mode 100644 index 0000000000..9fbd531a7e --- /dev/null +++ b/changelogs/SkiaSharp.Views.Forms/2.80.2/SkiaSharp.Views.Forms.md @@ -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); +``` + + + diff --git a/changelogs/SkiaSharp.Views.Gtk2/2.80.2/SkiaSharp.Views.Gtk.md b/changelogs/SkiaSharp.Views.Gtk2/2.80.2/SkiaSharp.Views.Gtk.md new file mode 100644 index 0000000000..62518e13aa --- /dev/null +++ b/changelogs/SkiaSharp.Views.Gtk2/2.80.2/SkiaSharp.Views.Gtk.md @@ -0,0 +1,5 @@ +# API diff: SkiaSharp.Views.Gtk.dll + +## SkiaSharp.Views.Gtk.dll + +> No changes. diff --git a/changelogs/SkiaSharp.Views.Gtk3/2.80.2/SkiaSharp.Views.Gtk3.md b/changelogs/SkiaSharp.Views.Gtk3/2.80.2/SkiaSharp.Views.Gtk3.md new file mode 100644 index 0000000000..cc4c1d9a54 --- /dev/null +++ b/changelogs/SkiaSharp.Views.Gtk3/2.80.2/SkiaSharp.Views.Gtk3.md @@ -0,0 +1,5 @@ +# API diff: SkiaSharp.Views.Gtk3.dll + +## SkiaSharp.Views.Gtk3.dll + +> No changes. diff --git a/changelogs/SkiaSharp.Views.Uno/2.80.2/SkiaSharp.Views.UWP.md b/changelogs/SkiaSharp.Views.Uno/2.80.2/SkiaSharp.Views.UWP.md new file mode 100644 index 0000000000..1dfd421a5d --- /dev/null +++ b/changelogs/SkiaSharp.Views.Uno/2.80.2/SkiaSharp.Views.UWP.md @@ -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 PaintSurface; + // methods + public void Invalidate (); + protected virtual void OnPaintSurface (SKPaintGLSurfaceEventArgs e); +} +``` + + + diff --git a/changelogs/SkiaSharp.Views.WPF/2.80.2/SkiaSharp.Views.WPF.md b/changelogs/SkiaSharp.Views.WPF/2.80.2/SkiaSharp.Views.WPF.md new file mode 100644 index 0000000000..0c21d2bfb0 --- /dev/null +++ b/changelogs/SkiaSharp.Views.WPF/2.80.2/SkiaSharp.Views.WPF.md @@ -0,0 +1,5 @@ +# API diff: SkiaSharp.Views.WPF.dll + +## SkiaSharp.Views.WPF.dll + +> No changes. diff --git a/changelogs/SkiaSharp.Views.WindowsForms/2.80.2/SkiaSharp.Views.WindowsForms.md b/changelogs/SkiaSharp.Views.WindowsForms/2.80.2/SkiaSharp.Views.WindowsForms.md new file mode 100644 index 0000000000..7ac0b262f8 --- /dev/null +++ b/changelogs/SkiaSharp.Views.WindowsForms/2.80.2/SkiaSharp.Views.WindowsForms.md @@ -0,0 +1,5 @@ +# API diff: SkiaSharp.Views.WindowsForms.dll + +## SkiaSharp.Views.WindowsForms.dll + +> No changes. diff --git a/changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.Android.md b/changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.Android.md new file mode 100644 index 0000000000..990bcac740 --- /dev/null +++ b/changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.Android.md @@ -0,0 +1,5 @@ +# API diff: SkiaSharp.Views.Android.dll + +## SkiaSharp.Views.Android.dll + +> No changes. diff --git a/changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.Desktop.md b/changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.Desktop.md new file mode 100644 index 0000000000..9ffcfd2d19 --- /dev/null +++ b/changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.Desktop.md @@ -0,0 +1,5 @@ +# API diff: SkiaSharp.Views.Desktop.dll + +## SkiaSharp.Views.Desktop.dll + +> No changes. diff --git a/changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.Mac.md b/changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.Mac.md new file mode 100644 index 0000000000..23345195eb --- /dev/null +++ b/changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.Mac.md @@ -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); +``` + + + diff --git a/changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.Tizen.md b/changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.Tizen.md new file mode 100644 index 0000000000..576719cc50 --- /dev/null +++ b/changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.Tizen.md @@ -0,0 +1,5 @@ +# API diff: SkiaSharp.Views.Tizen.dll + +## SkiaSharp.Views.Tizen.dll + +> No changes. diff --git a/changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.UWP.md b/changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.UWP.md new file mode 100644 index 0000000000..65f4808e21 --- /dev/null +++ b/changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.UWP.md @@ -0,0 +1,5 @@ +# API diff: SkiaSharp.Views.UWP.dll + +## SkiaSharp.Views.UWP.dll + +> No changes. diff --git a/changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.iOS.md b/changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.iOS.md new file mode 100644 index 0000000000..04ef47a327 --- /dev/null +++ b/changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.iOS.md @@ -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); +``` + + + diff --git a/changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.tvOS.md b/changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.tvOS.md new file mode 100644 index 0000000000..d807251efc --- /dev/null +++ b/changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.tvOS.md @@ -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); +``` + + + diff --git a/changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.watchOS.md b/changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.watchOS.md new file mode 100644 index 0000000000..8631bc1d15 --- /dev/null +++ b/changelogs/SkiaSharp.Views/2.80.2/SkiaSharp.Views.watchOS.md @@ -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); +``` + + + diff --git a/changelogs/SkiaSharp.Vulkan.SharpVk/2.80.2/SkiaSharp.Vulkan.SharpVk.md b/changelogs/SkiaSharp.Vulkan.SharpVk/2.80.2/SkiaSharp.Vulkan.SharpVk.md new file mode 100644 index 0000000000..ce2cf98989 --- /dev/null +++ b/changelogs/SkiaSharp.Vulkan.SharpVk/2.80.2/SkiaSharp.Vulkan.SharpVk.md @@ -0,0 +1,5 @@ +# API diff: SkiaSharp.Vulkan.SharpVk.dll + +## SkiaSharp.Vulkan.SharpVk.dll + +> No changes. diff --git a/changelogs/SkiaSharp/2.80.2/SkiaSharp.md b/changelogs/SkiaSharp/2.80.2/SkiaSharp.md new file mode 100644 index 0000000000..6a3a23ede2 --- /dev/null +++ b/changelogs/SkiaSharp/2.80.2/SkiaSharp.md @@ -0,0 +1,68 @@ +# API diff: SkiaSharp.dll + +## SkiaSharp.dll + +### Namespace SkiaSharp + +#### Type Changed: SkiaSharp.GRContext + +Added methods: + +```csharp +public void DumpMemoryStatistics (SKTraceMemoryDump dump); +public void PurgeResources (); +public void PurgeUnlockedResources (bool scratchResourcesOnly); +public void PurgeUnlockedResources (long bytesToPurge, bool preferScratchResources); +public void PurgeUnusedResources (long milliseconds); +``` + + +#### Type Changed: SkiaSharp.SKMatrix + +Added method: + +```csharp +public static SKMatrix CreateScaleTranslation (float sx, float sy, float tx, float ty); +``` + + +#### New Type: SkiaSharp.SKGraphics + +```csharp +public static class SKGraphics { + // methods + public static void DumpMemoryStatistics (SKTraceMemoryDump dump); + public static int GetFontCacheCountLimit (); + public static int GetFontCacheCountUsed (); + public static long GetFontCacheLimit (); + public static int GetFontCachePointSizeLimit (); + public static long GetFontCacheUsed (); + public static long GetResourceCacheSingleAllocationByteLimit (); + public static long GetResourceCacheTotalByteLimit (); + public static long GetResourceCacheTotalBytesUsed (); + public static void Init (); + public static void PurgeAllCaches (); + public static void PurgeFontCache (); + public static void PurgeResourceCache (); + public static int SetFontCacheCountLimit (int count); + public static long SetFontCacheLimit (long bytes); + public static int SetFontCachePointSizeLimit (int count); + public static long SetResourceCacheSingleAllocationByteLimit (long bytes); + public static long SetResourceCacheTotalByteLimit (long bytes); +} +``` + +#### New Type: SkiaSharp.SKTraceMemoryDump + +```csharp +public class SKTraceMemoryDump : SkiaSharp.SKObject, System.IDisposable { + // constructors + protected SKTraceMemoryDump (bool detailedDump, bool dumpWrappedObjects); + // methods + protected override void DisposeNative (); + protected virtual void OnDumpNumericValue (string dumpName, string valueName, string units, ulong value); + protected virtual void OnDumpStringValue (string dumpName, string valueName, string value); +} +``` + + diff --git a/docs b/docs index c4c45630c5..cf4946f2fb 160000 --- a/docs +++ b/docs @@ -1 +1 @@ -Subproject commit c4c45630c54a27021905a3ac39d1269ff4591204 +Subproject commit cf4946f2fbf2ca915820615de729d8622d9515f4 diff --git a/native/watchos/libSkiaSharp/libSkiaSharp.xcodeproj/project.pbxproj b/native/watchos/libSkiaSharp/libSkiaSharp.xcodeproj/project.pbxproj index 5ae1ccd8ed..d00c3c8756 100644 --- a/native/watchos/libSkiaSharp/libSkiaSharp.xcodeproj/project.pbxproj +++ b/native/watchos/libSkiaSharp/libSkiaSharp.xcodeproj/project.pbxproj @@ -303,6 +303,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; + OTHER_CFLAGS = "-fgnu-inline-asm"; OTHER_LDFLAGS = "-all_load"; SDKROOT = watchos; TARGETED_DEVICE_FAMILY = 4; @@ -372,6 +373,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; MTL_ENABLE_DEBUG_INFO = NO; + OTHER_CFLAGS = "-fgnu-inline-asm"; OTHER_LDFLAGS = "-all_load"; SDKROOT = watchos; TARGETED_DEVICE_FAMILY = 4; diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index fa6a1ca910..92fe7a0d9b 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -20,9 +20,9 @@ variables: BUILD_NUMBER: $[counter(format('{0}_{1}_{2}', variables['SKIASHARP_VERSION'], variables['Build.SourceBranch'], variables['PREVIEW_LABEL']), 1)] TIZEN_LINUX_PACKAGES: libxcb-xfixes0 libxcb-render-util0 libwebkitgtk-1.0-0 libxcb-image0 acl libsdl1.2debian libv4l-0 libxcb-randr0 libxcb-shape0 libxcb-icccm4 libsm6 gettext rpm2cpio cpio bridge-utils openvpn MANAGED_LINUX_PACKAGES: ttf-ancient-fonts ninja-build - MONO_VERSION_MACOS: 6_8_0 - MONO_VERSION_LINUX: stable-bionic/snapshots/6.8.0.123 - XCODE_VERSION: 11.3.1 + MONO_VERSION_MACOS: 'Latest' + MONO_VERSION_LINUX: '' + XCODE_VERSION: 11.6 DOTNET_VERSION: 3.1.302 CONFIGURATION: 'Release' VM_IMAGE_WINDOWS: windows-2019 diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 7a82bac31c..c262b5a714 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -59,7 +59,7 @@ jobs: condition: ne('${{ parameters.packages }}', '') # make sure mono/msbuild is the correct version - - ${{ if and(eq(parameters.docker, ''), endsWith(parameters.name, '_linux')) }}: + - ${{ if and(ne(variables['MONO_VERSION_LINUX'], ''), eq(parameters.docker, ''), endsWith(parameters.name, '_linux')) }}: - bash: | sudo apt remove -y mono-complete msbuild sudo apt autoremove -y diff --git a/tests/Tests/ApiTests.cs b/tests/Tests/ApiTests.cs index 6c85c50277..e60dfbfafe 100644 --- a/tests/Tests/ApiTests.cs +++ b/tests/Tests/ApiTests.cs @@ -172,6 +172,7 @@ public void ApiTypesAreMarshalledCorrectly(MethodInfo method, string delegateNam // older C API [InlineData("68.3", "68.0", "[68.3, 69.0)")] [InlineData("68.3", "68.2", "[68.3, 69.0)")] + [InlineData("80.2", "80.0", "[80.2, 81.0)")] // older skia milestone [InlineData("68.0", "60.0", "[68.0, 69.0)")] [InlineData("68.3", "60.0", "[68.3, 69.0)")] @@ -212,6 +213,12 @@ public void TestLibraryVersions() Assert.True(SkiaSharpVersion.CheckNativeLibraryCompatible()); } + [SkippableFact] + public void TestLibraryVersionsDoesNotThrow() + { + SkiaSharpVersion.CheckNativeLibraryCompatible(true); + } + [SkippableFact] public void TestVersionsString() {