System.Type Marshaling

src/Authoring/WinRT.SourceGenerator2/TypeMapAssemblyTargetGenerator.Execute.cs

@@ -104,6 +104,8 @@ public static void EmitPrivateProjectionsTypeMapAssemblyTargetAttributes(SourceP
             {
                 _ = builder.AppendLine($"""
                     [assembly: global::System.Runtime.InteropServices.TypeMapAssemblyTarget<global::WindowsRuntime.InteropServices.WindowsRuntimeComWrappersTypeMapGroup>("{assemblyName}")]
+                    [assembly: global::System.Runtime.InteropServices.TypeMapAssemblyTarget<global::WindowsRuntime.InteropServices.WindowsRuntimeMetadataTypeMapGroup>("{assemblyName}")]
+                    [assembly: global::System.Runtime.InteropServices.TypeMapAssemblyTarget<global::WindowsRuntime.InteropServices.DynamicInterfaceCastableImplementationTypeMapGroup>("{assemblyName}")]
                     """);
             }
 
@@ -129,6 +131,14 @@ public static void EmitDefaultTypeMapAssemblyTargetAttributes(SourceProductionCo
                 [assembly: global::System.Runtime.InteropServices.TypeMapAssemblyTarget<global::WindowsRuntime.InteropServices.WindowsRuntimeComWrappersTypeMapGroup>("WinRT.Interop")]
                 //[assembly: global::System.Runtime.InteropServices.TypeMapAssemblyTarget<global::WindowsRuntime.InteropServices.WindowsRuntimeComWrappersTypeMapGroup>("WinRT.Projection")]
                 [assembly: global::System.Runtime.InteropServices.TypeMapAssemblyTarget<global::WindowsRuntime.InteropServices.WindowsRuntimeComWrappersTypeMapGroup>("WinRT.Runtime2")]
+
+                [assembly: global::System.Runtime.InteropServices.TypeMapAssemblyTarget<global::WindowsRuntime.InteropServices.WindowsRuntimeMetadataTypeMapGroup>("WinRT.Interop")]
+                //[assembly: global::System.Runtime.InteropServices.TypeMapAssemblyTarget<global::WindowsRuntime.InteropServices.WindowsRuntimeMetadataTypeMapGroup>("WinRT.Projection")]
+                [assembly: global::System.Runtime.InteropServices.TypeMapAssemblyTarget<global::WindowsRuntime.InteropServices.WindowsRuntimeMetadataTypeMapGroup>("WinRT.Runtime2")]
+
+                [assembly: global::System.Runtime.InteropServices.TypeMapAssemblyTarget<global::WindowsRuntime.InteropServices.DynamicInterfaceCastableImplementationTypeMapGroup>("WinRT.Interop")]
+                //[assembly: global::System.Runtime.InteropServices.TypeMapAssemblyTarget<global::WindowsRuntime.InteropServices.DynamicInterfaceCastableImplementationTypeMapGroup>("WinRT.Projection")]
+                [assembly: global::System.Runtime.InteropServices.TypeMapAssemblyTarget<global::WindowsRuntime.InteropServices.DynamicInterfaceCastableImplementationTypeMapGroup>("WinRT.Runtime2")]
                 """;
 
             context.AddSource("TypeMapAssemblyTarget.g.cs", source);

src/Tests/FunctionalTests/TypeMarshaling/Program.cs

@@ -0,0 +1,53 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
+using TestComponent;
+using TestComponentCSharp;
+
+bool success = true;
+
+SetTypeProperties setTypeProperties = new();
+
+// TODO: This test case fails because of a System.InvalidCastException when passing in CustomTestType to GetPropertyInfoWithIType.
+// Reenable this once the issue is resolved.
+//
+//// Trimmed Metadata test case
+//// Do not reference TestComponentCSharp::TestType1 in managed because it needs to be trimmed to test the Metadata TypeKind scenario
+//String expectedMetadataPropertyInfo = "TestComponentCSharp.TestType1 Metadata";
+//CustomTestType customTestType = new();
+//if (setTypeProperties.GetPropertyInfoWithIType(customTestType) != expectedMetadataPropertyInfo)
+//{
+//    success = false;
+//}
+
+// Custom TypeKind test case
+String expectedCustomTypePropertyInfo = "CustomTestType, TypeMarshaling, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Custom";
+SetTypeProperties customSetTypeProperties = new();
+if (setTypeProperties.GetPropertyInfoFromCustomType(typeof(CustomTestType)) != expectedCustomTypePropertyInfo)
+{
+    success = false;
+}
+
+// Primitive TypeKind test case
+String expectedPrimitiveTypePropertyInfo = "Int32 Primitive";
+SetTypeProperties primitiveSetTypeProperties = new();
+if (setTypeProperties.GetPropertyInfoFromCustomType(typeof(int)) != expectedPrimitiveTypePropertyInfo)
+{
+    success = false;
+}
+
+// Primitive TypeKind test case 2
+String expectedPrimitiveTypePropertyInfo2 = "Int64 Primitive";
+SetTypeProperties primitiveSetTypeProperties2 = new();
+if (setTypeProperties.GetPropertyInfoFromCustomType(typeof(System.Int64)) != expectedPrimitiveTypePropertyInfo2)
+{
+    success = false;
+}
+
+return success ? 100 : 101;
+
+sealed class CustomTestType : IType
+{
+    public System.Type TypeProperty { get; set; }
+}
+

src/Tests/FunctionalTests/TypeMarshaling/Properties/launchSettings.json

@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "TypeMarshaling": {
+      "commandName": "Project",
+      "nativeDebugging": true
+    }
+  }
+}

src/Tests/FunctionalTests/TypeMarshaling/TypeMarshaling.csproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>$(FunctionalTestsBuildTFMs)</TargetFrameworks>
+    <Platforms>x86;x64</Platforms>
+    <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
+    <PublishProfileFullPath>$(MSBuildProjectDirectory)\..\PublishProfiles\win-$(Platform).pubxml</PublishProfileFullPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Authoring\WinRT.SourceGenerator2\WinRT.SourceGenerator2.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" SetPlatform="Platform=AnyCPU" />
+    <ProjectReference Include="..\..\..\Projections\Test\Test.csproj" />
+    <ProjectReference Include="..\..\..\Projections\Windows\Windows.csproj" />
+  </ItemGroup>
+
+</Project>

src/Tests/TestComponentCSharp/ManualProjectionTestClasses.cpp

@@ -5,9 +5,39 @@
 #include "CustomBindableVectorTest.g.cpp"
 #include "CustomBindableObservableVectorTest.g.cpp"
 #include "CustomIteratorTest.g.cpp"
+#include "SetTypeProperties.g.cpp"
+#include <winrt/Windows.UI.Xaml.Interop.h>
 
 namespace winrt::TestComponentCSharp::implementation
 {
+    SetTypeProperties::SetTypeProperties()
+    {
+
+    }
+
+    winrt::hstring SetTypeProperties::GetPropertyInfoWithIType(IType testObject)
+    {
+        testObject.TypeProperty(winrt::xaml_typename<TestComponentCSharp::TestType1>());
+        winrt::hstring kind;
+        switch (testObject.TypeProperty().Kind)
+        {
+            case Windows::UI::Xaml::Interop::TypeKind::Custom:
+                kind = winrt::hstring(L"Custom");
+            case Windows::UI::Xaml::Interop::TypeKind::Metadata:
+                kind = winrt::hstring(L"Metadata");
+            default:
+                kind = winrt::hstring(L"Primitive");
+        }
+        return testObject.TypeProperty().Name + L" " + kind;
+    }
+
+    winrt::hstring SetTypeProperties::GetPropertyInfoFromCustomType(winrt::Windows::UI::Xaml::Interop::TypeName typeName)
+    {
+        TestComponentCSharp::Class TestObject;
+        TestObject.TypeProperty(typeName);
+        return TestObject.GetTypePropertyAbiName() + L" " + TestObject.GetTypePropertyKind();
+    }
+
 	CustomBindableIteratorTest::CustomBindableIteratorTest()
 	{
 

src/Tests/TestComponentCSharp/ManualProjectionTestClasses.h

@@ -4,9 +4,18 @@
 #include "CustomBindableVectorTest.g.h"
 #include "CustomBindableObservableVectorTest.g.h"
 #include "CustomIteratorTest.g.h"
+#include "SetTypeProperties.g.h"
+#include <winrt/Windows.UI.Xaml.Interop.h>
 
 namespace winrt::TestComponentCSharp::implementation
 {
+    struct SetTypeProperties : SetTypePropertiesT<SetTypeProperties>
+    {
+        SetTypeProperties();
+        winrt::hstring GetPropertyInfoWithIType(IType testObject);
+        winrt::hstring GetPropertyInfoFromCustomType(winrt::Windows::UI::Xaml::Interop::TypeName typeName);
+    };
+
 	struct CustomBindableIteratorTest : CustomBindableIteratorTestT<CustomBindableIteratorTest>
 	{
 		CustomBindableIteratorTest();
@@ -72,6 +81,11 @@ namespace winrt::TestComponentCSharp::implementation
 
 namespace winrt::TestComponentCSharp::factory_implementation
 {
+    struct SetTypeProperties : SetTypePropertiesT<SetTypeProperties, implementation::SetTypeProperties>
+    {
+
+    };
+
 	struct CustomBindableIteratorTest : CustomBindableIteratorTestT<CustomBindableIteratorTest, implementation::CustomBindableIteratorTest>
 	{
 

src/Tests/TestComponentCSharp/TestComponentCSharp.idl

@@ -106,6 +106,11 @@ namespace TestComponentCSharp
         Int32 DrawTo();
     }
 
+    interface IType
+    {
+        Windows.UI.Xaml.Interop.TypeName TypeProperty{ get; set; };
+    };
+
     interface IProperties1
     {
         Int32 ReadWriteProperty{ get; };
@@ -152,6 +157,20 @@ namespace TestComponentCSharp
         static ISingleton Instance;
     }
 
+    [default_interface]
+    runtimeclass SetTypeProperties
+    {
+        SetTypeProperties();
+        String GetPropertyInfoWithIType(IType testObject);
+        String GetPropertyInfoFromCustomType(Windows.UI.Xaml.Interop.TypeName typeName);
+    }
+
+    // Do not reference TestComponentCSharp::TestType1 in managed because it needs to be trimmed to test the Metadata TypeKind scenario in the TypeHandling project
+    runtimeclass TestType1
+    {
+        void f();
+    }
+
     [default_interface, gc_pressure(Windows.Foundation.Metadata.GCPressureAmount.High)]
     runtimeclass Class :
         Windows.Foundation.IStringable