[mono-api-info] First filter, then order, and use ordinal comparison.

diff --git a/mcs/tools/corcompare/mono-api-info.cs b/mcs/tools/corcompare/mono-api-info.cs
index 4abfffd894633b8951ed31e7fd5899c980793e00..e2bbb36751afd6303549938e30d4f6f541d27fd4 100644 (file)
--- a/mcs/tools/corcompare/mono-api-info.cs
+++ b/mcs/tools/corcompare/mono-api-info.cs
@@ -1120,10 +1120,12 @@ namespace CorCompare
                                if (ass != null && !Driver.FollowForwarders)
                                        TypeForwardedToData.OutputForwarders (writer, ass);
 
-                               foreach (var att in provider.CustomAttributes.OrderBy ((a) => a.Constructor.DeclaringType.FullName)) {
+                               var attributes = provider.CustomAttributes.
+                                       Where ((att) => !SkipAttribute (att)).
+                                       OrderBy ((a) => a.Constructor.DeclaringType.FullName, StringComparer.Ordinal);
+                               
+                               foreach (var att in attributes) {
                                        string attName = Utils.CleanupTypeName (att.Constructor.DeclaringType);
-                                       if (SkipAttribute (att))
-                                               continue;
 
                                        writer.WriteStartElement ("attribute");
                                        AddAttribute ("name", attName);