Merged with dotnet/release/2.2.

12 files changed, 1617 insertions, 123 deletions

diff --git a/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.pkgproj b/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.pkgproj
index 22db2c447b..7853876bf9 100644
--- a/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.pkgproj
+++ b/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.pkgproj
@@ -3,7 +3,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
   <PropertyGroup>
-    <PackageVersion>2.1.0</PackageVersion>
+    <PackageVersion>2.2.0</PackageVersion>
     <SkipValidatePackage>true</SkipValidatePackage>
     <!-- We don't need to harvest the stable packages to build this -->
     <HarvestStablePackage>false</HarvestStablePackage>
diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
index b655246463..6b8e53c33c 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
@@ -1383,6 +1383,60 @@
     "any",
     "base"
   ],
+  "fedora.29": [
+    "fedora.29",
+    "fedora",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "fedora.29-corert": [
+    "fedora.29-corert",
+    "fedora.29",
+    "fedora-corert",
+    "fedora",
+    "linux-corert",
+    "linux",
+    "unix-corert",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "fedora.29-x64": [
+    "fedora.29-x64",
+    "fedora.29",
+    "fedora-x64",
+    "fedora",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "fedora.29-x64-corert": [
+    "fedora.29-x64-corert",
+    "fedora.29-corert",
+    "fedora.29-x64",
+    "fedora.29",
+    "fedora-x64-corert",
+    "fedora-corert",
+    "fedora-x64",
+    "fedora",
+    "linux-x64-corert",
+    "linux-corert",
+    "linux-x64",
+    "linux",
+    "unix-x64-corert",
+    "unix-corert",
+    "unix-x64",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
   "gentoo": [
     "gentoo",
     "linux",
@@ -3192,6 +3246,369 @@
     "any",
     "base"
   ],
+  "ol.7.5": [
+    "ol.7.5",
+    "ol.7.4",
+    "rhel.7.5",
+    "ol.7.3",
+    "rhel.7.4",
+    "ol.7.2",
+    "rhel.7.3",
+    "ol.7.1",
+    "rhel.7.2",
+    "ol.7.0",
+    "rhel.7.1",
+    "ol.7",
+    "rhel.7.0",
+    "ol",
+    "rhel.7",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.7.5-corert": [
+    "ol.7.5-corert",
+    "ol.7.5",
+    "ol.7.4-corert",
+    "rhel.7.5-corert",
+    "ol.7.4",
+    "rhel.7.5",
+    "ol.7.3-corert",
+    "rhel.7.4-corert",
+    "ol.7.3",
+    "rhel.7.4",
+    "ol.7.2-corert",
+    "rhel.7.3-corert",
+    "ol.7.2",
+    "rhel.7.3",
+    "ol.7.1-corert",
+    "rhel.7.2-corert",
+    "ol.7.1",
+    "rhel.7.2",
+    "ol.7.0-corert",
+    "rhel.7.1-corert",
+    "ol.7.0",
+    "rhel.7.1",
+    "ol.7-corert",
+    "rhel.7.0-corert",
+    "ol.7",
+    "rhel.7.0",
+    "ol-corert",
+    "rhel.7-corert",
+    "ol",
+    "rhel.7",
+    "rhel-corert",
+    "rhel",
+    "linux-corert",
+    "linux",
+    "unix-corert",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "ol.7.5-x64": [
+    "ol.7.5-x64",
+    "ol.7.5",
+    "ol.7.4-x64",
+    "rhel.7.5-x64",
+    "ol.7.4",
+    "rhel.7.5",
+    "ol.7.3-x64",
+    "rhel.7.4-x64",
+    "ol.7.3",
+    "rhel.7.4",
+    "ol.7.2-x64",
+    "rhel.7.3-x64",
+    "ol.7.2",
+    "rhel.7.3",
+    "ol.7.1-x64",
+    "rhel.7.2-x64",
+    "ol.7.1",
+    "rhel.7.2",
+    "ol.7.0-x64",
+    "rhel.7.1-x64",
+    "ol.7.0",
+    "rhel.7.1",
+    "ol.7-x64",
+    "rhel.7.0-x64",
+    "ol.7",
+    "rhel.7.0",
+    "ol-x64",
+    "rhel.7-x64",
+    "ol",
+    "rhel.7",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.7.5-x64-corert": [
+    "ol.7.5-x64-corert",
+    "ol.7.5-corert",
+    "ol.7.5-x64",
+    "ol.7.5",
+    "ol.7.4-x64-corert",
+    "ol.7.4-corert",
+    "rhel.7.5-corert",
+    "ol.7.4-x64",
+    "rhel.7.5-x64",
+    "ol.7.4",
+    "rhel.7.5",
+    "ol.7.3-x64-corert",
+    "ol.7.3-corert",
+    "rhel.7.4-corert",
+    "ol.7.3-x64",
+    "rhel.7.4-x64",
+    "ol.7.3",
+    "rhel.7.4",
+    "ol.7.2-x64-corert",
+    "ol.7.2-corert",
+    "rhel.7.3-corert",
+    "ol.7.2-x64",
+    "rhel.7.3-x64",
+    "ol.7.2",
+    "rhel.7.3",
+    "ol.7.1-x64-corert",
+    "ol.7.1-corert",
+    "rhel.7.2-corert",
+    "ol.7.1-x64",
+    "rhel.7.2-x64",
+    "ol.7.1",
+    "rhel.7.2",
+    "ol.7.0-x64-corert",
+    "ol.7.0-corert",
+    "rhel.7.1-corert",
+    "ol.7.0-x64",
+    "rhel.7.1-x64",
+    "ol.7.0",
+    "rhel.7.1",
+    "ol.7-x64-corert",
+    "ol.7-corert",
+    "rhel.7.0-corert",
+    "ol.7-x64",
+    "rhel.7.0-x64",
+    "ol.7",
+    "rhel.7.0",
+    "ol-x64-corert",
+    "ol-corert",
+    "rhel.7-corert",
+    "ol-x64",
+    "rhel.7-x64",
+    "ol",
+    "rhel.7",
+    "rhel-x64-corert",
+    "rhel-corert",
+    "rhel-x64",
+    "rhel",
+    "linux-x64-corert",
+    "linux-corert",
+    "linux-x64",
+    "linux",
+    "unix-x64-corert",
+    "unix-corert",
+    "unix-x64",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "ol.7.6": [
+    "ol.7.6",
+    "ol.7.5",
+    "rhel.7.6",
+    "ol.7.4",
+    "rhel.7.5",
+    "ol.7.3",
+    "rhel.7.4",
+    "ol.7.2",
+    "rhel.7.3",
+    "ol.7.1",
+    "rhel.7.2",
+    "ol.7.0",
+    "rhel.7.1",
+    "ol.7",
+    "rhel.7.0",
+    "ol",
+    "rhel.7",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.7.6-corert": [
+    "ol.7.6-corert",
+    "ol.7.6",
+    "ol.7.5-corert",
+    "rhel.7.6-corert",
+    "ol.7.5",
+    "rhel.7.6",
+    "ol.7.4-corert",
+    "rhel.7.5-corert",
+    "ol.7.4",
+    "rhel.7.5",
+    "ol.7.3-corert",
+    "rhel.7.4-corert",
+    "ol.7.3",
+    "rhel.7.4",
+    "ol.7.2-corert",
+    "rhel.7.3-corert",
+    "ol.7.2",
+    "rhel.7.3",
+    "ol.7.1-corert",
+    "rhel.7.2-corert",
+    "ol.7.1",
+    "rhel.7.2",
+    "ol.7.0-corert",
+    "rhel.7.1-corert",
+    "ol.7.0",
+    "rhel.7.1",
+    "ol.7-corert",
+    "rhel.7.0-corert",
+    "ol.7",
+    "rhel.7.0",
+    "ol-corert",
+    "rhel.7-corert",
+    "ol",
+    "rhel.7",
+    "rhel-corert",
+    "rhel",
+    "linux-corert",
+    "linux",
+    "unix-corert",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "ol.7.6-x64": [
+    "ol.7.6-x64",
+    "ol.7.6",
+    "ol.7.5-x64",
+    "rhel.7.6-x64",
+    "ol.7.5",
+    "rhel.7.6",
+    "ol.7.4-x64",
+    "rhel.7.5-x64",
+    "ol.7.4",
+    "rhel.7.5",
+    "ol.7.3-x64",
+    "rhel.7.4-x64",
+    "ol.7.3",
+    "rhel.7.4",
+    "ol.7.2-x64",
+    "rhel.7.3-x64",
+    "ol.7.2",
+    "rhel.7.3",
+    "ol.7.1-x64",
+    "rhel.7.2-x64",
+    "ol.7.1",
+    "rhel.7.2",
+    "ol.7.0-x64",
+    "rhel.7.1-x64",
+    "ol.7.0",
+    "rhel.7.1",
+    "ol.7-x64",
+    "rhel.7.0-x64",
+    "ol.7",
+    "rhel.7.0",
+    "ol-x64",
+    "rhel.7-x64",
+    "ol",
+    "rhel.7",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.7.6-x64-corert": [
+    "ol.7.6-x64-corert",
+    "ol.7.6-corert",
+    "ol.7.6-x64",
+    "ol.7.6",
+    "ol.7.5-x64-corert",
+    "ol.7.5-corert",
+    "rhel.7.6-corert",
+    "ol.7.5-x64",
+    "rhel.7.6-x64",
+    "ol.7.5",
+    "rhel.7.6",
+    "ol.7.4-x64-corert",
+    "ol.7.4-corert",
+    "rhel.7.5-corert",
+    "ol.7.4-x64",
+    "rhel.7.5-x64",
+    "ol.7.4",
+    "rhel.7.5",
+    "ol.7.3-x64-corert",
+    "ol.7.3-corert",
+    "rhel.7.4-corert",
+    "ol.7.3-x64",
+    "rhel.7.4-x64",
+    "ol.7.3",
+    "rhel.7.4",
+    "ol.7.2-x64-corert",
+    "ol.7.2-corert",
+    "rhel.7.3-corert",
+    "ol.7.2-x64",
+    "rhel.7.3-x64",
+    "ol.7.2",
+    "rhel.7.3",
+    "ol.7.1-x64-corert",
+    "ol.7.1-corert",
+    "rhel.7.2-corert",
+    "ol.7.1-x64",
+    "rhel.7.2-x64",
+    "ol.7.1",
+    "rhel.7.2",
+    "ol.7.0-x64-corert",
+    "ol.7.0-corert",
+    "rhel.7.1-corert",
+    "ol.7.0-x64",
+    "rhel.7.1-x64",
+    "ol.7.0",
+    "rhel.7.1",
+    "ol.7-x64-corert",
+    "ol.7-corert",
+    "rhel.7.0-corert",
+    "ol.7-x64",
+    "rhel.7.0-x64",
+    "ol.7",
+    "rhel.7.0",
+    "ol-x64-corert",
+    "ol-corert",
+    "rhel.7-corert",
+    "ol-x64",
+    "rhel.7-x64",
+    "ol",
+    "rhel.7",
+    "rhel-x64-corert",
+    "rhel-corert",
+    "rhel-x64",
+    "rhel",
+    "linux-x64-corert",
+    "linux-corert",
+    "linux-x64",
+    "linux",
+    "unix-x64-corert",
+    "unix-corert",
+    "unix-x64",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
   "opensuse": [
     "opensuse",
     "linux",
@@ -3723,6 +4140,87 @@
     "any",
     "base"
   ],
+  "osx.10.14": [
+    "osx.10.14",
+    "osx.10.13",
+    "osx.10.12",
+    "osx.10.11",
+    "osx.10.10",
+    "osx",
+    "unix",
+    "any",
+    "base"
+  ],
+  "osx.10.14-corert": [
+    "osx.10.14-corert",
+    "osx.10.14",
+    "osx.10.13-corert",
+    "osx.10.13",
+    "osx.10.12-corert",
+    "osx.10.12",
+    "osx.10.11-corert",
+    "osx.10.11",
+    "osx.10.10-corert",
+    "osx.10.10",
+    "osx-corert",
+    "osx",
+    "unix-corert",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "osx.10.14-x64": [
+    "osx.10.14-x64",
+    "osx.10.14",
+    "osx.10.13-x64",
+    "osx.10.13",
+    "osx.10.12-x64",
+    "osx.10.12",
+    "osx.10.11-x64",
+    "osx.10.11",
+    "osx.10.10-x64",
+    "osx.10.10",
+    "osx-x64",
+    "osx",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "osx.10.14-x64-corert": [
+    "osx.10.14-x64-corert",
+    "osx.10.14-corert",
+    "osx.10.14-x64",
+    "osx.10.14",
+    "osx.10.13-x64-corert",
+    "osx.10.13-corert",
+    "osx.10.13-x64",
+    "osx.10.13",
+    "osx.10.12-x64-corert",
+    "osx.10.12-corert",
+    "osx.10.12-x64",
+    "osx.10.12",
+    "osx.10.11-x64-corert",
+    "osx.10.11-corert",
+    "osx.10.11-x64",
+    "osx.10.11",
+    "osx.10.10-x64-corert",
+    "osx.10.10-corert",
+    "osx.10.10-x64",
+    "osx.10.10",
+    "osx-x64-corert",
+    "osx-corert",
+    "osx-x64",
+    "osx",
+    "unix-x64-corert",
+    "unix-corert",
+    "unix-x64",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
   "rhel": [
     "rhel",
     "linux",
@@ -4281,6 +4779,231 @@
     "any",
     "base"
   ],
+  "rhel.7.5": [
+    "rhel.7.5",
+    "rhel.7.4",
+    "rhel.7.3",
+    "rhel.7.2",
+    "rhel.7.1",
+    "rhel.7.0",
+    "rhel.7",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.7.5-corert": [
+    "rhel.7.5-corert",
+    "rhel.7.5",
+    "rhel.7.4-corert",
+    "rhel.7.4",
+    "rhel.7.3-corert",
+    "rhel.7.3",
+    "rhel.7.2-corert",
+    "rhel.7.2",
+    "rhel.7.1-corert",
+    "rhel.7.1",
+    "rhel.7.0-corert",
+    "rhel.7.0",
+    "rhel.7-corert",
+    "rhel.7",
+    "rhel-corert",
+    "rhel",
+    "linux-corert",
+    "linux",
+    "unix-corert",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "rhel.7.5-x64": [
+    "rhel.7.5-x64",
+    "rhel.7.5",
+    "rhel.7.4-x64",
+    "rhel.7.4",
+    "rhel.7.3-x64",
+    "rhel.7.3",
+    "rhel.7.2-x64",
+    "rhel.7.2",
+    "rhel.7.1-x64",
+    "rhel.7.1",
+    "rhel.7.0-x64",
+    "rhel.7.0",
+    "rhel.7-x64",
+    "rhel.7",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.7.5-x64-corert": [
+    "rhel.7.5-x64-corert",
+    "rhel.7.5-corert",
+    "rhel.7.5-x64",
+    "rhel.7.5",
+    "rhel.7.4-x64-corert",
+    "rhel.7.4-corert",
+    "rhel.7.4-x64",
+    "rhel.7.4",
+    "rhel.7.3-x64-corert",
+    "rhel.7.3-corert",
+    "rhel.7.3-x64",
+    "rhel.7.3",
+    "rhel.7.2-x64-corert",
+    "rhel.7.2-corert",
+    "rhel.7.2-x64",
+    "rhel.7.2",
+    "rhel.7.1-x64-corert",
+    "rhel.7.1-corert",
+    "rhel.7.1-x64",
+    "rhel.7.1",
+    "rhel.7.0-x64-corert",
+    "rhel.7.0-corert",
+    "rhel.7.0-x64",
+    "rhel.7.0",
+    "rhel.7-x64-corert",
+    "rhel.7-corert",
+    "rhel.7-x64",
+    "rhel.7",
+    "rhel-x64-corert",
+    "rhel-corert",
+    "rhel-x64",
+    "rhel",
+    "linux-x64-corert",
+    "linux-corert",
+    "linux-x64",
+    "linux",
+    "unix-x64-corert",
+    "unix-corert",
+    "unix-x64",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "rhel.7.6": [
+    "rhel.7.6",
+    "rhel.7.5",
+    "rhel.7.4",
+    "rhel.7.3",
+    "rhel.7.2",
+    "rhel.7.1",
+    "rhel.7.0",
+    "rhel.7",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.7.6-corert": [
+    "rhel.7.6-corert",
+    "rhel.7.6",
+    "rhel.7.5-corert",
+    "rhel.7.5",
+    "rhel.7.4-corert",
+    "rhel.7.4",
+    "rhel.7.3-corert",
+    "rhel.7.3",
+    "rhel.7.2-corert",
+    "rhel.7.2",
+    "rhel.7.1-corert",
+    "rhel.7.1",
+    "rhel.7.0-corert",
+    "rhel.7.0",
+    "rhel.7-corert",
+    "rhel.7",
+    "rhel-corert",
+    "rhel",
+    "linux-corert",
+    "linux",
+    "unix-corert",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "rhel.7.6-x64": [
+    "rhel.7.6-x64",
+    "rhel.7.6",
+    "rhel.7.5-x64",
+    "rhel.7.5",
+    "rhel.7.4-x64",
+    "rhel.7.4",
+    "rhel.7.3-x64",
+    "rhel.7.3",
+    "rhel.7.2-x64",
+    "rhel.7.2",
+    "rhel.7.1-x64",
+    "rhel.7.1",
+    "rhel.7.0-x64",
+    "rhel.7.0",
+    "rhel.7-x64",
+    "rhel.7",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.7.6-x64-corert": [
+    "rhel.7.6-x64-corert",
+    "rhel.7.6-corert",
+    "rhel.7.6-x64",
+    "rhel.7.6",
+    "rhel.7.5-x64-corert",
+    "rhel.7.5-corert",
+    "rhel.7.5-x64",
+    "rhel.7.5",
+    "rhel.7.4-x64-corert",
+    "rhel.7.4-corert",
+    "rhel.7.4-x64",
+    "rhel.7.4",
+    "rhel.7.3-x64-corert",
+    "rhel.7.3-corert",
+    "rhel.7.3-x64",
+    "rhel.7.3",
+    "rhel.7.2-x64-corert",
+    "rhel.7.2-corert",
+    "rhel.7.2-x64",
+    "rhel.7.2",
+    "rhel.7.1-x64-corert",
+    "rhel.7.1-corert",
+    "rhel.7.1-x64",
+    "rhel.7.1",
+    "rhel.7.0-x64-corert",
+    "rhel.7.0-corert",
+    "rhel.7.0-x64",
+    "rhel.7.0",
+    "rhel.7-x64-corert",
+    "rhel.7-corert",
+    "rhel.7-x64",
+    "rhel.7",
+    "rhel-x64-corert",
+    "rhel-corert",
+    "rhel-x64",
+    "rhel",
+    "linux-x64-corert",
+    "linux-corert",
+    "linux-x64",
+    "linux",
+    "unix-x64-corert",
+    "unix-corert",
+    "unix-x64",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
   "sles": [
     "sles",
     "linux",
@@ -4641,6 +5364,33 @@
     "any",
     "base"
   ],
+  "tizen-x86": [
+    "tizen-x86",
+    "tizen",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tizen-x86-corert": [
+    "tizen-x86-corert",
+    "tizen-corert",
+    "tizen-x86",
+    "linux-x86-corert",
+    "tizen",
+    "linux-corert",
+    "linux-x86",
+    "unix-x86-corert",
+    "linux",
+    "unix-corert",
+    "unix-x86",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
   "tizen.4.0.0": [
     "tizen.4.0.0",
     "tizen",
@@ -4695,6 +5445,141 @@
     "any",
     "base"
   ],
+  "tizen.4.0.0-x86": [
+    "tizen.4.0.0-x86",
+    "tizen.4.0.0",
+    "tizen-x86",
+    "tizen",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tizen.4.0.0-x86-corert": [
+    "tizen.4.0.0-x86-corert",
+    "tizen.4.0.0-corert",
+    "tizen.4.0.0-x86",
+    "tizen.4.0.0",
+    "tizen-x86-corert",
+    "tizen-corert",
+    "tizen-x86",
+    "tizen",
+    "linux-x86-corert",
+    "linux-corert",
+    "linux-x86",
+    "linux",
+    "unix-x86-corert",
+    "unix-corert",
+    "unix-x86",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "tizen.5.0.0": [
+    "tizen.5.0.0",
+    "tizen.4.0.0",
+    "tizen",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tizen.5.0.0-armel": [
+    "tizen.5.0.0-armel",
+    "tizen.5.0.0",
+    "tizen.4.0.0-armel",
+    "tizen.4.0.0",
+    "tizen-armel",
+    "tizen",
+    "linux-armel",
+    "linux",
+    "unix-armel",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tizen.5.0.0-armel-corert": [
+    "tizen.5.0.0-armel-corert",
+    "tizen.5.0.0-corert",
+    "tizen.5.0.0-armel",
+    "tizen.5.0.0",
+    "tizen.4.0.0-armel-corert",
+    "tizen.4.0.0-corert",
+    "tizen.4.0.0-armel",
+    "tizen.4.0.0",
+    "tizen-armel-corert",
+    "tizen-corert",
+    "tizen-armel",
+    "tizen",
+    "linux-armel-corert",
+    "linux-corert",
+    "linux-armel",
+    "linux",
+    "unix-armel-corert",
+    "unix-corert",
+    "unix-armel",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "tizen.5.0.0-corert": [
+    "tizen.5.0.0-corert",
+    "tizen.5.0.0",
+    "tizen.4.0.0-corert",
+    "tizen.4.0.0",
+    "tizen-corert",
+    "tizen",
+    "linux-corert",
+    "linux",
+    "unix-corert",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "tizen.5.0.0-x86": [
+    "tizen.5.0.0-x86",
+    "tizen.5.0.0",
+    "tizen.4.0.0-x86",
+    "tizen.4.0.0",
+    "tizen-x86",
+    "tizen",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tizen.5.0.0-x86-corert": [
+    "tizen.5.0.0-x86-corert",
+    "tizen.5.0.0-corert",
+    "tizen.5.0.0-x86",
+    "tizen.5.0.0",
+    "tizen.4.0.0-x86-corert",
+    "tizen.4.0.0-corert",
+    "tizen.4.0.0-x86",
+    "tizen.4.0.0",
+    "tizen-x86-corert",
+    "tizen-corert",
+    "tizen-x86",
+    "tizen",
+    "linux-x86-corert",
+    "linux-corert",
+    "linux-x86",
+    "linux",
+    "unix-x86-corert",
+    "unix-corert",
+    "unix-x86",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
   "ubuntu": [
     "ubuntu",
     "debian",
@@ -6312,6 +7197,186 @@
     "any",
     "base"
   ],
+  "ubuntu.18.10": [
+    "ubuntu.18.10",
+    "ubuntu",
+    "debian",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ubuntu.18.10-arm": [
+    "ubuntu.18.10-arm",
+    "ubuntu.18.10",
+    "ubuntu-arm",
+    "ubuntu",
+    "debian-arm",
+    "debian",
+    "linux-arm",
+    "linux",
+    "unix-arm",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ubuntu.18.10-arm-corert": [
+    "ubuntu.18.10-arm-corert",
+    "ubuntu.18.10-corert",
+    "ubuntu.18.10-arm",
+    "ubuntu.18.10",
+    "ubuntu-arm-corert",
+    "ubuntu-corert",
+    "ubuntu-arm",
+    "ubuntu",
+    "debian-arm-corert",
+    "debian-corert",
+    "debian-arm",
+    "debian",
+    "linux-arm-corert",
+    "linux-corert",
+    "linux-arm",
+    "linux",
+    "unix-arm-corert",
+    "unix-corert",
+    "unix-arm",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "ubuntu.18.10-arm64": [
+    "ubuntu.18.10-arm64",
+    "ubuntu.18.10",
+    "ubuntu-arm64",
+    "ubuntu",
+    "debian-arm64",
+    "debian",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ubuntu.18.10-arm64-corert": [
+    "ubuntu.18.10-arm64-corert",
+    "ubuntu.18.10-corert",
+    "ubuntu.18.10-arm64",
+    "ubuntu.18.10",
+    "ubuntu-arm64-corert",
+    "ubuntu-corert",
+    "ubuntu-arm64",
+    "ubuntu",
+    "debian-arm64-corert",
+    "debian-corert",
+    "debian-arm64",
+    "debian",
+    "linux-arm64-corert",
+    "linux-corert",
+    "linux-arm64",
+    "linux",
+    "unix-arm64-corert",
+    "unix-corert",
+    "unix-arm64",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "ubuntu.18.10-corert": [
+    "ubuntu.18.10-corert",
+    "ubuntu.18.10",
+    "ubuntu-corert",
+    "ubuntu",
+    "debian-corert",
+    "debian",
+    "linux-corert",
+    "linux",
+    "unix-corert",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "ubuntu.18.10-x64": [
+    "ubuntu.18.10-x64",
+    "ubuntu.18.10",
+    "ubuntu-x64",
+    "ubuntu",
+    "debian-x64",
+    "debian",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ubuntu.18.10-x64-corert": [
+    "ubuntu.18.10-x64-corert",
+    "ubuntu.18.10-corert",
+    "ubuntu.18.10-x64",
+    "ubuntu.18.10",
+    "ubuntu-x64-corert",
+    "ubuntu-corert",
+    "ubuntu-x64",
+    "ubuntu",
+    "debian-x64-corert",
+    "debian-corert",
+    "debian-x64",
+    "debian",
+    "linux-x64-corert",
+    "linux-corert",
+    "linux-x64",
+    "linux",
+    "unix-x64-corert",
+    "unix-corert",
+    "unix-x64",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "ubuntu.18.10-x86": [
+    "ubuntu.18.10-x86",
+    "ubuntu.18.10",
+    "ubuntu-x86",
+    "ubuntu",
+    "debian-x86",
+    "debian",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ubuntu.18.10-x86-corert": [
+    "ubuntu.18.10-x86-corert",
+    "ubuntu.18.10-corert",
+    "ubuntu.18.10-x86",
+    "ubuntu.18.10",
+    "ubuntu-x86-corert",
+    "ubuntu-corert",
+    "ubuntu-x86",
+    "ubuntu",
+    "debian-x86-corert",
+    "debian-corert",
+    "debian-x86",
+    "debian",
+    "linux-x86-corert",
+    "linux-corert",
+    "linux-x86",
+    "linux",
+    "unix-x86-corert",
+    "unix-corert",
+    "unix-x86",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
   "unix": [
     "unix",
     "any",
diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json
index 30f99f8e58..e4fb6294d5 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtime.json
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.json
@@ -632,6 +632,31 @@
         "fedora-x64-corert"
       ]
     },
+    "fedora.29": {
+      "#import": [
+        "fedora"
+      ]
+    },
+    "fedora.29-corert": {
+      "#import": [
+        "fedora.29",
+        "fedora-corert"
+      ]
+    },
+    "fedora.29-x64": {
+      "#import": [
+        "fedora.29",
+        "fedora-x64"
+      ]
+    },
+    "fedora.29-x64-corert": {
+      "#import": [
+        "fedora.29-corert",
+        "fedora.29-x64",
+        "fedora.29",
+        "fedora-x64-corert"
+      ]
+    },
     "gentoo": {
       "#import": [
         "linux"
@@ -1222,6 +1247,62 @@
         "ol.7.3-x64-corert"
       ]
     },
+    "ol.7.5": {
+      "#import": [
+        "ol.7.4",
+        "rhel.7.5"
+      ]
+    },
+    "ol.7.5-corert": {
+      "#import": [
+        "ol.7.5",
+        "ol.7.4-corert",
+        "rhel.7.5-corert"
+      ]
+    },
+    "ol.7.5-x64": {
+      "#import": [
+        "ol.7.5",
+        "ol.7.4-x64",
+        "rhel.7.5-x64"
+      ]
+    },
+    "ol.7.5-x64-corert": {
+      "#import": [
+        "ol.7.5-corert",
+        "ol.7.5-x64",
+        "ol.7.5",
+        "ol.7.4-x64-corert"
+      ]
+    },
+    "ol.7.6": {
+      "#import": [
+        "ol.7.5",
+        "rhel.7.6"
+      ]
+    },
+    "ol.7.6-corert": {
+      "#import": [
+        "ol.7.6",
+        "ol.7.5-corert",
+        "rhel.7.6-corert"
+      ]
+    },
+    "ol.7.6-x64": {
+      "#import": [
+        "ol.7.6",
+        "ol.7.5-x64",
+        "rhel.7.6-x64"
+      ]
+    },
+    "ol.7.6-x64-corert": {
+      "#import": [
+        "ol.7.6-corert",
+        "ol.7.6-x64",
+        "ol.7.6",
+        "ol.7.5-x64-corert"
+      ]
+    },
     "opensuse": {
       "#import": [
         "linux"
@@ -1470,6 +1551,31 @@
         "osx.10.12-x64-corert"
       ]
     },
+    "osx.10.14": {
+      "#import": [
+        "osx.10.13"
+      ]
+    },
+    "osx.10.14-corert": {
+      "#import": [
+        "osx.10.14",
+        "osx.10.13-corert"
+      ]
+    },
+    "osx.10.14-x64": {
+      "#import": [
+        "osx.10.14",
+        "osx.10.13-x64"
+      ]
+    },
+    "osx.10.14-x64-corert": {
+      "#import": [
+        "osx.10.14-corert",
+        "osx.10.14-x64",
+        "osx.10.14",
+        "osx.10.13-x64-corert"
+      ]
+    },
     "rhel": {
       "#import": [
         "linux"
@@ -1669,6 +1775,56 @@
         "rhel.7.3-x64-corert"
       ]
     },
+    "rhel.7.5": {
+      "#import": [
+        "rhel.7.4"
+      ]
+    },
+    "rhel.7.5-corert": {
+      "#import": [
+        "rhel.7.5",
+        "rhel.7.4-corert"
+      ]
+    },
+    "rhel.7.5-x64": {
+      "#import": [
+        "rhel.7.5",
+        "rhel.7.4-x64"
+      ]
+    },
+    "rhel.7.5-x64-corert": {
+      "#import": [
+        "rhel.7.5-corert",
+        "rhel.7.5-x64",
+        "rhel.7.5",
+        "rhel.7.4-x64-corert"
+      ]
+    },
+    "rhel.7.6": {
+      "#import": [
+        "rhel.7.5"
+      ]
+    },
+    "rhel.7.6-corert": {
+      "#import": [
+        "rhel.7.6",
+        "rhel.7.5-corert"
+      ]
+    },
+    "rhel.7.6-x64": {
+      "#import": [
+        "rhel.7.6",
+        "rhel.7.5-x64"
+      ]
+    },
+    "rhel.7.6-x64-corert": {
+      "#import": [
+        "rhel.7.6-corert",
+        "rhel.7.6-x64",
+        "rhel.7.6",
+        "rhel.7.5-x64-corert"
+      ]
+    },
     "sles": {
       "#import": [
         "linux"
@@ -1817,6 +1973,19 @@
         "linux-corert"
       ]
     },
+    "tizen-x86": {
+      "#import": [
+        "tizen",
+        "linux-x86"
+      ]
+    },
+    "tizen-x86-corert": {
+      "#import": [
+        "tizen-corert",
+        "tizen-x86",
+        "linux-x86-corert"
+      ]
+    },
     "tizen.4.0.0": {
       "#import": [
         "tizen"
@@ -1842,6 +2011,59 @@
         "tizen-corert"
       ]
     },
+    "tizen.4.0.0-x86": {
+      "#import": [
+        "tizen.4.0.0",
+        "tizen-x86"
+      ]
+    },
+    "tizen.4.0.0-x86-corert": {
+      "#import": [
+        "tizen.4.0.0-corert",
+        "tizen.4.0.0-x86",
+        "tizen.4.0.0",
+        "tizen-x86-corert"
+      ]
+    },
+    "tizen.5.0.0": {
+      "#import": [
+        "tizen.4.0.0"
+      ]
+    },
+    "tizen.5.0.0-armel": {
+      "#import": [
+        "tizen.5.0.0",
+        "tizen.4.0.0-armel"
+      ]
+    },
+    "tizen.5.0.0-armel-corert": {
+      "#import": [
+        "tizen.5.0.0-corert",
+        "tizen.5.0.0-armel",
+        "tizen.5.0.0",
+        "tizen.4.0.0-armel-corert"
+      ]
+    },
+    "tizen.5.0.0-corert": {
+      "#import": [
+        "tizen.5.0.0",
+        "tizen.4.0.0-corert"
+      ]
+    },
+    "tizen.5.0.0-x86": {
+      "#import": [
+        "tizen.5.0.0",
+        "tizen.4.0.0-x86"
+      ]
+    },
+    "tizen.5.0.0-x86-corert": {
+      "#import": [
+        "tizen.5.0.0-corert",
+        "tizen.5.0.0-x86",
+        "tizen.5.0.0",
+        "tizen.4.0.0-x86-corert"
+      ]
+    },
     "ubuntu": {
       "#import": [
         "debian"
@@ -2452,6 +2674,73 @@
         "ubuntu-x86-corert"
       ]
     },
+    "ubuntu.18.10": {
+      "#import": [
+        "ubuntu"
+      ]
+    },
+    "ubuntu.18.10-arm": {
+      "#import": [
+        "ubuntu.18.10",
+        "ubuntu-arm"
+      ]
+    },
+    "ubuntu.18.10-arm-corert": {
+      "#import": [
+        "ubuntu.18.10-corert",
+        "ubuntu.18.10-arm",
+        "ubuntu.18.10",
+        "ubuntu-arm-corert"
+      ]
+    },
+    "ubuntu.18.10-arm64": {
+      "#import": [
+        "ubuntu.18.10",
+        "ubuntu-arm64"
+      ]
+    },
+    "ubuntu.18.10-arm64-corert": {
+      "#import": [
+        "ubuntu.18.10-corert",
+        "ubuntu.18.10-arm64",
+        "ubuntu.18.10",
+        "ubuntu-arm64-corert"
+      ]
+    },
+    "ubuntu.18.10-corert": {
+      "#import": [
+        "ubuntu.18.10",
+        "ubuntu-corert"
+      ]
+    },
+    "ubuntu.18.10-x64": {
+      "#import": [
+        "ubuntu.18.10",
+        "ubuntu-x64"
+      ]
+    },
+    "ubuntu.18.10-x64-corert": {
+      "#import": [
+        "ubuntu.18.10-corert",
+        "ubuntu.18.10-x64",
+        "ubuntu.18.10",
+        "ubuntu-x64-corert"
+      ]
+    },
+    "ubuntu.18.10-x86": {
+      "#import": [
+        "ubuntu.18.10",
+        "ubuntu-x86"
+      ]
+    },
+    "ubuntu.18.10-x86-corert": {
+      "#import": [
+        "ubuntu.18.10-corert",
+        "ubuntu.18.10-x86",
+        "ubuntu.18.10",
+        "ubuntu-x86-corert"
+      ]
+    },
     "unix": {
       "#import": [
         "any"
diff --git a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
index c8898ed0bb..f522a717d4 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
@@ -43,7 +43,7 @@
     <RuntimeGroup Include="fedora">
       <Parent>linux</Parent>
       <Architectures>x64</Architectures>
-      <Versions>23;24;25;26;27;28</Versions>
+      <Versions>23;24;25;26;27;28;29</Versions>
       <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
     </RuntimeGroup>
 
@@ -72,7 +72,7 @@
     <RuntimeGroup Include="ol">
       <Parent>rhel</Parent>
       <Architectures>x64</Architectures>
-      <Versions>7;7.0;7.1;7.2;7.3;7.4</Versions>
+      <Versions>7;7.0;7.1;7.2;7.3;7.4;7.5;7.6</Versions>
       <ApplyVersionsToParent>true</ApplyVersionsToParent>
     </RuntimeGroup>
 
@@ -87,7 +87,7 @@
     <RuntimeGroup Include="osx">
       <Parent>unix</Parent>
       <Architectures>x64</Architectures>
-      <Versions>10.10;10.11;10.12;10.13</Versions>
+      <Versions>10.10;10.11;10.12;10.13;10.14</Versions>
     </RuntimeGroup>
 
     <!-- rhel 6 is independent -->
@@ -100,7 +100,7 @@
     <RuntimeGroup Include="rhel">
       <Parent>linux</Parent>
       <Architectures>x64</Architectures>
-      <Versions>7;7.0;7.1;7.2;7.3;7.4</Versions>
+      <Versions>7;7.0;7.1;7.2;7.3;7.4;7.5;7.6</Versions>
     </RuntimeGroup>
 
     <RuntimeGroup Include="sles">
@@ -111,8 +111,8 @@
 
     <RuntimeGroup Include="tizen">
       <Parent>linux</Parent>
-      <Architectures>armel</Architectures>
-      <Versions>4.0.0</Versions>
+      <Architectures>x86;armel</Architectures>
+      <Versions>4.0.0;5.0.0</Versions>
     </RuntimeGroup>
 
     <RuntimeGroup Include="ubuntu">
@@ -124,7 +124,7 @@
     <RuntimeGroup Include="ubuntu">
       <Parent>debian</Parent>
       <Architectures>x64;x86;arm;arm64</Architectures>
-      <Versions>16.04;16.10;17.04;17.10;18.04</Versions>
+      <Versions>16.04;16.10;17.04;17.10;18.04;18.10</Versions>
       <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
     </RuntimeGroup>
 
diff --git a/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.pkgproj b/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.pkgproj
index 06c3afa065..769e81ccf2 100644
--- a/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.pkgproj
+++ b/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.pkgproj
@@ -3,7 +3,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
   <PropertyGroup>
-    <PackageVersion>2.1.0</PackageVersion>
+    <PackageVersion>2.2.0</PackageVersion>
     <SkipValidatePackage>true</SkipValidatePackage>
     <!-- We don't need to harvest the stable packages to build this -->
     <HarvestStablePackage>false</HarvestStablePackage>
diff --git a/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj b/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj
index 6877786522..a3eccd5e5b 100644
--- a/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj
+++ b/pkg/Microsoft.Private.CoreFx.NETCoreApp/Microsoft.Private.CoreFx.NETCoreApp.pkgproj
@@ -3,8 +3,9 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
   <PropertyGroup>
+    <PackageVersion>4.5.220</PackageVersion>
     <TargetFrameworkName>netcoreapp</TargetFrameworkName>
-    <TargetFrameworkVersion>2.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>2.2</TargetFrameworkVersion>
     <TargetFramework>$(TargetFrameworkName)$(TargetFrameworkVersion)</TargetFramework>
 
     <RefBinDir>$(NETCoreAppPackageRefPath)</RefBinDir>
diff --git a/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props b/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props
index 06bdbc7696..520c72a119 100644
--- a/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props
+++ b/pkg/Microsoft.Private.CoreFx.NETCoreApp/netcoreapp.rids.props
@@ -28,5 +28,8 @@
     <OfficialBuildRID Include="tizen.4.0.0-armel">
       <Platform>armel</Platform>
     </OfficialBuildRID>
+    <OfficialBuildRID Include="tizen.5.0.0-armel">
+      <Platform>armel</Platform>
+    </OfficialBuildRID>
   </ItemGroup>
 </Project>
diff --git a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
index 30def071ac..672a8fa9fc 100644
--- a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+++ b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
@@ -61,7 +61,8 @@
         "4.0.1",
         "4.0.0",
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {
@@ -106,7 +107,8 @@
     },
     "Microsoft.Diagnostics.Tracing.EventSource.Redist": {
       "StableVersions": [
-        "2.0.0"
+        "2.0.0",
+        "2.0.1"
       ],
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
@@ -125,7 +127,11 @@
         "1.0.1",
         "1.0.2",
         "1.1.0",
-        "2.0.0"
+        "2.0.0",
+        "2.1.0",
+        "2.1.1",
+        "2.1.2",
+        "2.2.0"
       ],
       "BaselineVersion": "2.0.0",
       "InboxOn": {}
@@ -136,7 +142,8 @@
         "1.0.1",
         "1.0.2",
         "1.1.0",
-        "2.0.0"
+        "2.0.0",
+        "2.1.0"
       ],
       "BaselineVersion": "2.0.0",
       "InboxOn": {}
@@ -182,7 +189,8 @@
         "10.0.1",
         "10.0.0",
         "10.1.0",
-        "10.2.0"
+        "10.2.0",
+        "10.3.0"
       ],
       "BaselineVersion": "10.2.0",
       "InboxOn": {
@@ -256,7 +264,8 @@
       "StableVersions": [
         "4.0.0",
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {},
@@ -271,7 +280,8 @@
       "StableVersions": [
         "4.0.0",
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {},
@@ -283,20 +293,32 @@
       }
     },
     "Microsoft.Win32.SystemEvents": {
+      "StableVersions": [
+        "4.5.0"
+      ],
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0"
       }
     },
     "Microsoft.Windows.Compatibility": {
+      "StableVersions": [
+        "2.0.0",
+        "2.0.1"
+      ],
       "InboxOn": {}
     },
     "Microsoft.Windows.Compatibility.Shims": {
+      "StableVersions": [
+        "2.0.0",
+        "2.0.1"
+      ],
       "InboxOn": {}
     },
     "Microsoft.XmlSerializer.Generator": {
       "StableVersions": [
-        "1.0.0"
+        "1.0.0",
+        "2.0.0"
       ],
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
@@ -453,7 +475,8 @@
       "StableVersions": [
         "4.0.0",
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {}
@@ -577,7 +600,8 @@
       "StableVersions": [
         "4.0.0",
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {
@@ -594,7 +618,8 @@
     },
     "System.CodeDom": {
       "StableVersions": [
-        "4.4.0"
+        "4.4.0",
+        "4.5.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {},
@@ -687,7 +712,8 @@
         "1.2.0",
         "1.1.36",
         "1.3.0",
-        "1.4.0"
+        "1.4.0",
+        "1.5.0"
       ],
       "BaselineVersion": "1.4.0",
       "InboxOn": {
@@ -801,7 +827,8 @@
         "4.0.10",
         "4.1.0",
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {
@@ -830,6 +857,9 @@
       }
     },
     "System.ComponentModel.Composition": {
+      "StableVersions": [
+        "4.5.0"
+      ],
       "InboxOn": {
         "net45": "4.0.0.0",
         "monoandroid10": "Any",
@@ -963,7 +993,8 @@
     "System.Composition": {
       "StableVersions": [
         "1.0.31",
-        "1.1.0"
+        "1.1.0",
+        "1.2.0"
       ],
       "BaselineVersion": "1.1.0",
       "InboxOn": {}
@@ -971,7 +1002,8 @@
     "System.Composition.AttributedModel": {
       "StableVersions": [
         "1.0.31",
-        "1.1.0"
+        "1.1.0",
+        "1.2.0"
       ],
       "BaselineVersion": "1.1.0",
       "InboxOn": {},
@@ -984,7 +1016,8 @@
     "System.Composition.Convention": {
       "StableVersions": [
         "1.0.31",
-        "1.1.0"
+        "1.1.0",
+        "1.2.0"
       ],
       "BaselineVersion": "1.1.0",
       "InboxOn": {},
@@ -997,7 +1030,8 @@
     "System.Composition.Hosting": {
       "StableVersions": [
         "1.0.31",
-        "1.1.0"
+        "1.1.0",
+        "1.2.0"
       ],
       "BaselineVersion": "1.1.0",
       "InboxOn": {},
@@ -1010,7 +1044,8 @@
     "System.Composition.Runtime": {
       "StableVersions": [
         "1.0.31",
-        "1.1.0"
+        "1.1.0",
+        "1.2.0"
       ],
       "BaselineVersion": "1.1.0",
       "InboxOn": {},
@@ -1023,7 +1058,8 @@
     "System.Composition.TypedParts": {
       "StableVersions": [
         "1.0.31",
-        "1.1.0"
+        "1.1.0",
+        "1.2.0"
       ],
       "BaselineVersion": "1.1.0",
       "InboxOn": {},
@@ -1042,7 +1078,8 @@
     },
     "System.Configuration.ConfigurationManager": {
       "StableVersions": [
-        "4.4.0"
+        "4.4.0",
+        "4.5.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {},
@@ -1149,6 +1186,9 @@
       }
     },
     "System.Data.DataSetExtensions": {
+      "StableVersions": [
+        "4.5.0"
+      ],
       "InboxOn": {
         "net45": "4.0.0.0"
       },
@@ -1173,6 +1213,9 @@
       }
     },
     "System.Data.Odbc": {
+      "StableVersions": [
+        "4.5.0"
+      ],
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0"
@@ -1208,7 +1251,10 @@
       "StableVersions": [
         "4.1.0",
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0",
+        "4.5.1",
+        "4.6.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {
@@ -1216,7 +1262,7 @@
         "monoandroid10": "Any",
         "monotouch10": "Any",
         "uap10.0.16299": "4.3.0.0",
-        "uap10.0.16300": "4.4.0.0",
+        "uap10.0.16300": "4.5.0.0",
         "xamarinios10": "Any",
         "xamarinmac20": "Any",
         "xamarintvos10": "Any",
@@ -1227,7 +1273,8 @@
         "4.1.0.0": "4.1.0",
         "4.1.1.0": "4.3.0",
         "4.2.0.0": "4.4.0",
-        "4.4.0.0": "4.5.0"
+        "4.4.0.0": "4.5.0",
+        "4.5.0.0": "4.6.0"
       }
     },
     "System.Data.SqlXml": {
@@ -1337,22 +1384,28 @@
       "StableVersions": [
         "4.0.0",
         "4.3.0",
-        "4.4.1"
+        "4.4.1",
+        "4.5.0",
+        "4.5.1"
       ],
       "BaselineVersion": "4.4.1",
       "InboxOn": {
         "netcoreapp2.0": "4.0.2.1",
-        "netcoreapp2.1": "4.0.3.0"
+        "netcoreapp2.1": "4.0.3.1"
       },
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
         "4.0.1.0": "4.3.0",
         "4.0.2.0": "4.4.0",
         "4.0.2.1": "4.4.1",
-        "4.0.3.0": "4.5.0"
+        "4.0.3.0": "4.5.0",
+        "4.0.3.1": "4.5.1"
       }
     },
     "System.Diagnostics.EventLog": {
+      "StableVersions": [
+        "4.5.0"
+      ],
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0"
@@ -1383,6 +1436,9 @@
       }
     },
     "System.Diagnostics.PerformanceCounter": {
+      "StableVersions": [
+        "4.5.0"
+      ],
       "InboxOn": {
         "monoandroid10": "Any",
         "monotouch10": "Any",
@@ -1588,6 +1644,9 @@
       }
     },
     "System.DirectoryServices": {
+      "StableVersions": [
+        "4.5.0"
+      ],
       "InboxOn": {
         "net45": "4.0.0.0"
       },
@@ -1596,6 +1655,9 @@
       }
     },
     "System.DirectoryServices.AccountManagement": {
+      "StableVersions": [
+        "4.5.0"
+      ],
       "InboxOn": {
         "net45": "4.0.0.0"
       },
@@ -1604,6 +1666,9 @@
       }
     },
     "System.DirectoryServices.Protocols": {
+      "StableVersions": [
+        "4.5.0"
+      ],
       "InboxOn": {
         "net45": "4.0.0.0"
       },
@@ -1620,6 +1685,10 @@
       }
     },
     "System.Drawing.Common": {
+      "StableVersions": [
+        "4.5.0",
+        "4.5.1"
+      ],
       "InboxOn": {
         "monoandroid10": "Any",
         "monotouch10": "Any",
@@ -1629,7 +1698,8 @@
         "xamarinwatchos10": "Any"
       },
       "AssemblyVersionInPackageVersion": {
-        "4.0.0.0": "4.5.0"
+        "4.0.0.0": "4.5.0",
+        "4.0.0.1": "4.5.1"
       }
     },
     "System.Drawing.Design": {
@@ -1985,7 +2055,8 @@
       "StableVersions": [
         "4.0.0",
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {},
@@ -2129,7 +2200,8 @@
       "StableVersions": [
         "4.0.0",
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {},
@@ -2141,9 +2213,15 @@
       }
     },
     "System.IO.Pipelines": {
+      "StableVersions": [
+        "4.5.0",
+        "4.5.1",
+        "4.5.2"
+      ],
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
-        "4.0.0.0": "4.5.0"
+        "4.0.0.0": "4.5.1",
+        "4.0.0.1": "4.5.2"
       }
     },
     "System.IO.Pipes": {
@@ -2167,12 +2245,12 @@
     "System.IO.Pipes.AccessControl": {
       "StableVersions": [
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0",
+        "4.5.1"
       ],
       "BaselineVersion": "4.4.0",
-      "InboxOn": {
-        "uap10.0.16300": "4.0.3.0"
-      },
+      "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.1.0": "4.3.0",
         "4.0.2.0": "4.4.0",
@@ -2181,7 +2259,8 @@
     },
     "System.IO.Ports": {
       "StableVersions": [
-        "4.4.0"
+        "4.4.0",
+        "4.5.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {
@@ -2220,7 +2299,8 @@
     },
     "System.Json": {
       "StableVersions": [
-        "4.4.0"
+        "4.4.0",
+        "4.5.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {
@@ -2393,6 +2473,9 @@
       }
     },
     "System.Management": {
+      "StableVersions": [
+        "4.5.0"
+      ],
       "InboxOn": {
         "net45": "4.0.0.0"
       },
@@ -2406,19 +2489,16 @@
       }
     },
     "System.Memory": {
+      "StableVersions": [
+        "4.5.0",
+        "4.5.1"
+      ],
       "InboxOn": {
-        "netcoreapp2.1": "4.1.0.0",
-        "monoandroid10": "Any",
-        "monotouch10": "Any",
-        "uap10.0.16300": "4.1.0.0",
-        "xamarinios10": "Any",
-        "xamarinmac20": "Any",
-        "xamarintvos10": "Any",
-        "xamarinwatchos10": "Any"
+        "netcoreapp2.1": "4.1.0.0"
       },
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.4.0",
-        "4.0.1.0": "4.5.0"
+        "4.0.1.0": "4.5.1"
       }
     },
     "System.Messaging": {
@@ -2548,7 +2628,9 @@
         "4.0.0",
         "4.0.1",
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0",
+        "4.5.1"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {},
@@ -2556,7 +2638,8 @@
         "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.3.0": "4.5.0",
+        "4.0.3.1": "4.5.1"
       }
     },
     "System.Net.HttpListener": {
@@ -2928,9 +3011,15 @@
       }
     },
     "System.Net.WebSockets.WebSocketProtocol": {
+      "StableVersions": [
+        "4.5.0",
+        "4.5.1",
+        "4.5.2"
+      ],
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
-        "4.0.0.0": "4.5.0"
+        "4.0.0.0": "4.5.1",
+        "4.0.0.1": "4.5.2"
       }
     },
     "System.Numerics": {
@@ -2960,7 +3049,8 @@
         "4.1.0",
         "4.1.1",
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {
@@ -3151,7 +3241,9 @@
         "4.0.0",
         "4.0.1",
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0",
+        "4.5.1"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {
@@ -3291,7 +3383,8 @@
         "1.1.0",
         "1.2.0",
         "1.4.1",
-        "1.5.0"
+        "1.5.0",
+        "1.6.0"
       ],
       "BaselineVersion": "1.5.0",
       "InboxOn": {
@@ -3354,7 +3447,9 @@
         "4.0.0",
         "4.1.0",
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0",
+        "4.5.1"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {
@@ -3511,6 +3606,9 @@
       }
     },
     "System.Runtime.Caching": {
+      "StableVersions": [
+        "4.5.0"
+      ],
       "InboxOn": {
         "net45": "4.0.0.0",
         "monoandroid10": "Any",
@@ -3525,11 +3623,15 @@
       }
     },
     "System.Runtime.CompilerServices.Unsafe": {
-      "InboxOn": {
-        "uap10.0.16300": "4.0.4.0"
-      },
+      "StableVersions": [
+        "4.5.0",
+        "4.5.1",
+        "4.5.2"
+      ],
+      "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
-        "4.0.4.0": "4.5.0"
+        "4.0.4.0": "4.5.1",
+        "4.0.4.1": "4.5.2"
       }
     },
     "System.Runtime.CompilerServices.VisualC": {
@@ -4038,7 +4140,8 @@
       "StableVersions": [
         "4.0.0",
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {
@@ -4107,7 +4210,8 @@
       "StableVersions": [
         "4.2.0",
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {
@@ -4180,7 +4284,8 @@
       "StableVersions": [
         "4.0.0",
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {},
@@ -4195,7 +4300,9 @@
       "StableVersions": [
         "4.0.0",
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0",
+        "4.5.1"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {},
@@ -4203,7 +4310,9 @@
         "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.3.0": "4.5.0",
+        "4.0.3.1": "4.5.1",
+        "4.0.3.2": "4.5.2"
       }
     },
     "System.Security.Cryptography.Primitives": {
@@ -4234,7 +4343,8 @@
       "StableVersions": [
         "4.0.0",
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {
@@ -4279,7 +4389,8 @@
     },
     "System.Security.Cryptography.Xml": {
       "StableVersions": [
-        "4.4.0"
+        "4.4.0",
+        "4.5.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {},
@@ -4290,7 +4401,8 @@
     },
     "System.Security.Permissions": {
       "StableVersions": [
-        "4.4.0"
+        "4.4.0",
+        "4.5.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {},
@@ -4343,7 +4455,9 @@
       "StableVersions": [
         "4.0.0",
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0",
+        "4.5.1"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {
@@ -4353,7 +4467,8 @@
         "4.0.0.0": "4.0.0",
         "4.0.1.0": "4.3.0",
         "4.1.0.0": "4.4.0",
-        "4.1.1.0": "4.5.0"
+        "4.1.1.0": "4.5.0",
+        "4.1.1.1": "4.5.1"
       }
     },
     "System.Security.SecureString": {
@@ -4517,6 +4632,9 @@
       }
     },
     "System.ServiceModel.Syndication": {
+      "StableVersions": [
+        "4.5.0"
+      ],
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0"
@@ -4560,7 +4678,8 @@
       "StableVersions": [
         "4.1.0",
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {},
@@ -4624,7 +4743,8 @@
         "4.0.0",
         "4.0.1",
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {
@@ -4691,7 +4811,8 @@
       "StableVersions": [
         "4.0.0",
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {},
@@ -4793,7 +4914,8 @@
       "StableVersions": [
         "4.0.0",
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {},
@@ -4805,6 +4927,9 @@
       }
     },
     "System.Threading.Channels": {
+      "StableVersions": [
+        "4.5.0"
+      ],
       "InboxOn": {},
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.5.0"
@@ -4878,7 +5003,8 @@
         "4.6.0",
         "4.5.25",
         "4.7.0",
-        "4.8.0"
+        "4.8.0",
+        "4.9.0"
       ],
       "BaselineVersion": "4.8.0",
       "InboxOn": {
@@ -4898,19 +5024,26 @@
       "StableVersions": [
         "4.0.0",
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0",
+        "4.5.1"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {
         "netcoreapp2.0": "4.1.1.0",
         "netcoreapp2.1": "4.3.0.0",
-        "uap10.0.16300": "4.3.0.0"
+        "monoandroid10": "Any",
+        "monotouch10": "Any",
+        "xamarinios10": "Any",
+        "xamarinmac20": "Any",
+        "xamarintvos10": "Any",
+        "xamarinwatchos10": "Any"
       },
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
         "4.1.0.0": "4.3.0",
         "4.1.1.0": "4.4.0",
-        "4.2.0.0": "4.5.0"
+        "4.2.0.0": "4.5.1"
       }
     },
     "System.Threading.Tasks.Parallel": {
@@ -5048,7 +5181,8 @@
     "System.ValueTuple": {
       "StableVersions": [
         "4.3.0",
-        "4.4.0"
+        "4.4.0",
+        "4.5.0"
       ],
       "BaselineVersion": "4.4.0",
       "InboxOn": {
@@ -5652,4 +5786,4 @@
       "System.Xml.XDocument"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/pkg/Microsoft.Windows.Compatibility.Shims/Microsoft.Windows.Compatibility.Shims.pkgproj b/pkg/Microsoft.Windows.Compatibility.Shims/Microsoft.Windows.Compatibility.Shims.pkgproj
index 1005126635..334f8e6c06 100644
--- a/pkg/Microsoft.Windows.Compatibility.Shims/Microsoft.Windows.Compatibility.Shims.pkgproj
+++ b/pkg/Microsoft.Windows.Compatibility.Shims/Microsoft.Windows.Compatibility.Shims.pkgproj
@@ -4,42 +4,24 @@
 
   <PropertyGroup>
     <PackageVersion>$(CompatibilityShimsPackageVersion)</PackageVersion>
-    <_ShimsLocationPath>$(BaseIntermediateOutputPath)shims/netcoreapp/facades/</_ShimsLocationPath>
+    <SkipPackageFileCheck>true</SkipPackageFileCheck>
+    <SkipValidatePackage>true</SkipValidatePackage>
+    <OmitDependencies>true</OmitDependencies>
+    <HarvestStablePackage>false</HarvestStablePackage>
   </PropertyGroup>
 
   <ItemGroup>
-    <ShimsToInclude Include="mscorlib.dll" />
-    <ShimsToInclude Include="System.dll" />
-    <ShimsToInclude Include="System.Configuration.dll" />
-    <ShimsToInclude Include="System.Core.dll" />
-    <ShimsToInclude Include="System.Data.dll" />
-    <ShimsToInclude Include="System.Drawing.dll" />
-    <ShimsToInclude Include="System.Net.dll" />
-    <ShimsToInclude Include="System.Security.dll" />
-    <ShimsToInclude Include="System.ServiceModel.Web.dll" />
-    <ShimsToInclude Include="System.ServiceProcess.dll" />
-    <ShimsToInclude Include="System.Transactions.dll" />
-    <ShimsToInclude Include="WindowsBase.dll" />
-  </ItemGroup>
-
-  <Target Name="AddShimsToPackage"
-          BeforeTargets="GetPackageFiles">
-
-    <Error Text="Required facade: %(ShimsToInclude.Identity) was not found in $(_ShimsLocationPath)." Condition="!Exists('@(ShimsToInclude->'$(_ShimsLocationPath)%(Identity)')')" />
+    <!-- We include placeholder files so that it is installable but takes the inbox shims in netcoreapp2.1 -->
+    <File Include="$(PlaceHolderFile)">
+      <TargetPath>/lib/netcoreapp2.1</TargetPath>
+    </File>
 
-    <ItemGroup>
-      <File Include="@(ShimsToInclude->'$(_ShimsLocationPath)%(Identity)')">
-        <TargetPath>/lib/netcoreapp2.0</TargetPath>
-        <SkipPackageFileCheck>true</SkipPackageFileCheck>
-      </File>
-      <!-- Include placeholder to be netstandard2.0 compatible -->
-      <File Include="$(PlaceHolderFile)">
-        <TargetPath>/lib/netstandard2.0</TargetPath>
-      </File>
-    </ItemGroup>
-
-    <Message Importance="Low" Text="Added: %(ShimsToInclude.Identity) to package." />
-  </Target>
+    <File Include="$(PlaceHolderFile)">
+      <TargetPath>/ref/netcoreapp2.1</TargetPath>
+    </File>
 
+    <ProjectReference Include="..\..\src\shims\**\*.*proj"
+                      Exclude="..\..\src\shims\ApiCompat.proj" />
+  </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>
diff --git a/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj b/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj
index ffa4e7e23c..7f8105a4d1 100644
--- a/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj
+++ b/pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj
@@ -3,7 +3,8 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
 
   <PropertyGroup>
-    <PackageVersion>2.0.0</PackageVersion>
+    <HarvestStablePackage>false</HarvestStablePackage>
+    <PackageVersion>2.0.1</PackageVersion>
     <ServiceModelVersion>4.4.1</ServiceModelVersion>
   </PropertyGroup>
 
@@ -70,12 +71,22 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Dependency Include="@(LibraryPackage)" />
-    <Dependency Include="@(PrereleaseLibraryPackage)" />
-
+    <!-- The shims included in the shims package are only needed for netcoreapp2.0 since in newer frameworks they are included inbox.
+    In order to condition the shims package to an specific framework other dependencies need to specify their target framework. So
+    we need to include the dependencies with the supported frameworks and then we include the compatibility shims package only for 2.0 -->
+    <Dependency Include="@(LibraryPackage);@(PrereleaseLibraryPackage)">
+      <TargetFramework>netcoreapp2.0</TargetFramework>
+    </Dependency>
+    <Dependency Include="@(LibraryPackage);@(PrereleaseLibraryPackage)">
+      <TargetFramework>netcoreapp2.1</TargetFramework>
+    </Dependency>
+    <Dependency Include="@(LibraryPackage);@(PrereleaseLibraryPackage)">
+      <TargetFramework>netstandard2.0</TargetFramework>
+    </Dependency>
     <!-- Include dependency to shims package -->
     <Dependency Include="Microsoft.Windows.Compatibility.Shims">
       <Version>$(CompatibilityShimsPackageVersion)</Version>
+      <TargetFramework>netcoreapp2.0</TargetFramework>
     </Dependency>
   </ItemGroup>
 
diff --git a/pkg/test/frameworkSettings/netcoreapp2.1/settings.targets b/pkg/test/frameworkSettings/netcoreapp2.1/settings.targets
index 949dc4c30a..6628eaf7b3 100644
--- a/pkg/test/frameworkSettings/netcoreapp2.1/settings.targets
+++ b/pkg/test/frameworkSettings/netcoreapp2.1/settings.targets
@@ -4,6 +4,6 @@
     <!-- Enable targeting netcoreapp2.1 even in an older CLI -->
     <NETCoreAppMaximumVersion>2.1</NETCoreAppMaximumVersion>
     <!-- use the most recent MS.NETCore.App we have from upstack -->
-    <RuntimeFrameworkVersion>$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion>2.1.0</RuntimeFrameworkVersion>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/pkg/test/frameworkSettings/netcoreapp2.2/settings.targets b/pkg/test/frameworkSettings/netcoreapp2.2/settings.targets
new file mode 100644
index 0000000000..50ddf42206
--- /dev/null
+++ b/pkg/test/frameworkSettings/netcoreapp2.2/settings.targets
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <!-- Enable targeting netcoreapp2.2 even in an older CLI -->
+    <NETCoreAppMaximumVersion>2.2</NETCoreAppMaximumVersion>
+    <!-- use the most recent MS.NETCore.App we have from upstack -->
+    <RuntimeFrameworkVersion>$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
+  </PropertyGroup>
+</Project>
\ No newline at end of file