diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj
index e01f2a6ed73b66..18fe686588392b 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.MonoCrossAOT.sfxproj
@@ -29,6 +29,7 @@
<_ToolFile Include="$(AotCompilerPath)**" />
+ <_ToolFileExcludingSymbols Include="@(_ToolFile)" Condition="'%(Extension)' != '.dwarf' and '%(Extension)' != '.dbg'" />
<_SdkPropsProperties Condition="!$([MSBuild]::IsOsPlatform('Windows'))" Include="ExeSuffix" Value="" />
@@ -36,7 +37,7 @@
<_SdkPropsProperties Include="TargetRid" Value="$(TargetCrossRid)" />
- <_PermissionsFiles>@(_ToolFile -> '<File Path="tools/%(RecursiveDir)%(FileName)%(Extension)" Permission="755" />', ' ')
+ <_PermissionsFiles>@(_ToolFileExcludingSymbols -> '<File Path="tools/%(RecursiveDir)%(FileName)%(Extension)" Permission="755" />', ' ')
<_PermissionsProperties Include="PermissionsProperties" Value="$(_PermissionsFiles)" />
diff --git a/src/mono/mono.proj b/src/mono/mono.proj
index 6f15a31d94dca4..3122cdf153cd17 100644
--- a/src/mono/mono.proj
+++ b/src/mono/mono.proj
@@ -28,8 +28,7 @@
$(LibPrefix)$(MonoLibName)$(StaticLibSuffix)
$(MonoStaticLibFileName)
$(MonoSharedLibFileName)
- mono-aot-cross$(ExeSuffix)
- mono-aot-cross.pdb
+ mono-aot-cross
$(Configuration)
$(Configuration)
$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'tests', 'coreclr', '$(TargetOS).$(Platform).$(CoreClrTestConfig)', 'Tests', 'Core_Root'))
@@ -933,8 +932,7 @@
<_MonoIncludeInterpStaticFiles Condition="'$(TargetsBrowser)' == 'true' or '$(TargetsWasi)' == 'true'">true
- <_MonoAotCrossFilePath>$(MonoObjCrossDir)out\bin\$(MonoAotCrossFileName)
- <_MonoAotCrossPdbFilePath>$(MonoObjCrossDir)out\bin\$(MonoAotCrossPdbFileName)
+ <_MonoAotCrossFilePath>$(MonoObjCrossDir)out\bin\$(MonoAotCrossName)$(ExeSuffix)
<_MonoLLVMHostArchitecture>$(AotHostArchitecture)
@@ -961,6 +959,18 @@
<_MonoRuntimeArtifacts Include="$(_MonoRuntimeStaticFilePath)" Condition="Exists($(_MonoRuntimeStaticFilePath)) and '$(_MonoRuntimeStaticFilePath)' != '$(_MonoRuntimeFilePath)'">
$(RuntimeBinDir)$(MonoStaticLibFileName)
+ <_MonoRuntimeArtifacts Include="$(_MonoAotCrossFilePath)" Condition="Exists($(_MonoAotCrossFilePath))">
+ $(RuntimeBinDir)cross\$(OutputRID)\$(MonoAotCrossName)$(ExeSuffix)
+
+ <_MonoRuntimeArtifacts Include="$(_MonoAotCrossFilePath).dbg" Condition="Exists('$(_MonoAotCrossFilePath).dbg')">
+ $(RuntimeBinDir)cross\$(OutputRID)\$(MonoAotCrossName).dbg
+
+ <_MonoRuntimeArtifacts Include="$(_MonoAotCrossFilePath).dwarf" Condition="Exists('$(_MonoAotCrossFilePath).dwarf')">
+ $(RuntimeBinDir)cross\$(OutputRID)\$(MonoAotCrossName).dwarf
+
+ <_MonoRuntimeArtifacts Include="$(MonoObjCrossDir)out\bin\PDB\$(MonoAotCrossName).pdb" Condition="Exists('$(MonoObjCrossDir)out\bin\PDB\$(MonoAotCrossName).pdb')">
+ $(RuntimeBinDir)cross\$(OutputRID)\$(MonoAotCrossName).pdb
+
<_MonoRuntimeArtifacts Include="@(_MonoRuntimeComponentsStaticFilePath)">
$(RuntimeBinDir)%(_MonoRuntimeComponentsStaticFilePath.Filename)%(_MonoRuntimeComponentsStaticFilePath.Extension)
@@ -968,9 +978,6 @@
<_MonoRuntimeArtifacts Include="@(_MonoRuntimeComponentsSharedFilePath)">
$(RuntimeBinDir)%(_MonoRuntimeComponentsSharedFilePath.Filename)%(_MonoRuntimeComponentsSharedFilePath.Extension)
- <_MonoRuntimeArtifacts Include="$(_MonoAotCrossFilePath)">
- $(RuntimeBinDir)cross\$(OutputRID)\$(MonoAotCrossFileName)
-
<_MonoRuntimeArtifacts Condition="'$(HostOS)' == 'Linux' and ('$(MonoBundleLLVMOptimizer)' == 'true' or '$(MonoEnableLLVM)' == 'true') and '$(TargetArchitecture)' != 'wasm' and '$(MonoUseLibCxx)' == 'true'" Include="$(MonoLLVMDir)\$(_MonoLLVMTargetArchitecture)\lib\libc++.so.1">
$(RuntimeBinDir)libc++.so.1
@@ -983,9 +990,6 @@
<_MonoRuntimeArtifacts Condition="'$(HostOS)' == 'Linux' and ((('$(MonoAOTBundleLLVMOptimizer)' == 'true' or '$(MonoAOTEnableLLVM)' == 'true') and '$(MonoUseLibCxx)' == 'true') or '$(TargetArchitecture)' == 'wasm')" Include="$(MonoLLVMDir)\$(_MonoLLVMHostArchitecture)\lib\libc++abi.so.1">
$(RuntimeBinDir)cross\$(OutputRID)\libc++abi.so.1
- <_MonoRuntimeArtifacts Include="$(_MonoAotCrossPdbFilePath)" Condition="Exists('$(_MonoAotCrossPdbFilePath)')">
- $(RuntimeBinDir)cross\$(OutputRID)\$(MonoAotCrossPdbFileName)
-
<_MonoRuntimeArtifacts Condition="'$(MonoBundleLLVMOptimizer)' == 'true'" Include="$(MonoLLVMDir)\$(_MonoLLVMHostArchitecture)\bin\llc$(ExeSuffix)">
$(RuntimeBinDir)\llc$(ExeSuffix)