Skip to content

fix: Generate and inject uuid to apk and upload proguard with that uuid #4532

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

Merged
alexsohn1126 merged 23 commits into from
Sep 22, 2025
Merged

fix: Generate and inject uuid to apk and upload proguard with that uuid #4532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
748ff57
fix: Generate and inject uuid to apk and upload proguard with that uuid
alexsohn1126 Sep 16, 2025
b4da8a3
Add android check before injecting uuid to apk
alexsohn1126 Sep 16, 2025
833f587
Revert temporary change in sentry.targets
alexsohn1126 Sep 16, 2025
0324e89
Update changelog
alexsohn1126 Sep 16, 2025
1bfc327
Merge branch 'main' into alexsohn/fix/automatically-add-guid-for-prog…
alexsohn1126 Sep 16, 2025
5023e67
Add proper condition for Android uuid injection
alexsohn1126 Sep 17, 2025
b1aab6d
ci: update integration-test Action
Flash0ver Sep 18, 2025
6fc8146
Update CHANGELOG.md
alexsohn1126 Sep 19, 2025
19db620
Code Reviews applied
alexsohn1126 Sep 19, 2025
8235699
Fix ProGuard capitalization
alexsohn1126 Sep 19, 2025
4b01f06
chore(deps): update Cocoa SDK to v8.56.0 (#4528)
github-actions[bot] Sep 17, 2025
7b9b871
ci: install Mono for Ubuntu (ARM64) (#4545)
jpnurmi Sep 19, 2025
866ceb4
chore(deps): bump coverlet.collector to avoid vulnerability warnings …
jpnurmi Sep 19, 2025
2a6c611
chore: update modules/sentry-native to 0.11.0 (#4542)
github-actions[bot] Sep 19, 2025
4995dd6
chore: update scripts/update-cli.ps1 to 2.54.0 (#4541)
github-actions[bot] Sep 19, 2025
d1505f1
release: 5.15.1
getsentry-bot Sep 19, 2025
1407ce3
chore: Disable flaky Profiler_AfterTimeout_Stops in CI (#4549)
jamescrosswell Sep 20, 2025
ceccf52
Update changelog
alexsohn1126 Sep 16, 2025
10f9869
Update CHANGELOG.md
alexsohn1126 Sep 19, 2025
0ac6e78
Update changelog.md
alexsohn1126 Sep 22, 2025
c760398
Merge branch 'main' into alexsohn/fix/automatically-add-guid-for-prog…
alexsohn1126 Sep 22, 2025
3df1fc4
Update CHANGELOG.md
alexsohn1126 Sep 22, 2025
30e19d4
Update build.yml
alexsohn1126 Sep 22, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ jobs:
path: src

- name: Integration test
uses: getsentry/github-workflows/sentry-cli/integration-test/@v2
uses: getsentry/github-workflows/sentry-cli/integration-test/@a5e409bd5bad4c295201cdcfe862b17c50b29ab7 # v2.14.1
with:
path: integration-test

Expand Down Expand Up @@ -348,7 +348,7 @@ jobs:
path: src

- name: Test AOT
uses: getsentry/github-workflows/sentry-cli/integration-test/@v2
uses: getsentry/github-workflows/sentry-cli/integration-test/@a5e409bd5bad4c295201cdcfe862b17c50b29ab7 # v2.14.1
env:
RuntimeIdentifier: ${{ matrix.rid }}
with:
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## Unreleased

### Fixes

- In MAUI Android apps, generate and inject UUID to APK and upload ProGuard mapping to Sentry with the UUID ([#4532](https://github.com/getsentry/sentry-dotnet/pull/4532))

## 5.15.1

### Fixes
Expand Down
27 changes: 22 additions & 5 deletions src/Sentry/buildTransitive/Sentry.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

<PropertyGroup>
<SentryAttributesFile>Sentry.Attributes$(MSBuildProjectExtension.Replace('proj', ''))</SentryAttributesFile>
<SentryProGuardUUID Condition="'$(SentryProGuardUUID)' == ''">$([System.Guid]::NewGuid())</SentryProGuardUUID>
</PropertyGroup>

<Target Name="_SentryEnsureAndroidEnableAssemblyCompressionDisabled"
Expand Down Expand Up @@ -68,7 +69,7 @@
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' or $(SentryCreateRelease) == 'true' or $(SentrySetCommits) == 'true')
and ('$(SentryUploadSymbols)' == 'true' or '$(SentryUploadSources)' == 'true' or $(SentryUploadAndroidProGuardMapping) == 'true' or $(SentryCreateRelease) == 'true' or $(SentrySetCommits) == 'true')
Copy link
Member

@Flash0ver Flash0ver Sep 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note(docs):

Afterwards, please also update the documentation with the new capitalization.
It's not a breaking change as MSBuild isn't case-sensitive.

https://docs.sentry.io/platforms/dotnet/configuration/msbuild/

Copy link
Member Author

@alexsohn1126 alexsohn1126 Sep 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll make it a part of this pr:

getsentry/sentry-docs#14995

and '$(MSBuildProjectName)' != 'Sentry'
and !$(MSBuildProjectName.StartsWith('Sentry.'))">true</UseSentryCLI>
</PropertyGroup>
Expand Down Expand Up @@ -125,11 +126,14 @@
<SentrySetCommitReleaseOptions Condition="'$(SentryOrg)' != ''">$(SentrySetCommitReleaseOptions) --org $(SentryOrg)</SentrySetCommitReleaseOptions>
<SentrySetCommitReleaseOptions Condition="'$(SentryProject)' != ''">$(SentrySetCommitReleaseOptions) --project $(SentryProject)</SentrySetCommitReleaseOptions>

<_SentryCLIProGuardOptions Condition="'$(SentryProGuardUUID)' != ''">$(_SentryCLIProGuardOptions) --uuid &quot;$(SentryProGuardUUID)&quot;</_SentryCLIProGuardOptions>
<_SentryCLIProGuardOptions Condition="'$(_SentryCLIProGuardOptions.Trim())' != ''">$(_SentryCLIProGuardOptions.Trim())</_SentryCLIProGuardOptions>

<SentryCLIUploadOptions Condition="'$(SentryOrg)' != ''">$(SentryCLIUploadOptions) --org $(SentryOrg)</SentryCLIUploadOptions>
<SentryCLIUploadOptions Condition="'$(SentryProject)' != ''">$(SentryCLIUploadOptions) --project $(SentryProject)</SentryCLIUploadOptions>
<SentryCLIDebugFilesUploadCommand>$(SentryCLIBaseCommand) debug-files upload</SentryCLIDebugFilesUploadCommand>
<SentryCLIDebugFilesUploadCommand Condition="'$(SentryCLIUploadOptions.Trim())' != ''">$(SentryCLIDebugFilesUploadCommand) $(SentryCLIUploadOptions.Trim())</SentryCLIDebugFilesUploadCommand>
<SentryCLIProGuardMappingUploadCommand>$(SentryCLIBaseCommand) upload-proguard</SentryCLIProGuardMappingUploadCommand>
<SentryCLIProGuardMappingUploadCommand>$(SentryCLIBaseCommand) upload-proguard $(_SentryCLIProGuardOptions)</SentryCLIProGuardMappingUploadCommand>
<SentryCLIProGuardMappingUploadCommand Condition="'$(SentryCLIUploadOptions.Trim())' != ''">$(SentryCLIProGuardMappingUploadCommand) $(SentryCLIUploadOptions.Trim())</SentryCLIProGuardMappingUploadCommand>
</PropertyGroup>

Expand Down Expand Up @@ -267,9 +271,22 @@
<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)' != ''">
<Target Name="UpdateAndroidMetadata" BeforeTargets="GetAssemblyAttributes"
Condition="
$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'
and '$(SentryUploadAndroidProGuardMapping)' == 'true'">

<ItemGroup>
<AssemblyAttribute Include="Android.App.MetaData">
<_Parameter1>io.sentry.proguard-uuid</_Parameter1>
<Value>$(SentryProGuardUUID)</Value>
</AssemblyAttribute>
</ItemGroup>
</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))" />

Expand Down
Loading