From 892b72366309c3ae2207edd66956ffd4b80fe4f9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 28 Nov 2024 21:44:27 +0800
Subject: [PATCH] Move the WASM fix to SkiaSharp (#3088) (#3089)

(cherry picked from commit c85c478e1b49bc3a135a6b195b57caa5beb28a7d)

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
---
 .../buildTransitive/HarfBuzzSharp.targets     | 18 ---------------
 .../buildTransitive/SkiaSharp.targets         | 22 +++++++++++++++++++
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/binding/HarfBuzzSharp.NativeAssets.WebAssembly/buildTransitive/HarfBuzzSharp.targets b/binding/HarfBuzzSharp.NativeAssets.WebAssembly/buildTransitive/HarfBuzzSharp.targets
index 6e2fdd3bb6..7198786ae6 100644
--- a/binding/HarfBuzzSharp.NativeAssets.WebAssembly/buildTransitive/HarfBuzzSharp.targets
+++ b/binding/HarfBuzzSharp.NativeAssets.WebAssembly/buildTransitive/HarfBuzzSharp.targets
@@ -31,22 +31,4 @@
     <NativeFileReference Include="$(HarfBuzzSharpStaticLibraryPath)\3.1.56\$(_HarfBuzzSharpNativeBinaryType)\*.a" Condition="$([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '9.0'))" />
   </ItemGroup>
 
-  <!-- Workaround for https://github.com/dotnet/runtime/issues/109289 -->
-  <Target Name="RuntimeIssue109289_Workaround"
-          AfterTargets="_BrowserWasmWriteRspForLinking">
-    <ItemGroup>
-      <_WasmLinkStepArgs Remove="@(_EmccLinkStepArgs)" />
-      <_EmccLinkStepArgs Remove="&quot;%(_WasmNativeFileForLinking.Identity)&quot;" />
-      <_WasmLinkDependencies Remove="@(_WasmNativeFileForLinking)" />
-
-      <_SkiaSharpToReorder Include="@(_WasmNativeFileForLinking)" Condition="$([System.String]::Copy('%(FullPath)').Contains('libSkiaSharp.a'))" />
-      <_WasmNativeFileForLinking Remove="@(_SkiaSharpToReorder)" />
-      <_WasmNativeFileForLinking Include="@(_SkiaSharpToReorder)" />
-
-      <_EmccLinkStepArgs Include="&quot;%(_WasmNativeFileForLinking.Identity)&quot;" />
-      <_WasmLinkDependencies Include="@(_WasmNativeFileForLinking)" />
-      <_WasmLinkStepArgs Include="@(_EmccLinkStepArgs)" />
-    </ItemGroup>
-  </Target>
-
 </Project>
\ No newline at end of file
diff --git a/binding/SkiaSharp.NativeAssets.WebAssembly/buildTransitive/SkiaSharp.targets b/binding/SkiaSharp.NativeAssets.WebAssembly/buildTransitive/SkiaSharp.targets
index 62e8baacb5..e201d1ce41 100644
--- a/binding/SkiaSharp.NativeAssets.WebAssembly/buildTransitive/SkiaSharp.targets
+++ b/binding/SkiaSharp.NativeAssets.WebAssembly/buildTransitive/SkiaSharp.targets
@@ -40,4 +40,26 @@
     <NativeFileReference Include="$(SkiaSharpStaticLibraryPath)\3.1.56\$(_SkiaSharpNativeBinaryType)\*.a" Condition="$([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '9.0'))" />
   </ItemGroup>
 
+  <!-- Workaround for https://github.com/dotnet/runtime/issues/109289 -->
+  <Target Name="_SkiaSharpRuntimeIssue109289Workaround" AfterTargets="_BrowserWasmWriteRspForLinking">
+    <ItemGroup>
+      <!-- Remove the relevant args from the items -->
+      <_WasmLinkStepArgs Remove="@(_EmccLinkStepArgs)" />
+      <_EmccLinkStepArgs Remove="&quot;%(_WasmNativeFileForLinking.Identity)&quot;" />
+      <_WasmLinkDependencies Remove="@(_WasmNativeFileForLinking)" />
+
+      <!-- Find the libSkiaSharp binaries -->
+      <_SkiaSharpToReorder Include="@(_WasmNativeFileForLinking)" Condition="$([System.String]::Copy('%(FullPath)').Contains('libSkiaSharp.a'))" />
+
+      <!-- Remove the libSkiaSharp binary and add it back, but at the end -->
+      <_WasmNativeFileForLinking Remove="@(_SkiaSharpToReorder)" />
+      <_WasmNativeFileForLinking Include="@(_SkiaSharpToReorder)" />
+
+      <!-- Add all the args back -->
+      <_EmccLinkStepArgs Include="&quot;%(_WasmNativeFileForLinking.Identity)&quot;" />
+      <_WasmLinkDependencies Include="@(_WasmNativeFileForLinking)" />
+      <_WasmLinkStepArgs Include="@(_EmccLinkStepArgs)" />
+    </ItemGroup>
+  </Target>
+
 </Project>
\ No newline at end of file