fix: reach the moved NetworkTimeSystem through an alias

Netcode for Entities 6.7.0 corrected the casing of its namespace, so it now declares
Unity.Netcode.NetworkTimeSystem. The enclosing namespace is searched ahead of any using
directive, so once the timing types leave Unity.Netcode the five files that still spell
the name bare bind to theirs instead, and Unity.Netcode.Runtime stops compiling in any
project that has both packages: 16 errors across 6 files, all of them cascading from the
NetworkManager.NetworkTimeSystem property picking up the wrong type.

The collision stub is corrected to match what N4E actually shipped. It sub-namespaced
NetworkTime into Unity.Netcode.NetcodeTime but left NetworkTimeSystem in the shared root,
so only that one name is occupied.

Author: NoelStephensUnity

apiupdaterproject/Assets/CollisionStub~/N4ECollisionStub.cs

@@ -1,20 +1,15 @@
-// Stands in for a second package occupying Unity.Netcode.NetworkTime and
-// Unity.Netcode.NetworkTimeSystem, which is what Netcode for Entities does once the casing of its
-// Unity.NetCode namespace is corrected.
+// Stands in for a second package occupying Unity.Netcode.NetworkTimeSystem, which is what Netcode
+// for Entities does as of 6.7.0: its casing correction moved 204 files into Unity.Netcode, and it
+// sub-namespaced NetworkTime into Unity.Netcode.NetcodeTime but left NetworkTimeSystem behind.
 //
-// Only those two names collide. NetworkTickSystem deliberately is not declared here, so a
-// --collision-stub run asserts both halves of the finding in one pass: the updater migrates
-// NetworkTickSystem, and it cannot migrate the two whose old names still resolve.
+// Only that one name collides. NetworkTime and NetworkTickSystem deliberately are not declared here,
+// so a --collision-stub run asserts both halves of the finding in one pass: those two migrate, and
+// the one whose old name still resolves cannot.
 //
 // Inert until run_upgrade_test.py --collision-stub copies this folder into place. Unity does not
 // import a directory whose name ends in '~'.
 namespace Unity.Netcode
 {
-    public struct NetworkTime
-    {
-        public int ServerTick;
-    }
-
     public class NetworkTimeSystem
     {
         public uint EffectiveInputLatencyTicks;

apiupdaterproject/run_upgrade_test.py

@@ -8,12 +8,12 @@
 reference under Assets/Editor and Assets/Runtime was rewritten and that no stale reference
 survived. The 2.x sources are restored on exit so the test can be re-run.
 
-With --collision-stub, a stub assembly is added that occupies Unity.Netcode.NetworkTime and
-Unity.Netcode.NetworkTimeSystem, standing in for a second package that has taken those names. The
-expectation then inverts for exactly those two: the updater is driven by resolution failure, so a
+With --collision-stub, a stub assembly is added that occupies Unity.Netcode.NetworkTimeSystem,
+standing in for Netcode for Entities, which still declares that name in the shared root namespace.
+The expectation then inverts for exactly that one: the updater is driven by resolution failure, so a
 name another assembly still resolves never reaches the MovedFrom data and cannot be migrated.
-NetworkTickSystem is deliberately absent from the stub and must still migrate, which is what makes
-the run prove both halves rather than merely fail.
+NetworkTime and NetworkTickSystem are deliberately absent from the stub and must still migrate, which
+is what makes the run prove both halves rather than merely fail.
 
 Note that this script can be run from anywhere; paths are resolved relative to the script itself.
 """
@@ -70,7 +70,7 @@
 
 # The names the --collision-stub assembly occupies; under it these must NOT be rewritten.
 # Keep in sync with Assets/CollisionStub~/N4ECollisionStub.cs.
-STUB_OCCUPIED = ['Unity.Netcode.NetworkTime', 'Unity.Netcode.NetworkTimeSystem']
+STUB_OCCUPIED = ['Unity.Netcode.NetworkTimeSystem']
 
 
 def expected_pairs():

com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs

@@ -24,6 +24,11 @@
 using PackageInfo = UnityEditor.PackageManager.PackageInfo;
 #endif
 using UnityEngine.SceneManagement;
+// Netcode for Entities also declares Unity.Netcode.NetworkTimeSystem. The enclosing namespace is
+// searched before any using directive, so inside Unity.Netcode the bare name binds to theirs and the
+// import above is never consulted. An alias is the only spelling that reaches ours from here, since
+// IDE0001 rules out qualifying the name and an alias sharing it is silently ignored.
+using GameObjectsNetworkTimeSystem = Unity.Netcode.GameObjects.Timing.NetworkTimeSystem;
 
 
 
@@ -1017,7 +1022,7 @@ public NetworkPrefabHandler PrefabHandler
         /// Accessor property for the <see cref="NetworkTimeSystem"/> of the NetworkManager.
         /// Prefer the use of the LocalTime and ServerTime properties
         /// </summary>
-        public NetworkTimeSystem NetworkTimeSystem { get; private set; }
+        public GameObjectsNetworkTimeSystem NetworkTimeSystem { get; private set; }
 
         /// <summary>
         /// Accessor property for the <see cref="NetworkTickSystem"/> of the NetworkManager.
@@ -1310,7 +1315,7 @@ internal void Initialize(bool server)
             ConnectionManager.Initialize(this);
 
             // The remaining systems can then be initialized
-            NetworkTimeSystem = server ? NetworkTimeSystem.ServerTimeSystem() : new NetworkTimeSystem(1.0 / NetworkConfig.TickRate);
+            NetworkTimeSystem = server ? GameObjectsNetworkTimeSystem.ServerTimeSystem() : new GameObjectsNetworkTimeSystem(1.0 / NetworkConfig.TickRate);
             NetworkTickSystem = NetworkTimeSystem.Initialize(this);
             AnticipationSystem = new AnticipationSystem(this);