CHANGE: Update InstanceID to EntityId for PlayerInputEditor.cs

Assets/Editor/DumpInputActionReferences.cs

@@ -19,8 +19,10 @@ private static void DumpReferences(StringBuilder sb, string prefix, InputActionR
     private static void DumpReferences()
     {
         var sb = new StringBuilder();
+#pragma warning disable CS0618 // Type or member is obsolete
         DumpReferences(sb, "Loaded objects", Object.FindObjectsByType<InputActionReference>(
             FindObjectsInactive.Include, FindObjectsSortMode.InstanceID));
+#pragma warning restore CS0618 // Type or member is obsolete
         DumpReferences(sb, "All objects:", Resources.FindObjectsOfTypeAll<InputActionReference>());
         Debug.Log(sb.ToString());
     }

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -10,7 +10,13 @@ however, it has to be formatted properly to pass verification tests.
 
 ## [Unreleased] - yyyy-mm-dd
 
+### Changed
+
+- Updated `m_ActionAssetInstanceID` in PlayerInputEditor.cs to use `EntityId` instead of `InstanceID`.
 
+### Fixed
+
+### Added
 
 ## [1.18.0] - 2026-01-14
 

Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInputEditor.cs

@@ -97,7 +97,11 @@
 
             var assetChanged = CheckIfActionAssetChanged();
             // initialize the editor component if the asset has changed or if it has not been initialized yet
+#if UNITY_6000_5_OR_NEWER
+            if (EditorGUI.EndChangeCheck() || !m_ActionAssetInitialized || assetChanged || m_ActionAssetEntityId == EntityId.None)
+#else
             if (EditorGUI.EndChangeCheck() || !m_ActionAssetInitialized || assetChanged || m_ActionAssetInstanceID == 0)
+#endif
             {
                 InitializeEditorComponent(assetChanged);
                 actionsWereChanged = true;
@@ -278,6 +282,14 @@
         {
             if (m_ActionsProperty.objectReferenceValue != null)
             {
+#if UNITY_6000_5_OR_NEWER
+                EntityId assetEntityId = m_ActionsProperty.objectReferenceValue.GetEntityId();
+                bool result = assetEntityId != m_ActionAssetEntityId && m_ActionAssetEntityId != EntityId.None;
+                m_ActionAssetEntityId = assetEntityId;
+                return result;
+            }
+
+#else
                 // 6.4 deprecates instance id in favour of entity ids (a class)
                 // Fortunately, there is an implicit cast from entity id to an integer so we can have minimum footprint for now.
                 int assetInstanceID;
@@ -295,6 +307,7 @@
             }
 
             m_ActionAssetInstanceID = -1;
+#endif
             return false;
         }
 
@@ -656,7 +669,11 @@
 
         [NonSerialized] private bool m_NotificationBehaviorInitialized;
         [NonSerialized] private bool m_ActionAssetInitialized;
+#if UNITY_6000_5_OR_NEWER
+        [NonSerialized] private EntityId m_ActionAssetEntityId;
+#else
         [NonSerialized] private int m_ActionAssetInstanceID;
+#endif
     }
 }
 #endif // UNITY_EDITOR