#11 fix for "... and needs to be imported"

greuelpirat · Jul 20, 2019 · 4ad84af · 4ad84af
1 parent f5d84f7
commit 4ad84af
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 2 deletions.
diff --git a/AnotherAssembly/AnotherAssembly.csproj b/AnotherAssembly/AnotherAssembly.csproj
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net46;netcoreapp2.2</TargetFrameworks>
+        <TargetFrameworks>net472;netcoreapp2.2</TargetFrameworks>
         <DisableFody>true</DisableFody>
     </PropertyGroup>
+    <ItemGroup>
+      <ProjectReference Include="..\DeepCopy\DeepCopy.csproj" />
+    </ItemGroup>
 </Project>
diff --git a/AnotherAssembly/DeepCopyClassFromAnotherAssembly.cs b/AnotherAssembly/DeepCopyClassFromAnotherAssembly.cs
@@ -0,0 +1,10 @@
+using DeepCopy;
+
+namespace AnotherAssembly
+{
+    [AddDeepCopyConstructor]
+    public class DeepCopyClassFromAnotherAssembly
+    {
+        public string Text { get; set; }
+    }
+}
diff --git a/AssemblyToProcess/ClassUsingOtherAssembly.cs b/AssemblyToProcess/ClassUsingOtherAssembly.cs
@@ -8,4 +8,10 @@ public class ClassUsingOtherAssembly
     {
         public ClassFromAnotherAssembly Property { get; set; }
     }
+
+    [AddDeepCopyConstructor]
+    public class ClassUsingOtherDeepCopyAssembly
+    {
+        public DeepCopyClassFromAnotherAssembly Property { get; set; }
+    }
 }
diff --git a/DeepCopy.Fody/Utilities.cs b/DeepCopy.Fody/Utilities.cs
@@ -79,7 +79,7 @@ private bool IsCopyConstructorAvailable(TypeReference type, out MethodReference
 
             if (resolved.AnyAttribute(AddDeepCopyConstructorAttribute))
             {
-                constructor = NewConstructor(type, type);
+                constructor = ModuleDefinition.ImportReference(NewConstructor(type, type));
                 return true;
             }
 

diff --git a/Tests/CopyOtherAssembly.cs b/Tests/CopyOtherAssembly.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Reflection;
 using AssemblyToProcess;
 using Xunit;
 
@@ -14,5 +15,27 @@ public void TestClassUsingOtherAssembly()
             var copy = Activator.CreateInstance(type, instance);
             Assert.NotSame(instance, copy);
         }
+
+        [Fact]
+        public void TestClassUsingOtherDeepCopyAssembly()
+        {
+            var type = GetTestType(typeof(ClassUsingOtherDeepCopyAssembly));
+            var instance = Activator.CreateInstance(type);
+            try
+            {
+                Activator.CreateInstance(type, instance);
+                Assert.True(false);
+            }
+            catch (TargetInvocationException exception)
+            {
+                Assert.True(exception.InnerException is MissingMethodException);
+                Assert.Contains("Void AnotherAssembly.DeepCopyClassFromAnotherAssembly..ctor(AnotherAssembly.DeepCopyClassFromAnotherAssembly)", exception.InnerException.Message);
+
+            }
+            catch
+            {
+                Assert.True(false);
+            }
+        }
     }
 }