Fix IL2091 in generated ActivateInstance<T>() (#1449)

microsoft · Jan 19, 2024 · aff0c34 · aff0c34
1 parent 0dd0515
commit aff0c34
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/cswinrt/code_writers.h b/src/cswinrt/code_writers.h
@@ -9653,10 +9653,15 @@ public static IntPtr Make()
 }
 
 static readonly % _factory = new %();
-public static ObjectReference<I> ActivateInstance<I>()
+public static ObjectReference<I> ActivateInstance<
+#if NET5_0_OR_GREATER
+    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.NonPublicConstructors | DynamicallyAccessedMemberTypes.PublicFields)]
+#endif
+    I>()
 {
-IntPtr instance = _factory.ActivateInstance();
-return ObjectReference<IInspectable.Vftbl>.Attach(ref instance).As<I>();
+    IntPtr instance = _factory.ActivateInstance();
+
+    return ObjectReference<IInspectable.Vftbl>.Attach(ref instance).As<I>();
 }
 
 %

diff --git a/src/cswinrt/type_writers.h b/src/cswinrt/type_writers.h
@@ -47,6 +47,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.CompilerServices;