From 20e9f7ae1235f11bcd61e3e6826e5256b6d8cab6 Mon Sep 17 00:00:00 2001
From: Ahson Khan <ahkha@microsoft.com>
Date: Tue, 2 Apr 2019 16:23:41 -0700
Subject: [PATCH 1/5] Add SuppressMetaPackage to break circular dependency
 during System.Memory package restore

---
 pkg/Microsoft.Private.PackageBaseline/packageIndex.json | 6 ++++--
 src/System.Memory/dir.props                             | 2 +-
 src/System.Memory/pkg/System.Memory.pkgproj             | 6 +++++-
 src/packages.builds                                     | 3 +++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
index 7ad7069c437d..82f7d2e0c494 100644
--- a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+++ b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
@@ -2491,14 +2491,16 @@
       "StableVersions": [
         "4.5.0",
         "4.5.1",
-        "4.5.2"
+        "4.5.2",
+        "4.5.3"
       ],
       "InboxOn": {
         "netcoreapp2.1": "4.1.0.0"
       },
       "AssemblyVersionInPackageVersion": {
         "4.0.0.0": "4.4.0",
-        "4.0.1.0": "4.5.1"
+        "4.0.1.0": "4.5.1",
+        "4.0.1.1": "4.5.3"
       }
     },
     "System.Messaging": {
diff --git a/src/System.Memory/dir.props b/src/System.Memory/dir.props
index d829aaefed8d..16f7d45790ab 100644
--- a/src/System.Memory/dir.props
+++ b/src/System.Memory/dir.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\dir.props" />
   <PropertyGroup>
-    <AssemblyVersion>4.0.1.0</AssemblyVersion>
+    <AssemblyVersion>4.0.1.1</AssemblyVersion>
     <PackageVersion>4.5.1</PackageVersion>
     <!-- System.Memory has forwarded types into the runtime on netcoreapp/uap
          It must win over assemblies versioned at 4.0.* -->
diff --git a/src/System.Memory/pkg/System.Memory.pkgproj b/src/System.Memory/pkg/System.Memory.pkgproj
index c37c5552295f..13f08c0a5f5d 100644
--- a/src/System.Memory/pkg/System.Memory.pkgproj
+++ b/src/System.Memory/pkg/System.Memory.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>4.5.2</PackageVersion>
+    <PackageVersion>4.5.3</PackageVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageIndex Include="$(ProjectDir)\pkg\baseline\packageBaseline.1.1.json" />
@@ -10,6 +10,10 @@
       <SupportedFramework>net45;netcore45;wpa81;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
     </ProjectReference>
     <ProjectReference Include="..\src\System.Memory.csproj" />
+
+    <!-- this package is part of the implementation closure of NETStandard.Library
+      therefore it cannot reference NETStandard.Library -->
+    <SuppressMetaPackage Include="NETStandard.Library" />
     <InboxOnTargetFramework  Include="netcoreapp2.1" />
   </ItemGroup>
   <PropertyGroup>
diff --git a/src/packages.builds b/src/packages.builds
index 1f6ca6b97802..da3c86182265 100644
--- a/src/packages.builds
+++ b/src/packages.builds
@@ -27,6 +27,9 @@
     <Project Include="$(MSBuildThisFileDirectory)..\pkg\Microsoft.NETCore.Platforms\Microsoft.NETCore.Platforms.builds">
       <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
     </Project>
+    <Project Include="$(MSBuildThisFileDirectory)System.Memory\pkg\System.Memory.pkgproj">
+      <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
+    </Project>
     <Project Include="$(MSBuildThisFileDirectory)System.Net.Http.WinHttpHandler\pkg\System.Net.Http.WinHttpHandler.pkgproj">
       <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
     </Project>

From 8a1af30139464c6f5b957b72716e1aedfd4c1eb0 Mon Sep 17 00:00:00 2001
From: Ahson Khan <ahkha@microsoft.com>
Date: Tue, 2 Apr 2019 19:34:23 -0700
Subject: [PATCH 2/5] Add System.Memory entry for harvesting with correct
 version number.

---
 external/harvestPackages/harvestPackages.props | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/external/harvestPackages/harvestPackages.props b/external/harvestPackages/harvestPackages.props
index 3fd244d45a7d..2424e8b3990b 100644
--- a/external/harvestPackages/harvestPackages.props
+++ b/external/harvestPackages/harvestPackages.props
@@ -73,6 +73,9 @@
 <PackageReference Include="System.Json">
   <Version>4.5.0</Version>
 </PackageReference>
+<PackageReference Include="System.Memory">
+  <Version>4.5.3</Version>
+</PackageReference>
 <PackageReference Include="System.Net.Http.WinHttpHandler">
   <Version>4.5.2</Version>
 </PackageReference>

From 6f62ef84f4a1d32aeba72d7697b3ec32d0ef20b6 Mon Sep 17 00:00:00 2001
From: Ahson Khan <ahkha@microsoft.com>
Date: Tue, 2 Apr 2019 19:43:59 -0700
Subject: [PATCH 3/5] Last stable package version is 4.5.2, not 4.5.3

---
 external/harvestPackages/harvestPackages.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/external/harvestPackages/harvestPackages.props b/external/harvestPackages/harvestPackages.props
index 2424e8b3990b..994a47b87e10 100644
--- a/external/harvestPackages/harvestPackages.props
+++ b/external/harvestPackages/harvestPackages.props
@@ -74,7 +74,7 @@
   <Version>4.5.0</Version>
 </PackageReference>
 <PackageReference Include="System.Memory">
-  <Version>4.5.3</Version>
+  <Version>4.5.2</Version>
 </PackageReference>
 <PackageReference Include="System.Net.Http.WinHttpHandler">
   <Version>4.5.2</Version>

From 5910701f742dcf0d992e5b35e88a46291938660d Mon Sep 17 00:00:00 2001
From: Ahson Khan <ahkha@microsoft.com>
Date: Wed, 3 Apr 2019 14:08:41 -0700
Subject: [PATCH 4/5] Add workaround for package testing for netcoreapp1.0

---
 .../netcoreapp1.0/workaroundDowngrade.targets              | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 pkg/test/packageSettings/System.Memory/netcoreapp1.0/workaroundDowngrade.targets

diff --git a/pkg/test/packageSettings/System.Memory/netcoreapp1.0/workaroundDowngrade.targets b/pkg/test/packageSettings/System.Memory/netcoreapp1.0/workaroundDowngrade.targets
new file mode 100644
index 000000000000..1ec61540e47a
--- /dev/null
+++ b/pkg/test/packageSettings/System.Memory/netcoreapp1.0/workaroundDowngrade.targets
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <!-- issue https://github.com/dotnet/corefx/issues/28551 -->
+    <PackageReference Include="NETStandard.Library" Version="1.6.1" />
+  </ItemGroup>
+</Project>
\ No newline at end of file

From f097e75a3b3574000568475ac78f2826143771e9 Mon Sep 17 00:00:00 2001
From: Ahson Khan <ahkha@microsoft.com>
Date: Wed, 10 Apr 2019 16:05:01 -0700
Subject: [PATCH 5/5] Remove 4.5.3 from the stable packages list.

---
 pkg/Microsoft.Private.PackageBaseline/packageIndex.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
index 82f7d2e0c494..f8daf8ed1a76 100644
--- a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
+++ b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
@@ -2491,8 +2491,7 @@
       "StableVersions": [
         "4.5.0",
         "4.5.1",
-        "4.5.2",
-        "4.5.3"
+        "4.5.2"
       ],
       "InboxOn": {
         "netcoreapp2.1": "4.1.0.0"