From bafd001ab8101a8485f1b1a1448678a779d2918a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Fi=C5=A1era?= <mara@neptuo.com>
Date: Mon, 5 Oct 2026 15:53:09 +0200
Subject: [PATCH] Filter browser runtime-pack library maps and app C++ headers

Exclude intermediate Emscripten JS-library maps from CoreCLR browser runtime packs while retaining final-module maps and link inputs. Filter runtime-pack .hpp headers from WebAssembly app assets.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 eng/liveBuilds.targets                                     | 7 ++++++-
 .../pkg/sfx/Microsoft.NETCore.App/Directory.Build.props    | 4 ----
 .../AssetsComputingHelper.cs                               | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
index da24977023c101..d8ba0cccb1c41c 100644
--- a/eng/liveBuilds.targets
+++ b/eng/liveBuilds.targets
@@ -263,6 +263,7 @@
         $(LibrariesNativeArtifactsPath)*.jar;"
         IsNative="true" />
 
+      <!-- These Rollup maps are inputs to Emscripten's JS-library handling, not maps for a served module. -->
       <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'browser' and '$(RuntimeFlavor)' == 'CoreCLR'"
                              Include="
         $(CoreCLRSharedFrameworkDir)libcoreclr_static.a;
@@ -279,7 +280,11 @@
         "
         Exclude="$(LibrariesSharedFrameworkDir)libminipal.a;
                  $(LibrariesSharedFrameworkDir)libSystem.IO.Compression.Native.a;
-                 $(LibrariesSharedFrameworkDir)libz.a"
+                 $(LibrariesSharedFrameworkDir)libz.a;
+                 $(LibrariesSharedFrameworkDir)libBrowserHost.js.map;
+                 $(LibrariesSharedFrameworkDir)libSystem.Native.Browser.js.map;
+                 $(LibrariesSharedFrameworkDir)libSystem.Native.Browser.Utils.js.map;
+                 $(LibrariesSharedFrameworkDir)libSystem.Runtime.InteropServices.JavaScript.Native.js.map"
         IsNative="true" />
 
       <!-- Runtime tests for Helix are built without the host subset, so browser host files are excluded from the runtime tests build -->
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
index 5c36a463c5e5a6..c12c12479224ae 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
@@ -277,14 +277,10 @@
     <PlatformManifestFileEntry Include="libnativeresourcestring.a" IsNative="true" />
     <PlatformManifestFileEntry Include="libBrowserHost.a" IsNative="true" />
     <PlatformManifestFileEntry Include="libBrowserHost.js" IsNative="true" />
-    <PlatformManifestFileEntry Include="libBrowserHost.js.map" IsNative="true" />
     <PlatformManifestFileEntry Include="libSystem.Native.Browser.Utils.js" IsNative="true" />
-    <PlatformManifestFileEntry Include="libSystem.Native.Browser.Utils.js.map" IsNative="true" />
     <PlatformManifestFileEntry Include="libSystem.Native.Browser.js" IsNative="true" />
-    <PlatformManifestFileEntry Include="libSystem.Native.Browser.js.map" IsNative="true" />
     <PlatformManifestFileEntry Include="libSystem.Native.Browser.extpost.js" IsNative="true" />
     <PlatformManifestFileEntry Include="libSystem.Runtime.InteropServices.JavaScript.Native.js" IsNative="true" />
-    <PlatformManifestFileEntry Include="libSystem.Runtime.InteropServices.JavaScript.Native.js.map" IsNative="true" />
     <!-- wasi specific -->
     <PlatformManifestFileEntry Include="libWasiHost.a" IsNative="true" />
     <PlatformManifestFileEntry Include="main.c" IsNative="true" />
diff --git a/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/AssetsComputingHelper.cs b/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/AssetsComputingHelper.cs
index 673fc225ea5979..320d57bdb3a37f 100644
--- a/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/AssetsComputingHelper.cs
+++ b/src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/AssetsComputingHelper.cs
@@ -67,6 +67,7 @@ public static bool ShouldFilterCandidate(
             ".a" when fromRuntimePack => "extension is .a is not supported.",
             ".c" when fromRuntimePack => "extension is .c is not supported.",
             ".h" when fromRuntimePack => "extension is .h is not supported.",
+            ".hpp" when fromRuntimePack => "extension is .hpp is not supported.",
             // It is safe to filter out all XML files since we are not interested in any XML file from the list
             // of ResolvedFilesToPublish to become a static web asset. Things like this include XML doc files and
             // so on.