Merge branch 'develop' into stable

Author: stefanunity

.yamato/PVPexemptions.json

@@ -247,6 +247,9 @@ publish{% cycle "", "_dryrun" %}:
     - upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
     - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u 2019.4
     - upm-ci package publish --package-path ./Packages/com.unity.inputsystem/ {% cycle "", "--dry-run" %}
+    - upm-pvp xray --packages "upm-ci~/packages/*.tgz" --results upm-ci~/xray
+    - upm-pvp require "supported rme" --no-report --allow-missing --results upm-ci~/xray --exemptions upm-ci~/xray/new-exemptions.json
+    - upm-pvp require "supported rme ./.yamato/PVPexemptions.json" --allow-missing --results upm-ci~/xray    
   artifacts:
     artifacts:
       paths:

.yamato/upm-ci.yml

@@ -1,4 +1,4 @@
 {
   "displayName": "Custom Binding Composite",
   "description": "Shows how to implement a custom composite binding."
-} 
+}

Assets/Samples/CustomComposite/.sample.json

@@ -1,4 +1,4 @@
 {
   "displayName": "Custom Device",
   "description": "Shows how to implement a custom input device."
-} 
+}

Assets/Samples/CustomDevice/.sample.json

@@ -1,4 +1,4 @@
 {
   "displayName": "Custom Device Usages",
   "description": "Shows how to tag devices with custom usage strings that can be used, for example, to distinguish multiple instances of the same type of device (e.g. 'Gamepad') based on how the device is used (e.g. 'Player1' vs 'Player2' or 'LeftHand' vs 'RightHand')."
-} 
+}

Assets/Samples/CustomDeviceUsages/.sample.json

@@ -1,4 +1,4 @@
 {
   "displayName": "Gamepad Mouse Cursor",
   "description": "An example that shows how to use the gamepad for driving a mouse cursor for use with UIs."
-} 
+}

Assets/Samples/CustomDeviceUsages/.sample.json.meta

@@ -1,4 +1,4 @@
 {
   "displayName": "In-Game Hints",
   "description": "Demonstrates how to create in-game hints in the UI which reflect current bindings and active control schemes."
-} 
+}

Assets/Samples/GamepadMouseCursor/.sample.json

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.9.0
+//     version 1.10.0
 //     from Assets/Samples/InGameHints/InGameHintsActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -14,7 +14,6 @@
 using System.Collections.Generic;
 using UnityEngine.InputSystem;
 using UnityEngine.InputSystem.Utilities;
-using UnityEngine;
 
 namespace UnityEngine.InputSystem.Samples.InGameHints
 {
@@ -275,7 +274,7 @@ public @InGameHintsActions()
 
         ~@InGameHintsActions()
         {
-            Debug.Assert(!m_Gameplay.enabled, "This will cause a leak and performance issues, InGameHintsActions.Gameplay.Disable() has not been called.");
+            UnityEngine.Debug.Assert(!m_Gameplay.enabled, "This will cause a leak and performance issues, InGameHintsActions.Gameplay.Disable() has not been called.");
         }
 
         public void Dispose()

Assets/Samples/InGameHints/.sample.json

@@ -1,4 +1,4 @@
 {
   "displayName": "InputDeviceTester",
   "description": "A scene containing UI to visualize the controls on various supported input devices."
-} 
+}