Merge branch 'develop' into codecov-integration-develop

Author: NoelStephensUnity

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

@@ -20,7 +20,7 @@ api_validation_-_netcode_gameobjects_-_2021_3_-_windows:
   - command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     timeout: 20
     retries: 10
-  - command: unity-downloader-cli -u 2021.3/staging -c Editor --fast
+  - command: unity-downloader-cli -u 2021.3/staging -c editor --path .Editor --fast
     timeout: 10
     retries: 3
   - command: python PythonScripts/PackageJsonCondersor.py
@@ -51,8 +51,8 @@ api_validation_-_netcode_gameobjects_-_2021_3_-_windows:
   dependencies:
   - path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
   variables:
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 

.yamato/wrench/package-pack-jobs.yml

@@ -24,5 +24,5 @@ package_pack_-_netcode_gameobjects:
     UPMCI_ACK_LARGE_PACKAGE: 1
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 

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

@@ -208,10 +208,10 @@ publish_dry_run_netcode_gameobjects:
         ignore_artifact: true
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 
 # Publish  for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
 publish_netcode_gameobjects:
@@ -420,8 +420,8 @@ publish_netcode_gameobjects:
         ignore_artifact: true
   variables:
     UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
-    UPMPVP_CONTEXT_WRENCH: 0.11.3.0
+    UPMPVP_CONTEXT_WRENCH: 0.12.1.0
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 

.yamato/wrench/promotion-jobs.yml

@@ -9,14 +9,14 @@ test_-_wrench_jobs_up_to_date:
     type: Unity::VM
     flavor: b1.large
   commands:
-  - command: dotnet run --project Tools\CI\NGO.Cookbook.csproj
+  - command: dotnet run --project Tools/CI/NGO.Cookbook.csproj
   - command: |-
       if [ -n "$(git status --porcelain -- .yamato/wrench)" ]; then
         git status
         echo "Your repo is not clean - diff output:"
         git diff
         echo "You must run recipe generation after updating recipes to update the generated YAML!"
-        echo "Run 'dotnet run --project Tools\CI\NGO.Cookbook.csproj' from the root of your repository to regenerate all job definitions created by wrench."
+        echo "Run 'dotnet run --project Tools/CI/NGO.Cookbook.csproj' from the root of your repository to regenerate all job definitions created by wrench."
         exit 1
       fi
   variables:
@@ -26,5 +26,5 @@ test_-_wrench_jobs_up_to_date:
     cancel_old_ci: true
   metadata:
     Job Maintainers: '#rm-packageworks'
-    Wrench: 0.11.3.0
+    Wrench: 0.12.1.0
 

.yamato/wrench/recipe-regeneration.yml

@@ -31,7 +31,7 @@
   },
   "publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_netcode_gameobjects",
   "branch_pattern": "ReleaseSlash",
-  "wrench_version": "0.11.3.0",
+  "wrench_version": "0.12.1.0",
   "pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json",
-  "cs_project_path": "Tools\\CI\\NGO.Cookbook.csproj"
+  "cs_project_path": "Tools/CI/NGO.Cookbook.csproj"
 }

.yamato/wrench/validation-jobs.yml

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="RecipeEngine.Modules.Wrench" Version="0.11.3" />
+      <PackageReference Include="RecipeEngine.Modules.Wrench" Version="0.12.1" />
     </ItemGroup>
 
 </Project>

.yamato/wrench/wrench_config.json

@@ -9,12 +9,22 @@ public class NGOSettings : AnnotatedSettingsBase
     // Path from the root of the repository where packages are located.
     readonly string[] packagesRootPaths = {"."};
 
+    static ValidationOptions validationOptions = new ValidationOptions()
+    {
+        ProjectPath = "testproject",
+        UtrTestingYamatoTimeout = 40
+    };
+
     // update this to list all packages in this repo that you want to release.
     Dictionary<string, PackageOptions> PackageOptions = new()
     {
         {
             "com.unity.netcode.gameobjects",
-            new PackageOptions() { ReleaseOptions = new ReleaseOptions() { IsReleasing = true } }
+            new PackageOptions()
+            {
+                ReleaseOptions = new ReleaseOptions() { IsReleasing = true },
+                ValidationOptions = validationOptions
+            }
         }
     };
 

Tools/CI/NGO.Cookbook.csproj

@@ -15,6 +15,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
 
 ### Fixed
 
+- Fixed `NullReferenceException` on `NetworkList` when used without a NetworkManager in scene. (#3502)
 - Fixed inconsistencies in the `OnSceneEvent` callback. (#3487)
 - Fixed issue where `NetworkClient` could persist some settings if re-using the same `NetworkManager` instance. (#3494)
 - Fixed issue where a pooled `NetworkObject` was not resetting the internal latest parent property when despawned. (#3494)

Tools/CI/Settings/NGOSettings.cs

@@ -31,6 +31,9 @@ public class NetworkConfig
         [Tooltip("When set, NetworkManager will automatically create and spawn the assigned player prefab. This can be overridden by adding it to the NetworkPrefabs list and selecting override.")]
         public GameObject PlayerPrefab;
 
+        /// <summary>
+        /// The collection of network prefabs available for spawning across the network.
+        /// </summary>
         [SerializeField]
         public NetworkPrefabs Prefabs = new NetworkPrefabs();
 

com.unity.netcode.gameobjects/CHANGELOG.md

@@ -57,6 +57,11 @@ public class NetworkPrefab
         /// </summary>
         public GameObject OverridingTargetPrefab;
 
+        /// <summary>
+        /// Compares this NetworkPrefab with another to determine equality.
+        /// </summary>
+        /// <param name="other">The NetworkPrefab to compare against.</param>
+        /// <returns>True if all fields match between the two NetworkPrefabs, false otherwise.</returns>
         public bool Equals(NetworkPrefab other)
         {
             return Override == other.Override &&
@@ -66,6 +71,12 @@ public bool Equals(NetworkPrefab other)
                    OverridingTargetPrefab == other.OverridingTargetPrefab;
         }
 
+        /// <summary>
+        /// Gets the GlobalObjectIdHash of the source prefab based on the current override settings.
+        /// </summary>
+        /// <value>The hash value identifying the source prefab.</value>
+        /// <exception cref="InvalidOperationException">Thrown when required prefab references are missing or invalid.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when Override has an invalid value.</exception>
         public uint SourcePrefabGlobalObjectIdHash
         {
             get
@@ -98,6 +109,12 @@ public uint SourcePrefabGlobalObjectIdHash
             }
         }
 
+        /// <summary>
+        /// Gets the GlobalObjectIdHash of the target prefab when using prefab overrides.
+        /// </summary>
+        /// <value>The hash value identifying the target prefab, or 0 if no override is set.</value>
+        /// <exception cref="InvalidOperationException">Thrown when required prefab references are missing or invalid.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when Override has an invalid value.</exception>
         public uint TargetPrefabGlobalObjectIdHash
         {
             get
@@ -122,6 +139,11 @@ public uint TargetPrefabGlobalObjectIdHash
             }
         }
 
+        /// <summary>
+        /// Validates the NetworkPrefab configuration to ensure all required fields are properly set.
+        /// </summary>
+        /// <param name="index">Optional index used for error reporting when validating lists of prefabs.</param>
+        /// <returns>True if the NetworkPrefab is valid and ready for use, false otherwise.</returns>
         public bool Validate(int index = -1)
         {
             NetworkObject networkObject;
@@ -224,6 +246,10 @@ public bool Validate(int index = -1)
             return true;
         }
 
+        /// <summary>
+        /// Returns a string representation of this NetworkPrefab's source and target hash values.
+        /// </summary>
+        /// <returns>A string containing the source and target hash values.</returns>
         public override string ToString()
         {
             return $"{{SourceHash: {SourceHashToOverride}, TargetHash: {TargetPrefabGlobalObjectIdHash}}}";

com.unity.netcode.gameobjects/Runtime/Configuration/NetworkConfig.cs

@@ -34,11 +34,14 @@ public class NetworkPrefabs
         /// This is used for the legacy way of spawning NetworkPrefabs with an override when manually instantiating and spawning.
         /// To handle multiple source NetworkPrefab overrides that all point to the same target NetworkPrefab use
         /// <see cref="NetworkSpawnManager.InstantiateAndSpawn(NetworkObject, ulong, bool, bool, bool, Vector3, Quaternion)"/>
-        /// or <see cref="NetworkObject.InstantiateAndSpawn(NetworkManager, ulong, bool, bool, bool, Vector3, Quaternion)"/>
+        /// or <see cref="NetworkObject.InstantiateAndSpawn(NetworkManager, ulong, bool, bool, bool, Vector3, Quaternion)"/>.
         /// </summary>
         [NonSerialized]
         public Dictionary<uint, uint> OverrideToNetworkPrefab = new Dictionary<uint, uint>();
 
+        /// <summary>
+        /// Gets the read-only list of all registered network prefabs.
+        /// </summary>
         public IReadOnlyList<NetworkPrefab> Prefabs => m_Prefabs;
 
         [NonSerialized]
@@ -62,14 +65,16 @@ private void RemoveTriggeredByNetworkPrefabList(NetworkPrefab networkPrefab)
             m_Prefabs.Remove(networkPrefab);
         }
 
+        /// <summary>
+        /// Destructor that cleans up network prefab resources.
+        /// </summary>
         ~NetworkPrefabs()
         {
             Shutdown();
         }
 
         /// <summary>
-        /// Deregister from add and remove events
-        /// Clear the list
+        /// Deregister from add and remove events and clear the events.
         /// </summary>
         internal void Shutdown()
         {
@@ -84,6 +89,7 @@ internal void Shutdown()
         /// Processes the <see cref="NetworkPrefabsList"/> if one is present for use during runtime execution,
         /// else processes <see cref="Prefabs"/>.
         /// </summary>
+        /// <param name="warnInvalid">When true, logs warnings about invalid prefabs that are removed during initialization.</param>
         public void Initialize(bool warnInvalid = true)
         {
             m_Prefabs.Clear();
@@ -154,11 +160,12 @@ public void Initialize(bool warnInvalid = true)
         }
 
         /// <summary>
-        /// Add a new NetworkPrefab instance to the list
+        /// Add a new NetworkPrefab instance to the list.
         /// </summary>
+        /// <param name="networkPrefab">The <see cref="NetworkPrefab"/> to add.</param>
+        /// <returns>True if the prefab was successfully added, false if it was invalid or already registered</returns>
         /// <remarks>
-        /// The framework does not synchronize this list between clients. Any runtime changes must be handled manually.
-        ///
+        /// The framework does not synchronize this list between clients. Any runtime changes must be handled manually.<br />
         /// Any modifications made here are not persisted. Permanent configuration changes should be done
         /// through the <see cref="NetworkPrefabsList"/> scriptable object property.
         /// </remarks>
@@ -175,11 +182,11 @@ public bool Add(NetworkPrefab networkPrefab)
         }
 
         /// <summary>
-        /// Remove a NetworkPrefab instance from the list
+        /// Remove a NetworkPrefab instance from the list.
         /// </summary>
+        /// <param name="prefab">The <see cref="NetworkPrefab"/> to remove.</param>
         /// <remarks>
-        /// The framework does not synchronize this list between clients. Any runtime changes must be handled manually.
-        ///
+        /// The framework does not synchronize this list between clients. Any runtime changes must be handled manually.<br />
         /// Any modifications made here are not persisted. Permanent configuration changes should be done
         /// through the <see cref="NetworkPrefabsList"/> scriptable object property.
         /// </remarks>
@@ -197,11 +204,11 @@ public void Remove(NetworkPrefab prefab)
         }
 
         /// <summary>
-        /// Remove a NetworkPrefab instance with matching <see cref="NetworkPrefab.Prefab"/> from the list
+        /// Remove a NetworkPrefab instance with matching <see cref="NetworkPrefab.Prefab"/> from the list.
         /// </summary>
+        /// <param name="prefab">The <see cref="GameObject"/> to match against for removal.</param>
         /// <remarks>
-        /// The framework does not synchronize this list between clients. Any runtime changes must be handled manually.
-        ///
+        /// The framework does not synchronize this list between clients. Any runtime changes must be handled manually.<br />
         /// Any modifications made here are not persisted. Permanent configuration changes should be done
         /// through the <see cref="NetworkPrefabsList"/> scriptable object property.
         /// </remarks>
@@ -232,10 +239,10 @@ public void Remove(GameObject prefab)
         }
 
         /// <summary>
-        /// Check if the given GameObject is present as a prefab within the list
+        /// Check if the given GameObject is present as a prefab within the list.
         /// </summary>
-        /// <param name="prefab">The prefab to check</param>
-        /// <returns>Whether or not the prefab exists</returns>
+        /// <param name="prefab">The prefab to check.</param>
+        /// <returns>True if the prefab exists or false if it does not.</returns>
         public bool Contains(GameObject prefab)
         {
             for (int i = 0; i < m_Prefabs.Count; i++)
@@ -251,10 +258,10 @@ public bool Contains(GameObject prefab)
         }
 
         /// <summary>
-        /// Check if the given NetworkPrefab is present within the list
+        /// Check if the given NetworkPrefab is present within the list.
         /// </summary>
-        /// <param name="prefab">The prefab to check</param>
-        /// <returns>Whether or not the prefab exists</returns>
+        /// <param name="prefab">The prefab to check.</param>
+        /// <returns>True if the prefab exists or false if it does not.</returns>
         public bool Contains(NetworkPrefab prefab)
         {
             for (int i = 0; i < m_Prefabs.Count; i++)
@@ -269,7 +276,7 @@ public bool Contains(NetworkPrefab prefab)
         }
 
         /// <summary>
-        /// Configures <see cref="NetworkPrefabOverrideLinks"/> for the given <see cref="NetworkPrefab"/>
+        /// Configures <see cref="NetworkPrefabOverrideLinks"/> for the given <see cref="NetworkPrefab"/>.
         /// </summary>
         private bool AddPrefabRegistration(NetworkPrefab networkPrefab)
         {