Fix test failures and compiler errors.

Author: AswinRajGopal

Assets/Tests/InputSystem.Editor/CustomProcessorEnumTest.cs

@@ -1,4 +1,4 @@
-#if UNITY_EDITOR && UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
+#if UNITY_EDITOR && UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS && UNITY_6000_0_OR_NEWER
 
 using System;
 using NUnit.Framework;
@@ -29,6 +29,7 @@ static CustomProcessor()
     {
         Initialize();
     }
+
 #endif
 
     [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
@@ -54,7 +55,7 @@ public override void OneTimeSetUp()
 
         var actionMap = m_Asset.AddActionMap("Action Map");
 
-         actionMap.AddAction("Action", InputActionType.Value, processors: "Custom(SomeEnum=10)");
+        actionMap.AddAction("Action", InputActionType.Value, processors: "Custom(SomeEnum=10)");
     }
 
     public override void OneTimeTearDown()
@@ -68,21 +69,21 @@ public override IEnumerator UnitySetup()
         m_Window = InputActionsEditorWindow.OpenEditor(m_Asset);
         yield return base.UnitySetup();
     }
-    
+
     [UnityTest]
     public IEnumerator ProcessorEnum_ShouldSerializeByValue_WhenSerializedToAsset()
     {
         // Serialize current asset to JSON, and check that initial JSON contains default enum value for OptionA
         var json = m_Window.currentAssetInEditor.ToJson();
-        
+
         Assert.That(json.Contains("Custom(SomeEnum=10)"), Is.True,
             "Serialized JSON does not contain the expected custom processor string for OptionA.");
 
         // Query the dropdown with exactly two enum choices and check that the drop down is present in the UI
         var dropdownList = m_Window.rootVisualElement.Query<DropdownField>().Where(d => d.choices.Count == 2).ToList();
         Assume.That(dropdownList.Count > 0, Is.True, "Enum parameter dropdown not found in the UI.");
 
-        // Determine the new value to be set in the dropdown, focus the dropdown before dispatching the change 
+        // Determine the new value to be set in the dropdown, focus the dropdown before dispatching the change
         var dropdown = dropdownList.First();
         var newValue = dropdown.choices[1];
         dropdown.Focus();
@@ -92,7 +93,7 @@ public IEnumerator ProcessorEnum_ShouldSerializeByValue_WhenSerializedToAsset()
         var changeEvent = ChangeEvent<Enum>.GetPooled(SomeEnum.OptionA, SomeEnum.OptionB);
         changeEvent.target = dropdown;
         dropdown.SendEvent(changeEvent);
-        
+
         // Find the save button in the window, focus and click the save button to persist the changes
         var saveButton = m_Window.rootVisualElement.Q<Button>("save-asset-toolbar-button");
         Assume.That(saveButton, Is.Not.Null, "Save Asset button not found in the UI.");
@@ -109,4 +110,3 @@ public IEnumerator ProcessorEnum_ShouldSerializeByValue_WhenSerializedToAsset()
     }
 }
 #endif
-

Packages/com.unity.inputsystem/InputSystem/Actions/InputActionAsset.cs

@@ -301,7 +301,7 @@ public string ToJson()
         {
             return JsonUtility.ToJson(new WriteFileJson
             {
-                version = m_Version,
+                version = (m_Version >= 13) ? (int?)m_Version : null,
                 name = name,
                 maps = InputActionMap.WriteFileJson.FromMaps(m_ActionMaps).maps,
                 controlSchemes = InputControlScheme.SchemeJson.ToJson(m_ControlSchemes),
@@ -961,7 +961,7 @@ private void OnDestroy()
         [Serializable]
         internal struct WriteFileJson
         {
-            public int version;
+            public int? version;
             public string name;
             public InputActionMap.WriteMapJson[] maps;
             public InputControlScheme.SchemeJson[] controlSchemes;