Weaver: Fixes attributes corruption during weaving (#47)

Author: alex-kulakov

Weaver/Xtensive.Orm.Weaver/ProcessorContext.cs

@@ -24,6 +24,8 @@ public sealed class ProcessorContext : IDisposable
 
     public bool TranformationPerformed { get; set; }
 
+    public bool ShouldAddReferenceToOrm { get; set; }
+
     public IList<WeavingTask> WeavingTasks { get; set; }
 
     public ModuleDefinition TargetModule { get; set; }
@@ -54,6 +56,7 @@ public ProcessorContext()
       References = new ReferenceRegistry();
       PersistentTypes = new List<TypeInfo>();
       AssemblyChecker = new AssemblyChecker();
+      ShouldAddReferenceToOrm = false;
     }
   }
 }

Weaver/Xtensive.Orm.Weaver/Stages/ImportReferencesStage.cs

@@ -5,6 +5,7 @@
 // Created:    2013.08.20
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Mono.Cecil;
 
@@ -115,12 +116,15 @@ private bool TryGetOrmAssembly(ProcessorContext context, out AssemblyNameReferen
       assemblyNameReference = context.TargetModule.AssemblyReferences
         .FirstOrDefault(r => comparer.Equals(r.FullName, WellKnown.OrmAssemblyFullName));
 
-      if (assemblyNameReference!=null)
+      if (assemblyNameReference != null) {
         return true;
+      }
 
-      // check whether project had reference to Xtensive.Orm assembly.
-      if (!context.Configuration.ReferencedAssemblies.Reverse().Any(ra => ra.EndsWith(WellKnown.OrmAssemblyShortName + ".dll", StringComparison.InvariantCultureIgnoreCase)))
+      // check whether project had reference to Xtensive.Orm assembly
+      // but omitted during project compilation as not used.
+      if (!IsOrmReferenceOmmitedByCompiler(context.Configuration.ReferencedAssemblies)) {
         return false;
+      }
 
       // if target module has't got reference to the assembly and there was reference to the assembly in project
       // then probably some of target module referenses references the assembly.
@@ -131,8 +135,27 @@ private bool TryGetOrmAssembly(ProcessorContext context, out AssemblyNameReferen
         .SelectMany(m => m.AssemblyReferences)
         .FirstOrDefault(ar => comparer.Equals(ar.FullName, WellKnown.OrmAssemblyFullName));
 
-      if (assemblyNameReference!=null)
+      if (assemblyNameReference != null) {
+        context.ShouldAddReferenceToOrm = true;
         return true;
+      }
+      return false;
+    }
+
+    private bool IsOrmReferenceOmmitedByCompiler(IList<string> projectReferences)
+    {
+      if (projectReferences.Count == 0) {
+        return false;
+      }
+      var lastItemIndex = projectReferences.Count - 1;
+
+      // Orm assembly tends to be at the end of the list
+      string searchCreteria = WellKnown.OrmAssemblyShortName + ".dll";
+      for (int i = lastItemIndex; i >= 0; i--) {
+        if (projectReferences[i].EndsWith(searchCreteria, StringComparison.OrdinalIgnoreCase)) {
+          return true;
+        }
+      }
       return false;
     }
 

Weaver/Xtensive.Orm.Weaver/Stages/SaveAssemblyStage.cs

@@ -5,9 +5,7 @@
 // Created:    2013.08.19
 
 using System.IO;
-using System.Reflection;
 using Mono.Cecil;
-using Mono.Cecil.Cil;
 
 namespace Xtensive.Orm.Weaver.Stages
 {
@@ -27,22 +25,29 @@ public override ActionResult Execute(ProcessorContext context)
       var outputIsInput = inputFile==outputFile;
 
       if (context.SkipProcessing) {
-        if (!outputIsInput)
+        if (!outputIsInput) {
           FileHelper.CopyWithPdb(context, inputFile, outputFile);
+        }
         return ActionResult.Success;
       }
 
-      if (!context.TranformationPerformed && context.Configuration.MakeBackup && outputIsInput)
+      if (!context.TranformationPerformed && context.Configuration.MakeBackup && outputIsInput) {
         FileHelper.CopyWithPdb(context, inputFile, FileHelper.GetBackupFile(inputFile));
+      }
+
+      if (context.ShouldAddReferenceToOrm) {
+        context.TargetModule.AssemblyReferences.Add(context.References.OrmAssembly);
+      }
 
       var writerParameters = new WriterParameters {
         WriteSymbols = configuration.ProcessDebugSymbols
       };
 
       var strongNameKey = configuration.StrongNameKey;
       if (!string.IsNullOrEmpty(strongNameKey)) {
-        if (File.Exists(strongNameKey))
+        if (File.Exists(strongNameKey)) {
           writerParameters.StrongNameKeyBlob = File.ReadAllBytes(strongNameKey);
+        }
         else {
           context.Logger.Write(MessageCode.ErrorStrongNameKeyIsNotFound);
           return ActionResult.Failure;