Fixed generic assembly neutral interfaces

#1144
aspnet · Jan 28, 2015 · 1f8171a · 1f8171a
1 parent 0c81a2d
commit 1f8171a
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 4 deletions.
diff --git a/src/Microsoft.Framework.Runtime.Roslyn/AssemblyNeutral/TypeCompilationContext.cs b/src/Microsoft.Framework.Runtime.Roslyn/AssemblyNeutral/TypeCompilationContext.cs
@@ -33,8 +33,7 @@ public string AssemblyName
         {
             get
             {
-                // TODO: Fix this to generate proper names (seems that the generic type's arity isn't captured here)
-                return TypeSymbol.ContainingNamespace + "." + TypeSymbol.Name;
+                return TypeSymbol.ContainingNamespace + "." + TypeSymbol.MetadataName;
             }
         }
 

diff --git a/test/Microsoft.Framework.Runtime.Roslyn.Tests/AssemblyNeutralFacts.cs b/test/Microsoft.Framework.Runtime.Roslyn.Tests/AssemblyNeutralFacts.cs
@@ -133,6 +133,43 @@ public class AssemblyNeutralAttribute : System.Attribute { }
             Assert.Equal("Something.IDataObjectProvider", compilations[2].AssemblyName);
         }
 
+        [Fact]
+        public void GenericAndNonGenericWithSameName()
+        {
+            var worker = DoAssemblyNeutralCompilation(
+@"
+namespace Something
+{
+    [AssemblyNeutral]
+    public interface ILogger { void Log(string message); }
+}",
+@"
+
+namespace Something
+{
+    [AssemblyNeutral]
+    public interface ILogger<T> : ILogger 
+    {
+    }
+}",
+@"
+namespace Something
+{
+    [AssemblyNeutral]
+    public class AssemblyNeutralAttribute : System.Attribute { }
+}
+");
+
+            var diagnostics = worker.GenerateTypeCompilations();
+            var compilations = worker.TypeCompilations.OrderBy(c => c.AssemblyName).ToList();
+
+            Assert.Equal(0, diagnostics.Count);
+            Assert.Equal(3, compilations.Count());
+            Assert.Equal("Something.AssemblyNeutralAttribute", compilations[0].AssemblyName);
+            Assert.Equal("Something.ILogger", compilations[1].AssemblyName);
+            Assert.Equal("Something.ILogger`1", compilations[2].AssemblyName);
+        }
+
         [Fact]
         public void GenericAssemblyNeutralMembersWithPrimitiveTypeParams()
         {
@@ -182,9 +219,9 @@ public class AssemblyNeutralAttribute : System.Attribute { }
             Assert.Equal(0, diagnostics.Count);
             Assert.Equal(4, compilations.Count());
             Assert.Equal("Something.AssemblyNeutralAttribute", compilations[0].AssemblyName);
-            Assert.Equal("Something.IDataObject", compilations[1].AssemblyName);
+            Assert.Equal("Something.IDataObject`1", compilations[1].AssemblyName);
             Assert.Equal("Something.IDataObjectProvider", compilations[2].AssemblyName);
-            Assert.Equal("Something.IDataValue", compilations[3].AssemblyName);
+            Assert.Equal("Something.IDataValue`1", compilations[3].AssemblyName);
         }
 
         private AssemblyNeutralWorker DoAssemblyNeutralCompilation(params string[] fileContents)