From a8895d3476394f13f433e5b8d1a5be9bfff152c0 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Sun, 7 Jul 2024 22:50:51 +0800 Subject: [PATCH] Update build --- .../HarfBuzzSharp.NativeAssets.macOS.csproj | 1 - .../SkiaSharp.NativeAssets.macOS.csproj | 1 - binding/SkiaSharp/SKCanvas.cs | 14 ++++++++++++++ .../Maui/SkiaSharpSample/SkiaSharpSample.csproj | 5 +++++ .../SkiaSharpSample.Mobile.csproj | 10 +++++----- .../SkiaSharpSample.Skia.Gtk.csproj | 8 ++++---- .../SkiaSharpSample.Skia.Wpf.Host.csproj | 8 ++++---- .../SkiaSharpSample.Skia.WPF.csproj | 8 ++++---- .../SkiaSharpSample.Wasm.csproj | 12 ++++++------ samples/Directory.Build.props | 8 -------- scripts/VERSIONS.txt | 2 +- scripts/azure-pipelines-variables.yml | 3 ++- scripts/azure-templates-bootstrapper.yml | 4 ++-- source/SkiaSharp.Build.props | 8 +------- .../SkiaSharp.Views.Maui.Controls.csproj | 4 ++++ .../SkiaSharp.Views.Maui.Core.csproj | 3 +++ .../SkiaSharp.Views.Uno.WinUI.Skia.csproj | 2 +- .../SkiaSharp.Views.Uno.WinUI.Wasm.csproj | 4 ++-- .../SkiaSharp.Views.Uno.WinUI.csproj | 2 +- .../SkiaSharp.Tests.Devices.csproj | 2 ++ .../SkiaSharp.Tests.Wasm.csproj | 4 ++-- 21 files changed, 63 insertions(+), 50 deletions(-) diff --git a/binding/HarfBuzzSharp.NativeAssets.macOS/HarfBuzzSharp.NativeAssets.macOS.csproj b/binding/HarfBuzzSharp.NativeAssets.macOS/HarfBuzzSharp.NativeAssets.macOS.csproj index 0f154aeb4c..685c0610eb 100644 --- a/binding/HarfBuzzSharp.NativeAssets.macOS/HarfBuzzSharp.NativeAssets.macOS.csproj +++ b/binding/HarfBuzzSharp.NativeAssets.macOS/HarfBuzzSharp.NativeAssets.macOS.csproj @@ -2,7 +2,6 @@ $(BasicTargetFrameworks) $(TargetFrameworks);$(TFMCurrent)-macos - $(TargetFrameworks);$(TFMPrevious)-macos $(TargetFrameworks);$(TFMNext)-macos HarfBuzzSharp $(PackagingGroup) - Native Assets for macOS diff --git a/binding/SkiaSharp.NativeAssets.macOS/SkiaSharp.NativeAssets.macOS.csproj b/binding/SkiaSharp.NativeAssets.macOS/SkiaSharp.NativeAssets.macOS.csproj index 8effe1c2d9..64a43dea75 100644 --- a/binding/SkiaSharp.NativeAssets.macOS/SkiaSharp.NativeAssets.macOS.csproj +++ b/binding/SkiaSharp.NativeAssets.macOS/SkiaSharp.NativeAssets.macOS.csproj @@ -2,7 +2,6 @@ $(BasicTargetFrameworks) $(TargetFrameworks);$(TFMCurrent)-macos - $(TargetFrameworks);$(TFMPrevious)-macos $(TargetFrameworks);$(TFMNext)-macos SkiaSharp $(PackagingGroup) - Native Assets for macOS diff --git a/binding/SkiaSharp/SKCanvas.cs b/binding/SkiaSharp/SKCanvas.cs index b18c3cffd4..d1d7300964 100644 --- a/binding/SkiaSharp/SKCanvas.cs +++ b/binding/SkiaSharp/SKCanvas.cs @@ -450,7 +450,9 @@ public void DrawPoint (float x, float y, SKColor color) public void DrawImage (SKImage image, SKPoint p, SKPaint paint = null) { +#pragma warning disable CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.' DrawImage (image, p.X, p.Y, paint?.FilterQuality.ToSamplingOptions() ?? SKSamplingOptions.Default, paint); +#pragma warning restore CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.' } public void DrawImage (SKImage image, SKPoint p, SKSamplingOptions sampling, SKPaint paint = null) @@ -460,7 +462,9 @@ public void DrawImage (SKImage image, SKPoint p, SKSamplingOptions sampling, SKP public void DrawImage (SKImage image, float x, float y, SKPaint paint = null) { +#pragma warning disable CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.' DrawImage (image, x, y, paint?.FilterQuality.ToSamplingOptions() ?? SKSamplingOptions.Default, paint); +#pragma warning restore CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.' } public void DrawImage (SKImage image, float x, float y, SKSamplingOptions sampling, SKPaint paint = null) @@ -472,7 +476,9 @@ public void DrawImage (SKImage image, float x, float y, SKSamplingOptions sampli public void DrawImage (SKImage image, SKRect dest, SKPaint paint = null) { +#pragma warning disable CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.' DrawImage (image, null, &dest, paint?.FilterQuality.ToSamplingOptions() ?? SKSamplingOptions.Default, paint); +#pragma warning restore CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.' } public void DrawImage (SKImage image, SKRect dest, SKSamplingOptions sampling, SKPaint paint = null) @@ -482,7 +488,9 @@ public void DrawImage (SKImage image, SKRect dest, SKSamplingOptions sampling, S public void DrawImage (SKImage image, SKRect source, SKRect dest, SKPaint paint = null) { +#pragma warning disable CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.' DrawImage (image, &source, &dest, paint?.FilterQuality.ToSamplingOptions() ?? SKSamplingOptions.Default, paint); +#pragma warning restore CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.' } public void DrawImage (SKImage image, SKRect source, SKRect dest, SKSamplingOptions sampling, SKPaint paint = null) @@ -942,19 +950,25 @@ public void DrawRoundRectDifference (SKRoundRect outer, SKRoundRect inner, SKPai // DrawAtlas public void DrawAtlas (SKImage atlas, SKRect[] sprites, SKRotationScaleMatrix[] transforms, SKPaint paint = null) => +#pragma warning disable CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.' DrawAtlas (atlas, sprites, transforms, null, SKBlendMode.Dst, paint?.FilterQuality.ToSamplingOptions() ?? SKSamplingOptions.Default, null, paint); +#pragma warning restore CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.' public void DrawAtlas (SKImage atlas, SKRect[] sprites, SKRotationScaleMatrix[] transforms, SKSamplingOptions sampling, SKPaint paint = null) => DrawAtlas (atlas, sprites, transforms, null, SKBlendMode.Dst, sampling, null, paint); public void DrawAtlas (SKImage atlas, SKRect[] sprites, SKRotationScaleMatrix[] transforms, SKColor[] colors, SKBlendMode mode, SKPaint paint = null) => +#pragma warning disable CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.' DrawAtlas (atlas, sprites, transforms, colors, mode, paint?.FilterQuality.ToSamplingOptions() ?? SKSamplingOptions.Default, null, paint); +#pragma warning restore CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.' public void DrawAtlas (SKImage atlas, SKRect[] sprites, SKRotationScaleMatrix[] transforms, SKColor[] colors, SKBlendMode mode, SKSamplingOptions sampling, SKPaint paint = null) => DrawAtlas (atlas, sprites, transforms, colors, mode, sampling, null, paint); public void DrawAtlas (SKImage atlas, SKRect[] sprites, SKRotationScaleMatrix[] transforms, SKColor[] colors, SKBlendMode mode, SKRect cullRect, SKPaint paint = null) => +#pragma warning disable CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.' DrawAtlas (atlas, sprites, transforms, colors, mode, paint?.FilterQuality.ToSamplingOptions() ?? SKSamplingOptions.Default, &cullRect, paint); +#pragma warning restore CS0618 // 'SKPaint.FilterQuality' is obsolete: 'Use SKSamplingOptions instead.' public void DrawAtlas (SKImage atlas, SKRect[] sprites, SKRotationScaleMatrix[] transforms, SKColor[] colors, SKBlendMode mode, SKSamplingOptions sampling, SKRect cullRect, SKPaint paint = null) => DrawAtlas (atlas, sprites, transforms, colors, mode, sampling, &cullRect, paint); diff --git a/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj index 981c1ed524..b974f44c9d 100644 --- a/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Maui/SkiaSharpSample/SkiaSharpSample.csproj @@ -31,6 +31,11 @@ + + + + + diff --git a/samples/Basic/UnoPlatform/SkiaSharpSample.Mobile/SkiaSharpSample.Mobile.csproj b/samples/Basic/UnoPlatform/SkiaSharpSample.Mobile/SkiaSharpSample.Mobile.csproj index 7b9b546e07..a85afb6c69 100644 --- a/samples/Basic/UnoPlatform/SkiaSharpSample.Mobile/SkiaSharpSample.Mobile.csproj +++ b/samples/Basic/UnoPlatform/SkiaSharpSample.Mobile/SkiaSharpSample.Mobile.csproj @@ -22,9 +22,9 @@ - - - + + + @@ -37,10 +37,10 @@ - + - + diff --git a/samples/Basic/UnoPlatform/SkiaSharpSample.Skia.Gtk/SkiaSharpSample.Skia.Gtk.csproj b/samples/Basic/UnoPlatform/SkiaSharpSample.Skia.Gtk/SkiaSharpSample.Skia.Gtk.csproj index 584b6a703d..f79f1c61ae 100644 --- a/samples/Basic/UnoPlatform/SkiaSharpSample.Skia.Gtk/SkiaSharpSample.Skia.Gtk.csproj +++ b/samples/Basic/UnoPlatform/SkiaSharpSample.Skia.Gtk/SkiaSharpSample.Skia.Gtk.csproj @@ -10,10 +10,10 @@ - - - - + + + + diff --git a/samples/Basic/UnoPlatform/SkiaSharpSample.Skia.WPF.Host/SkiaSharpSample.Skia.Wpf.Host.csproj b/samples/Basic/UnoPlatform/SkiaSharpSample.Skia.WPF.Host/SkiaSharpSample.Skia.Wpf.Host.csproj index 4e0d0634a7..a11ae072f8 100644 --- a/samples/Basic/UnoPlatform/SkiaSharpSample.Skia.WPF.Host/SkiaSharpSample.Skia.Wpf.Host.csproj +++ b/samples/Basic/UnoPlatform/SkiaSharpSample.Skia.WPF.Host/SkiaSharpSample.Skia.Wpf.Host.csproj @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/samples/Basic/UnoPlatform/SkiaSharpSample.Skia.WPF/SkiaSharpSample.Skia.WPF.csproj b/samples/Basic/UnoPlatform/SkiaSharpSample.Skia.WPF/SkiaSharpSample.Skia.WPF.csproj index d3079de073..0876089286 100644 --- a/samples/Basic/UnoPlatform/SkiaSharpSample.Skia.WPF/SkiaSharpSample.Skia.WPF.csproj +++ b/samples/Basic/UnoPlatform/SkiaSharpSample.Skia.WPF/SkiaSharpSample.Skia.WPF.csproj @@ -8,10 +8,10 @@ - - - - + + + + diff --git a/samples/Basic/UnoPlatform/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj b/samples/Basic/UnoPlatform/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj index a4db4c9a52..8c7f27b985 100644 --- a/samples/Basic/UnoPlatform/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj +++ b/samples/Basic/UnoPlatform/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj @@ -21,12 +21,12 @@ - - - - - - + + + + + + diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props index ae0a69d69d..4de98b5c73 100644 --- a/samples/Directory.Build.props +++ b/samples/Directory.Build.props @@ -1,11 +1,3 @@ - - - true - - \ No newline at end of file diff --git a/scripts/VERSIONS.txt b/scripts/VERSIONS.txt index 536f5bafc3..86c1c9e1a6 100644 --- a/scripts/VERSIONS.txt +++ b/scripts/VERSIONS.txt @@ -12,7 +12,7 @@ GLibSharp release 3.24.24.95 AtkSharp release 3.24.24.95 System.Memory release 4.5.5 SharpVk release 0.4.2 -Uno.WinUI release 4.9.26 +Uno.WinUI release 5.2.175 Microsoft.WindowsAppSDK release 1.3.230602002 Microsoft.Maui.Graphics release 7.0.92 Microsoft.Windows.SDK.NET.Ref release 10.0.19041.27 diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml index e787c78b35..1afc8b9f9f 100644 --- a/scripts/azure-pipelines-variables.yml +++ b/scripts/azure-pipelines-variables.yml @@ -15,9 +15,10 @@ variables: XCODE_VERSION: '14.3.1' XCODE_VERSION_NATIVE: '14.3.1' VISUAL_STUDIO_VERSION: '' + DOTNET_VERSION: '8.0.x' DOTNET_VERSION_PREVIEW: '' DOTNET_WORKLOAD_SOURCE: '' - DOTNET_WORKLOAD_TIZEN: '8.0.130' + DOTNET_WORKLOAD_TIZEN: '8.0.149' CONFIGURATION: 'Release' DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true NUGET_DIFF_PRERELEASE: false diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml index 80a6bd9e31..7fba99a3f8 100644 --- a/scripts/azure-templates-bootstrapper.yml +++ b/scripts/azure-templates-bootstrapper.yml @@ -195,9 +195,9 @@ jobs: condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], '')) inputs: packageType: 'sdk' - version: 7.0.x + version: $(DOTNET_VERSION) retryCountOnTaskFailure: 3 - displayName: Install .NET 7.0.x + displayName: Install .NET $(DOTNET_VERSION) - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" displayName: Install the preview version of .NET retryCountOnTaskFailure: 3 diff --git a/source/SkiaSharp.Build.props b/source/SkiaSharp.Build.props index b8edea2145..cab2f8f29d 100644 --- a/source/SkiaSharp.Build.props +++ b/source/SkiaSharp.Build.props @@ -41,7 +41,7 @@ \d+\.\d+\.\d+(-[a-z]+\.\d+)? $([System.Text.RegularExpressions.Regex]::Match('$(MSBuildExtensionsPath)', '$(DotNetSdkManifestVersionRegex)')) - + net6.0 net8.0 @@ -95,11 +95,6 @@ false - - - True - - netstandard2.0;netstandard2.1;net462;$(TFMCurrent) @@ -111,7 +106,6 @@ $(TFMPrevious) - $(TFMNext)-macos $(TFMNext) diff --git a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.csproj b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.csproj index 847faf3de5..2ee5a0ebe0 100644 --- a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.csproj +++ b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Controls/SkiaSharp.Views.Maui.Controls.csproj @@ -14,6 +14,10 @@ None false + + + + diff --git a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/SkiaSharp.Views.Maui.Core.csproj b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/SkiaSharp.Views.Maui.Core.csproj index ee09f8be26..c63f0a0681 100644 --- a/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/SkiaSharp.Views.Maui.Core.csproj +++ b/source/SkiaSharp.Views.Maui/SkiaSharp.Views.Maui.Core/SkiaSharp.Views.Maui.Core.csproj @@ -15,6 +15,9 @@ None false + + + diff --git a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Skia/SkiaSharp.Views.Uno.WinUI.Skia.csproj b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Skia/SkiaSharp.Views.Uno.WinUI.Skia.csproj index 4498038d3e..17a9ebeff3 100644 --- a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Skia/SkiaSharp.Views.Uno.WinUI.Skia.csproj +++ b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Skia/SkiaSharp.Views.Uno.WinUI.Skia.csproj @@ -12,7 +12,7 @@ $(DefineConstants);HAS_UNO_SKIA;WINUI - + diff --git a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Wasm/SkiaSharp.Views.Uno.WinUI.Wasm.csproj b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Wasm/SkiaSharp.Views.Uno.WinUI.Wasm.csproj index 21b7ecfc8f..b5854f9e0d 100644 --- a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Wasm/SkiaSharp.Views.Uno.WinUI.Wasm.csproj +++ b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI.Wasm/SkiaSharp.Views.Uno.WinUI.Wasm.csproj @@ -13,8 +13,8 @@ $(DefineConstants);__WASM__;WINUI - - + + diff --git a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Uno.WinUI.csproj b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Uno.WinUI.csproj index 2fd3ed249a..55cf75ee97 100644 --- a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Uno.WinUI.csproj +++ b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.WinUI/SkiaSharp.Views.Uno.WinUI.csproj @@ -24,7 +24,7 @@ - + diff --git a/tests/SkiaSharp.Tests.Devices/SkiaSharp.Tests.Devices.csproj b/tests/SkiaSharp.Tests.Devices/SkiaSharp.Tests.Devices.csproj index 9eb1a63ee2..5e9cd0a8b4 100644 --- a/tests/SkiaSharp.Tests.Devices/SkiaSharp.Tests.Devices.csproj +++ b/tests/SkiaSharp.Tests.Devices/SkiaSharp.Tests.Devices.csproj @@ -41,6 +41,8 @@ + + diff --git a/tests/SkiaSharp.Tests.Wasm/SkiaSharp.Tests.Wasm.csproj b/tests/SkiaSharp.Tests.Wasm/SkiaSharp.Tests.Wasm.csproj index a6bceb81d4..8edf07dd7f 100644 --- a/tests/SkiaSharp.Tests.Wasm/SkiaSharp.Tests.Wasm.csproj +++ b/tests/SkiaSharp.Tests.Wasm/SkiaSharp.Tests.Wasm.csproj @@ -18,8 +18,8 @@ - - + +