From 0da5f8eac29a696f6be418723ed8d1a0f4591462 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 13 Nov 2024 22:11:40 -0800
Subject: [PATCH 1/2] Add dotnet/runtime#109289 workaround

---
 .../build/Avalonia.Browser.targets            | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/Browser/Avalonia.Browser/build/Avalonia.Browser.targets b/src/Browser/Avalonia.Browser/build/Avalonia.Browser.targets
index 91399a2e762..d4e7e330979 100644
--- a/src/Browser/Avalonia.Browser/build/Avalonia.Browser.targets
+++ b/src/Browser/Avalonia.Browser/build/Avalonia.Browser.targets
@@ -35,4 +35,23 @@
     <NativeFileReference Include="$(HarfBuzzSharpStaticLibraryPath)\3.1.56\$(_AvNativeBinaryType)\*.a"
                          Condition="$([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '9.0'))" />
   </ItemGroup>
+
+  <!-- https://github.com/dotnet/runtime/issues/109289 -->
+  <Target Name="Issue109289_Workaround"
+          Condition="'$(DisableIssue109289Workaround)' != 'true'"
+          AfterTargets="_BrowserWasmWriteRspForLinking">
+    <ItemGroup>
+      <_WasmLinkStepArgs Remove="@(_EmccLinkStepArgs)" />
+      <_EmccLinkStepArgs Remove="&quot;%(_WasmNativeFileForLinking.Identity)&quot;" />
+      <_WasmLinkDependencies Remove="@(_WasmNativeFileForLinking)" />
+
+      <_SkiaSharpToReorder Include="@(_WasmNativeFileForLinking)" Condition="$([System.String]::Copy('%(FullPath)').Contains('SkiaSharp'))" />
+      <_WasmNativeFileForLinking Remove="@(_SkiaSharpToReorder)" />
+      <_WasmNativeFileForLinking Include="@(_SkiaSharpToReorder)" />
+
+      <_EmccLinkStepArgs Include="&quot;%(_WasmNativeFileForLinking.Identity)&quot;" />
+      <_WasmLinkDependencies Include="@(_WasmNativeFileForLinking)" />
+      <_WasmLinkStepArgs Include="@(_EmccLinkStepArgs)" />
+    </ItemGroup>
+  </Target>
 </Project>

From ff02f27f00114c0ea10913acd25a1a64c087cbc0 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Wed, 13 Nov 2024 22:20:56 -0800
Subject: [PATCH 2/2] Add target framework version condition

---
 src/Browser/Avalonia.Browser/build/Avalonia.Browser.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Browser/Avalonia.Browser/build/Avalonia.Browser.targets b/src/Browser/Avalonia.Browser/build/Avalonia.Browser.targets
index d4e7e330979..13f2ed78ba2 100644
--- a/src/Browser/Avalonia.Browser/build/Avalonia.Browser.targets
+++ b/src/Browser/Avalonia.Browser/build/Avalonia.Browser.targets
@@ -38,7 +38,7 @@
 
   <!-- https://github.com/dotnet/runtime/issues/109289 -->
   <Target Name="Issue109289_Workaround"
-          Condition="'$(DisableIssue109289Workaround)' != 'true'"
+          Condition="'$(DisableIssue109289Workaround)' != 'true' AND $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '9.0'))"
           AfterTargets="_BrowserWasmWriteRspForLinking">
     <ItemGroup>
       <_WasmLinkStepArgs Remove="@(_EmccLinkStepArgs)" />