CA1854: Prefer the 'IDictionary.TryGetValue(TKey, out TValue)' method

Author: manfred-brands

src/NUnitCommon/nunit.agent.core/Drivers/NUnitFrameworkApi2009.cs

@@ -55,8 +55,7 @@ public string Load(string testAssemblyPath, IDictionary<string, object> settings
                 _testAssemblyPath = testAssemblyPath;
 
                 // Normally, the caller should check for an invalid requested runtime, but we make sure here
-                var requestedRuntime = settings.ContainsKey(EnginePackageSettings.RequestedRuntimeFramework)
-                    ? settings[EnginePackageSettings.RequestedRuntimeFramework] : null;
+                settings.TryGetValue(EnginePackageSettings.RequestedRuntimeFramework, out object? requestedRuntime);
 
                 var idPrefix = _driverId + "-";
 

src/NUnitCommon/nunit.extensibility/ExtensionNode.cs

@@ -80,8 +80,8 @@ public IEnumerable<string> PropertyNames
         /// <returns>A collection of values</returns>
         public IEnumerable<string> GetValues(string name)
         {
-            if (_properties.ContainsKey(name))
-                return _properties[name];
+            if (_properties.TryGetValue(name, out List<string>? value))
+                return value;
             else
                 return Enumerable.Empty<string>();
         }

src/NUnitEngine/nunit.engine/Runners/MasterTestRunner.cs

@@ -377,8 +377,8 @@ private void ValidatePackageSettings()
             {
                 var oldKey = entry.OldKey;
                 var newKey = entry.NewKey;
-                if (TestPackage.Settings.ContainsKey(oldKey) && !TestPackage.Settings.ContainsKey(newKey))
-                    TestPackage.Settings[newKey] = TestPackage.Settings[oldKey];
+                if (TestPackage.Settings.TryGetValue(oldKey, out object? value) && !TestPackage.Settings.ContainsKey(newKey))
+                    TestPackage.Settings[newKey] = value;
             }
         }
 #else

src/NUnitEngine/nunit.engine/Services/ServiceManager.cs

@@ -23,11 +23,7 @@ public class ServiceManager : IDisposable
 
         public IService GetService( Type serviceType )
         {
-            IService? theService = null;
-
-            if (_serviceIndex.ContainsKey(serviceType))
-                theService = _serviceIndex[serviceType];
-            else
+            if (!_serviceIndex.TryGetValue(serviceType, out IService? theService))
                 foreach( IService service in _services )
                 {
                     if( serviceType.IsInstanceOfType( service ) )