Skip to content

Commit f4a0834

Browse files
0xFA110xFA11
authored
ci: add 2023.1 (#2453)
1 parent 2da54f0 commit f4a0834

File tree

5 files changed

+64
-38
lines changed

5 files changed

+64
-38
lines changed

‎.yamato/project.metafile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ projects:
4545
- 2020.3
4646
- 2021.3
4747
- 2022.2
48+
- 2023.1
4849
- trunk
4950
- name: minimalproject
5051
path: minimalproject

‎com.unity.netcode.gameobjects/TestHelpers/Runtime/IntegrationTestSceneHandler.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,11 @@ public void MoveObjectsFromSceneToDontDestroyOnLoad(ref NetworkManager networkMa
702702
{
703703
// Create a local copy of the spawned objects list since the spawn manager will adjust the list as objects
704704
// are despawned.
705+
#if UNITY_2023_1_OR_NEWER
706+
var networkObjects = Object.FindObjectsByType<NetworkObject>(FindObjectsSortMode.InstanceID).Where((c) => c.IsSpawned);
707+
#else
705708
var networkObjects = Object.FindObjectsOfType<NetworkObject>().Where((c) => c.IsSpawned);
709+
#endif
706710
foreach (var networkObject in networkObjects)
707711
{
708712
if (networkObject == null || (networkObject != null && networkObject.gameObject.scene.handle != scene.handle))

‎testproject/Assets/Tests/Manual/Scripts/NetworkPrefabPool.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,11 @@ private void ShowHideObjectIdLabelClientRpc(bool isVisible)
351351
{
352352
m_LabelEnabled = isVisible;
353353
NetworkObjectLabel.GlobalVisibility = m_LabelEnabled;
354+
#if UNITY_2023_1_OR_NEWER
355+
var labels = FindObjectsByType<NetworkObjectLabel>(FindObjectsSortMode.InstanceID);
356+
#else
354357
var labels = FindObjectsOfType<NetworkObjectLabel>();
358+
#endif
355359

356360
foreach (var label in labels)
357361
{

‎testproject/Packages/manifest.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
{
22
"dependencies": {
3-
"com.unity.addressables": "1.18.19",
4-
"com.unity.collab-proxy": "1.17.2",
5-
"com.unity.ide.rider": "3.0.15",
6-
"com.unity.ide.visualstudio": "2.0.16",
7-
"com.unity.ide.vscode": "1.2.5",
3+
"com.unity.addressables": "1.21.9",
4+
"com.unity.ai.navigation": "1.1.1",
5+
"com.unity.collab-proxy": "1.17.7",
6+
"com.unity.ide.rider": "3.0.18",
7+
"com.unity.ide.visualstudio": "2.0.17",
88
"com.unity.mathematics": "1.2.6",
99
"com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
10-
"com.unity.package-validation-suite": "0.21.0-preview",
11-
"com.unity.services.authentication": "2.2.0",
12-
"com.unity.services.core": "1.4.3",
13-
"com.unity.services.relay": "1.0.1-pre.1",
14-
"com.unity.test-framework": "1.1.31",
15-
"com.unity.test-framework.performance": "2.8.0-preview",
10+
"com.unity.package-validation-suite": "0.49.0-preview",
11+
"com.unity.services.authentication": "2.4.0",
12+
"com.unity.services.core": "1.8.1",
13+
"com.unity.services.relay": "1.0.5",
14+
"com.unity.test-framework": "1.3.3",
15+
"com.unity.test-framework.performance": "2.8.1-preview",
1616
"com.unity.textmeshpro": "3.0.6",
17-
"com.unity.timeline": "1.6.2",
17+
"com.unity.timeline": "1.8.2",
1818
"com.unity.ugui": "1.0.0",
1919
"com.unity.modules.ai": "1.0.0",
2020
"com.unity.modules.androidjni": "1.0.0",

‎testproject/Packages/packages-lock.json

Lines changed: 43 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"dependencies": {
33
"com.unity.addressables": {
4-
"version": "1.18.19",
4+
"version": "1.21.9",
55
"depth": 0,
66
"source": "registry",
77
"dependencies": {
8-
"com.unity.scriptablebuildpipeline": "1.19.2",
8+
"com.unity.scriptablebuildpipeline": "1.21.3",
99
"com.unity.modules.assetbundle": "1.0.0",
1010
"com.unity.modules.imageconversion": "1.0.0",
1111
"com.unity.modules.jsonserialize": "1.0.0",
@@ -14,6 +14,15 @@
1414
},
1515
"url": "https://packages.unity.com"
1616
},
17+
"com.unity.ai.navigation": {
18+
"version": "1.1.1",
19+
"depth": 0,
20+
"source": "registry",
21+
"dependencies": {
22+
"com.unity.modules.ai": "1.0.0"
23+
},
24+
"url": "https://packages.unity.com"
25+
},
1726
"com.unity.burst": {
1827
"version": "1.6.6",
1928
"depth": 2,
@@ -24,7 +33,7 @@
2433
"url": "https://packages.unity.com"
2534
},
2635
"com.unity.collab-proxy": {
27-
"version": "1.17.2",
36+
"version": "1.17.7",
2837
"depth": 0,
2938
"source": "registry",
3039
"dependencies": {
@@ -43,14 +52,14 @@
4352
"url": "https://packages.unity.com"
4453
},
4554
"com.unity.ext.nunit": {
46-
"version": "1.0.6",
55+
"version": "2.0.3",
4756
"depth": 1,
4857
"source": "registry",
4958
"dependencies": {},
5059
"url": "https://packages.unity.com"
5160
},
5261
"com.unity.ide.rider": {
53-
"version": "3.0.15",
62+
"version": "3.0.18",
5463
"depth": 0,
5564
"source": "registry",
5665
"dependencies": {
@@ -59,21 +68,14 @@
5968
"url": "https://packages.unity.com"
6069
},
6170
"com.unity.ide.visualstudio": {
62-
"version": "2.0.16",
71+
"version": "2.0.17",
6372
"depth": 0,
6473
"source": "registry",
6574
"dependencies": {
6675
"com.unity.test-framework": "1.1.9"
6776
},
6877
"url": "https://packages.unity.com"
6978
},
70-
"com.unity.ide.vscode": {
71-
"version": "1.2.5",
72-
"depth": 0,
73-
"source": "registry",
74-
"dependencies": {},
75-
"url": "https://packages.unity.com"
76-
},
7779
"com.unity.mathematics": {
7880
"version": "1.2.6",
7981
"depth": 0,
@@ -105,7 +107,7 @@
105107
"url": "https://packages.unity.com"
106108
},
107109
"com.unity.package-validation-suite": {
108-
"version": "0.21.0-preview",
110+
"version": "0.49.0-preview",
109111
"depth": 0,
110112
"source": "registry",
111113
"dependencies": {
@@ -114,26 +116,26 @@
114116
"url": "https://packages.unity.com"
115117
},
116118
"com.unity.scriptablebuildpipeline": {
117-
"version": "1.20.1",
119+
"version": "1.21.3",
118120
"depth": 1,
119121
"source": "registry",
120122
"dependencies": {},
121123
"url": "https://packages.unity.com"
122124
},
123125
"com.unity.services.authentication": {
124-
"version": "2.2.0",
126+
"version": "2.4.0",
125127
"depth": 0,
126128
"source": "registry",
127129
"dependencies": {
128130
"com.unity.nuget.newtonsoft-json": "3.0.2",
129-
"com.unity.services.core": "1.4.3",
131+
"com.unity.services.core": "1.7.0",
130132
"com.unity.modules.unitywebrequest": "1.0.0",
131133
"com.unity.ugui": "1.0.0"
132134
},
133135
"url": "https://packages.unity.com"
134136
},
135137
"com.unity.services.core": {
136-
"version": "1.4.3",
138+
"version": "1.8.1",
137139
"depth": 0,
138140
"source": "registry",
139141
"dependencies": {
@@ -143,35 +145,50 @@
143145
},
144146
"url": "https://packages.unity.com"
145147
},
148+
"com.unity.services.qos": {
149+
"version": "1.1.0",
150+
"depth": 1,
151+
"source": "registry",
152+
"dependencies": {
153+
"com.unity.services.core": "1.4.0",
154+
"com.unity.modules.unitywebrequest": "1.0.0",
155+
"com.unity.nuget.newtonsoft-json": "3.0.2",
156+
"com.unity.services.authentication": "2.0.0",
157+
"com.unity.collections": "1.2.4"
158+
},
159+
"url": "https://packages.unity.com"
160+
},
146161
"com.unity.services.relay": {
147-
"version": "1.0.1-pre.1",
162+
"version": "1.0.5",
148163
"depth": 0,
149164
"source": "registry",
150165
"dependencies": {
151-
"com.unity.services.core": "1.1.0-pre.8",
166+
"com.unity.services.core": "1.4.0",
167+
"com.unity.services.authentication": "2.0.0",
168+
"com.unity.services.qos": "1.1.0",
152169
"com.unity.modules.unitywebrequest": "1.0.0",
153170
"com.unity.modules.unitywebrequestassetbundle": "1.0.0",
154171
"com.unity.modules.unitywebrequestaudio": "1.0.0",
155172
"com.unity.modules.unitywebrequesttexture": "1.0.0",
156173
"com.unity.modules.unitywebrequestwww": "1.0.0",
157-
"com.unity.nuget.newtonsoft-json": "2.0.0",
158-
"com.unity.services.authentication": "1.0.0-pre.4"
174+
"com.unity.nuget.newtonsoft-json": "3.0.2",
175+
"com.unity.transport": "1.3.0"
159176
},
160177
"url": "https://packages.unity.com"
161178
},
162179
"com.unity.test-framework": {
163-
"version": "1.1.31",
180+
"version": "1.3.3",
164181
"depth": 0,
165182
"source": "registry",
166183
"dependencies": {
167-
"com.unity.ext.nunit": "1.0.6",
184+
"com.unity.ext.nunit": "2.0.3",
168185
"com.unity.modules.imgui": "1.0.0",
169186
"com.unity.modules.jsonserialize": "1.0.0"
170187
},
171188
"url": "https://packages.unity.com"
172189
},
173190
"com.unity.test-framework.performance": {
174-
"version": "2.8.0-preview",
191+
"version": "2.8.1-preview",
175192
"depth": 0,
176193
"source": "registry",
177194
"dependencies": {
@@ -190,7 +207,7 @@
190207
"url": "https://packages.unity.com"
191208
},
192209
"com.unity.timeline": {
193-
"version": "1.6.2",
210+
"version": "1.8.2",
194211
"depth": 0,
195212
"source": "registry",
196213
"dependencies": {

0 commit comments

Comments
 (0)