chore: upgrade to Unity 6000.5.4f1

[eordano]

Bump the editor and migrate the DCL code that hit APIs removed in 6000.5:

• EntityId replaces the obsolete int instance-id APIs. Physics.BakeMesh now takes an EntityId (Utils, BakeColliderMeshes, CollideTerrainSystem), and the collider-bake job array is typed NativeArray.
• MetricsRegistry guards its type scan: IsAssignableFrom can force-load a precompiled dependency type that 6000.5's Mono fails to resolve, which would otherwise throw from the static ctor and take request metrics down.

Verified compiling and running on 6000.5.2f1 (editor boots, enters play mode, reaches interactive).

This fixes the NPE on Unity Editor start

[decentraland-bot]

PR Review — chore: upgrade to Unity 6000.5.2f1

STEP 2 — Root-cause check: ✅ PASS

The PR fixes two distinct breakages introduced by Unity 6000.5:

1. Physics.BakeMesh API change — Unity 6000.5 replaced the int instance-ID parameter with EntityId. The diff migrates all three call sites (Utils.cs, BakeColliderMeshes.cs, CollideTerrainSystem.cs) to the new GetEntityId() API and updates the NativeArray<int> typing to NativeArray<EntityId>. This is a correct root-cause fix — the old APIs were removed, and the new ones are the documented replacements.

2. MetricsRegistry static-constructor crash — IsAssignableFrom can force-load type definitions that 6000.5's Mono can't resolve, throwing from the static initializer and taking down the entire request-metrics subsystem. The fix wraps the call in IsAssignableSafe with a try/catch, mirroring the existing GetTypesSafely pattern in the same class. This is a correct defensive fix — the root cause is in Unity's Mono runtime (not controllable by this project), and the alternative (letting the static ctor throw) is strictly worse.

STEP 3 — Design & integration: ✅ PASS

No new long-lived units introduced. The only new code is IsAssignableSafe(Type), a private static helper method that extracts error handling from the existing LINQ predicate. No lifecycle management, no persistent state, no new subscriptions or connections.

The EntityId migration is consistent across all three call sites — Utils.AddMeshCollider, CollideTerrainSystem.Update, and BakeColliderMeshes.Execute all use the same API transition. EntityId is a blittable struct in Unity 6000.5, so the [BurstCompile] job and NativeArray<EntityId> remain compatible.

STEP 4 — Member audit: ✅ PASS

IsAssignableSafe(Type type) — private static, single consumer (the Where clause in the TYPES static field initializer). Justified as an error-handling extraction: it keeps the LINQ chain readable and makes the defensive try/catch visible. The existing GetTypesSafely in the same class follows the same "extract-for-safety" pattern.

STEP 5 — Line-level review

One P2 finding (see inline comment on MetricsRegistry.cs).

• Physics API migration (Utils.cs:44, BakeColliderMeshes.cs:11, CollideTerrainSystem.cs:140-144): Correct. GetEntityId() is the 1:1 replacement for the removed GetInstanceID() in the physics mesh-baking context. The NativeArray<EntityId> type change is consistent with the BakeColliderMeshes job field.
• LINQ in MetricsRegistry: Runs once in a static field initializer (not a hot path). No performance concern.
• No resource leaks: No new subscriptions, connections, or allocations without matching teardown.
• No nullability violations: No null assignments to non-nullable types.

Security review: ✅ PASS

• No secrets, credentials, or API keys in the diff
• No input validation changes
• No auth/authz modifications
• No sensitive data exposure
• The bare catch in IsAssignableSafe is defensive (more restrictive, not less) — it cannot introduce a security vulnerability
• The EntityId migration is a type-system change with no security surface

STEP 6 — Complexity: SIMPLE

Mechanical API migration across 3 call sites + one defensive helper method. No ECS system logic, async flow, or architectural changes.

STEP 7 — QA: YES

Changes affect runtime physics collider baking (terrain + GLTF meshes) and the metrics registry. Author reports verified compilation and interactive play mode on 6000.5.2f1.

STEP 8 — Warnings

None. Main scene not modified.

STEP 9 — Verdict

REVIEW_RESULT: PASS ✅
COMPLEXITY: SIMPLE
COMPLEXITY_REASON: Mechanical Unity API migration (GetInstanceID → GetEntityId) across 3 call sites plus a defensive try/catch in a static initializer
QA_REQUIRED: YES

---

Reviewed by Jarvis 🤖 · Requested by mikhail-dcl via GitHub

[decentraland-bot]

[P2] Minor: bare catch could be narrowed for clarity. The bare catch silently swallows all exception types including non-CLS-compliant ones. While the behavior is correct here (any failure from IsAssignableFrom means the type is unusable, so false is the right answer), catch (Exception) is the conventional C# idiom and would be consistent with GetTypesSafely above which catches a specific exception type.

Tradeoff acknowledged: catching broadly is intentional since IsAssignableFrom can fail with various exception types (TypeLoadException, FileNotFoundException, FileLoadException, etc.), not just the one named in the XML doc. catch (Exception) is functionally equivalent for managed exceptions but signals intent more clearly.

Suggested change

	catch { return false; }
	catch (Exception) { return false; }

[eordano]

Updated to Unity 6000.5.4f1 (was 6000.5.2f1) and verified in-editor: clean script compile (0 errors), clean shader compile, boots to the authentication screen with correctly shaded avatars and working UI Toolkit text.

What 6000.5.3+ broke on top of .2f1 (all were warnings on .2f1, errors on .4f1):

• InstanceID deprecations escalated to errors → third-party packages migrated to EntityId on unity-explorer-packages#fix/unity-6000.5.4-api-compat (single commit, must be merged with this PR). AltTester 2.3.0 / SerializeReferenceExtensions 1.3.1 / AnimationSequencer 0.5.4 are now vendored there at their previously pinned versions since upstream has no 6000.5 support.
• UnityEngine.XR types moved behind com.unity.modules.xr → added to the manifest.
• URP 17.5's LitForwardPass.hlsl self-includes LitInput.hlsl → collided with DCL_Toon's input (magenta avatars). Fixed with a 10-line guard-reuse on unity-shared-dependencies#fix/unity-6000.5-shader-compat (must also be merged with this PR).
• UI Toolkit's Advanced Text Generator (default-on) can't use static font assets (blank text) → the two Inter font assets migrated to dynamic atlas population per Unity's migration guide, baked atlases retained.
• SoftMask → 3.6.2 and UniTask → latest master, both of which fixed 6000.5 upstream.

A multi-agent audit of the full diff ran before the last commit; all confirmed findings are addressed (no silent package bumps, no editor churn in the diff, deterministic 6000.5 migration artifacts committed, test-only localization table kept out of shipped addressables — note Localization 1.5.12's sync may try to re-add it on editor open).

Known cosmetic regression: Metal now logs Incompatible texture type [MTLTextureType2D] of texture [UnityWhite] … expected [MTLTextureType2DArray] warnings for DCL_Toon when avatar material slots are empty — new 6000.5 validation, rendering is unaffected; worth a follow-up to bind default texture arrays.

Before merge: repoint the nine unity-explorer-packages refs and unity-shared-dependencies from the fix branches to main once those branches merge.

🤖 Generated with Claude Code

[eordano]

Second full audit + final fixes. A re-audit workflow (48 agents) reviewed the finalized upgrade; all confirmed findings addressed. Latest state: bf7aa8a6f, compiles clean, boots to auth with zero missing-glyph warnings (was 8), verified in-world at Genesis Plaza.

Since the last summary:

• ac7ed0298 — unlink the hard-referenced sprite in ControlsPanel.prefab (fixes the [UI] Image must not have a sprite lint on panel preallocation).
• 935b48156 / 2a84d9382 — CJK fallback fonts now load awaited during chat init, and live TMP texts refresh when they land.
• bf7aa8a6f — UIDesignGlyphs SDF: a 3-glyph (文あ中) static fallback baked from NotoSansSC and wired into Inter-Regular SDF, because those glyphs are serialized in UI prefabs (auto-translate indicator, 中文 dropdown) and render before any runtime font loading. Source-font reference stripped, so no OTF build dependency.
• unity-explorer-packages branch amended to 1293099 — drops 7 Ocean .mat editor resaves that had slipped into the squash; lock re-pinned.

For-the-record notes from the audit (accepted, documenting so nothing is silent):

• decentraland.grassshader and superscrollview lock hashes moved to uep main 53f8551 (they track the default branch): grassshader content-identical; superscrollview picks up one upstream change (LoopListView2.GetItemPos private→public, additive).
• The unity-shared-dependencies pin (c424175) is main+1 and therefore also carries upstream main's facd86e (DirectBRDFSpecular FP16 overflow clamp) — it would arrive on the next re-resolve anyway.
• Correction to 901a37c02's commit message: the vendored AltTester is 2.3.0 (the previously pinned version), not 2.3.2.

🤖 Generated with Claude Code

[eordano]

Landing sequence is now set up and cross-version verified:

1. decentraland/unity-explorer-packages#60 (EntityId migration + vendored AltTester/SerializeReferenceExtensions/AnimationSequencer)
2. fix: keep URP 17.5 LitInput out of the DCL_Toon ForwardLit pass unity-shared-dependencies#95 (DCL_Toon guard for URP 17.5's LitInput self-include)
3. this PR (rebased onto current dev, ba70dfd80), then repoint the ten branch pins to main + refresh the lock.

Both dependency branches compile with zero errors on current dev (6000.4.0f1) and on this PR (6000.5.4f1) — they are safe to merge first without breaking anyone still on 6000.4. Two cross-version fixes were needed and are included: AdvancedDropdownItem.childList is 6000.5-only (now version-guarded) and Shaders/Utils/SurfaceType.hlsl doesn't exist in 6000.4's URP (function now inlined under the file's own guard).

🤖 Generated with Claude Code

[eordano]

Full player-build verification (macOS)

Went past editor compiles to real player builds, which compile shader variants (DOTS instancing) and run IL2CPP — neither of which an editor compile exercises. This surfaced several player-only breaks, now all fixed:

6000.5.4f1 — full IL2CPP player build ✅ SUCCEEDED, 0 script / 0 shader / 0 IL2CPP errors, .app boots to auth screen and renders correctly. Fixes it required (all pushed):

• MountainLitInput.hlsl: _TerrainBounds declared float but used as float4 — 6000.5 encodes the type into the DOTS metadata symbol name, so the player variant failed (undeclared unity_DOTSInstancingF16_Metadata_TerrainBounds). Now float4. (commit ad8419e)
• Sentry 4.0.0 → 4.7.0: 4.0.0's repackaged System.Memory/System.Text.Json shims crash 6000.5's IL2CPP Span-intrinsic remapper (Sequence contains no matching element in IntrinsicRemap.SpanGetItemArguments), failing every player build with 9 conversion errors. (commit 00bd7e7)
• unity-shared-dependencies shader fixes (see IL2CPP Crash on Start #95): DOTS-instancing player variants.

6000.4.0f1 — player build: dependency packages compile with 0 shader errors; the only failure was this repo's own pre-existing MountainLit bug (same root cause, also breaks 6000.4 player builds — not 6000.5-specific), which ad8419e fixes. Full green clean-pass in final confirmation.

State

• Rebased onto current dev (89f53c0), MERGEABLE, still draft.
• Pins unity-explorer-packages#60 (6bc4241) and unity-shared-dependencies#95 (de4cce8); both verified compiling on 6000.4.0f1 dev AND 6000.5.4f1, so they can land first.
• Merge order: chore: enable edit-mode tests #60 → IL2CPP Crash on Start #95 → this → repoint the 10 branch pins to main.

🤖 Generated with Claude Code

[eordano]

✅ Windows/DirectX verified. Full 6000.5.4f1 StandaloneWindows64 player build on the Windows rig succeeded — 0 shader errors, 0 CS errors across 132k log lines, Explorer.exe produced. The DCL_Toon ForwardLit, DCL/Scene, and all DOTS-instancing variants compiled clean on d3d11. This closes the last platform gap: the upgrade's shader fixes now verified on both macOS/Metal and Windows/DirectX, across both 6000.4 and 6000.5 editors.