Address build feedback

Author: steveharter

pkg/Microsoft.Private.PackageBaseline/packageIndex.json

@@ -3466,10 +3466,9 @@
       }
     },
     "System.Reflection.MetadataLoadContext": {
-        "BaselineVersion": "4.0.0",
         "InboxOn": {},
         "AssemblyVersionInPackageVersion": {
-            "4.0.0.0": "4.0.0"
+            "4.0.0.0": "4.6.0"
         }
     },
     "System.Reflection.Primitives": {

pkg/descriptions.json

@@ -1389,6 +1389,15 @@
       "System.Reflection.PortableExecutable.ManagedPEBuilder"
     ]
   },
+  {
+    "Name": "System.Reflection.MetataLoadContext",
+    "Description": "Provides read-only reflection on assemblies in an isolated context with support for assemblies that have different architectures and runtimes.",
+    "CommonTypes": [
+      "System.Reflection.MetadataLoadContext",
+      "System.Reflection.MetadataAssemblyResolver",
+      "System.Reflection.PathAssemblyResolver"
+	]
+  },
   {
     "Name": "System.Reflection.Primitives",
     "Description": "Provides common enumerations for reflection-based libraries.",
@@ -2273,10 +2282,5 @@
     "Name": "Microsoft.IO.Redist",
     "Description": "Downlevel support package for System.IO classes.",
     "CommonTypes": []
-  },
-  {
-    "Name": "System.Reflection.MetataLoadContext",
-    "Description": "Provides read-only reflection on assemblies in an isolated context with support for assemblies that have different architectures and runtimes.",
-    "CommonTypes": []
   }
 ]

src/System.Reflection.MetadataLoadContext/Directory.Build.props

@@ -4,6 +4,5 @@
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <AssemblyKey>OPEN</AssemblyKey>
-    <IsNETCoreApp>false</IsNETCoreApp>
   </PropertyGroup>
 </Project>

src/System.Reflection.MetadataLoadContext/src/Configurations.props

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <PackageConfigurations>
-      netstandard;
-      netcoreapp
-    </PackageConfigurations>
     <BuildConfigurations>
       netstandard;
       netcoreapp

src/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj

@@ -79,8 +79,9 @@
     <Compile Include="System\Reflection\TypeLoading\General\Ecma\MetadataTable.cs" />
     <Compile Include="System\Reflection\TypeLoading\General\HashHelpers.cs" />
     <Compile Include="System\Reflection\TypeLoading\General\Helpers.cs" />
+    <Compile Include="System\Reflection\TypeLoading\General\Interop.netcoreapp.cs" Condition="'$(TargetGroup)' == 'netcoreapp'" />
+    <Compile Include="System\Reflection\TypeLoading\General\Interop.netstandard.cs" Condition="'$(TargetGroup)' == 'netstandard'" />
     <Compile Include="System\Reflection\TypeLoading\General\MethodSig.cs" />
-    <Compile Include="System\Reflection\TypeLoading\General\NetStandardBridge.cs" />
     <Compile Include="System\Reflection\TypeLoading\General\RoAssemblyName.cs" />
     <Compile Include="System\Reflection\TypeLoading\General\Sentinels.cs" />
     <Compile Include="System\Reflection\TypeLoading\General\TypeContext.cs" />
@@ -142,7 +143,7 @@
     <Compile Include="System\Reflection\TypeLoading\Types\RoType.TypeClassification.cs" />
     <Compile Include="System\Reflection\TypeLoading\Types\RoWrappedType.cs" />
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
     <Reference Include="System.Runtime" />
     <Reference Include="System.Runtime.CompilerServices.Unsafe" />
     <Reference Include="System.Runtime.Extensions" />

src/System.Reflection.MetadataLoadContext/src/System/Reflection/TypeLoading/General/Interop.netcoreapp.cs

@@ -0,0 +1,56 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+// This file makes NetStandard Reflection's "subclassing" surface area look as much like NetCore as possible so the rest of the code can be written without #if's.
+
+namespace System.Reflection.TypeLoading
+{
+    internal static class NetCoreApiEmulators
+    {
+        // On NetCore, call the real thing.
+
+        public static bool IsSignatureType(this Type type) => type.IsSignatureType;
+        public static bool IsSZArray(this Type type) => type.IsSZArray;
+        public static bool IsVariableBoundArray(this Type type) => type.IsVariableBoundArray;
+        public static bool IsGenericMethodParameter(this Type type) => type.IsGenericMethodParameter;
+        public static Type MakeSignatureGenericType(this Type genericTypeDefinition, Type[] typeArguments) => Type.MakeGenericSignatureType(genericTypeDefinition, typeArguments);
+    }
+
+    /// <summary>
+    /// Another layer of base types. For NetCore, these base types are empty. For NetStandard, these base types add the NetCore apis to NetStandard
+    /// so code interacting with "RoTypes" and friends can happily code to the full NetCore surface area.
+    /// </summary>
+    internal abstract class LeveledTypeInfo : TypeInfo
+    {
+        protected LeveledTypeInfo() : base() { }
+    }
+
+    internal abstract class LeveledAssembly : Assembly
+    {
+    }
+
+    internal abstract class LeveledConstructorInfo : ConstructorInfo
+    {
+    }
+
+    internal abstract class LeveledMethodInfo : MethodInfo
+    {
+    }
+
+    internal abstract class LeveledEventInfo : EventInfo
+    {
+    }
+
+    internal abstract class LeveledFieldInfo : FieldInfo
+    {
+    }
+
+    internal abstract class LeveledPropertyInfo : PropertyInfo
+    {
+    }
+
+    internal abstract class LeveledCustomAttributeData : CustomAttributeData
+    {
+    }
+}

src/System.Reflection.MetadataLoadContext/src/System/Reflection/TypeLoading/General/NetStandardBridge.cs renamed to src/System.Reflection.MetadataLoadContext/src/System/Reflection/TypeLoading/General/Interop.netstandard.cs

@@ -2,65 +2,41 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-//
 // This file makes NetStandard Reflection's "subclassing" surface area look as much like NetCore as possible so the rest of the code can be written without #if's.
-//
 
 namespace System.Reflection.TypeLoading
 {
-    //
-    // For code (usually shared with other repos) that have to interact with "Type" rather than "RoType", some handy extension methods that 
-    // "add" the NetCore reflection apis back to NetStandard.
-    //
+    // For code that have to interact with "Type" rather than "RoType", some handy extension methods that "add" the NetCore reflection apis to NetStandard.
     internal static class NetCoreApiEmulators
     {
-#if netstandard
         // On NetStandard, have to do with slower emulations.
 
         public static bool IsSignatureType(this Type type) => false;
         public static bool IsSZArray(this Type type) => type.IsArray && type.GetArrayRank() == 1 && type.Name.EndsWith("[]");
         public static bool IsVariableBoundArray(this Type type) => type.IsArray && !type.IsSZArray();
         public static bool IsGenericMethodParameter(this Type type) => type.IsGenericParameter && type.DeclaringMethod != null;
 
-        // Signature Types do not exist on NetStandard 2.0 but it's possible we could reach this if a NetCore app uses the NetStandard build
-        // of this library.
+        // Signature Types do not exist on NetStandard 2.0 but it's possible we could reach this if a NetCore app uses the NetStandard build of this library.
         public static Type MakeSignatureGenericType(this Type genericTypeDefinition, Type[] typeArguments) => throw new NotSupportedException(SR.NotSupported_MakeGenericType_SignatureTypes);
-#else
-        // On NetCore, call the real thing.
-
-        public static bool IsSignatureType(this Type type) => type.IsSignatureType;
-        public static bool IsSZArray(this Type type) => type.IsSZArray;
-        public static bool IsVariableBoundArray(this Type type) => type.IsVariableBoundArray;
-        public static bool IsGenericMethodParameter(this Type type) => type.IsGenericMethodParameter;
-
-        // @TODO - https://github.com/dotnet/corefxlab/issues/2443: This should be fixed assuming https://github.com/dotnet/corefx/issues/31798 gets approved.
-        public static Type MakeSignatureGenericType(this Type genericTypeDefinition, Type[] typeArguments) => throw new NotSupportedException(SR.NotSupported_MakeGenericType_SignatureTypes);
-#endif
     }
 
-    //
-    // Another layer of base types. For NetCore, these base types are all but empty. For NetStandard, these base types add the NetCore apis to NetStandard
-    // so code interacting with "RoTypes" and friends can happily code to the full NetCore surface area.
-    //
-    // On NetStandard and pre-2.2 NetCore, the TypeInfo constructor is not exposed so we cannot derive directly from TypeInfo. 
-    // But we *can* derive from TypeDelegator which derives from TypeInfo. Since we're overriding (almost) every method, 
-    // none of TypeDelegator's own methods get called (and the instance field it has for holding the "underlying Type" goes
-    // to waste.) 
-    //
-    // For future platforms, RoTypeBase's base type should be changed back to TypeInfo. Deriving from TypeDelegator is a hack and
-    // causes us to waste an extra pointer-sized field per Type instance. It is also fragile as TypeDelegator could break us in the future
-    // by overriding more methods.
-    //
-    internal abstract class LeveledTypeInfo :
-#if netstandard
-        TypeDelegator
-#else
-        TypeInfo
-#endif
+    /// <summary>
+    /// Another layer of base types. For NetCore, these base types are all but empty. For NetStandard, these base types add the NetCore apis to NetStandard
+    /// so code interacting with "RoTypes" and friends can happily code to the full NetCore surface area.
+    ///
+    /// On NetStandard (and pre-2.2 NetCore), the TypeInfo constructor is not exposed so we cannot derive directly from TypeInfo.
+    /// But we *can* derive from TypeDelegator which derives from TypeInfo. Since we're overriding (almost) every method,
+    /// none of TypeDelegator's own methods get called (and the instance field it has for holding the "underlying Type" goes
+    /// to waste.)
+    ///
+    /// For future platforms, RoTypeBase's base type should be changed back to TypeInfo. Deriving from TypeDelegator is a hack and
+    /// causes us to waste an extra pointer-sized field per Type instance. It is also fragile as TypeDelegator could break us in the future
+    /// by overriding more methods.
+    /// </summary>
+    internal abstract class LeveledTypeInfo : TypeDelegator
     {
         protected LeveledTypeInfo() : base() { }
 
-#if netstandard
         // This is an api that TypeDelegator overrides that it needn't have. Since RoType expects to fall through to System.Type's method, we have to reimplement
         // System.Type's behavior here to avoid getting TypeDelegator's method.
         //
@@ -77,62 +53,43 @@ protected LeveledTypeInfo() : base() { }
         public virtual bool IsSignatureType => false;
         protected abstract MethodInfo GetMethodImpl(string name, int genericParameterCount, BindingFlags bindingAttr, Binder binder, CallingConventions callConvention, Type[] types, ParameterModifier[] modifiers);
         public abstract bool HasSameMetadataDefinitionAs(MemberInfo other);
-#endif // netstandard
     }
 
     internal abstract class LeveledAssembly : Assembly
     {
-#if netstandard
         public abstract Type[] GetForwardedTypes();
-#endif // netstandard
     }
 
     internal abstract class LeveledConstructorInfo : ConstructorInfo
     {
-#if netstandard
         public abstract bool IsConstructedGenericMethod { get; }
         public abstract bool HasSameMetadataDefinitionAs(MemberInfo other);
-#endif // netstandard
     }
 
     internal abstract class LeveledMethodInfo : MethodInfo
     {
-#if netstandard
         public abstract bool IsConstructedGenericMethod { get; }
         public abstract bool HasSameMetadataDefinitionAs(MemberInfo other);
-#endif // netstandard
     }
 
     internal abstract class LeveledEventInfo : EventInfo
     {
-#if netstandard
         public abstract bool HasSameMetadataDefinitionAs(MemberInfo other);
-#endif // netstandard
     }
 
     internal abstract class LeveledFieldInfo : FieldInfo
     {
-#if netstandard
         public abstract bool HasSameMetadataDefinitionAs(MemberInfo other);
-#endif // netstandard
     }
 
     internal abstract class LeveledPropertyInfo : PropertyInfo
     {
-#if netstandard
         public abstract bool HasSameMetadataDefinitionAs(MemberInfo other);
-#endif // netstandard
     }
 
     internal abstract class LeveledCustomAttributeData : CustomAttributeData
     {
-#if netstandard
         // On NetStandard, AttributeType is declared non-virtually so apps are stuck calling the slow version that builds a constructor.
         public new abstract Type AttributeType { get; }
-#else
-        // @todo: https://github.com/dotnet/corefxlab/issues/2460 Once the netcore build is building against a contract that declares AttributeType virtually,
-        // delete this line. We want RoCustomAttributeData to override the real AttributeType property.
-        public new abstract Type AttributeType { get; }
-#endif // netstandard
     }
 }