From 3cc850517b3f3c8c85523ec0b53187b21ab8c034 Mon Sep 17 00:00:00 2001
From: Ivan Povazan <ivan.povazan@gmail.com>
Date: Wed, 28 Aug 2024 13:06:18 +0200
Subject: [PATCH 1/2] Do not treat assembly.pdb/xml files as native files to
 bundle

---
 eng/testing/tests.ioslike.targets | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/eng/testing/tests.ioslike.targets b/eng/testing/tests.ioslike.targets
index dde49575d7ae4..b2b5ac3b9dbe5 100644
--- a/eng/testing/tests.ioslike.targets
+++ b/eng/testing/tests.ioslike.targets
@@ -93,8 +93,7 @@
 
     <ItemGroup Condition="'$(DebuggerSupport)' == 'true'">
       <!-- Add any pdb files, if available -->
-      <_BundlePdbFiles Include="$([System.IO.Path]::ChangeExtension('%(AppleAssembliesToBundle.Identity)', '.pdb'))" />
-      <BundleFiles Include="@(_BundlePdbFiles)" TargetDir="publish" Condition="Exists(%(_BundlePdbFiles.Identity))" />
+      <BundleFiles Include="@(ApplePdbsToBundle)" TargetDir="publish" Condition="Exists(%(ApplePdbsToBundle.Identity))" />
     </ItemGroup>
 
     <Copy SourceFiles="@(BundleFiles)"         DestinationFolder="$(BundleDir)%(TargetDir)" />
@@ -213,7 +212,10 @@
         <_IsNative>false</_IsNative>
       </AppleAssembliesToBundle>
 
-      <AppleNativeFilesToBundle Include="$(PublishDir)\**\*.*" Exclude="$(PublishDir)\*.dll" />
+      <ApplePdbsToBundle Include="$([System.IO.Path]::ChangeExtension('%(AppleAssembliesToBundle.Identity)', '.pdb'))" />
+      <AppleXmlsToBundle Include="$([System.IO.Path]::ChangeExtension('%(AppleAssembliesToBundle.Identity)', '.xml'))" />
+
+      <AppleNativeFilesToBundle Include="$(PublishDir)\**\*.*" Exclude="@(AppleAssembliesToBundle);@(ApplePdbsToBundle);@(AppleXmlsToBundle);@(_SatelliteAssemblies)" />
     </ItemGroup>
   </Target>
 

From ec3cf2dc62fa365e14f325ba8859c674b117bc15 Mon Sep 17 00:00:00 2001
From: Ivan Povazan <ivan.povazan@gmail.com>
Date: Thu, 29 Aug 2024 11:42:57 +0200
Subject: [PATCH 2/2] Bundle satellite assemblies as well

---
 eng/testing/tests.ioslike.targets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/testing/tests.ioslike.targets b/eng/testing/tests.ioslike.targets
index b2b5ac3b9dbe5..a59cce6c49aee 100644
--- a/eng/testing/tests.ioslike.targets
+++ b/eng/testing/tests.ioslike.targets
@@ -71,6 +71,7 @@
       <BundleFiles Condition="'%(AppleAssembliesToBundle._IsNative)' != 'true'"
                    Include="@(AppleAssembliesToBundle)"         TargetDir="publish\%(AppleAssembliesToBundle.RecursiveDir)" />
       <BundleFiles Include="@(AppleNativeFilesToBundle)"        TargetDir="publish\%(AppleNativeFilesToBundle.RecursiveDir)" />
+      <BundleFiles Include="@(_SatelliteAssemblies)"            TargetDir="publish\%(_SatelliteAssemblies.RecursiveDir)" />
       <BundleFiles Include="$(RuntimeConfigFilePath)"           TargetDir="publish" />
 
       <BundleFiles Include="$(MonoProjectRoot)\msbuild\apple\data\*" TargetDir="publish" />