Attempt to fix #217

pamidur · Jun 9, 2023 · cbafc5a · cbafc5a
1 parent 36423da
commit cbafc5a
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 41 deletions.
diff --git a/src/AspectInjector.Core.Advice/Weavers/Processes/AdviceAroundProcess.cs b/src/AspectInjector.Core.Advice/Weavers/Processes/AdviceAroundProcess.cs
@@ -1,4 +1,4 @@
-using AspectInjector.Core.Advice.Effects;
+using AspectInjector.Core.Advice.Effects;
 using AspectInjector.Core.Extensions;
 using AspectInjector.Core.Models;
 using FluentIL;
@@ -82,7 +82,7 @@ private void RedirectPreviousWrapper(MethodDefinition prev, MethodDefinition nex
         {
             var unwrapper = GetOrCreateUnwrapper();
 
-            var instructions = prev.Body.Instructions.Where(i => i.Operand is MethodReference && ((MethodReference)i.Operand).Resolve() == unwrapper).ToList();
+            var instructions = prev.Body.Instructions.Where(i => i.Operand is MethodReference reference && reference.Resolve() == unwrapper).ToList();
 
             var nextRef = CreateRef(next, prev);
 
@@ -238,7 +238,9 @@ private void MoveBody(MethodDefinition from, MethodDefinition to)
             var fbProc = from.Body.GetILProcessor();
             var fdbg = from.DebugInformation;
             var fsp = from.DebugInformation.SequencePoints;
-            var tsp = to.DebugInformation.SequencePoints;
+            var tsp = to.DebugInformation.SequencePoints;
+
+            to.HasThis = from.HasThis;
 
             var codeStart = from.Body.GetUserCodeStart();
             var init = codeStart == null ? 0 : frb.IndexOf(codeStart);
@@ -261,18 +263,34 @@ private void MoveBody(MethodDefinition from, MethodDefinition to)
                 }
             }
 
-            to.DebugInformation.Scope = new ScopeDebugInformation(to.Body.Instructions.First(), to.Body.Instructions.Last());
-
-            if (from.DebugInformation.Scope != null)
-                to.DebugInformation.Scope.Import = from.DebugInformation.Scope.Import;
+            if (from.DebugInformation.Scope != null)
+            {
+                to.DebugInformation.Scope = from.DebugInformation.Scope;
+                to.DebugInformation.Scope.Start = new InstructionOffset(to.Body.Instructions[0].Offset);
+                to.DebugInformation.Scope.End = new InstructionOffset(to.Body.Instructions[to.Body.Instructions.Count - 1].Offset);
+                from.DebugInformation.Scope = null;
+            }
+
+
+            //to.DebugInformation.StateMachineKickOffMethod = from;
+
+            if (from.DebugInformation.StateMachineKickOffMethod != null)
+            {
+                to.DebugInformation.StateMachineKickOffMethod = from.DebugInformation.StateMachineKickOffMethod;
+                from.DebugInformation.StateMachineKickOffMethod = null;
+            }
 
             if (from.DebugInformation.HasCustomDebugInformations)
                 foreach (var cdi in from.DebugInformation.CustomDebugInformations.ToArray())
                 {
                     from.DebugInformation.CustomDebugInformations.Remove(cdi);
                     to.DebugInformation.CustomDebugInformations.Add(cdi);
-                }
-
+                }
+
+            //var cstm = new StateMachineScopeDebugInformation();
+            //cstm.Scopes.Add(new StateMachineScope(to.Body.Instructions[0], to.Body.Instructions[to.Body.Instructions.Count - 1]));
+            //to.CustomDebugInformations.Add(cstm);
+
             var to_vars = to.Body.Variables;
             foreach (var var in from.Body.Variables)
                 to_vars.Add(new VariableDefinition(to.Module.ImportReference(var.VariableType)));
@@ -323,4 +341,4 @@ private static string GetAroundMethodPrefix(MethodDefinition target)
             return $"{Constants.Prefix}around_{target.Name}_{target.MetadataToken.ToUInt32()}_";
         }
     }
-}
+}
diff --git a/src/AspectInjector.Core/AspectInjector.Core.csproj b/src/AspectInjector.Core/AspectInjector.Core.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Mono.Cecil" Version="0.11.4" />
+    <PackageReference Include="Mono.Cecil" Version="0.11.5" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FluentIL\FluentIL.csproj" />

diff --git a/src/AspectInjector/Program.cs b/src/AspectInjector/Program.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -18,7 +18,7 @@ private static int Main(string[] args)
 
             var optimize = false;
             var verbose = false;
-            List<string> references = new List<string>();
+            List<string> references = new();
 
             for (int i = 0; i < args.Length; i++)
             {

diff --git a/src/FluentIL/FluentIL.csproj b/src/FluentIL/FluentIL.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Mono.Cecil" Version="0.11.4" />
+    <PackageReference Include="Mono.Cecil" Version="0.11.5" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/FluentIL/MethodEditor.cs b/src/FluentIL/MethodEditor.cs
@@ -1,4 +1,4 @@
-using FluentIL.Extensions;
+using FluentIL.Extensions;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 using System;
@@ -64,15 +64,20 @@ public static void Instead(this MethodBody body, PointCut action)
                 .Here(action);
         }
 
-        public static void Mark(this MethodDefinition method, TypeReference attribute)
+        public static void Mark(this MethodDefinition method, TypeReference attribute, params CustomAttributeArgument[] args)
         {
             if (method.CustomAttributes.Any(ca => ca.AttributeType.FullName == attribute.FullName))
                 return;
 
             var constructor = method.Module.ImportReference(attribute).Resolve()
                 .Methods.First(m => m.IsConstructor && !m.IsStatic);
 
-            method.CustomAttributes.Add(new CustomAttribute(method.Module.ImportReference(constructor)));
+            var attr = new CustomAttribute(method.Module.ImportReference(constructor));
+
+            foreach (var arg in args)
+                attr.ConstructorArguments.Add(arg);
+
+            method.CustomAttributes.Add(attr);
         }
 
         public static Instruction GetCodeStart(this MethodBody body)
@@ -146,4 +151,4 @@ public static void OnEveryOccasionOf(this MethodBody body, Func<Instruction, boo
                 new Cut(body, curi).Here(pc);
         }
     }
-}
+}
diff --git a/tests/AspectInjector.Analyzer.Tests/AspectInjector.Analyzer.Tests.csproj b/tests/AspectInjector.Analyzer.Tests/AspectInjector.Analyzer.Tests.csproj
@@ -6,14 +6,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.10.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/tests/AspectInjector.Tests.Generics/AspectInjector.Tests.Generics.csproj b/tests/AspectInjector.Tests.Generics/AspectInjector.Tests.Generics.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <LangVersion>7.1</LangVersion>
     <Configurations>Debug;Release;DebugTests</Configurations>
   </PropertyGroup>

diff --git a/tests/AspectInjector.Tests.Integrity/AspectInjector.Tests.Integrity.csproj b/tests/AspectInjector.Tests.Integrity/AspectInjector.Tests.Integrity.csproj
@@ -7,9 +7,9 @@
 
   <ItemGroup>
     <PackageReference Include="Unofficial.CoreRT.ILVerify" Version="0.0.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/tests/AspectInjector.Tests.Runtime/AspectInjector.Tests.Runtime.csproj b/tests/AspectInjector.Tests.Runtime/AspectInjector.Tests.Runtime.csproj
@@ -1,17 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net6.0;net471;net461</TargetFrameworks>
+    <TargetFrameworks>net6.0;net462;net470;net480</TargetFrameworks>
     <LangVersion>7.3</LangVersion>
     <Configurations>Debug;Release;DebugTests</Configurations>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/tests/AspectInjector.Tests.RuntimeAssets/AspectInjector.Tests.RuntimeAssets.csproj b/tests/AspectInjector.Tests.RuntimeAssets/AspectInjector.Tests.RuntimeAssets.csproj
@@ -1,10 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Configurations>Debug;Release;DebugTests</Configurations>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net6.0;net471;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net462;net470;net480</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/tests/AspectInjector.Tests.VBRuntime/AspectInjector.Tests.VBRuntime.vbproj b/tests/AspectInjector.Tests.VBRuntime/AspectInjector.Tests.VBRuntime.vbproj
@@ -1,16 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net6.0;net471;net461</TargetFrameworks>
+    <TargetFrameworks>net6.0;net462;net470;net480</TargetFrameworks>
     <Configurations>Debug;Release;DebugTests</Configurations>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>