From: William Godbe <wigodbe@microsoft.com>
Date: Tue, 16 Jul 2019 22:47:57 +0000 (-0700)
Subject: Update branding in master to 5.0 (dotnet/corefx#39503)
X-Git-Tag: submit/tizen/20210909.063632~11031^2~906
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d285b6c6621f185f66cc3d96753c19bcd862e870;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Update branding in master to 5.0 (dotnet/corefx#39503)

* Update branding in master to 5.0

* Revert to old AssemblyVersions

* Update to correct package versions

* Update Prerelease to alpha1

* Remove redundant PackageVersions

* Disable index check

* Update packageIndex

* Update PackageIndex again

* Revert incorrect packageIndex versions


Commit migrated from https://github.com/dotnet/corefx/commit/1acaa2017cfc64ef1aabcf3b19d0e097af692616
---

diff --git a/eng/Packaging.props b/eng/Packaging.props
index 6a46905..2e0bbc9 100644
--- a/eng/Packaging.props
+++ b/eng/Packaging.props
@@ -23,12 +23,13 @@
     <SkipBaseLineCheck>true</SkipBaseLineCheck>
 
     <!-- by default all packages will use the same version which revs with respect to product version -->
-    <PackageVersion Condition="'$(PackageVersion)' == ''">4.6.0</PackageVersion>
+    <PackageVersion Condition="'$(PackageVersion)' == ''">5.0.0</PackageVersion>
     <!-- major.minor.release version of the platforms package we're currently building
          Pre-release will be appended during build -->
     <PlatformPackageVersion>$(ProductVersion)</PlatformPackageVersion>
     <SkipValidatePackageTargetFramework>true</SkipValidatePackageTargetFramework>
     <SkipGenerationCheck>true</SkipGenerationCheck>
+    <SkipIndexCheck>true</SkipIndexCheck>
   </PropertyGroup>
 
   <Import Condition="Exists('../pkg/baseline/baseline.props') AND '$(MSBuildProjectExtension)' == '.pkgproj'" Project="../pkg/baseline/baseline.props" />
diff --git a/src/libraries/Microsoft.Bcl.AsyncInterfaces/Directory.Build.props b/src/libraries/Microsoft.Bcl.AsyncInterfaces/Directory.Build.props
index 2f87c4e..1bc704a 100644
--- a/src/libraries/Microsoft.Bcl.AsyncInterfaces/Directory.Build.props
+++ b/src/libraries/Microsoft.Bcl.AsyncInterfaces/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
+    <PackageVersion>1.1.0</PackageVersion>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
-    <PackageVersion>1.0.0</PackageVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <!-- This assembly should never be placed inbox as it is only for downlevel compatibility. -->
   </PropertyGroup>
diff --git a/src/libraries/Microsoft.Bcl.HashCode/Directory.Build.props b/src/libraries/Microsoft.Bcl.HashCode/Directory.Build.props
index 2f87c4e..1bc704a 100644
--- a/src/libraries/Microsoft.Bcl.HashCode/Directory.Build.props
+++ b/src/libraries/Microsoft.Bcl.HashCode/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
+    <PackageVersion>1.1.0</PackageVersion>
     <AssemblyVersion>1.0.0.0</AssemblyVersion>
-    <PackageVersion>1.0.0</PackageVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <!-- This assembly should never be placed inbox as it is only for downlevel compatibility. -->
   </PropertyGroup>
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 ffff611..0b3afe1 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,7 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageVersion>2.1.0</PackageVersion>
+    <PackageVersion>2.2.0</PackageVersion>
     <AssemblyVersion>2.0.2.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
diff --git a/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props b/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props
index eaf414b..e0f3a30 100644
--- a/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props
+++ b/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageVersion>10.4.0</PackageVersion>
+    <PackageVersion>10.5.0</PackageVersion>
     <AssemblyVersion>10.0.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/Directory.Build.props b/src/libraries/Microsoft.XmlSerializer.Generator/Directory.Build.props
index 041f284..ab50969 100644
--- a/src/libraries/Microsoft.XmlSerializer.Generator/Directory.Build.props
+++ b/src/libraries/Microsoft.XmlSerializer.Generator/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageVersion>2.1.0</PackageVersion>
+    <PackageVersion>2.2.0</PackageVersion>
     <SkipValidatePackage>true</SkipValidatePackage>
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
     <AssemblyFileVersion>$(AssemblyVersion)</AssemblyFileVersion>
diff --git a/src/libraries/System.Collections.Immutable/Directory.Build.props b/src/libraries/System.Collections.Immutable/Directory.Build.props
index 7e38210..21a8965 100644
--- a/src/libraries/System.Collections.Immutable/Directory.Build.props
+++ b/src/libraries/System.Collections.Immutable/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageVersion>1.6.0</PackageVersion>
+    <PackageVersion>1.7.0</PackageVersion>
     <AssemblyVersion>1.2.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
diff --git a/src/libraries/System.Composition/Directory.Build.props b/src/libraries/System.Composition/Directory.Build.props
index d0a8e4d..791c488 100644
--- a/src/libraries/System.Composition/Directory.Build.props
+++ b/src/libraries/System.Composition/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageVersion>1.3.0</PackageVersion>
+    <PackageVersion>1.4.0</PackageVersion>
     <AssemblyVersion>1.0.34.0</AssemblyVersion>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libraries/System.Data.SqlClient/Directory.Build.props b/src/libraries/System.Data.SqlClient/Directory.Build.props
index 11dfd9d..5e537c5 100644
--- a/src/libraries/System.Data.SqlClient/Directory.Build.props
+++ b/src/libraries/System.Data.SqlClient/Directory.Build.props
@@ -1,8 +1,6 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <!-- Must be kept in sync with pkg\Microsoft.Windows.Compatibility\Microsoft.Windows.Compatibility.pkgproj -->
-    <PackageVersion>4.7.0</PackageVersion>
     <AssemblyVersion>4.6.0.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsUAP>true</IsUAP>
diff --git a/src/libraries/System.Numerics.Tensors/Directory.Build.props b/src/libraries/System.Numerics.Tensors/Directory.Build.props
index c75bac3..6d6b6d1 100644
--- a/src/libraries/System.Numerics.Tensors/Directory.Build.props
+++ b/src/libraries/System.Numerics.Tensors/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
+    <PackageVersion>0.3.0</PackageVersion>
     <AssemblyVersion>0.2.0.0</AssemblyVersion>
-    <PackageVersion>0.2.0</PackageVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
 </Project>
diff --git a/src/libraries/System.Reflection.Metadata/Directory.Build.props b/src/libraries/System.Reflection.Metadata/Directory.Build.props
index 177a3fa..d033bf5 100644
--- a/src/libraries/System.Reflection.Metadata/Directory.Build.props
+++ b/src/libraries/System.Reflection.Metadata/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <PackageVersion>1.7.0</PackageVersion>
+    <PackageVersion>1.8.0</PackageVersion>
     <AssemblyVersion>1.4.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
diff --git a/src/libraries/System.Threading.Tasks.Dataflow/Directory.Build.props b/src/libraries/System.Threading.Tasks.Dataflow/Directory.Build.props
index def2ade..24c7b72 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>
-    <PackageVersion>4.10.0</PackageVersion>
     <AssemblyVersion>4.6.4.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IsNETCoreApp>true</IsNETCoreApp>
diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms.Future/Microsoft.NETCore.Platforms.Future.pkgproj b/src/libraries/pkg/Microsoft.NETCore.Platforms.Future/Microsoft.NETCore.Platforms.Future.pkgproj
index ad5fd41..1fbcf08 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms.Future/Microsoft.NETCore.Platforms.Future.pkgproj
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms.Future/Microsoft.NETCore.Platforms.Future.pkgproj
@@ -1,7 +1,6 @@
 <Project DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <PropertyGroup>
-    <PackageVersion>3.0.0</PackageVersion>
     <SkipValidatePackage>true</SkipValidatePackage>
     <!-- We don't need to harvest the stable packages to build this -->
     <HarvestStablePackage>false</HarvestStablePackage>
diff --git a/src/libraries/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.pkgproj b/src/libraries/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.pkgproj
index 2c48d5f..a42b79a 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.pkgproj
+++ b/src/libraries/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.pkgproj
@@ -1,7 +1,6 @@
 <Project DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <PropertyGroup>
-    <PackageVersion>3.0.0</PackageVersion>
     <SkipValidatePackage>true</SkipValidatePackage>
     <!-- We don't need to harvest the stable packages to build this -->
     <HarvestStablePackage>false</HarvestStablePackage>
diff --git a/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj b/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj
index 6b3207a..38201c7 100644
--- a/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj
+++ b/src/libraries/pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj
@@ -1,7 +1,6 @@
 <Project DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <PropertyGroup>
-    <PackageVersion>4.7.0</PackageVersion>
     <TargetFrameworkName>uap</TargetFrameworkName>
     <TargetFrameworkVersion>$(UAPvNextVersion)</TargetFrameworkVersion>
     <TargetFramework>$(TargetFrameworkName)$(TargetFrameworkVersion)</TargetFramework>
diff --git a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
index 84daf82..4732e77 100644
--- a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+++ b/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
@@ -21,12 +21,14 @@
       }
     },
     "Microsoft.Bcl.AsyncInterfaces": {
+      "BaselineVersion": "1.1.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "1.0.0.0": "1.0.0"
       }
     },
     "Microsoft.Bcl.HashCode": {
+      "BaselineVersion": "1.1.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "1.0.0.0": "1.0.0"
@@ -73,7 +75,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "netcoreapp2.0": "4.0.3.0",
         "netcoreapp2.1": "4.0.4.0",
@@ -115,6 +117,7 @@
       }
     },
     "Microsoft.Diagnostics.Tracing.EventSource.Redist": {
+      "BaselineVersion": "2.2.0",
       "StableVersions": [
         "2.0.0",
         "2.0.1"
@@ -127,6 +130,7 @@
       }
     },
     "Microsoft.IO.Redist": {
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.6.0"
@@ -151,7 +155,7 @@
         "2.1.4",
         "2.2.0"
       ],
-      "BaselineVersion": "3.0.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {}
     },
     "Microsoft.NETCore.Targets": {
@@ -163,7 +167,7 @@
         "2.0.0",
         "2.1.0"
       ],
-      "BaselineVersion": "3.0.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {}
     },
     "Microsoft.Phone": {
@@ -246,6 +250,7 @@
       }
     },
     "Microsoft.VisualBasic.Core": {
+      "BaselineVersion": "10.5.0",
       "InboxOn": {
         "netcoreapp3.0": "10.0.4.0",
         "uap10.0.16300": "10.0.4.0"
@@ -294,7 +299,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
@@ -311,7 +316,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
@@ -325,7 +330,7 @@
       "StableVersions": [
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0",
@@ -352,6 +357,7 @@
         "1.0.0",
         "2.0.0"
       ],
+      "BaselineVersion": "2.2.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "1.0.0.0": "1.0.0",
@@ -513,11 +519,11 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {}
     },
     "runtime.native.System.IO.Ports": {
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {}
     },
     "runtime.win7-x64.runtime.native.System.Data.SqlClient.sni": {
@@ -662,7 +668,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.4.0",
@@ -757,7 +763,7 @@
         "1.4.0",
         "1.5.0"
       ],
-      "BaselineVersion": "1.6.0",
+      "BaselineVersion": "1.7.0",
       "InboxOn": {
         "netcoreapp2.0": "1.2.2.0",
         "netcoreapp2.1": "1.2.3.0",
@@ -875,7 +881,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
@@ -908,7 +914,7 @@
       "StableVersions": [
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "net45": "4.0.0.0",
         "monoandroid10": "Any",
@@ -924,6 +930,7 @@
       }
     },
     "System.ComponentModel.Composition.Registration": {
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "net45": "4.0.0.0"
       },
@@ -1048,7 +1055,7 @@
         "1.1.0",
         "1.2.0"
       ],
-      "BaselineVersion": "1.3.0",
+      "BaselineVersion": "1.4.0",
       "InboxOn": {}
     },
     "System.Composition.AttributedModel": {
@@ -1138,7 +1145,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.4.0",
@@ -1277,7 +1284,7 @@
       "StableVersions": [
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0",
@@ -1285,6 +1292,7 @@
       }
     },
     "System.Data.OleDb": {
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.6.0"
@@ -1326,7 +1334,7 @@
         "4.6.0",
         "4.6.1"
       ],
-      "BaselineVersion": "4.7.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "net461": "4.1.0.0",
         "monoandroid10": "Any",
@@ -1460,7 +1468,7 @@
         "4.5.0",
         "4.5.1"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "netcoreapp2.0": "4.0.2.1",
         "netcoreapp2.1": "4.0.3.1",
@@ -1480,7 +1488,7 @@
       "StableVersions": [
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0",
@@ -1515,7 +1523,7 @@
       "StableVersions": [
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "monoandroid10": "Any",
         "monotouch10": "Any",
@@ -1725,7 +1733,7 @@
       "StableVersions": [
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "net45": "4.0.0.0"
       },
@@ -1737,7 +1745,7 @@
       "StableVersions": [
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "net45": "4.0.0.0"
       },
@@ -1749,7 +1757,7 @@
       "StableVersions": [
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "net45": "4.0.0.0"
       },
@@ -1770,7 +1778,7 @@
         "4.5.0",
         "4.5.1"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "monoandroid10": "Any",
         "monotouch10": "Any",
@@ -2141,7 +2149,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
@@ -2287,7 +2295,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
@@ -2304,7 +2312,7 @@
         "4.5.2",
         "4.5.3"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0",
@@ -2352,7 +2360,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "uap10.0.16299": "4.0.1.0",
         "uap10.0.16300": "4.0.2.0"
@@ -2394,7 +2402,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "monoandroid10": "Any",
         "monotouch10": "Any",
@@ -2532,7 +2540,7 @@
         "4.0.1",
         "4.3.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "netcoreapp2.0": "4.0.3.0",
         "net45": "4.0.0.0",
@@ -2569,7 +2577,7 @@
       "StableVersions": [
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "net45": "4.0.0.0"
       },
@@ -2743,7 +2751,7 @@
         "4.5.3",
         "4.5.4"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
@@ -3131,7 +3139,7 @@
         "4.5.2",
         "4.5.3"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0",
@@ -3165,7 +3173,7 @@
       "StableVersions": [
         "0.1.0"
       ],
-      "BaselineVersion": "0.2.0",
+      "BaselineVersion": "0.3.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "0.1.0.0": "0.1.0",
@@ -3212,7 +3220,7 @@
         "4.0.0",
         "4.3.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "uap10.0.16299": "4.0.4.0"
       },
@@ -3352,7 +3360,7 @@
         "4.0.0",
         "4.3.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "net45": "4.0.0.0",
         "portable46-net451+win81": "4.0.0.0",
@@ -3376,7 +3384,7 @@
         "4.5.1",
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "netcoreapp2.0": "4.0.3.0",
         "netcoreapp2.1": "4.0.4.0",
@@ -3405,7 +3413,7 @@
         "4.0.1",
         "4.3.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "netcoreapp2.0": "4.1.0.0",
         "netcoreapp3.0": "4.1.1.0",
@@ -3526,7 +3534,7 @@
         "1.5.0",
         "1.6.0"
       ],
-      "BaselineVersion": "1.7.0",
+      "BaselineVersion": "1.8.0",
       "InboxOn": {
         "netcoreapp2.0": "1.4.2.0",
         "netcoreapp2.1": "1.4.3.0",
@@ -3546,6 +3554,7 @@
       }
     },
     "System.Reflection.MetadataLoadContext": {
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.6.0"
@@ -3600,7 +3609,7 @@
         "4.5.0",
         "4.5.1"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "netcoreapp2.0": "4.1.2.0",
         "netcoreapp2.1": "4.1.3.0",
@@ -3624,6 +3633,7 @@
       }
     },
     "System.Resources.Extensions": {
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.6.0"
@@ -3767,7 +3777,7 @@
       "StableVersions": [
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "net45": "4.0.0.0",
         "monoandroid10": "Any",
@@ -3788,7 +3798,7 @@
         "4.5.1",
         "4.5.2"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "netcoreapp3.0": "4.0.5.0",
         "uap10.0.16300": "4.0.5.0"
@@ -3969,7 +3979,7 @@
         "4.0.1",
         "4.3.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "netcoreapp2.0": "4.0.3.0",
         "net45": "4.0.0.0",
@@ -4007,6 +4017,7 @@
       }
     },
     "System.Runtime.Intrinsics.Experimental": {
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.6.0"
@@ -4262,7 +4273,7 @@
         "4.0.11",
         "4.3.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "net45": "4.0.0.0",
         "net451": "4.0.10.0",
@@ -4291,7 +4302,7 @@
         "4.0.0",
         "4.3.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "net45": "4.0.0.0",
         "portable46-win81+wpa81": "4.0.0.0",
@@ -4321,7 +4332,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "uap10.0.16299": "4.1.1.0"
       },
@@ -4392,7 +4403,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "monoandroid10": "Any",
         "monotouch10": "Any",
@@ -4469,7 +4480,7 @@
         "4.5.0",
         "4.5.1"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
@@ -4489,7 +4500,7 @@
         "4.5.1",
         "4.5.2"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
@@ -4533,7 +4544,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "monoandroid10": "Any",
         "monotouch10": "Any",
@@ -4580,7 +4591,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.4.0",
@@ -4593,7 +4604,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.4.0",
@@ -4649,7 +4660,7 @@
         "4.5.0",
         "4.5.1"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "uap10.0.16299": "4.1.1.0"
       },
@@ -4826,7 +4837,7 @@
       "StableVersions": [
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0",
@@ -4874,7 +4885,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.1.0.0": "4.1.0",
@@ -4941,7 +4952,7 @@
         "4.5.0",
         "4.5.1"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "monoandroid10": "Any",
         "monotouch10": "Any",
@@ -5012,7 +5023,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "netcoreapp3.0": "4.0.4.0",
         "uap10.0.16300": "4.0.4.0"
@@ -5026,6 +5037,7 @@
       }
     },
     "System.Text.Json": {
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "netcoreapp3.0": "4.0.0.0",
         "uap10.0.16300": "4.0.0.0"
@@ -5128,7 +5140,7 @@
         "4.4.0",
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
@@ -5142,7 +5154,7 @@
       "StableVersions": [
         "4.5.0"
       ],
-      "BaselineVersion": "4.6.0",
+      "BaselineVersion": "5.0.0",
         "InboxOn": {
           "netcoreapp3.0":  "4.0.1.0"
         },
@@ -5222,7 +5234,7 @@
         "4.8.0",
         "4.9.0"
       ],
-      "BaselineVersion": "4.10.0",
+      "BaselineVersion": "5.0.0",
       "InboxOn": {
         "netcoreapp2.0": "4.6.2.0",
         "netcoreapp2.1": "4.6.3.0",
@@ -5401,6 +5413,7 @@
       }
     },
     "System.Utf8String.Experimental": {
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.6.0"
@@ -5558,6 +5571,7 @@
       }
     },
     "System.Windows.Extensions": {
+      "BaselineVersion": "5.0.0",
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.6.0"
diff --git a/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj b/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj
index 8a2b9c5..9a20271 100644
--- a/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj
+++ b/src/libraries/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj
@@ -1,19 +1,16 @@
 <Project DefaultTargets="Build">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
   <PropertyGroup>
-      <!-- We use the PackageVersion property defined in Packaging.props for the Prerelease packages which are using it to be built -->
-    <_PreReleasePackageVersion>$(PackageVersion)</_PreReleasePackageVersion>
-    <PackageVersion>3.0.0</PackageVersion>
     <ServiceModelVersion>4.5.3</ServiceModelVersion>
     <!-- We don't need to harvest the stable packages to build this -->
     <HarvestStablePackage>false</HarvestStablePackage>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <PrereleaseLibraryPackage>
-      <Version>$(_PreReleasePackageVersion)</Version>
+      <Version>$(PackageVersion)</Version>
     </PrereleaseLibraryPackage>
     <NS21PrereleaseLibraryPackage>
-      <Version>$(_PreReleasePackageVersion)</Version>
+      <Version>$(PackageVersion)</Version>
     </NS21PrereleaseLibraryPackage>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -28,10 +25,7 @@
     <PrereleaseLibraryPackage Include="System.Configuration.ConfigurationManager" />
     <PrereleaseLibraryPackage Include="System.Data.Odbc" />
     <PrereleaseLibraryPackage Include="System.Data.OleDb" />
-    <PrereleaseLibraryPackage Include="System.Data.SqlClient">
-      <!-- SQL client defines its own version, higher than rest of master -->
-      <Version>4.7.0</Version>
-    </PrereleaseLibraryPackage>
+    <PrereleaseLibraryPackage Include="System.Data.SqlClient" />
     <PrereleaseLibraryPackage Include="System.Drawing.Common" />
     <PrereleaseLibraryPackage Include="System.Diagnostics.EventLog" />
     <PrereleaseLibraryPackage Include="System.Diagnostics.PerformanceCounter" />