diff --git a/Assets/QA/Tests/Core Platform Menu/SceneMenu.cs b/Assets/QA/Tests/Core Platform Menu/SceneMenu.cs
index 0e6e5aea02..17e7735dca 100644
--- a/Assets/QA/Tests/Core Platform Menu/SceneMenu.cs	
+++ b/Assets/QA/Tests/Core Platform Menu/SceneMenu.cs	
@@ -382,13 +382,13 @@ void BuildSearchBar(Transform parent)
         var ph = MakeText("Placeholder", textArea.transform, "Search scenes\u2026", 18,
             kTextSecondary, TextAlignmentOptions.MidlineLeft);
         ph.fontStyle = FontStyles.Italic;
-        ph.textWrappingMode = TextWrappingModes.NoWrap;
+        DisableWordWrap(ph);
         ph.overflowMode = TextOverflowModes.Ellipsis;
         Stretch(ph.gameObject);
 
         var txt = MakeText("Text", textArea.transform, "", 18,
             kTextPrimary, TextAlignmentOptions.MidlineLeft);
-        txt.textWrappingMode = TextWrappingModes.NoWrap;
+        DisableWordWrap(txt);
         Stretch(txt.gameObject);
 
         var input = bar.AddComponent<TMP_InputField>();
@@ -614,7 +614,7 @@ void BuildSceneButton(Transform parent, SceneEntry entry)
         var nameT = MakeText("Name", go.transform, entry.displayName, 15, kTextPrimary,
             TextAlignmentOptions.Center);
         nameT.overflowMode      = TextOverflowModes.Ellipsis;
-        nameT.textWrappingMode = TextWrappingModes.NoWrap;
+        DisableWordWrap(nameT);
         var nr = Rect(nameT);
         nr.anchorMin = new Vector2(0.04f, 0.38f);
         nr.anchorMax = new Vector2(0.96f, 0.94f);
@@ -626,7 +626,7 @@ void BuildSceneButton(Transform parent, SceneEntry entry)
             var subT = MakeText("Sub", go.transform, entry.subcategory, 11, kTextSecondary,
                 TextAlignmentOptions.Center);
             subT.overflowMode      = TextOverflowModes.Ellipsis;
-            subT.textWrappingMode = TextWrappingModes.NoWrap;
+            DisableWordWrap(subT);
             var srr = Rect(subT);
             srr.anchorMin = new Vector2(0.04f, 0.06f);
             srr.anchorMax = new Vector2(0.96f, 0.38f);
@@ -714,6 +714,15 @@ static TextMeshProUGUI MakeText(string name, Transform parent, string text, floa
         return t;
     }
 
+    static void DisableWordWrap(TMP_Text t)
+    {
+#if UNITY_6000_0_OR_NEWER
+        t.textWrappingMode = TextWrappingModes.NoWrap;
+#else
+        t.enableWordWrapping = false;
+#endif
+    }
+
     static void Stretch(GameObject go)
     {
         var r = go.GetComponent<RectTransform>();
diff --git a/Assets/Samples/InGameHints/InGameHintsActions.cs b/Assets/Samples/InGameHints/InGameHintsActions.cs
index ad0e2b99a7..04e4205716 100644
--- 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.19.1
+//     version 1.20.0
 //     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
index 1aaf0dcc73..a54bf71f54 100644
--- 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.19.1
+//     version 1.20.0
 //     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
index 9167dc741f..7771944524 100644
--- 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.19.1
+//     version 1.20.0
 //     from Assets/Tests/InputSystem/InputActionCodeGeneratorActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if