Merge pull request #26 from Capgemini/master

Actualize original

Author: reflection-emit

Fody/Cauldron.ActivatorInterceptors/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // "3.0.0.8")]
-[assembly: AssemblyVersion("3.2.0.0")]
-[assembly: AssemblyFileVersion("3.2.0.0")]
+[assembly: AssemblyVersion("3.2.0.2")]
+[assembly: AssemblyFileVersion("3.2.0.2")]

Fody/Cauldron.BasicInterceptors/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // "3.0.0.8")]
-[assembly: AssemblyVersion("3.2.0.0")]
-[assembly: AssemblyFileVersion("3.2.0.0")]
+[assembly: AssemblyVersion("3.2.0.2")]
+[assembly: AssemblyFileVersion("3.2.0.2")]

Fody/Cauldron.Interception.Cecilator/AsyncMethodHelper.cs

@@ -48,7 +48,7 @@ public object Instance
                     return result;
                 }
 
-                return (object)CodeBlocks.This;
+                return CodeBlocks.This;
             }
         }
 
@@ -134,14 +134,14 @@ public Method MoveNextMethod
         }
 
         /// <summary>
-        /// Gets the type that inherited the async method.
+        /// Returns the variable that contains the current state of the async state machine
         /// </summary>
-        public BuilderType OriginType => this.Method.OriginType;
+        public LocalVariable StateVariable => this.MoveNextMethod?.GetVariable(0);
 
         /// <summary>
-        /// Returns the variable that contains the current state of the async state machine
+        /// Gets the type that inherited the async method.
         /// </summary>
-        public LocalVariable StateVariable => this.MoveNextMethod?.GetVariable(0);
+        public BuilderType OriginType => this.Method.OriginType;
 
         public Tuple<Positions, ExceptionHandler> GetAsyncStateMachineExceptionBlock()
         {
@@ -187,7 +187,7 @@ public LocalVariable GetAsyncStateMachineExceptionVariable()
         /// <returns></returns>
         public Position GetAsyncStateMachineLastGetResult()
         {
-            var lastGetResult = this.MoveNextMethod.methodDefinition.Body.Instructions.Last(x =>
+            var lastGetResult = this.MoveNextMethod.methodDefinition.Body.Instructions.LastOrDefault(x =>
             {
                 if (x.OpCode == OpCodes.Call)
                 {
@@ -211,7 +211,7 @@ public Position GetAsyncStateMachineLastGetResult()
         /// <returns></returns>
         public Position GetAsyncStateMachineLastSetResult()
         {
-            var lastSetResult = this.MoveNextMethod.methodDefinition.Body.Instructions.Last(x =>
+            var lastSetResult = this.MoveNextMethod.methodDefinition.Body.Instructions.LastOrDefault(x =>
             {
                 if (x.OpCode == OpCodes.Call)
                 {
@@ -265,7 +265,7 @@ public Position GetAsyncTaskMethodBuilderStart()
         }
 
         public Field InsertFieldToAsyncStateMachine(string fieldName, BuilderType fieldType, Func<Coder, object> setCoder) =>
-            InsertFieldToAsyncStateMachine(fieldName, fieldType.typeReference, setCoder);
+            this.InsertFieldToAsyncStateMachine(fieldName, fieldType.typeReference, setCoder);
 
         public Field InsertFieldToAsyncStateMachine(string fieldName, TypeReference fieldType, Func<Coder, object> setCoder)
         {

Fody/Cauldron.Interception.Cecilator/Coders/Default/Coder.cs

@@ -425,7 +425,7 @@ TypeReference getIEnumerableInterfaceChild(TypeReference typeReference)
                 return new Tuple<TypeReference, bool>(module.ImportReference(result), true);
 
             // We just don't know :(
-            return new Tuple<TypeReference, bool>(module.ImportReference((TypeReference)BuilderTypes.Object), false);
+            return new Tuple<TypeReference, bool>(module.ImportReference(typeof(object)), false);
         }
 
         public static IReadOnlyDictionary<string, TypeReference> GetGenericResolvedTypeName(this GenericInstanceType type)
@@ -521,7 +521,7 @@ public static IEnumerable<TypeReference> GetInterfaces(this TypeReference type)
                 }
                 catch (Exception e)
                 {
-                    Builder.Current.Log(LogTypes.Info, e.GetStackTrace());
+                    Builder.Current.Log(LogTypes.Info, $"Error in getting interfaces of '{type}'\r\n" + e.GetStackTrace());
                     break;
                 }
             };
@@ -1418,6 +1418,9 @@ internal static IEnumerable<T> Recursive<T>(this T root, Func<T, IEnumerable<T>>
             {
                 var current = stack.Pop();
 
+                if (current == null)
+                    Builder.Current.Log(LogTypes.Info, $"-------------------> '{root}'\r\n");
+
                 foreach (var child in children(current))
                     stack.Push(child);
 

Fody/Cauldron.Interception.Cecilator/Extension.cs

@@ -24,5 +24,5 @@
 //
 // Major Version Minor Version Build Number Revision
 //
-[assembly: AssemblyVersion("3.2.0.0")]
-[assembly: AssemblyFileVersion("3.2.0.0")]
+[assembly: AssemblyVersion("3.2.0.2")]
+[assembly: AssemblyFileVersion("3.2.0.2")]

Fody/Cauldron.Interception.Cecilator/Properties/AssemblyInfo.cs

@@ -91,7 +91,7 @@ private void AddEntranceAssemblyHACK(Builder builder)
                 }
             }
 
-            CreateAssemblyListingArray(builder, referencedAssembliesMethod, assembly.Type, builder.ReferencedAssemblies);
+            this.CreateAssemblyListingArray(builder, referencedAssembliesMethod, assembly.Type, builder.ReferencedAssemblies);
         }
 
         private void CreateAssemblyListingArray(Builder builder, Method method, BuilderType assemblyType, IEnumerable<AssemblyDefinition> assembliesToList)

Fody/Cauldron.Interception.Fody/ModuleWeaver.cs

@@ -76,9 +76,12 @@ public void ExecuteInterceptionScripts(Builder builder)
                     {
                         this.Log(LogTypes.Info, ">> Executing custom interceptors in: " + scriptBinary.Name);
                         var config = scriptBinary.Type.GetProperty("Config", BindingFlags.Static | BindingFlags.Public);
+                        var projectDirectoryPath = scriptBinary.Type.GetProperty("ProjectDirectoryPath", BindingFlags.Static | BindingFlags.Public);
+                        var solutionDirectoryPath = scriptBinary.Type.GetProperty("SolutionDirectoryPath", BindingFlags.Static | BindingFlags.Public);
 
-                        if (config != null)
-                            config.SetValue(null, this.Config);
+                        if (config != null) config.SetValue(null, this.Config);
+                        if (projectDirectoryPath != null) projectDirectoryPath.SetValue(null, this.ProjectDirectoryPath);
+                        if (solutionDirectoryPath != null) solutionDirectoryPath.SetValue(null, this.SolutionDirectoryPath);
 
                         foreach (var method in scriptBinary.Implement)
                         {

Fody/Cauldron.Interception.Fody/ModuleWeaver_Scripting.cs

@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.2.0.0")]
-[assembly: AssemblyFileVersion("3.2.0.0")]
+[assembly: AssemblyVersion("3.2.0.2")]
+[assembly: AssemblyFileVersion("3.2.0.2")]

Fody/Cauldron.Interception.Fody/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // "3.0.0.8")]
-[assembly: AssemblyVersion("3.2.0.0")]
-[assembly: AssemblyFileVersion("3.2.0.0")]
+[assembly: AssemblyVersion("3.2.0.2")]
+[assembly: AssemblyFileVersion("3.2.0.2")]