From f5f8f753070057f994a789d9dc39357385114acd Mon Sep 17 00:00:00 2001 From: michal-chrobot Date: Mon, 3 Nov 2025 11:55:07 +0100 Subject: [PATCH 1/6] Initial change for PR creation --- .yamato/_run-all.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.yamato/_run-all.yml b/.yamato/_run-all.yml index 4eda4fb597..30c2089f1c 100644 --- a/.yamato/_run-all.yml +++ b/.yamato/_run-all.yml @@ -10,6 +10,7 @@ #----------------------------------------------------------------------------------- + # This job runs the fastest checks (PVP and code standards) # This is mainly used to quickly validate the easy mistakes before for example running PR trigger jobs (see _triggers.yml) run_quick_checks: From d91b7d2a24efb6085da97ea6d053b8001539459b Mon Sep 17 00:00:00 2001 From: Noel Stephens Date: Mon, 3 Nov 2025 12:33:36 -0600 Subject: [PATCH 2/6] fix Compilation error due to the changed return value of ClientIdToTransportId. --- .../Runtime/Transports/UTP/UnityTransport.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs index fddb41addd..c3ca650418 100644 --- a/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs +++ b/com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs @@ -1048,7 +1048,10 @@ private void ExtractNetworkMetrics() continue; } var transportClientId = NetworkManager.ConnectionManager.ClientIdToTransportId(ngoConnectionId); - ExtractNetworkMetricsForClient(transportClientId); + if (transportClientId.Item2) + { + ExtractNetworkMetricsForClient(transportClientId.Item1); + } } } else From 1de01424387c9d9bfc84b946ec1a934977da4b00 Mon Sep 17 00:00:00 2001 From: michal-chrobot Date: Tue, 4 Nov 2025 12:01:42 +0100 Subject: [PATCH 3/6] fix Moving the mid-test #endif and moving it to the bottom. --- .../Tests/Runtime/NetworkVariableTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTests.cs index 9cb68417ff..1709d9c294 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTests.cs +++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTests.cs @@ -5665,3 +5665,4 @@ public IEnumerator ModifyNetworkVariableOrListOnNetworkDespawn() } } } +#endif From 9cccd8e46dfc1f22ba8a3aaa66ad4b95d1cba451 Mon Sep 17 00:00:00 2001 From: michal-chrobot Date: Tue, 4 Nov 2025 12:28:27 +0100 Subject: [PATCH 4/6] Revert "fix" This reverts commit 1de01424387c9d9bfc84b946ec1a934977da4b00. --- .../Tests/Runtime/NetworkVariableTests.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTests.cs b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTests.cs index 1709d9c294..9cb68417ff 100644 --- a/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTests.cs +++ b/com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariableTests.cs @@ -5665,4 +5665,3 @@ public IEnumerator ModifyNetworkVariableOrListOnNetworkDespawn() } } } -#endif From 69fa3d41a2671504cccee64aee124d906a435549 Mon Sep 17 00:00:00 2001 From: michal-chrobot Date: Tue, 4 Nov 2025 12:37:04 +0100 Subject: [PATCH 5/6] Corrected docs helper URLs --- com.unity.netcode.gameobjects/Runtime/HelpUrls.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/com.unity.netcode.gameobjects/Runtime/HelpUrls.cs b/com.unity.netcode.gameobjects/Runtime/HelpUrls.cs index 6362d7f6f1..2cd79c4fee 100644 --- a/com.unity.netcode.gameobjects/Runtime/HelpUrls.cs +++ b/com.unity.netcode.gameobjects/Runtime/HelpUrls.cs @@ -10,8 +10,8 @@ internal static class HelpUrls public const string NetworkManager = k_BaseManualUrl + "components/core/networkmanager.html"; public const string NetworkObject = k_BaseManualUrl + "components/core/networkobject.html"; public const string NetworkAnimator = k_BaseManualUrl + "components/helper/networkanimator.html"; - public const string NetworkRigidbody = k_BaseManualUrl + "advanced-topics/physics.html#networkrigidbody"; - public const string NetworkRigidbody2D = k_BaseManualUrl + "advanced-topics/physics.html#networkrigidbody2d"; + public const string NetworkRigidbody = k_BaseManualUrl + "components/helper/networkrigidbody.html"; + public const string NetworkRigidbody2D = k_BaseManualUrl + "components/helper/networkrigidbody.html#networkrigidbody2d"; public const string NetworkTransform = k_BaseManualUrl + "components/helper/networktransform.html"; public const string AnticipatedNetworkTransform = k_BaseManualUrl + "advanced-topics/client-anticipation.html"; public const string UnityTransport = k_BaseApiUrl + ".Transports.UTP.UnityTransport.html"; From c97139759aeed88a8d3ba64011aee62d09515afb Mon Sep 17 00:00:00 2001 From: michal-chrobot Date: Tue, 4 Nov 2025 14:50:07 +0100 Subject: [PATCH 6/6] corrected logging and code coverage typo --- .yamato/code-coverage.yml | 2 +- .yamato/project-builders/project-builders.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/code-coverage.yml b/.yamato/code-coverage.yml index 8449d3114b..fe4efb393b 100644 --- a/.yamato/code-coverage.yml +++ b/.yamato/code-coverage.yml @@ -38,7 +38,7 @@ code_coverage_{{ platform.name }}_{{ editor }}: commands: - unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models - upm-pvp create-test-project test-project --packages "upm-ci~/packages/*.tgz" --unity .Editor - - UnifiedTestRunner --suite=editor --suite=playmode --editor-location=.Editor --testproject=test-project --enable-code-coverage coverage-upload-options="reportsDir:$PWD/test-results/CoverageResults;name:NGOv1_{{ platform.name }}_{{ editor }};flags:NGOv1_{{ platform.name }}_{{ editor }};verbose" --coverage-results-path=$PWD/test-results/CoverageResults --coverage-options="generateHtmlReport;generateAdditionalMetrics;assemblyFilters:+Unity.Netcode.Editor,+Unity.Netcode.Runtime" --extra-editor-arg=--burst-disable-compilation --timeout={ test_timeout }} --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library-on-rerun --artifacts-path=test-results + - UnifiedTestRunner --suite=editor --suite=playmode --editor-location=.Editor --testproject=test-project --enable-code-coverage coverage-upload-options="reportsDir:$PWD/test-results/CoverageResults;name:NGOv1_{{ platform.name }}_{{ editor }};flags:NGOv1_{{ platform.name }}_{{ editor }};verbose" --coverage-results-path=$PWD/test-results/CoverageResults --coverage-options="generateHtmlReport;generateAdditionalMetrics;assemblyFilters:+Unity.Netcode.Editor,+Unity.Netcode.Runtime" --extra-editor-arg=--burst-disable-compilation --timeout={{ test_timeout }} --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library-on-rerun --artifacts-path=test-results artifacts: logs: paths: diff --git a/.yamato/project-builders/project-builders.yml b/.yamato/project-builders/project-builders.yml index 322a194c61..6d5a53ca81 100644 --- a/.yamato/project-builders/project-builders.yml +++ b/.yamato/project-builders/project-builders.yml @@ -34,7 +34,7 @@ build_{{ netcodeProject[0] }}_project: commands: # Validate inputs passed via Yamato variables - python Tools/scripts/BuildAutomation/validate_params.py - - echo Building {{ netcodeProject[0] }} project from branch {{ netcodeProject[1].defaultBranch }} with Unity version of %UNITY_VERSION%, Scripting backend %SCRIPTING_BACKEND_IL2CPP_MONO%, Burst %BURST_ON_OFF% for platform %PLATFORM_WIN64_MAC_ANDROID% + - echo Building {{ netcodeProject[0] }} project from branch %SAMPLE_BRANCH% with Unity version of %UNITY_VERSION%, Scripting backend %SCRIPTING_BACKEND_IL2CPP_MONO%, Burst %BURST_ON_OFF% for platform %PLATFORM_WIN64_MAC_ANDROID% # Clone the external project repository into a specific directory. Notice that branch is also specified. - git clone --single-branch --branch %SAMPLE_BRANCH% {{ netcodeProject[1].GithubRepo }} C:/ClonedProject