Remove type reordering on corlib

- Bump version to 2.9.

Signed-off-by: José Simões <[email protected]>

Author: josesimoes

source/MetadataProcessor.Console/Program.cs

@@ -52,14 +52,13 @@ public void Parse(string fileName)
             }
 
             public void Compile(
-                string fileName,
-                bool isCoreLibrary)
+                string fileName)
             {
                 try
                 {
                     if (Verbose) System.Console.WriteLine("Compiling assembly...");
 
-                    _assemblyBuilder = new nanoAssemblyBuilder(_assemblyDefinition, _classNamesToExclude, VerboseMinimize, isCoreLibrary);
+                    _assemblyBuilder = new nanoAssemblyBuilder(_assemblyDefinition, _classNamesToExclude, VerboseMinimize);
 
                     using (var stream = File.Open(fileName, FileMode.Create, FileAccess.ReadWrite))
                     using (var writer = new BinaryWriter(stream))
@@ -223,20 +222,11 @@ public static void Main(string[] args)
                 {
                     md.Parse(args[++i]);
                 }
-                else if (arg == "-compile" && i + 2 < args.Length)
+                else if (arg == "-compile" && i + 1 < args.Length)
                 {
-                    bool isCoreLibrary = false;
-
-                    if (!bool.TryParse(args[i + 2], out isCoreLibrary))
-                    {
-                        System.Console.Error.WriteLine("Bad parameter for compile. IsCoreLib options has to be 'true' or 'false'.");
-
-                        Environment.Exit(1);
-                    }
-
                     md.PeFileName = args[i + 1];
 
-                    md.Compile(md.PeFileName, isCoreLibrary);
+                    md.Compile(md.PeFileName);
 
                     i += 2;
                 }

source/MetadataProcessor.Core/Tables/nanoTablesContext.cs

@@ -65,8 +65,7 @@ public nanoTablesContext(
             List<string> classNamesToExclude,
             ICustomStringSorter stringSorter,
             bool applyAttributesCompression,
-            bool verbose,
-            bool isCoreLibrary)
+            bool verbose)
         {
             AssemblyDefinition = assemblyDefinition;
 
@@ -123,34 +122,6 @@ public nanoTablesContext(
 
             var types = GetOrderedTypes(mainModule, explicitTypesOrder);
 
-            // mscorlib requires a particular type order
-            if(isCoreLibrary)
-            {
-                var indexOfSystemObject = types.IndexOf(types.FirstOrDefault(t => t.FullName == "System.Object"));
-                if (indexOfSystemObject >= 0)
-                {
-                    TypeDefinition item = types[indexOfSystemObject];
-                    types.RemoveAt(indexOfSystemObject);
-                    types.Insert(0, item);
-                }
-
-                var indexOfSystemValueType = types.IndexOf(types.FirstOrDefault(t => t.FullName == "System.ValueType"));
-                if (indexOfSystemValueType >= 0)
-                {
-                    TypeDefinition item = types[indexOfSystemValueType];
-                    types.RemoveAt(indexOfSystemValueType);
-                    types.Insert(1, item);
-                }
-
-                var indexOfSystemException = types.IndexOf(types.FirstOrDefault(t => t.FullName == "System.Exception1"));
-                if (indexOfSystemException >= 0)
-                {
-                    TypeDefinition item = types[indexOfSystemException];
-                    types.RemoveAt(indexOfSystemException);
-                    types.Insert(2, item);
-                }
-            }
-
             TypeDefinitionTable = new nanoTypeDefinitionTable(types, this);
 
             var fields = types

source/MetadataProcessor.Core/nanoAssemblyBuilder.cs

@@ -40,7 +40,6 @@ public nanoAssemblyBuilder(
             AssemblyDefinition assemblyDefinition,
             List<string> classNamesToExclude,
             bool verbose,
-            bool isCoreLibrary = false,
             List<string> explicitTypesOrder = null,
             ICustomStringSorter stringSorter = null,
             bool applyAttributesCompression = false)
@@ -51,11 +50,9 @@ public nanoAssemblyBuilder(
                 classNamesToExclude,
                 stringSorter,
                 applyAttributesCompression,
-                verbose,
-                isCoreLibrary);
+                verbose);
 
             _verbose = verbose;
-            _isCoreLibrary = isCoreLibrary;
         }
 
         /// <summary>

source/version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "2.8",
+  "version": "2.9",
   "assemblyVersion": {
     "precision": "revision"
   },