From 5d87f32efd6852ea55accecfeb803486210d7bf0 Mon Sep 17 00:00:00 2001
From: Wes Haggard <Wes.Haggard@microsoft.com>
Date: Wed, 20 Jun 2018 10:07:31 -0700
Subject: [PATCH 1/3] Move to netcoreapp3.0

Commit migrated from https://github.com/dotnet/corefx/commit/7e103021ccfe3376ebe31d81698d5fbc7e1669b8
---
 ...icrosoft.Private.CoreFx.NETCoreApp.pkgproj |  2 +-
 .../packageIndex.json                         | 24 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

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 bfe81d87c98..da6a9feba0b 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
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFrameworkName>netcoreapp</TargetFrameworkName>
-    <TargetFrameworkVersion>2.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>3.0</TargetFrameworkVersion>
     <TargetFramework>$(TargetFrameworkName)$(TargetFrameworkVersion)</TargetFramework>
 
     <RefBinDir>$(NETCoreAppPackageRefPath)</RefBinDir>
diff --git a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
index 7e358600f82..37fe0eee4f1 100644
--- a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+++ b/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
@@ -589,7 +589,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.0.2.0",
         "netcoreapp2.1": "4.0.3.0",
-        "netcoreapp2.2": "4.0.4.0",
+        "netcoreapp3.0": "4.0.4.0",
         "uap10.0.16299": "4.0.3.0",
         "uap10.0.16300": "4.0.4.0"
       },
@@ -703,7 +703,7 @@
       "InboxOn": {
         "netcoreapp2.0": "1.2.2.0",
         "netcoreapp2.1": "1.2.3.0",
-        "netcoreapp2.2": "1.2.4.0",
+        "netcoreapp3.0": "1.2.4.0",
         "uap10.0.16299": "1.2.3.0",
         "uap10.0.16300": "1.2.4.0"
       },
@@ -820,7 +820,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.2.0.0",
         "netcoreapp2.1": "4.2.1.0",
-        "netcoreapp2.2": "4.2.2.0",
+        "netcoreapp3.0": "4.2.2.0",
         "net45": "4.0.0.0",
         "net46": "4.0.10.0",
         "portable46-net451+win81": "4.0.0.0",
@@ -1367,7 +1367,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.0.2.1",
         "netcoreapp2.1": "4.0.3.0",
-        "netcoreapp2.2": "4.0.4.0"
+        "netcoreapp3.0": "4.0.4.0"
       },
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.0.0",
@@ -2444,7 +2444,7 @@
     "System.Memory": {
       "InboxOn": {
         "netcoreapp2.1": "4.1.0.0",
-        "netcoreapp2.2": "4.1.0.0",
+        "netcoreapp3.0": "4.1.0.0",
         "monoandroid10": "Any",
         "monotouch10": "Any",
         "uap10.0.16300": "4.1.0.0",
@@ -3006,7 +3006,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.3.0",
         "netcoreapp2.1": "4.1.4.0",
-        "netcoreapp2.2": "4.1.5.0",
+        "netcoreapp3.0": "4.1.5.0",
         "net46": "4.0.0.0",
         "net461": "4.1.2.0",
         "monoandroid10": "Any",
@@ -3199,7 +3199,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.0.3.0",
         "netcoreapp2.1": "4.0.4.0",
-        "netcoreapp2.2": "4.0.5.0",
+        "netcoreapp3.0": "4.0.5.0",
         "monoandroid10": "Any",
         "monotouch10": "Any",
         "uap10.0.16299": "4.0.4.0",
@@ -3342,7 +3342,7 @@
       "InboxOn": {
         "netcoreapp2.0": "1.4.2.0",
         "netcoreapp2.1": "1.4.3.0",
-        "netcoreapp2.2": "1.4.4.0",
+        "netcoreapp3.0": "1.4.4.0",
         "uap10.0.16299": "1.4.3.0",
         "uap10.0.16300": "1.4.4.0"
       },
@@ -3408,7 +3408,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.1.2.0",
         "netcoreapp2.1": "4.1.3.0",
-        "netcoreapp2.2": "4.1.4.0",
+        "netcoreapp3.0": "4.1.4.0",
         "monoandroid10": "Any",
         "monotouch10": "Any",
         "uap10.0.16299": "4.1.3.0",
@@ -4956,7 +4956,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.6.2.0",
         "netcoreapp2.1": "4.6.3.0",
-        "netcoreapp2.2": "4.6.4.0",
+        "netcoreapp3.0": "4.6.4.0",
         "uap10.0.16299": "4.6.3.0",
         "uap10.0.16300": "4.6.4.0"
       },
@@ -4981,7 +4981,7 @@
         "monotouch10": "Any",
         "netcoreapp2.0": "4.1.1.0",
         "netcoreapp2.1": "4.3.0.0",
-        "netcoreapp2.2": "4.3.0.0",
+        "netcoreapp3.0": "4.3.0.0",
         "uap10.0.16300": "4.3.0.0",
         "xamarinios10": "Any",
         "xamarinmac20": "Any",
@@ -5137,7 +5137,7 @@
       "InboxOn": {
         "netcoreapp2.0": "4.0.2.0",
         "netcoreapp2.1": "4.0.3.0",
-        "netcoreapp2.2": "4.0.4.0",
+        "netcoreapp3.0": "4.0.4.0",
         "netstandard2.0": "4.0.2.0",
         "monoandroid10": "Any",
         "monotouch10": "Any",

From 7e7826e5eb3bb7b025e162f12314058f2caba953 Mon Sep 17 00:00:00 2001
From: Wes Haggard <Wes.Haggard@microsoft.com>
Date: Wed, 20 Jun 2018 14:48:04 -0700
Subject: [PATCH 2/3] Move packages to 3.0.0 to match NETCore app version

Commit migrated from https://github.com/dotnet/corefx/commit/fdd041b9a271e62c0aa7a1b5486f526bb70fbc23
---
 .../Microsoft.NETCore.Platforms.pkgproj                         | 2 +-
 .../Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.pkgproj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.pkgproj b/src/libraries/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.pkgproj
index 242f99415dd..88f12d4d8be 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.pkgproj
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/Microsoft.NETCore.Platforms.pkgproj
@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
-    <PackageVersion>2.2.0</PackageVersion>
+    <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 781dc4a7db3..1683a7e1bc2 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.pkgproj
+++ b/src/libraries/pkg/Microsoft.NETCore.Targets/Microsoft.NETCore.Targets.pkgproj
@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
-    <PackageVersion>2.2.0</PackageVersion>
+    <PackageVersion>3.0.0</PackageVersion>
     <SkipValidatePackage>true</SkipValidatePackage>
     <!-- We don't need to harvest the stable packages to build this -->
     <HarvestStablePackage>false</HarvestStablePackage>

From 1b78ecbac1c4e6df959b1fff03a6555fd5b80617 Mon Sep 17 00:00:00 2001
From: Wes Haggard <Wes.Haggard@microsoft.com>
Date: Wed, 20 Jun 2018 16:43:33 -0700
Subject: [PATCH 3/3] Add netcoreapp3.0 to frameworks for package testing

Commit migrated from https://github.com/dotnet/corefx/commit/7918a042891ba12680619eb710ec7a1bad16e25f
---
 .../frameworkSettings/netcoreapp3.0/settings.targets     | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 src/libraries/pkg/test/frameworkSettings/netcoreapp3.0/settings.targets

diff --git a/src/libraries/pkg/test/frameworkSettings/netcoreapp3.0/settings.targets b/src/libraries/pkg/test/frameworkSettings/netcoreapp3.0/settings.targets
new file mode 100644
index 00000000000..a5193eaa486
--- /dev/null
+++ b/src/libraries/pkg/test/frameworkSettings/netcoreapp3.0/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 netcoreapp3.0 even in an older CLI -->
+    <NETCoreAppMaximumVersion>3.0</NETCoreAppMaximumVersion>
+    <!-- use the most recent MS.NETCore.App we have from upstack -->
+    <RuntimeFrameworkVersion>$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
+  </PropertyGroup>
+</Project>