Skip to content

chore: merge develop 2.0.0 - post unified merge#4025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NoelStephensUnity merged 17 commits into from
Jun 10, 2026
Merged

chore: merge develop 2.0.0 - post unified merge #4025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
cfa5789
fix: Improved OnValueChanged door example (#3959)
NoelStephensUnity May 11, 2026
8851038
ci: Update of CI dependencies and test fixes (#3970)
michalChrobot May 12, 2026
d6e96d6
fix: UniversalRpcTests failing when using IL2CPP backend (#3973)
NoelStephensUnity May 13, 2026
2943643
feat: Make custom driver construction smoother (#3980)
simon-lemay-unity May 14, 2026
5d6a3c7
chore: Change codeowners for UTP (#3982)
simon-lemay-unity May 15, 2026
75c36f4
chore: Add obsolete warnings to unused or invalid methods (#3987)
EmandM May 21, 2026
6141740
chore: Updated aspects of Netcode package in anticipation of v2.12.0 …
svc-netcode-sdk May 27, 2026
7c992c2
chore: Replace IsSceneObject with InScenePlaced bool (#4000)
EmandM May 29, 2026
0a56f44
fix: Add more detailed logging around RPC messages (#3994)
EmandM May 29, 2026
7d03b41
refactor: Logging update (#4002)
noellie-velez Jun 1, 2026
c48f54d
fix: reset static fields for Fast Enter Play Mode (#3956)
noellie-velez Jun 1, 2026
7fd6ab9
fix: end TransportConnect profiler marker on early returns in Connect…
mnachury-unity Jun 2, 2026
8c78fc3
refactor: NetworkAnimator cleanup and code quality improvements (#4001)
noellie-velez Jun 5, 2026
67e3e1c
chore: replace DEVELOPMENT_BUILD || UNITY_EDITOR with DEBUG (#4006)
NoelStephensUnity Jun 9, 2026
7a8fd72
Merge branch 'develop-2.0.0' into chore/merge-develop-2.0.0/post-unif…
NoelStephensUnity Jun 9, 2026
a3334d8
update
NoelStephensUnity Jun 9, 2026
6c4d326
update
NoelStephensUnity Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,4 +10,4 @@ AssemblyInfo.cs @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
.github/ @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
.yamato/ @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
com.unity.netcode.gameobjects/Documentation*/ @jabbacakes
com.unity.netcode.gameobjects/Runtime/Transports/UTP/ @Unity-Technologies/multiplayer-workflows
com.unity.netcode.gameobjects/Runtime/Transports/UTP/ @simon-lemay-unity
2 changes: 1 addition & 1 deletion .yamato/package-pack.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ package_pack_-_ngo_{{ platform.name }}:
{% endif %}
timeout: 0.25
variables:
XRAY_PROFILE: "gold ./pvpExceptions.json"
XRAY_PROFILE: "gold ./pvpExceptions.json rme"
commands:
- upm-pvp pack "com.unity.netcode.gameobjects" --output upm-ci~/packages
- upm-pvp xray --packages "upm-ci~/packages/com.unity.netcode.gameobjects*.tgz" --results pvp-results
Expand Down
2 changes: 1 addition & 1 deletion .yamato/package-tests.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ package_test_-_ngo_{{ editor }}_{{ platform.name }}:
model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
{% endif %}
variables:
XRAY_PROFILE: "gold ./pvpExceptions.json"
XRAY_PROFILE: "gold ./pvpExceptions.json rme"
UNITY_EXT_LOGGING: 1
commands:
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models.
Expand Down
14 changes: 7 additions & 7 deletions .yamato/project.metafile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@
small_agent_platform:
- name: ubuntu
type: Unity::VM
image: package-ci/ubuntu-22.04:v4.83.0
image: package-ci/ubuntu-22.04:v4.85.0
flavor: b1.small


Expand All@@ -39,15 +39,15 @@ test_platforms:
default:
- name: ubuntu
type: Unity::VM
image: package-ci/ubuntu-22.04:v4.83.0
image: package-ci/ubuntu-22.04:v4.85.0
flavor: b1.large
standalone: StandaloneLinux64
desktop:
- name: ubuntu
type: Unity::VM
image: package-ci/ubuntu-22.04:v4.83.0
image: package-ci/ubuntu-22.04:v4.85.0
flavor: b1.large
smaller_flavor: b1.medium
smaller_flavor: b1.large
larger_flavor: b1.xlarge
standalone: StandaloneLinux64
- name: win
Expand DownExpand Up@@ -180,10 +180,10 @@ validation_editors:
- 6000.4
- 6000.5
- trunk
- a4ce83e807ca9aff8394d1cc07341168dc49df03
- f1298548e194f35ff7dfa6fee699d4464ab3919c
minimal:
- 6000.3
pinnedTrunk: a4ce83e807ca9aff8394d1cc07341168dc49df03
- 6000.0
pinnedTrunk: f1298548e194f35ff7dfa6fee699d4464ab3919c


# Scripting backends used by Standalone RunTimeTests---------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions .yamato/wrench/api-validation-jobs.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,8 +60,8 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_win10:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_CONTEXT_WRENCH: 2.7.0.0
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.7.0.0
Wrench: 2.9.0.0

2 changes: 1 addition & 1 deletion .yamato/wrench/package-pack-jobs.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,5 +29,5 @@ package_pack_-_netcode_gameobjects:
UPMCI_ACK_LARGE_PACKAGE: 1
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.7.0.0
Wrench: 2.9.0.0

62 changes: 31 additions & 31 deletions .yamato/wrench/preview-a-p-v.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ all_preview_apv_jobs:
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_6_-_win10
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.7.0.0
Wrench: 2.9.0.0

# Functional tests for dependents found in the latest 6000.0 manifest (MacOS).
preview_apv_-_6000_0_-_macos13:
Expand DownExpand Up@@ -82,10 +82,10 @@ preview_apv_-_6000_0_-_macos13:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_CONTEXT_WRENCH: 2.7.0.0
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.7.0.0
Wrench: 2.9.0.0

# Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu).
preview_apv_-_6000_0_-_ubuntu2204:
Expand DownExpand Up@@ -140,10 +140,10 @@ preview_apv_-_6000_0_-_ubuntu2204:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_CONTEXT_WRENCH: 2.7.0.0
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.7.0.0
Wrench: 2.9.0.0

# Functional tests for dependents found in the latest 6000.0 manifest (Windows).
preview_apv_-_6000_0_-_win10:
Expand DownExpand Up@@ -199,10 +199,10 @@ preview_apv_-_6000_0_-_win10:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_CONTEXT_WRENCH: 2.7.0.0
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.7.0.0
Wrench: 2.9.0.0

# Functional tests for dependents found in the latest 6000.3 manifest (MacOS).
preview_apv_-_6000_3_-_macos13:
Expand DownExpand Up@@ -257,10 +257,10 @@ preview_apv_-_6000_3_-_macos13:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_CONTEXT_WRENCH: 2.7.0.0
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.7.0.0
Wrench: 2.9.0.0

# Functional tests for dependents found in the latest 6000.3 manifest (Ubuntu).
preview_apv_-_6000_3_-_ubuntu2204:
Expand DownExpand Up@@ -315,10 +315,10 @@ preview_apv_-_6000_3_-_ubuntu2204:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_CONTEXT_WRENCH: 2.7.0.0
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.7.0.0
Wrench: 2.9.0.0

# Functional tests for dependents found in the latest 6000.3 manifest (Windows).
preview_apv_-_6000_3_-_win10:
Expand DownExpand Up@@ -374,10 +374,10 @@ preview_apv_-_6000_3_-_win10:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_CONTEXT_WRENCH: 2.7.0.0
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.7.0.0
Wrench: 2.9.0.0

# Functional tests for dependents found in the latest 6000.4 manifest (MacOS).
preview_apv_-_6000_4_-_macos13:
Expand DownExpand Up@@ -432,10 +432,10 @@ preview_apv_-_6000_4_-_macos13:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_CONTEXT_WRENCH: 2.7.0.0
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.7.0.0
Wrench: 2.9.0.0

# Functional tests for dependents found in the latest 6000.4 manifest (Ubuntu).
preview_apv_-_6000_4_-_ubuntu2204:
Expand DownExpand Up@@ -490,10 +490,10 @@ preview_apv_-_6000_4_-_ubuntu2204:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_CONTEXT_WRENCH: 2.7.0.0
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.7.0.0
Wrench: 2.9.0.0

# Functional tests for dependents found in the latest 6000.4 manifest (Windows).
preview_apv_-_6000_4_-_win10:
Expand DownExpand Up@@ -549,10 +549,10 @@ preview_apv_-_6000_4_-_win10:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_CONTEXT_WRENCH: 2.7.0.0
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.7.0.0
Wrench: 2.9.0.0

# Functional tests for dependents found in the latest 6000.5 manifest (MacOS).
preview_apv_-_6000_5_-_macos13:
Expand DownExpand Up@@ -607,10 +607,10 @@ preview_apv_-_6000_5_-_macos13:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_CONTEXT_WRENCH: 2.7.0.0
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.7.0.0
Wrench: 2.9.0.0

# Functional tests for dependents found in the latest 6000.5 manifest (Ubuntu).
preview_apv_-_6000_5_-_ubuntu2204:
Expand DownExpand Up@@ -665,10 +665,10 @@ preview_apv_-_6000_5_-_ubuntu2204:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_CONTEXT_WRENCH: 2.7.0.0
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.7.0.0
Wrench: 2.9.0.0

# Functional tests for dependents found in the latest 6000.5 manifest (Windows).
preview_apv_-_6000_5_-_win10:
Expand DownExpand Up@@ -724,10 +724,10 @@ preview_apv_-_6000_5_-_win10:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_CONTEXT_WRENCH: 2.7.0.0
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.7.0.0
Wrench: 2.9.0.0

# Functional tests for dependents found in the latest 6000.6 manifest (MacOS).
preview_apv_-_6000_6_-_macos13:
Expand DownExpand Up@@ -782,10 +782,10 @@ preview_apv_-_6000_6_-_macos13:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_CONTEXT_WRENCH: 2.7.0.0
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.7.0.0
Wrench: 2.9.0.0

# Functional tests for dependents found in the latest 6000.6 manifest (Ubuntu).
preview_apv_-_6000_6_-_ubuntu2204:
Expand DownExpand Up@@ -840,10 +840,10 @@ preview_apv_-_6000_6_-_ubuntu2204:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_CONTEXT_WRENCH: 2.7.0.0
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.7.0.0
Wrench: 2.9.0.0

# Functional tests for dependents found in the latest 6000.6 manifest (Windows).
preview_apv_-_6000_6_-_win10:
Expand DownExpand Up@@ -899,8 +899,8 @@ preview_apv_-_6000_6_-_win10:
UNITY_LICENSING_SERVER_DELETE_NUL: 0
UNITY_LICENSING_SERVER_DELETE_ULF: 0
UNITY_LICENSING_SERVER_TOOLSET: pro
UPMPVP_CONTEXT_WRENCH: 2.7.0.0
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.7.0.0
Wrench: 2.9.0.0

9 changes: 5 additions & 4 deletions .yamato/wrench/promotion-jobs.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -183,10 +183,10 @@ publish_dry_run_netcode_gameobjects:
unzip: true
variables:
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
UPMPVP_CONTEXT_WRENCH: 2.7.0.0
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.7.0.0
Wrench: 2.9.0.0

# Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
publish_netcode_gameobjects:
Expand DownExpand Up@@ -365,8 +365,9 @@ publish_netcode_gameobjects:
unzip: true
variables:
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
UPMPVP_CONTEXT_WRENCH: 2.7.0.0
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
allow_on: branch match "^release/.*"
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.7.0.0
Wrench: 2.9.0.0

2 changes: 1 addition & 1 deletion .yamato/wrench/recipe-regeneration.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,5 +31,5 @@ test_-_wrench_jobs_up_to_date:
cancel_old_ci: true
metadata:
Job Maintainers: '#rm-packageworks'
Wrench: 2.7.0.0
Wrench: 2.9.0.0

Loading