From 90842b7737decdf3ccc7adacaf2dc7da5fd60203 Mon Sep 17 00:00:00 2001
From: Andy Gocke <andy@commentout.net>
Date: Tue, 19 Sep 2023 17:11:54 -0700
Subject: [PATCH 1/2] Bring back CopyOutputSymbolsToPublishDirectory

I accidentally removed this property from AOT compilation
when adding support for Mac dsym bundles. This change re-enables
support for suppressing debugging symbols in the output.

Fixes #92188
---
 .../BuildIntegration/Microsoft.NETCore.Native.Publish.targets  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets
index caee0777b30ddd..426d9939b2e0a8 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets
@@ -95,7 +95,10 @@
     <!-- replace apphost with binary we generated during native compilation -->
     <Delete Files="$(PublishDir)\$(TargetName)$(NativeBinaryExt)" />
     <Copy SourceFiles="$(NativeOutputPath)$(TargetName)$(NativeBinaryExt)" DestinationFolder="$(PublishDir)" />
+  </Target>
 
+  <Target Name="_CopyAotSymbols" AfterTargets="CopyNativeBinary"
+          Condition="'$(CopyOutputSymbolsToPublishDirectory)' == 'true'">
     <!-- dotnet CLI produces managed debug symbols, which we will delete and copy native symbols instead -->
     <Delete Files="$(PublishDir)\$(TargetName).pdb" />
 

From 6f6df7d36f94c3dfcc99cad5e36e7123b2a1934e Mon Sep 17 00:00:00 2001
From: Andy Gocke <angocke@microsoft.com>
Date: Wed, 20 Sep 2023 12:45:58 -0700
Subject: [PATCH 2/2] Update
 src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Michal Strehovský <MichalStrehovsky@users.noreply.github.com>
---
 .../BuildIntegration/Microsoft.NETCore.Native.Publish.targets   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets
index 426d9939b2e0a8..da6c90642f6f13 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets
@@ -97,7 +97,7 @@
     <Copy SourceFiles="$(NativeOutputPath)$(TargetName)$(NativeBinaryExt)" DestinationFolder="$(PublishDir)" />
   </Target>
 
-  <Target Name="_CopyAotSymbols" AfterTargets="CopyNativeBinary"
+  <Target Name="_CopyAotSymbols" AfterTargets="Publish"
           Condition="'$(CopyOutputSymbolsToPublishDirectory)' == 'true'">
     <!-- dotnet CLI produces managed debug symbols, which we will delete and copy native symbols instead -->
     <Delete Files="$(PublishDir)\$(TargetName).pdb" />