diff --git a/eng/testing/tests.wasm.targets b/eng/testing/tests.wasm.targets
index 6aa83a3d8f6bf..d29a9e7f4f9e7 100644
--- a/eng/testing/tests.wasm.targets
+++ b/eng/testing/tests.wasm.targets
@@ -20,7 +20,7 @@
- for AOT library tests, we use WasmNativeStrip=false, so we already have symbols
-->
false
- true
+ true
<_ShellCommandSeparator Condition="'$(OS)' == 'Windows_NT'">&&
diff --git a/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs b/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs
index 4507dddd1ff51..706ddc9b0b58e 100644
--- a/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs
+++ b/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs
@@ -340,7 +340,6 @@ public static TheoryData TestDataForConsolePublishAndRun()
{
var data = new TheoryData();
data.Add("Debug", false, false);
- data.Add("Debug", false, false);
data.Add("Debug", false, true);
data.Add("Release", false, false); // Release relinks by default
diff --git a/src/mono/wasm/build/WasmApp.targets b/src/mono/wasm/build/WasmApp.targets
index 9d944c125c070..e248125876003 100644
--- a/src/mono/wasm/build/WasmApp.targets
+++ b/src/mono/wasm/build/WasmApp.targets
@@ -87,7 +87,7 @@
-->
- false
+ true
false
false
diff --git a/src/tasks/AotCompilerTask/MonoAOTCompiler.cs b/src/tasks/AotCompilerTask/MonoAOTCompiler.cs
index efcdaf30cc34f..e6aac82177f04 100644
--- a/src/tasks/AotCompilerTask/MonoAOTCompiler.cs
+++ b/src/tasks/AotCompilerTask/MonoAOTCompiler.cs
@@ -560,7 +560,7 @@ private IEnumerable EnsureAllAssembliesInTheSameDir(IEnumerable ConvertAssembliesDictToOrderedList(ConcurrentDict
List outItems = new(originalAssemblies.Count);
foreach (ITaskItem item in originalAssemblies)
{
- if (dict.TryGetValue(item.GetMetadata("FullPath"), out ITaskItem? dictItem))
- outItems.Add(dictItem);
+ if (!dict.TryGetValue(item.GetMetadata("FullPath"), out ITaskItem? dictItem))
+ continue;
+
+ string originalFullPath = item.GetMetadata(s_originalFullPathMetadataName);
+ if (!string.IsNullOrEmpty(originalFullPath))
+ dictItem.ItemSpec = originalFullPath;
+
+ outItems.Add(dictItem);
}
return outItems;
}