Merge branch 'develop-2.0.0' into develop-2.0.0-docs

Author: jabbacakes

.github/CODEOWNERS

@@ -9,3 +9,4 @@ AssemblyInfo.cs @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
 .gitignore @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

.github/codecov.yml

@@ -0,0 +1,47 @@
+codecov:
+  require_ci_to_pass: false
+  notify:
+    wait_for_ci: true
+
+coverage:
+  precision: 2
+  round: down
+  range: "50...70"
+  status:
+    patch:
+      default:
+        if_ci_failed: success
+        informational: true
+    default_rules:
+      flag_coverage_not_uploaded_behavior: exclude
+    project:
+      default:
+        target: auto
+        # Threshold used for the PR Check
+        threshold: 0.5%
+        base: auto
+        if_ci_failed: success
+        informational: true
+        only_pulls: true
+
+# PR Comment configuration
+comment:
+  layout: "diff, flags, files, components"
+  behavior: default
+  require_changes: false
+  require_base: false
+  require_head: false
+  # Set this to the number of coverage jobs run in the PR
+  after_n_builds: 1
+
+flag_management:
+  default_rules:
+    carryforward: true
+
+# Components configuration
+component_management:
+  individual_components:
+    - component_id: "com.unity.netcode.gameobjects"
+      name: "com.unity.netcode.gameobjects"
+      paths:
+        - com.unity.netcode.gameobjects

.yamato/_run-all.yml

@@ -110,11 +110,9 @@ run_all_webgl_builds:
   dependencies:
 {% for project in projects.default -%}
 {% for platform in test_platforms.desktop -%}
-{% if platform.name != "mac" -%} # There is an error about "Light baking could not be started because no valid OpenCL device could be found". Tracked in MTT-11726
 {% for editor in validation_editors.all -%}
     - .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}
 {% endfor -%}
-{% endif -%}
 {% endfor -%}
 {% endfor -%}
 
@@ -125,11 +123,9 @@ run_all_webgl_builds_trunk:
   dependencies:
 {% for project in projects.default -%}
 {% for platform in test_platforms.desktop -%}
-{% if platform.name != "mac" -%} # There is an error about "Light baking could not be started because no valid OpenCL device could be found". Tracked in MTT-11726
 {% for editor in validation_editors.default -%}
     - .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}
 {% endfor -%}
-{% endif -%}
 {% endfor -%}
 {% endfor -%}
 
@@ -139,9 +135,7 @@ run_all_webgl_builds_6000:
   dependencies:
 {% for project in projects.default -%}
 {% for platform in test_platforms.desktop -%}
-{% if platform.name != "mac" -%} # There is an error about "Light baking could not be started because no valid OpenCL device could be found". Tracked in MTT-11726
     - .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_6000.0
-{% endif -%}
 {% endfor -%}
 {% endfor -%}
 

.yamato/code-coverage.yml

@@ -21,7 +21,6 @@
   # In order to properly use -coverage-results-path parameter we need to start it with $PWD (which means the absolute path). Otherwise coverage results will not be visible
 
 # QUALITY CONSIDERATIONS--------------------------------------------------------------------
-  # TODO: somewhere in 2025 we will be able to upload resuls to CodeCov from public repos
   # To see where this job is included (in trigger job definitions) look into _triggers.yml file
 
 
@@ -40,7 +39,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-results-path=$PWD/test-results/CodeCoverage --coverage-options="generateHtmlReport;generateAdditionalMetrics;assemblyFilters:+Unity.Netcode.Editor,+Unity.Netcode.Runtime" --extra-editor-arg=--burst-disable-compilation --timeout=1800 --reruncount=1 --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:NGOv2_{{ platform.name }}_{{ editor }};flags:NGOv2_{{ 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=1800 --reruncount=1 --clean-library-on-rerun --artifacts-path=test-results
   artifacts:
     logs:
       paths:

.yamato/project.metafile

@@ -37,13 +37,13 @@ test_platforms:
     default:
         - name: ubuntu
           type: Unity::VM
-          image: package-ci/ubuntu-22.04:v4.71.0
+          image: package-ci/ubuntu-22.04:v4
           flavor: b1.large
           standalone: StandaloneLinux64
     desktop:  
         - name: ubuntu
           type: Unity::VM
-          image: package-ci/ubuntu-22.04:v4.71.0
+          image: package-ci/ubuntu-22.04:v4
           flavor: b1.large
           standalone: StandaloneLinux64
           model: rtx2080

.yamato/webgl-build.yml

@@ -26,14 +26,13 @@
 
 {% for project in projects.default -%}
 {% for platform in test_platforms.desktop -%}
-{% if platform.name != "mac" -%} # There is an error about "Light baking could not be started because no valid OpenCL device could be found". Tracked in MTT-11726
 {% for editor in validation_editors.all -%}
 webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
   name: WebGl Build - {{ project.name }} [{{ platform.name }}, {{ editor }}, il2cpp]
   agent:
     type: {{ platform.type }}
     image: {{ platform.image }}
-    flavor: {{ platform.flavor }}
+    flavor: b1.xlarge # We use b1.xlarge for WebGL builds since it requires more resources (otherwise it hangs and timeouts) especially on Ubuntu platform
 {% if platform.model %}
     model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
 {% endif %}
@@ -53,6 +52,5 @@ webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
         - "artifacts/**/*"
         - "build/players/**/*"
 {% endfor -%}
-{% endif -%}
 {% endfor -%}
 {% endfor -%}

com.unity.netcode.gameobjects/CHANGELOG.md

@@ -20,6 +20,13 @@ Additional documentation and release notes are available at [Multiplayer Documen
 ### Changed
 
 
+## [2.4.3] - 2025-06-25
+
+### Fixed
+
+- Fixed issue where spawned objects with `NetworkObject.DontDestroyWithOwner` set to `false` would not be destroyed when using a client-server network topology. (#3522)
+
+
 ## [2.4.2] - 2025-06-13
 
 ### Fixed

com.unity.netcode.gameobjects/Runtime/Connection/NetworkConnectionManager.cs

@@ -1177,8 +1177,7 @@ internal void OnClientDisconnectFromServer(ulong clientId)
                     if (ownedObject)
                     {
                         // If destroying with owner, then always despawn and destroy (or defer destroying to prefab handler)
-                        // Handle an object with no observers other than the current disconnecting client as destroying with owner
-                        if (!ownedObject.DontDestroyWithOwner && (ownedObject.Observers.Count == 0 || (ownedObject.Observers.Count == 1 && ownedObject.Observers.Contains(clientId))))
+                        if (!ownedObject.DontDestroyWithOwner)
                         {
                             if (NetworkManager.PrefabHandler.ContainsHandler(ownedObject.GlobalObjectIdHash))
                             {
@@ -1244,7 +1243,7 @@ internal void OnClientDisconnectFromServer(ulong clientId)
                                     }
 
                                     // Skip destroy with owner objects as they will be processed by the outer loop
-                                    if (!childObject.DontDestroyWithOwner && (childObject.Observers.Count == 0 || (childObject.Observers.Count == 1 && childObject.Observers.Contains(clientId))))
+                                    if (!childObject.DontDestroyWithOwner)
                                     {
                                         continue;
                                     }