From d6aa4c700149b9dbdacbcf5399a25805ee4cb88f Mon Sep 17 00:00:00 2001
From: "Brett V. Forsgren" <brettfo@microsoft.com>
Date: Wed, 30 Jun 2021 15:49:46 -0600
Subject: [PATCH] apply source-build patches

---
 .../0005-Fix-package-downgrade-warning.patch  | 56 -------------------
 .../Microsoft.FSharp.Compiler.nuspec          |  4 +-
 src/fsharp/fsc/fsc.fsproj                     |  1 +
 3 files changed, 3 insertions(+), 58 deletions(-)
 delete mode 100644 eng/source-build-patches/0005-Fix-package-downgrade-warning.patch

diff --git a/eng/source-build-patches/0005-Fix-package-downgrade-warning.patch b/eng/source-build-patches/0005-Fix-package-downgrade-warning.patch
deleted file mode 100644
index e13b98068f9..00000000000
--- a/eng/source-build-patches/0005-Fix-package-downgrade-warning.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 7f0d25bfaa9a38da2097c9420461232a08951165 Mon Sep 17 00:00:00 2001
-From: Chris Rummel <crummel@microsoft.com>
-Date: Thu, 3 Sep 2020 19:02:07 -0500
-Subject: [PATCH 5/5] Fix package downgrade warning
-
----
- .../FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj    | 4 ++--
- .../Microsoft.FSharp.Compiler.nuspec                          | 4 ++--
- src/fsharp/fsc/fsc.fsproj                                     | 1 +
- 3 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
-index aced6e1b4..fcdacc30b 100644
---- a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
-+++ b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
-@@ -770,8 +770,8 @@
-     <PackageReference Include="System.Threading.Tasks.Parallel" Version="$(SystemThreadingTasksParallelVersion)" />
-     <PackageReference Include="System.Threading.Thread" Version="$(SystemThreadingThreadVersion)" />
-     <PackageReference Include="System.Threading.ThreadPool" Version="$(SystemThreadingThreadPoolVersion)" />
--    <PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
--    <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
-+    <PackageReference Include="System.Buffers" Version="4.5.1" />
-+    <PackageReference Include="System.Memory" Version="4.5.4" />
-     <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" />
-     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildVersion)" />
-     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
-diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec
-index b96f90d2a..366488b47 100644
---- a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec
-+++ b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec
-@@ -22,8 +22,8 @@
-                 <dependency id="System.Threading.Thread" version="4.3.0" />
-                 <dependency id="System.Threading.ThreadPool" version="4.3.0" />
-                 <dependency id="System.ValueTuple" version="4.4.0" />
--                <dependency id="System.Buffers" version="4.5.0" />
--                <dependency id="System.Memory" version="4.5.3" />
-+                <dependency id="System.Buffers" version="4.5.1" />
-+                <dependency id="System.Memory" version="4.5.4" />
-             </group>
-         </dependencies>
-         <contentFiles>
-diff --git a/src/fsharp/fsc/fsc.fsproj b/src/fsharp/fsc/fsc.fsproj
-index 776cddc78..df16c1554 100644
---- a/src/fsharp/fsc/fsc.fsproj
-+++ b/src/fsharp/fsc/fsc.fsproj
-@@ -45,6 +45,7 @@
-     <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
-     <PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
-     <PackageReference Include="System.Security.Principal" Version="$(SystemSecurityPrincipalVersion)" />
-+    <PackageReference Include="System.Memory" Version="4.5.4" />
-   </ItemGroup>
-
- </Project>
---
-2.18.0
-
diff --git a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec
index 8f9f4824dd6..f4877b8258c 100644
--- a/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec
+++ b/src/fsharp/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec
@@ -22,8 +22,8 @@
                 <dependency id="System.Threading.Thread" version="4.3.0" />
                 <dependency id="System.Threading.ThreadPool" version="4.3.0" />
                 <dependency id="System.ValueTuple" version="4.4.0" />
-                <dependency id="System.Buffers" version="4.5.0" />
-                <dependency id="System.Memory" version="4.5.3" />
+                <dependency id="System.Buffers" version="4.5.1" />
+                <dependency id="System.Memory" version="4.5.4" />
             </group>
         </dependencies>
         <contentFiles>
diff --git a/src/fsharp/fsc/fsc.fsproj b/src/fsharp/fsc/fsc.fsproj
index 211415f64e1..7fa31fc2151 100644
--- a/src/fsharp/fsc/fsc.fsproj
+++ b/src/fsharp/fsc/fsc.fsproj
@@ -41,6 +41,7 @@
   <ItemGroup>
     <PackageReference Include="System.Console" Version="$(SystemConsoleVersion)" />
     <PackageReference Include="System.Linq.Expressions" Version="$(SystemLinqExpressionsVersion)" />
+    <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
     <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
     <PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
     <PackageReference Include="System.Security.Principal" Version="$(SystemSecurityPrincipalVersion)" />