Skip to content

Commit 0fab0ae

Browse files
noellie-veleznoellie-velez
committed
Merge branch 'develop-2.0.0' into chore/simplify-accessors-network-behaviour
# Conflicts: # com.unity.netcode.gameobjects/CHANGELOG.md
2 parents 26e9cbc + 60471ae commit 0fab0ae

File tree

16 files changed

+116
-97
lines changed

16 files changed

+116
-97
lines changed

‎.yamato/project.metafile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
small_agent_platform:
2525
- name: ubuntu
2626
type: Unity::VM
27-
image: package-ci/ubuntu-22.04:v4.82.0
27+
image: package-ci/ubuntu-22.04:v4.83.0
2828
flavor: b1.small
2929

3030

@@ -39,13 +39,13 @@ test_platforms:
3939
default:
4040
- name: ubuntu
4141
type: Unity::VM
42-
image: package-ci/ubuntu-22.04:v4.82.0
42+
image: package-ci/ubuntu-22.04:v4.83.0
4343
flavor: b1.large
4444
standalone: StandaloneLinux64
4545
desktop:
4646
- name: ubuntu
4747
type: Unity::VM
48-
image: package-ci/ubuntu-22.04:v4.82.0
48+
image: package-ci/ubuntu-22.04:v4.83.0
4949
flavor: b1.large
5050
smaller_flavor: b1.medium
5151
larger_flavor: b1.xlarge

‎.yamato/wrench/api-validation-jobs.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
### Auto-generated by Recipe Engine, DO NOT EDIT. ###
44
### ###
55
#######################################################
6+
# Source: RecipeEngine.Modules.Wrench.Recipes.ApiValidationJobs
67
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
78
all_api_validation_jobs:
89
name: All API Validation Jobs
@@ -59,8 +60,8 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_win10:
5960
UNITY_LICENSING_SERVER_DELETE_NUL: 0
6061
UNITY_LICENSING_SERVER_DELETE_ULF: 0
6162
UNITY_LICENSING_SERVER_TOOLSET: pro
62-
UPMPVP_CONTEXT_WRENCH: 2.3.3.0
63+
UPMPVP_CONTEXT_WRENCH: 2.5.0.0
6364
metadata:
6465
Job Maintainers: '#rm-packageworks'
65-
Wrench: 2.3.3.0
66+
Wrench: 2.5.0.0
6667

‎.yamato/wrench/package-pack-jobs.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
### Auto-generated by Recipe Engine, DO NOT EDIT. ###
44
### ###
55
#######################################################
6+
# Source: RecipeEngine.Modules.Wrench.Recipes.PackagePackJobs
67
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
78

89
# Pack Netcode for GameObjects
@@ -28,5 +29,5 @@ package_pack_-_netcode_gameobjects:
2829
UPMCI_ACK_LARGE_PACKAGE: 1
2930
metadata:
3031
Job Maintainers: '#rm-packageworks'
31-
Wrench: 2.3.3.0
32+
Wrench: 2.5.0.0
3233

‎.yamato/wrench/player-build.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
### Auto-generated by Recipe Engine, DO NOT EDIT. ###
44
### ###
55
#######################################################
6+
# Source: RecipeEngine.Modules.Wrench.Recipes.PlayerBuild
67
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
78
{}
89

‎.yamato/wrench/player-test.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
### Auto-generated by Recipe Engine, DO NOT EDIT. ###
44
### ###
55
#######################################################
6+
# Source: RecipeEngine.Modules.Wrench.Recipes.PlayerTest
67
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
78
{}
89

‎.yamato/wrench/preview-a-p-v.yml‎

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
### Auto-generated by Recipe Engine, DO NOT EDIT. ###
44
### ###
55
#######################################################
6+
# Source: RecipeEngine.Modules.Wrench.Recipes.PreviewAPV
67
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
78

89
# Parent Preview APV Job.
@@ -26,7 +27,7 @@ all_preview_apv_jobs:
2627
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_6_-_win10
2728
metadata:
2829
Job Maintainers: '#rm-packageworks'
29-
Wrench: 2.3.3.0
30+
Wrench: 2.5.0.0
3031

3132
# Functional tests for dependents found in the latest 6000.0 manifest (MacOS).
3233
preview_apv_-_6000_0_-_macos13:
@@ -81,10 +82,10 @@ preview_apv_-_6000_0_-_macos13:
8182
UNITY_LICENSING_SERVER_DELETE_NUL: 0
8283
UNITY_LICENSING_SERVER_DELETE_ULF: 0
8384
UNITY_LICENSING_SERVER_TOOLSET: pro
84-
UPMPVP_CONTEXT_WRENCH: 2.3.3.0
85+
UPMPVP_CONTEXT_WRENCH: 2.5.0.0
8586
metadata:
8687
Job Maintainers: '#rm-packageworks'
87-
Wrench: 2.3.3.0
88+
Wrench: 2.5.0.0
8889

8990
# Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu).
9091
preview_apv_-_6000_0_-_ubuntu2204:
@@ -139,10 +140,10 @@ preview_apv_-_6000_0_-_ubuntu2204:
139140
UNITY_LICENSING_SERVER_DELETE_NUL: 0
140141
UNITY_LICENSING_SERVER_DELETE_ULF: 0
141142
UNITY_LICENSING_SERVER_TOOLSET: pro
142-
UPMPVP_CONTEXT_WRENCH: 2.3.3.0
143+
UPMPVP_CONTEXT_WRENCH: 2.5.0.0
143144
metadata:
144145
Job Maintainers: '#rm-packageworks'
145-
Wrench: 2.3.3.0
146+
Wrench: 2.5.0.0
146147

147148
# Functional tests for dependents found in the latest 6000.0 manifest (Windows).
148149
preview_apv_-_6000_0_-_win10:
@@ -198,10 +199,10 @@ preview_apv_-_6000_0_-_win10:
198199
UNITY_LICENSING_SERVER_DELETE_NUL: 0
199200
UNITY_LICENSING_SERVER_DELETE_ULF: 0
200201
UNITY_LICENSING_SERVER_TOOLSET: pro
201-
UPMPVP_CONTEXT_WRENCH: 2.3.3.0
202+
UPMPVP_CONTEXT_WRENCH: 2.5.0.0
202203
metadata:
203204
Job Maintainers: '#rm-packageworks'
204-
Wrench: 2.3.3.0
205+
Wrench: 2.5.0.0
205206

206207
# Functional tests for dependents found in the latest 6000.3 manifest (MacOS).
207208
preview_apv_-_6000_3_-_macos13:
@@ -256,10 +257,10 @@ preview_apv_-_6000_3_-_macos13:
256257
UNITY_LICENSING_SERVER_DELETE_NUL: 0
257258
UNITY_LICENSING_SERVER_DELETE_ULF: 0
258259
UNITY_LICENSING_SERVER_TOOLSET: pro
259-
UPMPVP_CONTEXT_WRENCH: 2.3.3.0
260+
UPMPVP_CONTEXT_WRENCH: 2.5.0.0
260261
metadata:
261262
Job Maintainers: '#rm-packageworks'
262-
Wrench: 2.3.3.0
263+
Wrench: 2.5.0.0
263264

264265
# Functional tests for dependents found in the latest 6000.3 manifest (Ubuntu).
265266
preview_apv_-_6000_3_-_ubuntu2204:
@@ -314,10 +315,10 @@ preview_apv_-_6000_3_-_ubuntu2204:
314315
UNITY_LICENSING_SERVER_DELETE_NUL: 0
315316
UNITY_LICENSING_SERVER_DELETE_ULF: 0
316317
UNITY_LICENSING_SERVER_TOOLSET: pro
317-
UPMPVP_CONTEXT_WRENCH: 2.3.3.0
318+
UPMPVP_CONTEXT_WRENCH: 2.5.0.0
318319
metadata:
319320
Job Maintainers: '#rm-packageworks'
320-
Wrench: 2.3.3.0
321+
Wrench: 2.5.0.0
321322

322323
# Functional tests for dependents found in the latest 6000.3 manifest (Windows).
323324
preview_apv_-_6000_3_-_win10:
@@ -373,10 +374,10 @@ preview_apv_-_6000_3_-_win10:
373374
UNITY_LICENSING_SERVER_DELETE_NUL: 0
374375
UNITY_LICENSING_SERVER_DELETE_ULF: 0
375376
UNITY_LICENSING_SERVER_TOOLSET: pro
376-
UPMPVP_CONTEXT_WRENCH: 2.3.3.0
377+
UPMPVP_CONTEXT_WRENCH: 2.5.0.0
377378
metadata:
378379
Job Maintainers: '#rm-packageworks'
379-
Wrench: 2.3.3.0
380+
Wrench: 2.5.0.0
380381

381382
# Functional tests for dependents found in the latest 6000.4 manifest (MacOS).
382383
preview_apv_-_6000_4_-_macos13:
@@ -431,10 +432,10 @@ preview_apv_-_6000_4_-_macos13:
431432
UNITY_LICENSING_SERVER_DELETE_NUL: 0
432433
UNITY_LICENSING_SERVER_DELETE_ULF: 0
433434
UNITY_LICENSING_SERVER_TOOLSET: pro
434-
UPMPVP_CONTEXT_WRENCH: 2.3.3.0
435+
UPMPVP_CONTEXT_WRENCH: 2.5.0.0
435436
metadata:
436437
Job Maintainers: '#rm-packageworks'
437-
Wrench: 2.3.3.0
438+
Wrench: 2.5.0.0
438439

439440
# Functional tests for dependents found in the latest 6000.4 manifest (Ubuntu).
440441
preview_apv_-_6000_4_-_ubuntu2204:
@@ -489,10 +490,10 @@ preview_apv_-_6000_4_-_ubuntu2204:
489490
UNITY_LICENSING_SERVER_DELETE_NUL: 0
490491
UNITY_LICENSING_SERVER_DELETE_ULF: 0
491492
UNITY_LICENSING_SERVER_TOOLSET: pro
492-
UPMPVP_CONTEXT_WRENCH: 2.3.3.0
493+
UPMPVP_CONTEXT_WRENCH: 2.5.0.0
493494
metadata:
494495
Job Maintainers: '#rm-packageworks'
495-
Wrench: 2.3.3.0
496+
Wrench: 2.5.0.0
496497

497498
# Functional tests for dependents found in the latest 6000.4 manifest (Windows).
498499
preview_apv_-_6000_4_-_win10:
@@ -548,10 +549,10 @@ preview_apv_-_6000_4_-_win10:
548549
UNITY_LICENSING_SERVER_DELETE_NUL: 0
549550
UNITY_LICENSING_SERVER_DELETE_ULF: 0
550551
UNITY_LICENSING_SERVER_TOOLSET: pro
551-
UPMPVP_CONTEXT_WRENCH: 2.3.3.0
552+
UPMPVP_CONTEXT_WRENCH: 2.5.0.0
552553
metadata:
553554
Job Maintainers: '#rm-packageworks'
554-
Wrench: 2.3.3.0
555+
Wrench: 2.5.0.0
555556

556557
# Functional tests for dependents found in the latest 6000.5 manifest (MacOS).
557558
preview_apv_-_6000_5_-_macos13:
@@ -606,10 +607,10 @@ preview_apv_-_6000_5_-_macos13:
606607
UNITY_LICENSING_SERVER_DELETE_NUL: 0
607608
UNITY_LICENSING_SERVER_DELETE_ULF: 0
608609
UNITY_LICENSING_SERVER_TOOLSET: pro
609-
UPMPVP_CONTEXT_WRENCH: 2.3.3.0
610+
UPMPVP_CONTEXT_WRENCH: 2.5.0.0
610611
metadata:
611612
Job Maintainers: '#rm-packageworks'
612-
Wrench: 2.3.3.0
613+
Wrench: 2.5.0.0
613614

614615
# Functional tests for dependents found in the latest 6000.5 manifest (Ubuntu).
615616
preview_apv_-_6000_5_-_ubuntu2204:
@@ -664,10 +665,10 @@ preview_apv_-_6000_5_-_ubuntu2204:
664665
UNITY_LICENSING_SERVER_DELETE_NUL: 0
665666
UNITY_LICENSING_SERVER_DELETE_ULF: 0
666667
UNITY_LICENSING_SERVER_TOOLSET: pro
667-
UPMPVP_CONTEXT_WRENCH: 2.3.3.0
668+
UPMPVP_CONTEXT_WRENCH: 2.5.0.0
668669
metadata:
669670
Job Maintainers: '#rm-packageworks'
670-
Wrench: 2.3.3.0
671+
Wrench: 2.5.0.0
671672

672673
# Functional tests for dependents found in the latest 6000.5 manifest (Windows).
673674
preview_apv_-_6000_5_-_win10:
@@ -723,10 +724,10 @@ preview_apv_-_6000_5_-_win10:
723724
UNITY_LICENSING_SERVER_DELETE_NUL: 0
724725
UNITY_LICENSING_SERVER_DELETE_ULF: 0
725726
UNITY_LICENSING_SERVER_TOOLSET: pro
726-
UPMPVP_CONTEXT_WRENCH: 2.3.3.0
727+
UPMPVP_CONTEXT_WRENCH: 2.5.0.0
727728
metadata:
728729
Job Maintainers: '#rm-packageworks'
729-
Wrench: 2.3.3.0
730+
Wrench: 2.5.0.0
730731

731732
# Functional tests for dependents found in the latest 6000.6 manifest (MacOS).
732733
preview_apv_-_6000_6_-_macos13:
@@ -781,10 +782,10 @@ preview_apv_-_6000_6_-_macos13:
781782
UNITY_LICENSING_SERVER_DELETE_NUL: 0
782783
UNITY_LICENSING_SERVER_DELETE_ULF: 0
783784
UNITY_LICENSING_SERVER_TOOLSET: pro
784-
UPMPVP_CONTEXT_WRENCH: 2.3.3.0
785+
UPMPVP_CONTEXT_WRENCH: 2.5.0.0
785786
metadata:
786787
Job Maintainers: '#rm-packageworks'
787-
Wrench: 2.3.3.0
788+
Wrench: 2.5.0.0
788789

789790
# Functional tests for dependents found in the latest 6000.6 manifest (Ubuntu).
790791
preview_apv_-_6000_6_-_ubuntu2204:
@@ -839,10 +840,10 @@ preview_apv_-_6000_6_-_ubuntu2204:
839840
UNITY_LICENSING_SERVER_DELETE_NUL: 0
840841
UNITY_LICENSING_SERVER_DELETE_ULF: 0
841842
UNITY_LICENSING_SERVER_TOOLSET: pro
842-
UPMPVP_CONTEXT_WRENCH: 2.3.3.0
843+
UPMPVP_CONTEXT_WRENCH: 2.5.0.0
843844
metadata:
844845
Job Maintainers: '#rm-packageworks'
845-
Wrench: 2.3.3.0
846+
Wrench: 2.5.0.0
846847

847848
# Functional tests for dependents found in the latest 6000.6 manifest (Windows).
848849
preview_apv_-_6000_6_-_win10:
@@ -898,8 +899,8 @@ preview_apv_-_6000_6_-_win10:
898899
UNITY_LICENSING_SERVER_DELETE_NUL: 0
899900
UNITY_LICENSING_SERVER_DELETE_ULF: 0
900901
UNITY_LICENSING_SERVER_TOOLSET: pro
901-
UPMPVP_CONTEXT_WRENCH: 2.3.3.0
902+
UPMPVP_CONTEXT_WRENCH: 2.5.0.0
902903
metadata:
903904
Job Maintainers: '#rm-packageworks'
904-
Wrench: 2.3.3.0
905+
Wrench: 2.5.0.0
905906

‎.yamato/wrench/promotion-jobs.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
### Auto-generated by Recipe Engine, DO NOT EDIT. ###
44
### ###
55
#######################################################
6+
# Source: RecipeEngine.Modules.Wrench.Recipes.PromotionJobs
67
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
78

89
# Publish Dry Run for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
@@ -182,10 +183,10 @@ publish_dry_run_netcode_gameobjects:
182183
unzip: true
183184
variables:
184185
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
185-
UPMPVP_CONTEXT_WRENCH: 2.3.3.0
186+
UPMPVP_CONTEXT_WRENCH: 2.5.0.0
186187
metadata:
187188
Job Maintainers: '#rm-packageworks'
188-
Wrench: 2.3.3.0
189+
Wrench: 2.5.0.0
189190

190191
# Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
191192
publish_netcode_gameobjects:
@@ -364,8 +365,8 @@ publish_netcode_gameobjects:
364365
unzip: true
365366
variables:
366367
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
367-
UPMPVP_CONTEXT_WRENCH: 2.3.3.0
368+
UPMPVP_CONTEXT_WRENCH: 2.5.0.0
368369
metadata:
369370
Job Maintainers: '#rm-packageworks'
370-
Wrench: 2.3.3.0
371+
Wrench: 2.5.0.0
371372

‎.yamato/wrench/publish-trigger.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
### Auto-generated by Recipe Engine, DO NOT EDIT. ###
44
### ###
55
#######################################################
6+
# Source: RecipeEngine.Modules.Wrench.Recipes.PublishTrigger
67
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
78
all_promotion_related_jobs_promotiontrigger:
89
name: All Promotion Related Jobs PromotionTrigger

‎.yamato/wrench/recipe-regeneration.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
### Auto-generated by Recipe Engine, DO NOT EDIT. ###
44
### ###
55
#######################################################
6+
# Source: RecipeEngine.Modules.Wrench.Recipes.RecipeRegeneration
67
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
78

89
# Test that Generated Wrench Jobs are up to date.
@@ -30,5 +31,5 @@ test_-_wrench_jobs_up_to_date:
3031
cancel_old_ci: true
3132
metadata:
3233
Job Maintainers: '#rm-packageworks'
33-
Wrench: 2.3.3.0
34+
Wrench: 2.5.0.0
3435

0 commit comments

Comments
 (0)