From 3679e373a346099eed990c5b3b1a1beedab68572 Mon Sep 17 00:00:00 2001
From: Anirudh Agnihotry <anirudhagnihotry098@gmail.com>
Date: Mon, 11 Nov 2019 10:43:58 -0800
Subject: [PATCH] Bumping the assembly version to 5.0.0.0 (dotnet/corefx#41723)

* bumping the assembly Version

* correcting the resx file

* keeping netfx for oleDb

* fiixing the netfx tests as well

* fixing the DataSetExtensionsVersion

* removing netstandard2.0 from ref in datasetextensions


Commit migrated from https://github.com/dotnet/corefx/commit/9a4ed0d00bc642b015974684c32b00650426429f
---
 .../Directory.Build.props                          |   1 -
 .../Microsoft.IO.Redist/Directory.Build.props      |   1 -
 .../Directory.Build.props                          |   2 +-
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../Microsoft.Win32.Registry.AccessControl.pkgproj |   2 +-
 .../Microsoft.Win32.Registry/Directory.Build.props |   1 -
 .../pkg/Microsoft.Win32.Registry.pkgproj           |   2 +-
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   3 +-
 .../System.AppContext/Directory.Build.props        |   1 -
 src/libraries/System.Buffers/Directory.Build.props |   1 -
 src/libraries/System.CodeDom/Directory.Build.props |   1 -
 .../System.CodeDom/pkg/System.CodeDom.pkgproj      |   2 +-
 .../Directory.Build.props                          |   3 +-
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../System.Collections/Directory.Build.props       |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 ...ComponentModel.Composition.Registration.pkgproj |   3 +-
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../System.ComponentModel/Directory.Build.props    |   3 +-
 .../pkg/System.Composition.AttributedModel.pkgproj |   2 +-
 .../pkg/System.Composition.Convention.pkgproj      |   2 +-
 .../pkg/System.Composition.Hosting.pkgproj         |   2 +-
 .../pkg/System.Composition.Runtime.pkgproj         |   2 +-
 .../pkg/System.Composition.TypedParts.pkgproj      |   2 +-
 .../System.Composition/Directory.Build.props       |   4 -
 .../Directory.Build.props                          |   1 -
 ...stem.Configuration.ConfigurationManager.pkgproj |   2 +-
 src/libraries/System.Console/Directory.Build.props |   1 -
 .../System.Data.Common/Directory.Build.props       |   1 -
 .../ref/Configurations.props                       |   1 -
 .../ref/System.Data.DataSetExtensions.cs           |  88 ------
 .../ref/System.Data.DataSetExtensions.csproj       |   7 +-
 .../System.Data.Odbc/Directory.Build.props         |   1 -
 .../System.Data.OleDb/Directory.Build.props        |   1 -
 .../System.Data.OleDb/ref/Configurations.props     |   2 +-
 .../System.Data.SqlClient/Directory.Build.props    |   1 -
 .../pkg/System.Data.SqlClient.pkgproj              |  12 +-
 .../System.Data.SqlClient/ref/Configurations.props |   3 -
 .../ref/System.Data.SqlClient.csproj               |  13 +-
 .../System.Data.SqlClient/src/Configurations.props |   6 +-
 .../src/System.Data.SqlClient.csproj               |  11 +-
 .../Directory.Build.props                          |   3 +-
 .../System.Diagnostics.Debug/Directory.Build.props |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../System.Diagnostics.Tools/Directory.Build.props |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../System.Drawing.Common/Directory.Build.props    |   1 -
 .../Directory.Build.props                          |   1 -
 .../System.Dynamic.Runtime/Directory.Build.props   |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../System.Globalization/Directory.Build.props     |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../System.IO.Compression/Directory.Build.props    |   1 -
 .../Directory.Build.props                          |   1 -
 .../pkg/System.IO.FileSystem.AccessControl.pkgproj |   2 +-
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../System.IO.FileSystem/Directory.Build.props     |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../System.IO.Packaging/Directory.Build.props      |   1 -
 .../System.IO.Pipelines/Directory.Build.props      |   1 -
 .../Directory.Build.props                          |   1 -
 .../System.IO.Pipes/Directory.Build.props          |   1 -
 .../System.IO.Ports/Directory.Build.props          |   1 -
 .../System.IO.Ports/pkg/System.IO.Ports.pkgproj    |   2 +-
 .../System.IO.Ports/ref/System.IO.Ports.csproj     |   3 -
 .../Directory.Build.props                          |   1 -
 src/libraries/System.IO/Directory.Build.props      |   1 -
 src/libraries/System.Json/Directory.Build.props    |   1 -
 .../System.Linq.Expressions/Directory.Build.props  |   1 -
 .../System.Linq.Parallel/Directory.Build.props     |   3 +-
 .../System.Linq.Queryable/Directory.Build.props    |   3 +-
 src/libraries/System.Linq/Directory.Build.props    |   1 -
 src/libraries/System.Memory/Directory.Build.props  |   3 -
 .../Directory.Build.props                          |   1 -
 .../pkg/System.Net.Http.WinHttpHandler.pkgproj     |   2 +-
 .../System.Net.Http/Directory.Build.props          |   1 -
 .../System.Net.HttpListener/Directory.Build.props  |   1 -
 .../System.Net.Mail/Directory.Build.props          |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../System.Net.Ping/Directory.Build.props          |   1 -
 .../System.Net.Primitives/Directory.Build.props    |   1 -
 .../System.Net.Requests/Directory.Build.props      |   1 -
 .../System.Net.Security/Directory.Build.props      |   1 -
 .../System.Net.ServicePoint/Directory.Build.props  |   1 -
 .../System.Net.Sockets/Directory.Build.props       |   1 -
 .../System.Net.WebClient/Directory.Build.props     |   1 -
 .../Directory.Build.props                          |   1 -
 .../System.Net.WebProxy/Directory.Build.props      |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../System.Net.WebSockets/Directory.Build.props    |   1 -
 .../System.Numerics.Tensors/Directory.Build.props  |   3 +-
 .../System.Numerics.Vectors/Directory.Build.props  |   1 -
 .../System.ObjectModel/Directory.Build.props       |   1 -
 .../Directory.Build.props                          |   1 -
 .../System.Private.Uri/Directory.Build.props       |   1 -
 .../System.Private.Xml.Linq/Directory.Build.props  |   1 -
 .../System.Private.Xml/Directory.Build.props       |   1 -
 .../Directory.Build.props                          |   2 +-
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   3 +-
 .../Directory.Build.props                          |   3 +-
 .../System.Reflection.Emit/Directory.Build.props   |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../ref/System.Reflection.TypeExtensions.csproj    |   3 -
 .../System.Reflection/Directory.Build.props        |   1 -
 .../Directory.Build.props                          |   1 -
 .../tests/System.Resources.Extensions.Tests.csproj |   4 +-
 .../tests/TestData.resources                       | Bin 8184 -> 8184 bytes
 .../System.Resources.Reader/Directory.Build.props  |   1 -
 .../Directory.Build.props                          |   1 -
 .../System.Resources.Writer/Directory.Build.props  |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../System.Runtime.Handles/Directory.Build.props   |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   3 +-
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../System.Runtime.Loader/Directory.Build.props    |   1 -
 .../System.Runtime.Numerics/Directory.Build.props  |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   3 +-
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 src/libraries/System.Runtime/Directory.Build.props |   1 -
 .../Directory.Build.props                          |   1 -
 .../pkg/System.Security.AccessControl.pkgproj      |   2 +-
 .../ref/System.Security.AccessControl.csproj       |   3 -
 .../System.Security.Claims/Directory.Build.props   |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 ...tem.Security.Cryptography.ProtectedData.pkgproj |   2 +-
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../pkg/System.Security.Cryptography.Xml.pkgproj   |   2 +-
 .../Directory.Build.props                          |   1 -
 .../pkg/System.Security.Permissions.pkgproj        |   2 +-
 .../Directory.Build.props                          |   1 -
 .../pkg/System.Security.Principal.Windows.pkgproj  |   2 +-
 .../ref/System.Security.Principal.Windows.csproj   |   3 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 ...System.ServiceProcess.ServiceController.pkgproj |   2 +-
 .../Directory.Build.props                          |   1 -
 .../pkg/System.Text.Encoding.CodePages.pkgproj     |   4 +-
 .../Directory.Build.props                          |   1 -
 .../System.Text.Encoding/Directory.Build.props     |   1 -
 .../Directory.Build.props                          |   1 -
 .../pkg/System.Text.Encodings.Web.pkgproj          |   4 +-
 .../System.Text.Json/Directory.Build.props         |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../pkg/System.Threading.AccessControl.pkgproj     |   2 +-
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   3 -
 .../Directory.Build.props                          |   3 +-
 .../System.Threading.Tasks/Directory.Build.props   |   1 -
 .../System.Threading.Thread/Directory.Build.props  |   1 -
 .../Directory.Build.props                          |   1 -
 .../System.Threading.Timer/Directory.Build.props   |   1 -
 .../System.Threading/Directory.Build.props         |   1 -
 .../Directory.Build.props                          |   1 -
 .../Directory.Build.props                          |   3 +-
 .../System.ValueTuple/Directory.Build.props        |   1 -
 .../System.Web.HttpUtility/Directory.Build.props   |   1 -
 .../Directory.Build.props                          |   1 -
 .../System.Xml.ReaderWriter/Directory.Build.props  |   1 -
 .../System.Xml.XDocument/Directory.Build.props     |   1 -
 .../Directory.Build.props                          |   1 -
 .../System.Xml.XPath/Directory.Build.props         |   1 -
 .../System.Xml.XmlDocument/Directory.Build.props   |   1 -
 .../System.Xml.XmlSerializer/Directory.Build.props |   1 -
 .../Microsoft.Private.CoreFx.NETCoreApp.pkgproj    |   3 +-
 .../packageIndex.json                              | 316 ++++++++++++++++-----
 .../netcoreapp5.0/settings.targets                 |   2 +
 .../binplacePackages/binplacePackages.depproj      |   1 +
 .../restore/netstandard/netstandard.depproj        |   3 +
 213 files changed, 312 insertions(+), 427 deletions(-)
 delete mode 100644 src/libraries/System.Data.DataSetExtensions/ref/System.Data.DataSetExtensions.cs

diff --git a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Directory.Build.props b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Directory.Build.props
index e849305..bdcfca3 100644
--- a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Directory.Build.props
+++ b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>2.0.2.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/Microsoft.IO.Redist/Directory.Build.props b/src/libraries/Microsoft.IO.Redist/Directory.Build.props
index f86fdad..7dcfd0e 100644
--- a/src/libraries/Microsoft.IO.Redist/Directory.Build.props
+++ b/src/libraries/Microsoft.IO.Redist/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <IsNETCoreApp>false</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props b/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props
index 8805a8c..49b1160 100644
--- a/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props
+++ b/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <MajorVersion>$([MSBuild]::Add($(MajorVersion), 6))</MajorVersion>
     <PackageVersion>$(MajorVersion).$(MinorVersion).$(PatchVersion)</PackageVersion>
-    <AssemblyVersion>10.0.4.0</AssemblyVersion>
+    <AssemblyVersion>10.0.6.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/Microsoft.Win32.Primitives/Directory.Build.props b/src/libraries/Microsoft.Win32.Primitives/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/Microsoft.Win32.Primitives/Directory.Build.props
+++ b/src/libraries/Microsoft.Win32.Primitives/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/Directory.Build.props b/src/libraries/Microsoft.Win32.Registry.AccessControl/Directory.Build.props
index 98004a4..63f02a0 100644
--- a/src/libraries/Microsoft.Win32.Registry.AccessControl/Directory.Build.props
+++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.pkgproj b/src/libraries/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.pkgproj
index bda29fe..d95891c 100644
--- a/src/libraries/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.pkgproj
+++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.pkgproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\Microsoft.Win32.Registry.AccessControl.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>net461;uap10.0.16299;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\Microsoft.Win32.Registry.AccessControl.csproj" />
     <HarvestIncludePaths Include="ref/net46;lib/net46;runtimes/win/lib/net46" />
diff --git a/src/libraries/Microsoft.Win32.Registry/Directory.Build.props b/src/libraries/Microsoft.Win32.Registry/Directory.Build.props
index 7de773a..8c72c62 100644
--- a/src/libraries/Microsoft.Win32.Registry/Directory.Build.props
+++ b/src/libraries/Microsoft.Win32.Registry/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.2.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
     <IsNETCoreAppRef>false</IsNETCoreAppRef>
diff --git a/src/libraries/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj b/src/libraries/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj
index c4c49d5..6cf3c19 100644
--- a/src/libraries/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj
+++ b/src/libraries/Microsoft.Win32.Registry/pkg/Microsoft.Win32.Registry.pkgproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\Microsoft.Win32.Registry.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>net461;uap10.0.16299;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\Microsoft.Win32.Registry.csproj" />
     <HarvestIncludePaths Include="ref/net46;lib/net46;runtimes/win/lib/net46" />
diff --git a/src/libraries/Microsoft.Win32.SystemEvents/Directory.Build.props b/src/libraries/Microsoft.Win32.SystemEvents/Directory.Build.props
index 7549428..bdcfca3 100644
--- a/src/libraries/Microsoft.Win32.SystemEvents/Directory.Build.props
+++ b/src/libraries/Microsoft.Win32.SystemEvents/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/Directory.Build.props b/src/libraries/Microsoft.XmlSerializer.Generator/Directory.Build.props
index 50d2821..804d7a7 100644
--- a/src/libraries/Microsoft.XmlSerializer.Generator/Directory.Build.props
+++ b/src/libraries/Microsoft.XmlSerializer.Generator/Directory.Build.props
@@ -1,8 +1,7 @@
-<Project>
+<Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <SkipValidatePackage>true</SkipValidatePackage>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyFileVersion>$(AssemblyVersion)</AssemblyFileVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
diff --git a/src/libraries/System.AppContext/Directory.Build.props b/src/libraries/System.AppContext/Directory.Build.props
index 42479cd..465e111 100644
--- a/src/libraries/System.AppContext/Directory.Build.props
+++ b/src/libraries/System.AppContext/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Buffers/Directory.Build.props b/src/libraries/System.Buffers/Directory.Build.props
index e3343ce..2b9e284 100644
--- a/src/libraries/System.Buffers/Directory.Build.props
+++ b/src/libraries/System.Buffers/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.CodeDom/Directory.Build.props b/src/libraries/System.CodeDom/Directory.Build.props
index c63e87e..bdcfca3 100644
--- a/src/libraries/System.CodeDom/Directory.Build.props
+++ b/src/libraries/System.CodeDom/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.2.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.CodeDom/pkg/System.CodeDom.pkgproj b/src/libraries/System.CodeDom/pkg/System.CodeDom.pkgproj
index 69615ec..1896e5e 100644
--- a/src/libraries/System.CodeDom/pkg/System.CodeDom.pkgproj
+++ b/src/libraries/System.CodeDom/pkg/System.CodeDom.pkgproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.CodeDom.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.CodeDom.csproj" />
   </ItemGroup>
diff --git a/src/libraries/System.Collections.Concurrent/Directory.Build.props b/src/libraries/System.Collections.Concurrent/Directory.Build.props
index 68c762d..5f6e490 100644
--- a/src/libraries/System.Collections.Concurrent/Directory.Build.props
+++ b/src/libraries/System.Collections.Concurrent/Directory.Build.props
@@ -1,7 +1,6 @@
-<Project>
+<Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.14.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Collections.Immutable/Directory.Build.props b/src/libraries/System.Collections.Immutable/Directory.Build.props
index 2ba313e..465e111 100644
--- a/src/libraries/System.Collections.Immutable/Directory.Build.props
+++ b/src/libraries/System.Collections.Immutable/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>1.2.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Collections.NonGeneric/Directory.Build.props b/src/libraries/System.Collections.NonGeneric/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Collections.NonGeneric/Directory.Build.props
+++ b/src/libraries/System.Collections.NonGeneric/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Collections.Specialized/Directory.Build.props b/src/libraries/System.Collections.Specialized/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Collections.Specialized/Directory.Build.props
+++ b/src/libraries/System.Collections.Specialized/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Collections/Directory.Build.props b/src/libraries/System.Collections/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Collections/Directory.Build.props
+++ b/src/libraries/System.Collections/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.ComponentModel.Annotations/Directory.Build.props b/src/libraries/System.ComponentModel.Annotations/Directory.Build.props
index 10289ed..465e111 100644
--- a/src/libraries/System.ComponentModel.Annotations/Directory.Build.props
+++ b/src/libraries/System.ComponentModel.Annotations/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.3.0.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.ComponentModel.Composition.Registration/Directory.Build.props b/src/libraries/System.ComponentModel.Composition.Registration/Directory.Build.props
index 7b1204a..798ccfd 100644
--- a/src/libraries/System.ComponentModel.Composition.Registration/Directory.Build.props
+++ b/src/libraries/System.ComponentModel.Composition.Registration/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <StrongNameKeyId>ECMA</StrongNameKeyId>
   </PropertyGroup>
 </Project>
diff --git a/src/libraries/System.ComponentModel.Composition.Registration/pkg/System.ComponentModel.Composition.Registration.pkgproj b/src/libraries/System.ComponentModel.Composition.Registration/pkg/System.ComponentModel.Composition.Registration.pkgproj
index c2f62c3..a2450f1 100644
--- a/src/libraries/System.ComponentModel.Composition.Registration/pkg/System.ComponentModel.Composition.Registration.pkgproj
+++ b/src/libraries/System.ComponentModel.Composition.Registration/pkg/System.ComponentModel.Composition.Registration.pkgproj
@@ -2,8 +2,9 @@
     <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
     <ItemGroup>
     <ProjectReference Include="..\ref\System.ComponentModel.Composition.Registration.csproj">
-      <SupportedFramework>netcoreapp3.0;net45;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>netcoreapp3.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
+    <SupportedFramework Include="net45" Version="4.0.0.0" />
     <ProjectReference Include="..\src\System.ComponentModel.Composition.Registration.csproj" />
     <InboxOnTargetFramework Include="net45">
       <AsFrameworkReference>true</AsFrameworkReference>
diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/Directory.Build.props b/src/libraries/System.ComponentModel.EventBasedAsync/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.ComponentModel.EventBasedAsync/Directory.Build.props
+++ b/src/libraries/System.ComponentModel.EventBasedAsync/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.ComponentModel.Primitives/Directory.Build.props b/src/libraries/System.ComponentModel.Primitives/Directory.Build.props
index 42479cd..465e111 100644
--- a/src/libraries/System.ComponentModel.Primitives/Directory.Build.props
+++ b/src/libraries/System.ComponentModel.Primitives/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.ComponentModel.TypeConverter/Directory.Build.props b/src/libraries/System.ComponentModel.TypeConverter/Directory.Build.props
index 42479cd..465e111 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/Directory.Build.props
+++ b/src/libraries/System.ComponentModel.TypeConverter/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.ComponentModel/Directory.Build.props b/src/libraries/System.ComponentModel/Directory.Build.props
index 359b316..5f6e490 100644
--- a/src/libraries/System.ComponentModel/Directory.Build.props
+++ b/src/libraries/System.ComponentModel/Directory.Build.props
@@ -1,7 +1,6 @@
-<Project>
+<Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.3.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.pkgproj b/src/libraries/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.pkgproj
index 09e6802..389b661 100644
--- a/src/libraries/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.pkgproj
+++ b/src/libraries/System.Composition.AttributedModel/pkg/System.Composition.AttributedModel.pkgproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\src\System.Composition.AttributedModel.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
 
     <HarvestIncludePaths Include="lib/netstandard1.0;lib/portable-net45+win8+wp8+wpa81" />
diff --git a/src/libraries/System.Composition.Convention/pkg/System.Composition.Convention.pkgproj b/src/libraries/System.Composition.Convention/pkg/System.Composition.Convention.pkgproj
index e6113b0..4c25f9e 100644
--- a/src/libraries/System.Composition.Convention/pkg/System.Composition.Convention.pkgproj
+++ b/src/libraries/System.Composition.Convention/pkg/System.Composition.Convention.pkgproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\src\System.Composition.Convention.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
 
     <HarvestIncludePaths Include="lib/netstandard1.0;lib/portable-net45+win8+wp8+wpa81" />
diff --git a/src/libraries/System.Composition.Hosting/pkg/System.Composition.Hosting.pkgproj b/src/libraries/System.Composition.Hosting/pkg/System.Composition.Hosting.pkgproj
index 90d5d58..3cbd0b2 100644
--- a/src/libraries/System.Composition.Hosting/pkg/System.Composition.Hosting.pkgproj
+++ b/src/libraries/System.Composition.Hosting/pkg/System.Composition.Hosting.pkgproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\src\System.Composition.Hosting.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
 
     <HarvestIncludePaths Include="lib/netstandard1.0;lib/portable-net45+win8+wp8+wpa81" />
diff --git a/src/libraries/System.Composition.Runtime/pkg/System.Composition.Runtime.pkgproj b/src/libraries/System.Composition.Runtime/pkg/System.Composition.Runtime.pkgproj
index 0390368..7bc1af4 100644
--- a/src/libraries/System.Composition.Runtime/pkg/System.Composition.Runtime.pkgproj
+++ b/src/libraries/System.Composition.Runtime/pkg/System.Composition.Runtime.pkgproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\src\System.Composition.Runtime.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
 
     <HarvestIncludePaths Include="lib/netstandard1.0;lib/portable-net45+win8+wp8+wpa81" />
diff --git a/src/libraries/System.Composition.TypedParts/pkg/System.Composition.TypedParts.pkgproj b/src/libraries/System.Composition.TypedParts/pkg/System.Composition.TypedParts.pkgproj
index 481b132..dd09a02 100644
--- a/src/libraries/System.Composition.TypedParts/pkg/System.Composition.TypedParts.pkgproj
+++ b/src/libraries/System.Composition.TypedParts/pkg/System.Composition.TypedParts.pkgproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\src\System.Composition.TypedParts.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
 
     <HarvestIncludePaths Include="lib/netstandard1.0;lib/portable-net45+win8+wp8+wpa81" />
diff --git a/src/libraries/System.Composition/Directory.Build.props b/src/libraries/System.Composition/Directory.Build.props
index 41233d6..ad247e4 100644
--- a/src/libraries/System.Composition/Directory.Build.props
+++ b/src/libraries/System.Composition/Directory.Build.props
@@ -1,7 +1,3 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
-  <PropertyGroup>
-    <StrongNameKeyId>Microsoft</StrongNameKeyId>
-    <AssemblyVersion>1.0.34.0</AssemblyVersion>
-  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Configuration.ConfigurationManager/Directory.Build.props b/src/libraries/System.Configuration.ConfigurationManager/Directory.Build.props
index c63e87e..bdcfca3 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/Directory.Build.props
+++ b/src/libraries/System.Configuration.ConfigurationManager/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.2.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Configuration.ConfigurationManager/pkg/System.Configuration.ConfigurationManager.pkgproj b/src/libraries/System.Configuration.ConfigurationManager/pkg/System.Configuration.ConfigurationManager.pkgproj
index bb9bf2c..1245e77 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/pkg/System.Configuration.ConfigurationManager.pkgproj
+++ b/src/libraries/System.Configuration.ConfigurationManager/pkg/System.Configuration.ConfigurationManager.pkgproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Configuration.ConfigurationManager.csproj">
-      <SupportedFramework>netcoreapp2.0;net461;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>netcoreapp2.0;net461;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Configuration.ConfigurationManager.csproj" />
   </ItemGroup>
diff --git a/src/libraries/System.Console/Directory.Build.props b/src/libraries/System.Console/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Console/Directory.Build.props
+++ b/src/libraries/System.Console/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Data.Common/Directory.Build.props b/src/libraries/System.Data.Common/Directory.Build.props
index 42479cd..465e111 100644
--- a/src/libraries/System.Data.Common/Directory.Build.props
+++ b/src/libraries/System.Data.Common/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Data.DataSetExtensions/ref/Configurations.props b/src/libraries/System.Data.DataSetExtensions/ref/Configurations.props
index 17e276b..55d2de1 100644
--- a/src/libraries/System.Data.DataSetExtensions/ref/Configurations.props
+++ b/src/libraries/System.Data.DataSetExtensions/ref/Configurations.props
@@ -1,7 +1,6 @@
 <Project>
   <PropertyGroup>
     <BuildConfigurations>
-      netstandard2.0;
       netcoreapp;
     </BuildConfigurations>
   </PropertyGroup>
diff --git a/src/libraries/System.Data.DataSetExtensions/ref/System.Data.DataSetExtensions.cs b/src/libraries/System.Data.DataSetExtensions/ref/System.Data.DataSetExtensions.cs
deleted file mode 100644
index a0ff68b..0000000
--- a/src/libraries/System.Data.DataSetExtensions/ref/System.Data.DataSetExtensions.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-// 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.
-// ------------------------------------------------------------------------------
-// Changes to this file must follow the http://aka.ms/api-review process.
-// ------------------------------------------------------------------------------
-
-namespace System.Data
-{
-    public static partial class DataRowComparer
-    {
-        public static System.Data.DataRowComparer<System.Data.DataRow> Default { get { throw null; } }
-    }
-    public sealed partial class DataRowComparer<TRow> : System.Collections.Generic.IEqualityComparer<TRow> where TRow : System.Data.DataRow
-    {
-        internal DataRowComparer() { }
-        public static System.Data.DataRowComparer<TRow> Default { get { throw null; } }
-        public bool Equals(TRow leftRow, TRow rightRow) { throw null; }
-        public int GetHashCode(TRow row) { throw null; }
-    }
-    public static partial class DataRowExtensions
-    {
-        public static T Field<T>(this System.Data.DataRow row, System.Data.DataColumn column) { throw null; }
-        public static T Field<T>(this System.Data.DataRow row, System.Data.DataColumn column, System.Data.DataRowVersion version) { throw null; }
-        public static T Field<T>(this System.Data.DataRow row, int columnIndex) { throw null; }
-        public static T Field<T>(this System.Data.DataRow row, int columnIndex, System.Data.DataRowVersion version) { throw null; }
-        public static T Field<T>(this System.Data.DataRow row, string columnName) { throw null; }
-        public static T Field<T>(this System.Data.DataRow row, string columnName, System.Data.DataRowVersion version) { throw null; }
-        public static void SetField<T>(this System.Data.DataRow row, System.Data.DataColumn column, T value) { }
-        public static void SetField<T>(this System.Data.DataRow row, int columnIndex, T value) { }
-        public static void SetField<T>(this System.Data.DataRow row, string columnName, T value) { }
-    }
-    public static partial class DataTableExtensions
-    {
-        public static System.Data.EnumerableRowCollection<System.Data.DataRow> AsEnumerable(this System.Data.DataTable source) { throw null; }
-        public static System.Data.DataTable CopyToDataTable<T>(this System.Collections.Generic.IEnumerable<T> source) where T : System.Data.DataRow { throw null; }
-        public static void CopyToDataTable<T>(this System.Collections.Generic.IEnumerable<T> source, System.Data.DataTable table, System.Data.LoadOption options) where T : System.Data.DataRow { }
-        public static void CopyToDataTable<T>(this System.Collections.Generic.IEnumerable<T> source, System.Data.DataTable table, System.Data.LoadOption options, System.Data.FillErrorEventHandler errorHandler) where T : System.Data.DataRow { }
-    }
-    public abstract partial class EnumerableRowCollection : System.Collections.IEnumerable
-    {
-        internal EnumerableRowCollection() { }
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
-    }
-    public static partial class EnumerableRowCollectionExtensions
-    {
-        public static System.Data.EnumerableRowCollection<TResult> Cast<TResult>(this System.Data.EnumerableRowCollection source) { throw null; }
-        public static System.Data.OrderedEnumerableRowCollection<TRow> OrderByDescending<TRow, TKey>(this System.Data.EnumerableRowCollection<TRow> source, System.Func<TRow, TKey> keySelector) { throw null; }
-        public static System.Data.OrderedEnumerableRowCollection<TRow> OrderByDescending<TRow, TKey>(this System.Data.EnumerableRowCollection<TRow> source, System.Func<TRow, TKey> keySelector, System.Collections.Generic.IComparer<TKey> comparer) { throw null; }
-        public static System.Data.OrderedEnumerableRowCollection<TRow> OrderBy<TRow, TKey>(this System.Data.EnumerableRowCollection<TRow> source, System.Func<TRow, TKey> keySelector) { throw null; }
-        public static System.Data.OrderedEnumerableRowCollection<TRow> OrderBy<TRow, TKey>(this System.Data.EnumerableRowCollection<TRow> source, System.Func<TRow, TKey> keySelector, System.Collections.Generic.IComparer<TKey> comparer) { throw null; }
-        public static System.Data.EnumerableRowCollection<S> Select<TRow, S>(this System.Data.EnumerableRowCollection<TRow> source, System.Func<TRow, S> selector) { throw null; }
-        public static System.Data.OrderedEnumerableRowCollection<TRow> ThenByDescending<TRow, TKey>(this System.Data.OrderedEnumerableRowCollection<TRow> source, System.Func<TRow, TKey> keySelector) { throw null; }
-        public static System.Data.OrderedEnumerableRowCollection<TRow> ThenByDescending<TRow, TKey>(this System.Data.OrderedEnumerableRowCollection<TRow> source, System.Func<TRow, TKey> keySelector, System.Collections.Generic.IComparer<TKey> comparer) { throw null; }
-        public static System.Data.OrderedEnumerableRowCollection<TRow> ThenBy<TRow, TKey>(this System.Data.OrderedEnumerableRowCollection<TRow> source, System.Func<TRow, TKey> keySelector) { throw null; }
-        public static System.Data.OrderedEnumerableRowCollection<TRow> ThenBy<TRow, TKey>(this System.Data.OrderedEnumerableRowCollection<TRow> source, System.Func<TRow, TKey> keySelector, System.Collections.Generic.IComparer<TKey> comparer) { throw null; }
-        public static System.Data.EnumerableRowCollection<TRow> Where<TRow>(this System.Data.EnumerableRowCollection<TRow> source, System.Func<TRow, bool> predicate) { throw null; }
-    }
-    public partial class EnumerableRowCollection<TRow> : System.Data.EnumerableRowCollection, System.Collections.Generic.IEnumerable<TRow>, System.Collections.IEnumerable
-    {
-        internal EnumerableRowCollection() { }
-        public System.Collections.Generic.IEnumerator<TRow> GetEnumerator() { throw null; }
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
-    }
-    public sealed partial class OrderedEnumerableRowCollection<TRow> : System.Data.EnumerableRowCollection<TRow>
-    {
-        internal OrderedEnumerableRowCollection() { }
-    }
-    public static partial class TypedTableBaseExtensions
-    {
-        public static System.Data.EnumerableRowCollection<TRow> AsEnumerable<TRow>(this System.Data.TypedTableBase<TRow> source) where TRow : System.Data.DataRow { throw null; }
-        public static TRow ElementAtOrDefault<TRow>(this System.Data.TypedTableBase<TRow> source, int index) where TRow : System.Data.DataRow { throw null; }
-        public static System.Data.OrderedEnumerableRowCollection<TRow> OrderByDescending<TRow, TKey>(this System.Data.TypedTableBase<TRow> source, System.Func<TRow, TKey> keySelector) where TRow : System.Data.DataRow { throw null; }
-        public static System.Data.OrderedEnumerableRowCollection<TRow> OrderByDescending<TRow, TKey>(this System.Data.TypedTableBase<TRow> source, System.Func<TRow, TKey> keySelector, System.Collections.Generic.IComparer<TKey> comparer) where TRow : System.Data.DataRow { throw null; }
-        public static System.Data.OrderedEnumerableRowCollection<TRow> OrderBy<TRow, TKey>(this System.Data.TypedTableBase<TRow> source, System.Func<TRow, TKey> keySelector) where TRow : System.Data.DataRow { throw null; }
-        public static System.Data.OrderedEnumerableRowCollection<TRow> OrderBy<TRow, TKey>(this System.Data.TypedTableBase<TRow> source, System.Func<TRow, TKey> keySelector, System.Collections.Generic.IComparer<TKey> comparer) where TRow : System.Data.DataRow { throw null; }
-        public static System.Data.EnumerableRowCollection<S> Select<TRow, S>(this System.Data.TypedTableBase<TRow> source, System.Func<TRow, S> selector) where TRow : System.Data.DataRow { throw null; }
-        public static System.Data.EnumerableRowCollection<TRow> Where<TRow>(this System.Data.TypedTableBase<TRow> source, System.Func<TRow, bool> predicate) where TRow : System.Data.DataRow { throw null; }
-    }
-    public abstract partial class TypedTableBase<T> : System.Data.DataTable, System.Collections.Generic.IEnumerable<T>, System.Collections.IEnumerable where T : System.Data.DataRow
-    {
-        protected TypedTableBase() { }
-        protected TypedTableBase(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
-        public System.Data.EnumerableRowCollection<TResult> Cast<TResult>() { throw null; }
-        public System.Collections.Generic.IEnumerator<T> GetEnumerator() { throw null; }
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
-    }
-}
diff --git a/src/libraries/System.Data.DataSetExtensions/ref/System.Data.DataSetExtensions.csproj b/src/libraries/System.Data.DataSetExtensions/ref/System.Data.DataSetExtensions.csproj
index 609ce6e..9c1d0f7 100644
--- a/src/libraries/System.Data.DataSetExtensions/ref/System.Data.DataSetExtensions.csproj
+++ b/src/libraries/System.Data.DataSetExtensions/ref/System.Data.DataSetExtensions.csproj
@@ -2,13 +2,10 @@
   <PropertyGroup>
     <Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetsNETStandard)' == 'true'">
-    <Compile Include="System.Data.DataSetExtensions.cs" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetsNETStandard)' != 'true'">
+  <ItemGroup>
     <Compile Include="System.Data.DataSetExtensions.Forwards.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetsNETStandard)' != 'true'">
+  <ItemGroup>
     <ProjectReference Include="..\..\System.ComponentModel.TypeConverter\ref\System.ComponentModel.TypeConverter.csproj" />
     <ProjectReference Include="..\..\System.Data.Common\ref\System.Data.Common.csproj" />
     <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
diff --git a/src/libraries/System.Data.Odbc/Directory.Build.props b/src/libraries/System.Data.Odbc/Directory.Build.props
index 7549428..bdcfca3 100644
--- a/src/libraries/System.Data.Odbc/Directory.Build.props
+++ b/src/libraries/System.Data.Odbc/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Data.OleDb/Directory.Build.props b/src/libraries/System.Data.OleDb/Directory.Build.props
index b82e19a..571905e 100644
--- a/src/libraries/System.Data.OleDb/Directory.Build.props
+++ b/src/libraries/System.Data.OleDb/Directory.Build.props
@@ -1,6 +1,5 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Data.OleDb/ref/Configurations.props b/src/libraries/System.Data.OleDb/ref/Configurations.props
index c71c6f1..23a6cc8 100644
--- a/src/libraries/System.Data.OleDb/ref/Configurations.props
+++ b/src/libraries/System.Data.OleDb/ref/Configurations.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <PackageConfigurations>
       netstandard2.0;
-      net461;      
+      net461;   
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations);
diff --git a/src/libraries/System.Data.SqlClient/Directory.Build.props b/src/libraries/System.Data.SqlClient/Directory.Build.props
index b90edfc..63f02a0 100644
--- a/src/libraries/System.Data.SqlClient/Directory.Build.props
+++ b/src/libraries/System.Data.SqlClient/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.6.0.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj b/src/libraries/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj
index 2c9cc4b..918a5bd 100644
--- a/src/libraries/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj
+++ b/src/libraries/System.Data.SqlClient/pkg/System.Data.SqlClient.pkgproj
@@ -2,17 +2,15 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Data.SqlClient.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(UAPvNextTFM);$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>netcoreapp2.1;netcoreapp3.0;netcoreapp5.0</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Data.SqlClient.csproj" />
     <HarvestIncludePaths Include="ref/net451;lib/net451;runtimes/win/lib/net451" />
     <HarvestIncludePaths Include="ref/net46;lib/net46;runtimes/win/lib/net46" />
-    <HarvestIncludePaths Include="ref/netstandard1.2">
-      <SupportedFramework>net451;win81;wpa81</SupportedFramework>
-    </HarvestIncludePaths>
-    <HarvestIncludePaths Include="ref/netstandard1.3">
-      <SupportedFramework>net46;netcoreapp1.0</SupportedFramework>
-    </HarvestIncludePaths>
+    <HarvestIncludePaths Include="ref/netstandard1.2;lib/netstandard1.2" />
+    <HarvestIncludePaths Include="ref/netstandard1.3;lib/netstandard1.3" />
+    <HarvestIncludePaths Include="ref/netstandard2.0;lib/netstandard2.0" />
+    <HarvestIncludePaths Include="ref/net461;lib/net461;runtimes/win/lib/net461" />
     <HarvestIncludePaths Include="runtimes/unix/lib/netstandard1.3;runtimes/win/lib/netstandard1.3" />
     <HarvestIncludePaths Include="runtimes/win/lib/uap10.0.16299" />
 
diff --git a/src/libraries/System.Data.SqlClient/ref/Configurations.props b/src/libraries/System.Data.SqlClient/ref/Configurations.props
index d9939d4..67f6653 100644
--- a/src/libraries/System.Data.SqlClient/ref/Configurations.props
+++ b/src/libraries/System.Data.SqlClient/ref/Configurations.props
@@ -2,13 +2,10 @@
   <PropertyGroup>
     <PackageConfigurations>
       netcoreapp2.1;
-      netstandard2.0;
-      net461;
     </PackageConfigurations>
     <BuildConfigurations>
       $(PackageConfigurations)
       netcoreapp;
-      netfx;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Data.SqlClient/ref/System.Data.SqlClient.csproj b/src/libraries/System.Data.SqlClient/ref/System.Data.SqlClient.csproj
index 43e6565..3d9a54f 100644
--- a/src/libraries/System.Data.SqlClient/ref/System.Data.SqlClient.csproj
+++ b/src/libraries/System.Data.SqlClient/ref/System.Data.SqlClient.csproj
@@ -1,22 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <Configurations>net461-Debug;net461-Release;netcoreapp-Debug;netcoreapp-Release;netcoreapp2.1-Debug;netcoreapp2.1-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
+    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp2.1-Debug;netcoreapp2.1-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System.Data.SqlClient.cs" />
     <Compile Include="System.Data.SqlClient.Forwards.cs" />
-    <Compile Condition="'$(TargetsNetFx)' != 'true'" Include="System.Data.SqlClient.Manual.cs" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
+    <Compile Include="System.Data.SqlClient.Manual.cs" />
     <Compile Include="System.Data.SqlClient.NetCoreApp.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetsNetFx)' == 'true'">
-    <Reference Include="mscorlib" />
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
   <ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp2.1'">
     <Reference Include="System.Runtime" />
     <Reference Include="System.Runtime.Extensions" />
diff --git a/src/libraries/System.Data.SqlClient/src/Configurations.props b/src/libraries/System.Data.SqlClient/src/Configurations.props
index 525709d..c1bd342 100644
--- a/src/libraries/System.Data.SqlClient/src/Configurations.props
+++ b/src/libraries/System.Data.SqlClient/src/Configurations.props
@@ -3,10 +3,6 @@
     <PackageConfigurations>
       netstandard2.0-Unix;
       netstandard2.0-Windows_NT;
-      netstandard1.2;
-      netstandard1.3;
-      netstandard2.0;
-      net461-Windows_NT;
       netcoreapp2.1;
       netcoreapp2.1-Unix;
       netcoreapp2.1-Windows_NT;
@@ -16,7 +12,7 @@
       netcoreapp;
       netcoreapp-Unix;
       netcoreapp-Windows_NT;
-      netfx-Windows_NT;
+      _netfx-Windows_NT;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Data.SqlClient/src/System.Data.SqlClient.csproj b/src/libraries/System.Data.SqlClient/src/System.Data.SqlClient.csproj
index 2668375..6a976b2 100644
--- a/src/libraries/System.Data.SqlClient/src/System.Data.SqlClient.csproj
+++ b/src/libraries/System.Data.SqlClient/src/System.Data.SqlClient.csproj
@@ -3,14 +3,13 @@
     <AssemblyName>System.Data.SqlClient</AssemblyName>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn);CS1573;nullable</NoWarn>
-    <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
     <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(OSGroup)' == 'AnyOS'">SR.PlatformNotSupported_DataSqlClient</GeneratePlatformNotSupportedAssemblyMessage>
-    <AssemblyVersion Condition="'$(TargetGroup)' == 'netstandard1.2'">4.0.0.0</AssemblyVersion>
-    <AssemblyVersion Condition="'$(TargetGroup)' == 'netstandard1.3'">4.1.0.0</AssemblyVersion>
+    <AssemblyVersion Condition="'$(TargetGroup)' == 'netstandard2.0'">4.6.0.0</AssemblyVersion>
     <DefineConstants Condition="'$(TargetsNetCoreApp)' != 'true'">$(DefineConstants);NETSTANDARD2_0</DefineConstants>
     <DefineConstants Condition="'$(TargetGroup)' == 'netcoreapp'">$(DefineConstants);FEATURE_TCPKEEPALIVE</DefineConstants>
-    <Configurations>net461-Windows_NT-Debug;net461-Windows_NT-Release;netcoreapp-Debug;netcoreapp-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.1-Debug;netcoreapp2.1-Release;netcoreapp2.1-Unix-Debug;netcoreapp2.1-Unix-Release;netcoreapp2.1-Windows_NT-Debug;netcoreapp2.1-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard2.0-Debug;netstandard2.0-Release;netstandard2.0-Unix-Debug;netstandard2.0-Unix-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release;netstandard1.2-Debug;netstandard1.2-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations>
     <Nullable>annotations</Nullable>
+    <DefineConstants Condition="'$(TargetGroup)' != 'netcoreapp'">$(DefineConstants);INTERNAL_NULLABLE_ATTRIBUTES</DefineConstants>
+    <Configurations>netcoreapp-Debug;netcoreapp-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.1-Debug;netcoreapp2.1-Release;netcoreapp2.1-Unix-Debug;netcoreapp2.1-Unix-Release;netcoreapp2.1-Windows_NT-Debug;netcoreapp2.1-Windows_NT-Release;netstandard2.0-Unix-Debug;netstandard2.0-Unix-Release;netstandard2.0-Windows_NT-Debug;netstandard2.0-Windows_NT-Release;</Configurations>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetsNetCoreApp)' == 'true'">
     <Compile Include="System.Data.SqlClient.TypeForwards.cs" />
@@ -552,10 +551,6 @@
     <Reference Include="System.Collections.NonGeneric" />
     <Reference Include="System.ComponentModel.TypeConverter" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetsNetFx)' == 'true'">
-    <Reference Include="mscorlib" />
-    <Reference Include="System.Data" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\System.Data.SqlClient.SqlMetaData.xml">
       <LogicalName>System.Data.SqlClient.SqlMetaData.xml</LogicalName>
diff --git a/src/libraries/System.Diagnostics.Contracts/Directory.Build.props b/src/libraries/System.Diagnostics.Contracts/Directory.Build.props
index 359b316..5f6e490 100644
--- a/src/libraries/System.Diagnostics.Contracts/Directory.Build.props
+++ b/src/libraries/System.Diagnostics.Contracts/Directory.Build.props
@@ -1,7 +1,6 @@
-<Project>
+<Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.3.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Diagnostics.Debug/Directory.Build.props b/src/libraries/System.Diagnostics.Debug/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Diagnostics.Debug/Directory.Build.props
+++ b/src/libraries/System.Diagnostics.Debug/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/Directory.Build.props b/src/libraries/System.Diagnostics.DiagnosticSource/Directory.Build.props
index e3343ce..2b9e284 100644
--- a/src/libraries/System.Diagnostics.DiagnosticSource/Directory.Build.props
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Diagnostics.EventLog/Directory.Build.props b/src/libraries/System.Diagnostics.EventLog/Directory.Build.props
index 7549428..bdcfca3 100644
--- a/src/libraries/System.Diagnostics.EventLog/Directory.Build.props
+++ b/src/libraries/System.Diagnostics.EventLog/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/Directory.Build.props b/src/libraries/System.Diagnostics.FileVersionInfo/Directory.Build.props
index bf938c6..465e111 100644
--- a/src/libraries/System.Diagnostics.FileVersionInfo/Directory.Build.props
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.3.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/Directory.Build.props b/src/libraries/System.Diagnostics.PerformanceCounter/Directory.Build.props
index 7549428..bdcfca3 100644
--- a/src/libraries/System.Diagnostics.PerformanceCounter/Directory.Build.props
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Diagnostics.Process/Directory.Build.props b/src/libraries/System.Diagnostics.Process/Directory.Build.props
index 42479cd..465e111 100644
--- a/src/libraries/System.Diagnostics.Process/Directory.Build.props
+++ b/src/libraries/System.Diagnostics.Process/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Diagnostics.StackTrace/Directory.Build.props b/src/libraries/System.Diagnostics.StackTrace/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Diagnostics.StackTrace/Directory.Build.props
+++ b/src/libraries/System.Diagnostics.StackTrace/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/Directory.Build.props b/src/libraries/System.Diagnostics.TextWriterTraceListener/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/Directory.Build.props
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Diagnostics.Tools/Directory.Build.props b/src/libraries/System.Diagnostics.Tools/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Diagnostics.Tools/Directory.Build.props
+++ b/src/libraries/System.Diagnostics.Tools/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Diagnostics.TraceSource/Directory.Build.props b/src/libraries/System.Diagnostics.TraceSource/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Diagnostics.TraceSource/Directory.Build.props
+++ b/src/libraries/System.Diagnostics.TraceSource/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Diagnostics.Tracing/Directory.Build.props b/src/libraries/System.Diagnostics.Tracing/Directory.Build.props
index 42479cd..465e111 100644
--- a/src/libraries/System.Diagnostics.Tracing/Directory.Build.props
+++ b/src/libraries/System.Diagnostics.Tracing/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Drawing.Common/Directory.Build.props b/src/libraries/System.Drawing.Common/Directory.Build.props
index 7549428..bdcfca3 100644
--- a/src/libraries/System.Drawing.Common/Directory.Build.props
+++ b/src/libraries/System.Drawing.Common/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Drawing.Primitives/Directory.Build.props b/src/libraries/System.Drawing.Primitives/Directory.Build.props
index 1d05699..465e111 100644
--- a/src/libraries/System.Drawing.Primitives/Directory.Build.props
+++ b/src/libraries/System.Drawing.Primitives/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.0.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Dynamic.Runtime/Directory.Build.props b/src/libraries/System.Dynamic.Runtime/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Dynamic.Runtime/Directory.Build.props
+++ b/src/libraries/System.Dynamic.Runtime/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Globalization.Calendars/Directory.Build.props b/src/libraries/System.Globalization.Calendars/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Globalization.Calendars/Directory.Build.props
+++ b/src/libraries/System.Globalization.Calendars/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Globalization.Extensions/Directory.Build.props b/src/libraries/System.Globalization.Extensions/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Globalization.Extensions/Directory.Build.props
+++ b/src/libraries/System.Globalization.Extensions/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Globalization/Directory.Build.props b/src/libraries/System.Globalization/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Globalization/Directory.Build.props
+++ b/src/libraries/System.Globalization/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.IO.Compression.Brotli/Directory.Build.props b/src/libraries/System.IO.Compression.Brotli/Directory.Build.props
index 0e1b263..aa25926 100644
--- a/src/libraries/System.IO.Compression.Brotli/Directory.Build.props
+++ b/src/libraries/System.IO.Compression.Brotli/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <StrongNameKeyId>ECMA</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.IO.Compression.ZipFile/Directory.Build.props b/src/libraries/System.IO.Compression.ZipFile/Directory.Build.props
index 9a4f4b8..aa25926 100644
--- a/src/libraries/System.IO.Compression.ZipFile/Directory.Build.props
+++ b/src/libraries/System.IO.Compression.ZipFile/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <StrongNameKeyId>ECMA</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.IO.Compression/Directory.Build.props b/src/libraries/System.IO.Compression/Directory.Build.props
index 0e1b263..aa25926 100644
--- a/src/libraries/System.IO.Compression/Directory.Build.props
+++ b/src/libraries/System.IO.Compression/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <StrongNameKeyId>ECMA</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.IO.FileSystem.AccessControl/Directory.Build.props b/src/libraries/System.IO.FileSystem.AccessControl/Directory.Build.props
index 9b21453..8c72c62 100644
--- a/src/libraries/System.IO.FileSystem.AccessControl/Directory.Build.props
+++ b/src/libraries/System.IO.FileSystem.AccessControl/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
     <IsNETCoreAppRef>false</IsNETCoreAppRef>
diff --git a/src/libraries/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.pkgproj b/src/libraries/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.pkgproj
index 4c16d5c..387aa53 100644
--- a/src/libraries/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.pkgproj
+++ b/src/libraries/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.pkgproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.IO.FileSystem.AccessControl.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.IO.FileSystem.AccessControl.csproj" />
     <HarvestIncludePaths Include="ref/net46;lib/net46;runtimes/win/lib/net46" />
diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/Directory.Build.props b/src/libraries/System.IO.FileSystem.DriveInfo/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.IO.FileSystem.DriveInfo/Directory.Build.props
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.IO.FileSystem.Primitives/Directory.Build.props b/src/libraries/System.IO.FileSystem.Primitives/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.IO.FileSystem.Primitives/Directory.Build.props
+++ b/src/libraries/System.IO.FileSystem.Primitives/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.IO.FileSystem.Watcher/Directory.Build.props b/src/libraries/System.IO.FileSystem.Watcher/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.IO.FileSystem.Watcher/Directory.Build.props
+++ b/src/libraries/System.IO.FileSystem.Watcher/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.IO.FileSystem/Directory.Build.props b/src/libraries/System.IO.FileSystem/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.IO.FileSystem/Directory.Build.props
+++ b/src/libraries/System.IO.FileSystem/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.IO.IsolatedStorage/Directory.Build.props b/src/libraries/System.IO.IsolatedStorage/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.IO.IsolatedStorage/Directory.Build.props
+++ b/src/libraries/System.IO.IsolatedStorage/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.IO.MemoryMappedFiles/Directory.Build.props b/src/libraries/System.IO.MemoryMappedFiles/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.IO.MemoryMappedFiles/Directory.Build.props
+++ b/src/libraries/System.IO.MemoryMappedFiles/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.IO.Packaging/Directory.Build.props b/src/libraries/System.IO.Packaging/Directory.Build.props
index 98004a4..63f02a0 100644
--- a/src/libraries/System.IO.Packaging/Directory.Build.props
+++ b/src/libraries/System.IO.Packaging/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO.Pipelines/Directory.Build.props b/src/libraries/System.IO.Pipelines/Directory.Build.props
index 7549428..bdcfca3 100644
--- a/src/libraries/System.IO.Pipelines/Directory.Build.props
+++ b/src/libraries/System.IO.Pipelines/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO.Pipes.AccessControl/Directory.Build.props b/src/libraries/System.IO.Pipes.AccessControl/Directory.Build.props
index 9b21453..8c72c62 100644
--- a/src/libraries/System.IO.Pipes.AccessControl/Directory.Build.props
+++ b/src/libraries/System.IO.Pipes.AccessControl/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
     <IsNETCoreAppRef>false</IsNETCoreAppRef>
diff --git a/src/libraries/System.IO.Pipes/Directory.Build.props b/src/libraries/System.IO.Pipes/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.IO.Pipes/Directory.Build.props
+++ b/src/libraries/System.IO.Pipes/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.IO.Ports/Directory.Build.props b/src/libraries/System.IO.Ports/Directory.Build.props
index c63e87e..bdcfca3 100644
--- a/src/libraries/System.IO.Ports/Directory.Build.props
+++ b/src/libraries/System.IO.Ports/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.2.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.IO.Ports/pkg/System.IO.Ports.pkgproj b/src/libraries/System.IO.Ports/pkg/System.IO.Ports.pkgproj
index 949f751..4cd234f 100644
--- a/src/libraries/System.IO.Ports/pkg/System.IO.Ports.pkgproj
+++ b/src/libraries/System.IO.Ports/pkg/System.IO.Ports.pkgproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.IO.Ports.csproj">
-      <SupportedFramework>net461</SupportedFramework>
+      <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <File Include="$(PlaceHolderFile)">
       <TargetPath>runtimes/win/lib/uap10.0.16299</TargetPath>
diff --git a/src/libraries/System.IO.Ports/ref/System.IO.Ports.csproj b/src/libraries/System.IO.Ports/ref/System.IO.Ports.csproj
index 48c778b..a258b76 100644
--- a/src/libraries/System.IO.Ports/ref/System.IO.Ports.csproj
+++ b/src/libraries/System.IO.Ports/ref/System.IO.Ports.csproj
@@ -1,9 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <!-- Must match version supported by frameworks which support 4.0.* inbox.
-         Can be removed when API is added and this assembly is versioned to 4.1.* -->
-    <AssemblyVersion Condition="'$(TargetsNetFx)' != 'true'">4.0.1.0</AssemblyVersion>
     <Configurations>net461-Debug;net461-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/Directory.Build.props b/src/libraries/System.IO.UnmanagedMemoryStream/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.IO.UnmanagedMemoryStream/Directory.Build.props
+++ b/src/libraries/System.IO.UnmanagedMemoryStream/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.IO/Directory.Build.props b/src/libraries/System.IO/Directory.Build.props
index 42479cd..465e111 100644
--- a/src/libraries/System.IO/Directory.Build.props
+++ b/src/libraries/System.IO/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Json/Directory.Build.props b/src/libraries/System.Json/Directory.Build.props
index 0e398ea8..bdcfca3 100644
--- a/src/libraries/System.Json/Directory.Build.props
+++ b/src/libraries/System.Json/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>2.0.7.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Linq.Expressions/Directory.Build.props b/src/libraries/System.Linq.Expressions/Directory.Build.props
index 42479cd..465e111 100644
--- a/src/libraries/System.Linq.Expressions/Directory.Build.props
+++ b/src/libraries/System.Linq.Expressions/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Linq.Parallel/Directory.Build.props b/src/libraries/System.Linq.Parallel/Directory.Build.props
index 359b316..5f6e490 100644
--- a/src/libraries/System.Linq.Parallel/Directory.Build.props
+++ b/src/libraries/System.Linq.Parallel/Directory.Build.props
@@ -1,7 +1,6 @@
-<Project>
+<Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.3.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Linq.Queryable/Directory.Build.props b/src/libraries/System.Linq.Queryable/Directory.Build.props
index 359b316..5f6e490 100644
--- a/src/libraries/System.Linq.Queryable/Directory.Build.props
+++ b/src/libraries/System.Linq.Queryable/Directory.Build.props
@@ -1,7 +1,6 @@
-<Project>
+<Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.3.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Linq/Directory.Build.props b/src/libraries/System.Linq/Directory.Build.props
index 42479cd..465e111 100644
--- a/src/libraries/System.Linq/Directory.Build.props
+++ b/src/libraries/System.Linq/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Memory/Directory.Build.props b/src/libraries/System.Memory/Directory.Build.props
index 505eba1..749d7fc 100644
--- a/src/libraries/System.Memory/Directory.Build.props
+++ b/src/libraries/System.Memory/Directory.Build.props
@@ -1,9 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <!-- System.Memory has forwarded types into the runtime on netcoreapp.
-         It must win over assemblies versioned at 4.0.* -->
-    <AssemblyVersion>4.2.0.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/Directory.Build.props b/src/libraries/System.Net.Http.WinHttpHandler/Directory.Build.props
index 98004a4..63f02a0 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/Directory.Build.props
+++ b/src/libraries/System.Net.Http.WinHttpHandler/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj b/src/libraries/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj
index 3c96d30..c4abaca 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj
+++ b/src/libraries/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.pkgproj
@@ -5,7 +5,7 @@
       <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Net.Http.WinHttpHandler.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <HarvestIncludePaths Include="lib/net46;runtimes/win/lib/net46" />
     <HarvestIncludePaths Include="runtimes/win/lib/netstandard1.3;lib/netstandard1.3" />
diff --git a/src/libraries/System.Net.Http/Directory.Build.props b/src/libraries/System.Net.Http/Directory.Build.props
index 42479cd..465e111 100644
--- a/src/libraries/System.Net.Http/Directory.Build.props
+++ b/src/libraries/System.Net.Http/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Net.HttpListener/Directory.Build.props b/src/libraries/System.Net.HttpListener/Directory.Build.props
index 1bf23a4..2b9e284 100644
--- a/src/libraries/System.Net.HttpListener/Directory.Build.props
+++ b/src/libraries/System.Net.HttpListener/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Net.Mail/Directory.Build.props b/src/libraries/System.Net.Mail/Directory.Build.props
index 1bf23a4..2b9e284 100644
--- a/src/libraries/System.Net.Mail/Directory.Build.props
+++ b/src/libraries/System.Net.Mail/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Net.NameResolution/Directory.Build.props b/src/libraries/System.Net.NameResolution/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Net.NameResolution/Directory.Build.props
+++ b/src/libraries/System.Net.NameResolution/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Net.NetworkInformation/Directory.Build.props b/src/libraries/System.Net.NetworkInformation/Directory.Build.props
index 42479cd..465e111 100644
--- a/src/libraries/System.Net.NetworkInformation/Directory.Build.props
+++ b/src/libraries/System.Net.NetworkInformation/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Net.Ping/Directory.Build.props b/src/libraries/System.Net.Ping/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Net.Ping/Directory.Build.props
+++ b/src/libraries/System.Net.Ping/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Net.Primitives/Directory.Build.props b/src/libraries/System.Net.Primitives/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Net.Primitives/Directory.Build.props
+++ b/src/libraries/System.Net.Primitives/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Net.Requests/Directory.Build.props b/src/libraries/System.Net.Requests/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Net.Requests/Directory.Build.props
+++ b/src/libraries/System.Net.Requests/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Net.Security/Directory.Build.props b/src/libraries/System.Net.Security/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Net.Security/Directory.Build.props
+++ b/src/libraries/System.Net.Security/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Net.ServicePoint/Directory.Build.props b/src/libraries/System.Net.ServicePoint/Directory.Build.props
index 1bf23a4..2b9e284 100644
--- a/src/libraries/System.Net.ServicePoint/Directory.Build.props
+++ b/src/libraries/System.Net.ServicePoint/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Net.Sockets/Directory.Build.props b/src/libraries/System.Net.Sockets/Directory.Build.props
index 42479cd..465e111 100644
--- a/src/libraries/System.Net.Sockets/Directory.Build.props
+++ b/src/libraries/System.Net.Sockets/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Net.WebClient/Directory.Build.props b/src/libraries/System.Net.WebClient/Directory.Build.props
index 1bf23a4..2b9e284 100644
--- a/src/libraries/System.Net.WebClient/Directory.Build.props
+++ b/src/libraries/System.Net.WebClient/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Net.WebHeaderCollection/Directory.Build.props b/src/libraries/System.Net.WebHeaderCollection/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Net.WebHeaderCollection/Directory.Build.props
+++ b/src/libraries/System.Net.WebHeaderCollection/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Net.WebProxy/Directory.Build.props b/src/libraries/System.Net.WebProxy/Directory.Build.props
index 1bf23a4..2b9e284 100644
--- a/src/libraries/System.Net.WebProxy/Directory.Build.props
+++ b/src/libraries/System.Net.WebProxy/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Net.WebSockets.Client/Directory.Build.props b/src/libraries/System.Net.WebSockets.Client/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Net.WebSockets.Client/Directory.Build.props
+++ b/src/libraries/System.Net.WebSockets.Client/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Net.WebSockets.WebSocketProtocol/Directory.Build.props b/src/libraries/System.Net.WebSockets.WebSocketProtocol/Directory.Build.props
index 7549428..bdcfca3 100644
--- a/src/libraries/System.Net.WebSockets.WebSocketProtocol/Directory.Build.props
+++ b/src/libraries/System.Net.WebSockets.WebSocketProtocol/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Net.WebSockets/Directory.Build.props b/src/libraries/System.Net.WebSockets/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Net.WebSockets/Directory.Build.props
+++ b/src/libraries/System.Net.WebSockets/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Numerics.Tensors/Directory.Build.props b/src/libraries/System.Numerics.Tensors/Directory.Build.props
index 3a570b1..da68fe2 100644
--- a/src/libraries/System.Numerics.Tensors/Directory.Build.props
+++ b/src/libraries/System.Numerics.Tensors/Directory.Build.props
@@ -1,10 +1,9 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>0.2.0.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <!-- This is a preview package. Do not mark as stable. -->
     <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
     <IsShippingAssembly>false</IsShippingAssembly>
   </PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.Numerics.Vectors/Directory.Build.props b/src/libraries/System.Numerics.Vectors/Directory.Build.props
index 0616336..465e111 100644
--- a/src/libraries/System.Numerics.Vectors/Directory.Build.props
+++ b/src/libraries/System.Numerics.Vectors/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.5.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.ObjectModel/Directory.Build.props b/src/libraries/System.ObjectModel/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.ObjectModel/Directory.Build.props
+++ b/src/libraries/System.ObjectModel/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Private.DataContractSerialization/Directory.Build.props b/src/libraries/System.Private.DataContractSerialization/Directory.Build.props
index 55e8fdd..8c72c62 100644
--- a/src/libraries/System.Private.DataContractSerialization/Directory.Build.props
+++ b/src/libraries/System.Private.DataContractSerialization/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
     <IsNETCoreAppRef>false</IsNETCoreAppRef>
diff --git a/src/libraries/System.Private.Uri/Directory.Build.props b/src/libraries/System.Private.Uri/Directory.Build.props
index a648a80..465e111 100644
--- a/src/libraries/System.Private.Uri/Directory.Build.props
+++ b/src/libraries/System.Private.Uri/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.5.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Private.Xml.Linq/Directory.Build.props b/src/libraries/System.Private.Xml.Linq/Directory.Build.props
index 7bbc6a9..05cc2bd 100644
--- a/src/libraries/System.Private.Xml.Linq/Directory.Build.props
+++ b/src/libraries/System.Private.Xml.Linq/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
     <IsNETCoreAppRef>false</IsNETCoreAppRef>
diff --git a/src/libraries/System.Private.Xml/Directory.Build.props b/src/libraries/System.Private.Xml/Directory.Build.props
index 7bbc6a9..05cc2bd 100644
--- a/src/libraries/System.Private.Xml/Directory.Build.props
+++ b/src/libraries/System.Private.Xml/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
     <IsNETCoreAppRef>false</IsNETCoreAppRef>
diff --git a/src/libraries/System.Reflection.Context/Directory.Build.props b/src/libraries/System.Reflection.Context/Directory.Build.props
index 14f75a5..ed15ad0 100644
--- a/src/libraries/System.Reflection.Context/Directory.Build.props
+++ b/src/libraries/System.Reflection.Context/Directory.Build.props
@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.3.0</AssemblyVersion>
diff --git a/src/libraries/System.Reflection.DispatchProxy/Directory.Build.props b/src/libraries/System.Reflection.DispatchProxy/Directory.Build.props
index a648a80..465e111 100644
--- a/src/libraries/System.Reflection.DispatchProxy/Directory.Build.props
+++ b/src/libraries/System.Reflection.DispatchProxy/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.5.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/Directory.Build.props b/src/libraries/System.Reflection.Emit.ILGeneration/Directory.Build.props
index d3c0087..e77934b 100644
--- a/src/libraries/System.Reflection.Emit.ILGeneration/Directory.Build.props
+++ b/src/libraries/System.Reflection.Emit.ILGeneration/Directory.Build.props
@@ -1,7 +1,6 @@
-<Project>
+<Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <AssemblyVersion Condition="'$(TargetsNetStandard)' == 'true'">4.0.0.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
diff --git a/src/libraries/System.Reflection.Emit.Lightweight/Directory.Build.props b/src/libraries/System.Reflection.Emit.Lightweight/Directory.Build.props
index d3c0087..e77934b 100644
--- a/src/libraries/System.Reflection.Emit.Lightweight/Directory.Build.props
+++ b/src/libraries/System.Reflection.Emit.Lightweight/Directory.Build.props
@@ -1,7 +1,6 @@
-<Project>
+<Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <AssemblyVersion Condition="'$(TargetsNetStandard)' == 'true'">4.0.0.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
diff --git a/src/libraries/System.Reflection.Emit/Directory.Build.props b/src/libraries/System.Reflection.Emit/Directory.Build.props
index f7e7d27..e77934b 100644
--- a/src/libraries/System.Reflection.Emit/Directory.Build.props
+++ b/src/libraries/System.Reflection.Emit/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <AssemblyVersion Condition="'$(TargetsNetStandard)' == 'true'">4.0.0.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
diff --git a/src/libraries/System.Reflection.Extensions/Directory.Build.props b/src/libraries/System.Reflection.Extensions/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Reflection.Extensions/Directory.Build.props
+++ b/src/libraries/System.Reflection.Extensions/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Reflection.Metadata/Directory.Build.props b/src/libraries/System.Reflection.Metadata/Directory.Build.props
index f969f45..465e111 100644
--- a/src/libraries/System.Reflection.Metadata/Directory.Build.props
+++ b/src/libraries/System.Reflection.Metadata/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>1.4.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Reflection.MetadataLoadContext/Directory.Build.props b/src/libraries/System.Reflection.MetadataLoadContext/Directory.Build.props
index aa74bf5..ba1f965 100644
--- a/src/libraries/System.Reflection.MetadataLoadContext/Directory.Build.props
+++ b/src/libraries/System.Reflection.MetadataLoadContext/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
 </Project>
diff --git a/src/libraries/System.Reflection.Primitives/Directory.Build.props b/src/libraries/System.Reflection.Primitives/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Reflection.Primitives/Directory.Build.props
+++ b/src/libraries/System.Reflection.Primitives/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Reflection.TypeExtensions/Directory.Build.props b/src/libraries/System.Reflection.TypeExtensions/Directory.Build.props
index a1cca7a..465e111 100644
--- a/src/libraries/System.Reflection.TypeExtensions/Directory.Build.props
+++ b/src/libraries/System.Reflection.TypeExtensions/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj b/src/libraries/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj
index cb0f246..d261f9e 100644
--- a/src/libraries/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj
+++ b/src/libraries/System.Reflection.TypeExtensions/ref/System.Reflection.TypeExtensions.csproj
@@ -1,8 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <!-- Must match version supported by frameworks which support 4.1.* inbox.
-         Can be removed when API is added and this assembly is versioned to 4.2.* -->
-    <AssemblyVersion Condition="'$(TargetsNetFx)' != 'true'">4.1.2.0</AssemblyVersion>
     <Nullable>enable</Nullable>
     <Configurations>net461-Debug;net461-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
diff --git a/src/libraries/System.Reflection/Directory.Build.props b/src/libraries/System.Reflection/Directory.Build.props
index 42479cd..465e111 100644
--- a/src/libraries/System.Reflection/Directory.Build.props
+++ b/src/libraries/System.Reflection/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Resources.Extensions/Directory.Build.props b/src/libraries/System.Resources.Extensions/Directory.Build.props
index c8c6511..bdcfca3 100644
--- a/src/libraries/System.Resources.Extensions/Directory.Build.props
+++ b/src/libraries/System.Resources.Extensions/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj b/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj
index c58af73..cee9e53 100644
--- a/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj
+++ b/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj
@@ -3,8 +3,6 @@
     <Configurations>netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release</Configurations>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
   </PropertyGroup>
-  <PropertyGroup>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="MyResourceType.cs" />
     <Compile Include="TestData.cs" />
@@ -16,7 +14,7 @@
       <Link>TypeNameComparer.cs</Link>
     </Compile>
     <Compile Include="TypeNameComparerTests.cs" />
-    <EmbeddedResource Include="TestData.resources" WithCulture="false" Type="Non-Resx" />
+    <EmbeddedResource Include="TestData.resources" WithCulture="false" Type="Non-Resx" LogicalName="$(RootNamespace).%(FileName)%(Extension)" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="System.Drawing.Common.TestData" Version="$(SystemDrawingCommonTestDataVersion)" />    
diff --git a/src/libraries/System.Resources.Extensions/tests/TestData.resources b/src/libraries/System.Resources.Extensions/tests/TestData.resources
index 6ec607baca9d7886ae88df4e7af53bed5cbb35d9..b2f4b4cd1928883e15073f7033e78217b6800728 100644
GIT binary patch
delta 18
acmexi|HFR66=p`$$%3pJoBuNZmIeS%+6Tq}

delta 15
Xcmexi|HFR673PUKmYaE5UP}W2Kne!-

diff --git a/src/libraries/System.Resources.Reader/Directory.Build.props b/src/libraries/System.Resources.Reader/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Resources.Reader/Directory.Build.props
+++ b/src/libraries/System.Resources.Reader/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Resources.ResourceManager/Directory.Build.props b/src/libraries/System.Resources.ResourceManager/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Resources.ResourceManager/Directory.Build.props
+++ b/src/libraries/System.Resources.ResourceManager/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Resources.Writer/Directory.Build.props b/src/libraries/System.Resources.Writer/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Resources.Writer/Directory.Build.props
+++ b/src/libraries/System.Resources.Writer/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Runtime.CompilerServices.VisualC/Directory.Build.props b/src/libraries/System.Runtime.CompilerServices.VisualC/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Runtime.CompilerServices.VisualC/Directory.Build.props
+++ b/src/libraries/System.Runtime.CompilerServices.VisualC/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Runtime.Extensions/Directory.Build.props b/src/libraries/System.Runtime.Extensions/Directory.Build.props
index 42479cd..465e111 100644
--- a/src/libraries/System.Runtime.Extensions/Directory.Build.props
+++ b/src/libraries/System.Runtime.Extensions/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Runtime.Handles/Directory.Build.props b/src/libraries/System.Runtime.Handles/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Runtime.Handles/Directory.Build.props
+++ b/src/libraries/System.Runtime.Handles/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/Directory.Build.props b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/Directory.Build.props
index bf938c6..465e111 100644
--- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/Directory.Build.props
+++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.3.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/Directory.Build.props b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/Directory.Build.props
index 359b316..5f6e490 100644
--- a/src/libraries/System.Runtime.InteropServices.WindowsRuntime/Directory.Build.props
+++ b/src/libraries/System.Runtime.InteropServices.WindowsRuntime/Directory.Build.props
@@ -1,7 +1,6 @@
-<Project>
+<Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.3.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Runtime.InteropServices/Directory.Build.props b/src/libraries/System.Runtime.InteropServices/Directory.Build.props
index 42479cd..465e111 100644
--- a/src/libraries/System.Runtime.InteropServices/Directory.Build.props
+++ b/src/libraries/System.Runtime.InteropServices/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Runtime.Intrinsics.Experimental/Directory.Build.props b/src/libraries/System.Runtime.Intrinsics.Experimental/Directory.Build.props
index aa74bf5..ba1f965 100644
--- a/src/libraries/System.Runtime.Intrinsics.Experimental/Directory.Build.props
+++ b/src/libraries/System.Runtime.Intrinsics.Experimental/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
 </Project>
diff --git a/src/libraries/System.Runtime.Intrinsics/Directory.Build.props b/src/libraries/System.Runtime.Intrinsics/Directory.Build.props
index 107531f..9f52a8a 100644
--- a/src/libraries/System.Runtime.Intrinsics/Directory.Build.props
+++ b/src/libraries/System.Runtime.Intrinsics/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <IsNETCoreApp>true</IsNETCoreApp>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
diff --git a/src/libraries/System.Runtime.Loader/Directory.Build.props b/src/libraries/System.Runtime.Loader/Directory.Build.props
index cdd8d84..5f6e490 100644
--- a/src/libraries/System.Runtime.Loader/Directory.Build.props
+++ b/src/libraries/System.Runtime.Loader/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Runtime.Numerics/Directory.Build.props b/src/libraries/System.Runtime.Numerics/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Runtime.Numerics/Directory.Build.props
+++ b/src/libraries/System.Runtime.Numerics/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Runtime.Serialization.Formatters/Directory.Build.props b/src/libraries/System.Runtime.Serialization.Formatters/Directory.Build.props
index bf938c6..465e111 100644
--- a/src/libraries/System.Runtime.Serialization.Formatters/Directory.Build.props
+++ b/src/libraries/System.Runtime.Serialization.Formatters/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.3.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Runtime.Serialization.Json/Directory.Build.props b/src/libraries/System.Runtime.Serialization.Json/Directory.Build.props
index a37afe1..5f6e490 100644
--- a/src/libraries/System.Runtime.Serialization.Json/Directory.Build.props
+++ b/src/libraries/System.Runtime.Serialization.Json/Directory.Build.props
@@ -1,7 +1,6 @@
-<Project>
+<Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Runtime.Serialization.Primitives/Directory.Build.props b/src/libraries/System.Runtime.Serialization.Primitives/Directory.Build.props
index 42479cd..465e111 100644
--- a/src/libraries/System.Runtime.Serialization.Primitives/Directory.Build.props
+++ b/src/libraries/System.Runtime.Serialization.Primitives/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Runtime.Serialization.Xml/Directory.Build.props b/src/libraries/System.Runtime.Serialization.Xml/Directory.Build.props
index a1cca7a..465e111 100644
--- a/src/libraries/System.Runtime.Serialization.Xml/Directory.Build.props
+++ b/src/libraries/System.Runtime.Serialization.Xml/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Runtime/Directory.Build.props b/src/libraries/System.Runtime/Directory.Build.props
index 42479cd..465e111 100644
--- a/src/libraries/System.Runtime/Directory.Build.props
+++ b/src/libraries/System.Runtime/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Security.AccessControl/Directory.Build.props b/src/libraries/System.Security.AccessControl/Directory.Build.props
index 7de773a..8c72c62 100644
--- a/src/libraries/System.Security.AccessControl/Directory.Build.props
+++ b/src/libraries/System.Security.AccessControl/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.2.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
     <IsNETCoreAppRef>false</IsNETCoreAppRef>
diff --git a/src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj b/src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj
index 8d79f40..c6f709c 100644
--- a/src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj
+++ b/src/libraries/System.Security.AccessControl/pkg/System.Security.AccessControl.pkgproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Security.AccessControl.csproj">
-      <SupportedFramework>net461</SupportedFramework>
+      <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <File Include="$(PlaceHolderFile)">
       <TargetPath>runtimes/win/lib/uap10.0.16299</TargetPath>
diff --git a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj
index 4b18b39..9a9a247 100644
--- a/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj
+++ b/src/libraries/System.Security.AccessControl/ref/System.Security.AccessControl.csproj
@@ -1,9 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <!-- Must match version supported by frameworks which support 4.1.* inbox.
-         Can be removed when API is added and this assembly is versioned to 4.2.* -->
-    <AssemblyVersion Condition="'$(TargetsNetFx)' != 'true'">4.1.1.0</AssemblyVersion>
     <Configurations>net461-Debug;net461-Release;netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Security.Claims/Directory.Build.props b/src/libraries/System.Security.Claims/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Security.Claims/Directory.Build.props
+++ b/src/libraries/System.Security.Claims/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Security.Cryptography.Algorithms/Directory.Build.props b/src/libraries/System.Security.Cryptography.Algorithms/Directory.Build.props
index 29b5e44..465e111 100644
--- a/src/libraries/System.Security.Cryptography.Algorithms/Directory.Build.props
+++ b/src/libraries/System.Security.Cryptography.Algorithms/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.3.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Security.Cryptography.Cng/Directory.Build.props b/src/libraries/System.Security.Cryptography.Cng/Directory.Build.props
index 0201026..8c72c62 100644
--- a/src/libraries/System.Security.Cryptography.Cng/Directory.Build.props
+++ b/src/libraries/System.Security.Cryptography.Cng/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.3.2.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
     <IsNETCoreAppRef>false</IsNETCoreAppRef>
diff --git a/src/libraries/System.Security.Cryptography.Csp/Directory.Build.props b/src/libraries/System.Security.Cryptography.Csp/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Security.Cryptography.Csp/Directory.Build.props
+++ b/src/libraries/System.Security.Cryptography.Csp/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Security.Cryptography.Encoding/Directory.Build.props b/src/libraries/System.Security.Cryptography.Encoding/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Security.Cryptography.Encoding/Directory.Build.props
+++ b/src/libraries/System.Security.Cryptography.Encoding/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/Directory.Build.props b/src/libraries/System.Security.Cryptography.OpenSsl/Directory.Build.props
index 7de773a..8c72c62 100644
--- a/src/libraries/System.Security.Cryptography.OpenSsl/Directory.Build.props
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.2.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
     <IsNETCoreAppRef>false</IsNETCoreAppRef>
diff --git a/src/libraries/System.Security.Cryptography.Pkcs/Directory.Build.props b/src/libraries/System.Security.Cryptography.Pkcs/Directory.Build.props
index a0dc52c..4d5b11e 100644
--- a/src/libraries/System.Security.Cryptography.Pkcs/Directory.Build.props
+++ b/src/libraries/System.Security.Cryptography.Pkcs/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.0.0</AssemblyVersion>
     <!-- Currently the netstandard build is locked to the netfx API -->
     <AssemblyVersion Condition="'$(TargetsNetStandard)' == 'true'">4.0.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
diff --git a/src/libraries/System.Security.Cryptography.Primitives/Directory.Build.props b/src/libraries/System.Security.Cryptography.Primitives/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Security.Cryptography.Primitives/Directory.Build.props
+++ b/src/libraries/System.Security.Cryptography.Primitives/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/Directory.Build.props b/src/libraries/System.Security.Cryptography.ProtectedData/Directory.Build.props
index 98004a4..63f02a0 100644
--- a/src/libraries/System.Security.Cryptography.ProtectedData/Directory.Build.props
+++ b/src/libraries/System.Security.Cryptography.ProtectedData/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/pkg/System.Security.Cryptography.ProtectedData.pkgproj b/src/libraries/System.Security.Cryptography.ProtectedData/pkg/System.Security.Cryptography.ProtectedData.pkgproj
index 16a3059..46c191a 100644
--- a/src/libraries/System.Security.Cryptography.ProtectedData/pkg/System.Security.Cryptography.ProtectedData.pkgproj
+++ b/src/libraries/System.Security.Cryptography.ProtectedData/pkg/System.Security.Cryptography.ProtectedData.pkgproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Security.Cryptography.ProtectedData.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Security.Cryptography.ProtectedData.csproj" />
     <HarvestIncludePaths Include="ref/net46;lib/net46;runtimes/win/lib/net46" />
diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/Directory.Build.props b/src/libraries/System.Security.Cryptography.X509Certificates/Directory.Build.props
index 42479cd..465e111 100644
--- a/src/libraries/System.Security.Cryptography.X509Certificates/Directory.Build.props
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Security.Cryptography.Xml/Directory.Build.props b/src/libraries/System.Security.Cryptography.Xml/Directory.Build.props
index c63e87e..bdcfca3 100644
--- a/src/libraries/System.Security.Cryptography.Xml/Directory.Build.props
+++ b/src/libraries/System.Security.Cryptography.Xml/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.2.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.Cryptography.Xml/pkg/System.Security.Cryptography.Xml.pkgproj b/src/libraries/System.Security.Cryptography.Xml/pkg/System.Security.Cryptography.Xml.pkgproj
index 1e0c6cbb..29869e8 100644
--- a/src/libraries/System.Security.Cryptography.Xml/pkg/System.Security.Cryptography.Xml.pkgproj
+++ b/src/libraries/System.Security.Cryptography.Xml/pkg/System.Security.Cryptography.Xml.pkgproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Security.Cryptography.Xml.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Security.Cryptography.Xml.csproj" />
   </ItemGroup>
diff --git a/src/libraries/System.Security.Permissions/Directory.Build.props b/src/libraries/System.Security.Permissions/Directory.Build.props
index c63e87e..bdcfca3 100644
--- a/src/libraries/System.Security.Permissions/Directory.Build.props
+++ b/src/libraries/System.Security.Permissions/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.2.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Security.Permissions/pkg/System.Security.Permissions.pkgproj b/src/libraries/System.Security.Permissions/pkg/System.Security.Permissions.pkgproj
index 6b60cfc..5bc8367 100644
--- a/src/libraries/System.Security.Permissions/pkg/System.Security.Permissions.pkgproj
+++ b/src/libraries/System.Security.Permissions/pkg/System.Security.Permissions.pkgproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Security.Permissions.csproj">
-      <SupportedFramework>netcoreapp2.0;net461;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>netcoreapp2.0;net461;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Security.Permissions.csproj" />
   </ItemGroup>
diff --git a/src/libraries/System.Security.Principal.Windows/Directory.Build.props b/src/libraries/System.Security.Principal.Windows/Directory.Build.props
index 7de773a..8c72c62 100644
--- a/src/libraries/System.Security.Principal.Windows/Directory.Build.props
+++ b/src/libraries/System.Security.Principal.Windows/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.2.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
     <IsNETCoreAppRef>false</IsNETCoreAppRef>
diff --git a/src/libraries/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj b/src/libraries/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj
index f64a569..dcdf4a7 100644
--- a/src/libraries/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj
+++ b/src/libraries/System.Security.Principal.Windows/pkg/System.Security.Principal.Windows.pkgproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Security.Principal.Windows.csproj">
-      <SupportedFramework>net461</SupportedFramework>
+      <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Security.Principal.Windows.csproj" />
     <File Include="$(PlaceHolderFile)">
diff --git a/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj b/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj
index fb04cde..bd2f40a 100644
--- a/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj
+++ b/src/libraries/System.Security.Principal.Windows/ref/System.Security.Principal.Windows.csproj
@@ -1,9 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPartialFacadeAssembly Condition="'$(TargetsNetFx)' == 'true'">true</IsPartialFacadeAssembly>
-    <!-- Must match version supported by frameworks which support 4.1.* inbox.
-         Can be removed when API is added and this assembly is versioned to 4.2.* -->
-    <AssemblyVersion Condition="'$(TargetsNetFx)' != 'true'">4.1.1.0</AssemblyVersion>
     <Configurations>net461-Debug;net461-Release;netcoreapp-Debug;netcoreapp-Release;netcoreapp3.0-Debug;netcoreapp3.0-Release;netfx-Debug;netfx-Release;netstandard2.0-Debug;netstandard2.0-Release</Configurations>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/libraries/System.Security.Principal/Directory.Build.props b/src/libraries/System.Security.Principal/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Security.Principal/Directory.Build.props
+++ b/src/libraries/System.Security.Principal/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Security.SecureString/Directory.Build.props b/src/libraries/System.Security.SecureString/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Security.SecureString/Directory.Build.props
+++ b/src/libraries/System.Security.SecureString/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.ServiceModel.Syndication/Directory.Build.props b/src/libraries/System.ServiceModel.Syndication/Directory.Build.props
index 7549428..bdcfca3 100644
--- a/src/libraries/System.ServiceModel.Syndication/Directory.Build.props
+++ b/src/libraries/System.ServiceModel.Syndication/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.ServiceProcess.ServiceController/Directory.Build.props b/src/libraries/System.ServiceProcess.ServiceController/Directory.Build.props
index 036c27c..63f02a0 100644
--- a/src/libraries/System.ServiceProcess.ServiceController/Directory.Build.props
+++ b/src/libraries/System.ServiceProcess.ServiceController/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.2.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.pkgproj b/src/libraries/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.pkgproj
index 200a6bd..dcc8b75 100644
--- a/src/libraries/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.pkgproj
+++ b/src/libraries/System.ServiceProcess.ServiceController/pkg/System.ServiceProcess.ServiceController.pkgproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.ServiceProcess.ServiceController.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.ServiceProcess.ServiceController.csproj" />
     <HarvestIncludePaths Include="ref/netstandard1.4">
diff --git a/src/libraries/System.Text.Encoding.CodePages/Directory.Build.props b/src/libraries/System.Text.Encoding.CodePages/Directory.Build.props
index fd766dd..465e111 100644
--- a/src/libraries/System.Text.Encoding.CodePages/Directory.Build.props
+++ b/src/libraries/System.Text.Encoding.CodePages/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.2.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.pkgproj b/src/libraries/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.pkgproj
index d44cbfc..1eedd5b 100644
--- a/src/libraries/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.pkgproj
+++ b/src/libraries/System.Text.Encoding.CodePages/pkg/System.Text.Encoding.CodePages.pkgproj
@@ -4,7 +4,9 @@
     <ProjectReference Include="..\ref\System.Text.Encoding.CodePages.csproj">
       <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
-    <ProjectReference Include="..\src\System.Text.Encoding.CodePages.csproj" />
+    <ProjectReference Include="..\src\System.Text.Encoding.CodePages.csproj">
+      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
+    </ProjectReference>
     <HarvestIncludePaths Include="lib/net46" />
     <HarvestIncludePaths Include="runtimes/win/lib/netstandard1.3;lib/netstandard1.3" />
   </ItemGroup>
diff --git a/src/libraries/System.Text.Encoding.Extensions/Directory.Build.props b/src/libraries/System.Text.Encoding.Extensions/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Text.Encoding.Extensions/Directory.Build.props
+++ b/src/libraries/System.Text.Encoding.Extensions/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Text.Encoding/Directory.Build.props b/src/libraries/System.Text.Encoding/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Text.Encoding/Directory.Build.props
+++ b/src/libraries/System.Text.Encoding/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Text.Encodings.Web/Directory.Build.props b/src/libraries/System.Text.Encodings.Web/Directory.Build.props
index e3343ce..2b9e284 100644
--- a/src/libraries/System.Text.Encodings.Web/Directory.Build.props
+++ b/src/libraries/System.Text.Encodings.Web/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Text.Encodings.Web/pkg/System.Text.Encodings.Web.pkgproj b/src/libraries/System.Text.Encodings.Web/pkg/System.Text.Encodings.Web.pkgproj
index 16bb080..6acd903 100644
--- a/src/libraries/System.Text.Encodings.Web/pkg/System.Text.Encodings.Web.pkgproj
+++ b/src/libraries/System.Text.Encodings.Web/pkg/System.Text.Encodings.Web.pkgproj
@@ -4,7 +4,9 @@
     <ProjectReference Include="..\ref\System.Text.Encodings.Web.csproj">
       <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
-    <ProjectReference Include="..\src\System.Text.Encodings.Web.csproj" />
+    <ProjectReference Include="..\src\System.Text.Encodings.Web.csproj">
+      <SupportedFramework>net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks)</SupportedFramework>
+    </ProjectReference>
     <HarvestIncludePaths Include="lib/netstandard1.0" />
     <!-- Since UAP and .NETCoreApp are package based we still want to enable
      OOBing libraries that happen to overlap with their framework package.
diff --git a/src/libraries/System.Text.Json/Directory.Build.props b/src/libraries/System.Text.Json/Directory.Build.props
index dfa0b0b..749d7fc 100644
--- a/src/libraries/System.Text.Json/Directory.Build.props
+++ b/src/libraries/System.Text.Json/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Text.RegularExpressions/Directory.Build.props b/src/libraries/System.Text.RegularExpressions/Directory.Build.props
index 42479cd..465e111 100644
--- a/src/libraries/System.Text.RegularExpressions/Directory.Build.props
+++ b/src/libraries/System.Text.RegularExpressions/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Threading.AccessControl/Directory.Build.props b/src/libraries/System.Threading.AccessControl/Directory.Build.props
index 98004a4..63f02a0 100644
--- a/src/libraries/System.Threading.AccessControl/Directory.Build.props
+++ b/src/libraries/System.Threading.AccessControl/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Threading.AccessControl/pkg/System.Threading.AccessControl.pkgproj b/src/libraries/System.Threading.AccessControl/pkg/System.Threading.AccessControl.pkgproj
index 45ae201..0d1c945 100644
--- a/src/libraries/System.Threading.AccessControl/pkg/System.Threading.AccessControl.pkgproj
+++ b/src/libraries/System.Threading.AccessControl/pkg/System.Threading.AccessControl.pkgproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <ItemGroup>
     <ProjectReference Include="..\ref\System.Threading.AccessControl.csproj">
-      <SupportedFramework>net461;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
+      <SupportedFramework>net461;uap10.0.16299;netcoreapp2.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Threading.AccessControl.csproj" />
     <HarvestIncludePaths Include="ref/net46;lib/net46;runtimes/win/lib/net46" />
diff --git a/src/libraries/System.Threading.Channels/Directory.Build.props b/src/libraries/System.Threading.Channels/Directory.Build.props
index 1bf23a4..2b9e284 100644
--- a/src/libraries/System.Threading.Channels/Directory.Build.props
+++ b/src/libraries/System.Threading.Channels/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Threading.Overlapped/Directory.Build.props b/src/libraries/System.Threading.Overlapped/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Threading.Overlapped/Directory.Build.props
+++ b/src/libraries/System.Threading.Overlapped/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Threading.Tasks.Dataflow/Directory.Build.props b/src/libraries/System.Threading.Tasks.Dataflow/Directory.Build.props
index 1142a8a..465e111 100644
--- a/src/libraries/System.Threading.Tasks.Dataflow/Directory.Build.props
+++ b/src/libraries/System.Threading.Tasks.Dataflow/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.6.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Threading.Tasks.Extensions/Directory.Build.props b/src/libraries/System.Threading.Tasks.Extensions/Directory.Build.props
index fb7700c..749d7fc 100644
--- a/src/libraries/System.Threading.Tasks.Extensions/Directory.Build.props
+++ b/src/libraries/System.Threading.Tasks.Extensions/Directory.Build.props
@@ -1,9 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <!-- System.Threading.Tasks.Extensions has forwarded types into the runtime on netcoreapp.
-         It must win over assemblies versioned at 4.2.* -->
-    <AssemblyVersion>4.3.0.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Threading.Tasks.Parallel/Directory.Build.props b/src/libraries/System.Threading.Tasks.Parallel/Directory.Build.props
index 359b316..5f6e490 100644
--- a/src/libraries/System.Threading.Tasks.Parallel/Directory.Build.props
+++ b/src/libraries/System.Threading.Tasks.Parallel/Directory.Build.props
@@ -1,7 +1,6 @@
-<Project>
+<Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.3.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Threading.Tasks/Directory.Build.props b/src/libraries/System.Threading.Tasks/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Threading.Tasks/Directory.Build.props
+++ b/src/libraries/System.Threading.Tasks/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Threading.Thread/Directory.Build.props b/src/libraries/System.Threading.Thread/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Threading.Thread/Directory.Build.props
+++ b/src/libraries/System.Threading.Thread/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Threading.ThreadPool/Directory.Build.props b/src/libraries/System.Threading.ThreadPool/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Threading.ThreadPool/Directory.Build.props
+++ b/src/libraries/System.Threading.ThreadPool/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Threading.Timer/Directory.Build.props b/src/libraries/System.Threading.Timer/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Threading.Timer/Directory.Build.props
+++ b/src/libraries/System.Threading.Timer/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Threading/Directory.Build.props b/src/libraries/System.Threading/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Threading/Directory.Build.props
+++ b/src/libraries/System.Threading/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Transactions.Local/Directory.Build.props b/src/libraries/System.Transactions.Local/Directory.Build.props
index 1bf23a4..2b9e284 100644
--- a/src/libraries/System.Transactions.Local/Directory.Build.props
+++ b/src/libraries/System.Transactions.Local/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Utf8String.Experimental/Directory.Build.props b/src/libraries/System.Utf8String.Experimental/Directory.Build.props
index ce26045..1dce756 100644
--- a/src/libraries/System.Utf8String.Experimental/Directory.Build.props
+++ b/src/libraries/System.Utf8String.Experimental/Directory.Build.props
@@ -2,8 +2,7 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <!-- System.Memory uses the Open key, so we will also. -->
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/libraries/System.ValueTuple/Directory.Build.props b/src/libraries/System.ValueTuple/Directory.Build.props
index e3343ce..2b9e284 100644
--- a/src/libraries/System.ValueTuple/Directory.Build.props
+++ b/src/libraries/System.ValueTuple/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.4.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Web.HttpUtility/Directory.Build.props b/src/libraries/System.Web.HttpUtility/Directory.Build.props
index 1bf23a4..2b9e284 100644
--- a/src/libraries/System.Web.HttpUtility/Directory.Build.props
+++ b/src/libraries/System.Web.HttpUtility/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Windows.Extensions/Directory.Build.props b/src/libraries/System.Windows.Extensions/Directory.Build.props
index c8c6511..bdcfca3 100644
--- a/src/libraries/System.Windows.Extensions/Directory.Build.props
+++ b/src/libraries/System.Windows.Extensions/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Xml.ReaderWriter/Directory.Build.props b/src/libraries/System.Xml.ReaderWriter/Directory.Build.props
index 42479cd..465e111 100644
--- a/src/libraries/System.Xml.ReaderWriter/Directory.Build.props
+++ b/src/libraries/System.Xml.ReaderWriter/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.2.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Xml.XDocument/Directory.Build.props b/src/libraries/System.Xml.XDocument/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Xml.XDocument/Directory.Build.props
+++ b/src/libraries/System.Xml.XDocument/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Xml.XPath.XDocument/Directory.Build.props b/src/libraries/System.Xml.XPath.XDocument/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Xml.XPath.XDocument/Directory.Build.props
+++ b/src/libraries/System.Xml.XPath.XDocument/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Xml.XPath/Directory.Build.props b/src/libraries/System.Xml.XPath/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Xml.XPath/Directory.Build.props
+++ b/src/libraries/System.Xml.XPath/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Xml.XmlDocument/Directory.Build.props b/src/libraries/System.Xml.XmlDocument/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Xml.XmlDocument/Directory.Build.props
+++ b/src/libraries/System.Xml.XmlDocument/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/System.Xml.XmlSerializer/Directory.Build.props b/src/libraries/System.Xml.XmlSerializer/Directory.Build.props
index 08f46e9..465e111 100644
--- a/src/libraries/System.Xml.XmlSerializer/Directory.Build.props
+++ b/src/libraries/System.Xml.XmlSerializer/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.1.1.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
   </PropertyGroup>
diff --git a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj b/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj
index 4cdc993..718764f 100644
--- a/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj
+++ b/src/libraries/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj
@@ -3,9 +3,8 @@
 
   <PropertyGroup>
     <TargetFrameworkName>netcoreapp</TargetFrameworkName>
-    <TargetFrameworkVersion>3.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>5.0</TargetFrameworkVersion>
     <TargetFramework>$(TargetFrameworkName)$(TargetFrameworkVersion)</TargetFramework>
-
     <RefBinDir>$(NETCoreAppPackageRefPath)</RefBinDir>
     <LibBinDir>$(NETCoreAppPackageRuntimePath)</LibBinDir>
 
diff --git a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
index 209c785..ba1759c 100644
--- a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+++ b/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
@@ -87,6 +87,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.0.3.0",
         "netcoreapp2.1": "4.0.4.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
         "portable46-net451+win81+wpa81": "4.0.0.0",
@@ -140,7 +141,8 @@
       "AssemblyVersionInPackageVersion": {
         "2.0.0.0": "2.0.0",
         "2.0.1.0": "2.0.1",
-        "2.0.2.0": "2.1.0"
+        "2.0.2.0": "2.1.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "Microsoft.IO.Redist": {
@@ -150,7 +152,8 @@
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
-        "4.0.0.0": "4.6.0"
+        "4.0.0.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "Microsoft.JScript": {
@@ -247,6 +250,7 @@
       "InboxOn": {
         "netcoreapp2.0": "10.0.3.0",
         "netcoreapp2.1": "10.0.4.0",
+        "netcoreapp5.0": "10.0.6.0",
         "net45": "10.0.0.0",
         "portable45-net45+win8+wpa81": "10.0.0.0",
         "portable46-net451+win81+wpa81": "10.0.0.0",
@@ -279,6 +283,7 @@
       "BaselineVersion": "11.0.0",
       "InboxOn": {
         "netcoreapp3.0": "10.0.4.0",
+        "netcoreapp5.0": "10.0.6.0",
         "uap10.0.16300": "10.0.4.0"
       }
     },
@@ -302,6 +307,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.1.0",
         "netstandard2.0": "4.0.1.0",
         "monoandroid10": "Any",
@@ -333,7 +339,8 @@
         "4.0.1.0": "4.3.0",
         "4.1.0.0": "4.4.0",
         "4.1.1.0": "4.5.0",
-        "4.1.2.0": "4.6.0"
+        "4.1.2.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "Microsoft.Win32.Registry.AccessControl": {
@@ -351,7 +358,8 @@
         "4.0.1.0": "4.3.0",
         "4.0.2.0": "4.4.0",
         "4.0.3.0": "4.5.0",
-        "4.0.4.0": "4.6.0"
+        "4.0.4.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "Microsoft.Win32.SystemEvents": {
@@ -363,7 +371,8 @@
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0",
-        "4.0.1.0": "4.6.0"
+        "4.0.1.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "Microsoft.Windows.Compatibility.Shims": {
@@ -384,7 +393,8 @@
       "AssemblyVersionInPackageVersion": {
         "1.0.0.0": "1.0.0",
         "1.0.1.0": "1.1.0",
-        "2.0.0.0": "2.0.0"
+        "2.0.0.0": "2.0.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "Microsoft.Xna.Framework": {
@@ -639,6 +649,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.1.0.0",
         "netstandard2.0": "4.1.0.0",
         "monoandroid10": "Any",
@@ -667,6 +678,7 @@
         "netcoreapp2.0": "4.0.2.0",
         "netcoreapp2.1": "4.0.3.0",
         "netcoreapp3.0": "4.0.4.0",
+        "netcoreapp5.0": "5.0.0.0",
         "uap10.0.16299": "4.0.3.0",
         "uap10.0.16300": "4.0.4.0"
       },
@@ -688,7 +700,8 @@
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.4.0",
         "4.0.1.0": "4.5.0",
-        "4.0.2.0": "4.6.0"
+        "4.0.2.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Collections": {
@@ -702,6 +715,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
@@ -744,6 +758,7 @@
       "BaselineVersion": "4.3.0",
       "InboxOn": {
         "netcoreapp2.0": "4.0.14.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
@@ -786,8 +801,8 @@
         "netcoreapp2.0": "1.2.2.0",
         "netcoreapp2.1": "1.2.3.0",
         "netcoreapp3.0": "1.2.4.0",
-        "uap10.0.16299": "1.2.3.0",
-        "uap10.0.16300": "1.2.4.0"
+        "netcoreapp5.0": "5.0.0.0",
+        "uap10.0.16299": "1.2.3.0"
       },
       "AssemblyVersionInPackageVersion": {
         "1.1.36.0": "1.1.36",
@@ -796,7 +811,8 @@
         "1.2.1.0": "1.3.0",
         "1.2.2.0": "1.4.0",
         "1.2.3.0": "1.5.0",
-        "1.2.4.0": "1.6.0"
+        "1.2.4.0": "1.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Collections.NonGeneric": {
@@ -809,6 +825,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.1.0",
         "netstandard2.0": "4.0.1.0",
         "monoandroid10": "Any",
@@ -835,6 +852,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.1.0",
         "netstandard2.0": "4.0.1.0",
         "monoandroid10": "Any",
@@ -860,6 +878,7 @@
       "BaselineVersion": "4.3.0",
       "InboxOn": {
         "netcoreapp2.0": "4.0.3.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
         "portable46-net451+win81+wpa81": "4.0.0.0",
@@ -906,6 +925,7 @@
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
         "netcoreapp3.0": "4.3.0.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "portable46-net451+win81": "4.0.0.0",
@@ -926,7 +946,8 @@
         "4.1.1.0": "4.3.0",
         "4.2.0.0": "4.4.0",
         "4.2.1.0": "4.5.0",
-        "4.3.0.0": "4.6.0"
+        "4.3.0.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.ComponentModel.Composition": {
@@ -958,7 +979,8 @@
         "net45": "4.0.0.0"
       },
       "AssemblyVersionInPackageVersion": {
-        "4.0.0.0": "4.6.0"
+        "4.0.0.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.ComponentModel.DataAnnotations": {
@@ -988,6 +1010,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
@@ -1030,6 +1053,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.1.0.0",
         "netstandard2.0": "4.1.0.0",
         "monoandroid10": "Any",
@@ -1056,6 +1080,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.1.0.0",
         "netstandard2.0": "4.1.0.0",
         "monoandroid10": "Any",
@@ -1095,7 +1120,8 @@
         "1.0.31.0": "1.0.31",
         "1.0.32.0": "1.1.0",
         "1.0.33.0": "1.2.0",
-        "1.0.34.0": "1.3.0"
+        "1.0.34.0": "1.3.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Composition.Convention": {
@@ -1111,7 +1137,8 @@
         "1.0.31.0": "1.0.31",
         "1.0.32.0": "1.1.0",
         "1.0.33.0": "1.2.0",
-        "1.0.34.0": "1.3.0"
+        "1.0.34.0": "1.3.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Composition.Hosting": {
@@ -1127,7 +1154,8 @@
         "1.0.31.0": "1.0.31",
         "1.0.32.0": "1.1.0",
         "1.0.33.0": "1.2.0",
-        "1.0.34.0": "1.3.0"
+        "1.0.34.0": "1.3.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Composition.Runtime": {
@@ -1143,7 +1171,8 @@
         "1.0.31.0": "1.0.31",
         "1.0.32.0": "1.1.0",
         "1.0.33.0": "1.2.0",
-        "1.0.34.0": "1.3.0"
+        "1.0.34.0": "1.3.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Composition.TypedParts": {
@@ -1159,7 +1188,8 @@
         "1.0.31.0": "1.0.31",
         "1.0.32.0": "1.1.0",
         "1.0.33.0": "1.2.0",
-        "1.0.34.0": "1.3.0"
+        "1.0.34.0": "1.3.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Configuration": {
@@ -1181,7 +1211,8 @@
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.4.0",
         "4.0.1.0": "4.5.0",
-        "4.0.2.0": "4.6.0"
+        "4.0.2.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Configuration.Install": {
@@ -1200,6 +1231,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.0.0",
         "netstandard2.0": "4.0.0.0",
         "monoandroid10": "Any",
@@ -1267,6 +1299,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.1.0.0",
         "netstandard2.0": "4.1.0.0",
         "monoandroid10": "Any",
@@ -1290,6 +1323,7 @@
       "BaselineVersion": "4.5.0",
       "InboxOn": {
         "netcoreapp3.0": "4.0.0.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "uap10.0.16300": "4.0.0.0"
       },
@@ -1322,7 +1356,8 @@
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0",
-        "4.0.1.0": "4.6.0"
+        "4.0.1.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Data.OleDb": {
@@ -1332,7 +1367,8 @@
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
-        "4.0.0.0": "4.6.0"
+        "4.0.0.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Data.OracleClient": {
@@ -1395,7 +1431,8 @@
         "4.4.0.0": "4.5.0",
         "4.5.0.0": "4.6.0",
         "4.5.0.1": "4.6.1",
-        "4.6.0.0": "4.7.0"
+        "4.6.0.0": "4.7.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Data.SqlXml": {
@@ -1428,6 +1465,7 @@
       "BaselineVersion": "4.3.0",
       "InboxOn": {
         "netcoreapp2.0": "4.0.3.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
         "portable46-net451+win81+wpa81": "4.0.0.0",
@@ -1469,6 +1507,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
@@ -1516,7 +1555,8 @@
       "InboxOn": {
         "netcoreapp2.0": "4.0.2.1",
         "netcoreapp2.1": "4.0.3.1",
-        "netcoreapp3.0": "4.0.4.0"
+        "netcoreapp3.0": "4.0.4.0",
+        "netcoreapp5.0": "5.0.0.0"
       },
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
@@ -1525,7 +1565,8 @@
         "4.0.2.1": "4.4.1",
         "4.0.3.0": "4.5.0",
         "4.0.3.1": "4.5.1",
-        "4.0.4.0": "4.6.0"
+        "4.0.4.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Diagnostics.EventLog": {
@@ -1537,7 +1578,8 @@
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0",
-        "4.0.1.0": "4.6.0"
+        "4.0.1.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Diagnostics.FileVersionInfo": {
@@ -1549,6 +1591,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.0.2.0",
         "netcoreapp2.1": "4.0.3.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.0.0",
         "netstandard2.0": "4.0.0.0",
         "monoandroid10": "Any",
@@ -1580,7 +1623,8 @@
       },
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0",
-        "4.0.1.0": "4.6.0"
+        "4.0.1.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Diagnostics.Process": {
@@ -1592,6 +1636,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.1.0.0",
         "netstandard2.0": "4.1.0.0",
         "monoandroid10": "Any",
@@ -1619,6 +1664,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.2.0",
         "netstandard2.0": "4.0.2.0",
         "monoandroid10": "Any",
@@ -1645,6 +1691,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.0.0",
         "netstandard2.0": "4.0.0.0",
         "monoandroid10": "Any",
@@ -1670,6 +1717,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
         "portable46-net451+win81+wpa81": "4.0.0.0",
@@ -1719,6 +1767,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.0.0",
         "netstandard2.0": "4.0.0.0",
         "monoandroid10": "Any",
@@ -1746,6 +1795,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net451": "4.0.10.0",
         "net46": "4.0.20.0",
@@ -1840,7 +1890,8 @@
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0",
         "4.0.0.1": "4.5.1",
-        "4.0.1.0": "4.6.0"
+        "4.0.1.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Drawing.Design": {
@@ -1857,6 +1908,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.2.0.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.0.0",
         "netstandard2.0": "4.0.0.0",
         "monoandroid10": "Any",
@@ -1889,6 +1941,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
@@ -1938,6 +1991,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
@@ -1980,6 +2034,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.1.0",
         "netstandard2.0": "4.0.1.0",
         "monoandroid10": "Any",
@@ -2006,6 +2061,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.1.0",
         "netstandard2.0": "4.0.1.0",
         "monoandroid10": "Any",
@@ -2048,6 +2104,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "net461": "4.1.0.0",
@@ -2092,6 +2149,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net461": "4.1.1.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
@@ -2119,7 +2177,8 @@
     },
     "System.IO.Compression.Brotli": {
       "InboxOn": {
-        "netcoreapp2.1": "4.2.1.0"
+        "netcoreapp2.1": "4.2.1.0",
+        "netcoreapp5.0": "5.0.0.0"
       },
       "AssemblyVersionInPackageVersion": {
         "4.2.0.0": "4.4.0",
@@ -2129,6 +2188,7 @@
     "System.IO.Compression.FileSystem": {
       "InboxOn": {
         "netcoreapp2.0": "4.0.0.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "netstandard2.0": "4.0.0.0",
         "monoandroid10": "Any",
@@ -2150,6 +2210,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.0.3.0",
         "netcoreapp2.1": "4.0.4.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.1.0",
         "netstandard2.0": "4.0.1.0",
         "monoandroid10": "Any",
@@ -2176,6 +2237,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.1.0",
         "netstandard2.0": "4.0.1.0",
         "monoandroid10": "Any",
@@ -2207,7 +2269,8 @@
         "4.0.1.0": "4.3.0",
         "4.0.2.0": "4.4.0",
         "4.0.3.0": "4.5.0",
-        "4.0.4.0": "4.6.0"
+        "4.0.4.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.IO.FileSystem.DriveInfo": {
@@ -2221,6 +2284,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.0.0",
         "netstandard2.0": "4.0.0.0",
         "monoandroid10": "Any",
@@ -2246,6 +2310,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.1.0",
         "netstandard2.0": "4.0.1.0",
         "monoandroid10": "Any",
@@ -2271,6 +2336,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.0.0",
         "netstandard2.0": "4.0.0.0",
         "monoandroid10": "Any",
@@ -2296,6 +2362,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.1.0",
         "netstandard2.0": "4.0.1.0",
         "monoandroid10": "Any",
@@ -2326,6 +2393,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.0.0",
         "netstandard2.0": "4.0.0.0",
         "monoandroid10": "Any",
@@ -2357,7 +2425,8 @@
         "4.0.1.0": "4.3.0",
         "4.0.2.0": "4.4.0",
         "4.0.3.0": "4.5.0",
-        "4.0.4.0": "4.6.0"
+        "4.0.4.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.IO.Pipelines": {
@@ -2373,7 +2442,8 @@
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0",
         "4.0.0.1": "4.5.2",
-        "4.0.1.0": "4.6.0"
+        "4.0.1.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.IO.Pipes": {
@@ -2385,6 +2455,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.0.0",
         "netstandard2.0": "4.0.0.0",
         "uap10.0.16299": "4.1.1.0"
@@ -2425,7 +2496,8 @@
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.4.0",
         "4.0.1.0": "4.5.0",
-        "4.0.2.0": "4.6.0"
+        "4.0.2.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.IO.UnmanagedMemoryStream": {
@@ -2438,6 +2510,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.1.0",
         "netstandard2.0": "4.0.1.0",
         "monoandroid10": "Any",
@@ -2472,7 +2545,8 @@
       "AssemblyVersionInPackageVersion": {
         "2.0.5.0": "4.4.0",
         "2.0.6.0": "4.5.0",
-        "2.0.7.0": "4.6.0"
+        "2.0.7.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Linq": {
@@ -2485,6 +2559,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net461": "4.1.0.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
@@ -2528,6 +2603,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "net461": "4.1.0.0",
@@ -2570,6 +2646,7 @@
       "BaselineVersion": "4.3.0",
       "InboxOn": {
         "netcoreapp2.0": "4.0.3.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
         "portable46-net451+win81+wpa81": "4.0.0.0",
@@ -2602,6 +2679,7 @@
       "BaselineVersion": "5.0.0",
       "InboxOn": {
         "netcoreapp2.0": "4.0.3.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
         "portable46-net451+win81+wpa81": "4.0.0.0",
@@ -2661,6 +2739,7 @@
       "InboxOn": {
         "netcoreapp2.1": "4.1.0.0",
         "netcoreapp3.0": "4.2.0.0",
+        "netcoreapp5.0": "5.0.0.0",
         "monoandroid10": "Any",
         "monotouch10": "Any",
         "xamarinios10": "Any",
@@ -2748,6 +2827,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net461": "4.1.1.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
@@ -2836,13 +2916,15 @@
         "4.0.3.0": "4.5.0",
         "4.0.3.1": "4.5.1",
         "4.0.3.2": "4.5.3",
-        "4.0.4.0": "4.6.0"
+        "4.0.4.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Net.HttpListener": {
       "InboxOn": {
         "netcoreapp2.0": "4.0.0.0",
         "netcoreapp2.1": "4.0.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "monoandroid10": "Any",
         "monotouch10": "Any",
         "uap10.0.16299": "4.0.1.0",
@@ -2856,6 +2938,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.0.0.0",
         "netcoreapp2.1": "4.0.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "monoandroid10": "Any",
         "monotouch10": "Any",
         "uap10.0.16299": "4.0.1.0",
@@ -2874,6 +2957,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.0.0",
         "netstandard2.0": "4.0.0.0",
         "monoandroid10": "Any",
@@ -2899,6 +2983,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "net461": "4.1.0.0",
@@ -2940,6 +3025,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.0.0",
         "netstandard2.0": "4.0.0.0",
         "monoandroid10": "Any",
@@ -2969,6 +3055,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
@@ -3019,6 +3106,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
@@ -3065,6 +3153,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.0.0",
         "netstandard2.0": "4.0.0.0",
         "monoandroid10": "Any",
@@ -3084,6 +3173,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.0.0.0",
         "netcoreapp2.1": "4.0.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "monoandroid10": "Any",
         "monotouch10": "Any",
         "uap10.0.16299": "4.0.1.0",
@@ -3103,6 +3193,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.1.0.0",
         "netstandard2.0": "4.1.0.0",
         "monoandroid10": "Any",
@@ -3134,6 +3225,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.0.0.0",
         "netcoreapp2.1": "4.0.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "uap10.0.16299": "4.0.1.0"
       }
     },
@@ -3147,6 +3239,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net46": "4.0.0.0",
         "netstandard2.0": "4.0.0.0",
         "monoandroid10": "Any",
@@ -3167,6 +3260,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.0.0.0",
         "netcoreapp2.1": "4.0.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "uap10.0.16299": "4.0.1.0"
       }
     },
@@ -3179,6 +3273,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.0.0",
         "netstandard2.0": "4.0.0.0",
         "monoandroid10": "Any",
@@ -3207,6 +3302,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.0.0",
         "netstandard2.0": "4.0.0.0",
         "monoandroid10": "Any",
@@ -3236,7 +3332,8 @@
         "4.0.0.0": "4.5.0",
         "4.0.0.1": "4.5.2",
         "4.0.0.2": "4.5.3",
-        "4.0.1.0": "4.6.0"
+        "4.0.1.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Numerics": {
@@ -3268,7 +3365,8 @@
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "0.1.0.0": "0.1.0",
-        "0.2.0.0": "0.2.0"
+        "0.2.0.0": "0.2.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Numerics.Vectors": {
@@ -3285,6 +3383,7 @@
         "netcoreapp2.0": "4.1.3.0",
         "netcoreapp2.1": "4.1.4.0",
         "netcoreapp3.0": "4.1.5.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net46": "4.0.0.0",
         "net461": "4.1.2.0",
         "monoandroid10": "Any",
@@ -3332,6 +3431,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
@@ -3418,6 +3518,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "net461": "4.1.0.0",
@@ -3488,6 +3589,7 @@
         "netcoreapp2.0": "4.0.3.0",
         "netcoreapp2.1": "4.0.4.0",
         "netcoreapp3.0": "4.0.5.0",
+        "netcoreapp5.0": "5.0.0.0",
         "monoandroid10": "Any",
         "monotouch10": "Any",
         "uap10.0.16299": "4.0.4.0",
@@ -3502,7 +3604,8 @@
         "4.0.2.0": "4.3.0",
         "4.0.3.0": "4.4.0",
         "4.0.4.0": "4.5.0",
-        "4.0.5.0": "4.6.0"
+        "4.0.5.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Reflection.Emit": {
@@ -3516,6 +3619,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "netstandard2.1": "4.0.0.0",
         "monoandroid10": "Any",
@@ -3543,6 +3647,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.0.3.0",
         "netcoreapp3.0": "4.1.0.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "portable45-net45+wp8": "4.0.0.0",
         "netstandard2.1": "4.0.0.0",
@@ -3571,6 +3676,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.0.3.0",
         "netcoreapp3.0": "4.1.0.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "portable45-net45+wp8": "4.0.0.0",
         "netstandard2.1": "4.0.0.0",
@@ -3598,6 +3704,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
         "portable46-net451+win81+wpa81": "4.0.0.0",
@@ -3647,8 +3754,8 @@
         "netcoreapp2.0": "1.4.2.0",
         "netcoreapp2.1": "1.4.3.0",
         "netcoreapp3.0": "1.4.4.0",
-        "uap10.0.16299": "1.4.3.0",
-        "uap10.0.16300": "1.4.4.0"
+        "netcoreapp5.0": "5.0.0.0",
+        "uap10.0.16299": "1.4.3.0"
       },
       "AssemblyVersionInPackageVersion": {
         "1.0.22.0": "1.0.22",
@@ -3658,7 +3765,8 @@
         "1.4.1.0": "1.4.1",
         "1.4.2.0": "1.5.0",
         "1.4.3.0": "1.6.0",
-        "1.4.4.0": "1.7.0"
+        "1.4.4.0": "1.7.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Reflection.MetadataLoadContext": {
@@ -3668,7 +3776,8 @@
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
-        "4.0.0.0": "4.6.0"
+        "4.0.0.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Reflection.Primitives": {
@@ -3681,6 +3790,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
         "portable46-net451+win81+wpa81": "4.0.0.0",
@@ -3726,6 +3836,7 @@
         "netcoreapp2.0": "4.1.2.0",
         "netcoreapp2.1": "4.1.3.0",
         "netcoreapp3.0": "4.1.4.0",
+        "netcoreapp5.0": "5.0.0.0",
         "monoandroid10": "Any",
         "monotouch10": "Any",
         "uap10.0.16299": "4.1.3.0",
@@ -3740,7 +3851,8 @@
         "4.1.1.0": "4.3.0",
         "4.1.2.0": "4.4.0",
         "4.1.3.0": "4.5.0",
-        "4.1.4.0": "4.6.0"
+        "4.1.4.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Resources.Extensions": {
@@ -3750,7 +3862,8 @@
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
-        "4.0.0.0": "4.6.0"
+        "4.0.0.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Resources.Reader": {
@@ -3762,6 +3875,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.1.0",
         "netstandard2.0": "4.0.1.0",
         "uap10.0.16299": "4.1.1.0"
@@ -3791,6 +3905,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
         "portable46-net451+win81+wpa81": "4.0.0.0",
@@ -3830,6 +3945,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.1.0",
         "netstandard2.0": "4.0.1.0",
         "uap10.0.16299": "4.1.1.0"
@@ -3854,6 +3970,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net451": "4.0.10.0",
         "net46": "4.0.20.0",
@@ -3922,6 +4039,7 @@
       "BaselineVersion": "5.0.0",
       "InboxOn": {
         "netcoreapp3.0": "4.0.5.0",
+        "netcoreapp5.0": "5.0.0.0",
         "uap10.0.16300": "4.0.5.0"
       },
       "AssemblyVersionInPackageVersion": {
@@ -3940,6 +4058,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.0.0",
         "netstandard2.0": "4.0.0.0",
         "monoandroid10": "Any",
@@ -3974,6 +4093,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "net461": "4.1.0.0",
@@ -4017,6 +4137,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net46": "4.0.0.0",
         "netstandard2.0": "4.0.0.0",
         "monoandroid10": "Any",
@@ -4045,6 +4166,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net451": "4.0.10.0",
         "net46": "4.0.20.0",
@@ -4083,6 +4205,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.0.2.0",
         "netcoreapp2.1": "4.0.3.0",
+        "netcoreapp5.0": "5.0.0.0",
         "monoandroid10": "Any",
         "monotouch10": "Any",
         "uap10.0.16299": "4.0.3.0",
@@ -4106,6 +4229,7 @@
       "BaselineVersion": "5.0.0",
       "InboxOn": {
         "netcoreapp2.0": "4.0.3.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
         "portable46-net451+win81+wpa81": "4.0.0.0",
@@ -4137,14 +4261,16 @@
     },
     "System.Runtime.Intrinsics": {
       "InboxOn": {
-        "netcoreapp3.0": "4.0.0.0"
+        "netcoreapp3.0": "4.0.0.0",
+        "netcoreapp5.0": "5.0.0.0"
       }
     },
     "System.Runtime.Intrinsics.Experimental": {
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
-        "4.0.0.0": "4.6.0"
+        "4.0.0.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Runtime.Loader": {
@@ -4156,7 +4282,8 @@
       "InboxOn": {
         "netcoreapp2.0": "4.0.2.0",
         "netcoreapp2.1": "4.0.3.0",
-        "netcoreapp3.0": "4.1.0.0"
+        "netcoreapp3.0": "4.1.0.0",
+        "netcoreapp5.0": "5.0.0.0"
       },
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
@@ -4174,6 +4301,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
         "portable46-net451+win81+wpa81": "4.0.0.0",
@@ -4238,6 +4366,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.0.2.0",
         "netcoreapp2.1": "4.0.3.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.1.0",
         "netstandard2.0": "4.0.1.0",
         "monoandroid10": "Any",
@@ -4268,6 +4397,7 @@
       "BaselineVersion": "4.3.0",
       "InboxOn": {
         "netcoreapp2.0": "4.0.4.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
         "portable46-net451+win81+wpa81": "4.0.0.0",
@@ -4311,6 +4441,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "net461": "4.1.1.0",
@@ -4359,6 +4490,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.3.0",
         "netcoreapp2.1": "4.1.4.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "net461": "4.1.1.0",
@@ -4472,7 +4604,8 @@
         "4.0.1.0": "4.3.0",
         "4.1.0.0": "4.4.0",
         "4.1.1.0": "4.5.0",
-        "4.1.2.0": "4.6.0"
+        "4.1.2.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Security.Claims": {
@@ -4485,6 +4618,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.1.0",
         "netstandard2.0": "4.0.1.0",
         "monoandroid10": "Any",
@@ -4512,6 +4646,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.3.0.0",
         "netcoreapp2.1": "4.3.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.2.0.0",
         "netstandard2.0": "4.2.0.0",
         "monoandroid10": "Any",
@@ -4554,7 +4689,8 @@
         "4.2.1.0": "4.3.0",
         "4.3.0.0": "4.4.0",
         "4.3.1.0": "4.5.0",
-        "4.3.2.0": "4.6.0"
+        "4.3.2.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Security.Cryptography.Csp": {
@@ -4566,6 +4702,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.0.0",
         "netstandard2.0": "4.0.0.0",
         "monoandroid10": "Any",
@@ -4590,6 +4727,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.0.0",
         "netstandard2.0": "4.0.0.0",
         "monoandroid10": "Any",
@@ -4624,7 +4762,8 @@
         "4.1.0.0": "4.4.0",
         "4.1.1.0": "4.5.0",
         "4.1.1.1": "4.5.1",
-        "4.1.2.0": "4.6.0"
+        "4.1.2.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Security.Cryptography.Pkcs": {
@@ -4647,7 +4786,8 @@
         "4.0.3.1": "4.5.1",
         "4.0.3.2": "4.5.2",
         "4.0.4.0": "4.6.0",
-        "4.1.0.0": "4.6.0"
+        "4.1.0.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Security.Cryptography.Primitives": {
@@ -4659,6 +4799,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.0.0",
         "netstandard2.0": "4.0.0.0",
         "monoandroid10": "Any",
@@ -4696,7 +4837,8 @@
         "4.0.1.0": "4.3.0",
         "4.0.2.0": "4.4.0",
         "4.0.3.0": "4.5.0",
-        "4.0.4.0": "4.6.0"
+        "4.0.4.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Security.Cryptography.X509Certificates": {
@@ -4712,6 +4854,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.1.0.0",
         "netstandard2.0": "4.1.0.0",
         "monoandroid10": "Any",
@@ -4741,7 +4884,8 @@
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.4.0",
         "4.0.1.0": "4.5.0",
-        "4.0.2.0": "4.6.0"
+        "4.0.2.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Security.Permissions": {
@@ -4756,7 +4900,8 @@
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.4.0",
         "4.0.1.0": "4.5.0",
-        "4.0.2.0": "4.6.0"
+        "4.0.2.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Security.Principal": {
@@ -4769,6 +4914,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
         "portable46-net451+win81+wpa81": "4.0.0.0",
@@ -4819,7 +4965,8 @@
         "4.1.0.0": "4.4.0",
         "4.1.1.0": "4.5.0",
         "4.1.1.1": "4.5.1",
-        "4.1.2.0": "4.6.0"
+        "4.1.2.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Security.SecureString": {
@@ -4831,6 +4978,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.0.0",
         "netstandard2.0": "4.0.0.0",
         "monoandroid10": "Any",
@@ -4991,7 +5139,8 @@
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0",
-        "4.0.1.0": "4.6.0"
+        "4.0.1.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.ServiceModel.Web": {
@@ -5043,7 +5192,8 @@
         "4.1.1.0": "4.3.0",
         "4.2.0.0": "4.4.0",
         "4.2.1.0": "4.5.0",
-        "4.2.2.0": "4.6.0"
+        "4.2.2.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Speech": {
@@ -5062,6 +5212,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
@@ -5107,6 +5258,7 @@
       "BaselineVersion": "5.0.0",
       "InboxOn": {
         "netcoreapp3.0": "4.1.2.0",
+        "netcoreapp5.0": "5.0.0.0",
         "monoandroid10": "Any",
         "monotouch10": "Any",
         "uap10.0.16299": "4.1.1.0",
@@ -5121,7 +5273,8 @@
         "4.0.2.0": "4.3.0",
         "4.1.0.0": "4.4.0",
         "4.1.1.0": "4.5.0",
-        "4.1.2.0": "4.6.0"
+        "4.1.2.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Text.Encoding.Extensions": {
@@ -5135,6 +5288,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
@@ -5180,14 +5334,15 @@
       "BaselineVersion": "5.0.0",
       "InboxOn": {
         "netcoreapp3.0": "4.0.4.0",
-        "uap10.0.16300": "4.0.4.0"
+        "netcoreapp5.0": "5.0.0.0"
       },
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
         "4.0.1.0": "4.3.0",
         "4.0.2.0": "4.4.0",
         "4.0.3.0": "4.5.0",
-        "4.0.4.0": "4.6.0"
+        "4.0.4.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Text.Json": {
@@ -5197,10 +5352,11 @@
       "BaselineVersion": "5.0.0",
       "InboxOn": {
         "netcoreapp3.0": "4.0.0.0",
-        "uap10.0.16300": "4.0.0.0"
+        "netcoreapp5.0": "5.0.0.0"
       },
       "AssemblyVersionInPackageVersion": {
-        "4.0.0.0": "4.6.0"
+        "4.0.0.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Text.RegularExpressions": {
@@ -5216,6 +5372,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "net461": "4.1.0.0",
@@ -5260,6 +5417,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
@@ -5307,7 +5465,8 @@
         "4.0.1.0": "4.3.0",
         "4.0.2.0": "4.4.0",
         "4.0.3.0": "4.5.0",
-        "4.0.4.0": "4.6.0"
+        "4.0.4.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Threading.Channels": {
@@ -5317,11 +5476,13 @@
       ],
       "BaselineVersion": "5.0.0",
       "InboxOn": {
-        "netcoreapp3.0": "4.0.1.0"
+        "netcoreapp3.0": "4.0.1.0",
+        "netcoreapp5.0": "5.0.0.0"
       },
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0",
-        "4.0.1.0": "4.6.0"
+        "4.0.1.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Threading.Overlapped": {
@@ -5334,6 +5495,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.1.0",
         "netstandard2.0": "4.0.1.0",
         "uap10.0.16299": "4.1.1.0"
@@ -5363,6 +5525,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
@@ -5410,8 +5573,8 @@
         "netcoreapp2.0": "4.6.2.0",
         "netcoreapp2.1": "4.6.3.0",
         "netcoreapp3.0": "4.6.4.0",
-        "uap10.0.16299": "4.6.3.0",
-        "uap10.0.16300": "4.6.4.0"
+        "netcoreapp5.0": "5.0.0.0",
+        "uap10.0.16299": "4.6.3.0"
       },
       "AssemblyVersionInPackageVersion": {
         "4.5.25.0": "4.5.25",
@@ -5419,7 +5582,8 @@
         "4.6.1.0": "4.7.0",
         "4.6.2.0": "4.8.0",
         "4.6.3.0": "4.9.0",
-        "4.6.4.0": "4.10.0"
+        "4.6.4.0": "4.10.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Threading.Tasks.Extensions": {
@@ -5436,6 +5600,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.1.0",
         "netcoreapp2.1": "4.3.0.0",
+        "netcoreapp5.0": "5.0.0.0",
         "monoandroid10": "Any",
         "monotouch10": "Any",
         "xamarinios10": "Any",
@@ -5460,6 +5625,7 @@
       "BaselineVersion": "4.3.0",
       "InboxOn": {
         "netcoreapp2.0": "4.0.3.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
         "portable46-net451+win81+wpa81": "4.0.0.0",
@@ -5492,6 +5658,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.0.0",
         "netstandard2.0": "4.0.0.0",
         "monoandroid10": "Any",
@@ -5516,6 +5683,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.10.0",
         "netstandard2.0": "4.0.10.0",
         "monoandroid10": "Any",
@@ -5541,6 +5709,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net451": "4.0.0.0",
         "portable46-net451+win81+wpa81": "4.0.0.0",
         "portable46-win81+wpa81": "4.0.0.0",
@@ -5580,6 +5749,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.0.0.0",
         "netcoreapp2.1": "4.0.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "uap10.0.16299": "4.0.1.0"
       }
     },
@@ -5587,7 +5757,8 @@
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
-        "4.0.0.0": "4.6.0"
+        "4.0.0.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.ValueTuple": {
@@ -5602,6 +5773,7 @@
         "netcoreapp2.0": "4.0.2.0",
         "netcoreapp2.1": "4.0.3.0",
         "netcoreapp3.0": "4.0.4.0",
+        "netcoreapp5.0": "5.0.0.0",
         "netstandard2.0": "4.0.2.0",
         "monoandroid10": "Any",
         "monotouch10": "Any",
@@ -5680,6 +5852,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.0.0.0",
         "netcoreapp2.1": "4.0.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "uap10.0.16299": "4.0.1.0"
       }
     },
@@ -5748,7 +5921,8 @@
       "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
-        "4.0.0.0": "4.6.0"
+        "4.0.0.0": "4.6.0",
+        "5.0.0.0": "5.0.0"
       }
     },
     "System.Windows.Forms": {
@@ -5870,6 +6044,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "net461": "4.1.0.0",
@@ -5941,6 +6116,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
@@ -5983,6 +6159,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.1.0",
         "netstandard2.0": "4.0.1.0",
         "monoandroid10": "Any",
@@ -6010,6 +6187,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "portable45-net45+win8+wpa81": "4.0.0.0",
@@ -6052,6 +6230,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.1.0",
         "netstandard2.0": "4.0.1.0",
         "monoandroid10": "Any",
@@ -6078,6 +6257,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp2.1": "4.1.1.0",
+        "netcoreapp5.0": "5.0.0.0",
         "net461": "4.0.1.0",
         "netstandard2.0": "4.0.1.0",
         "monoandroid10": "Any",
diff --git a/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets b/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets
index 2bd7fdd..1598ff2 100644
--- a/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets
+++ b/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets
@@ -3,6 +3,8 @@
     <TargetFramework>netcoreapp5.0</TargetFramework>
     <NETCoreAppMaximumVersion>5.0</NETCoreAppMaximumVersion>
     <RuntimeFrameworkVersion>$(MicrosoftNETCoreAppVersion)</RuntimeFrameworkVersion>
+    <!-- This should be enabled once we have updating assembly versions in our targeting pack. -->
+    <ShouldVerifyClosure>false</ShouldVerifyClosure>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/libraries/restore/binplacePackages/binplacePackages.depproj b/src/libraries/restore/binplacePackages/binplacePackages.depproj
index a1b0d6b..9535d89 100644
--- a/src/libraries/restore/binplacePackages/binplacePackages.depproj
+++ b/src/libraries/restore/binplacePackages/binplacePackages.depproj
@@ -32,6 +32,7 @@
     <PackageReference Include="System.Memory" Version="4.5.2" Condition="'$(TargetFramework)' == 'netcoreapp2.0' or '$(TargetsNetfx)' == 'true' or ('$(TargetsNetStandard)' == 'true' and '$(NETStandardVersion)' &gt;= 1.1)" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" Condition="'$(TargetsNetStandardLowerThan21)' == 'true' or '$(TargetsNetfx)' == 'true'" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" Condition="'$(TargetFramework)' == 'netcoreapp2.0' or '$(TargetsNetfx)' == 'true' or '$(TargetsNetStandard)' == 'true'" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.7.0" Condition="'$(TargetsNetfx)' == 'true'" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/libraries/restore/netstandard/netstandard.depproj b/src/libraries/restore/netstandard/netstandard.depproj
index 7a4c07c..76bec3f 100644
--- a/src/libraries/restore/netstandard/netstandard.depproj
+++ b/src/libraries/restore/netstandard/netstandard.depproj
@@ -62,6 +62,9 @@
     <PackageReference Include="System.Security.Cryptography.Pkcs">
       <Version>4.5.2</Version>
     </PackageReference>
+    <PackageReference Include="System.Data.SqlClient">
+      <Version>4.7.0</Version>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
-- 
2.7.4