chore: merge develop 2x into 2 6 0 fixes networkmanager#3718
Closed
NoelStephensUnity wants to merge 5 commits intorelease/2.6.0from
Closed
chore: merge develop 2x into 2 6 0 fixes networkmanager#3718NoelStephensUnity wants to merge 5 commits intorelease/2.6.0from
NoelStephensUnity wants to merge 5 commits intorelease/2.6.0from
Conversation
* chore: Update NetworkSceneManagerEventNotifications to work with CMB service * chore: Small yamato tweaks to try speed up our PR trigger runs * re-add the dependency on in * Ensure CMB Service tests are running on nightly and weekly jobs * Re-add update to project-tests * Swap --clean-library-on-rerun to --clean-library to see if that'll allow us to only rerun failed tests * Force NetworkSceneManagerEventNotifications to fail to test rerun behaviour * Run the lighter dotnet standards check first, before running the heavier unity standards check * Remove empty folder and use correct pvp argument * See if standards check requires the editor * package_pack runs faster than vetting_test or standards_check. Define it last so the other two are earlier in the VM queue * Put project_pack back to upm-ci * Try running the vetting test on a smaller vm * move vetting_test out of quick_initial_checks * Add run_quick_checks to desktop_standalone dependencies * I think project_pack does nothing?? * Remove --clean-library from any test runs * try swapping reruncount to retry * Remove --clean-library from project_tests * Separate editor and playmode tests * try something else * Use the working retry syntax * Remove runtime tests from project_tests and package_tests to test the standalone and cmb retry functionality * Try --clean-library-on-rerun * Put back --clean-library-on-rerun * completely delete project-pack * Revert failure in HelpUrlTests * PR feedback * Put Vetting Test back onto a smaller machine * Add shared settings in project.metafile and use them * Add note about difference between project_pack and package_pack * Small argument and comment corrections Re-added reruncount argument to build jobs Updated some comments Set CMB tests to both Playmode and Editmode * Reverted --suite=editor param from cmb tests since those are being run in player --------- Co-authored-by: michal-chrobot <michal.chrobot@unity3d.com>
* chore: Optimize NetworkBehaviour.NetworkManager property * ensure internal state is completely reset on behaviour despawn * Fix tests * Ensure NetworkManagerOwner is always correctly set * Update tests to explicitly set NetworkManagerOwner * Fix InstantiateAndSpawn * fixes * Hide error for now * Put error back and fix timetravel * try things * Fix onStartSweep * put back changed test code * Remove unneeded changes * Simplify changes * Put back needed change * Set NetworkManager in InstantiateAnd Spawn * Check for IsSpawned on despawn * Add recreating test * Clean up test helpers some * Fix the DistributedAuthorityCodecTests --------- Co-authored-by: Unity Netcode CI <74025435+netcode-ci-service@users.noreply.github.com>
…ixes-networkmanager
…ixes-networkmanager
|
|
auto-merge was automatically disabled
October 15, 2025 16:02
Pull request was closed
NoelStephensUnity
deleted the
chore/merge-develop-2x-into-2-6-0-fixes-networkmanager
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Purpose of this PR
Merging fixes to issues found during play test.
Jira ticket
N/A
Changelog
N/A
Documentation
Testing & QA (How your changes can be verified during release Playtest)
Functional Testing
Manual testing :
Manual testing doneAutomated tests:
Covered by existing automated testsDoes the change require QA team to:
Review automated tests?Execute manual tests?Provide feedback about the PR?If any boxes above are checked the QA team will be automatically added as a PR reviewer.
Backports
This requires no back port.