CR feedback

Author: jkotas

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets

@@ -109,7 +109,7 @@ The .NET Foundation licenses this file to you under the MIT license.
   </ItemGroup>
 
   <ItemGroup>
-    <PrivateSdkAssemblies Include="$(IlcSdkPath)*.dll" Exclude="@(_ExcludedPrivateSdkAssemblies)"/>
+    <PrivateSdkAssemblies Include="$(IlcSdkPath)*.dll" />
 
     <!-- Exclude unmanaged dlls -->
     <FrameworkAssemblies Include="$(IlcFrameworkPath)*.dll" Exclude="$(IlcFrameworkPath)*.Native.dll;$(IlcFrameworkPath)msquic.dll" />
@@ -149,7 +149,7 @@ The .NET Foundation licenses this file to you under the MIT license.
 
     <!-- If running from a package these values need to be set again with the resolved IlcXYZPath -->
     <ItemGroup>
-      <PrivateSdkAssemblies Include="$(IlcSdkPath)*.dll" Exclude="@(_ExcludedPrivateSdkAssemblies)"/>
+      <PrivateSdkAssemblies Include="$(IlcSdkPath)*.dll" />
 
       <!-- Exclude unmanaged dlls -->
       <FrameworkAssemblies Include="$(IlcFrameworkPath)*.dll" Exclude="$(IlcFrameworkPath)*.Native.dll;$(IlcFrameworkPath)msquic.dll" />

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Runtime/MethodInfos/CustomMethodMapper.Nullable.cs

@@ -77,8 +77,9 @@ public static Dictionary<MethodBase, CustomMethodInvokerAction> Map
 
                         map.AddMethod(type, nameof(Nullable<int>.GetValueOrDefault), Array.Empty<Type>(), NullableGetValueOrDefault);
 
+                        [UnconditionalSuppressMessage("ReflectionAnalysis", "IL2067:ParameterDoesntMeetParameterRequirements",
+                            Justification = "Constructed MethodTable of a Nullable forces a constructed MethodTable of the element type")]
                         static object NullableGetValueOrDefault(object thisObject, object[] args,
-                            [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.NonPublicConstructors)]
                             Type thisType)
                         {
                             if (thisObject == null)

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Runtime/MethodInfos/RuntimeNamedMethodInfo.cs

@@ -135,7 +135,7 @@ public sealed override MethodInfo MakeGenericMethod(params Type[] typeArguments)
                     throw new ArgumentNullException();
 
                 if (typeArgument is not RuntimeType)
-                    throw new ArgumentException(SR.Format(SR.Reflection_CustomReflectionObjectsNotSupported, typeArguments[i]), "typeArguments[" + i + "]"); // Not a runtime type.
+                    throw new PlatformNotSupportedException(SR.Format(SR.Reflection_CustomReflectionObjectsNotSupported, typeArguments[i]));
 
                 if (typeArgument.IsByRefLike)
                     throw new BadImageFormatException(SR.CannotUseByRefLikeTypeInInstantiation);

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/Runtime/TypeInfos/RuntimeTypeInfo.cs

@@ -465,7 +465,7 @@ public sealed override Type MakeGenericType(params Type[] typeArguments)
                     }
                     else
                     {
-                        throw new PlatformNotSupportedException(SR.PlatformNotSupported_MakeGenericType); // "PlatformNotSupported" because on desktop, passing in a foreign type is allowed and creates a RefEmit.TypeBuilder
+                        throw new PlatformNotSupportedException(SR.Format(SR.Reflection_CustomReflectionObjectsNotSupported, typeArguments[i]));
                     }
                 }
             }

src/libraries/System.Private.CoreLib/src/Resources/Strings.resx

@@ -3949,9 +3949,6 @@
   <data name="NoMetadataTokenAvailable" xml:space="preserve">
     <value>There is no metadata token available for the given member.</value>
   </data>
-  <data name="PlatformNotSupported_MakeGenericType" xml:space="preserve">
-    <value>PlatformNotSupported_MakeGenericType", @"MakeGenericType can only accept Type objects created by the runtime.</value>
-  </data>
   <data name="ArgumentException_InvalidTypeArgument" xml:space="preserve">
     <value>The type '{0}' may not be used as a type argument.</value>
   </data>
@@ -3962,7 +3959,7 @@
     <value>TypeHandles are not supported for types that return true for ContainsGenericParameters.</value>
   </data>
   <data name="Reflection_CustomReflectionObjectsNotSupported" xml:space="preserve">
-    <value>The object '{0}' was created by a custom ReflectionContext and cannot be used here.</value>
+    <value>The type '{0}' was created by a custom ReflectionContext and cannot be used here.</value>
   </data>
   <data name="CannotCreateByRefOfByRef" xml:space="preserve">
     <value>Cannot create a byref of a byref: {0}</value>