Allow Getter method to be injected

Allow getter method to be injected
punitganshani · Feb 19, 2015 · 175fc80 · 175fc80
1 parent 05d1c85
commit 175fc80
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 682 deletions.
diff --git a/CInject.Engine/Properties/AssemblyInfo.cs b/CInject.Engine/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:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4")]
-[assembly: AssemblyFileVersion("1.4")]
+[assembly: AssemblyVersion("1.4.1")]
+[assembly: AssemblyFileVersion("1.4.1")]
diff --git a/CInject.Engine/Resolvers/MonoAssemblyResolver.cs b/CInject.Engine/Resolvers/MonoAssemblyResolver.cs
@@ -187,9 +187,8 @@ private bool PatchMethod(MethodDefinition method, Injection injection)
             bool success = true;
             if (method.IsConstructor ||
                 method.IsAbstract ||
-                method.IsGetter ||
                 method.IsSetter ||
-                method.IsSpecialName ||
+                (method.IsSpecialName && !method.IsGetter) || // to allow getter methods
                 method.IsGenericInstance ||
                 method.IsManaged == false ||
                 method.Body == null)

diff --git a/CInject.Injections/Properties/AssemblyInfo.cs b/CInject.Injections/Properties/AssemblyInfo.cs
@@ -54,5 +54,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.4")]
-[assembly: AssemblyFileVersion("1.4")]
+[assembly: AssemblyVersion("1.4.1")]
+[assembly: AssemblyFileVersion("1.4.1")]
diff --git a/CInject.Injections/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/CInject.Injections/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/CInject.TargetAssembly/Program.cs b/CInject.TargetAssembly/Program.cs
@@ -52,6 +52,7 @@ private static void Main(string[] args)
             TestClass.MyDelegate delegateDefinition = new TestClass.MyDelegate(DelegateCalled);
             testClass.CallDelegate(delegateDefinition);
 
+            Console.WriteLine("Name is: " + testClass.NameProperty);
             Console.WriteLine("Press any key to exit...");
             Console.ReadKey();
         }

diff --git a/CInject.TargetAssembly/TestClass.cs b/CInject.TargetAssembly/TestClass.cs
@@ -109,5 +109,13 @@ public double Subtract(double x, double y)
         {
             return x - y;
         }
+
+        public string NameProperty
+        {
+            get
+            {
+                return Name;
+            }
+        }
     }
 }
diff --git a/CInject/Properties/AssemblyInfo.cs b/CInject/Properties/AssemblyInfo.cs
@@ -56,5 +56,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.4")]
-[assembly: AssemblyFileVersion("1.4")]
+[assembly: AssemblyVersion("1.4.1")]
+[assembly: AssemblyFileVersion("1.4.1")]
diff --git a/License/gpl.txt b/License/gpl.txt