Skip to content

Commit 82b0616

Browse files
authored
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
1 parent 5bf7fe7 commit 82b0616

File tree

5 files changed

+17
-14
lines changed

5 files changed

+17
-14
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
key: Library-${{ matrix.project-path }}
3232
restore-keys: |
3333
Library-
34-
- uses: game-ci/unity-test-runner@v2
34+
- uses: game-ci/unity-test-runner@v3
3535
id: tests
3636
env:
3737
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}

Packages/manifest.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
"dependencies": {
33
"com.cysharp.unitask": "2.3.3",
44
"com.mygamedevtools.script-template": "3.4.0",
5-
"com.unity.addressables": "1.21.12",
5+
"com.unity.addressables": "1.21.15",
66
"com.unity.feature.development": "1.0.1",
7+
"com.unity.ide.visualstudio": "2.0.22",
78
"com.unity.textmeshpro": "3.0.6",
8-
"com.unity.timeline": "1.7.4",
9+
"com.unity.timeline": "1.7.5",
910
"com.unity.ugui": "1.0.0",
1011
"com.unity.modules.ai": "1.0.0",
1112
"com.unity.modules.androidjni": "1.0.0",

Packages/mygamedevtools-scene-loader/Runtime/Utilities/AsyncOperationHandleGroup.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#if ENABLE_ADDRESSABLES
12
using System;
23
using System.Collections.Generic;
34
using UnityEngine;
@@ -63,4 +64,5 @@ public IList<SceneInstance> GetResult()
6364
return loadedScenes;
6465
}
6566
}
66-
}
67+
}
68+
#endif

Packages/packages-lock.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
"url": "https://package.openupm.com"
2222
},
2323
"com.unity.addressables": {
24-
"version": "1.21.12",
24+
"version": "1.21.15",
2525
"depth": 0,
2626
"source": "registry",
2727
"dependencies": {
28-
"com.unity.scriptablebuildpipeline": "1.21.5",
28+
"com.unity.scriptablebuildpipeline": "1.21.8",
2929
"com.unity.modules.assetbundle": "1.0.0",
3030
"com.unity.modules.imageconversion": "1.0.0",
3131
"com.unity.modules.jsonserialize": "1.0.0",
@@ -54,7 +54,7 @@
5454
"source": "builtin",
5555
"dependencies": {
5656
"com.unity.ide.visualstudio": "2.0.18",
57-
"com.unity.ide.rider": "3.0.21",
57+
"com.unity.ide.rider": "3.0.24",
5858
"com.unity.ide.vscode": "1.2.5",
5959
"com.unity.editorcoroutines": "1.0.0",
6060
"com.unity.performance.profile-analyzer": "1.2.2",
@@ -63,7 +63,7 @@
6363
}
6464
},
6565
"com.unity.ide.rider": {
66-
"version": "3.0.21",
66+
"version": "3.0.24",
6767
"depth": 1,
6868
"source": "registry",
6969
"dependencies": {
@@ -72,8 +72,8 @@
7272
"url": "https://packages.unity.com"
7373
},
7474
"com.unity.ide.visualstudio": {
75-
"version": "2.0.18",
76-
"depth": 1,
75+
"version": "2.0.22",
76+
"depth": 0,
7777
"source": "registry",
7878
"dependencies": {
7979
"com.unity.test-framework": "1.1.9"
@@ -95,7 +95,7 @@
9595
"url": "https://packages.unity.com"
9696
},
9797
"com.unity.scriptablebuildpipeline": {
98-
"version": "1.21.5",
98+
"version": "1.21.8",
9999
"depth": 1,
100100
"source": "registry",
101101
"dependencies": {},
@@ -139,7 +139,7 @@
139139
"url": "https://packages.unity.com"
140140
},
141141
"com.unity.timeline": {
142-
"version": "1.7.4",
142+
"version": "1.7.5",
143143
"depth": 0,
144144
"source": "registry",
145145
"dependencies": {

ProjectSettings/ProjectVersion.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2022.3.2f1
2-
m_EditorVersionWithRevision: 2022.3.2f1 (d74737c6db50)
1+
m_EditorVersion: 2022.3.8f1
2+
m_EditorVersionWithRevision: 2022.3.8f1 (b5eafc012955)

0 commit comments

Comments
 (0)