Merge branch 'develop' into stable

1 files changed, 11 insertions, 9 deletions

diff --git a/src/SMAPI.Tests/Utilities/KeybindListTests.cs b/src/SMAPI.Tests/Utilities/KeybindListTests.cs
index 0bd6ec17..c4c086de 100644
--- a/src/SMAPI.Tests/Utilities/KeybindListTests.cs
+++ b/src/SMAPI.Tests/Utilities/KeybindListTests.cs
@@ -21,12 +21,12 @@ namespace SMAPI.Tests.Utilities
         public void TryParse_SimpleValue(SButton button)
         {
             // act
-            bool success = KeybindList.TryParse($"{button}", out KeybindList parsed, out string[] errors);
+            bool success = KeybindList.TryParse($"{button}", out KeybindList? parsed, out string[] errors);
 
             // assert
             Assert.IsTrue(success, "Parsing unexpectedly failed.");
             Assert.IsNotNull(parsed, "The parsed result should not be null.");
-            Assert.AreEqual(parsed.ToString(), $"{button}");
+            Assert.AreEqual(parsed!.ToString(), $"{button}");
             Assert.IsNotNull(errors, message: "The errors should never be null.");
             Assert.IsEmpty(errors, message: "The input bindings incorrectly reported errors.");
         }
@@ -44,17 +44,17 @@ namespace SMAPI.Tests.Utilities
         [TestCase(",", ExpectedResult = "None")]
         [TestCase("A,", ExpectedResult = "A")]
         [TestCase(",A", ExpectedResult = "A")]
-        public string TryParse_MultiValues(string input)
+        public string TryParse_MultiValues(string? input)
         {
             // act
-            bool success = KeybindList.TryParse(input, out KeybindList parsed, out string[] errors);
+            bool success = KeybindList.TryParse(input, out KeybindList? parsed, out string[] errors);
 
             // assert
             Assert.IsTrue(success, "Parsing unexpectedly failed.");
             Assert.IsNotNull(parsed, "The parsed result should not be null.");
             Assert.IsNotNull(errors, message: "The errors should never be null.");
             Assert.IsEmpty(errors, message: "The input bindings incorrectly reported errors.");
-            return parsed.ToString();
+            return parsed!.ToString();
         }
 
         /// <summary>Assert invalid values are rejected.</summary>
@@ -67,7 +67,7 @@ namespace SMAPI.Tests.Utilities
         public void TryParse_InvalidValues(string input, string expectedError)
         {
             // act
-            bool success = KeybindList.TryParse(input, out KeybindList parsed, out string[] errors);
+            bool success = KeybindList.TryParse(input, out KeybindList? parsed, out string[] errors);
 
             // assert
             Assert.IsFalse(success, "Parsing unexpectedly succeeded.");
@@ -98,13 +98,15 @@ namespace SMAPI.Tests.Utilities
         public SButtonState GetState(string input, string stateMap)
         {
             // act
-            bool success = KeybindList.TryParse(input, out KeybindList parsed, out string[] errors);
+            bool success = KeybindList.TryParse(input, out KeybindList? parsed, out string[] errors);
             if (success && parsed?.Keybinds != null)
             {
-                foreach (var keybind in parsed.Keybinds)
+                foreach (Keybind? keybind in parsed.Keybinds)
+                {
 #pragma warning disable 618 // method is marked obsolete because it should only be used in unit tests
                     keybind.GetButtonState = key => this.GetStateFromMap(key, stateMap);
 #pragma warning restore 618
+                }
             }
 
             // assert
@@ -112,7 +114,7 @@ namespace SMAPI.Tests.Utilities
             Assert.IsNotNull(parsed, "The parsed result should not be null.");
             Assert.IsNotNull(errors, message: "The errors should never be null.");
             Assert.IsEmpty(errors, message: "The input bindings incorrectly reported errors.");
-            return parsed.GetState();
+            return parsed!.GetState();
         }