From: Jarl Gullberg <jarl.gullberg@gmail.com>
Date: Tue, 30 May 2017 16:16:45 +0000 (+0200)
Subject: Added catching of error thrown when the assembly has been rewritten but the debug... 
X-Git-Tag: v3.0.0~108^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b8975c5626004e86f471aa23f292b1af8ec2b8d3;p=platform%2Fcore%2Fcsapi%2Fopentk.git

Added catching of error thrown when the assembly has been rewritten but the debug symbols do not match.
---

diff --git a/src/Generator.Rewrite/Program.cs b/src/Generator.Rewrite/Program.cs
index dc8bfcf..4b6f2b8 100644
--- a/src/Generator.Rewrite/Program.cs
+++ b/src/Generator.Rewrite/Program.cs
@@ -90,58 +90,65 @@ namespace OpenTK.Rewrite
             }
 
             // Load assembly and process all modules
-            using (AssemblyDefinition assembly = AssemblyDefinition.ReadAssembly(file, read_params))
+            try
             {
-                var rewritten = assembly.CustomAttributes.FirstOrDefault(a => a.AttributeType.Name == "RewrittenAttribute");
-                if (rewritten == null)
+                using (AssemblyDefinition assembly = AssemblyDefinition.ReadAssembly(file, read_params))
                 {
-                    foreach (var module in assembly.Modules)
+                    var rewritten = assembly.CustomAttributes.FirstOrDefault(a => a.AttributeType.Name == "RewrittenAttribute");
+                    if (rewritten == null)
                     {
-                        foreach (var reference in module.AssemblyReferences)
+                        foreach (var module in assembly.Modules)
                         {
-                            try
+                            foreach (var reference in module.AssemblyReferences)
                             {
-                                var resolved = module.AssemblyResolver.Resolve(reference);
-                                if (reference.Name == "mscorlib")
+                                try
                                 {
-                                    mscorlib = resolved;
+                                    var resolved = module.AssemblyResolver.Resolve(reference);
+                                    if (reference.Name == "mscorlib")
+                                    {
+                                        mscorlib = resolved;
+                                    }
+                                }
+                                catch (Exception e)
+                                {
+                                    Console.Error.WriteLine(e.ToString());
                                 }
-                            }
-                            catch (Exception e)
-                            {
-                                Console.Error.WriteLine(e.ToString());
                             }
                         }
-                    }
 
-                    if (mscorlib == null)
-                    {
-                        Console.Error.WriteLine("Failed to locate mscorlib");
-                        return;
-                    }
-                    TypeMarshal = mscorlib.MainModule.GetType("System.Runtime.InteropServices.Marshal");
-                    TypeStringBuilder = mscorlib.MainModule.GetType("System.Text.StringBuilder");
-                    TypeVoid = mscorlib.MainModule.GetType("System.Void");
-                    TypeIntPtr = mscorlib.MainModule.GetType("System.IntPtr");
-                    TypeInt32 = mscorlib.MainModule.GetType("System.Int32");
+                        if (mscorlib == null)
+                        {
+                            Console.Error.WriteLine("Failed to locate mscorlib");
+                            return;
+                        }
+                        TypeMarshal = mscorlib.MainModule.GetType("System.Runtime.InteropServices.Marshal");
+                        TypeStringBuilder = mscorlib.MainModule.GetType("System.Text.StringBuilder");
+                        TypeVoid = mscorlib.MainModule.GetType("System.Void");
+                        TypeIntPtr = mscorlib.MainModule.GetType("System.IntPtr");
+                        TypeInt32 = mscorlib.MainModule.GetType("System.Int32");
 
-                    TypeBindingsBase = assembly.Modules.Select(m => m.GetType("OpenTK.BindingsBase")).First();
+                        TypeBindingsBase = assembly.Modules.Select(m => m.GetType("OpenTK.BindingsBase")).First();
 
-                    foreach (var module in assembly.Modules)
-                    {
-                        foreach (var type in module.Types)
+                        foreach (var module in assembly.Modules)
                         {
-                            Rewrite(type, optionsEnumerated);
+                            foreach (var type in module.Types)
+                            {
+                                Rewrite(type, optionsEnumerated);
+                            }
                         }
                     }
-                }
-                else
-                {
-                    Console.Error.WriteLine("Error: assembly has already been rewritten");
-                }
+                    else
+                    {
+                        Console.Error.WriteLine("Error: assembly has already been rewritten");
+                    }
 
-                // Save rewritten assembly
-                assembly.Write(write_params);
+                    // Save rewritten assembly
+                    assembly.Write(write_params);
+                }
+            }
+            catch (InvalidOperationException inex)
+            {
+                Console.WriteLine("Failed to load the assembly. It may already have been rewritten, and the debug symbols no longer match.");
             }
         }