Skip to content

Fix NativeAOT aggregate executable dSYM publish paths #132018

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.

Sign up for GitHub

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

Open
akoeplinger wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −1
Open

Fix NativeAOT aggregate executable dSYM publish paths #132018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Publish.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@
</ResolvedFileToPublish>
<_AggregateExecutableShimSymbolRecursivePath Include="%(_AggregateExecutableReferencePath.ShimSymbol)/**/*"
Condition="'$(_AggregateExecutable)' == 'true' and '$(CopyOutputSymbolsToPublishDirectory)' == 'true' and '$(NativeSymbolExt)' == '.dSYM' and Exists('%(_AggregateExecutableReferencePath.ShimSymbol)')">
<RelativePath>%(_AggregateExecutableReferencePath.AssemblyName)$(NativeSymbolExt)/%(RecursiveDir)%(Filename)%(Extension)</RelativePath>
<SymbolBundleName>%(_AggregateExecutableReferencePath.AssemblyName)$(NativeSymbolExt)</SymbolBundleName>
</_AggregateExecutableShimSymbolRecursivePath>
<_AggregateExecutableShimSymbolRecursivePath Update="@(_AggregateExecutableShimSymbolRecursivePath)">
<RelativePath>%(_AggregateExecutableShimSymbolRecursivePath.SymbolBundleName)/%(_AggregateExecutableShimSymbolRecursivePath.RecursiveDir)%(_AggregateExecutableShimSymbolRecursivePath.Filename)%(_AggregateExecutableShimSymbolRecursivePath.Extension)</RelativePath>
</_AggregateExecutableShimSymbolRecursivePath>
<ResolvedFileToPublish Include="@(_AggregateExecutableShimSymbolRecursivePath)"
Condition="'$(_AggregateExecutable)' == 'true' and '$(CopyOutputSymbolsToPublishDirectory)' == 'true'">
Expand Down
20 changes: 20 additions & 0 deletions src/tests/nativeaot/AggregateExecutableLibrary/AggregateLibrary.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
<CLRTestRunFile Condition="'$(TargetsWindows)' != 'true'">./native/ValidatorExe</CLRTestRunFile>
<SkipInferOutputType>true</SkipInferOutputType>
<EnablePreviewFeatures>true</EnablePreviewFeatures>
<NativeDebugSymbols Condition="'$(TargetsOSX)' == 'true'">true</NativeDebugSymbols>
<CopyOutputSymbolsToPublishDirectory Condition="'$(TargetsOSX)' == 'true'">true</CopyOutputSymbolsToPublishDirectory>
<!-- warning CS2008: No source files specified -->
<NoWarn>$(NoWarn);CS2008</NoWarn>
</PropertyGroup>
Expand All @@ -31,6 +33,12 @@
</PropertyGroup>
</Target>

<Target Name="UseDsymAggregateExecutableShimSymbols" BeforeTargets="ComputeAggregateExecutableInputs" Condition="'$(TargetsOSX)' == 'true'">
<PropertyGroup>
<NativeSymbolExt>.dSYM</NativeSymbolExt>
</PropertyGroup>
</Target>

<Target Name="WriteHelixExtraExecutablesList" AfterTargets="NativeCompile" Condition="'$(TargetsWindows)' != 'true'">
<PropertyGroup>
<_HelloExeRelative>$(BuildProjectRelativeDir)native/HelloExe</_HelloExeRelative>
Expand All @@ -39,4 +47,16 @@

<WriteLinesToFile File="$(TargetDir)helix-extra-executables.list" Lines="$(_HelloExeRelative)" Overwrite="true" WriteOnlyWhenDifferent="true" />
</Target>

<Target Name="ValidateAggregateExecutableShimSymbols" AfterTargets="NativeCompile" Condition="'$(TargetsOSX)' == 'true'">
<ItemGroup>
<_ExpectedAggregateExecutableShimSymbol Include="HelloExe.dSYM/Contents/Info.plist" />
<_ExpectedAggregateExecutableShimSymbol Include="HelloExe.dSYM/Contents/Resources/DWARF/HelloExe" />
<_PublishedFileRelativePath Include="@(ResolvedFileToPublish->'%(RelativePath)')" />
<_MissingAggregateExecutableShimSymbol Include="@(_ExpectedAggregateExecutableShimSymbol)" Exclude="@(_PublishedFileRelativePath)" />
</ItemGroup>

<Error Condition="'@(_MissingAggregateExecutableShimSymbol)' != ''"
Text="Aggregate executable shim symbol files have incorrect publish paths: @(_MissingAggregateExecutableShimSymbol, ', ')" />
</Target>
</Project>
Loading