Merge branch 'develop' into type-registration-source-generator

ekcoh · web-flow · commit da27148853e2 · 2025-11-28T16:36:59.000+01:00
diff --git a/Assets/Samples/InGameHints/InGameHintsActions.cs b/Assets/Samples/InGameHints/InGameHintsActions.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.16.1
+//     version 1.17.1
 //     from Assets/Samples/InGameHints/InGameHintsActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
diff --git a/Assets/Samples/SimpleDemo/SimpleControls.cs b/Assets/Samples/SimpleDemo/SimpleControls.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.16.1
+//     version 1.17.1
 //     from Assets/Samples/SimpleDemo/SimpleControls.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
diff --git a/Assets/Tests/InputSystem/InputActionCodeGeneratorActions.cs b/Assets/Tests/InputSystem/InputActionCodeGeneratorActions.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.16.1
+//     version 1.17.1
 //     from Assets/Tests/InputSystem/InputActionCodeGeneratorActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md
@@ -10,6 +10,10 @@ however, it has to be formatted properly to pass verification tests.
 
 ## [Unreleased] - yyyy-mm-dd
 
+
+
+## [1.17.0] - 2025-11-25
+
 ### Changed
 - Project-Wide Input Actions support can no longer be compiled out (removed the `UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS` define). (ISX-2397)
 - Removed code that had to do with Unity versions older than Unity 2022.3 LTS. (ISX-2396)
@@ -19,7 +23,9 @@ however, it has to be formatted properly to pass verification tests.
 ### Fixed
 - An issue where a UITK MouseEvent was triggered when changing from Scene View to Game View in the Editor has been fixed. [ISXB-1671](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1671)
 - Fix documentation error in file AndroidGameController.cs mentioning a wrong controller. [DOCATT-9806]
-
+- Deferred auto-registration of processors, interactions and composite binding types referenced by `InputActionAsset`
+  to only happen once when an unresolved type reference is found in an action definition. This avoids reflective
+  type loading from assemblies for all cases where the Input System is not extended. (ISXB-1766).
 
 ## [1.16.0] - 2025-11-10
 
diff --git a/Packages/com.unity.inputsystem/InputSystem/AssemblyInfo.cs b/Packages/com.unity.inputsystem/InputSystem/AssemblyInfo.cs
@@ -18,7 +18,7 @@ public static partial class InputSystem
         // Keep this in sync with "Packages/com.unity.inputsystem/package.json".
         // NOTE: Unfortunately, System.Version doesn't use semantic versioning so we can't include
         //       "-preview" suffixes here.
-        internal const string kAssemblyVersion = "1.16.1";
-        internal const string kDocUrl = "https://docs.unity3d.com/Packages/com.unity.inputsystem@1.16";
+        internal const string kAssemblyVersion = "1.17.1";
+        internal const string kDocUrl = "https://docs.unity3d.com/Packages/com.unity.inputsystem@1.17";
     }
 }
diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastKeyboard.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastKeyboard.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputLayoutCodeGenerator
-//     version 1.16.1
+//     version 1.17.1
 //     from "Keyboard" layout
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastMouse.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastMouse.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputLayoutCodeGenerator
-//     version 1.16.1
+//     version 1.17.1
 //     from "Mouse" layout
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
diff --git a/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastTouchscreen.cs b/Packages/com.unity.inputsystem/InputSystem/Devices/Precompiled/FastTouchscreen.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputLayoutCodeGenerator
-//     version 1.16.1
+//     version 1.17.1
 //     from "Touchscreen" layout
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
diff --git a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs
@@ -1913,9 +1913,9 @@ private void InitializeActions()
         internal void InitializeData()
         {
             m_Layouts.Allocate();
-            m_Processors.Initialize();
-            m_Interactions.Initialize();
-            m_Composites.Initialize();
+            m_Processors.Initialize(this);
+            m_Interactions.Initialize(this);
+            m_Composites.Initialize(this);
             m_DevicesById = new Dictionary<int, InputDevice>();
 
             // Determine our default set of enabled update types. By
@@ -2026,11 +2026,11 @@ internal void InitializeData()
             composites.AddTypeRegistration("OneModifier", typeof(OneModifierComposite));
             composites.AddTypeRegistration("TwoModifiers", typeof(TwoModifiersComposite));
 
-            // Register custom types by reflection
-            //RegisterCustomTypes();
+            // ISXB-1766: Defer loading custom types by reflection unless we have to since referenced from
+            // .inputaction JSON assets. This is managed via TypeTable.cs.
         }
 
-        void RegisterCustomTypes(Type[] types)
+        static void RegisterCustomTypes(Type[] types)
         {
             foreach (Type type in types)
             {
@@ -2053,8 +2053,18 @@ void RegisterCustomTypes(Type[] types)
             }
         }
 
-        void RegisterCustomTypes()
+        private bool m_CustomTypesRegistered;
+
+        internal bool RegisterCustomTypes()
         {
+            // If we have already attempted to register custom types, there is no need to reattempt since we
+            // would end up with the same result again. Only with a domain reload would the resulting types
+            // be different, and hence it is sufficient to use a static flag that we do not reset.
+            if (m_CustomTypesRegistered)
+                return false; // Already evaluated
+
+            m_CustomTypesRegistered = true;
+
             k_InputRegisterCustomTypesMarker.Begin();
 
             var inputSystemAssembly = typeof(InputProcessor).Assembly;
@@ -2079,11 +2089,13 @@ void RegisterCustomTypes()
                 }
                 catch (ReflectionTypeLoadException)
                 {
-                    continue;
+                    // Ignore exception
                 }
             }
 
             k_InputRegisterCustomTypesMarker.End();
+
+            return true; // Signal that custom types were extracted and registered.
         }
 
         internal void InstallRuntime(IInputRuntime runtime)
@@ -2164,6 +2176,9 @@ internal void UninstallGlobals()
             InputControlLayout.s_CacheInstance = default;
             InputControlLayout.s_CacheInstanceRef = 0;
 
+            // Invalidate type registrations
+            m_CustomTypesRegistered = false;
+
             // Detach from runtime.
             if (m_Runtime != null)
             {
diff --git a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs
@@ -868,7 +868,7 @@ public static bool IsFirstLayoutBasedOnSecond(string firstLayoutName, string sec
         /// different names. When doing so, the first registration is considered as the "proper"
         /// name for the processor and all subsequent registrations will be considered aliases.
         ///
-        /// See the <a href="../manual/Processors.html">manual</a> for more details.
+        /// See the <a href="../manual/UsingProcessors.html">manual</a> for more details.
         /// </remarks>
         /// <seealso cref="InputProcessor{T}"/>
         /// <seealso cref="InputBinding.processors"/>
@@ -998,7 +998,7 @@ public static void RegisterProcessor(Type type, string name = null)
         /// different names. When doing so, the first registration is considered as the "proper"
         /// name for the processor and all subsequent registrations will be considered aliases.
         ///
-        /// See the <a href="../manual/Processors.html">manual</a> for more details.
+        /// See the <a href="../manual/UsingProcessors.html">manual</a> for more details.
         /// </remarks>
         /// <seealso cref="InputProcessor{T}"/>
         /// <seealso cref="InputBinding.processors"/>
diff --git a/Packages/com.unity.inputsystem/InputSystem/Utilities/TypeTable.cs b/Packages/com.unity.inputsystem/InputSystem/Utilities/TypeTable.cs
@@ -25,12 +25,16 @@ internal struct TypeTable
         public HashSet<InternedString> aliases;
         #endif
 
-        public void Initialize()
+        // Strong coupling to Input Manager which is always the owner
+        private InputManager m_Manager;
+
+        public void Initialize(InputManager manager)
         {
             table = new Dictionary<InternedString, Type>();
             #if UNITY_EDITOR
             aliases = new HashSet<InternedString>();
             #endif
+            m_Manager = manager;
         }
 
         public InternedString FindNameForType(Type type)
@@ -80,10 +84,24 @@ public Type LookupTypeRegistration(string name)
             if (table == null)
                 throw new InvalidOperationException("Input System not yet initialized");
 
-            var internedName = new InternedString(name);
-            if (table.TryGetValue(internedName, out var type))
-                return type;
-            return null;
+            return TryLookupTypeRegistration(new InternedString(name));
+        }
+
+        private Type TryLookupTypeRegistration(InternedString internedName)
+        {
+            if (!table.TryGetValue(internedName, out var type))
+            {
+                // Failed to look-up type, either type do not exist or it is a custom type that has not been registered.
+                // Check whether we have attempted to load custom types and otherwise lazily load  types only when
+                // relevant and reattempt looking up type by name. (ISXB-1766)
+                if (m_Manager != null)
+                {
+                    if (m_Manager.RegisterCustomTypes())
+                        table.TryGetValue(internedName, out type);
+                }
+            }
+
+            return type;
         }
 
         #if UNITY_EDITOR
diff --git a/Packages/com.unity.inputsystem/Tests/TestFixture/AssemblyInfo.cs b/Packages/com.unity.inputsystem/Tests/TestFixture/AssemblyInfo.cs
@@ -4,7 +4,7 @@
 // Keep this in sync with "Packages/com.unity.inputsystem/package.json".
 // NOTE: Unfortunately, System.Version doesn't use semantic versioning so we can't include
 //       "-preview" suffixes here.
-[assembly: AssemblyVersion("1.16.1")]
+[assembly: AssemblyVersion("1.17.1")]
 [assembly: InternalsVisibleTo("Unity.InputSystem.Tests.Editor")]
 [assembly: InternalsVisibleTo("Unity.InputSystem.Tests")]
 [assembly: InternalsVisibleTo("Unity.InputSystem.IntegrationTests")]
diff --git a/Packages/com.unity.inputsystem/ValidationExceptions.json b/Packages/com.unity.inputsystem/ValidationExceptions.json
@@ -3,7 +3,7 @@
         {
             "ValidationTest": "API Validation",
             "ExceptionMessage": "Breaking changes require a new major version.",
-            "PackageVersion": "1.16.0",
+            "PackageVersion": "1.17.0",
             "__comments": "starting from 2022.3 ugui is not added to the project by default. We have some APIs that are conditional on ugui being present, so the API Validation thinks we are breaking API, but that is not the case."
         }
     ],
diff --git a/Packages/com.unity.inputsystem/package.json b/Packages/com.unity.inputsystem/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "com.unity.inputsystem",
 	"displayName": "Input System",
-	"version": "1.16.1",
+	"version": "1.17.1",
 	"unity": "2022.3",
 	"description": "A new input system which can be used as a more extensible and customizable alternative to Unity's classic input system in UnityEngine.Input.",
 	"keywords": [

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public static partial class InputSystem`
`18`	`18`	`// Keep this in sync with "Packages/com.unity.inputsystem/package.json".`
`19`	`19`	`// NOTE: Unfortunately, System.Version doesn't use semantic versioning so we can't include`
`20`	`20`	`// "-preview" suffixes here.`
`21`		`- internal const string kAssemblyVersion = "1.16.1";`
`22`		`- internal const string kDocUrl = "https://docs.unity3d.com/Packages/com.unity.inputsystem@1.16";`
	`21`	`+ internal const string kAssemblyVersion = "1.17.1";`
	`22`	`+ internal const string kDocUrl = "https://docs.unity3d.com/Packages/com.unity.inputsystem@1.17";`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1913,9 +1913,9 @@ private void InitializeActions()`
`1913`	`1913`	`internal void InitializeData()`
`1914`	`1914`	`{`
`1915`	`1915`	`m_Layouts.Allocate();`
`1916`		`- m_Processors.Initialize();`
`1917`		`- m_Interactions.Initialize();`
`1918`		`- m_Composites.Initialize();`
	`1916`	`+ m_Processors.Initialize(this);`
	`1917`	`+ m_Interactions.Initialize(this);`
	`1918`	`+ m_Composites.Initialize(this);`
`1919`	`1919`	`m_DevicesById = new Dictionary<int, InputDevice>();`
`1920`	`1920`
`1921`	`1921`	`// Determine our default set of enabled update types. By`
`@@ -2026,11 +2026,11 @@ internal void InitializeData()`
`2026`	`2026`	`composites.AddTypeRegistration("OneModifier", typeof(OneModifierComposite));`
`2027`	`2027`	`composites.AddTypeRegistration("TwoModifiers", typeof(TwoModifiersComposite));`
`2028`	`2028`
`2029`		`- // Register custom types by reflection`
`2030`		`- //RegisterCustomTypes();`
	`2029`	`+ // ISXB-1766: Defer loading custom types by reflection unless we have to since referenced from`
	`2030`	`+ // .inputaction JSON assets. This is managed via TypeTable.cs.`
`2031`	`2031`	`}`
`2032`	`2032`
`2033`		`- void RegisterCustomTypes(Type[] types)`
	`2033`	`+ static void RegisterCustomTypes(Type[] types)`
`2034`	`2034`	`{`
`2035`	`2035`	`foreach (Type type in types)`
`2036`	`2036`	`{`
`@@ -2053,8 +2053,18 @@ void RegisterCustomTypes(Type[] types)`
`2053`	`2053`	`}`
`2054`	`2054`	`}`
`2055`	`2055`
`2056`		`- void RegisterCustomTypes()`
	`2056`	`+ private bool m_CustomTypesRegistered;`
	`2057`	`+`
	`2058`	`+ internal bool RegisterCustomTypes()`
`2057`	`2059`	`{`
	`2060`	`+ // If we have already attempted to register custom types, there is no need to reattempt since we`
	`2061`	`+ // would end up with the same result again. Only with a domain reload would the resulting types`
	`2062`	`+ // be different, and hence it is sufficient to use a static flag that we do not reset.`
	`2063`	`+ if (m_CustomTypesRegistered)`
	`2064`	`+ return false; // Already evaluated`
	`2065`	`+`
	`2066`	`+ m_CustomTypesRegistered = true;`
	`2067`	`+`
`2058`	`2068`	`k_InputRegisterCustomTypesMarker.Begin();`
`2059`	`2069`
`2060`	`2070`	`var inputSystemAssembly = typeof(InputProcessor).Assembly;`
`@@ -2079,11 +2089,13 @@ void RegisterCustomTypes()`
`2079`	`2089`	`}`
`2080`	`2090`	`catch (ReflectionTypeLoadException)`
`2081`	`2091`	`{`
`2082`		`- continue;`
	`2092`	`+ // Ignore exception`
`2083`	`2093`	`}`
`2084`	`2094`	`}`
`2085`	`2095`
`2086`	`2096`	`k_InputRegisterCustomTypesMarker.End();`
	`2097`	`+`
	`2098`	`+ return true; // Signal that custom types were extracted and registered.`
`2087`	`2099`	`}`
`2088`	`2100`
`2089`	`2101`	`internal void InstallRuntime(IInputRuntime runtime)`
`@@ -2164,6 +2176,9 @@ internal void UninstallGlobals()`
`2164`	`2176`	`InputControlLayout.s_CacheInstance = default;`
`2165`	`2177`	`InputControlLayout.s_CacheInstanceRef = 0;`
`2166`	`2178`
	`2179`	`+ // Invalidate type registrations`
	`2180`	`+ m_CustomTypesRegistered = false;`
	`2181`	`+`
`2167`	`2182`	`// Detach from runtime.`
`2168`	`2183`	`if (m_Runtime != null)`
`2169`	`2184`	`{`