From 5f5b1e49d10bb92f50e1f091ad7110e066dbd3c7 Mon Sep 17 00:00:00 2001
From: Radek Doulik <radek.doulik@gmail.com>
Date: Wed, 20 Nov 2024 14:11:50 +0100
Subject: [PATCH] Re-enable skiasharp WBT tests (#109232)

* [wasm] Re-enable skiasharp WBT tests

* Disable Debug/AOT combination

That would trigger build error, because we don't support that combination
anymore

* Change order of native libs

Put NativeFileReference files after the runtime libs. This server as
a workaround of #109289

* Update llvm, emsdk and icu deps

* Revert "Change order of native libs"

This reverts commit e320fd67aabede113e274d0d569ca6d7be70bd3e.
---
 src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests.cs   | 1 -
 src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs      | 4 ++--
 src/mono/wasm/Wasm.Build.Tests/NativeLibraryTests.cs | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests.cs b/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests.cs
index 25bd5c7f4d06bf..c93ec2c6af452f 100644
--- a/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests.cs
+++ b/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests.cs
@@ -22,7 +22,6 @@ public MiscTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buildC
     [InlineData("Debug", false)]
     [InlineData("Release", true)]
     [InlineData("Release", false)]
-    [ActiveIssue("https://github.com/dotnet/runtime/issues/103566")]
     public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRelink)
     {
         string id = $"blz_deploy_on_build_{config}_{nativeRelink}_{GetRandomId()}";
diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs
index 3dc64bc556d538..cccc44efb621ee 100644
--- a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs
+++ b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs
@@ -605,8 +605,8 @@ internal BuildPaths GetBuildPaths(BuildArgs buildArgs, bool forPublish = true)
         }
 
         protected static string GetSkiaSharpReferenceItems()
-            => @"<PackageReference Include=""SkiaSharp"" Version=""2.88.6"" />
-                <PackageReference Include=""SkiaSharp.NativeAssets.WebAssembly"" Version=""2.88.6"" />
+            => @"<PackageReference Include=""SkiaSharp"" Version=""2.88.9-preview.2.2"" />
+                <PackageReference Include=""SkiaSharp.NativeAssets.WebAssembly"" Version=""2.88.9-preview.2.2"" />
                 <NativeFileReference Include=""$(SkiaSharpStaticLibraryPath)\3.1.56\st\*.a"" />";
 
         protected static string s_mainReturns42 = @"
diff --git a/src/mono/wasm/Wasm.Build.Tests/NativeLibraryTests.cs b/src/mono/wasm/Wasm.Build.Tests/NativeLibraryTests.cs
index 8444f54308d5b9..990d331f0c580c 100644
--- a/src/mono/wasm/Wasm.Build.Tests/NativeLibraryTests.cs
+++ b/src/mono/wasm/Wasm.Build.Tests/NativeLibraryTests.cs
@@ -50,8 +50,7 @@ public void ProjectWithNativeReference(BuildArgs buildArgs, RunHost host, string
 
         [Theory]
         [BuildAndRun(aot: false)]
-        [BuildAndRun(aot: true)]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/103566")]
+        [BuildAndRun(aot: true, config: "Release")]
         public void ProjectUsingSkiaSharp(BuildArgs buildArgs, RunHost host, string id)
         {
             string projectName = $"AppUsingSkiaSharp";