chore: Bump Unity on CI (#500)

* unity bump

* updated unity version

* bumped 2019.4.34f1

* updated samples project to 2019.4.34f1

* 2021.2 now netstandard 2.1

* released artifact from lowest supported unity version

* 'fixed' CI

* 'fixed' CI

* excluding 2021.2 and newer from running tests

* CI exclusion test #2

* CI exclusion test #3

* Apply suggestions from code review

Co-authored-by: LucasZF <[email protected]>

* use ns2.1 only on tests

* moved .ns2.1 to target for tests

* test reset after reset

* fixed *all* the version numbers

* bumped sample too

* sticking with 2019.4.34 because 35 is broken

* sample to 34, not running on 21 for 2021.2.

* fixed if

* bumped to 2021.2.10

Co-authored-by: Bruno Garcia <[email protected]>
Co-authored-by: LucasZF <[email protected]>

Author: 3 people

.github/workflows/ci.yml

@@ -20,12 +20,13 @@ jobs:
     env:
       DOTNET_CLI_TELEMETRY_OPTOUT: 1
       DOTNET_NOLOGO: 1
+      LOWEST_SUPPORTED_UNITY_VERSION: 2019.4.34f1
     strategy:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest]
         # 2022.1.0a12 removed until S.T.J issues fixed
-        unity-version: [2019.4.33f1, 2020.3.21f1, 2021.1.26f1]
+        unity-version: [2019.4.34f1, 2020.3.27f1, 2021.2.10f1]
         include:
           - os: windows-latest
             unity-installation-path: C:/Program Files/Unity/
@@ -37,12 +38,12 @@ jobs:
             unity-root: /Applications/Unity/Hub/Editor/
             unity-path: Unity.app/Contents/MacOS
             unity-config-path: /Library/Application Support/Unity/config/
-          - unity-version: 2019.4.33f1
-            unity-version-changeset: c9b2b02eeeef
-          - unity-version: 2020.3.21f1
-            unity-version-changeset: a38c86f6690f
-          - unity-version: 2021.1.26f1
-            unity-version-changeset: 6f076387c01d
+          - unity-version: 2019.4.34f1
+            unity-version-changeset: 6a9faed444f2
+          - unity-version: 2020.3.27f1
+            unity-version-changeset: e759542391ea
+          - unity-version: 2021.2.10f1
+            unity-version-changeset: ee872746220e
           # - unity-version: 2022.1.0a12
           #   unity-version-changeset: 816252c3efbb
 
@@ -194,9 +195,9 @@ jobs:
           assemblyalias --target-directory "package-dev/Runtime" --internalize --prefix "Sentry." --assemblies-to-alias "Microsoft*;System*"
 
       - name: Run Unity tests (playmode)
-        # TODO: Run Play mode tests on 2022 once S.T.J loading issue resolved.
+        # TODO: Run Play mode tests on 2021.2 or newer once S.T.J loading issue resolved.
         # System.MissingMethodException : Method not found: System.Text.Json.JsonDocument System.Text.Json.JsonDocument.Parse(System.ReadOnlyMemory`1<byte>,System.Text.Json.JsonDocumentOptions)
-        if: ${{ matrix.unity-version != '2022.1.0a12' }}
+        if: ${{ !(startsWith(matrix.unity-version, '2021.2')) && !(startsWith(matrix.unity-version, '2022')) }}
         env:
           UNITY_VERSION: ${{ matrix.unity-version }}
         run: dotnet msbuild /t:UnityPlayModeTest /p:Configuration=Release /p:OutDir=other test/Sentry.Unity.Tests
@@ -209,9 +210,9 @@ jobs:
           path: artifacts/test/playmode
 
       - name: Run Unity tests (editmode)
-        # TODO: Run Edit mode tests on 2022 once S.T.J loading issue resolved.
+        # TODO: Run Play mode tests on 2021.2 or newer once S.T.J loading issue resolved.
         # https://forum.unity.com/threads/unity-future-net-development-status.1092205/page-8#post-7602256
-        if: ${{ matrix.unity-version != '2022.1.0a12' }}
+        if: ${{ !(startsWith(matrix.unity-version, '2021.2')) && !(startsWith(matrix.unity-version, '2022')) }}
         env:
           UNITY_VERSION: ${{ matrix.unity-version }}
         run: dotnet msbuild /t:UnityEditModeTest /p:Configuration=Release /p:OutDir=other test/Sentry.Unity.Editor.Tests
@@ -290,7 +291,7 @@ jobs:
       - name: Upload release artifacts
         uses: actions/upload-artifact@v2
         # Only on macOS which contain all native plugin needed
-        if: matrix.os == 'macos-latest'
+        if: matrix.os == 'macos-latest' && matrix.unity-version == ${{ env.LOWEST_SUPPORTED_UNITY_VERSION }}
         with:
           name: ${{ github.sha }}
           if-no-files-found: error
@@ -337,9 +338,9 @@ jobs:
       max-parallel: 5
       fail-fast: false
       matrix:
-        api-level: [21, 27, 29]
-        avd-target: [default]
-        unity-version: [2019.4.33f1, 2020.3.21f1, 2021.1.26f1]
+         api-level: [21, 27, 29]
+         avd-target: [default]
+         unity-version: [2019.4.34f1, 2020.3.27f1, 2021.2.10f1]
     steps:
       - name: Checkout
         uses: actions/[email protected]
@@ -354,6 +355,8 @@ jobs:
         id: smoke-test
         continue-on-error: true
         timeout-minutes: 10
+        # API 21 is no longer supported on Unity 2022
+        if: ${{ (matrix.unity-version == '2021.2.10f1') && matrix.api-level != '21' }}
         uses: reactivecircus/android-emulator-runner@2b2ebf2e518e38a17180117fc2b677006db27330
         with:
           api-level: ${{ matrix.api-level }}
@@ -377,8 +380,8 @@ jobs:
         id: smoke-test-retry
         continue-on-error: true
         timeout-minutes: 10
-        # We only want to retry the tests if the previous fail happened on the emulator startup.
-        if: ${{ steps.smoke-test.outputs.smoke-status != 'Completed' }}
+        # API 21 is no longer supported on Unity 2022 and we only want to retry the tests if the previous fail happened on the emulator startup.
+        if: ${{ (matrix.unity-version == '2021.2.10f1') && matrix.api-level != '21' && steps.smoke-test.outputs.smoke-status != 'Completed' }}
         uses: reactivecircus/android-emulator-runner@2b2ebf2e518e38a17180117fc2b677006db27330
         with:
           api-level: ${{ matrix.api-level }}
@@ -412,10 +415,10 @@ jobs:
       max-parallel: 2
       fail-fast: false
       matrix:
-        api-level: [30]
-        avd-target: [google_apis]
-        #api-level 30 image is only available with google services.
-        unity-version: [2019.4.33f1, 2020.3.21f1, 2021.1.26f1]
+         api-level: [30]
+         avd-target: [google_apis]
+         #api-level 30 image is only available with google services.
+         unity-version: [2019.4.34f1, 2020.3.27f1, 2021.2.10f1]
     steps:
       - name: Checkout
         uses: actions/[email protected]

Directory.Build.props

@@ -16,12 +16,13 @@
   </PropertyGroup>
 
   <Target Name="ResetTargetFrameworks" AfterTargets="FindUnity" BeforeTargets="BeforeResolveReferences">
+    <!-- Blocked by https://github.com/getsentry/sentry-unity/issues/513 -->
     <!-- With 2022 Unity packages are already targeting ns2.1 and Unity itself only has that as an option so we must target ns2.1 here too: -->
-    <PropertyGroup Condition="$(UnityVersion.StartsWith('2022'))">
+    <!-- <PropertyGroup Condition="$(UnityVersion.StartsWith('2021.2')) or $(UnityVersion.StartsWith('2022'))">
       <TargetFrameworks>netstandard2.1</TargetFrameworks>
-    </PropertyGroup>
+    </PropertyGroup> -->
     <!-- Lowest version supported at this time is 2019 and up to 2021 ns2.0 is the only option. -->
-    <PropertyGroup Condition="$(UnityVersion.StartsWith('2019')) or $(UnityVersion.StartsWith('2020')) or $(UnityVersion.StartsWith('2021'))">
+    <PropertyGroup Condition="$(UnityVersion.StartsWith('2019')) or $(UnityVersion.StartsWith('2020')) or $(UnityVersion.StartsWith('2021.1'))">
       <TargetFrameworks>netstandard2.0</TargetFrameworks>
     </PropertyGroup>
     <!-- Being specific on which Unity version we support allows us to quickly ajust these settings when adding support to new editors.

samples/unity-of-bugs/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2019.4.33f1
-m_EditorVersionWithRevision: 2019.4.33f1 (c9b2b02eeeef)
+m_EditorVersion: 2019.4.34f1
+m_EditorVersionWithRevision: 2019.4.34f1 (6a9faed444f2)

test/Directory.Build.props

@@ -6,6 +6,13 @@
     <PackageEditorTestsPath>../../$(DevPackageFolderName)/Tests/Editor</PackageEditorTestsPath>
   </PropertyGroup>
 
+  <Target Name="ResetTestTargetFrameworks" AfterTargets="ResetTargetFrameworks" BeforeTargets="BeforeResolveReferences">
+    <!-- With 2022 Unity packages are already targeting ns2.1 and Unity itself only has that as an option so we must target ns2.1 here too: -->
+    <PropertyGroup Condition="$(UnityVersion.StartsWith('2021.2')) or $(UnityVersion.StartsWith('2022'))">
+      <TargetFrameworks>netstandard2.1</TargetFrameworks>
+    </PropertyGroup>
+  </Target>
+
   <!-- Add reference once we figure out where the DLL is (find Unity version and install location) -->
   <Target Name="ReferenceUnityEditor" BeforeTargets="BeforeResolveReferences">
     <ItemGroup>