System.Type Marshaling

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

@@ -104,6 +104,7 @@ 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}")]
                     """);
             }
@@ -130,6 +131,11 @@ 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")]

src/Projections/Test/Test.csproj

@@ -20,6 +20,7 @@
   <PropertyGroup>
     <CsWinRTExcludes>
       TestComponentCSharp.AnotherAssembly;
+      TestComponentCSharp.TestTypeTrimmed;
     </CsWinRTExcludes>
     <CsWinRTIncludes>
       TestComponent;

src/Tests/FunctionalTests/TypeMarshaling/Program.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
+using TestComponent;
+using TestComponentCSharp;
+
+SetTypeProperties setTypeProperties = new();
+
+// Convert to Managed Metadata Marshalling Info Test Case
+String expectedMetadataPropertyInfo = "TestComponentCSharp.TestType Metadata";
+CustomTestType TestType = new();
+if (setTypeProperties.GetPropertyInfoTestType(TestType) != expectedMetadataPropertyInfo)
+{
+    return 101;
+}
+
+// Convert to Managed Trimmed Metadata NoMetadataTypeInfo Test Case
+// Goes into NoMetadataTypeInfo codepath for Type.cs ConvertToManaged
+// Do not reference TestComponentCSharp::TestType1 in managed because it needs to be trimmed to test the Metadata TypeKind scenario
+String expectedMetadataPropertyInfoTrimmed = "TestComponentCSharp.TestTypeTrimmed Metadata";
+CustomTestType TestTypeTrimmed = new();
+if (setTypeProperties.GetPropertyInfoTestTypeTrimmed(TestTypeTrimmed) != expectedMetadataPropertyInfoTrimmed)
+{
+    return 102;
+}
+
+// Custom TypeKind test case
+String expectedCustomTypePropertyInfo = "CustomTestType, TypeMarshaling, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Custom";
+SetTypeProperties customSetTypeProperties = new();
+if (setTypeProperties.GetPropertyInfoWithType(typeof(CustomTestType)) != expectedCustomTypePropertyInfo)
+{
+    return 103;
+}
+
+// Primitive TypeKind test case
+String expectedPrimitiveTypePropertyInfo = "Int32 Primitive";
+SetTypeProperties primitiveSetTypeProperties = new();
+if (setTypeProperties.GetPropertyInfoWithType(typeof(int)) != expectedPrimitiveTypePropertyInfo)
+{
+    return 104;
+}
+
+// Primitive TypeKind test case 2
+String expectedPrimitiveTypePropertyInfo2 = "Int64 Primitive";
+SetTypeProperties primitiveSetTypeProperties2 = new();
+if (setTypeProperties.GetPropertyInfoWithType(typeof(System.Int64)) != expectedPrimitiveTypePropertyInfo2)
+{
+    return 105;
+}
+
+return 100;
+
+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,62 @@
 #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::GetPropertyInfoTestTypeTrimmed(IType testObject)
+    {
+        testObject.TypeProperty(winrt::xaml_typename<TestComponentCSharp::TestTypeTrimmed>());
+        winrt::hstring kind;
+        switch (testObject.TypeProperty().Kind)
+        {
+            case Windows::UI::Xaml::Interop::TypeKind::Custom:
+                kind = winrt::hstring(L"Custom");
+                break;
+            case Windows::UI::Xaml::Interop::TypeKind::Metadata:
+                kind = winrt::hstring(L"Metadata");
+                break;
+            default:
+                kind = winrt::hstring(L"Primitive");
+                break;
+        }
+        return testObject.TypeProperty().Name + L" " + kind;
+    }
+
+    winrt::hstring SetTypeProperties::GetPropertyInfoTestType(IType testObject)
+    {
+        testObject.TypeProperty(winrt::xaml_typename<TestComponentCSharp::TestType>());
+        winrt::hstring kind;
+        switch (testObject.TypeProperty().Kind)
+        {
+        case Windows::UI::Xaml::Interop::TypeKind::Custom:
+            kind = winrt::hstring(L"Custom");
+            break;
+        case Windows::UI::Xaml::Interop::TypeKind::Metadata:
+            kind = winrt::hstring(L"Metadata");
+            break;
+        default:
+            kind = winrt::hstring(L"Primitive");
+            break;
+        }
+        return testObject.TypeProperty().Name + L" " + kind;
+    }
+
+
+    winrt::hstring SetTypeProperties::GetPropertyInfoWithType(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,19 @@
 #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 GetPropertyInfoTestType(IType testObject);
+        winrt::hstring GetPropertyInfoTestTypeTrimmed(IType testObject);
+        winrt::hstring GetPropertyInfoWithType(winrt::Windows::UI::Xaml::Interop::TypeName typeName);
+    };
+
 	struct CustomBindableIteratorTest : CustomBindableIteratorTestT<CustomBindableIteratorTest>
 	{
 		CustomBindableIteratorTest();
@@ -72,6 +82,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,26 @@ namespace TestComponentCSharp
         static ISingleton Instance;
     }
 
+    [default_interface]
+    runtimeclass SetTypeProperties
+    {
+        SetTypeProperties();
+        String GetPropertyInfoTestTypeTrimmed(IType testObject);
+        String GetPropertyInfoTestType(IType testObject);
+        String GetPropertyInfoWithType(Windows.UI.Xaml.Interop.TypeName typeName);
+    }
+
+    // Do not reference TestComponentCSharp::TestTypeTrimmed in managed because it needs to be trimmed to test the Metadata TypeKind scenario in the TypeHandling project
+    runtimeclass TestTypeTrimmed
+    {
+        void f();
+    }
+
+    runtimeclass TestType
+    {
+        void f();
+    }
+
     [default_interface, gc_pressure(Windows.Foundation.Metadata.GCPressureAmount.High)]
     runtimeclass Class :
         Windows.Foundation.IStringable