From 20f7d3be9d2617058ad680ebe447f6a015f29df9 Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Fri, 16 Nov 2018 09:06:48 -0800
Subject: [PATCH 1/2] Prevent SiteExtension OOB build from including root
 Directory.props/targets (#4064)

---
 src/SiteExtensions/Directory.Build.props   | 3 +--
 src/SiteExtensions/Directory.Build.targets | 5 +++++
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 src/SiteExtensions/Directory.Build.targets

diff --git a/src/SiteExtensions/Directory.Build.props b/src/SiteExtensions/Directory.Build.props
index e0780dd926..b6e2f87d64 100644
--- a/src/SiteExtensions/Directory.Build.props
+++ b/src/SiteExtensions/Directory.Build.props
@@ -1,7 +1,6 @@
 <Project>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
-
+  <!-- Not including parent is intentional, this build should be isolated -->
   <Import Project="build\sources.props" />
   <Import Project="build\dependencies.props" />
   <Import Project="version.props" />
diff --git a/src/SiteExtensions/Directory.Build.targets b/src/SiteExtensions/Directory.Build.targets
new file mode 100644
index 0000000000..3787302e64
--- /dev/null
+++ b/src/SiteExtensions/Directory.Build.targets
@@ -0,0 +1,5 @@
+<Project>
+
+  <!-- Not including parent is intentional, this build should be isolated -->
+
+</Project>

From f7c26f991265323274381b030f136810cf162090 Mon Sep 17 00:00:00 2001
From: Ben Adams <thundercat@illyriad.co.uk>
Date: Sat, 17 Nov 2018 00:18:23 +0000
Subject: [PATCH 2/2] [2.2.1] Use non-pinnable buffer for zero byte read
 (#4066)

---
 .../Transport.Sockets/src/Internal/SocketReceiver.cs        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketReceiver.cs b/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketReceiver.cs
index 5d33f49829..3c3451cbcc 100644
--- a/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketReceiver.cs
+++ b/src/Servers/Kestrel/Transport.Sockets/src/Internal/SocketReceiver.cs
@@ -15,7 +15,13 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.Internal
 
         public SocketAwaitableEventArgs WaitForDataAsync()
         {
+#if NETCOREAPP2_1
+            _awaitableEventArgs.SetBuffer(Memory<byte>.Empty);
+#elif NETSTANDARD2_0
             _awaitableEventArgs.SetBuffer(Array.Empty<byte>(), 0, 0);
+#else
+#error TFMs need to be updated
+#endif
 
             if (!_socket.ReceiveAsync(_awaitableEventArgs))
             {