Merge develop-2.0.0 into chore/optimize-destroy-object-message

Author: netcode-ci-service

com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs

@@ -356,18 +356,9 @@ private struct PacketLossCache
             public float PacketLoss;
         };
 
-        /// <summary>
-        /// TODO-FIXME:
-        /// Multiplayer Tools subscribes to this event and does not have the EntityId udpate.
-        /// </summary>
-#if FIXED
 #if UNITY_6000_2_OR_NEWER
-        internal static event Action<EntityId, NetworkDriver> TransportInitialized;
-        internal static event Action<EntityId> TransportDisposed;
-#else
-        internal static event Action<int, NetworkDriver> TransportInitialized;
-        internal static event Action<int> TransportDisposed;
-#endif
+        internal static event Action<EntityId, NetworkDriver> OnDriverInitialized;
+        internal static event Action<EntityId> OnDisposingDriver;
 #endif
         internal static event Action<int, NetworkDriver> TransportInitialized;
         internal static event Action<int> TransportDisposed;
@@ -449,13 +440,8 @@ private void InitDriver()
                 out m_ReliableSequencedPipeline);
 #if UNITY_6000_2_OR_NEWER
             var entityId = GetEntityId();
-#if UNITY_6000_3_0A6_OR_HIGHER
-            // TODO-FIXME: Since multiplayer tools subscribes to this and we have to validate against any package that
-            // might use this action, we have to cast it down temporarily to avoid being blocked from getting these fixes in place.
-            TransportInitialized?.Invoke((int)entityId.GetRawData(), m_Driver);
-#else
-            TransportInitialized?.Invoke(entityId, m_Driver);
-#endif
+            OnDriverInitialized?.Invoke(entityId, m_Driver);
+            TransportInitialized?.Invoke(entityId.GetHashCode(), m_Driver);
 #else
             TransportInitialized?.Invoke(GetInstanceID(), m_Driver);
 #endif
@@ -477,14 +463,8 @@ private void DisposeInternals()
 
 #if UNITY_6000_2_OR_NEWER
             var entityId = GetEntityId();
-#if UNITY_6000_3_0A6_OR_HIGHER
-            // TODO-FIXME: Since multiplayer tools subscribes to this and we have to validate against any package that
-            // might use this action, we have to cast it down temporarily to avoid being blocked from getting these fixes in place.
-            TransportDisposed?.Invoke((int)entityId.GetRawData());
-#else
-            TransportDisposed?.Invoke(entityId, m_Driver);
-#endif
-
+            OnDisposingDriver?.Invoke(entityId);
+            TransportDisposed?.Invoke(entityId.GetHashCode());
 #else
             TransportDisposed?.Invoke(GetInstanceID());
 #endif

com.unity.netcode.gameobjects/Runtime/Unity.Netcode.Runtime.asmdef

@@ -84,10 +84,10 @@
             "define": "SCENE_MANAGEMENT_SCENE_HANDLE_NO_INT_CONVERSION"
         },
         {
-          "name": "Unity",
-          "expression": "6000.5.0a1",
-          "define": "SCENE_MANAGEMENT_SCENE_HANDLE_MUST_USE_ULONG"
+            "name": "Unity",
+            "expression": "6000.5.0a1",
+            "define": "SCENE_MANAGEMENT_SCENE_HANDLE_MUST_USE_ULONG"
         }
     ],
     "noEngineReferences": false
-}
+}