Skip to content

Commit 6a7d6ca

Browse files
ivanpovazangithub-actions
authored andcommitted
[mono][tvos] Do not treat assembly.pdb/xml files as native files to bundle when AOTing on Helix (#107079)
* Do not treat assembly.pdb/xml files as native files to bundle * Bundle satellite assemblies as well
1 parent f40b07a commit 6a7d6ca

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

eng/testing/tests.ioslike.targets

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
<BundleFiles Condition="'%(AppleAssembliesToBundle._IsNative)' != 'true'"
7272
Include="@(AppleAssembliesToBundle)" TargetDir="publish\%(AppleAssembliesToBundle.RecursiveDir)" />
7373
<BundleFiles Include="@(AppleNativeFilesToBundle)" TargetDir="publish\%(AppleNativeFilesToBundle.RecursiveDir)" />
74+
<BundleFiles Include="@(_SatelliteAssemblies)" TargetDir="publish\%(_SatelliteAssemblies.RecursiveDir)" />
7475
<BundleFiles Include="$(RuntimeConfigFilePath)" TargetDir="publish" />
7576

7677
<BundleFiles Include="$(MonoProjectRoot)\msbuild\apple\data\*" TargetDir="publish" />
@@ -93,8 +94,7 @@
9394

9495
<ItemGroup Condition="'$(DebuggerSupport)' == 'true'">
9596
<!-- Add any pdb files, if available -->
96-
<_BundlePdbFiles Include="$([System.IO.Path]::ChangeExtension('%(AppleAssembliesToBundle.Identity)', '.pdb'))" />
97-
<BundleFiles Include="@(_BundlePdbFiles)" TargetDir="publish" Condition="Exists(%(_BundlePdbFiles.Identity))" />
97+
<BundleFiles Include="@(ApplePdbsToBundle)" TargetDir="publish" Condition="Exists(%(ApplePdbsToBundle.Identity))" />
9898
</ItemGroup>
9999

100100
<Copy SourceFiles="@(BundleFiles)" DestinationFolder="$(BundleDir)%(TargetDir)" />
@@ -213,7 +213,10 @@
213213
<_IsNative>false</_IsNative>
214214
</AppleAssembliesToBundle>
215215

216-
<AppleNativeFilesToBundle Include="$(PublishDir)\**\*.*" Exclude="$(PublishDir)\*.dll" />
216+
<ApplePdbsToBundle Include="$([System.IO.Path]::ChangeExtension('%(AppleAssembliesToBundle.Identity)', '.pdb'))" />
217+
<AppleXmlsToBundle Include="$([System.IO.Path]::ChangeExtension('%(AppleAssembliesToBundle.Identity)', '.xml'))" />
218+
219+
<AppleNativeFilesToBundle Include="$(PublishDir)\**\*.*" Exclude="@(AppleAssembliesToBundle);@(ApplePdbsToBundle);@(AppleXmlsToBundle);@(_SatelliteAssemblies)" />
217220
</ItemGroup>
218221
</Target>
219222

0 commit comments

Comments
 (0)