1.0.4

clean code & fix bugs

Author: Yvees

src/Cache.Fody/Cache.Fody.csproj

@@ -12,9 +12,9 @@
     <PackageProjectUrl>https://github.com/KevinYeti/Cache</PackageProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/KevinYeti/Cache/master/icon.png</PackageIconUrl>
     <PackageTags>Cache, ILWeaving, Fody, Cecil, AOP</PackageTags>
-    <AssemblyVersion>1.0.1.0</AssemblyVersion>
-    <FileVersion>1.0.1.0</FileVersion>
-    <Version>1.0.1</Version>
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <FileVersion>1.0.0.0</FileVersion>
+    <Version>1.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/Cache.Fody/ReferenceFinder.cs

@@ -25,6 +25,8 @@ public static class ReferenceFinder
 
         public static MethodDefinition SystemTypeGetTypeFromHandleMethod { get; set; }
 
+        public static AssemblyDefinition CacheAssembly { get; set; }
+
         public static void LoadReferences(BaseModuleWeaver weaver)
         {
             _weaver = weaver;
@@ -34,16 +36,8 @@ public static void LoadReferences(BaseModuleWeaver weaver)
             DictionaryConstructor = weaver.FindType("Dictionary`2").Resolve().GetConstructors().FirstOrDefault();
             DictionaryAddMethod = weaver.FindType("Dictionary`2").Method("Add");
             SystemTypeGetTypeFromHandleMethod = weaver.FindType("Type").Method("GetTypeFromHandle");
+            CacheAssembly = new DefaultAssemblyResolver().Resolve(weaver.ModuleDefinition.AssemblyReferences.FirstOrDefault(r => r.Name == "Cache"));
         }
 
-        //private static void AppendTypes(string name, List<TypeDefinition> coreTypes)
-        //{
-        //    AssemblyDefinition definition = AssemblyResolver.Resolve(AssemblyNameReference.Parse(name));
-        //    if (definition != null)
-        //    {
-        //        coreTypes.AddRange(definition.MainModule.Types);
-        //    }
-        //}
-
     }
 }

src/Cache.Fody/WeaveHelper.cs

@@ -387,9 +387,8 @@ public static PropertyDefinition InjectProperty(BaseModuleWeaver weaver, MethodD
         {
             //Import Reference 
             TypeDefinition mdlClass = methodDefinition.DeclaringType;
-            var refModule = ModuleDefinition.ReadModule("Cache.dll");
+            var refModule = ReferenceFinder.CacheAssembly.MainModule;
             var refInterface = refModule.GetType("Cache.ICacheProvider");
-            //mdlClass.Module.ImportReference(refInterface);
 
             //define the field we store the value in 
             FieldDefinition field = new FieldDefinition(
@@ -440,31 +439,6 @@ public static void WeaveMethod(BaseModuleWeaver weaver, MethodDefinition methodD
             PropertyDefinition propertyInject = null;
             if (propertyGet == null && methodDefinition.IsStatic && !methodDefinition.DeclaringType.Properties.Any( p => p.Name == "Cache"))
             {
-                //add field
-                //FieldDefinition fldCache = new FieldDefinition("Cache", FieldAttributes.Public | FieldAttributes.Static, 
-                //        new TypeReference("Cache", "ICacheProvider", methodDefinition.Module, methodDefinition.Module));
-
-                //add property
-                //PropertyDefinition property = new PropertyDefinition("Cache", PropertyAttributes.None,
-                //            moduleClass.Module.ImportReference(t));
-                //moduleClass.Module.ImportReference(new TypeReference("Cache", "ICacheProvider", refModule, refModule));
-                //moduleClass.Module.ImportReference(t);
-
-
-                //add getter
-
-                //property.GetMethod = new MethodDefinition("get_Cache", MethodAttributes.Static | MethodAttributes.Public | MethodAttributes.HideBySig | MethodAttributes.SpecialName,
-                //    moduleClass.Module.ImportReference(t));
-                //property.GetMethod.DeclaringType = moduleClass;
-                //property.GetMethod.ReturnType = t;
-                //foreach (var item in p.GetMethod.Body.Instructions)
-                //{
-                //    property.GetMethod.Body.Instructions.Add(item);
-                //}
-
-
-
-                //moduleClass.Properties.Add(property);
                 propertyInject = InjectProperty(weaver, methodDefinition);
                 propertyGet = propertyInject.GetMethod;
             }
@@ -505,10 +479,10 @@ public static void WeaveMethod(BaseModuleWeaver weaver, MethodDefinition methodD
 
             current = SetCacheKeyLocalVariable(weaver, current, methodDefinition, processor, cacheKeyIndex, objectArrayIndex);
 
-            //
+            //init CacheProvider when static method called
             if (methodDefinition.IsStatic)
             {
-                var refModule = ModuleDefinition.ReadModule("Cache.dll");
+                var refModule = ReferenceFinder.CacheAssembly.MainModule;
                 var refProvider = refModule.GetType("Cache.CacheProvider");
                 var refProviderGet = refProvider.Method("get_Provider");
                 var refSetter = propertyInject.SetMethod;

src/Cache/Cache.csproj

@@ -2,17 +2,17 @@
 
   <PropertyGroup>
     <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
-    <PackageVersion>1.0.3</PackageVersion>
+    <PackageVersion>1.0.4</PackageVersion>
     <Description>Injects method cache code.</Description>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageProjectUrl>https://github.com/KevinYeti/Cache</PackageProjectUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/KevinYeti/Cache/master/icon.png</PackageIconUrl>
     <PackageTags>Cache, ILWeaving, Fody, Cecil, AOP</PackageTags>
     <PackageLicenseUrl>https://github.com/KevinYeti/Cache/blob/master/LICENSE</PackageLicenseUrl>
     <PackageId>Cache.Fody</PackageId>
-    <AssemblyVersion>1.0.3.0</AssemblyVersion>
-    <FileVersion>1.0.3.0</FileVersion>
-    <Version>1.0.3</Version>
+    <AssemblyVersion>1.0.4.0</AssemblyVersion>
+    <FileVersion>1.0.4.0</FileVersion>
+    <Version>1.0.4</Version>
   </PropertyGroup>
 
   <ItemGroup>