MERGE: develop => stable.

Author: Rene Damm

Assets/Samples/InGameHints/InGameHintsActions.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.1.0
+//     version 1.1.1
 //     from Assets/Samples/InGameHints/InGameHintsActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

Assets/Samples/SimpleDemo/SimpleControls.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.1.0
+//     version 1.1.1
 //     from Assets/Samples/SimpleDemo/SimpleControls.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -8,6 +8,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 Due to package verification, the latest version below is the unpublished version and the date is meaningless.
 however, it has to be formatted properly to pass verification tests.
 
+## [1.1.1] - 2021-09-03
+
+### Fixed
+
+- Fixed `InvalidCastException: Specified cast is not valid.` and `InvalidOperationException: Already have an event buffer set! Was OnUpdate() called recursively?` when upgrading from 1.1.0-pre.5 or earlier. If you experience this issue you can also restart the editor to resolve it.
+- Fixed `InputDeviceChange.Destroyed` not being available, now it's correctly marked as obsolete instead.
+- Removed documentation around platform user account management of `InputUser` which was ahead of actual backend support for the feature.
+
 ## [1.1.0] - 2021-08-27
 
 ### Changed

Packages/com.unity.inputsystem/Documentation~/UserManagement.md

@@ -4,7 +4,7 @@ The Input System supports multi-user management through the [`InputUser`](../api
 
 >__Note__: The user management API is quite low-level in nature. The stock functionality of [`PlayerInputManager`](Components.md#playerinputmanager-component) (see [Components](./Components.md)) provides an easier way to set up user management. The API described here is useful when you want more control over user management.
 
-In the Input System, each [`InputUser`](../api/UnityEngine.InputSystem.Users.InputUser.html) represents a human interacting with the application. For example, you can have multiple users playing a game together on a single computer or device (local multiplayer), where each user has one or more [paired Input Devices](#device-pairing). A user might be associated with a platform [user account](#user-account-management), if the platform and Devices support it.
+In the Input System, each [`InputUser`](../api/UnityEngine.InputSystem.Users.InputUser.html) represents a human interacting with the application. For example, you can have multiple users playing a game together on a single computer or device (local multiplayer), where each user has one or more [paired Input Devices](#device-pairing).
 
 The [`PlayerInputManager`](Components.md#playerinputmanager-component) class uses [`InputUser`](../api/UnityEngine.InputSystem.Users.InputUser.html) internally to handle users.
 
@@ -34,16 +34,6 @@ If paired Input Devices disconnect during the session, the system notifies the [
 
 To get notifications about these changes, subscribe to the [`InputUser.onChange`](../api/UnityEngine.InputSystem.Users.InputUser.html#UnityEngine_InputSystem_Users_InputUser_onChange) event.
 
-## User account management
-
-The Input System can associate a user with a platform-specific user account, if both the platform and the Devices support this. Consoles commonly support this functionality. Platforms that support user account association are Xbox One, PlayStation 4, Nintendo Switch, and UWP.
-
-Use the [`platformUserAccountHandle`](../api/UnityEngine.InputSystem.Users.InputUser.html#UnityEngine_InputSystem_Users_InputUser_platformUserAccountHandle) property to query the associated user account for an [`InputUser`](../api/UnityEngine.InputSystem.Users.InputUser.html). This property gets determined when the user is first [paired to a Device](#device-pairing), and the Device has any platform user information the Input System can query.
-
-The account associated with an InputUser might change if the player uses the platform's facilities to switch to a different account ([`InputUser.onChange`](../api/UnityEngine.InputSystem.Users.InputUser.html#UnityEngine_InputSystem_Users_InputUser_onChange) receives an `InputUserChange.AccountChanged` notification).
-
-Note that for WSA/UWP apps, the *User Account Information* capability must be enabled for the app in order for user information to come through on input devices.
-
 ## Debugging
 
 Check the debugger documentation to learn [how to debug active users](Debugging.md#debugging-users-and-playerinput).

Packages/com.unity.inputsystem/InputSystem/AssemblyInfo.cs

@@ -15,7 +15,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.1.0";
+        internal const string kAssemblyVersion = "1.1.1";
         internal const string kDocUrl = "https://docs.unity3d.com/Packages/[email protected]";
     }
 }

Packages/com.unity.inputsystem/InputSystem/Devices/InputDevice.cs

@@ -619,16 +619,16 @@ internal enum DeviceFlags
 
             HasStateCallbacks = 1 << 1,
             HasControlsWithDefaultState = 1 << 2,
-            HasDontResetControls = 1 << 3,
-            HasEventMerger = 1 << 4,
+            HasDontResetControls = 1 << 10,
+            HasEventMerger = 1 << 13,
 
-            Remote = 1 << 5, // It's a local mirror of a device from a remote player connection.
-            Native = 1 << 6, // It's a device created from data surfaced by NativeInputRuntime.
+            Remote = 1 << 3, // It's a local mirror of a device from a remote player connection.
+            Native = 1 << 4, // It's a device created from data surfaced by NativeInputRuntime.
 
-            DisabledInFrontend = 1 << 7, // Explicitly disabled on the managed side.
-            DisabledInRuntime = 1 << 8, // Disabled in the native runtime.
-            DisabledWhileInBackground = 1 << 9, // Disabled while the player is running in the background.
-            DisabledStateHasBeenQueriedFromRuntime = 1 << 10, // Whether we have fetched the current enable/disable state from the runtime.
+            DisabledInFrontend = 1 << 5, // Explicitly disabled on the managed side.
+            DisabledInRuntime = 1 << 7, // Disabled in the native runtime.
+            DisabledWhileInBackground = 1 << 8, // Disabled while the player is running in the background.
+            DisabledStateHasBeenQueriedFromRuntime = 1 << 6, // Whether we have fetched the current enable/disable state from the runtime.
 
             CanRunInBackground = 1 << 11,
             CanRunInBackgroundHasBeenQueried = 1 << 12,

Packages/com.unity.inputsystem/InputSystem/Devices/InputDeviceChange.cs

@@ -1,3 +1,4 @@
+using System;
 using UnityEngine.InputSystem.LowLevel;
 using UnityEngine.InputSystem.Utilities;
 
@@ -119,5 +120,8 @@ public enum InputDeviceChange
         /// This notification is sent before the actual reset happens.
         /// </summary>
         HardReset,
+
+        [Obsolete("Destroyed enum has been deprecated.")]
+        Destroyed,
     }
 }

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.1.0
+//     version 1.1.1
 //     from "Keyboard" layout
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

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.1.0
+//     version 1.1.1
 //     from "Mouse" layout
 //
 //     Changes to this file may cause incorrect behavior and will be lost if

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.1.0
+//     version 1.1.1
 //     from "Touchscreen" layout
 //
 //     Changes to this file may cause incorrect behavior and will be lost if