Skip to content

Commit 9bec5ba

Browse files
NoelStephensUnityEmandM
NoelStephensUnity
and
EmandM
authored
chore: merge 2.7.0 release fixes back (#3769)
* Merge branch 'release/2.7.0' of https://github.com/Unity-Technologies/com.unity.netcode.gameobjects into release/2.7.0 * fix - revert Reverting changes made in 3664 with the time used when interpolating to local time. Added additional comments to prevent future fiddling with that (whether to use local or server time). * fix: Compilation error when using an RpcAttribute with RequireOwnership (#3750) * fix: clear DisconnectReason on server-side disconnect client (#3751) * fix Reset the disconnect reason when the server-side is disconnecting a client. * test Updating the disconnect test to validate that the disconnect reason is reset when a server force disconnects a client. * fix: Disabled Networkbehaviours are not excluded from NetworkObject.ChildNetworkBehaviours (#3756) * fix This resolves the issue where a disabled NetworkBehaviour was being included in the ChildNetworkBehaviours list which would cause an exception upon a client attempting to synchronize. * update Adding a warning generation method to make testing easier. * test Modifying the original test for this to assure it checks for the correct error message. * test - refactor Adding a bit more coverage to the `ValidatedDisableddNetworkBehaviourWarning` test so it validates that when either a child GameObject is set inactive or the NetworkBehaviiour itself is disabled the warning message is generated and the network prefab still spawns and synchronizes. * fix: disconnect reason should not duplicate any information (#3757) * fix Fixing issue with duplicated disconnect reasons for all cases. * test - update Making adjustments to the validation logic checking to determine if a server's disconnect reason is included in the NetworkManager.DisconnectReaon property. * style Removing a trailing whitespace * test - update One more area that needs to check for the server reason but not be a 1:1 due to the additional disconnect information before it. * fix: disabled NetworkBehaviours vs disabled GameObjects and tests excluded by lack of MP tools (#3761) * fix Use the GameObject.activeInHierarchy fix. Allow disabled NetworkBehaviour with a disabled GameObject to internally start pre-spawn but exit before invoking protected method. * test - update Re-factoring this test to align with the previously committed fix. * tests - enable Now that we have included the Mutliplayer Tools package in the test project, we needed to remove the !MULTIPLAYER_TOOLS check to assure these tests are actually being run. * fix: Ensure DisconnectReason remains parsable (#3766) * fix: NetworkAnimator initialization sequencing (#3767) * fix: NetworkAnimator initialization sequencing * Update changelog * fix: 2.7.0 test instabilities (#3768) * test - fix Resolving the PeerDisconnectCallbackTests instability where sometimes the disconnect notification is processed prior to the targeted client's NetworkManager having completely disconnected and shutdown (this would only have a chance of happening if server disconnects the client). Hoping to resolve the instability with the ParentingInSceneObjectsTests resulting in a false failure. * test fix Fixing potential cause for instabilities on this set of tests due to the initial network prefab transform settings not being applied to the prefab but applied to the spawned instances which could be causing issues since they were being applied to the non-authority instances. This fix moves the applied test NetworkTrransform settings to the player prefab prior to spawning any instances. --------- Co-authored-by: Emma <emma.mcmillan@unity3d.com>
1 parent a5005c3 commit 9bec5ba

26 files changed

+602
-115
lines changed

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

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -839,3 +839,166 @@ preview_apv_-_6000_5_-_windows:
839839
Job Maintainers: '#rm-packageworks'
840840
Wrench: 1.3.0.0
841841

842+
# Functional tests for dependents found in the latest 6000.5 manifest (MacOS).
843+
preview_apv_-_6000_5_-_macos:
844+
name: Preview APV - 6000.5 - macos
845+
agent:
846+
image: package-ci/macos-13:default
847+
type: Unity::VM::osx
848+
flavor: b1.xlarge
849+
commands:
850+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
851+
- command: 7z x -aoa wrench-localapv.zip
852+
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
853+
- command: python PythonScripts/print_machine_info.py
854+
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
855+
timeout: 20
856+
retries: 10
857+
- command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
858+
timeout: 10
859+
retries: 3
860+
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
861+
- command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
862+
after:
863+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
864+
artifacts:
865+
Crash Dumps:
866+
paths:
867+
- CrashDumps/**
868+
logs:
869+
paths:
870+
- '*.log'
871+
- '*.xml'
872+
- upm-ci~/test-results/**/*
873+
- upm-ci~/temp/*/Logs/**
874+
- upm-ci~/temp/*/Library/*.log
875+
- upm-ci~/temp/*/*.log
876+
- upm-ci~/temp/Builds/*.log
877+
packages:
878+
paths:
879+
- upm-ci~/packages/**/*
880+
PreviewAPVResults:
881+
paths:
882+
- PreviewApvArtifacts~/**
883+
- APVTest/**/manifest.json
884+
pvp-results:
885+
paths:
886+
- upm-ci~/pvp/**/*
887+
browsable: onDemand
888+
dependencies:
889+
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
890+
variables:
891+
UPMPVP_CONTEXT_WRENCH: 1.2.0.0
892+
metadata:
893+
Job Maintainers: '#rm-packageworks'
894+
Wrench: 1.2.0.0
895+
896+
# Functional tests for dependents found in the latest 6000.5 manifest (Ubuntu).
897+
preview_apv_-_6000_5_-_ubuntu:
898+
name: Preview APV - 6000.5 - ubuntu
899+
agent:
900+
image: package-ci/ubuntu-22.04:v4
901+
type: Unity::VM
902+
flavor: b1.large
903+
commands:
904+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
905+
- command: 7z x -aoa wrench-localapv.zip
906+
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
907+
- command: python PythonScripts/print_machine_info.py
908+
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
909+
timeout: 20
910+
retries: 10
911+
- command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
912+
timeout: 10
913+
retries: 3
914+
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
915+
- command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
916+
after:
917+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
918+
artifacts:
919+
Crash Dumps:
920+
paths:
921+
- CrashDumps/**
922+
logs:
923+
paths:
924+
- '*.log'
925+
- '*.xml'
926+
- upm-ci~/test-results/**/*
927+
- upm-ci~/temp/*/Logs/**
928+
- upm-ci~/temp/*/Library/*.log
929+
- upm-ci~/temp/*/*.log
930+
- upm-ci~/temp/Builds/*.log
931+
packages:
932+
paths:
933+
- upm-ci~/packages/**/*
934+
PreviewAPVResults:
935+
paths:
936+
- PreviewApvArtifacts~/**
937+
- APVTest/**/manifest.json
938+
pvp-results:
939+
paths:
940+
- upm-ci~/pvp/**/*
941+
browsable: onDemand
942+
dependencies:
943+
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
944+
variables:
945+
UPMPVP_CONTEXT_WRENCH: 1.2.0.0
946+
metadata:
947+
Job Maintainers: '#rm-packageworks'
948+
Wrench: 1.2.0.0
949+
950+
# Functional tests for dependents found in the latest 6000.5 manifest (Windows).
951+
preview_apv_-_6000_5_-_windows:
952+
name: Preview APV - 6000.5 - windows
953+
agent:
954+
image: package-ci/win10:default
955+
type: Unity::VM
956+
flavor: b1.large
957+
commands:
958+
- command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f
959+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
960+
- command: 7z x -aoa wrench-localapv.zip
961+
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
962+
- command: python PythonScripts/print_machine_info.py
963+
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
964+
timeout: 20
965+
retries: 10
966+
- command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
967+
timeout: 10
968+
retries: 3
969+
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.5 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
970+
- command: python PythonScripts/editor_manifest_validator.py --version=6000.5 --wrench-config=.yamato/wrench/wrench_config.json
971+
after:
972+
- command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
973+
artifacts:
974+
Crash Dumps:
975+
paths:
976+
- CrashDumps/**
977+
logs:
978+
paths:
979+
- '*.log'
980+
- '*.xml'
981+
- upm-ci~/test-results/**/*
982+
- upm-ci~/temp/*/Logs/**
983+
- upm-ci~/temp/*/Library/*.log
984+
- upm-ci~/temp/*/*.log
985+
- upm-ci~/temp/Builds/*.log
986+
packages:
987+
paths:
988+
- upm-ci~/packages/**/*
989+
PreviewAPVResults:
990+
paths:
991+
- PreviewApvArtifacts~/**
992+
- APVTest/**/manifest.json
993+
pvp-results:
994+
paths:
995+
- upm-ci~/pvp/**/*
996+
browsable: onDemand
997+
dependencies:
998+
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
999+
variables:
1000+
UPMPVP_CONTEXT_WRENCH: 1.2.0.0
1001+
metadata:
1002+
Job Maintainers: '#rm-packageworks'
1003+
Wrench: 1.2.0.0
1004+

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

Lines changed: 198 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,204 @@ validate_-_netcode_gameobjects_-_6000_4_-_windows:
742742
- command: unity-downloader-cli -u 6000.4/staging -c editor --path .Editor --fast
743743
timeout: 10
744744
retries: 3
745+
- command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects" --unity .Editor
746+
timeout: 10
747+
retries: 1
748+
- command: echo No internal packages to add.
749+
- command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
750+
timeout: 40
751+
retries: 0
752+
- command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
753+
timeout: 5
754+
retries: 0
755+
- command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
756+
timeout: 10
757+
retries: 0
758+
- command: 'UnifiedTestRunner.exe --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
759+
timeout: 40
760+
retries: 1
761+
after:
762+
- command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
763+
artifacts:
764+
Crash Dumps:
765+
paths:
766+
- CrashDumps/**
767+
packages:
768+
paths:
769+
- upm-ci~/packages/**/*
770+
pvp-results:
771+
paths:
772+
- upm-ci~/pvp/**/*
773+
browsable: onDemand
774+
UTR:
775+
paths:
776+
- '*.log'
777+
- '*.xml'
778+
- artifacts/**/*
779+
- testproject/Logs/**
780+
- testproject/Library/*.log
781+
- testproject/*.log
782+
- testproject/Builds/*.log
783+
- build/test-results/**
784+
browsable: onDemand
785+
dependencies:
786+
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
787+
variables:
788+
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
789+
UPMPVP_CONTEXT_WRENCH: 1.2.0.0
790+
metadata:
791+
Job Maintainers: '#rm-packageworks'
792+
Wrench: 1.2.0.0
793+
labels:
794+
- Packages:netcode.gameobjects
795+
796+
# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.5 - macos (6000.5 - MacOS).
797+
validate_-_netcode_gameobjects_-_6000_5_-_macos:
798+
name: Validate - netcode.gameobjects - 6000.5 - macos
799+
agent:
800+
image: package-ci/macos-13:default
801+
type: Unity::VM::osx
802+
flavor: b1.xlarge
803+
commands:
804+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
805+
- command: 7z x -aoa wrench-localapv.zip
806+
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
807+
- command: python PythonScripts/print_machine_info.py
808+
- command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
809+
timeout: 10
810+
retries: 3
811+
- command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects" --unity .Editor
812+
timeout: 10
813+
retries: 1
814+
- command: echo No internal packages to add.
815+
- command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
816+
timeout: 40
817+
retries: 0
818+
- command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
819+
timeout: 5
820+
retries: 0
821+
- command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
822+
timeout: 10
823+
retries: 0
824+
- command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
825+
timeout: 40
826+
retries: 1
827+
after:
828+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
829+
artifacts:
830+
Crash Dumps:
831+
paths:
832+
- CrashDumps/**
833+
packages:
834+
paths:
835+
- upm-ci~/packages/**/*
836+
pvp-results:
837+
paths:
838+
- upm-ci~/pvp/**/*
839+
browsable: onDemand
840+
UTR:
841+
paths:
842+
- '*.log'
843+
- '*.xml'
844+
- artifacts/**/*
845+
- testproject/Logs/**
846+
- testproject/Library/*.log
847+
- testproject/*.log
848+
- testproject/Builds/*.log
849+
- build/test-results/**
850+
browsable: onDemand
851+
dependencies:
852+
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
853+
variables:
854+
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
855+
UPMPVP_CONTEXT_WRENCH: 1.2.0.0
856+
metadata:
857+
Job Maintainers: '#rm-packageworks'
858+
Wrench: 1.2.0.0
859+
labels:
860+
- Packages:netcode.gameobjects
861+
862+
# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.5 - ubuntu (6000.5 - Ubuntu).
863+
validate_-_netcode_gameobjects_-_6000_5_-_ubuntu:
864+
name: Validate - netcode.gameobjects - 6000.5 - ubuntu
865+
agent:
866+
image: package-ci/ubuntu-22.04:v4
867+
type: Unity::VM
868+
flavor: b1.large
869+
commands:
870+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
871+
- command: 7z x -aoa wrench-localapv.zip
872+
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
873+
- command: python PythonScripts/print_machine_info.py
874+
- command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
875+
timeout: 10
876+
retries: 3
877+
- command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects" --unity .Editor
878+
timeout: 10
879+
retries: 1
880+
- command: echo No internal packages to add.
881+
- command: upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --results upm-ci~/pvp
882+
timeout: 40
883+
retries: 0
884+
- command: upm-pvp require "pkgprom-promote -PVP-29-2 rme" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
885+
timeout: 5
886+
retries: 0
887+
- command: upm-pvp require "rme PVP-160-1 supported" --results upm-ci~/pvp --exemptions upm-ci~/pvp/failures.json
888+
timeout: 10
889+
retries: 0
890+
- command: 'UnifiedTestRunner --testproject=testproject --editor-location=.Editor --clean-library --reruncount=1 --clean-library-on-rerun --artifacts-path=artifacts --suite=Editor --suite=Playmode "--ff={ops.upmpvpevidence.enable=true}" '
891+
timeout: 40
892+
retries: 1
893+
after:
894+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
895+
artifacts:
896+
Crash Dumps:
897+
paths:
898+
- CrashDumps/**
899+
packages:
900+
paths:
901+
- upm-ci~/packages/**/*
902+
pvp-results:
903+
paths:
904+
- upm-ci~/pvp/**/*
905+
browsable: onDemand
906+
UTR:
907+
paths:
908+
- '*.log'
909+
- '*.xml'
910+
- artifacts/**/*
911+
- testproject/Logs/**
912+
- testproject/Library/*.log
913+
- testproject/*.log
914+
- testproject/Builds/*.log
915+
- build/test-results/**
916+
browsable: onDemand
917+
dependencies:
918+
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
919+
variables:
920+
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
921+
UPMPVP_CONTEXT_WRENCH: 1.2.0.0
922+
metadata:
923+
Job Maintainers: '#rm-packageworks'
924+
Wrench: 1.2.0.0
925+
labels:
926+
- Packages:netcode.gameobjects
927+
928+
# PVP Editor and Playmode tests for Validate - netcode.gameobjects - 6000.5 - windows (6000.5 - Windows).
929+
validate_-_netcode_gameobjects_-_6000_5_-_windows:
930+
name: Validate - netcode.gameobjects - 6000.5 - windows
931+
agent:
932+
image: package-ci/win10:default
933+
type: Unity::VM
934+
flavor: b1.large
935+
commands:
936+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
937+
- command: 7z x -aoa wrench-localapv.zip
938+
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
939+
- command: python PythonScripts/print_machine_info.py
940+
- command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
941+
timeout: 10
942+
retries: 3
745943
- command: upm-pvp create-test-project testproject --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects com.unity.netcode.gameobjects.tests" --unity .Editor
746944
timeout: 10
747945
retries: 1

‎com.unity.netcode.gameobjects/CHANGELOG.md‎

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

6161
### Fixed
6262

63+
- Initialization errors with NetworkAnimator. (#3767)
6364
- Multiple disconnect events from the same transport will no longer disconnect the host. (#3707)
6465
- Fixed NetworkTransform state synchronization issue when `NetworkTransform.SwitchTransformSpaceWhenParented` is enabled and the associated NetworkObject is parented multiple times in a single frame or within a couple of frames. (#3664)
6566
- Fixed issue when spawning, parenting, and immediately re-parenting when `NetworkTransform.SwitchTransformSpaceWhenParented` is enabled. (#3664)

0 commit comments

Comments
 (0)