diff --git a/eng/Tools.props b/eng/Tools.props
index 34fceddb8..23eabfa93 100644
--- a/eng/Tools.props
+++ b/eng/Tools.props
@@ -18,14 +18,17 @@
   <!-- source-built packages -->
   <ItemGroup>
     <!-- arcade -->
-    <PackageReference Include="Microsoft.DotNet.ApiCompat" Version="$(MicrosoftDotNetApiCompatPackageVersion)" />
-    <PackageReference Include="Microsoft.DotNet.GenAPI" Version="$(MicrosoftDotNetGenApiPackageVersion)" />
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingPackageVersion)" />
     <PackageReference Include="Microsoft.DotNet.CodeAnalysis" Version="$(MicrosoftDotNetCodeAnalysisPackageVersion)" />
+    <PackageReference Include="Microsoft.DotNet.GenFacades" Version="$(MicrosoftDotNetGenFacadesPackageVersion)" />
   </ItemGroup>
 
   <!-- excluded from source build -->
   <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
+    <!-- arcade -->
+    <PackageReference Include="Microsoft.DotNet.ApiCompat" Version="$(MicrosoftDotNetApiCompatPackageVersion)" />
+    <PackageReference Include="Microsoft.DotNet.GenAPI" Version="$(MicrosoftDotNetGenApiPackageVersion)" />
+
     <!-- XML docs -->
     <PackageReference Include="$(XmlDocPackage)" Version="$(XmlDocPackageVersion)" />
 
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c879e2f01..6cab2134f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -23,6 +23,10 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>11f90a2a260422201895de58e57170131ab4efe7</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19278.1">
+      <Uri>https://github.com/dotnet/arcade</Uri>
+      <Sha>11f90a2a260422201895de58e57170131ab4efe7</Sha>
+    </Dependency>
     <Dependency Name="System.Reflection.Emit" Version="4.6.0-preview6.19277.2">
       <Uri>https://github.com/dotnet/corefx</Uri>
       <Sha>d58a8ade31b4731759c92df00d0f6398c52f3d83</Sha>
diff --git a/eng/Versions.props b/eng/Versions.props
index db3095d75..c6a11e280 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -28,6 +28,7 @@
     <MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19278.1</MicrosoftDotNetBuildTasksPackagingPackageVersion>
     <MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19278.1</MicrosoftDotNetCodeAnalysisPackageVersion>
     <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19278.1</MicrosoftDotNetGenAPIPackageVersion>
+    <MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19278.1</MicrosoftDotNetGenFacadesPackageVersion>
     <SystemReflectionEmitPackageVersion>4.6.0-preview6.19277.2</SystemReflectionEmitPackageVersion>
     <SystemReflectionEmitILGenerationPackageVersion>4.6.0-preview6.19277.2</SystemReflectionEmitILGenerationPackageVersion>
     <SystemReflectionEmitLightweightPackageVersion>4.6.0-preview6.19277.2</SystemReflectionEmitLightweightPackageVersion>
diff --git a/src/netstandard/src/ApiCompatBaseline.net461.txt b/src/netstandard/src/ApiCompatBaseline.net461.txt
index 3ddf28ca5..37b6e23a2 100644
--- a/src/netstandard/src/ApiCompatBaseline.net461.txt
+++ b/src/netstandard/src/ApiCompatBaseline.net461.txt
@@ -722,7 +722,6 @@ CannotMakeMemberNonVirtual : Member 'System.Reflection.TypeInfo.GetDeclaredNeste
 CannotMakeMemberNonVirtual : Member 'System.Reflection.TypeInfo.GetDeclaredProperty(System.String)' is non-virtual in the implementation but is virtual in the contract.
 CannotMakeMemberNonVirtual : Member 'System.Reflection.TypeInfo.ImplementedInterfaces.get()' is non-virtual in the implementation but is virtual in the contract.
 CannotMakeMemberNonVirtual : Member 'System.Reflection.TypeInfo.IsAssignableFrom(System.Reflection.TypeInfo)' is non-virtual in the implementation but is virtual in the contract.
-TypesMustExist : Type 'System.Reflection.Emit.DynamicMethod' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'System.Reflection.Emit.EnumBuilder.IsByRefLike.get()' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'System.Reflection.Emit.EnumBuilder.IsSZArray.get()' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'System.Reflection.Emit.EnumBuilder.IsTypeDefinition.get()' does not exist in the implementation but it does exist in the contract.
@@ -972,7 +971,21 @@ MembersMustExist : Member 'System.Security.Cryptography.DSA.VerifySignature(Syst
 MembersMustExist : Member 'System.Security.Cryptography.DSACryptoServiceProvider.HashData(System.Byte[], System.Int32, System.Int32, System.Security.Cryptography.HashAlgorithmName)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'System.Security.Cryptography.DSACryptoServiceProvider.HashData(System.IO.Stream, System.Security.Cryptography.HashAlgorithmName)' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Security.Cryptography.ECCurve' does not exist in the implementation but it does exist in the contract.
-TypesMustExist : Type 'System.Security.Cryptography.ECDiffieHellman' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Security.Cryptography.ECDiffieHellman.Create(System.Security.Cryptography.ECCurve)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Security.Cryptography.ECDiffieHellman.Create(System.Security.Cryptography.ECParameters)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Security.Cryptography.ECDiffieHellman.DeriveKeyFromHash(System.Security.Cryptography.ECDiffieHellmanPublicKey, System.Security.Cryptography.HashAlgorithmName)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Security.Cryptography.ECDiffieHellman.DeriveKeyFromHash(System.Security.Cryptography.ECDiffieHellmanPublicKey, System.Security.Cryptography.HashAlgorithmName, System.Byte[], System.Byte[])' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Security.Cryptography.ECDiffieHellman.DeriveKeyFromHmac(System.Security.Cryptography.ECDiffieHellmanPublicKey, System.Security.Cryptography.HashAlgorithmName, System.Byte[])' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Security.Cryptography.ECDiffieHellman.DeriveKeyFromHmac(System.Security.Cryptography.ECDiffieHellmanPublicKey, System.Security.Cryptography.HashAlgorithmName, System.Byte[], System.Byte[], System.Byte[])' does not exist in the implementation but it does exist in the contract.
+CannotMakeMemberAbstract : Member 'System.Security.Cryptography.ECDiffieHellman.DeriveKeyMaterial(System.Security.Cryptography.ECDiffieHellmanPublicKey)' is abstract in the implementation but is not abstract in the contract.
+MembersMustExist : Member 'System.Security.Cryptography.ECDiffieHellman.DeriveKeyTls(System.Security.Cryptography.ECDiffieHellmanPublicKey, System.Byte[], System.Byte[])' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Security.Cryptography.ECDiffieHellman.ExportECPrivateKey()' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Security.Cryptography.ECDiffieHellman.ExportExplicitParameters(System.Boolean)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Security.Cryptography.ECDiffieHellman.ExportParameters(System.Boolean)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Security.Cryptography.ECDiffieHellman.GenerateKey(System.Security.Cryptography.ECCurve)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Security.Cryptography.ECDiffieHellman.ImportECPrivateKey(System.ReadOnlySpan<System.Byte>, System.Int32)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Security.Cryptography.ECDiffieHellman.ImportParameters(System.Security.Cryptography.ECParameters)' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'System.Security.Cryptography.ECDiffieHellman.TryExportECPrivateKey(System.Span<System.Byte>, System.Int32)' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'System.Security.Cryptography.ECDiffieHellmanPublicKey..ctor()' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'System.Security.Cryptography.ECDiffieHellmanPublicKey.ExportExplicitParameters()' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'System.Security.Cryptography.ECDiffieHellmanPublicKey.ExportParameters()' does not exist in the implementation but it does exist in the contract.
@@ -1177,4 +1190,4 @@ CannotChangeAttribute : Attribute 'System.ObsoleteAttribute' on 'System.Xml.Sche
 CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'System.Xml.Serialization.XmlAnyAttributeAttribute' changed from '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, AllowMultiple=false)]' in the implementation.
 CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'System.Xml.Serialization.XmlNamespaceDeclarationsAttribute' changed from '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, AllowMultiple=false)]' in the implementation.
 TypesMustExist : Type 'System.Xml.XPath.XDocumentExtensions' does not exist in the implementation but it does exist in the contract.
-Total Issues: 1178
+Total Issues: 1191
diff --git a/src/netstandard/src/ApiCompatBaseline.xamarin.mac.txt b/src/netstandard/src/ApiCompatBaseline.xamarin.mac.txt
index bdc1d53bb..ada42bf06 100644
--- a/src/netstandard/src/ApiCompatBaseline.xamarin.mac.txt
+++ b/src/netstandard/src/ApiCompatBaseline.xamarin.mac.txt
@@ -322,7 +322,6 @@ CannotRemoveAttribute : Attribute 'System.Runtime.CompilerServices.IsReadOnlyAtt
 CannotRemoveBaseTypeOrInterface : Type 'System.Drawing.Color' does not implement interface 'System.IEquatable<System.Drawing.Color>' in the implementation but it does in the contract.
 TypeCannotChangeClassification : Type 'System.Drawing.Color' is marked as readonly in the contract so it must also be marked readonly in the implementation.
 MembersMustExist : Member 'System.Drawing.Color.Equals(System.Drawing.Color)' does not exist in the implementation but it does exist in the contract.
-TypesMustExist : Type 'System.Drawing.ColorConverter' does not exist in the implementation but it does exist in the contract.
 CannotRemoveBaseTypeOrInterface : Type 'System.Drawing.Point' does not implement interface 'System.IEquatable<System.Drawing.Point>' in the implementation but it does in the contract.
 MembersMustExist : Member 'System.Drawing.Point.Equals(System.Drawing.Point)' does not exist in the implementation but it does exist in the contract.
 TypesMustExist : Type 'System.Drawing.PointConverter' does not exist in the implementation but it does exist in the contract.
@@ -626,7 +625,6 @@ CannotMakeMemberNonVirtual : Member 'System.Reflection.TypeInfo.GetDeclaredNeste
 CannotMakeMemberNonVirtual : Member 'System.Reflection.TypeInfo.GetDeclaredProperty(System.String)' is non-virtual in the implementation but is virtual in the contract.
 CannotMakeMemberNonVirtual : Member 'System.Reflection.TypeInfo.ImplementedInterfaces.get()' is non-virtual in the implementation but is virtual in the contract.
 CannotMakeMemberNonVirtual : Member 'System.Reflection.TypeInfo.IsAssignableFrom(System.Reflection.TypeInfo)' is non-virtual in the implementation but is virtual in the contract.
-TypesMustExist : Type 'System.Reflection.Emit.DynamicMethod' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'System.Reflection.Emit.EnumBuilder.IsByRefLike.get()' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'System.Reflection.Emit.EnumBuilder.IsTypeDefinition.get()' does not exist in the implementation but it does exist in the contract.
 MembersMustExist : Member 'System.Reflection.Emit.EnumBuilder.IsVariableBoundArray.get()' does not exist in the implementation but it does exist in the contract.
@@ -1034,4 +1032,4 @@ CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'System.Xm
 CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'System.Xml.Serialization.XmlChoiceIdentifierAttribute' changed from '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue, AllowMultiple=false)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.ReturnValue)]' in the implementation.
 CannotRemoveBaseTypeOrInterface : Type 'System.Xml.Serialization.XmlSchemaImporter' does not inherit from base type 'System.Xml.Serialization.SchemaImporter' in the implementation but it does in the contract.
 CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'System.Xml.Serialization.XmlSerializerAssemblyAttribute' changed from '[AttributeUsageAttribute(AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Interface | AttributeTargets.Struct, AllowMultiple=false)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Interface | AttributeTargets.Struct)]' in the implementation.
-Total Issues: 1035
+Total Issues: 1033
diff --git a/src/netstandard/src/Directory.Build.targets b/src/netstandard/src/Directory.Build.targets
deleted file mode 100644
index 5863a88ab..000000000
--- a/src/netstandard/src/Directory.Build.targets
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-<Project DefaultTargets="Build">
-
-  <PropertyGroup>
-    <CompileDependsOn>
-      GenerateTypeForwards;
-      $(CompileDependsOn);
-    </CompileDependsOn>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <_TypeForwardsOutputPath>$(IntermediateOutputPath)netstandard.forwards.cs</_TypeForwardsOutputPath>
-    <_ExcludeAPIList>$(MSBuildThisProjectDirectory)GenApi.exclude.$(TargetFramework).txt</_ExcludeAPIList>
-  </PropertyGroup>
-
-  <Target Name="GenerateTypeForwards"
-          Inputs="@(ResolvedMatchingContract);$(_ExcludeAPIList)"
-          Outputs="$(_TypeForwardsOutputPath)">
-
-    <PropertyGroup>
-      <_ReferenceAssembly>@(ResolvedMatchingContract)</_ReferenceAssembly>
-      <_TypeForwardsOutputPath>$(IntermediateOutputPath)netstandard.forwards.cs</_TypeForwardsOutputPath>
-      <_ExcludeAPIList>$(MSBuildThisProjectDirectory)GenApi.exclude.$(TargetFramework).txt</_ExcludeAPIList>
-
-      <_GenAPICmd>$(_GenAPICommand) "$(_ReferenceAssembly)" --writer TypeForwards --out "$(_TypeForwardsOutputPath)"</_GenAPICmd>
-      <_GenAPICmd Condition="Exists('$(_ExcludeAPIList)')">$(_GenAPICmd) --exclude-api-list "$(_ExcludeAPIList)"</_GenAPICmd>
-    </PropertyGroup>
-
-    <Exec Command="$(_GenAPICmd)" />
-
-    <ItemGroup>
-      <Compile Include="$(_TypeForwardsOutputPath)" />
-      <FileWrites Include="$(_TypeForwardsOutputPath)" />
-    </ItemGroup>
-
-  </Target>
-
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.targets))\Directory.Build.targets" />
-
-</Project>
\ No newline at end of file
diff --git a/src/netstandard/src/GenApi.exclude.monoandroid.txt b/src/netstandard/src/GenApi.exclude.monoandroid.txt
deleted file mode 100644
index 00defee45..000000000
--- a/src/netstandard/src/GenApi.exclude.monoandroid.txt
+++ /dev/null
@@ -1,84 +0,0 @@
-T:System.Buffers.ArrayPool`1
-T:System.Buffers.Binary.BinaryPrimitives
-T:System.Buffers.BuffersExtensions
-T:System.Buffers.IBufferWriter`1
-T:System.Buffers.IMemoryOwner`1
-T:System.Buffers.IPinnable
-T:System.Buffers.MemoryManager`1
-T:System.Buffers.MemoryPool`1
-T:System.Buffers.ReadOnlySequence`1
-T:System.Buffers.ReadOnlySequenceSegment`1
-T:System.Buffers.ReadOnlySpanAction`2
-T:System.Buffers.SpanAction`2
-T:System.Buffers.StandardFormat
-T:System.Buffers.Text.Base64
-T:System.Buffers.Text.Utf8Formatter
-T:System.Buffers.Text.Utf8Parser
-T:System.Data.Common.DbProviderFactories
-T:System.Diagnostics.Tracing.EventSourceCreatedEventArgs
-T:System.HashCode
-T:System.IO.Compression.BrotliDecoder
-T:System.IO.Compression.BrotliEncoder
-T:System.IO.Compression.BrotliStream
-T:System.IO.Enumeration.FileSystemEntry
-T:System.IO.Enumeration.FileSystemEnumerable`1
-T:System.IO.Enumeration.FileSystemEnumerator`1
-T:System.IO.Enumeration.FileSystemName
-T:System.IO.EnumerationOptions
-T:System.Globalization.ISOWeek
-T:System.IAsyncDisposable
-T:System.IO.MatchCasing
-T:System.IO.MatchType
-T:System.MathF
-T:System.Memory`1
-T:System.MemoryExtensions
-T:System.Net.Http.ReadOnlyMemoryContent
-T:System.Net.Http.SocketsHttpHandler
-T:System.Net.Security.ServerCertificateSelectionCallback
-T:System.Net.Security.SslApplicationProtocol
-T:System.Net.Security.SslClientAuthenticationOptions
-T:System.Net.Security.SslServerAuthenticationOptions
-T:System.Net.Sockets.UnixDomainSocketEndPoint
-T:System.ReadOnlyMemory`1
-T:System.ReadOnlySpan`1
-T:System.Reflection.AssemblyExtensions
-T:System.Reflection.DispatchProxy
-T:System.Reflection.EventInfoExtensions
-T:System.Reflection.MemberInfoExtensions
-T:System.Reflection.MethodInfoExtensions
-T:System.Reflection.ModuleExtensions
-T:System.Reflection.PropertyInfoExtensions
-T:System.Reflection.TypeExtensions
-T:System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder
-T:System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable
-T:System.Runtime.CompilerServices.ValueTaskAwaiter
-T:System.Runtime.InteropServices.MemoryMarshal
-T:System.Runtime.InteropServices.SequenceMarshal
-T:System.Security.Cryptography.CryptographicOperations
-T:System.Security.Cryptography.ECDiffieHellman
-T:System.Security.Cryptography.PbeEncryptionAlgorithm
-T:System.Security.Cryptography.PbeParameters
-T:System.Security.Cryptography.X509Certificates.CertificateRequest
-T:System.Security.Cryptography.X509Certificates.DSACertificateExtensions
-T:System.Security.Cryptography.X509Certificates.SubjectAlternativeNameBuilder
-T:System.Security.Cryptography.X509Certificates.X509SignatureGenerator
-T:System.SequencePosition
-T:System.Span`1
-T:System.Threading.Tasks.Sources.IValueTaskSource
-T:System.Threading.Tasks.Sources.IValueTaskSource`1
-T:System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags
-T:System.Threading.Tasks.Sources.ValueTaskSourceStatus
-T:System.Threading.Tasks.TaskAsyncEnumerableExtensions
-T:System.Threading.Tasks.ValueTask
-T:System.Xml.Serialization.SchemaImporter
-T:System.Runtime.CompilerServices.SwitchExpressionException
-T:System.Index
-T:System.Range
-T:System.Collections.Generic.IAsyncEnumerable`1
-T:System.Collections.Generic.IAsyncEnumerator`1
-T:System.Runtime.CompilerServices.AsyncIteratorMethodBuilder
-T:System.Runtime.CompilerServices.AsyncIteratorStateMachineAttribute
-T:System.Runtime.CompilerServices.ConfiguredAsyncDisposable
-T:System.Runtime.CompilerServices.ConfiguredCancelableAsyncEnumerable`1
-T:System.Threading.Tasks.Sources.ManualResetValueTaskSourceCore`1
-T:System.Runtime.CompilerServices.EnumeratorCancellationAttribute
\ No newline at end of file
diff --git a/src/netstandard/src/GenApi.exclude.net461.txt b/src/netstandard/src/GenApi.exclude.net461.txt
deleted file mode 100644
index 09c4c8b4a..000000000
--- a/src/netstandard/src/GenApi.exclude.net461.txt
+++ /dev/null
@@ -1,121 +0,0 @@
-T:System.Buffers.ArrayPool`1
-T:System.Buffers.Binary.BinaryPrimitives
-T:System.Buffers.BuffersExtensions
-T:System.Buffers.IBufferWriter`1
-T:System.Buffers.IMemoryOwner`1
-T:System.Buffers.IPinnable
-T:System.Buffers.MemoryHandle
-T:System.Buffers.MemoryManager`1
-T:System.Buffers.MemoryPool`1
-T:System.Buffers.OperationStatus
-T:System.Buffers.ReadOnlySequence`1
-T:System.Buffers.ReadOnlySequenceSegment`1
-T:System.Buffers.ReadOnlySpanAction`2
-T:System.Buffers.SpanAction`2
-T:System.Buffers.StandardFormat
-T:System.Buffers.Text.Base64
-T:System.Buffers.Text.Utf8Formatter
-T:System.Buffers.Text.Utf8Parser
-T:System.Collections.Generic.CollectionExtensions
-T:System.Collections.Generic.KeyValuePair
-T:System.Data.Common.DbColumn
-T:System.Data.Common.DbDataReaderExtensions
-T:System.Data.Common.IDbColumnSchemaGenerator
-T:System.Diagnostics.StackFrameExtensions
-T:System.Diagnostics.Tracing.EventCounter
-T:System.Diagnostics.Tracing.EventSourceCreatedEventArgs
-T:System.Globalization.GlobalizationExtensions
-T:System.Globalization.ISOWeek
-T:System.HashCode
-T:System.IAsyncDisposable
-T:System.IO.Compression.BrotliDecoder
-T:System.IO.Compression.BrotliEncoder
-T:System.IO.Compression.BrotliStream
-T:System.IO.Enumeration.FileSystemEntry
-T:System.IO.Enumeration.FileSystemEnumerable`1
-T:System.IO.Enumeration.FileSystemEnumerator`1
-T:System.IO.Enumeration.FileSystemName
-T:System.IO.EnumerationOptions
-T:System.IO.MatchCasing
-T:System.IO.MatchType
-T:System.MathF
-T:System.Memory`1
-T:System.MemoryExtensions
-T:System.Net.Http.ReadOnlyMemoryContent
-T:System.Net.Http.SocketsHttpHandler
-T:System.Net.Security.ServerCertificateSelectionCallback
-T:System.Net.Security.SslApplicationProtocol
-T:System.Net.Security.SslClientAuthenticationOptions
-T:System.Net.Security.SslServerAuthenticationOptions
-T:System.Net.Sockets.SocketReceiveFromResult
-T:System.Net.Sockets.SocketReceiveMessageFromResult
-T:System.Net.Sockets.SocketTaskExtensions
-T:System.Net.Sockets.UnixDomainSocketEndPoint
-T:System.Net.WebSockets.ValueWebSocketReceiveResult
-T:System.Numerics.Vector
-T:System.Numerics.Vector`1
-T:System.ReadOnlyMemory`1
-T:System.ReadOnlySpan`1
-T:System.Reflection.AssemblyExtensions
-T:System.Reflection.DispatchProxy
-T:System.Reflection.Emit.DynamicMethod
-T:System.Reflection.EventInfoExtensions
-T:System.Reflection.MemberInfoExtensions
-T:System.Reflection.MethodInfoExtensions
-T:System.Reflection.ModuleExtensions
-T:System.Reflection.PropertyInfoExtensions
-T:System.Reflection.TypeExtensions
-T:System.Runtime.CompilerServices.AsyncMethodBuilderAttribute
-T:System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder
-T:System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder`1
-T:System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable
-T:System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable`1
-T:System.Runtime.CompilerServices.IsByRefLikeAttribute
-T:System.Runtime.CompilerServices.IsReadOnlyAttribute
-T:System.Runtime.CompilerServices.ITuple
-T:System.Runtime.CompilerServices.RuntimeFeature
-T:System.Runtime.CompilerServices.ValueTaskAwaiter
-T:System.Runtime.CompilerServices.ValueTaskAwaiter`1
-T:System.Runtime.InteropServices.MemoryMarshal
-T:System.Runtime.InteropServices.SequenceMarshal
-T:System.Runtime.Serialization.DataContractSerializerExtensions
-T:System.Runtime.Serialization.ISerializationSurrogateProvider
-T:System.Security.Cryptography.AesCng
-T:System.Security.Cryptography.CryptographicOperations
-T:System.Security.Cryptography.ECCurve
-T:System.Security.Cryptography.ECDiffieHellman
-T:System.Security.Cryptography.ECParameters
-T:System.Security.Cryptography.ECPoint
-T:System.Security.Cryptography.IncrementalHash
-T:System.Security.Cryptography.PbeEncryptionAlgorithm
-T:System.Security.Cryptography.PbeParameters
-T:System.Security.Cryptography.TripleDESCng
-T:System.Security.Cryptography.X509Certificates.CertificateRequest
-T:System.Security.Cryptography.X509Certificates.DSACertificateExtensions
-T:System.Security.Cryptography.X509Certificates.SubjectAlternativeNameBuilder
-T:System.Security.Cryptography.X509Certificates.X509SignatureGenerator
-T:System.Security.SecureStringMarshal
-T:System.SequencePosition
-T:System.Span`1
-T:System.StringNormalizationExtensions
-T:System.Threading.PreAllocatedOverlapped
-T:System.Threading.Tasks.Sources.IValueTaskSource
-T:System.Threading.Tasks.Sources.IValueTaskSource`1
-T:System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags
-T:System.Threading.Tasks.Sources.ValueTaskSourceStatus
-T:System.Threading.Tasks.TaskAsyncEnumerableExtensions
-T:System.Threading.Tasks.ValueTask
-T:System.Threading.Tasks.ValueTask`1
-T:System.Threading.ThreadPoolBoundHandle
-T:System.Xml.XPath.XDocumentExtensions
-T:System.Runtime.CompilerServices.SwitchExpressionException
-T:System.Index
-T:System.Range
-T:System.Collections.Generic.IAsyncEnumerable`1
-T:System.Collections.Generic.IAsyncEnumerator`1
-T:System.Runtime.CompilerServices.AsyncIteratorMethodBuilder
-T:System.Runtime.CompilerServices.AsyncIteratorStateMachineAttribute
-T:System.Runtime.CompilerServices.ConfiguredAsyncDisposable
-T:System.Runtime.CompilerServices.ConfiguredCancelableAsyncEnumerable`1
-T:System.Threading.Tasks.Sources.ManualResetValueTaskSourceCore`1
-T:System.Runtime.CompilerServices.EnumeratorCancellationAttribute
diff --git a/src/netstandard/src/GenApi.exclude.xamarin.ios.txt b/src/netstandard/src/GenApi.exclude.xamarin.ios.txt
deleted file mode 100644
index 2886dd098..000000000
--- a/src/netstandard/src/GenApi.exclude.xamarin.ios.txt
+++ /dev/null
@@ -1,99 +0,0 @@
-T:System.Buffers.ArrayPool`1
-T:System.Buffers.Binary.BinaryPrimitives
-T:System.Buffers.BuffersExtensions
-T:System.Buffers.IBufferWriter`1
-T:System.Buffers.IMemoryOwner`1
-T:System.Buffers.IPinnable
-T:System.Buffers.MemoryManager`1
-T:System.Buffers.MemoryPool`1
-T:System.Buffers.ReadOnlySequence`1
-T:System.Buffers.ReadOnlySequenceSegment`1
-T:System.Buffers.ReadOnlySpanAction`2
-T:System.Buffers.SpanAction`2
-T:System.Buffers.StandardFormat
-T:System.Buffers.Text.Base64
-T:System.Buffers.Text.Utf8Formatter
-T:System.Buffers.Text.Utf8Parser
-T:System.Data.Common.DbProviderFactories
-T:System.Diagnostics.Tracing.EventSourceCreatedEventArgs
-T:System.Drawing.ColorConverter
-T:System.Drawing.PointConverter
-T:System.Drawing.RectangleConverter
-T:System.Drawing.SizeConverter
-T:System.Drawing.SizeFConverter
-T:System.Globalization.ISOWeek
-T:System.HashCode
-T:System.IAsyncDisposable
-T:System.IO.Compression.BrotliDecoder
-T:System.IO.Compression.BrotliEncoder
-T:System.IO.Compression.BrotliStream
-T:System.IO.Enumeration.FileSystemEntry
-T:System.IO.Enumeration.FileSystemEnumerable`1
-T:System.IO.Enumeration.FileSystemEnumerator`1
-T:System.IO.Enumeration.FileSystemName
-T:System.IO.EnumerationOptions
-T:System.IO.MatchCasing
-T:System.IO.MatchType
-T:System.MathF
-T:System.Memory`1
-T:System.MemoryExtensions
-T:System.Net.Http.ReadOnlyMemoryContent
-T:System.Net.Http.SocketsHttpHandler
-T:System.Net.Security.ServerCertificateSelectionCallback
-T:System.Net.Security.SslApplicationProtocol
-T:System.Net.Security.SslClientAuthenticationOptions
-T:System.Net.Security.SslServerAuthenticationOptions
-T:System.Net.Sockets.UnixDomainSocketEndPoint
-T:System.ReadOnlyMemory`1
-T:System.ReadOnlySpan`1
-T:System.Reflection.AssemblyExtensions
-T:System.Reflection.DispatchProxy
-T:System.Reflection.Emit.DynamicILInfo
-T:System.Reflection.Emit.DynamicMethod
-T:System.Reflection.Emit.EventToken
-T:System.Reflection.Emit.FieldToken
-T:System.Reflection.Emit.MethodToken
-T:System.Reflection.Emit.ParameterToken
-T:System.Reflection.Emit.PropertyToken
-T:System.Reflection.Emit.SignatureToken
-T:System.Reflection.Emit.StringToken
-T:System.Reflection.Emit.TypeToken
-T:System.Reflection.EventInfoExtensions
-T:System.Reflection.MemberInfoExtensions
-T:System.Reflection.MethodInfoExtensions
-T:System.Reflection.ModuleExtensions
-T:System.Reflection.PropertyInfoExtensions
-T:System.Reflection.TypeExtensions
-T:System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder
-T:System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable
-T:System.Runtime.CompilerServices.ValueTaskAwaiter
-T:System.Runtime.InteropServices.MemoryMarshal
-T:System.Runtime.InteropServices.SequenceMarshal
-T:System.Security.Cryptography.CryptographicOperations
-T:System.Security.Cryptography.ECDiffieHellman
-T:System.Security.Cryptography.PbeEncryptionAlgorithm
-T:System.Security.Cryptography.PbeParameters
-T:System.Security.Cryptography.X509Certificates.CertificateRequest
-T:System.Security.Cryptography.X509Certificates.DSACertificateExtensions
-T:System.Security.Cryptography.X509Certificates.SubjectAlternativeNameBuilder
-T:System.Security.Cryptography.X509Certificates.X509SignatureGenerator
-T:System.SequencePosition
-T:System.Span`1
-T:System.Threading.Tasks.Sources.IValueTaskSource
-T:System.Threading.Tasks.Sources.IValueTaskSource`1
-T:System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags
-T:System.Threading.Tasks.Sources.ValueTaskSourceStatus
-T:System.Threading.Tasks.TaskAsyncEnumerableExtensions
-T:System.Threading.Tasks.ValueTask
-T:System.Xml.Serialization.SchemaImporter
-T:System.Runtime.CompilerServices.SwitchExpressionException
-T:System.Index
-T:System.Range
-T:System.Collections.Generic.IAsyncEnumerable`1
-T:System.Collections.Generic.IAsyncEnumerator`1
-T:System.Runtime.CompilerServices.AsyncIteratorMethodBuilder
-T:System.Runtime.CompilerServices.AsyncIteratorStateMachineAttribute
-T:System.Runtime.CompilerServices.ConfiguredAsyncDisposable
-T:System.Runtime.CompilerServices.ConfiguredCancelableAsyncEnumerable`1
-T:System.Threading.Tasks.Sources.ManualResetValueTaskSourceCore`1
-T:System.Runtime.CompilerServices.EnumeratorCancellationAttribute
diff --git a/src/netstandard/src/GenApi.exclude.xamarin.mac.txt b/src/netstandard/src/GenApi.exclude.xamarin.mac.txt
deleted file mode 100644
index 3c2ff6e61..000000000
--- a/src/netstandard/src/GenApi.exclude.xamarin.mac.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-T:System.Buffers.ArrayPool`1
-T:System.Buffers.Binary.BinaryPrimitives
-T:System.Buffers.BuffersExtensions
-T:System.Buffers.IBufferWriter`1
-T:System.Buffers.IMemoryOwner`1
-T:System.Buffers.IPinnable
-T:System.Buffers.MemoryManager`1
-T:System.Buffers.MemoryPool`1
-T:System.Buffers.ReadOnlySequence`1
-T:System.Buffers.ReadOnlySequenceSegment`1
-T:System.Buffers.ReadOnlySpanAction`2
-T:System.Buffers.SpanAction`2
-T:System.Buffers.StandardFormat
-T:System.Buffers.Text.Base64
-T:System.Buffers.Text.Utf8Formatter
-T:System.Buffers.Text.Utf8Parser
-T:System.Data.Common.DbProviderFactories
-T:System.Diagnostics.Tracing.EventSourceCreatedEventArgs
-T:System.Drawing.ColorConverter
-T:System.Drawing.PointConverter
-T:System.Drawing.RectangleConverter
-T:System.Drawing.SizeConverter
-T:System.Drawing.SizeFConverter
-T:System.Globalization.ISOWeek
-T:System.HashCode
-T:System.IAsyncDisposable
-T:System.IO.Compression.BrotliDecoder
-T:System.IO.Compression.BrotliEncoder
-T:System.IO.Compression.BrotliStream
-T:System.IO.Enumeration.FileSystemEntry
-T:System.IO.Enumeration.FileSystemEnumerable`1
-T:System.IO.Enumeration.FileSystemEnumerator`1
-T:System.IO.Enumeration.FileSystemName
-T:System.IO.EnumerationOptions
-T:System.IO.MatchCasing
-T:System.IO.MatchType
-T:System.MathF
-T:System.Memory`1
-T:System.MemoryExtensions
-T:System.Net.Http.ReadOnlyMemoryContent
-T:System.Net.Http.SocketsHttpHandler
-T:System.Net.Security.ServerCertificateSelectionCallback
-T:System.Net.Security.SslApplicationProtocol
-T:System.Net.Security.SslClientAuthenticationOptions
-T:System.Net.Security.SslServerAuthenticationOptions
-T:System.Net.Sockets.UnixDomainSocketEndPoint
-T:System.ReadOnlyMemory`1
-T:System.ReadOnlySpan`1
-T:System.Reflection.AssemblyExtensions
-T:System.Reflection.DispatchProxy
-T:System.Reflection.Emit.DynamicMethod
-T:System.Reflection.EventInfoExtensions
-T:System.Reflection.MemberInfoExtensions
-T:System.Reflection.MethodInfoExtensions
-T:System.Reflection.ModuleExtensions
-T:System.Reflection.PropertyInfoExtensions
-T:System.Reflection.TypeExtensions
-T:System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder
-T:System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable
-T:System.Runtime.CompilerServices.ValueTaskAwaiter
-T:System.Runtime.InteropServices.MemoryMarshal
-T:System.Runtime.InteropServices.SequenceMarshal
-T:System.Security.Cryptography.CryptographicOperations
-T:System.Security.Cryptography.ECDiffieHellman
-T:System.Security.Cryptography.PbeEncryptionAlgorithm
-T:System.Security.Cryptography.PbeParameters
-T:System.Security.Cryptography.X509Certificates.CertificateRequest
-T:System.Security.Cryptography.X509Certificates.DSACertificateExtensions
-T:System.Security.Cryptography.X509Certificates.SubjectAlternativeNameBuilder
-T:System.Security.Cryptography.X509Certificates.X509SignatureGenerator
-T:System.SequencePosition
-T:System.Span`1
-T:System.Threading.Tasks.Sources.IValueTaskSource
-T:System.Threading.Tasks.Sources.IValueTaskSource`1
-T:System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags
-T:System.Threading.Tasks.Sources.ValueTaskSourceStatus
-T:System.Threading.Tasks.TaskAsyncEnumerableExtensions
-T:System.Threading.Tasks.ValueTask
-T:System.Xml.Serialization.SchemaImporter
-T:System.Runtime.CompilerServices.SwitchExpressionException
-T:System.Index
-T:System.Range
-T:System.Collections.Generic.IAsyncEnumerable`1
-T:System.Collections.Generic.IAsyncEnumerator`1
-T:System.Runtime.CompilerServices.AsyncIteratorMethodBuilder
-T:System.Runtime.CompilerServices.AsyncIteratorStateMachineAttribute
-T:System.Runtime.CompilerServices.ConfiguredAsyncDisposable
-T:System.Runtime.CompilerServices.ConfiguredCancelableAsyncEnumerable`1
-T:System.Threading.Tasks.Sources.ManualResetValueTaskSourceCore`1
-T:System.Runtime.CompilerServices.EnumeratorCancellationAttribute
diff --git a/src/netstandard/src/GenApi.exclude.xamarin.tvos.txt b/src/netstandard/src/GenApi.exclude.xamarin.tvos.txt
deleted file mode 100644
index 2886dd098..000000000
--- a/src/netstandard/src/GenApi.exclude.xamarin.tvos.txt
+++ /dev/null
@@ -1,99 +0,0 @@
-T:System.Buffers.ArrayPool`1
-T:System.Buffers.Binary.BinaryPrimitives
-T:System.Buffers.BuffersExtensions
-T:System.Buffers.IBufferWriter`1
-T:System.Buffers.IMemoryOwner`1
-T:System.Buffers.IPinnable
-T:System.Buffers.MemoryManager`1
-T:System.Buffers.MemoryPool`1
-T:System.Buffers.ReadOnlySequence`1
-T:System.Buffers.ReadOnlySequenceSegment`1
-T:System.Buffers.ReadOnlySpanAction`2
-T:System.Buffers.SpanAction`2
-T:System.Buffers.StandardFormat
-T:System.Buffers.Text.Base64
-T:System.Buffers.Text.Utf8Formatter
-T:System.Buffers.Text.Utf8Parser
-T:System.Data.Common.DbProviderFactories
-T:System.Diagnostics.Tracing.EventSourceCreatedEventArgs
-T:System.Drawing.ColorConverter
-T:System.Drawing.PointConverter
-T:System.Drawing.RectangleConverter
-T:System.Drawing.SizeConverter
-T:System.Drawing.SizeFConverter
-T:System.Globalization.ISOWeek
-T:System.HashCode
-T:System.IAsyncDisposable
-T:System.IO.Compression.BrotliDecoder
-T:System.IO.Compression.BrotliEncoder
-T:System.IO.Compression.BrotliStream
-T:System.IO.Enumeration.FileSystemEntry
-T:System.IO.Enumeration.FileSystemEnumerable`1
-T:System.IO.Enumeration.FileSystemEnumerator`1
-T:System.IO.Enumeration.FileSystemName
-T:System.IO.EnumerationOptions
-T:System.IO.MatchCasing
-T:System.IO.MatchType
-T:System.MathF
-T:System.Memory`1
-T:System.MemoryExtensions
-T:System.Net.Http.ReadOnlyMemoryContent
-T:System.Net.Http.SocketsHttpHandler
-T:System.Net.Security.ServerCertificateSelectionCallback
-T:System.Net.Security.SslApplicationProtocol
-T:System.Net.Security.SslClientAuthenticationOptions
-T:System.Net.Security.SslServerAuthenticationOptions
-T:System.Net.Sockets.UnixDomainSocketEndPoint
-T:System.ReadOnlyMemory`1
-T:System.ReadOnlySpan`1
-T:System.Reflection.AssemblyExtensions
-T:System.Reflection.DispatchProxy
-T:System.Reflection.Emit.DynamicILInfo
-T:System.Reflection.Emit.DynamicMethod
-T:System.Reflection.Emit.EventToken
-T:System.Reflection.Emit.FieldToken
-T:System.Reflection.Emit.MethodToken
-T:System.Reflection.Emit.ParameterToken
-T:System.Reflection.Emit.PropertyToken
-T:System.Reflection.Emit.SignatureToken
-T:System.Reflection.Emit.StringToken
-T:System.Reflection.Emit.TypeToken
-T:System.Reflection.EventInfoExtensions
-T:System.Reflection.MemberInfoExtensions
-T:System.Reflection.MethodInfoExtensions
-T:System.Reflection.ModuleExtensions
-T:System.Reflection.PropertyInfoExtensions
-T:System.Reflection.TypeExtensions
-T:System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder
-T:System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable
-T:System.Runtime.CompilerServices.ValueTaskAwaiter
-T:System.Runtime.InteropServices.MemoryMarshal
-T:System.Runtime.InteropServices.SequenceMarshal
-T:System.Security.Cryptography.CryptographicOperations
-T:System.Security.Cryptography.ECDiffieHellman
-T:System.Security.Cryptography.PbeEncryptionAlgorithm
-T:System.Security.Cryptography.PbeParameters
-T:System.Security.Cryptography.X509Certificates.CertificateRequest
-T:System.Security.Cryptography.X509Certificates.DSACertificateExtensions
-T:System.Security.Cryptography.X509Certificates.SubjectAlternativeNameBuilder
-T:System.Security.Cryptography.X509Certificates.X509SignatureGenerator
-T:System.SequencePosition
-T:System.Span`1
-T:System.Threading.Tasks.Sources.IValueTaskSource
-T:System.Threading.Tasks.Sources.IValueTaskSource`1
-T:System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags
-T:System.Threading.Tasks.Sources.ValueTaskSourceStatus
-T:System.Threading.Tasks.TaskAsyncEnumerableExtensions
-T:System.Threading.Tasks.ValueTask
-T:System.Xml.Serialization.SchemaImporter
-T:System.Runtime.CompilerServices.SwitchExpressionException
-T:System.Index
-T:System.Range
-T:System.Collections.Generic.IAsyncEnumerable`1
-T:System.Collections.Generic.IAsyncEnumerator`1
-T:System.Runtime.CompilerServices.AsyncIteratorMethodBuilder
-T:System.Runtime.CompilerServices.AsyncIteratorStateMachineAttribute
-T:System.Runtime.CompilerServices.ConfiguredAsyncDisposable
-T:System.Runtime.CompilerServices.ConfiguredCancelableAsyncEnumerable`1
-T:System.Threading.Tasks.Sources.ManualResetValueTaskSourceCore`1
-T:System.Runtime.CompilerServices.EnumeratorCancellationAttribute
diff --git a/src/netstandard/src/GenApi.exclude.xamarin.watchos.txt b/src/netstandard/src/GenApi.exclude.xamarin.watchos.txt
deleted file mode 100644
index 6c71fd03a..000000000
--- a/src/netstandard/src/GenApi.exclude.xamarin.watchos.txt
+++ /dev/null
@@ -1,99 +0,0 @@
-T:System.Buffers.ArrayPool`1
-T:System.Buffers.Binary.BinaryPrimitives
-T:System.Buffers.BuffersExtensions
-T:System.Buffers.IBufferWriter`1
-T:System.Buffers.IMemoryOwner`1
-T:System.Buffers.IPinnable
-T:System.Buffers.MemoryManager`1
-T:System.Buffers.MemoryPool`1
-T:System.Buffers.ReadOnlySequence`1
-T:System.Buffers.ReadOnlySequenceSegment`1
-T:System.Buffers.ReadOnlySpanAction`2
-T:System.Buffers.SpanAction`2
-T:System.Buffers.StandardFormat
-T:System.Buffers.Text.Base64
-T:System.Buffers.Text.Utf8Formatter
-T:System.Buffers.Text.Utf8Parser
-T:System.Data.Common.DbProviderFactories
-T:System.Diagnostics.Tracing.EventSourceCreatedEventArgs
-T:System.Drawing.ColorConverter
-T:System.Drawing.PointConverter
-T:System.Drawing.RectangleConverter
-T:System.Drawing.SizeConverter
-T:System.Drawing.SizeFConverter
-T:System.HashCode
-T:System.IAsyncDisposable
-T:System.IO.Compression.BrotliDecoder
-T:System.IO.Compression.BrotliEncoder
-T:System.IO.Compression.BrotliStream
-T:System.IO.Enumeration.FileSystemEntry
-T:System.IO.Enumeration.FileSystemEnumerable`1
-T:System.IO.Enumeration.FileSystemEnumerator`1
-T:System.IO.Enumeration.FileSystemName
-T:System.IO.EnumerationOptions
-T:System.Globalization.ISOWeek
-T:System.IO.MatchCasing
-T:System.IO.MatchType
-T:System.MathF
-T:System.Memory`1
-T:System.MemoryExtensions
-T:System.Net.Http.ReadOnlyMemoryContent
-T:System.Net.Http.SocketsHttpHandler
-T:System.Net.Security.ServerCertificateSelectionCallback
-T:System.Net.Security.SslApplicationProtocol
-T:System.Net.Security.SslClientAuthenticationOptions
-T:System.Net.Security.SslServerAuthenticationOptions
-T:System.Net.Sockets.UnixDomainSocketEndPoint
-T:System.ReadOnlyMemory`1
-T:System.ReadOnlySpan`1
-T:System.Reflection.AssemblyExtensions
-T:System.Reflection.DispatchProxy
-T:System.Reflection.Emit.DynamicILInfo
-T:System.Reflection.Emit.DynamicMethod
-T:System.Reflection.Emit.EventToken
-T:System.Reflection.Emit.FieldToken
-T:System.Reflection.Emit.MethodToken
-T:System.Reflection.Emit.ParameterToken
-T:System.Reflection.Emit.PropertyToken
-T:System.Reflection.Emit.SignatureToken
-T:System.Reflection.Emit.StringToken
-T:System.Reflection.Emit.TypeToken
-T:System.Reflection.EventInfoExtensions
-T:System.Reflection.MemberInfoExtensions
-T:System.Reflection.MethodInfoExtensions
-T:System.Reflection.ModuleExtensions
-T:System.Reflection.PropertyInfoExtensions
-T:System.Reflection.TypeExtensions
-T:System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder
-T:System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable
-T:System.Runtime.CompilerServices.ValueTaskAwaiter
-T:System.Runtime.InteropServices.MemoryMarshal
-T:System.Runtime.InteropServices.SequenceMarshal
-T:System.Security.Cryptography.CryptographicOperations
-T:System.Security.Cryptography.ECDiffieHellman
-T:System.Security.Cryptography.PbeEncryptionAlgorithm
-T:System.Security.Cryptography.PbeParameters
-T:System.Security.Cryptography.X509Certificates.CertificateRequest
-T:System.Security.Cryptography.X509Certificates.DSACertificateExtensions
-T:System.Security.Cryptography.X509Certificates.SubjectAlternativeNameBuilder
-T:System.Security.Cryptography.X509Certificates.X509SignatureGenerator
-T:System.SequencePosition
-T:System.Span`1
-T:System.Threading.Tasks.Sources.IValueTaskSource
-T:System.Threading.Tasks.Sources.IValueTaskSource`1
-T:System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags
-T:System.Threading.Tasks.Sources.ValueTaskSourceStatus
-T:System.Threading.Tasks.TaskAsyncEnumerableExtensions
-T:System.Threading.Tasks.ValueTask
-T:System.Xml.Serialization.SchemaImporter
-T:System.Runtime.CompilerServices.SwitchExpressionException
-T:System.Index
-T:System.Range
-T:System.Collections.Generic.IAsyncEnumerable`1
-T:System.Collections.Generic.IAsyncEnumerator`1
-T:System.Runtime.CompilerServices.AsyncIteratorMethodBuilder
-T:System.Runtime.CompilerServices.AsyncIteratorStateMachineAttribute
-T:System.Runtime.CompilerServices.ConfiguredAsyncDisposable
-T:System.Runtime.CompilerServices.ConfiguredCancelableAsyncEnumerable`1
-T:System.Threading.Tasks.Sources.ManualResetValueTaskSourceCore`1
-T:System.Runtime.CompilerServices.EnumeratorCancellationAttribute
diff --git a/src/netstandard/src/System.Void.cs b/src/netstandard/src/System.Void.cs
new file mode 100644
index 000000000..c566acbeb
--- /dev/null
+++ b/src/netstandard/src/System.Void.cs
@@ -0,0 +1,6 @@
+// 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.
+
+// System.void typeforward requires a special C# syntax that we choose to handle here.
+[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(void))]
diff --git a/src/netstandard/src/netstandard.csproj b/src/netstandard/src/netstandard.csproj
index 3dba92bbf..f2c2998f1 100644
--- a/src/netstandard/src/netstandard.csproj
+++ b/src/netstandard/src/netstandard.csproj
@@ -11,7 +11,8 @@
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
     <DisableStandardFrameworkResolution>true</DisableStandardFrameworkResolution>
     <ContractProject>..\ref\netstandard.csproj</ContractProject>
-    <ResolveMatchingContract>true</ResolveMatchingContract>
+    <IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
+    <GenFacadesIgnoreMissingTypes>true</GenFacadesIgnoreMissingTypes>
     <RunApiCompatForSrc>true</RunApiCompatForSrc>
     <RunMatchingRefApiCompat>false</RunMatchingRefApiCompat>
     <ApiCompatBaseline>$(MSBuildProjectDirectory)\ApiCompatBaseline.$(TargetFramework).txt</ApiCompatBaseline>
@@ -24,6 +25,13 @@
     <ComputeNETCoreBuildOutputFiles>false</ComputeNETCoreBuildOutputFiles>
     <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>
+  
+  <ItemGroup>
+      <!-- Omit System.Void since C# doesn't permit the use of the `System.Void`
+         typename and instead requires callers to use the `void` keyword. -->
+    <GenFacadesOmitType Include="System.Void" />
+    <Compile Include="System.Void.cs" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="$(ContractProject)">
@@ -31,6 +39,9 @@
       <OutputItemType>ResolvedMatchingContract</OutputItemType>
     </ProjectReference>
   </ItemGroup>
+  
+  <!-- we don't require a target since we use ProjectReference -->
+  <Target Name="ResolveMatchingContract" />
 
   <ItemGroup>
     <!-- Mark netstandard as a framework assembly -->