diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1bb59a1678..f54403af15 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -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
@@ -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:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 141222b598..baadd4e5e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
diff --git a/src/Sentry/buildTransitive/Sentry.targets b/src/Sentry/buildTransitive/Sentry.targets
index 653cc294c0..76b4feb88e 100644
--- a/src/Sentry/buildTransitive/Sentry.targets
+++ b/src/Sentry/buildTransitive/Sentry.targets
@@ -18,6 +18,7 @@
Sentry.Attributes$(MSBuildProjectExtension.Replace('proj', ''))
+ $([System.Guid]::NewGuid())
true
@@ -125,11 +126,14 @@
$(SentrySetCommitReleaseOptions) --org $(SentryOrg)
$(SentrySetCommitReleaseOptions) --project $(SentryProject)
+ <_SentryCLIProGuardOptions Condition="'$(SentryProGuardUUID)' != ''">$(_SentryCLIProGuardOptions) --uuid "$(SentryProGuardUUID)"
+ <_SentryCLIProGuardOptions Condition="'$(_SentryCLIProGuardOptions.Trim())' != ''">$(_SentryCLIProGuardOptions.Trim())
+
$(SentryCLIUploadOptions) --org $(SentryOrg)
$(SentryCLIUploadOptions) --project $(SentryProject)
$(SentryCLIBaseCommand) debug-files upload
$(SentryCLIDebugFilesUploadCommand) $(SentryCLIUploadOptions.Trim())
- $(SentryCLIBaseCommand) upload-proguard
+ $(SentryCLIBaseCommand) upload-proguard $(_SentryCLIProGuardOptions)
$(SentryCLIProGuardMappingUploadCommand) $(SentryCLIUploadOptions.Trim())
@@ -267,9 +271,22 @@
-
-
+
+
+
+
+ <_Parameter1>io.sentry.proguard-uuid
+ $(SentryProGuardUUID)
+
+
+
+
+
+