From 0b634833d24414aa5f6eed60a737758ee47dbdde Mon Sep 17 00:00:00 2001
From: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com>
Date: Tue, 23 Jun 2026 17:27:28 -0700
Subject: [PATCH] Ship stripped cdac AOT binary and its symbols in the
 transport package

The Microsoft.DotNet.Cdac.Transport package consumed the NativeAOT publish output (DotNetCdacBinDir), which is the unstripped binary with no adjacent symbol file. The runtime-component build (native-library.targets) already strips the binary like the CoreCLR cmake build and installs both the stripped library and its symbol file (.so.dbg/.dylib.dwarf/.pdb) into the CoreCLR artifacts directory, but nothing consumed them.

Point the package at CoreCLRArtifactsPath so it ships the stripped binary, and use a NativeBinary item so the packaging infrastructure (GetSymbolPackageFiles) auto-discovers the adjacent symbol file and adds it to the symbol package.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../Microsoft.DotNet.Cdac.Transport.pkgproj          | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/installer/pkg/projects/Microsoft.DotNet.Cdac.Transport/Microsoft.DotNet.Cdac.Transport.pkgproj b/src/installer/pkg/projects/Microsoft.DotNet.Cdac.Transport/Microsoft.DotNet.Cdac.Transport.pkgproj
index d1f26ea579f827..bc7abf451f8b20 100644
--- a/src/installer/pkg/projects/Microsoft.DotNet.Cdac.Transport/Microsoft.DotNet.Cdac.Transport.pkgproj
+++ b/src/installer/pkg/projects/Microsoft.DotNet.Cdac.Transport/Microsoft.DotNet.Cdac.Transport.pkgproj
@@ -5,7 +5,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <File Include="$(DotNetCdacBinDir)$(LibPrefix)mscordaccore_universal$(LibSuffix)">
+    <!--
+      Consume the stripped binary that the runtime-component build installs into the CoreCLR
+      artifacts directory. Using a NativeBinary item (instead of a bare File) lets the packaging
+      infrastructure auto-discover the adjacent symbol file (.so.dbg/.dylib.dwarf/.pdb) and add
+      it to the symbol package.
+    -->
+    <NativeBinary Include="$(CoreCLRArtifactsPath)$(LibPrefix)mscordaccore_universal$(LibSuffix)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <File Include="@(NativeBinary)">
       <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
       <IsNative>true</IsNative>
     </File>