0.7.3: Ability to export an inline attribute

oleg-st · Jun 24, 2024 · 7d9d2cf · 7d9d2cf
1 parent bd10bd3
commit 7d9d2cf
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/src/InlineMethod.Fody/InlineMethodWeaver.cs b/src/InlineMethod.Fody/InlineMethodWeaver.cs
@@ -233,6 +233,20 @@ private void FixInstructions()
             while (instruction != null)
             {
                 var nextInstruction = instruction.Next;
+                if (instruction.Operand is FieldReference opFieldReference)
+                {
+                    instruction.Operand = _moduleWeaver.ModuleDefinition.ImportReference(opFieldReference);
+                }
+
+                if (instruction.Operand is MethodReference opMethodReference)
+                {
+                    instruction.Operand = _moduleWeaver.ModuleDefinition.ImportReference(opMethodReference);
+                }
+
+                if (instruction.Operand is TypeReference opTypeReference)
+                {
+                    instruction.Operand = _moduleWeaver.ModuleDefinition.ImportReference(opTypeReference);
+                }
 
                 if (instruction.Operand is Instruction opInstruction)
                 {

diff --git a/src/InlineMethod.Fody/ModuleWeaver.cs b/src/InlineMethod.Fody/ModuleWeaver.cs
@@ -74,7 +74,7 @@ public override void Execute()
                 var attr = GetInlineAttribute(method);
                 if (attr != null)
                 {
-                    var value = attr.ConstructorArguments.Single().Value;
+                    var value = attr.ConstructorArguments.First().Value;
                     if (value is bool boolValue)
                     {
                         value = boolValue ? InlineBehavior.RemovePrivate : InlineBehavior.Keep;
@@ -88,8 +88,12 @@ public override void Execute()
                     }
                     else
                     {
+                        var export = (bool)(attr.ConstructorArguments.Skip(1).FirstOrDefault().Value ?? false);
                         // consume attribute
-                        method.CustomAttributes.Remove(attr);
+                        if (!export)
+                        {
+                            method.CustomAttributes.Remove(attr);
+                        }
                     }
                 }
             }

diff --git a/src/InlineMethod/InlineAttribute.cs b/src/InlineMethod/InlineAttribute.cs
@@ -13,13 +13,20 @@ public class InlineAttribute : Attribute
         /// </summary>
         public InlineBehavior Behavior { get; }
 
+        /// <summary>
+        /// Export attribute
+        /// </summary>
+        public bool Export { get; }
+
         /// <summary>
         /// Initialize a new instance
         /// </summary>
         /// <param name="behavior"></param>
-        public InlineAttribute(InlineBehavior behavior = InlineBehavior.RemovePrivate)
+        /// <param name="export"></param>
+        public InlineAttribute(InlineBehavior behavior = InlineBehavior.RemovePrivate, bool export = false)
         {
             Behavior = behavior;
+            Export = export;
         }
     }
 }
diff --git a/src/InlineMethod/InlineMethod.csproj b/src/InlineMethod/InlineMethod.csproj
@@ -12,7 +12,7 @@
     <PackageOutputPath>$(SolutionDir)/../nugets</PackageOutputPath>
     <PackageProjectUrl>https://github.com/oleg-st/InlineMethod.Fody</PackageProjectUrl>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <Version>0.7.2</Version>
+    <Version>0.7.3</Version>
   </PropertyGroup>
 
   <ItemGroup>