Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build Mac symbols in .dSYM bundle, not single .dwarf file #96456

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions eng/liveBuilds.targets
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<!-- Accept override paths for live artifacts. -->
<PropertyGroup>
<!-- Accept override paths for live artifacts. -->
<CoreCLRArtifactsPath Condition="'$(CoreCLROverridePath)' != ''">$([MSBuild]::NormalizeDirectory('$(CoreCLROverridePath)'))</CoreCLRArtifactsPath>
<MonoArtifactsPath Condition="'$(MonoOverridePath)' != ''">$([MSBuild]::NormalizeDirectory('$(MonoOverridePath)'))</MonoArtifactsPath>
<LibrariesArtifactsPath Condition="'$(LibrariesOverridePath)' != ''">$([MSBuild]::NormalizeDirectory('$(LibrariesOverridePath)'))</LibrariesArtifactsPath>
Expand All @@ -9,6 +9,8 @@
<!-- Honor the RuntimeArtifactsPath property. -->
<CoreCLRArtifactsPath Condition="'$(CoreCLRArtifactsPath)' == '' and '$(RuntimeArtifactsPath)' != ''">$([MSBuild]::NormalizeDirectory('$(RuntimeArtifactsPath)'))</CoreCLRArtifactsPath>
<MonoArtifactsPath Condition="'$(MonoArtifactsPath)' == '' and '$(RuntimeArtifactsPath)' != ''">$([MSBuild]::NormalizeDirectory('$(RuntimeArtifactsPath)'))</MonoArtifactsPath>

<!-- Set default for LibrariesTargetOSConfigurationArchitecture if not set. -->
<LibrariesTargetOSConfigurationArchitecture Condition="'$(LibrariesTargetOSConfigurationArchitecture)' == ''">$(TargetOS)-$(LibrariesConfiguration)-$(TargetArchitecture)</LibrariesTargetOSConfigurationArchitecture>
</PropertyGroup>

Expand All @@ -22,7 +24,9 @@

<!-- Set up artifact subpaths. -->
<PropertyGroup>
<CoreCLRArtifactsPdbDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'PDB'))</CoreCLRArtifactsPdbDir>
<CoreCLRSharedFrameworkDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'sharedFramework'))</CoreCLRSharedFrameworkDir>
<CoreCLRSharedFrameworkPdbDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRSharedFrameworkDir)', 'PDB'))</CoreCLRSharedFrameworkPdbDir>
<CoreCLRILCompilerDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'ilc-published'))</CoreCLRILCompilerDir>
<CoreCLRCrossILCompilerDir Condition="'$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)' or '$(HostOS)' != '$(TargetOS)' or '$(EnableNativeSanitizers)' != ''">$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', '$(BuildArchitecture)', 'ilc'))</CoreCLRCrossILCompilerDir>
<CoreCLRAotSdkDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'aotsdk'))</CoreCLRAotSdkDir>
Expand Down Expand Up @@ -65,20 +69,9 @@
Text="The Mono artifacts path does not exist '$(MonoArtifactsPath)'. The 'mono' subset must be built before building this project. Configuration: '$(MonoConfiguration)'. To use a different configuration, specify the 'RuntimeConfiguration' property." />

<PropertyGroup Condition="'$(RuntimeFlavor)' == 'CoreCLR'">
<CoreCLRArtifactsPath>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)'))</CoreCLRArtifactsPath>
<CoreCLRArtifactsPdbDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)','PDB'))</CoreCLRArtifactsPdbDir>
<!--
Even though CoreCLRSharedFrameworkDir is statically initialized, set it again in case the
value is different after CoreCLRArtifactsPath is normalized.
-->
<CoreCLRSharedFrameworkDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)','sharedFramework'))</CoreCLRSharedFrameworkDir>
<CoreCLRSharedFrameworkPdbDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRSharedFrameworkDir)','PDB'))</CoreCLRSharedFrameworkPdbDir>
<CoreCLRCrossTargetComponentDir
Condition="'$(CoreCLRCrossTargetComponentDirName)' != ''">$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)','$(CoreCLRCrossTargetComponentDirName)','sharedFramework'))</CoreCLRCrossTargetComponentDir>
</PropertyGroup>
<PropertyGroup Condition="'$(RuntimeFlavor)' == 'Mono'">
<MonoArtifactsPath>$([MSBuild]::NormalizeDirectory('$(MonoArtifactsPath)'))</MonoArtifactsPath>
</PropertyGroup>

<ItemGroup Condition="'$(BuildNativeAOTRuntimePack)' == 'true'">
<_nativeAotRuntimeFiles Include="$(CoreCLRAotSdkDir)*" />
Expand All @@ -94,16 +87,22 @@
<RuntimeFiles>
<IsNative>true</IsNative>
</RuntimeFiles>

<!-- Include System.Private.CoreLib.dll if it exists; get the one in the 'IL' subdirectory if the one in the root directory is missing. -->
<_systemPrivateCoreLib Include="$(CoreCLRArtifactsPath)System.Private.CoreLib.dll"
Condition="Exists('$(CoreCLRArtifactsPath)System.Private.CoreLib.dll')" />
<_systemPrivateCoreLib Include="$(CoreCLRArtifactsPath)IL/System.Private.CoreLib.dll"
Condition="Exists('$(CoreCLRArtifactsPath)IL/System.Private.CoreLib.dll') and '@(_systemPrivateCoreLib)' == ''" />
<RuntimeFiles Include="@(_systemPrivateCoreLib)" />

<!-- Include debugging symbols -->
<RuntimeFiles
Include="
$(CoreCLRSharedFrameworkPdbDir)*.pdb;
$(CoreCLRSharedFrameworkPdbDir)*.dbg;
$(CoreCLRSharedFrameworkPdbDir)*.dwarf" IsNative="true" />
$(CoreCLRSharedFrameworkPdbDir)*.dwarf;
$(CoreCLRSharedFrameworkPdbDir)*.dSYM/**"
IsNative="true" />
<RuntimeFiles Condition="Exists('$(CoreCLRArtifactsPdbDir)System.Private.CoreLib.pdb')"
Include="$(CoreCLRArtifactsPdbDir)System.Private.CoreLib.pdb" />
<RuntimeFiles Condition="Exists('$(CoreCLRArtifactsPdbDir)System.Private.CoreLib.ni.pdb')"
Expand All @@ -113,13 +112,15 @@
Include="
$(CoreCLRSharedFrameworkPdbDir)*.pdb;
$(CoreCLRSharedFrameworkPdbDir)*.dbg;
$(CoreCLRSharedFrameworkPdbDir)*.dwarf" />
$(CoreCLRSharedFrameworkPdbDir)*.dwarf;
$(CoreCLRSharedFrameworkPdbDir)*.dSYM/**" />

<CoreCLRCrossTargetFiles>
<TargetPath>runtime/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)/native</TargetPath>
<IsNative>true</IsNative>
</CoreCLRCrossTargetFiles>
</ItemGroup>

<ItemGroup Condition="'$(RuntimeFlavor)' == 'Mono'">
<RuntimeFiles Include="$(MonoArtifactsPath)\*.*" />
<RuntimeFiles>
Expand Down Expand Up @@ -188,6 +189,7 @@
$(LibrariesNativeArtifactsPath)*.so;
$(LibrariesNativeArtifactsPath)*.dbg;
$(LibrariesNativeArtifactsPath)*.dwarf;
$(LibrariesNativeArtifactsPath)*.dSYM/**;
$(LibrariesNativeArtifactsPath)*.pdb"
IsNative="true"
Exclude="@(ExcludeNativeLibrariesRuntimeFiles)" />
Expand Down
4 changes: 2 additions & 2 deletions eng/native/functions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ endfunction()
function (get_symbol_file_name targetName outputSymbolFilename)
if (CLR_CMAKE_HOST_UNIX)
if (CLR_CMAKE_TARGET_APPLE)
set(strip_destination_file $<TARGET_FILE:${targetName}>.dwarf)
set(strip_destination_file $<TARGET_FILE:${targetName}>.dSYM)
else ()
set(strip_destination_file $<TARGET_FILE:${targetName}>.dbg)
endif ()
Expand Down Expand Up @@ -416,7 +416,7 @@ function(strip_symbols targetName outputFilename)
OUTPUT_VARIABLE DSYMUTIL_HELP_OUTPUT
)

set(DSYMUTIL_OPTS "--flat")
set(DSYMUTIL_OPTS "")
if ("${DSYMUTIL_HELP_OUTPUT}" MATCHES "--minimize")
list(APPEND DSYMUTIL_OPTS "--minimize")
endif ()
Expand Down
11 changes: 9 additions & 2 deletions eng/native/naming.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,18 @@
<LibSuffix>.dll</LibSuffix>
<StaticLibSuffix>.lib</StaticLibSuffix>
<SymbolsSuffix>.pdb</SymbolsSuffix>
<SymbolsSuffixPath>.pdb</SymbolsSuffixPath>
<SymbolsIsDirectory>false</SymbolsIsDirectory>
</PropertyGroup>
</When>
<When Condition="$(PackageRID.StartsWith('osx')) or $(PackageRID.StartsWith('maccatalyst')) or $(PackageRID.StartsWith('ios')) or $(PackageRID.StartsWith('tvos'))">
<PropertyGroup>
<LibPrefix>lib</LibPrefix>
<LibSuffix>.dylib</LibSuffix>
<StaticLibSuffix>.a</StaticLibSuffix>
<SymbolsSuffix>.dwarf</SymbolsSuffix>
<SymbolsSuffix>.dSYM</SymbolsSuffix>
<SymbolsSuffixPath>.dSYM/**</SymbolsSuffixPath>
<SymbolsIsDirectory>true</SymbolsIsDirectory>
</PropertyGroup>
</When>
<Otherwise>
Expand All @@ -27,12 +31,15 @@
<LibSuffix>.so</LibSuffix>
<StaticLibSuffix>.a</StaticLibSuffix>
<SymbolsSuffix>.dbg</SymbolsSuffix>
<SymbolsSuffixPath>.dbg</SymbolsSuffixPath>
<SymbolsIsDirectory>false</SymbolsIsDirectory>
</PropertyGroup>
</Otherwise>
</Choose>

<ItemGroup>
<AdditionalLibPackageExcludes Condition="'$(SymbolsSuffix)' != ''" Include="%2A%2A\%2A$(SymbolsSuffix)" />
<!-- %2A is * so below is "**\*.pdb" for example -->
<AdditionalLibPackageExcludes Condition="'$(SymbolsSuffixPath)' != ''" Include="%2A%2A\%2A$(SymbolsSuffixPath)" />
<AdditionalSymbolPackageExcludes Condition="'$(LibSuffix)' != ''" Include="%2A%2A\%2A.a;%2A%2A\%2A$(LibSuffix)" />
</ItemGroup>

Expand Down
3 changes: 2 additions & 1 deletion src/coreclr/.nuget/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@
<NonWindowsNativeFile Include="@(NativeWithSymbolFile)"
Exclude="@(WindowsNativeFile)" />

<NonWindowsSymbolFile Include="@(NonWindowsNativeFile -> '%(Identity)$(SymbolsSuffix)')" />
<NonWindowsSymbolFile Condition="'$(SymbolsSuffix)'=='.dSYM'" Include="@(NonWindowsNativeFile -> '%(Identity)$(SymbolsSuffix)/**')" />
<NonWindowsSymbolFile Condition="'$(SymbolsSuffix)'!='.dSYM'" Include="@(NonWindowsNativeFile -> '%(Identity)$(SymbolsSuffix)')" />

<ExistingWindowsSymbolFile Include="@(WindowsSymbolFile)" Condition="Exists('%(Identity)')" />
<ExistingNonWindowsSymbolFile Include="@(NonWindowsSymbolFile)" Condition="Exists('%(Identity)') AND '$(SkipPackagingXplatSymbols)'!='true'" />
Expand Down
3 changes: 0 additions & 3 deletions src/coreclr/tools/aot/crossgen2/crossgen2_publish.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@
<IlcFrameworkPath>$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)</IlcFrameworkPath>
<IlcFrameworkNativePath>$(MicrosoftNetCoreAppRuntimePackNativeDir)</IlcFrameworkNativePath>
<TrimmerSingleWarn>false</TrimmerSingleWarn>
<!-- Use .dwarf files instead of .dsym files since our symbol exporting may not safely handle folders. -->
<NativeSymbolExt Condition="'$(_IsApplePlatform)' == 'true'">.dwarf</NativeSymbolExt>
<DsymUtilOptions Condition="'$(_IsApplePlatform)' == 'true'">--flat</DsymUtilOptions>
</PropertyGroup>

<ItemGroup Condition="'$(NativeAotSupported)' == 'true'">
Expand Down
10 changes: 9 additions & 1 deletion src/installer/pkg/archives/dotnet-nethost.proj
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,15 @@
Condition="'$(TargetsWindows)' == 'true'"
DestinationFolder="$(SymbolsOutputPath)" />
<Copy SourceFiles="$(DotNetHostBinDir)\$(LibPrefix)nethost$(LibSuffix)$(SymbolsSuffix)"
Condition="'$(TargetsWindows)' != 'true'"
Condition="('$(TargetsWindows)' != 'true') and ('$(SymbolsIsDirectory)' != 'true')"
DestinationFolder="$(SymbolsOutputPath)" />

<!-- Do some magic to tree copy the symbols if they represent a directory instead of a file (e.g., .dSYM) -->
<ItemGroup Condition="('$(TargetsWindows)' != 'true') and ('$(SymbolsIsDirectory)' == 'true')">
<RecursiveSourceFiles Include="$(DotNetHostBinDir)\$(LibPrefix)nethost$(LibSuffix)$(SymbolsSuffix)/**/*"/>
</ItemGroup>
<Copy SourceFiles="@(RecursiveSourceFiles)"
Condition="('$(TargetsWindows)' != 'true') and ('$(SymbolsIsDirectory)' == 'true')"
DestinationFolder="$(SymbolsOutputPath)/%(RecursiveDir)" />
</Target>
</Project>
7 changes: 3 additions & 4 deletions src/installer/pkg/projects/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

<!--
Explicitly re-set the symbol package output path. The pkgproj files here end up importing the targets from
Microsoft.DotNet.Build.Tasks.Packaging (based on a PackageReference) before importing the Arcade targets hat
set defaults for project output paths. This means the value set by the packaging targets does not accountfor
Microsoft.DotNet.Build.Tasks.Packaging (based on a PackageReference) before importing the Arcade targets that
set defaults for project output paths. This means the value set by the packaging targets does not account for
the updated defaults from the Arcade targets.
-->
<SymbolPackageOutputPath>$(PackageOutputPath)</SymbolPackageOutputPath>
Expand Down Expand Up @@ -95,8 +95,7 @@
-->
<NonWindowsNativeFile Include="@(NativeWithSymbolFile)"
Exclude="@(WindowsNativeFile)" />

<NonWindowsSymbolFile Include="@(NonWindowsNativeFile -> '%(Identity)$(SymbolsSuffix)')" />
<NonWindowsSymbolFile Include="@(NonWindowsNativeFile -> '%(Identity)$(SymbolsSuffix)')</NonWindowsSymbolFile>
<ExistingWindowsSymbolFile Include="@(WindowsSymbolFile)" Condition="Exists('%(Identity)')" />
<ExistingNonWindowsSymbolFile Include="@(NonWindowsSymbolFile)" Condition="Exists('%(Identity)') AND '$(SkipPackagingXplatSymbols)'!='true'" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
<_Crossgen2SymbolFilesToPackage Include="@(_CrossgenPublishFiles)" Condition="'%(Extension)' == '.pdb'" />
<!-- Symbol files for JIT libraries are placed in a different location for Windows builds -->
<_Crossgen2SymbolFilesToPackage Include="@(NativeRuntimeAsset->'$(CoreCLRArtifactsPdbDir)%(FileName).pdb')" Condition="'$(TargetOS)' == 'windows' and '%(FileName)' != 'crossgen2'" />
<!-- TODO: handle .dSYM -->
<_Crossgen2SymbolFilesToPackage Include="@(NativeRuntimeAsset->'$(CoreCLRArtifactsPath)%(FileName)%(Extension)$(SymbolsSuffix)')" Condition="'$(TargetOS)' != 'windows' and '%(FileName)' != 'crossgen2'" />
<_Crossgen2SymbolFilesToPackage Remove="@(_Crossgen2SymbolFilesToPackage)" Condition="!Exists('%(Identity)')" />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,25 +47,23 @@
<NativeRuntimeAsset Include="@(_SymbolsToIncludeAlways)" IncludeAlways="true" />
</ItemGroup>

<ItemGroup>
<_SymbolFiles Condition="'$(TargetOS)' == 'windows'"
Include="@(NativeRuntimeAsset->'%(RootDir)%(Directory)PDB/%(Filename).pdb')"
IsSymbolFile="true"
IsNative="true" />
<_SymbolFiles Condition="'$(TargetOS)' != 'windows'"
Include="@(NativeRuntimeAsset->'%(RootDir)%(Directory)%(Filename)%(Extension)$(SymbolsSuffix)')"
IsSymbolFile="true"
IsNative="true" />

<ItemGroup Condition="'$(TargetOS)' == 'windows'">
<_SymbolFilesBase Condition="'$(TargetOS)' == 'windows'"
Include="@(NativeRuntimeAsset->'%(RootDir)%(Directory)PDB/%(Filename).pdb')" />
<_SymbolFilesBase Condition="'$(TargetOS)' != 'windows'"
Include="@(NativeRuntimeAsset->'%(RootDir)%(Directory)%(Filename)%(Extension)$(SymbolsSuffixPath)')" />

<!-- dotnet doesn't have its own package, so it uses this one as a means to publish to symbol servers -->
<_SymbolFiles Condition="'$(TargetOS)' == 'windows'"
Include="$(DotNetHostBinDir)PDB/dotnet.pdb"
IsSymbolFile="true"
IsNative="true" />
<_SymbolFiles Condition="'$(TargetOS)' != 'windows'"
Include="$(DotNetHostBinDir)dotnet$(ExeSuffix)$(SymbolsSuffix)"
IsSymbolFile="true"
IsNative="true" />
<_SymbolFilesBase Condition="'$(TargetOS)' == 'windows'"
Include="$(DotNetHostBinDir)PDB/dotnet.pdb" />
<_SymbolFilesBase Condition="'$(TargetOS)' != 'windows'"
Include="$(DotNetHostBinDir)dotnet$(ExeSuffix)$(SymbolsSuffixPath)" />
</ItemGroup>

<ItemGroup>
<_SymbolFiles Include="@(_SymbolFilesBase)"
IsSymbolFile="true"
IsNative="true" />

<!-- Remove symbols that are explicitly shipped with implementation package -->
<_SymbolFiles Remove="@(_SymbolsToIncludeAlways)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
<_HostFiles Include="$(DotNetHostBinDir)/$(LibPrefix)hostfxr$(LibSuffix)" PackOnly="true" />
<NativeRuntimeAsset Include="@(_HostFiles)" />

<!-- TODO: handle .dSYM -->
<_HostSymbolFiles Include="@(_HostFiles->'%(RootDir)%(Directory)PDB/%(Filename)$(SymbolsSuffix)')" Condition="'$(TargetOS)' == 'windows'" />
<_HostSymbolFiles Include="@(_HostFiles->'%(RootDir)%(Directory)%(Filename)%(Extension)$(SymbolsSuffix)')" Condition="'$(TargetOS)' != 'windows'" />
<_SymbolFilesToPackage Include="@(_HostSymbolFiles->Exists())" IsNative="true" />
Expand All @@ -80,9 +81,12 @@
<Target Name="AddRuntimeFilesToPackage" DependsOnTargets="ResolveRuntimeFilesFromLocalBuild">
<ItemGroup>
<RuntimeFiles Condition="'%(RuntimeFiles.IsNative)' == 'true'">
<TargetPath>runtimes/$(RuntimeIdentifier)/native</TargetPath>
<TargetPath>runtimes/$(RuntimeIdentifier)/native/%(RecursiveDir)</TargetPath>
</RuntimeFiles>
</ItemGroup>
<Message Text="RuntimeFiles START =====================================================================================" Importance="High"/>
<Message Text="RuntimeFiles %(Identity) RecursiveDir: %(RuntimeFiles.RecursiveDir) TargetPath: %(RuntimeFiles.TargetPath)" Importance="High"/>
<Message Text="RuntimeFiles END =====================================================================================" Importance="High"/>
<ItemGroup Condition="'$(BuildNativeAOTRuntimePack)' != 'true'">
<RuntimeFiles Condition="'%(FileName)' == 'crossgen'">
<TargetPath>tools</TargetPath>
Expand Down Expand Up @@ -121,11 +125,25 @@
<CoreCLRCrossTargetFiles Condition="'%(FileName)%(Extension)' == 'mscordbi.dll' and '$(TargetsWindows)' == 'true'">
<TargetPath>tools/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)</TargetPath>
</CoreCLRCrossTargetFiles>

<CoreCLROptimizationFiles Include="$(CoreCLRArtifactsPath)StandardOptimizationData.mibc"
Condition="Exists('$(CoreCLRArtifactsPath)StandardOptimizationData.mibc')">
<TargetPath>tools</TargetPath>
</CoreCLROptimizationFiles>
</ItemGroup>

<Message Text="RuntimeFiles START =====================================================================================" Importance="High"/>
<Message Text="RuntimeFiles %(Identity) RecursiveDir: %(RuntimeFiles.RecursiveDir) TargetPath: %(RuntimeFiles.TargetPath)" Importance="High"/>
<Message Text="RuntimeFiles END =====================================================================================" Importance="High"/>

<Message Text="CoreCLRCrossTargetFiles START =====================================================================================" Importance="High"/>
<Message Text="CoreCLRCrossTargetFiles %(Identity) RecursiveDir: %(CoreCLRCrossTargetFiles.RecursiveDir) TargetPath: %(CoreCLRCrossTargetFiles.TargetPath)" Importance="High"/>
<Message Text="CoreCLRCrossTargetFiles END =====================================================================================" Importance="High"/>

<Message Text="CoreCLROptimizationFiles START =====================================================================================" Importance="High"/>
<Message Text="CoreCLROptimizationFiles %(Identity) RecursiveDir: %(CoreCLROptimizationFiles.RecursiveDir) TargetPath: %(CoreCLROptimizationFiles.TargetPath)" Importance="High"/>
<Message Text="CoreCLROptimizationFiles END =====================================================================================" Importance="High"/>

<ItemGroup>
<ReferenceCopyLocalPaths Include="@(RuntimeFiles);@(CoreCLRCrossTargetFiles);@(CoreCLROptimizationFiles)" />
</ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/installer/pkg/sfx/installers/dotnet-host.proj
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
Condition="'$(TargetOS)' == 'windows'"
DestinationFolder="$(SymbolsOutputPath)" />

<!-- TODO: handle .dSYM -->
<Copy SourceFiles="$(DotNetHostBinDir)\dotnet$(SymbolsSuffix)"
Condition="'$(TargetOS)' != 'windows'"
DestinationFolder="$(SymbolsOutputPath)" />
Expand Down
1 change: 1 addition & 0 deletions src/installer/pkg/sfx/installers/dotnet-hostfxr.proj
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
Condition="'$(TargetOS)' == 'windows'"
DestinationFolder="$(SymbolsOutputPath)" />

<!-- TODO: handle .dSYM -->
<Copy SourceFiles="$(DotNetHostBinDir)\$(LibPrefix)hostfxr$(LibSuffix)$(SymbolsSuffix)"
Condition="'$(TargetOS)' != 'windows'"
DestinationFolder="$(SymbolsOutputPath)" />
Expand Down
Loading
Loading