From 01501ff93b202b8975cb30eb7c42dc5f2122a3c4 Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Thu, 12 Oct 2023 14:38:42 -0400
Subject: [PATCH 1/2] Workloads test: Install the current app.ref pack also

Re-enable updating the targeting pack as the workload is correctly using
9.0 artifacts. The targeting pack update is needed because it includes
the locally built analyzers, like the source generators for
`JSImport/Export`.

This fixes `SatelliteLoadingTests.LoadSatelliteAssembly`.

Fixes issue: https://github.com/dotnet/runtime/issues/93387
---
 eng/testing/workloads-testing.targets                         | 4 +++-
 .../TestAppScenarios/SatelliteLoadingTests.cs                 | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/eng/testing/workloads-testing.targets b/eng/testing/workloads-testing.targets
index 5b8e0abce741eb..eb3e384d147170 100644
--- a/eng/testing/workloads-testing.targets
+++ b/eng/testing/workloads-testing.targets
@@ -20,6 +20,8 @@
       GetWorkloadInputs;
       _InstallWorkloads
     </InstallWorkloadUsingArtifactsDependsOn>
+
+    <SkipUpdateAppRefPackForTestingWorkloads>false</SkipUpdateAppRefPackForTestingWorkloads>
   </PropertyGroup>
 
   <ItemGroup>
@@ -190,7 +192,7 @@
                      LocalNuGetsPath="$(LibrariesShippingPackagesDir)"
                      TemplateNuGetConfigPath="$(RepoRoot)NuGet.config"
                      SdkWithNoWorkloadInstalledPath="$(_SdkWithNoWorkloadPath)"
-                     SkipUpdateAppRefPack="true"
+                     SkipUpdateAppRefPack="$(SkipUpdateAppRefPackForTestingWorkloads)"
       />
 
     <Touch Files="$(_SdkWithNoWorkloadStampPath)" AlwaysCreate="true" />
diff --git a/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/SatelliteLoadingTests.cs b/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/SatelliteLoadingTests.cs
index a2df9feee1eea3..31dcb65582869e 100644
--- a/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/SatelliteLoadingTests.cs
+++ b/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/SatelliteLoadingTests.cs
@@ -24,7 +24,6 @@ public SatelliteLoadingTests(ITestOutputHelper output, SharedBuildPerTestClassFi
     }
 
     [Fact]
-    [ActiveIssue("https://github.com/dotnet/runtime/issues/93387")]
     public async Task LoadSatelliteAssembly()
     {
         CopyTestAsset("WasmBasicTestApp", "SatelliteLoadingTests");

From 42f66012a985aa8bfbe528de8df44437aeb4a15c Mon Sep 17 00:00:00 2001
From: Ankit Jain <radical@gmail.com>
Date: Mon, 16 Oct 2023 22:22:48 -0400
Subject: [PATCH 2/2] [wasm] WBT: Disable NonWasmConsoleBuild_WithWorkload

Issue: https://github.com/dotnet/runtime/issues/93585
---
 src/mono/wasm/Wasm.Build.Tests/NonWasmTemplateBuildTests.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mono/wasm/Wasm.Build.Tests/NonWasmTemplateBuildTests.cs b/src/mono/wasm/Wasm.Build.Tests/NonWasmTemplateBuildTests.cs
index 579debf24502d9..d87c3b67d201f1 100644
--- a/src/mono/wasm/Wasm.Build.Tests/NonWasmTemplateBuildTests.cs
+++ b/src/mono/wasm/Wasm.Build.Tests/NonWasmTemplateBuildTests.cs
@@ -83,6 +83,7 @@ public void NonWasmConsoleBuild_WithoutWorkload(string config, string extraBuild
                                shouldRun: targetFramework == s_latestTargetFramework);
 
     [Theory]
+    [ActiveIssue("https://github.com/dotnet/runtime/issues/93585")]
     [MemberData(nameof(GetTestData))]
     public void NonWasmConsoleBuild_WithWorkload(string config, string extraBuildArgs, string targetFramework)
         => NonWasmConsoleBuild(config,