C#: Fix ordering of stubbed type members, implemented interfaces, and location comments

csharp/ql/src/Stubs/Stubs.qll

@@ -122,7 +122,8 @@ abstract private class GeneratedType extends Type, GeneratedElement {
   private string stubComment() {
     result =
       "// Generated from `" + this.getQualifiedName() + "` in `" +
-        concat(this.getALocation().toString(), "; ") + "`\n"
+        concat(Location l | l = this.getALocation() | l.toString(), "; " order by l.toString()) +
+        "`\n"
   }
 
   /** Gets the entire C# stub code for this type. */
@@ -169,7 +170,7 @@ abstract private class GeneratedType extends Type, GeneratedElement {
               t = this.getAnInterestingBaseType() and
               (if t instanceof Class then i = 0 else i = 1)
             |
-              stubClassName(t), ", " order by i
+              stubClassName(t), ", " order by i, t.getQualifiedName()
             )
       else result = ""
   }
@@ -180,7 +181,7 @@ abstract private class GeneratedType extends Type, GeneratedElement {
       concat(GeneratedMember m |
         m = this.getAGeneratedMember(assembly)
       |
-        stubMember(m, assembly) order by m.getName()
+        stubMember(m, assembly) order by m.getQualifiedNameWithTypes()
       )
   }