fix: bump submodules #474
fix: bump submodules #474
Conversation
| @@ -152,6 +157,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 | |||
There was a problem hiding this comment.
These steps are all called by Build but to get their timing more clearly, I'm adding them here explicitly here.
They only run if their output hasn't being built yet so the time spent on it will move from the "Build Unity" step to here
| @@ -168,7 +188,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 | |||
There was a problem hiding this comment.
Added the project path explicitly so we're not running this target against the solution, and hence, against all projects in the solution. They are designed to spawn Unity once only
| @@ -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> | |||
There was a problem hiding this comment.
So we can build individual projects (dotnet build src/Sentry.Unity), we couldn't rely on SolutionDir because that didn't expand when not buiilding the .sln (which it's what we're doing when we do dotnet build on a directory with a .sln in it).
So changing things here to be relative to the root of the repo based on this new property
| @@ -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"> | |||
There was a problem hiding this comment.
$UnityPackageProject depends on FindUnity so this was missing
| @@ -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> | |||
There was a problem hiding this comment.
To help debug when UnityTestPath didnt' expand properly.
| @@ -176,42 +176,6 @@ static SentryEvent CreateSentryEvent() | |||
| } | |||
| }; | |||
| } | |||
|
|
|||
| [Test] | |||
| public void SentrySdkCaptureEvent_WrongDsn_CorrectException() | |||
There was a problem hiding this comment.
This test isn't really doing anything other than testing DNS and our internal logging. Also, it started failing because of a change in the .NET SDK.
NOTE: I had to push a branch to the .NET SDK since the addition of a .targets there broken the inheritance flow to this repo:
getsentry/sentry-dotnet#1397
I suggest we move on with this to unblock the next release. And iterate from there