Imported Upstream version 4.2.1.36

Former-commit-id: f3008ca867fe7e4b7ae9b9a8844c0ad5798925a9
This commit is contained in:
Xamarin Public Jenkins
2015-09-24 06:06:07 -04:00
committed by Jo Shields
parent afe402035c
commit ea5caba957
172 changed files with 6570 additions and 11015 deletions

View File

@ -228,7 +228,7 @@ namespace CorCompare
var typesCollection = ass.MainModule.Types;
if (typesCollection == null || typesCollection.Count == 0)
return;
object [] typesArray = new object [typesCollection.Count];
var typesArray = new TypeDefinition [typesCollection.Count];
for (int i = 0; i < typesCollection.Count; i++) {
typesArray [i] = typesCollection [i];
}
@ -416,7 +416,7 @@ namespace CorCompare
XmlNode ifaces = null;
foreach (TypeReference iface in TypeHelper.GetInterfaces (type)) {
foreach (TypeReference iface in TypeHelper.GetInterfaces (type).OrderBy (s => s.FullName)) {
if (!TypeHelper.IsPublic (iface))
// we're only interested in public interfaces
continue;
@ -454,7 +454,7 @@ namespace CorCompare
MethodDefinition [] ctors = GetConstructors (type);
if (ctors.Length > 0) {
Array.Sort (ctors, MemberReferenceComparer.Default);
Array.Sort (ctors, MethodDefinitionComparer.Default);
members.Add (new ConstructorData (document, nclass, ctors));
}
@ -472,7 +472,7 @@ namespace CorCompare
MethodDefinition [] methods = GetMethods (type);
if (methods.Length > 0) {
Array.Sort (methods, MemberReferenceComparer.Default);
Array.Sort (methods, MethodDefinitionComparer.Default);
members.Add (new MethodData (document, nclass, methods));
}
}
@ -495,11 +495,13 @@ namespace CorCompare
nested.RemoveAt (i);
}
if (nested.Count > 0) {
var nestedArray = nested.ToArray ();
Array.Sort (nestedArray, TypeReferenceComparer.Default);
XmlNode classes = document.CreateElement ("classes", null);
nclass.AppendChild (classes);
foreach (TypeDefinition t in nested) {
foreach (TypeDefinition t in nestedArray) {
TypeData td = new TypeData (document, classes, t);
td.DoOutput ();
}