From 2e959912c1d1a9128d7fc1ab219b9dfea18e4d27 Mon Sep 17 00:00:00 2001 From: GitHub Date: Sat, 23 Jul 2022 03:29:13 +0000 Subject: [PATCH 1/4] chore: update src/sentry-dotnet to 3.20.0 --- CHANGELOG.md | 3 +++ src/sentry-dotnet | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3338b8b19..1d2374815 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,9 @@ - Bump Cocoa SDK to v7.21.0 ([#892](https://github.com/getsentry/sentry-unity/pull/892)) - [changelog](https://github.com/getsentry/sentry-cocoa/blob/master/CHANGELOG.md#7210) - [diff](https://github.com/getsentry/sentry-cocoa/compare/7.20.0...7.21.0) +- Bump .NET SDK to v3.20.0 ([#907](https://github.com/getsentry/sentry-unity/pull/907)) + - [changelog](https://github.com/getsentry/sentry-dotnet/blob/main/CHANGELOG.md#3200) + - [diff](https://github.com/getsentry/sentry-dotnet/compare/3.19.0...3.20.0) ## 0.21.0 diff --git a/src/sentry-dotnet b/src/sentry-dotnet index 0d9369711..502135cad 160000 --- a/src/sentry-dotnet +++ b/src/sentry-dotnet @@ -1 +1 @@ -Subproject commit 0d93697110ab12cf22980f2025f946c0a73009a1 +Subproject commit 502135cad69739cd0b46bfe2919f412805f57ccd From a81811dda250f0fca9a056b4d51c24a17615056d Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Mon, 25 Jul 2022 14:05:36 +0200 Subject: [PATCH 2/4] added Sentry.Unity.Native to internals visible --- src/Sentry.Unity/Properties/AssemblyInfo.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Sentry.Unity/Properties/AssemblyInfo.cs b/src/Sentry.Unity/Properties/AssemblyInfo.cs index 256d67944..a09dff694 100644 --- a/src/Sentry.Unity/Properties/AssemblyInfo.cs +++ b/src/Sentry.Unity/Properties/AssemblyInfo.cs @@ -1,5 +1,6 @@ using System.Runtime.CompilerServices; +[assembly: InternalsVisibleTo("Sentry.Unity.Native")] [assembly: InternalsVisibleTo("Sentry.Unity.Tests")] [assembly: InternalsVisibleTo("Sentry.Unity.Editor")] [assembly: InternalsVisibleTo("Sentry.Unity.Editor.Tests")] From eaf089ae66e8e2191c8c80830c119e099c3cb179 Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Mon, 25 Jul 2022 14:08:47 +0200 Subject: [PATCH 3/4] moved testapplication to 'SharedClasses' --- test/Sentry.Unity.Editor.Tests/Android/ProguardSetupTests.cs | 4 ---- .../Sentry.Unity.Editor.Tests.csproj | 1 - .../Stubs => SharedClasses}/TestApplication.cs | 0 3 files changed, 5 deletions(-) rename test/{Sentry.Unity.Tests/Stubs => SharedClasses}/TestApplication.cs (100%) diff --git a/test/Sentry.Unity.Editor.Tests/Android/ProguardSetupTests.cs b/test/Sentry.Unity.Editor.Tests/Android/ProguardSetupTests.cs index ed8432fe3..bad41cbba 100644 --- a/test/Sentry.Unity.Editor.Tests/Android/ProguardSetupTests.cs +++ b/test/Sentry.Unity.Editor.Tests/Android/ProguardSetupTests.cs @@ -1,12 +1,8 @@ using System; using System.IO; -using System.Linq; -using System.Reflection; using System.Text.RegularExpressions; using NUnit.Framework; using Sentry.Unity.Editor.Android; -using Sentry.Unity.Tests.Stubs; -using UnityEditor; namespace Sentry.Unity.Editor.Tests.Android { diff --git a/test/Sentry.Unity.Editor.Tests/Sentry.Unity.Editor.Tests.csproj b/test/Sentry.Unity.Editor.Tests/Sentry.Unity.Editor.Tests.csproj index 147a30cf5..9ea4bcb01 100644 --- a/test/Sentry.Unity.Editor.Tests/Sentry.Unity.Editor.Tests.csproj +++ b/test/Sentry.Unity.Editor.Tests/Sentry.Unity.Editor.Tests.csproj @@ -13,7 +13,6 @@ - diff --git a/test/Sentry.Unity.Tests/Stubs/TestApplication.cs b/test/SharedClasses/TestApplication.cs similarity index 100% rename from test/Sentry.Unity.Tests/Stubs/TestApplication.cs rename to test/SharedClasses/TestApplication.cs From cc980d59e8137feec2aa07272e9b21dc72c69af4 Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Mon, 25 Jul 2022 17:29:48 +0200 Subject: [PATCH 4/4] removed Build dependency for running test targets --- Directory.Build.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 8fca8ba6e..abcc6e00a 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -326,7 +326,7 @@ Related: https://forum.unity.com/threads/6572-debugger-agent-unable-to-listen-on - + @@ -338,7 +338,7 @@ Related: https://forum.unity.com/threads/6572-debugger-agent-unable-to-listen-on - +