Skip to content

Commit 4bc0e6c

Browse files
authored
fix: Multiple sentry.proguard-uuid being set in Android manifest (#4647)
Fix an issue of multiple ProGuard UUID metadata being set in Android manifest file.
1 parent 2f46bf5 commit 4bc0e6c

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## Unreleased
44

5+
### Fixes
6+
7+
- Do not allow multiple `sentry.proguard-uuid` metadata to be set in Android manifest ([#4647](https://github.com/getsentry/sentry-dotnet/pull/4647))
8+
59
### Dependencies
610

711
- Bump Cocoa SDK from v8.56.2 to v8.57.0 ([#4637](https://github.com/getsentry/sentry-dotnet/pull/4637))

src/Sentry/buildTransitive/Sentry.targets

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,11 +271,12 @@
271271
<Warning Condition="'$(_SentryCLIExitCode)' != '0'" Text="Sentry CLI could not upload debug files." />
272272
</Target>
273273

274-
<Target Name="UpdateAndroidMetadata" BeforeTargets="GetAssemblyAttributes"
275-
Condition="
276-
$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'
274+
<!-- Only for the application assembly: https://github.com/getsentry/sentry-dotnet/pull/4647 -->
275+
<Target Name="UpdateAndroidMetadata"
276+
BeforeTargets="GetAssemblyAttributes"
277+
Condition="'$(AndroidApplication)' == 'True'
278+
and $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'
277279
and '$(SentryUploadAndroidProGuardMapping)' == 'true'">
278-
279280
<ItemGroup>
280281
<AssemblyAttribute Include="Android.App.MetaData">
281282
<_Parameter1>io.sentry.proguard-uuid</_Parameter1>

0 commit comments

Comments
 (0)