Merge pull request #495 from microsoft/ujjwalchadha/345-fix-typename

Fix TypeName.Name to return full assembly qualified type name for cus…
microsoft · Oct 14, 2020 · f9e64eb · f9e64eb
2 parents 27073d6 + 74f41d1
commit f9e64eb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/UnitTest/TestComponentCSharp_Tests.cs b/UnitTest/TestComponentCSharp_Tests.cs
@@ -48,6 +48,16 @@ public void TestTypePropertyWithSystemType()
  TestObject.TypeProperty = typeof(System.Type);
  Assert.Equal("Windows.UI.Xaml.Interop.TypeName", TestObject.GetTypePropertyAbiName());
  Assert.Equal("Metadata", TestObject.GetTypePropertyKind());
+ }
+
+ class CustomDictionary : Dictionary<string, string> { }
+
+ [Fact]
+ public void TestTypePropertyWithCustomType()
+ {
+ TestObject.TypeProperty = typeof(CustomDictionary);
+ var name = TestObject.GetTypePropertyAbiName();
+ Assert.Equal("UnitTest.TestCSharp+CustomDictionary, UnitTest, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null", name);
  }
 
 #if NET5_0

diff --git a/WinRT.Runtime/Projections/Type.cs b/WinRT.Runtime/Projections/Type.cs
@@ -51,7 +51,7 @@ public static Marshaler CreateMarshaler(global::System.Type value)
 
  return new Marshaler
  {
- Name = MarshalString.CreateMarshaler(TypeNameSupport.GetNameForType(value, TypeNameGenerationFlags.None)),
+ Name = MarshalString.CreateMarshaler(kind == TypeKind.Custom ? value.AssemblyQualifiedName : TypeNameSupport.GetNameForType(value, TypeNameGenerationFlags.None)),
  Kind = kind
  };
  }