[release/6.0] [mono] Allow RuntimeType arguments in CustomAttributeBuilder (#58317)

Co-authored-by: Ulrich Weigand <ulrich.weigand@de.ibm.com>

diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/tests/CustomAttributeBuilderTests.cs b/src/libraries/System.Reflection.Emit.ILGeneration/tests/CustomAttributeBuilderTests.cs
index 9c2df4249b3836d5de319c5a98dac482ddeba803..0b536e51a9447bd6613f5be3edfa744f3a433324 100644 (file)
--- a/src/libraries/System.Reflection.Emit.ILGeneration/tests/CustomAttributeBuilderTests.cs
+++ b/src/libraries/System.Reflection.Emit.ILGeneration/tests/CustomAttributeBuilderTests.cs
@@ -255,7 +255,6 @@ namespace System.Reflection.Emit.Tests
         }
 
         [Fact]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/2383", TestRuntimes.Mono)]
         public static void Ctor_AllPrimitives()
         {
             ConstructorInfo con = typeof(Primitives).GetConstructors()[0];

diff --git a/src/mono/System.Private.CoreLib/src/System/Reflection/Emit/CustomAttributeBuilder.Mono.cs b/src/mono/System.Private.CoreLib/src/System/Reflection/Emit/CustomAttributeBuilder.Mono.cs
index 7f26920c5e52d813db268e8ce40475951489537d..a34ea7064705d6b11d15bb59df4f15a251faa375 100644 (file)
--- a/src/mono/System.Private.CoreLib/src/System/Reflection/Emit/CustomAttributeBuilder.Mono.cs
+++ b/src/mono/System.Private.CoreLib/src/System/Reflection/Emit/CustomAttributeBuilder.Mono.cs
@@ -123,7 +123,7 @@ namespace System.Reflection.Emit
                 // depends on this
                 Enum.GetUnderlyingType(t);
             }
-            if (t.IsClass && !(t.IsArray || t == typeof(object) || t == typeof(Type) || t == typeof(string) || t.Assembly.GetName().Name == "mscorlib"))
+            if (t.IsClass && !(t.IsArray || t == typeof(object) || typeof(Type).IsAssignableFrom(t) || t == typeof(string) || t.Assembly.GetName().Name == "mscorlib"))
                 return false;
             if (t.IsValueType && !(t.IsPrimitive || t.IsEnum || ((t.Assembly is AssemblyBuilder) && t.Assembly.GetName().Name == "mscorlib")))
                 return false;
@@ -149,7 +149,7 @@ namespace System.Reflection.Emit
         {
             if (type.IsValueType && value == null)
                 return false;
-            if (type.IsArray && type.GetElementType()!.IsValueType)
+            if (type.IsArray && type.GetElementType()!.IsValueType && value != null)
             {
                 foreach (object? v in (Array)value!)
                 {