Fixed crash in cilg.exe when generating dll release versions without …

…debug symbols.
RockerUrBiz · Jun 24, 2019 · 503d11a · 503d11a
1 parent b523daf
commit 503d11a
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 39 deletions.
diff --git a/Trinity.CilGenerator/Extensions/TypeDefinitionExtensions.cs b/Trinity.CilGenerator/Extensions/TypeDefinitionExtensions.cs
@@ -311,13 +311,13 @@ public static MethodReference TryGetSetValueMethod(this TypeDefinition type, Ass
         public static MethodReference TryGetGetValueMethod(this TypeDefinition type, AssemblyDefinition assembly, params TypeReference[] genericArguments)
         {
 
-            TypeReference mappingType =ILGenerator.propertyMapping;
+            TypeReference mappingType =ILGenerator.PropertyMapping;
             assembly.MainModule.ImportReference(mappingType);
             GenericParameter valueType = mappingType.GenericParameters[0];
 
             if (mappingType == null) return null;
 
-            MethodDefinition method = type.TryGetInheritedGenericMethod("GetValue",ILGenerator.propertyMapping);
+            MethodDefinition method = type.TryGetInheritedGenericMethod("GetValue",ILGenerator.PropertyMapping);
 
             if (method == null) return null;
 

diff --git a/Trinity.CilGenerator/ILGenerator.cs b/Trinity.CilGenerator/ILGenerator.cs
@@ -65,6 +65,8 @@ public class ILGenerator
         /// </summary>
         public bool WriteSymbols { get; set; }
 
+        public static TypeDefinition PropertyMapping;
+
         #endregion
 
         #region Constructors
@@ -78,7 +80,6 @@ public ILGenerator(ILogger log, bool writeSymbols = true)
         #endregion
 
         #region Methods
-        public static TypeDefinition propertyMapping;
 
         public bool ProcessFile(string sourceFile, string targetFile = "")
         {
@@ -94,20 +95,20 @@ public bool ProcessFile(string sourceFile, string targetFile = "")
 
             try
             {
-
                 using (var module = CustomResolver.LoadMainModule(sourceFile))
                 {
-
-                    module.ReadSymbols();
-                    FileInfo sourceDll = new FileInfo(sourceFile);
+                    if (WriteSymbols)
+                    {
+                        module.ReadSymbols();
+                    }
 
                     Assembly = module.Assembly;
+
                     var resolver = module.AssemblyResolver;
                     var trinityRef = module.AssemblyReferences.Where(x => x.Name == "Semiodesk.Trinity").First();
                     var trinity = resolver.Resolve(trinityRef);
-                    var g = trinity.MainModule.Types.Where(b => b.FullName == "Semiodesk.Trinity.PropertyMapping`1").First();
-                    propertyMapping = g;
 
+                    PropertyMapping = trinity.MainModule.Types.Where(b => b.FullName == "Semiodesk.Trinity.PropertyMapping`1").First();
 
                     Log.LogMessage("------ Begin Task: ImplementRdfMapping [{0}]", Assembly.Name);
 
@@ -163,12 +164,17 @@ public bool ProcessFile(string sourceFile, string targetFile = "")
                     {
                         var param = new WriterParameters { WriteSymbols = WriteSymbols };
 
+                        FileInfo sourceDll = new FileInfo(sourceFile);
                         FileInfo targetDll = new FileInfo(targetFile);
+
                         if (sourceDll.FullName != targetDll.FullName)
+                        {
                             Assembly.Write(targetDll.FullName, param);
+                        }
                         else
+                        {
                             Assembly.Write(param);
-
+                        }
                     }
 
                     result = true;
@@ -188,19 +194,6 @@ public bool ProcessFile(string sourceFile, string targetFile = "")
             return result;
         }
 
-        string GetAssemblyDirectoryFromType(Type type)
-        {
-            return new FileInfo(System.Reflection.Assembly.GetAssembly(type).Location).DirectoryName;
-        }
-
-        void WriteSymbolsToAssembly(string targetFile, ISymbolReader symbolReader, ISymbolWriterProvider symbolWriter)
-        {
-            Assembly.MainModule.ReadSymbols(symbolReader);
-
-            // NOTE: "WriteSymbols = true" generates the .pdb symbols required for debugging.
-            Assembly.Write(targetFile, new WriterParameters { WriteSymbols = true, SymbolWriterProvider = symbolWriter });
-        }
-
         #endregion
     }
 }
diff --git a/Trinity.CilGenerator/Program.cs b/Trinity.CilGenerator/Program.cs
@@ -74,11 +74,15 @@ static int Main(string[] args)
                     }
 
                     ILGenerator generator = new ILGenerator(new ConsoleLogger(), writeSymbols);
+
                     if (generator.ProcessFile(input, output))
+                    {
                         return 0;
+                    }
                     else
+                    {
                         return -1;
-
+                    }
                 }
             }
             catch (OptionException e)

diff --git a/Trinity.CilGenerator/Resolver/CustomResolver.cs b/Trinity.CilGenerator/Resolver/CustomResolver.cs
@@ -1,5 +1,6 @@
 
 using ICSharpCode.Decompiler;
+using ICSharpCode.Decompiler.Metadata;
 using Mono.Cecil;
 using System;
 using System.Collections.Generic;
@@ -10,18 +11,16 @@
 
 namespace Semiodesk.Trinity.CilGenerator.Resolver
 {
-
-    class CustomResolver : ICSharpCode.Decompiler.Metadata.UniversalAssemblyResolver
+    class CustomResolver : UniversalAssemblyResolver
     {
-        protected CustomResolver(string mainAssemblyFileName, bool throwOnError, string targetFramework) :base(mainAssemblyFileName, throwOnError, targetFramework, System.Reflection.PortableExecutable.PEStreamOptions.PrefetchEntireImage)
+        protected CustomResolver(string mainAssemblyFileName, bool throwOnError, string targetFramework) : base(mainAssemblyFileName, throwOnError, targetFramework, System.Reflection.PortableExecutable.PEStreamOptions.PrefetchEntireImage)
         {
-
         }
 
         public static ModuleDefinition LoadMainModule(string mainAssemblyFileName)
         {
-            var moduleDefinition = new ICSharpCode.Decompiler.Metadata.PEFile(mainAssemblyFileName, System.Reflection.PortableExecutable.PEStreamOptions.PrefetchEntireImage);
-            var targetFramework = ICSharpCode.Decompiler.Metadata.DotNetCorePathFinderExtensions.DetectTargetFrameworkId(moduleDefinition.Reader);
+            var moduleDefinition = new PEFile(mainAssemblyFileName, System.Reflection.PortableExecutable.PEStreamOptions.PrefetchEntireImage);
+            var targetFramework = DotNetCorePathFinderExtensions.DetectTargetFrameworkId(moduleDefinition.Reader);
             var resolver = new CustomResolver(mainAssemblyFileName, true, targetFramework);
 
             var module = ModuleDefinition.ReadModule(mainAssemblyFileName, new ReaderParameters
@@ -30,11 +29,7 @@ public static ModuleDefinition LoadMainModule(string mainAssemblyFileName)
                 ReadWrite = true
             });
 
-
             return module;
         }
-
-
-
     }
 }
diff --git a/Trinity.CilGenerator/Tasks/GeneratorTaskBase.cs b/Trinity.CilGenerator/Tasks/GeneratorTaskBase.cs
@@ -126,7 +126,7 @@ protected virtual void LoadTrinityTypes()
             LoadType("Semiodesk.Trinity.Class", out ClassType);
             ClassArrayType= new ArrayType(ClassType);
 
-            PropertyMappingType = ILGenerator.propertyMapping;
+            PropertyMappingType = ILGenerator.PropertyMapping;
 
 
 

diff --git a/Trinity.CilGenerator/Tasks/ImplementRdfPropertyTask.cs b/Trinity.CilGenerator/Tasks/ImplementRdfPropertyTask.cs
@@ -112,13 +112,13 @@ public override bool Execute(object parameter = null)
 
         internal FieldDefinition ImplementMappingField(PropertyDefinition property)
         {
-
             // Load the property mapping type.
-            TypeReference mappingType = MainModule.ImportReference(ILGenerator.propertyMapping);
-
+            TypeReference mappingType = MainModule.ImportReference(ILGenerator.PropertyMapping);
 
-            if(mappingType == null)
+            if (mappingType == null)
+            {
                 throw new ArgumentException(string.Format("{0}: Failed to import type {1}.", Assembly.FullName, mappingType.FullName));
+            }
 
             // Add the property type as generic parameter.
             GenericInstanceType fieldType = new GenericInstanceType(mappingType);