chore: depend on n4e 6.7.0 and compile the unified path against either version

The 7.0.0 dependency could not be satisfied anywhere. Every editor available today - 6000.7.0a6 and
current trunk alike - lists com.unity.netcode 6.7.0 as mustBeBundled in its manifest, so UPM drops a
7.0.0 request silently: no assemblies, no packages-lock entry, no warning. upm-pvp then fails hard
with "depends on com.unity.netcode, which is not in the lock file", which is what took out Validate
on all three platforms and Package Test on both editors.

Dependency versions are minimums, so asking for 6.7.0 resolves the bundled package today and picks up
7.0.0 by itself once an editor manifest carries it. The transport bump goes back to 2.6.0: 6.5.0 was
never published (the 6.x line is editor-bundled only, latest published is 2.7.4), so it fails
PVP-160-1, which the Validate job explicitly requires - and N4E asks for 6.5.0 itself, so resolution
is unaffected either way. With the dependency resolving everywhere, nothing needs a trunk editor and
validation_editors goes back to what develop had.

Since either version can now be what resolves, the unified path compiles against both, gated on a
UNIFIED_NETCODE_7_0_0 versionDefine keyed to the resolved package version. The 6.7.0 spellings are
aliased to the 7.0.0 names so the use sites read the same either way, except N4E's Netcode class:
inside namespace Unity.Netcode that name binds to the enclosing namespace before any file-scope alias
is considered, so it is aliased as EntitiesNetcode in both. GhostObjectScaleExtensions is 7.0.0-only,
since 6.7.0 still has the method it stands in for.

That also makes the dependency real rather than dropped, which has consequences worth knowing: N4E's
assemblies now build in every project, its ClientServerBootstrap becomes the Entities bootstrap with a
non-zero AutoConnectPort, and it writes a NetcodeConfig into the project when its settings asset does
not resolve one - which is why the GlobalNetCodeConfig field goes back to the 6.7.0 spelling here.

Verified on 6000.7.0a6 against both versions: shipping (unified off), unified against bundled 6.7.0,
and unified against 7.0.0 all compile with zero errors, and the standards check is clean.

Author: NoelStephensUnity

.yamato/project.metafile

@@ -175,16 +175,9 @@ test_platforms:
 # Editors to be used for testing. NGOv3.X official support started from 6000.7 editor
 # TODO: When a new editor will be released it should be added to this list
 
-# TEMPORARY: only trunk has dropped Netcode for Entities as a core package, so only there does the
-# com.unity.netcode 7.0.0 dependency resolve. A released editor bundles 6.7.0 as a built-in package and
-# UPM then drops the 7.0.0 request silently, leaving N4E out of the project entirely - which still
-# compiles, since the unified API is opt-in. `default` runs the jobs that should see N4E present.
-# `minimal` stays on a released editor: it is what the standards job opens the project with, and trunk
-# rewrites ProjectVersion.txt out from under the cleanliness check. Restore `default` once a released
-# editor ships without N4E as a core package; `all` is left alone as the reminder.
 validation_editors:
     default:
-        - trunk
+        - 6000.7
     all:
         - 6000.7.0a6
         - 6000.7

com.unity.netcode.gameobjects/CHANGELOG.md

@@ -10,12 +10,10 @@ Additional documentation and release notes are available at [Multiplayer Documen
 
 ### Added
 
-- Netcode for Entities (`com.unity.netcode` 7.0.0) is now a dependency, so installing Netcode for GameObjects also brings it, and its own dependencies (Entities, Burst, Collections), into the project.
+- Netcode for Entities (`com.unity.netcode` 6.7.0) is now a dependency, so installing Netcode for GameObjects also brings it, and its own dependencies (Entities, Burst, Collections), into the project.
 
 ### Changed
 
-- The `com.unity.transport` dependency moved from 2.6.0 to 6.5.0, the version Netcode for Entities 7.0.0 requires.
-
 - Changed `NetworkTransform.UseHalfFloatPrecision` to synchronize position with a resolution of approximately 1mm regardless of how far an object has travelled. Previously the resolution could degrade to approximately 3cm. This does not increase bandwidth, but projects using `NetworkTransform.UseUnreliableDeltas` will send full precision position updates more often. (#4129)
 
 - All editor assembly definitions are renamed with `Unity.Netcode.GameObjects.x` variants

com.unity.netcode.gameobjects/Editor/NetworkObjectEditor.cs

@@ -1,6 +1,11 @@
 using System.Collections.Generic;
 #if UNIFIED_NETCODE
+#if UNIFIED_NETCODE_7_0_0
 using Unity.Netcode.Editor;
+#else
+using Unity.NetCode;
+using Unity.NetCode.Editor;
+#endif
 #endif
 using UnityEditor;
 using UnityEngine;

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

@@ -21,6 +21,11 @@
     "autoReferenced": true,
     "defineConstraints": [],
     "versionDefines": [
+        {
+            "name": "com.unity.netcode",
+            "expression": "7.0.0",
+            "define": "UNIFIED_NETCODE_7_0_0"
+        },
         {
             "name": "com.unity.multiplayer.tools",
             "expression": "",

com.unity.netcode.gameobjects/Runtime/Components/Helpers/NetworkObjectBridge.cs

@@ -1,5 +1,8 @@
 #if UNIFIED_NETCODE
 using Unity.Mathematics;
+#if !UNIFIED_NETCODE_7_0_0
+using Unity.NetCode;
+#endif
 using Unity.Transforms;
 using UnityEngine;
 
@@ -87,10 +90,12 @@ internal void ApplyScale(Vector3 scale)
         }
     }
 
+#if UNIFIED_NETCODE_7_0_0
     /// <summary>
-    /// Stands in for N4E's <c>GhostObject.ApplyPostTransformMatrixScale</c>, removed by the 6.7.0 non-uniform
-    /// scale rework that gave the GameObject-to-entity transform sync ownership of the
-    /// <see cref="PostTransformMatrix"/>. Remove this once N4E exposes a supported way to push scale to a ghost.
+    /// Stands in for N4E's <c>GhostObject.ApplyPostTransformMatrixScale</c>, which 7.0.0 removed along with the
+    /// non-uniform scale rework that gave the GameObject-to-entity transform sync ownership of the
+    /// <see cref="PostTransformMatrix"/>. 6.7.0 still has the method, so this is only compiled against 7.0.0.
+    /// Remove it once N4E exposes a supported way to push scale to a ghost.
     /// </summary>
     internal static class GhostObjectScaleExtensions
     {
@@ -123,5 +128,6 @@ internal static void ApplyPostTransformMatrixScale(this GhostObject ghost, Vecto
             entityManager.SetComponentData(entity, localTransform);
         }
     }
+#endif
 }
 #endif

com.unity.netcode.gameobjects/Runtime/Components/Helpers/UnifiedBootstrap.cs

@@ -4,6 +4,9 @@
 #if UNIFIED_NETCODE
 using System;
 using Unity.Entities;
+#if !UNIFIED_NETCODE_7_0_0
+using Unity.NetCode;
+#endif
 using UnityEngine;
 
 namespace Unity.Netcode

com.unity.netcode.gameobjects/Runtime/Components/Helpers/UnifiedUpdateConnections.cs

@@ -2,6 +2,9 @@
 using System.Collections.Generic;
 using Unity.Collections;
 using Unity.Entities;
+#if !UNIFIED_NETCODE_7_0_0
+using Unity.NetCode;
+#endif
 using UnityEngine;
 
 namespace Unity.Netcode.Components

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

@@ -4,6 +4,17 @@
 using Unity.Collections;
 #if UNIFIED_NETCODE
 using Unity.Entities;
+// N4E's own Netcode class cannot be aliased as "Netcode": inside namespace Unity.Netcode that name
+// resolves to the enclosing Unity.Netcode namespace before any file-scope alias is considered, so it gets
+// its own name here. 6.7.0 additionally keeps the config and world types under the older Unity.NetCode
+// casing, aliased to the 7.0.0 spellings so the use sites below read the same either way.
+#if UNIFIED_NETCODE_7_0_0
+using EntitiesNetcode = Unity.Netcode.Netcode;
+#else
+using EntitiesNetcode = Unity.NetCode.Netcode;
+using NetcodeConfig = Unity.NetCode.NetCodeConfig;
+using NetcodeWorld = Unity.NetCode.NetcodeWorld;
+#endif
 #endif
 using Unity.Netcode.Components;
 using Unity.Netcode.GameObjects.Timing;
@@ -1370,13 +1381,13 @@ internal void InitializeNetcodeWorld()
 
             if (this == Singleton)
             {
-                if (Netcode.IsActive)
+                if (EntitiesNetcode.IsActive)
                 {
                     Log.Info(new Context(LogLevel.Normal, "Netcode is not active but has an instance at this point."));
                 }
                 /// !! Important !!
                 /// Clear out any pre-existing configuration in the event this applicatioin instance has already been connected to a session.
-                Netcode.Reset();
+                EntitiesNetcode.Reset();
             }
 
             /// !! Initialize worlds here !!

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

@@ -7,7 +7,8 @@
 using Unity.Netcode.Components;
 using Unity.Netcode.Logging;
 using Unity.Netcode.Runtime;
-#if UNIFIED_NETCODE
+#if UNIFIED_NETCODE && !UNIFIED_NETCODE_7_0_0
+using Unity.NetCode;
 #endif
 
 #if UNITY_EDITOR

com.unity.netcode.gameobjects/Runtime/Spawning/NetworkPrefabHandler.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
-#if UNIFIED_NETCODE
+#if UNIFIED_NETCODE && !UNIFIED_NETCODE_7_0_0
+using Unity.NetCode;
 #endif
 using UnityEngine;