chore: merge 1.12.0 into develop (#3196)

NoelStephensUnity · michalChrobot · EmandM · web-flow · commit cefecf2eb6d4 · 2025-01-10T10:30:42.000+01:00
* update incrementing the version number and updating changelog to match version number. * Added setup necessary for release automation of NGO (#3141) generated files for release automation within Unity org * fix: networklist editor memory leak [backport] (#3148) * fix This fixes the issue with NetworkLists on in-scene placed NetworkObjects causing small memory leaks when entering and exiting playmode. * update adding changelog entry * update adding PR number to log entry * Corrected setup necessary for release automation of NGO (#3149) * generated files for release automation within Unity org * Corrected pvp profiles check * Chore/phase 1 api documentation update 1 12 0 (#3158) * Update README.md Adding note about where to find the NGO v2 branch along with the examples. * chore: api documentation phase 1 [backport] (#3157) * update updating XML API documentation for ConnectionEvent and ConnectionEventData. * update Updating XML API documentation for RpcTargetUse. * Update com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/RpcTarget.cs Co-authored-by: Emma <emma.mcmillan@unity3d.com> * Update com.unity.netcode.gameobjects/Runtime/Messaging/RpcTargets/RpcTarget.cs Co-authored-by: Emma <emma.mcmillan@unity3d.com> --------- Co-authored-by: Emma <emma.mcmillan@unity3d.com> --------- Co-authored-by: Emma <emma.mcmillan@unity3d.com> * PVP and Wrench fixes * Updated wrench version to 0.10.30 * Corrected license file * Removed old files not conforming to pvp rules * Corrected typo in changelog * Added samples description to package.json while removing deprecated .samples.json * Inclusion of CI generation files * Pvp fixes for automated release * Changed Samples folder name to Samples~ * Added path field in package.json for samples * Increased wrench timeout for editors below 6000 * Increasing wrench timeout to 2h for wrench validation jobs * Timeout of validation jobs increased to 2h for editors below 6000 * fix: removing timeouts from integration tests (#3167) fix Removing timesouts from our integration tests: - TestSendingWithGroupOverride - TestSendingWithGroupNotOverride - WhenManyObjectsAreSpawnedAtOnce_AllAreReceived( * fix: update universal rpc tests revert spawnmany timeout (#3168) * update reverting the removal of the timeout. making it actually 6 minutes. * fix Using the NGO v2. version of the UniversalRpcTestSendingWithGroupNotOverride and TestSendingWithGroupOverride tests. * fix (#3169) ignoring the two failing tests. * fix: adding extended timeout to all universal rpc tests (#3170) fix Adding extended timeout to all universal rpc tests * Extended timeout for validation jobs on editors lower than 6000 to 5h (#3173) * update Adding change log entry for this PR. * update removing changelog entry as that belong to a different PR. --------- Co-authored-by: Michał Chrobot <124174716+michalChrobot@users.noreply.github.com> Co-authored-by: Emma <emma.mcmillan@unity3d.com>
diff --git a/com.unity.netcode.gameobjects/CHANGELOG.md b/com.unity.netcode.gameobjects/CHANGELOG.md
@@ -6,7 +6,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 Additional documentation and release notes are available at [Multiplayer Documentation](https://docs-multiplayer.unity3d.com).
 
-[Unreleased]
+## [Unreleased]
+
+### Added
+
+### Fixed
+
+- Fixed issue where an exception was thrown when calling `NetworkManager.Shutdown` after calling `UnityTransport.Shutdown`. (#3118)
+
+### Changed
+
+## [1.12.0] - 2024-11-19
 
 ### Added
 
@@ -18,7 +28,7 @@ Additional documentation and release notes are available at [Multiplayer Documen
 
 ### Fixed
 
-- Fixed issue where an exception was thrown when calling `NetworkManager.Shutdown` after calling `UnityTransport.Shutdown`. (#3118)
+- Fixed issue where `NetworkList` properties on in-scene placed `NetworkObject`s could cause small memory leaks when entering playmode. (#3148)
 - Fixed issue where a newly synchronizing client would be synchronized with the current `NetworkVariable` values always which could cause issues with collections if there were any pending state updates. Now, when initially synchronizing a client, if a `NetworkVariable` has a pending state update it will serialize the previously known value(s) to the synchronizing client so when the pending updates are sent they aren't duplicate values on the newly connected client side. (#3126)
 - Fixed issue where changing ownership would mark every `NetworkVariable` dirty. Now, it will only mark any `NetworkVariable` with owner read permissions as dirty and will send/flush any pending updates to all clients prior to sending the change in ownership message.  (#3126)
 - Fixed issue with `NetworkVariable` collections where transferring ownership to another client would not update the new owner's previous value to the most current value which could cause the last/previous added value to be detected as a change when adding or removing an entry (as long as the entry removed was not the last/previously added value).  (#3126)
diff --git a/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections/NetworkList.cs b/com.unity.netcode.gameobjects/Runtime/NetworkVariable/Collections/NetworkList.cs
@@ -49,6 +49,11 @@ public NetworkList(IEnumerable<T> values = default,
             }
         }
 
+        ~NetworkList()
+        {
+            Dispose();
+        }
+
         /// <inheritdoc />
         public override void ResetDirty()
         {
@@ -599,8 +604,17 @@ public int LastModifiedTick
         /// </summary>
         public override void Dispose()
         {
-            m_List.Dispose();
-            m_DirtyEvents.Dispose();
+            if (m_List.IsCreated)
+            {
+                m_List.Dispose();
+            }
+
+            if (m_DirtyEvents.IsCreated)
+            {
+                m_DirtyEvents.Dispose();
+            }
+
+            base.Dispose();
         }
     }
 
diff --git a/com.unity.netcode.gameobjects/package.json b/com.unity.netcode.gameobjects/package.json
@@ -2,7 +2,7 @@
     "name": "com.unity.netcode.gameobjects",
     "displayName": "Netcode for GameObjects",
     "description": "Netcode for GameObjects is a high-level netcode SDK that provides networking capabilities to GameObject/MonoBehaviour workflows within Unity and sits on top of underlying transport layer.",
-    "version": "1.11.0",
+    "version": "1.12.0",
     "unity": "2021.3",
     "dependencies": {
         "com.unity.nuget.mono-cecil": "1.10.1",

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,11 @@ public NetworkList(IEnumerable<T> values = default,`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
	`52`	`+ ~NetworkList()`
	`53`	`+ {`
	`54`	`+ Dispose();`
	`55`	`+ }`
	`56`	`+`
`52`	`57`	`/// <inheritdoc />`
`53`	`58`	`public override void ResetDirty()`
`54`	`59`	`{`
`@@ -599,8 +604,17 @@ public int LastModifiedTick`
`599`	`604`	`/// </summary>`
`600`	`605`	`public override void Dispose()`
`601`	`606`	`{`
`602`		`- m_List.Dispose();`
`603`		`- m_DirtyEvents.Dispose();`
	`607`	`+ if (m_List.IsCreated)`
	`608`	`+ {`
	`609`	`+ m_List.Dispose();`
	`610`	`+ }`
	`611`	`+`
	`612`	`+ if (m_DirtyEvents.IsCreated)`
	`613`	`+ {`
	`614`	`+ m_DirtyEvents.Dispose();`
	`615`	`+ }`
	`616`	`+`
	`617`	`+ base.Dispose();`
`604`	`618`	`}`
`605`	`619`	`}`
`606`	`620`