Feat: native AOT debug info upload #2739
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,2 @@ | ||
| dotnet build Sentry.sln -c Release | ||
| dotnet test Sentry.sln -c Release --no-build |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,2 @@ | ||
| dotnet build Sentry.sln -c Release | ||
| dotnet test Sentry.sln -c Release --no-build |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,8 +34,13 @@ | |
| <SentryUploadSymbols Condition="'$(SentryUploadSymbols)' == ''">false</SentryUploadSymbols> | ||
| <SentryUploadSources Condition="'$(SentryUploadSources)' == ''">false</SentryUploadSources> | ||
|
|
||
| <!-- This property controls if the Sentry CLI is to be used at all. Setting false will disable all Sentry CLI usage. | ||
| We're explicitly skipping uploads for Sentry projects because they interfere with CLI integration test asserts. --> | ||
| <UseSentryCLI Condition=" | ||
| '$(UseSentryCLI)' == '' | ||
| and ('$(SentryUploadSymbols)' == 'true' or '$(SentryUploadSources)' == 'true' or $(SentryUploadAndroidProguardMapping) == 'true') | ||
| and ('$(MSBuildProjectName)' != 'Sentry') | ||
| and (!$(MSBuildProjectName.StartsWith('Sentry.')) or '$(MSBuildProjectName)' == '$(SentryCLIIntegrationTestProject)')">true</UseSentryCLI> | ||
vaind marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| </PropertyGroup> | ||
| </Target> | ||
|
|
||
|
|
@@ -120,53 +125,88 @@ | |
|
|
||
| </Target> | ||
|
|
||
| <!-- Native AOT publishing | ||
| While '_IsPublishing' looks a bit "private", it's also OK if it suddenly stops working and this step runs anyway. | ||
| See https://github.com/dotnet/sdk/issues/26324#issuecomment-1169236993 --> | ||
| <PropertyGroup Condition="'$(PublishDir)' != '' and '$(PublishAot)' == 'true' and '$(_IsPublishing)' == 'true'"> | ||
|
Collaborator
There was a problem hiding this comment. I see we already have a
Collaborator
Author
There was a problem hiding this comment. this is a transitive build target, so one that gets triggered during lib-consumer builds.
Collaborator
There was a problem hiding this comment. Aha... cunning. I had no idea we were doing that (or that it was even possible - never had a need before). Is that enabled simply by this? sentry-dotnet/src/Sentry/Sentry.csproj Lines 78 to 86 in d32f05b I think that's all we need to do right (reading the docs).
Collaborator
Author
There was a problem hiding this comment. and I've learned about this a couple of weeks ago myself, for the same reason :) |
||
| <SentryCLIUploadNativeAOT>true</SentryCLIUploadNativeAOT> | ||
| <SentryCLIUploadDirectory>$(PublishDir)</SentryCLIUploadDirectory> | ||
| <!-- We must run after "CopyNativeBinary" (not "Publish"), | ||
| because that is the one that actually copies native AOT symbols to the publish directory. --> | ||
| <SentryCLIUploadAfterTargets>CopyNativeBinary</SentryCLIUploadAfterTargets> | ||
| </PropertyGroup> | ||
| <ItemGroup Condition="'$(SentryCLIUploadNativeAOT)' == 'true'"> | ||
| <SentryCLIUploadSymbolType Include="pdb" /> | ||
| <SentryCLIUploadSymbolType Include="dsym" /> | ||
| <SentryCLIUploadSymbolType Include="elf" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- "Standard" managed build --> | ||
| <PropertyGroup Condition="'$(SentryCLIUploadNativeAOT)' != 'true'"> | ||
| <SentryCLIUploadNativeAOT>false</SentryCLIUploadNativeAOT> | ||
| <SentryCLIUploadDirectory>$(OutputPath)</SentryCLIUploadDirectory> | ||
| <SentryCLIUploadAfterTargets>Build</SentryCLIUploadAfterTargets> | ||
| </PropertyGroup> | ||
| <ItemGroup Condition="'$(SentryCLIUploadNativeAOT)' != 'true'"> | ||
| <SentryCLIUploadSymbolType Include="pdb" /> | ||
| <SentryCLIUploadSymbolType Include="portablepdb" /> | ||
| <SentryCLIUploadSymbolType Include="dsym" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'" /> | ||
| <SentryCLIUploadSymbolType Include="dsym" Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- Upload symbols to Sentry after the build. --> | ||
| <Target Name="UploadDebugInfoToSentry" AfterTargets="$(SentryCLIUploadAfterTargets)" DependsOnTargets="PrepareSentryCLI" | ||
| Condition="'$(SentryCLI)' != '' and ('$(SentryUploadSymbols)' == 'true' or '$(SentryUploadSources)' == 'true')"> | ||
|
|
||
| <!-- if (UploadSymbols && UploadSources) { --> | ||
|
Collaborator
Author
There was a problem hiding this comment. yeah they're nice although at one point I've found myself just copying a piece of a code from one if branch to the other, forgetting to actually update the relevant condition 😅 |
||
| <Message Importance="High" | ||
| Condition="'$(SentryUploadSymbols)' == 'true' and '$(SentryUploadSources)' == 'true'" | ||
| Text="Preparing upload to Sentry for project '$(MSBuildProjectName)' ($(Configuration)/$(TargetFramework)): collecting debug symbols and referenced source code from $(SentryCLIUploadDirectory)" /> | ||
| <Exec | ||
| Condition="'$(SentryUploadSymbols)' == 'true' and '$(SentryUploadSources)' == 'true'" | ||
| Command="$(SentryCLIDebugFilesUploadCommand) @(SentryCLIUploadSymbolType -> '-t %(Identity)', ' ') --include-sources $(SentryCLIUploadDirectory)" | ||
| IgnoreExitCode="true" ContinueOnError="WarnAndContinue"> | ||
| <Output TaskParameter="ExitCode" PropertyName="_SentryCLIExitCode" /> | ||
| </Exec> | ||
| <!-- } else if (UploadSymbols && !UploadSources) { --> | ||
| <Message Importance="High" | ||
| Condition="'$(SentryUploadSymbols)' == 'true' and '$(SentryUploadSources)' != 'true'" | ||
| Text="Preparing upload to Sentry for project '$(MSBuildProjectName)' ($(Configuration)/$(TargetFramework)): collecting debug symbols from $(SentryCLIUploadDirectory)" /> | ||
| <Exec | ||
| Condition="'$(SentryUploadSymbols)' == 'true' and '$(SentryUploadSources)' != 'true'" | ||
| Command="$(SentryCLIDebugFilesUploadCommand) @(SentryCLIUploadSymbolType -> '-t %(Identity)', ' ') $(SentryCLIUploadDirectory)" | ||
| IgnoreExitCode="true" ContinueOnError="WarnAndContinue"> | ||
| <Output TaskParameter="ExitCode" PropertyName="_SentryCLIExitCode" /> | ||
| </Exec> | ||
| <!-- } else if (!UploadSymbols && UploadSources) { --> | ||
| <PropertyGroup> | ||
| <SentryCLIDebugInfoFile Condition="'$(NativeBinary)' != ''">$(NativeBinary)$(NativeSymbolExt)</SentryCLIDebugInfoFile> | ||
| <SentryCLIDebugInfoFile Condition="'$(NativeBinary)' == '' or !Exists('$(SentryCLIDebugInfoFile)')">@(IntermediateAssembly->'$(SentryCLIUploadDirectory)%(FileName).pdb')</SentryCLIDebugInfoFile> | ||
| <SentryCLIDebugInfoFile Condition="!Exists('$(SentryCLIDebugInfoFile)')">@(IntermediateAssembly->'$(SentryCLIUploadDirectory)%(FileName)%(Extension)')</SentryCLIDebugInfoFile> | ||
| <SentryCLIUploadSourcesDirectory>$([System.IO.Path]::GetDirectoryName('$(SentryCLIDebugInfoFile)'))</SentryCLIUploadSourcesDirectory> | ||
| </PropertyGroup> | ||
| <Message Importance="High" | ||
| Condition="'$(SentryUploadSymbols)' != 'true' and '$(SentryUploadSources)' == 'true'" | ||
| Text="Preparing upload to Sentry for project '$(MSBuildProjectName)' ($(Configuration)/$(TargetFramework)): collecting source code referenced by $(SentryCLIDebugInfoFile)" /> | ||
| <Exec | ||
| Condition="'$(SentryUploadSymbols)' != 'true' and '$(SentryUploadSources)' == 'true'" | ||
| Command=""$(SentryCLI)" debug-files bundle-sources $(SentryCLIDebugInfoFile) " IgnoreExitCode="true" ContinueOnError="WarnAndContinue"> | ||
| <Output TaskParameter="ExitCode" PropertyName="_SentryCLIExitCode" /> | ||
| </Exec> | ||
| <Warning Condition="'$(_SentryCLIExitCode)' != '0'" Text="Sentry CLI could not upload debug files." /> | ||
| <Exec | ||
| Condition="'$(SentryUploadSymbols)' != 'true' and '$(SentryUploadSources)' == 'true' and '$(_SentryCLIExitCode)' == '0'" | ||
| Command="$(SentryCLIDebugFilesUploadCommand) -t sourcebundle $(SentryCLIUploadSourcesDirectory)" | ||
| IgnoreExitCode="true" ContinueOnError="WarnAndContinue"> | ||
| <Output TaskParameter="ExitCode" PropertyName="_SentryCLIExitCode" /> | ||
| </Exec> | ||
| <!-- } --> | ||
| <Warning Condition="'$(_SentryCLIExitCode)' != '0'" Text="Sentry CLI could not upload debug files." /> | ||
| </Target> | ||
|
|
||
| <!-- Upload Android Proguard mapping file to Sentry after the build. --> | ||
| <Target Name="UploadAndroidProguardMappingFileToSentry" AfterTargets="Build" DependsOnTargets="PrepareSentryCLI" | ||
| Condition="'$(SentryCLI)' != '' and '$(SentryUploadAndroidProguardMapping)' == 'true' And '$(AndroidProguardMappingFile)' != ''"> | ||
|
|
||
| <Message Importance="High" Text="Preparing to upload Android Proguard mapping to Sentry for '$(MSBuildProjectName)': $(AndroidProguardMappingFile))" /> | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FYI: This (and other similar cases below) is now handled by a condition in
Sentry.targetspropertyUseSentryCLI