From 2d23b6f324505095d396383d3eda3a02136f8ac3 Mon Sep 17 00:00:00 2001
From: Simon Wittber <simonwittber@unity3d.com>
Date: Wed, 24 Apr 2024 11:40:22 +0800
Subject: [PATCH 1/4] more information in the dialog to restart the editor.
---
Packages/com.unity.inputsystem/InputSystem/InputSystem.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs
index c7f78b18bd..74d6b2a10f 100644
--- a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs
@@ -3601,7 +3601,7 @@ internal static void InitializeInEditor(IInputRuntime runtime = null)
{
const string dialogText = "This project is using the new input system package but the native platform backends for the new input system are not enabled in the player settings. " +
"This means that no input from native devices will come through." +
- "\n\nDo you want to enable the backends? Doing so will *RESTART* the editor.";
+ "\n\nDo you want to enable the backends? Doing so will *RESTART* the editor. If you do this, you will need to start the import process again for any packages that are waiting to be imported.";
if (EditorUtility.DisplayDialog("Warning", dialogText, "Yes", "No"))
{
From 784f3c4a8a479ddd4c742ee2d6e53eee4c4e38ee Mon Sep 17 00:00:00 2001
From: Simon Wittber <simonwittber@unity3d.com>
Date: Fri, 26 Apr 2024 11:04:13 +0800
Subject: [PATCH 2/4] changelog entry
---
Packages/com.unity.inputsystem/CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md
index 3ca64f857c..5a4cdf4a25 100644
--- a/Packages/com.unity.inputsystem/CHANGELOG.md
+++ b/Packages/com.unity.inputsystem/CHANGELOG.md
@@ -27,6 +27,7 @@ however, it has to be formatted properly to pass verification tests.
### Changed
- For Unity 6.0 and above, when an `EventSystem` GameObject is created in the Editor it will have the
`InputSystemUIInputModule` by default if the Input System package is installed and enabled.
+- Added information to the 'Restart Editor' dialog to clarify impact on packages pending import [ISXB-608](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-608).
## [1.8.1] - 2024-03-14
From 94e5cea5253e318cbd5d7526bbe92c228fbf4826 Mon Sep 17 00:00:00 2001
From: Simon Wittber <simonwittber@unity3d.com>
Date: Mon, 10 Jun 2024 10:19:25 +0800
Subject: [PATCH 3/4] updated dialog text
---
.../com.unity.inputsystem/InputSystem/InputSystem.cs | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs
index 74d6b2a10f..4fd260505f 100644
--- a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs
@@ -3599,11 +3599,12 @@ internal static void InitializeInEditor(IInputRuntime runtime = null)
!EditorPlayerSettingHelpers.newSystemBackendsEnabled &&
!s_Manager.m_Runtime.isInBatchMode)
{
- const string dialogText = "This project is using the new input system package but the native platform backends for the new input system are not enabled in the player settings. " +
- "This means that no input from native devices will come through." +
- "\n\nDo you want to enable the backends? Doing so will *RESTART* the editor. If you do this, you will need to start the import process again for any packages that are waiting to be imported.";
+ const string dialogText =
+ "Unity is importing the newer Input System package, but the older Input Manager is currently active. The Input System package needs to enable the newer system and and restart the Editor now.\r\n" +
+ "If you don't enable and restart now, the old input manager will remain active, and the Input System package won't work correctly.\r\n" +
+ "Note: If you were installing a different package (such as an Asset Store package) for which the Input System is a dependency, this restart will interrupt the import process. This means once the Editor has restarted, you must return to the Package Manager window and import your intended package again to finish the import process.";
- if (EditorUtility.DisplayDialog("Warning", dialogText, "Yes", "No"))
+ if (EditorUtility.DisplayDialog("Warning", dialogText, "Enable and restart Editor now", "Cancel"))
{
EditorPlayerSettingHelpers.newSystemBackendsEnabled = true;
EditorHelpers.RestartEditorAndRecompileScripts();
From 5b663e6e72f6ae03048de05d5cb4f6d7874bbe0b Mon Sep 17 00:00:00 2001
From: Simon Wittber <simonwittber@unity3d.com>
Date: Mon, 10 Jun 2024 12:37:44 +0800
Subject: [PATCH 4/4] format fix
---
Packages/com.unity.inputsystem/InputSystem/InputSystem.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs
index 4fd260505f..ae233609f1 100644
--- a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs
@@ -3599,7 +3599,7 @@ internal static void InitializeInEditor(IInputRuntime runtime = null)
!EditorPlayerSettingHelpers.newSystemBackendsEnabled &&
!s_Manager.m_Runtime.isInBatchMode)
{
- const string dialogText =
+ const string dialogText =
"Unity is importing the newer Input System package, but the older Input Manager is currently active. The Input System package needs to enable the newer system and and restart the Editor now.\r\n" +
"If you don't enable and restart now, the old input manager will remain active, and the Input System package won't work correctly.\r\n" +
"Note: If you were installing a different package (such as an Asset Store package) for which the Input System is a dependency, this restart will interrupt the import process. This means once the Editor has restarted, you must return to the Package Manager window and import your intended package again to finish the import process.";