Import cache getter to enable import from base classes in other assemblies

Author: Dresel

SpatialFocus.MethodCache.Fody.sln

@@ -38,6 +38,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpatialFocus.MethodCache.Sa
 		{81703F57-025F-42C4-AE8B-568E2F56CCE2} = {81703F57-025F-42C4-AE8B-568E2F56CCE2}
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpatialFocus.MethodCache.TestAssembly2", "src\SpatialFocus.MethodCache.TestAssembly2\SpatialFocus.MethodCache.TestAssembly2.csproj", "{766C91B4-5753-4B31-9FBF-684D6754D2DA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -72,6 +74,10 @@ Global
 		{E03D9328-B71F-4451-9956-6D28186F84A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E03D9328-B71F-4451-9956-6D28186F84A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E03D9328-B71F-4451-9956-6D28186F84A7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{766C91B4-5753-4B31-9FBF-684D6754D2DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{766C91B4-5753-4B31-9FBF-684D6754D2DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{766C91B4-5753-4B31-9FBF-684D6754D2DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{766C91B4-5753-4B31-9FBF-684D6754D2DA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -84,6 +90,7 @@ Global
 		{C47814DC-272E-4FB8-A97C-2B6C75F60C76} = {674F705E-E459-490B-B536-3F750485AE33}
 		{88A8C843-A479-42B8-AAF6-8F816C660515} = {674F705E-E459-490B-B536-3F750485AE33}
 		{E03D9328-B71F-4451-9956-6D28186F84A7} = {674F705E-E459-490B-B536-3F750485AE33}
+		{766C91B4-5753-4B31-9FBF-684D6754D2DA} = {674F705E-E459-490B-B536-3F750485AE33}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1a3946bb-e6d6-4999-932a-807a80bc0cdb}

src/SpatialFocus.MethodCache.Fody/MemoryCache.cs

@@ -60,7 +60,7 @@ public static MethodReference GetCacheGetterMethod(ClassWeavingContext classWeav
 				throw new WeavingException("Cache Property not found or multiple properties found.");
 			}
 
-			MethodDefinition methodDefinition = propertyDefinitions.Single().GetMethod;
+			MethodReference methodDefinition = classWeavingContext.TypeDefinition.Module.ImportReference(propertyDefinitions.Single().GetMethod);
 
 			if (methodDefinition.DeclaringType.GenericParameters.Any())
 			{

src/SpatialFocus.MethodCache.TestAssembly/DerivedTestClass2.cs

@@ -0,0 +1,23 @@
+// <copyright file="DerivedTestClass2.cs" company="Spatial Focus GmbH">
+// Copyright (c) Spatial Focus GmbH. All rights reserved.
+// </copyright>
+
+namespace SpatialFocus.MethodCache.TestAssembly
+{
+	using Microsoft.Extensions.Caching.Memory;
+
+	[Cache]
+	public class DerivedTestClass2 : TestAssembly2.BaseClass
+	{
+		public DerivedTestClass2(IMemoryCache memoryCache) : base(memoryCache)
+		{
+		}
+
+#pragma warning disable CA1822 // Mark members as static
+		public int Add(int a, int b)
+		{
+			return a + b;
+		}
+#pragma warning restore CA1822 // Mark members as static
+	}
+}

src/SpatialFocus.MethodCache.TestAssembly/SpatialFocus.MethodCache.TestAssembly.csproj

@@ -10,6 +10,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<ProjectReference Include="..\SpatialFocus.MethodCache.TestAssembly2\SpatialFocus.MethodCache.TestAssembly2.csproj" />
 		<ProjectReference Include="..\SpatialFocus.MethodCache\SpatialFocus.MethodCache.csproj" />
 	</ItemGroup>
 

src/SpatialFocus.MethodCache.TestAssembly2/BaseClass.cs

@@ -0,0 +1,18 @@
+// <copyright file="BaseClass.cs" company="Spatial Focus GmbH">
+// Copyright (c) Spatial Focus GmbH. All rights reserved.
+// </copyright>
+
+namespace SpatialFocus.MethodCache.TestAssembly2
+{
+	using Microsoft.Extensions.Caching.Memory;
+
+	public class BaseClass
+	{
+		public BaseClass(IMemoryCache memoryCache)
+		{
+			MemoryCache = memoryCache;
+		}
+
+		public IMemoryCache MemoryCache { get; }
+	}
+}

src/SpatialFocus.MethodCache.TestAssembly2/SpatialFocus.MethodCache.TestAssembly2.csproj

@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>netstandard2.0</TargetFramework>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.9" />
+	</ItemGroup>
+
+</Project>

src/SpatialFocus.MethodCache.Tests/MemoryCacheBasicTests.cs

@@ -97,5 +97,19 @@ public void BasicTest5DerivedClass()
 			Assert.Equal(1, mockMemoryCache.CountSets);
 			Assert.Equal(1, mockMemoryCache.CountGets);
 		}
+
+		[Fact]
+		public void BasicTest6DerivedClass()
+		{
+			using MockMemoryCache mockMemoryCache = MockMemoryCache.Default;
+
+			dynamic instance = TestHelpers.CreateInstance<DerivedTestClass2>(MemoryCacheBasicTests.TestResult.Assembly, mockMemoryCache);
+
+			dynamic result = instance.Add(1, 2);
+
+			Assert.Equal(3, result);
+			Assert.Equal(1, mockMemoryCache.CountSets);
+			Assert.Equal(1, mockMemoryCache.CountGets);
+		}
 	}
 }