SONARMSBRU-151 Custom FxCop rules aren't supported with all .NET Framework versions

Author: dbolkensteyn

SonarQube.TeamBuild.PreProcessor/SonarWebService.cs

@@ -95,7 +95,9 @@ public IDictionary<string, string> GetInternalKeys(string repository)
             var contents = Downloader.Download(ws);
 
             var rules = JObject.Parse(contents);
-            var keysToIds = rules["rules"].ToDictionary(r => r["key"].ToString(), r => r["internalKey"] != null ? r["internalKey"].ToString() : null);
+            var keysToIds = rules["rules"]
+                .Where(r => r["internalKey"] != null)
+                .ToDictionary(r => r["key"].ToString(), r => r["internalKey"].ToString());
 
             return keysToIds;
         }

Tests/SonarQube.TeamBuild.PreProcessor.Tests/SonarWebServiceTest.cs

@@ -123,7 +123,6 @@ public void GetInternalKeys()
         {
             downloader.Pages["http://myhost:222/api/rules/search?f=internalKey&ps=" + int.MaxValue + "&repositories=fxcop"] = "{\"total\":2,\"p\":1,\"ps\":10,\"rules\":[{\"key\":\"fxcop:My_Own_FxCop_Rule\"},{\"key\":\"fxcop:UriParametersShouldNotBeStrings\",\"internalKey\":\"CA1054\"}]}";
             var expected = new Dictionary<string, string>();
-            expected["fxcop:My_Own_FxCop_Rule"] = null;
             expected["fxcop:UriParametersShouldNotBeStrings"] = "CA1054";
             var actual = ws.GetInternalKeys("fxcop");
 
@@ -174,7 +173,6 @@ public void ServerUrlWithTrailingSlash()
 
             downloader.Pages["http://myhost:222/api/rules/search?f=internalKey&ps=" + int.MaxValue + "&repositories=fxcop"] = "{\"total\":2,\"p\":1,\"ps\":10,\"rules\":[{\"key\":\"fxcop:My_Own_FxCop_Rule\"},{\"key\":\"fxcop:UriParametersShouldNotBeStrings\",\"internalKey\":\"CA1054\"}]}";
             var expected2 = new Dictionary<string, string>();
-            expected2["fxcop:My_Own_FxCop_Rule"] = null;
             expected2["fxcop:UriParametersShouldNotBeStrings"] = "CA1054";
             var actual2 = ws.GetInternalKeys("fxcop");