fix: add preprocessor directives to filter out addressables code (#21)

* update to unity 2022.3.8f1 * update visual studio code editor package * add preprocessor directives for addressables code * bump test runner version
mygamedevtools · Oct 19, 2023 · 82b0616 · 82b0616
1 parent 5bf7fe7
commit 82b0616
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -31,7 +31,7 @@ jobs:
           key: Library-${{ matrix.project-path }}
           restore-keys: |
             Library-
-      - uses: game-ci/unity-test-runner@v2
+      - uses: game-ci/unity-test-runner@v3
         id: tests
         env:
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -2,10 +2,11 @@
   "dependencies": {
     "com.cysharp.unitask": "2.3.3",
     "com.mygamedevtools.script-template": "3.4.0",
-    "com.unity.addressables": "1.21.12",
+    "com.unity.addressables": "1.21.15",
     "com.unity.feature.development": "1.0.1",
+    "com.unity.ide.visualstudio": "2.0.22",
     "com.unity.textmeshpro": "3.0.6",
-    "com.unity.timeline": "1.7.4",
+    "com.unity.timeline": "1.7.5",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",

diff --git a/Packages/mygamedevtools-scene-loader/Runtime/Utilities/AsyncOperationHandleGroup.cs b/Packages/mygamedevtools-scene-loader/Runtime/Utilities/AsyncOperationHandleGroup.cs
@@ -1,3 +1,4 @@
+#if ENABLE_ADDRESSABLES
 using System;
 using System.Collections.Generic;
 using UnityEngine;
@@ -63,4 +64,5 @@ public IList<SceneInstance> GetResult()
             return loadedScenes;
         }
     }
-}
+}
+#endif
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -21,11 +21,11 @@
       "url": "https://package.openupm.com"
     },
     "com.unity.addressables": {
-      "version": "1.21.12",
+      "version": "1.21.15",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.scriptablebuildpipeline": "1.21.5",
+        "com.unity.scriptablebuildpipeline": "1.21.8",
         "com.unity.modules.assetbundle": "1.0.0",
         "com.unity.modules.imageconversion": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0",
@@ -54,7 +54,7 @@
       "source": "builtin",
       "dependencies": {
         "com.unity.ide.visualstudio": "2.0.18",
-        "com.unity.ide.rider": "3.0.21",
+        "com.unity.ide.rider": "3.0.24",
         "com.unity.ide.vscode": "1.2.5",
         "com.unity.editorcoroutines": "1.0.0",
         "com.unity.performance.profile-analyzer": "1.2.2",
@@ -63,7 +63,7 @@
       }
     },
     "com.unity.ide.rider": {
-      "version": "3.0.21",
+      "version": "3.0.24",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -72,8 +72,8 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.18",
-      "depth": 1,
+      "version": "2.0.22",
+      "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.test-framework": "1.1.9"
@@ -95,7 +95,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.scriptablebuildpipeline": {
-      "version": "1.21.5",
+      "version": "1.21.8",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
@@ -139,7 +139,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
-      "version": "1.7.4",
+      "version": "1.7.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {

diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.2f1
-m_EditorVersionWithRevision: 2022.3.2f1 (d74737c6db50)
+m_EditorVersion: 2022.3.8f1
+m_EditorVersionWithRevision: 2022.3.8f1 (b5eafc012955)