Skip to content

Commit 9e5fad7

Browse files
LPLafontaineBLPLafontaineB
committed
Merge branch 'feat/update-to-2022-lts' into feat/update-to-UTP-2.0
2 parents fd07a38 + 7a714ed commit 9e5fad7

22 files changed

+204
-142
lines changed

‎.yamato/mobile-build-and-run.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ Build_Player_With_Tests_iOS_{{ project.name }}_{{ editor }}:
99
name: build {{ project.name }} - {{ editor }} on iOS
1010
agent:
1111
type: Unity::VM::osx
12-
image: mobile/macos-10.15-testing:stable
12+
image: package-ci/macos-12:v4
1313
flavor: b1.large
1414

1515
commands:
1616
- pip install unity-downloader-cli==1.2.0 --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
17-
- unity-downloader-cli -c Editor -c iOS -u 2021.3.15f1 --fast --wait
17+
- unity-downloader-cli -c Editor -c iOS -u {{ editor }} --fast --wait
1818
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
1919
- chmod +x ./utr
2020
- ./utr --suite=playmode --platform=iOS --editor-location=.Editor --testproject={{ project.path }} --player-save-path=build/players --artifacts_path=build/logs --build-only --testfilter=Unity.BossRoom.Tests.Runtime

‎.yamato/project-standards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ standards_{{ projects.first.name }}:
55
agent:
66
type: Unity::VM
77
image: desktop/logging-testing-linux:v0.1.2-926285
8-
flavor: b1.medium
8+
flavor: b1.large
99
commands:
1010
- dotnet --version
1111
- dotnet format --version

‎.yamato/project.metafile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
validation_editor: 2020.3
2-
3-
# Platforms that will be tested. The first entry in this array will also
4-
# be used for validation
1+
# Platforms that will be tested.
52
test_platforms:
63
- name: win
74
type: Unity::VM
@@ -33,4 +30,4 @@ projects:
3330
- name: com.unity.multiplayer.samples.coop
3431
path: Packages/com.unity.multiplayer.samples.coop
3532
test_editors:
36-
- 2021.3
33+
- 2022.3

‎Assets/Scenes/Startup.unity

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:edf173324a5d24080b24d1238c0302c0cdb694b206eab93e8c31c42b8a06a70b
3-
size 45837
2+
oid sha256:e582c8553ed14bee7d93703de52b5099f91b19e2c6b6d46ddbc0622a26b87b19
3+
size 47253

‎Assets/URP/Mobile/0_UniversalRenderPipelineAsset_Mobile_Low.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:649a7a9017233ecdb71d8147d23ceb72087b8da8a18ce05fddae07168203b581
3-
size 2678
2+
oid sha256:62ae1d73a7e79f82f466f0cca0ffd7d7f3c647af0c5d7876e8f28aed6ba195da
3+
size 3501

‎Assets/URP/Mobile/1_UniversalRenderPipelineAsset_Mobile_Medium.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:41ceb482b96531ac959bb0a8b9c6a40bde804670f186ba2bceb512c279da9b97
3-
size 2681
2+
oid sha256:ec3b54e2206ca1aca321f2f0b9961bf14937f8e15821aa8342e45835b965db81
3+
size 3504

‎Assets/URP/Mobile/2_UniversalRenderPipelineAsset_Mobile_High.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:269b2ff7a7687aa0cdde2a4a9e9d5ee5fec0101b509a8601f3b11c49fb40610f
3-
size 2679
2+
oid sha256:78565188a9b121a758c685ad1b4da264123ab20dc15b2de49725c527140b8ae0
3+
size 3502

‎Assets/URP/Windows/0_UniversalRenderPipelineAsset_Windows_Low.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:b10b4b0d3054c47aecf4e7fd339c10d95ab8db854e90b60811f17186e0f6fe07
3-
size 2670
2+
oid sha256:b276240933fdda078fe3a462a4729dbade38d49a9ae51cc6eaad477907cb2ac9
3+
size 3493

‎Assets/URP/Windows/1_UniversalRenderPipelineAsset_Windows_Medium.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:eb6ecdcc51ec9f27631ac40896551a87368b56a120bffb53fe7db2e64c3fa2ee
3-
size 2678
2+
oid sha256:08ba74e6bb58af1ca915ad7e9f6bdcc451d2604be3bf6a8621a9a91f83ac747c
3+
size 3501

‎Assets/URP/Windows/1_UniversalRenderPipelineAsset_Windows_Medium_Renderer.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:ceca0a89bc650a42542241e989eec3a4b1d4d67eb9233bda03ac9517f31759f0
3-
size 3586
2+
oid sha256:52463974785ae7050f0828ba83615b26e51c2f3cdd25e326985c5ee71a7493ab
3+
size 3760

‎Assets/URP/Windows/2_UniversalRenderPipelineAsset_Windows_High.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:cc0df2a8054598c801879b6ba92397cb9c1de7c1a9692fff38a7e40195609943
3-
size 2670
2+
oid sha256:b3fa683710f40f40512976e3bdae2171c9ba488c985f87995fd0577839347cd6
3+
size 3493

‎Assets/URP/Windows/3_UniversalRenderPipelineAsset_Windows_Ultra.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:f516e108f4f018a85a5b2c2a11f8aef7a2f37b6db88c792986306827e3e5d66e
3-
size 2672
2+
oid sha256:d20bce9da6b76d3fb037333159f05170ad0e75d5f4df6414bcca8c368585f501
3+
size 3495

‎Assets/VFX/Materials/FX_M_Crystal.mat

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ Material:
7676
m_Texture: {fileID: 2800000, guid: 9ed3e7e3831313745a7354fa9e38753c, type: 3}
7777
m_Scale: {x: 1, y: 1}
7878
m_Offset: {x: 0, y: 0}
79+
- _SampleTexture2D_e44098f8ce8c4aafaf724e92f07e43fd_Texture_1_Texture2D:
80+
m_Texture: {fileID: 2800000, guid: 9ed3e7e3831313745a7354fa9e38753c, type: 3}
81+
m_Scale: {x: 1, y: 1}
82+
m_Offset: {x: 0, y: 0}
7983
- _Texture0:
8084
m_Texture: {fileID: 0}
8185
m_Scale: {x: 1, y: 1}

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
1010

1111
### Changed
1212
* Updated Unity Transport Package to version 2.0.1 (#835)
13+
* Upgraded editor version to 2022.3.0f1 (#840)
1314

1415
## [2.1.0] - 2023-04-27
1516

‎Packages/com.unity.multiplayer.samples.coop/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
## [unreleased] - yyyy-mm-dd
44

5+
### Fixed
6+
* Updating package dependency to Netcode for GameObjects version 1.4.0 (#839)
7+
58
## [1.6.0] - 2023-04-27
69

710
### Changed

‎Packages/com.unity.multiplayer.samples.coop/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"dependencies": {
1010
"com.unity.learn.iet-framework": "1.2.1",
1111
"com.unity.multiplayer.tools": "1.1.0",
12-
"com.unity.netcode.gameobjects": "1.1.0",
12+
"com.unity.netcode.gameobjects": "1.4.0",
1313
"com.unity.services.relay": "1.0.3"
1414
}
15-
}
15+
}

‎Packages/manifest.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
22
"dependencies": {
33
"com.unity.2d.sprite": "1.0.0",
4-
"com.unity.ai.navigation": "1.1.1",
4+
"com.unity.ai.navigation": "1.1.3",
55
"com.unity.cinemachine": "2.9.5",
6-
"com.unity.collab-proxy": "2.0.1",
7-
"com.unity.ide.rider": "3.0.18",
8-
"com.unity.ide.visualstudio": "2.0.17",
6+
"com.unity.collab-proxy": "2.0.4",
7+
"com.unity.ide.rider": "3.0.21",
8+
"com.unity.ide.visualstudio": "2.0.18",
99
"com.unity.ide.vscode": "1.2.5",
1010
"com.unity.learn.iet-framework": "3.1.3",
1111
"com.unity.memoryprofiler": "1.0.0",
12-
"com.unity.multiplayer.tools": "1.1.0",
12+
"com.unity.multiplayer.tools": "2.0.0-pre.3",
1313
"com.unity.netcode.gameobjects": "1.4.0",
1414
"com.unity.performance.profile-analyzer": "1.2.2",
1515
"com.unity.postprocessing": "3.2.2",
16-
"com.unity.render-pipelines.universal": "14.0.6",
17-
"com.unity.services.authentication": "2.4.0",
16+
"com.unity.render-pipelines.universal": "14.0.7",
17+
"com.unity.services.authentication": "2.5.0",
1818
"com.unity.services.lobby": "1.1.0-pre.3",
1919
"com.unity.services.relay": "1.0.5",
20-
"com.unity.services.wire": "1.1.1",
20+
"com.unity.services.wire": "1.1.5",
2121
"com.unity.test-framework": "1.1.33",
2222
"com.unity.textmeshpro": "3.0.6",
2323
"com.unity.timeline": "1.7.4",

‎Packages/packages-lock.json

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"dependencies": {}
88
},
99
"com.unity.ai.navigation": {
10-
"version": "1.1.1",
10+
"version": "1.1.3",
1111
"depth": 0,
1212
"source": "registry",
1313
"dependencies": {
@@ -34,7 +34,7 @@
3434
"url": "https://packages.unity.com"
3535
},
3636
"com.unity.collab-proxy": {
37-
"version": "2.0.1",
37+
"version": "2.0.4",
3838
"depth": 0,
3939
"source": "registry",
4040
"dependencies": {},
@@ -68,7 +68,7 @@
6868
"url": "https://packages.unity.com"
6969
},
7070
"com.unity.ide.rider": {
71-
"version": "3.0.18",
71+
"version": "3.0.21",
7272
"depth": 0,
7373
"source": "registry",
7474
"dependencies": {
@@ -77,7 +77,7 @@
7777
"url": "https://packages.unity.com"
7878
},
7979
"com.unity.ide.visualstudio": {
80-
"version": "2.0.17",
80+
"version": "2.0.18",
8181
"depth": 0,
8282
"source": "registry",
8383
"dependencies": {
@@ -125,20 +125,22 @@
125125
"dependencies": {
126126
"com.unity.learn.iet-framework": "1.2.1",
127127
"com.unity.multiplayer.tools": "1.1.0",
128-
"com.unity.netcode.gameobjects": "1.1.0",
128+
"com.unity.netcode.gameobjects": "1.4.0",
129129
"com.unity.services.relay": "1.0.3"
130130
}
131131
},
132132
"com.unity.multiplayer.tools": {
133-
"version": "1.1.0",
133+
"version": "2.0.0-pre.3",
134134
"depth": 0,
135135
"source": "registry",
136136
"dependencies": {
137137
"com.unity.profiling.core": "1.0.0-pre.1",
138138
"com.unity.nuget.newtonsoft-json": "2.0.0",
139139
"com.unity.nuget.mono-cecil": "1.10.1",
140140
"com.unity.collections": "1.1.0",
141-
"com.unity.modules.uielements": "1.0.0"
141+
"com.unity.modules.uielements": "1.0.0",
142+
"com.unity.burst": "1.6.6",
143+
"com.unity.mathematics": "1.2.6"
142144
},
143145
"url": "https://packages.unity.com"
144146
},
@@ -160,7 +162,7 @@
160162
"url": "https://packages.unity.com"
161163
},
162164
"com.unity.nuget.newtonsoft-json": {
163-
"version": "3.1.0",
165+
"version": "3.2.1",
164166
"depth": 1,
165167
"source": "registry",
166168
"dependencies": {},
@@ -190,7 +192,7 @@
190192
"url": "https://packages.unity.com"
191193
},
192194
"com.unity.render-pipelines.core": {
193-
"version": "14.0.6",
195+
"version": "14.0.7",
194196
"depth": 1,
195197
"source": "builtin",
196198
"dependencies": {
@@ -201,14 +203,14 @@
201203
}
202204
},
203205
"com.unity.render-pipelines.universal": {
204-
"version": "14.0.6",
206+
"version": "14.0.7",
205207
"depth": 0,
206208
"source": "builtin",
207209
"dependencies": {
208210
"com.unity.mathematics": "1.2.1",
209-
"com.unity.burst": "1.8.2",
210-
"com.unity.render-pipelines.core": "14.0.6",
211-
"com.unity.shadergraph": "14.0.6"
211+
"com.unity.burst": "1.8.4",
212+
"com.unity.render-pipelines.core": "14.0.7",
213+
"com.unity.shadergraph": "14.0.7"
212214
}
213215
},
214216
"com.unity.searcher": {
@@ -219,24 +221,24 @@
219221
"url": "https://packages.unity.com"
220222
},
221223
"com.unity.services.authentication": {
222-
"version": "2.4.0",
224+
"version": "2.5.0",
223225
"depth": 0,
224226
"source": "registry",
225227
"dependencies": {
226-
"com.unity.nuget.newtonsoft-json": "3.0.2",
227-
"com.unity.services.core": "1.7.0",
228+
"com.unity.nuget.newtonsoft-json": "3.2.1",
229+
"com.unity.services.core": "1.9.0",
228230
"com.unity.modules.unitywebrequest": "1.0.0",
229231
"com.unity.ugui": "1.0.0"
230232
},
231233
"url": "https://packages.unity.com"
232234
},
233235
"com.unity.services.core": {
234-
"version": "1.8.1",
236+
"version": "1.9.0",
235237
"depth": 1,
236238
"source": "registry",
237239
"dependencies": {
238240
"com.unity.modules.unitywebrequest": "1.0.0",
239-
"com.unity.nuget.newtonsoft-json": "3.0.2",
241+
"com.unity.nuget.newtonsoft-json": "3.2.1",
240242
"com.unity.modules.androidjni": "1.0.0"
241243
},
242244
"url": "https://packages.unity.com"
@@ -259,7 +261,7 @@
259261
"url": "https://packages.unity.com"
260262
},
261263
"com.unity.services.qos": {
262-
"version": "1.1.0",
264+
"version": "1.2.0",
263265
"depth": 1,
264266
"source": "registry",
265267
"dependencies": {
@@ -290,13 +292,13 @@
290292
"url": "https://packages.unity.com"
291293
},
292294
"com.unity.services.wire": {
293-
"version": "1.1.1",
295+
"version": "1.1.5",
294296
"depth": 0,
295297
"source": "registry",
296298
"dependencies": {
297-
"com.unity.services.core": "1.4.2",
299+
"com.unity.services.core": "1.8.1",
298300
"com.unity.nuget.newtonsoft-json": "3.0.2",
299-
"com.unity.services.authentication": "2.1.1"
301+
"com.unity.services.authentication": "2.4.0"
300302
},
301303
"url": "https://packages.unity.com"
302304
},
@@ -308,11 +310,11 @@
308310
"url": "https://packages.unity.com"
309311
},
310312
"com.unity.shadergraph": {
311-
"version": "14.0.6",
313+
"version": "14.0.7",
312314
"depth": 1,
313315
"source": "builtin",
314316
"dependencies": {
315-
"com.unity.render-pipelines.core": "14.0.6",
317+
"com.unity.render-pipelines.core": "14.0.7",
316318
"com.unity.searcher": "4.9.2"
317319
}
318320
},

‎ProjectSettings/ProjectSettings.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:2f3a7346c3cc5c0bdd7646fb812d034e99294d7ef5589d0e0e5fd8b0503412b9
3-
size 26729
2+
oid sha256:22be047b4bd9919df98928f051e8c8d7ba53faa63e0a7abf5cb280aa96385c81
3+
size 26762

‎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.2.13f1
2-
m_EditorVersionWithRevision: 2022.2.13f1 (5f5de2657605)
1+
m_EditorVersion: 2022.3.0f1
2+
m_EditorVersionWithRevision: 2022.3.0f1 (fb119bb0b476)

‎ProjectSettings/UnityConnectSettings.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:8e19c2d77de966d5f982464d6a2f7ee94eddf34053baf2f0eb4bf1c3fd31d7bd
3-
size 901
2+
oid sha256:d6034acbef6c9e3179866486c31eab81fcbe5e7ed350ce71e0fa2b1449b77109
3+
size 943

0 commit comments

Comments
 (0)