fix: bump submodules (#474)

* fix: bump submodules

* fix dotnet tag

* ci for net6

* fix logger

* fix import

* run task on single project

* magic

* explicit steps

* remove useless test

* mask

* fix package snapshot

.github/workflows/ci.yml

@@ -57,6 +57,13 @@ jobs:
         with:
           submodules: recursive
 
+      - run: echo "::add-mask::${{ secrets.LICENSE_SERVER_URL }}"
+
+      - name: Setup .NET SDK (v6.0)
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.x'
+
       - name: "Set up Java: 11"
         uses: actions/setup-java@v1
         with:
@@ -152,6 +159,21 @@ jobs:
         shell: pwsh
         run: New-Item -ItemType SymbolicLink -Path "C:\${{ matrix.unity-version }}" -Target "C:\Program Files\Unity\Hub\Editor\${{ matrix.unity-version }}"
 
+      - name: Install Unity UPM Packages
+        env:
+          UNITY_VERSION: ${{ matrix.unity-version }}
+        run: dotnet msbuild /t:UnityRestorePackages /p:Configuration=Release /p:OutDir=other src/Sentry.Unity
+
+      - name: Build Android SDK
+        env:
+          UNITY_VERSION: ${{ matrix.unity-version }}
+        run: dotnet msbuild /t:BuildAndroidSDK /p:Configuration=Release /p:OutDir=other src/Sentry.Unity
+
+      - name: Build iOS SDK
+        env:
+          UNITY_VERSION: ${{ matrix.unity-version }}
+        run: dotnet msbuild /t:BuildCocoaSDK /p:Configuration=Release /p:OutDir=other src/Sentry.Unity
+
       - name: Build Sentry.Unity Solution
         env:
           UNITY_VERSION: ${{ matrix.unity-version }}
@@ -168,7 +190,7 @@ jobs:
         if: ${{ matrix.unity-version != '2022.1.0a12' }}
         env:
           UNITY_VERSION: ${{ matrix.unity-version }}
-        run: dotnet msbuild /t:UnityPlayModeTest /p:Configuration=Release /p:OutDir=other
+        run: dotnet msbuild /t:UnityPlayModeTest /p:Configuration=Release /p:OutDir=other test/Sentry.Unity.Tests
 
       - name: Upload test artifacts (playmode)
         if: ${{ failure() }}
@@ -183,7 +205,7 @@ jobs:
         if: ${{ matrix.unity-version != '2022.1.0a12' }}
         env:
           UNITY_VERSION: ${{ matrix.unity-version }}
-        run: dotnet msbuild /t:UnityEditModeTest /p:Configuration=Release /p:OutDir=other
+        run: dotnet msbuild /t:UnityEditModeTest /p:Configuration=Release /p:OutDir=other test/Sentry.Unity.Editor.Tests
 
       - name: Upload test artifacts (editmode)
         if: ${{ failure() }}
@@ -195,23 +217,23 @@ jobs:
       - name: Build Android Player with IL2CPP
         env:
           UNITY_VERSION: ${{ matrix.unity-version }}
-        run: dotnet msbuild /t:UnityBuildPlayerAndroidIL2CPP /p:Configuration=Release /p:OutDir=other
+        run: dotnet msbuild /t:UnityBuildPlayerAndroidIL2CPP /p:Configuration=Release /p:OutDir=other src/Sentry.Unity
 
       - name: Build iOS Player
         if: matrix.os == 'macos-latest'
         env:
           UNITY_VERSION: ${{ matrix.unity-version }}
-        run: dotnet msbuild /t:UnityBuildPlayerIOS /p:Configuration=Release /p:OutDir=other
+        run: dotnet msbuild /t:UnityBuildPlayerIOS /p:Configuration=Release /p:OutDir=other src/Sentry.Unity
 
       - name: Build Standalone Player with IL2CPP
         env:
           UNITY_VERSION: ${{ matrix.unity-version }}
-        run: dotnet msbuild /t:UnityBuildStandalonePlayerIL2CPP /p:Configuration=Release /p:OutDir=other
+        run: dotnet msbuild /t:UnityBuildStandalonePlayerIL2CPP /p:Configuration=Release /p:OutDir=other src/Sentry.Unity
 
       - name: Run Smoke Tests
         env:
           UNITY_VERSION: ${{ matrix.unity-version }}
-        run: dotnet msbuild /t:UnitySmokeTestStandalonePlayerIL2CPP /p:OutDir=other
+        run: dotnet msbuild /t:UnitySmokeTestStandalonePlayerIL2CPP /p:OutDir=other src/Sentry.Unity
 
       - name: Preparing test app for smoke test.
         uses: actions/upload-artifact@v2

CHANGELOG.md

@@ -8,6 +8,15 @@
 - Fixed overwriting Xcode build properties ([#466](https://github.com/getsentry/sentry-unity/pull/466))
 - Xcode exports no longer break with sentry-cli already added ([#457](https://github.com/getsentry/sentry-unity/pull/457))
 - Explicitly set <SignAssembly>false</SignAssembly> ([#470](https://github.com/getsentry/sentry-unity/pull/470)). So that Sentry.dll is not strong named when consumed inside Unity.
+- Bump Sentry .NET SDK 3.12.2 ([#474](https://github.com/getsentry/sentry-unity/pull/474))
+  - [changelog](https://github.com/getsentry/sentry-dotnet/blob/3.12.2/CHANGELOG.md)
+  - [diff](https://github.com/getsentry/sentry-dotnet/compare/3.11.1...3.12.2)
+- Bump Sentry Cocoa SDK 7.6.1 ([#474](https://github.com/getsentry/sentry-unity/pull/474))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/7.6.1/CHANGELOG.md)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/7.5.2...7.6.1)
+- Bump Sentry Android SDK 5.5.0 ([#474](https://github.com/getsentry/sentry-unity/pull/474))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/5.5.0/CHANGELOG.md)
+  - [diff](https://github.com/getsentry/sentry-java/compare/5.4.0...5.5.0)
 
 ## 0.8.0
 

Directory.Build.props

@@ -36,10 +36,6 @@
     <PackageReference Include="Nullable" Version="1.3.0" PrivateAssets="All" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <UnityPackageProject>$(SolutionDir)temp/unity-packages</UnityPackageProject>
-  </PropertyGroup>
-
   <!-- Add reference once we figure out where the DLL is (find Unity version and install location) -->
   <Target Name="ReferenceUnity" AfterTargets="FindUnity" BeforeTargets="BeforeResolveReferences">
     <Error Condition="'$(UnityManagedPath)' == ''" Text="'UnityManagedPath' not defined. Can't find UnityEngine.dll."></Error>

Directory.Build.targets

@@ -6,16 +6,19 @@
     <AndroidBuildMethod>Builder.BuildAndroidIl2CPPPlayer</AndroidBuildMethod>
     <AndroidBuildPath>$(PlayerBuildPath)Android/IL2CPP_Player.apk</AndroidBuildPath>
     <!-- Assumes running `dotnet` from the root of the repo: -->
-    <UnitySampleProjectUnityVersion>$(SolutionDir)samples/unity-of-bugs/ProjectSettings/ProjectVersion.txt</UnitySampleProjectUnityVersion>
+    <RepoRoot>$([System.IO.Path]::GetDirectoryName($([MSBuild]::GetPathOfFileAbove('.gitignore', '$(MSBuildThisFileDirectory)'))))/</RepoRoot>
+    <UnityPackageProject>$(RepoRoot)temp/unity-packages</UnityPackageProject>
+    <UnityTestPath>$(UnityPackageProject)/Library/ScriptAssemblies</UnityTestPath>
+    <UnitySampleProjectUnityVersion>$(RepoRoot)samples/unity-of-bugs/ProjectSettings/ProjectVersion.txt</UnitySampleProjectUnityVersion>
     <UnityTestPlayModeResultFilePath>../../artifacts/test/playmode/results.xml</UnityTestPlayModeResultFilePath>
     <UnityTestEditModeResultFilePath>../../artifacts/test/editmode/results.xml</UnityTestEditModeResultFilePath>
     <!-- Cocoa -->
-    <SentryCocoaRoot>$(SolutionDir)modules/sentry-cocoa/</SentryCocoaRoot>
-    <SentryCocoaDeviceArtifactsDestination>$(SolutionDir)package-dev/Plugins/iOS/Device/Sentry.framework/</SentryCocoaDeviceArtifactsDestination>
-    <SentryCocoaSimulatorArtifactsDestination>$(SolutionDir)package-dev/Plugins/iOS/Simulator/Sentry.framework/</SentryCocoaSimulatorArtifactsDestination>
+    <SentryCocoaRoot>$(RepoRoot)modules/sentry-cocoa/</SentryCocoaRoot>
+    <SentryCocoaDeviceArtifactsDestination>$(RepoRoot)package-dev/Plugins/iOS/Device/Sentry.framework/</SentryCocoaDeviceArtifactsDestination>
+    <SentryCocoaSimulatorArtifactsDestination>$(RepoRoot)package-dev/Plugins/iOS/Simulator/Sentry.framework/</SentryCocoaSimulatorArtifactsDestination>
     <!-- Android -->
-    <SentryAndroidRoot>$(SolutionDir)modules/sentry-java/</SentryAndroidRoot>
-    <SentryAndroidArtifactsDestination>$(SolutionDir)package-dev/Plugins/Android/Sentry/</SentryAndroidArtifactsDestination>
+    <SentryAndroidRoot>$(RepoRoot)modules/sentry-java/</SentryAndroidRoot>
+    <SentryAndroidArtifactsDestination>$(RepoRoot)package-dev/Plugins/Android/Sentry/</SentryAndroidArtifactsDestination>
   </PropertyGroup>
 
   <!-- Use the Unity Editor version set in the sample project of the repo -->
@@ -72,7 +75,6 @@ Expected to exist:
  * /Applications/Unity/Hub/Editor/$(UnityVersion)/Unity.app/Contents/Managed/UnityEngine.dll
 or
  * /Applications/Unity/Unity.app/Contents/Managed/UnityEngine.dll" />
-
   </Target>
 
   <Target Name="CleanUnityTestResults" AfterTargets="Clean">
@@ -138,7 +140,7 @@ or
       <AndroidSdkArtifacts Include="$(SentryAndroidRoot)sentry/build/libs/sentry*.jar" />
       <AndroidSdkArtifacts Include="$(SentryAndroidRoot)sentry-android-ndk/build/outputs/aar/sentry-android-ndk-release.aar" />
       <AndroidSdkArtifacts Include="$(SentryAndroidRoot)sentry-android-core/build/outputs/aar/sentry-android-core-release.aar" />
-      <AndroidSdkArtifacts Include="$(SolutionDir)lib/gson-2.8.5.jar" />
+      <AndroidSdkArtifacts Include="$(RepoRoot)lib/gson-2.8.5.jar" />
     </ItemGroup>
 
     <Copy SourceFiles="@(AndroidSdkArtifacts)"
@@ -212,7 +214,8 @@ Related: https://forum.unity.com/threads/6572-debugger-agent-unable-to-listen-on
   <!-- If Unity Library Project doesn't exist, create a Unity project. We use this project to restore packages needed to build
   this solution without using the sample project which depends on the output of this build. -->
   <Target Name="UnityCreatePackages"
-    Condition="!Exists('$(UnityPackageProject)') AND '$(MSBuildProjectName)' == 'Sentry.Unity'">
+    Condition="!Exists('$(UnityPackageProject)') AND '$(MSBuildProjectName)' == 'Sentry.Unity'"
+    AfterTargets="FindUnity">
     <Error Condition="$(UnityRoot) == ''" Text="Couldn't find Unity."></Error>
 
     <Message Importance="High" Text="Running Unity Create Packages."></Message>

src/Sentry.Unity/Protocol/Unity.cs

@@ -1,6 +1,7 @@
 using System.IO;
 using System.Text;
 using System.Text.Json;
+using Sentry.Extensibility;
 using Sentry.Unity.Extensions;
 
 namespace Sentry.Unity.Protocol
@@ -52,7 +53,7 @@ internal Unity Clone()
                 TargetFrameRate = TargetFrameRate
             };
 
-        public void WriteTo(Utf8JsonWriter writer)
+        public void WriteTo(Utf8JsonWriter writer, IDiagnosticLogger? logger)
         {
             writer.WriteStartObject();
 
@@ -90,12 +91,12 @@ public static Unity FromJson(JsonElement json)
                 TargetFrameRate = json.GetPropertyOrNull("target_frame_rate")?.GetString()
             };
 
-        public string ToJsonString()
+        public string ToJsonString(IDiagnosticLogger? logger = null)
         {
             using var stream = new MemoryStream();
             using var writer = new Utf8JsonWriter(stream);
 
-            WriteTo(writer);
+            WriteTo(writer, logger);
             writer.Flush();
 
             return Encoding.UTF8.GetString(stream.ToArray());

test/Directory.Build.props

@@ -1,10 +1,6 @@
 <Project>
   <Import Project="../Directory.Build.props" />
 
-  <PropertyGroup>
-    <UnityTestPath>$(UnityPackageProject)/Library/ScriptAssemblies</UnityTestPath>
-  </PropertyGroup>
-
   <PropertyGroup>
     <PackageRuntimeTestsPath>../../$(DevPackageFolderName)/Tests/Runtime</PackageRuntimeTestsPath>
     <PackageEditorTestsPath>../../$(DevPackageFolderName)/Tests/Editor</PackageEditorTestsPath>
@@ -26,6 +22,7 @@
         <Private>false</Private>
       </Reference>
     </ItemGroup>
+    <Error Condition="!Exists('$(UnityTestPath)/UnityEngine.TestRunner.dll')" Text="TestRunner not found. Expected: $(UnityTestPath)/UnityEngine.TestRunner.dll"></Error>
   </Target>
 
   <PropertyGroup>

test/Scripts.Tests/package-release.zip.snapshot

@@ -255,8 +255,8 @@ Plugins/iOS/Device/Sentry.framework/Modules/module.modulemap.meta
 Plugins/Android/Sentry.meta
 Plugins/Android/Sentry/gson-2.8.5.jar
 Plugins/Android/Sentry/gson-2.8.5.jar.meta
-Plugins/Android/Sentry/sentry-5.4.0.jar
-Plugins/Android/Sentry/sentry-5.4.0.jar.meta
+Plugins/Android/Sentry/sentry-5.5.0.jar
+Plugins/Android/Sentry/sentry-5.5.0.jar.meta
 Plugins/Android/Sentry/sentry-android-core-release.aar
 Plugins/Android/Sentry/sentry-android-core-release.aar.meta
 Plugins/Android/Sentry/sentry-android-ndk-release.aar

test/Sentry.Unity.Tests/UnityEventProcessorTests.cs

@@ -176,42 +176,6 @@ static SentryEvent CreateSentryEvent()
                     }
                 };
         }
-
-        [Test]
-        public void SentrySdkCaptureEvent_WrongDsn_CorrectException()
-        {
-            // arrange
-            const string wrongDsn = "https://key@fake.domain.fail.to.resolve/5606182";
-            var options = new SentryUnityOptions
-            {
-                Dsn = wrongDsn,
-                Enabled = true,
-                AttachStacktrace = true,
-                Debug = true,
-                DiagnosticLogger = _testLogger
-            };
-            SentryUnity.Init(options);
-
-            var sentryEvent = new SentryEvent
-            {
-                Message = new SentryMessage
-                {
-                    Message = "Test message"
-                }
-            };
-
-            // act
-            SentrySdk.CaptureEvent(sentryEvent);
-            SentrySdk.FlushAsync(TimeSpan.FromSeconds(1)).GetAwaiter().GetResult();
-
-            // assert
-            var matchingError = _testLogger.Logs
-                .Any(log => log.logLevel == SentryLevel.Error
-                                 && log.exception is HttpRequestException
-                                 && (log.exception?.InnerException as WebException)
-                                  ?.Message?.Contains("Error: NameResolutionFailure") == true);
-            Assert.IsTrue(matchingError);
-        }
     }
 
     public sealed class UnityEventProcessorTests