From 624f29b58344a5877ab409d86bb8f1d7a12573fe Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Thu, 2 Jun 2016 12:09:09 +0200 Subject: [PATCH] [mono-api-info] Take number of generic parameters into account when comparing methods. --- mcs/tools/corcompare/mono-api-info.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mcs/tools/corcompare/mono-api-info.cs b/mcs/tools/corcompare/mono-api-info.cs index 8b1ad945095..55c2aeb4283 100644 --- a/mcs/tools/corcompare/mono-api-info.cs +++ b/mcs/tools/corcompare/mono-api-info.cs @@ -1571,6 +1571,15 @@ namespace CorCompare if (res != 0) return res; + if (ma.HasGenericParameters != mb.HasGenericParameters) + return ma.HasGenericParameters ? -1 : 1; + + if (ma.HasGenericParameters && mb.HasGenericParameters) { + res = ma.GenericParameters.Count - mb.GenericParameters.Count; + if (res != 0) + return res; + } + // operators can differ by only return type return string.CompareOrdinal (ma.ReturnType.FullName, mb.ReturnType.FullName); } -- 2.11.4.GIT