From 5b786bf87aac11a87ea33284596371024efe5822 Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Wed, 2 Apr 2025 15:38:35 +0200 Subject: [PATCH 1/5] bumped .net to 5.5.0 --- src/sentry-dotnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sentry-dotnet b/src/sentry-dotnet index ab208ce33..92262a164 160000 --- a/src/sentry-dotnet +++ b/src/sentry-dotnet @@ -1 +1 @@ -Subproject commit ab208ce33a4888fdce954cf3f2b1c4e2633b55bb +Subproject commit 92262a16455992af112cc03a4fc3c79462acaef5 From 5c1c2e26862dbc349f1a8875fb25ffa54ae4c555 Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Wed, 2 Apr 2025 15:43:53 +0200 Subject: [PATCH 2/5] update scopemanager --- src/Sentry.Unity/ScopeObserver.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Sentry.Unity/ScopeObserver.cs b/src/Sentry.Unity/ScopeObserver.cs index 1a7f0996b..86dc3e872 100644 --- a/src/Sentry.Unity/ScopeObserver.cs +++ b/src/Sentry.Unity/ScopeObserver.cs @@ -81,6 +81,9 @@ public void SetUser(SentryUser? user) } } + public void SetTrace(SentryId traceId, SpanId parentSpanId) + { } + public abstract void SetUserImpl(SentryUser user); public abstract void UnsetUserImpl(); From ffe9d1958ec79837a64d7b935752c72940e2aefb Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Wed, 2 Apr 2025 15:50:01 +0200 Subject: [PATCH 3/5] Updated CHANGELOG.md --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e61bfd6bb..0147fe9c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,9 +18,9 @@ - Bump CLI from v2.42.2 to v2.43.0 ([#2065](https://github.com/getsentry/sentry-unity/pull/2065), [#2082](https://github.com/getsentry/sentry-unity/pull/2082), [#2085](https://github.com/getsentry/sentry-unity/pull/2085)) - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2430) - [diff](https://github.com/getsentry/sentry-cli/compare/2.42.2...2.43.0) -- Bump .NET SDK from v5.2.0 to v5.4.0 ([#2067](https://github.com/getsentry/sentry-unity/pull/2067)) - - [changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md#540) - - [diff](https://github.com/getsentry/sentry-dotnet/compare/5.2.0...5.4.0) +- Bump .NET SDK from v5.2.0 to v5.4.0 ([#2067](https://github.com/getsentry/sentry-unity/pull/2067), [#2093](https://github.com/getsentry/sentry-unity/pull/2093)) + - [changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md#550) + - [diff](https://github.com/getsentry/sentry-dotnet/compare/5.2.0...5.5.0) - Bump Native SDK from v0.8.1 to v0.8.3 ([#2077](https://github.com/getsentry/sentry-unity/pull/2077), [#2087](https://github.com/getsentry/sentry-unity/pull/2087)) - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#083) - [diff](https://github.com/getsentry/sentry-native/compare/0.8.1...0.8.3) From a85d422ba30921c7109ef771e73fd1509e43c627 Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Wed, 2 Apr 2025 16:39:34 +0200 Subject: [PATCH 4/5] fixed test --- test/Sentry.Unity.Tests/IntegrationTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Sentry.Unity.Tests/IntegrationTests.cs b/test/Sentry.Unity.Tests/IntegrationTests.cs index a4918b041..10e7e4924 100644 --- a/test/Sentry.Unity.Tests/IntegrationTests.cs +++ b/test/Sentry.Unity.Tests/IntegrationTests.cs @@ -210,7 +210,7 @@ public IEnumerator DebugLogException_IsMarkedUnhandled() { yield return SetupSceneCoroutine("1_BugFarm"); - var expectedMechanism = "\"mechanism\":{\"type\":\"Unity.LogException\",\"handled\":false}}]}"; + var expectedMechanism = "\"mechanism\":{\"type\":\"Unity.LogException\",\"handled\":false"; using var _ = InitSentrySdk(); var testBehaviour = new GameObject("TestHolder").AddComponent(); From b599c6734eac4897dbb1839aade3d5eacb8ecc5e Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Wed, 2 Apr 2025 17:07:55 +0200 Subject: [PATCH 5/5] Updated CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0147fe9c5..edfede698 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ - Bump CLI from v2.42.2 to v2.43.0 ([#2065](https://github.com/getsentry/sentry-unity/pull/2065), [#2082](https://github.com/getsentry/sentry-unity/pull/2082), [#2085](https://github.com/getsentry/sentry-unity/pull/2085)) - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2430) - [diff](https://github.com/getsentry/sentry-cli/compare/2.42.2...2.43.0) -- Bump .NET SDK from v5.2.0 to v5.4.0 ([#2067](https://github.com/getsentry/sentry-unity/pull/2067), [#2093](https://github.com/getsentry/sentry-unity/pull/2093)) +- Bump .NET SDK from v5.2.0 to v5.5.0 ([#2067](https://github.com/getsentry/sentry-unity/pull/2067), [#2093](https://github.com/getsentry/sentry-unity/pull/2093)) - [changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md#550) - [diff](https://github.com/getsentry/sentry-dotnet/compare/5.2.0...5.5.0) - Bump Native SDK from v0.8.1 to v0.8.3 ([#2077](https://github.com/getsentry/sentry-unity/pull/2077), [#2087](https://github.com/getsentry/sentry-unity/pull/2087))