Merge branch 'main' into dev/spouliot/metal-extra

.github/workflows/label-with-ai.yml

@@ -0,0 +1,36 @@
+name: Apply labels using AI
+
+on:
+  issues:
+    types: [opened, reopened]
+
+jobs:
+  apply-label-and-add-comment:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+      - uses: mattleibow/labeled-by-ai@main
+        name: Apply AREA labels
+        with:
+          label-pattern: '^area/.*'
+          apply-label: 'false'
+          add-comment: 'false'
+      - uses: mattleibow/labeled-by-ai@main
+        name: Apply PLATFORM labels
+        with:
+          label-pattern: '^os/.*'
+          apply-label: 'false'
+          add-comment: 'false'
+      - uses: mattleibow/labeled-by-ai@main
+        name: Apply BACKEND labels
+        with:
+          label-pattern: '^backend/.*'
+          apply-label: 'false'
+          add-comment: 'false'
+      - uses: mattleibow/labeled-by-ai@main
+        name: Apply TENET labels
+        with:
+          label-pattern: '^tenet/.*'
+          apply-label: 'false'
+          add-comment: 'false'

README.md

@@ -63,6 +63,15 @@ However, these are easy to install as they are found on the various websites. If
  - To get started building, [go here](https://github.com/mono/SkiaSharp/wiki/Building-SkiaSharp).
  - If you are just wanting a custom Linux build, [go here](https://github.com/mono/SkiaSharp/wiki/Building-on-Linux)
 
+## Contributors
+
+<a href="https://github.com/mono/SkiaSharp/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=mono/SkiaSharp" />
+</a>
+
+
+Made with [contrib.rocks](https://contrib.rocks).
+
 ## Compare Code
 
 Here are some links to show the differences in our code as compared to Google's code.

scripts/azure-pipelines-complete-internal.yml

@@ -45,7 +45,7 @@ parameters:
     default:
       pool:
         name: Azure Pipelines
-        vmImage: macos-13
+        vmImage: macos-14
         os: macos
   - name: buildAgentLinux
     displayName: 'The Linux build agent configuration:'
@@ -144,7 +144,7 @@ extends:
           buildAgentWindows: ${{ parameters.buildAgentWindows }}
           buildAgentWindowsNative: ${{ parameters.buildAgentWindows }}
           buildAgentMac: ${{ parameters.buildAgentMac }}
-          buildAgentMacNative: ${{ parameters.buildAgentMac }}
+          buildAgentMacNative: ${{ parameters.buildAgentMacNative }}
           buildAgentLinux: ${{ parameters.buildAgentLinux }}
           buildAgentLinuxNative: ${{ parameters.buildAgentLinuxNative }}
           buildAgentAndroidTests: ${{ parameters.buildAgentAndroidTests }}

scripts/azure-pipelines-complete.yml

@@ -51,7 +51,7 @@ parameters:
     default:
       pool:
         name: Azure Pipelines
-        vmImage: macos-13
+        vmImage: macos-14
         os: macos
   - name: buildAgentLinux
     displayName: 'The Linux build agent configuration:'

scripts/azure-pipelines-variables.yml

@@ -13,7 +13,7 @@ variables:
   TIZEN_LINUX_PACKAGES: libxcb-icccm4 libxcb-render-util0 gettext libxcb-image0 libsdl1.2debian libv4l-0 libxcb-randr0 bridge-utils libxcb-shape0 libpython2.7 openvpn libkf5itemmodels5 libkf5kiowidgets5 libkchart2
   MANAGED_LINUX_PACKAGES: ttf-ancient-fonts ninja-build
   XCODE_VERSION: '15.4'
-  XCODE_VERSION_NATIVE: '14.3.1'
+  XCODE_VERSION_NATIVE: '15.4'
   VISUAL_STUDIO_VERSION: ''
   DOTNET_VERSION: '8.0.304'
   DOTNET_VERSION_PREVIEW: ''

scripts/azure-pipelines.yml

@@ -51,7 +51,7 @@ parameters:
     default:
       pool:
         name: Azure Pipelines
-        vmImage: macos-13
+        vmImage: macos-14
         os: macos
   - name: buildAgentLinux
     displayName: 'The Linux build agent configuration:'

scripts/azure-templates-bootstrapper.yml

@@ -87,10 +87,10 @@ jobs:
         submodules: recursive
       - template: /scripts/azure-templates-variables.yml@self
 
-      # checkout required skia PR
-      - pwsh: .\scripts\checkout-skia.ps1 -GitHubToken $(GitHub.Token.PublicAccess)
-        displayName: Checkout required skia PR
-        condition: eq(variables['Build.Reason'], 'PullRequest')
+      # # checkout required skia PR
+      # - pwsh: .\scripts\checkout-skia.ps1 -GitHubToken $(GitHub.Token.PublicAccess)
+      #   displayName: Checkout required skia PR
+      #   condition: eq(variables['Build.Reason'], 'PullRequest')
 
       - ${{ if eq(parameters.buildPipelineType, 'tests') }}:
         - template: /scripts/azure-templates-github-status.yml@self

scripts/azure-templates-stages.yml

@@ -458,11 +458,11 @@ stages:
               - 3.1.56:
                 displayName: '3.1.56_SIMD'
                 version: 3.1.56
-                features: _wasmeh,simd,st
+                features: _wasmeh,st,simd
               - 3.1.56:
                 displayName: '3.1.56_SIMD_Threading'
                 version: 3.1.56
-                features: _wasmeh,simd,mt
+                features: _wasmeh,mt,simd
 
   - ${{ if ne(parameters.buildPipelineType, 'tests') }}:
     - stage: native

source/SkiaSharp.Views/SkiaSharp.Views.Blazor/Internal/ActionHelper.cs

@@ -1,4 +1,5 @@
-using System;
+#if !NET7_0_OR_GREATER
+using System;
 using System.ComponentModel;
 using Microsoft.JSInterop;
 
@@ -18,3 +19,4 @@ public ActionHelper(Action action)
 		public void Invoke() => action?.Invoke();
 	}
 }
+#endif

source/SkiaSharp.Views/SkiaSharp.Views.Blazor/Internal/DpiWatcherInterop.cs

@@ -1,11 +1,18 @@
-using System;
+using System;
+using System.Runtime.Versioning;
 using System.Threading.Tasks;
 using Microsoft.JSInterop;
 
+#if NET7_0_OR_GREATER
+using System.Runtime.InteropServices.JavaScript;
+#endif
+
 namespace SkiaSharp.Views.Blazor.Internal
 {
-	internal class DpiWatcherInterop : JSModuleInterop
+	[SupportedOSPlatform("browser")]
+	internal partial class DpiWatcherInterop : JSModuleInterop
 	{
+		private const string ModuleName = "DpiWatcher";
 		private const string JsFilename = "./_content/SkiaSharp.Views.Blazor/DpiWatcher.js";
 		private const string StartSymbol = "DpiWatcher.start";
 		private const string StopSymbol = "DpiWatcher.stop";
@@ -14,9 +21,13 @@ internal class DpiWatcherInterop : JSModuleInterop
 		private static DpiWatcherInterop? instance;
 
 		private event Action<double>? callbacksEvent;
+#if NET7_0_OR_GREATER
+		private readonly Action<double, double> callbackHelper;
+#else
 		private readonly FloatFloatActionHelper callbackHelper;
 
 		private DotNetObjectReference<FloatFloatActionHelper>? callbackReference;
+#endif
 
 		public static async Task<DpiWatcherInterop> ImportAsync(IJSRuntime js, Action<double>? callback = null)
 		{
@@ -31,9 +42,9 @@ public static DpiWatcherInterop Get(IJSRuntime js) =>
 			instance ??= new DpiWatcherInterop(js);
 
 		private DpiWatcherInterop(IJSRuntime js)
-			: base(js, JsFilename)
+			: base(js, ModuleName, JsFilename)
 		{
-			callbackHelper = new FloatFloatActionHelper((o, n) => callbacksEvent?.Invoke(n));
+			callbackHelper = new((o, n) => callbacksEvent?.Invoke((float)n));
 		}
 
 		protected override void OnDisposingModule() =>
@@ -60,21 +71,28 @@ public void Unsubscribe(Action<double> callback)
 				Stop();
 		}
 
+#if NET7_0_OR_GREATER
+		private double Start() =>
+			Start(callbackHelper);
+
+		[JSImport(StartSymbol, ModuleName)]
+		private static partial double Start([JSMarshalAs<JSType.Function<JSType.Number, JSType.Number>>] Action<double, double> callback);
+
+		[JSImport(StopSymbol, ModuleName)]
+		private static partial void Stop();
+
+		[JSImport(GetDpiSymbol, ModuleName)]
+		public static partial double GetDpi();
+#else
 		private double Start()
 		{
-			if (callbackReference != null)
-				return GetDpi();
-
-			callbackReference = DotNetObjectReference.Create(callbackHelper);
+			callbackReference ??= DotNetObjectReference.Create(callbackHelper);
 
 			return Invoke<double>(StartSymbol, callbackReference);
 		}
 
 		private void Stop()
 		{
-			if (callbackReference == null)
-				return;
-
 			Invoke(StopSymbol);
 
 			callbackReference?.Dispose();
@@ -83,5 +101,6 @@ private void Stop()
 
 		public double GetDpi() =>
 			Invoke<double>(GetDpiSymbol);
+#endif
 	}
 }

source/SkiaSharp.Views/SkiaSharp.Views.Blazor/Internal/FloatFloatActionHelper.cs

@@ -1,4 +1,5 @@
-using System;
+#if !NET7_0_OR_GREATER
+using System;
 using System.ComponentModel;
 using Microsoft.JSInterop;
 
@@ -18,3 +19,4 @@ public FloatFloatActionHelper(Action<float, float> action)
 		public void Invoke(float width, float height) => action?.Invoke(width, height);
 	}
 }
+#endif

source/SkiaSharp.Views/SkiaSharp.Views.Blazor/Internal/JSModuleInterop.cs

@@ -1,20 +1,32 @@
 using System;
 using System.Threading.Tasks;
+using System.Runtime.Versioning;
 using Microsoft.JSInterop;
 
+#if NET7_0_OR_GREATER
+using System.Runtime.InteropServices.JavaScript;
+#else
+using JSObject = Microsoft.JSInterop.IJSUnmarshalledObjectReference;
+#endif
+
 namespace SkiaSharp.Views.Blazor.Internal
 {
-	internal class JSModuleInterop : IDisposable
+	[SupportedOSPlatform("browser")]
+	internal partial class JSModuleInterop : IDisposable
 	{
-		private readonly Task<IJSUnmarshalledObjectReference> moduleTask;
-		private IJSUnmarshalledObjectReference? module;
+		private readonly Task<JSObject> moduleTask;
+		private JSObject? module;
 
-		public JSModuleInterop(IJSRuntime js, string filename)
+		public JSModuleInterop(IJSRuntime js, string moduleName, string moduleUrl)
 		{
+#if NET7_0_OR_GREATER
+			moduleTask = JSHost.ImportAsync(moduleName, "/" + moduleUrl);
+#else
 			if (js is not IJSInProcessRuntime)
 				throw new NotSupportedException("SkiaSharp currently only works on Web Assembly.");
 
-			moduleTask = js.InvokeAsync<IJSUnmarshalledObjectReference>("import", filename).AsTask();
+			moduleTask = js.InvokeAsync<JSObject>("import", moduleUrl).AsTask();
+#endif
 		}
 
 		public async Task ImportAsync()
@@ -28,14 +40,16 @@ public void Dispose()
 			Module.Dispose();
 		}
 
-		protected IJSUnmarshalledObjectReference Module =>
+		protected JSObject Module =>
 			module ?? throw new InvalidOperationException("Make sure to run ImportAsync() first.");
 
+#if !NET7_0_OR_GREATER
 		protected void Invoke(string identifier, params object?[]? args) =>
 			Module.InvokeVoid(identifier, args);
 
 		protected TValue Invoke<TValue>(string identifier, params object?[]? args) =>
 			Module.Invoke<TValue>(identifier, args);
+#endif
 
 		protected virtual void OnDisposingModule() { }
 	}