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 1/4] [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))
             {

From 5e961e27ea083f640daa8c46b3bd72b076932e28 Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Fri, 16 Nov 2018 17:17:44 -0800
Subject: [PATCH 2/4] Ignore apphost.exe in runtime store (#4073)

---
 src/SiteExtensions/build/repo.props             | 2 ++
 src/SiteExtensions/eng/signcheck.exclusions.txt | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 src/SiteExtensions/eng/signcheck.exclusions.txt

diff --git a/src/SiteExtensions/build/repo.props b/src/SiteExtensions/build/repo.props
index 25129c9001..eca3003474 100644
--- a/src/SiteExtensions/build/repo.props
+++ b/src/SiteExtensions/build/repo.props
@@ -3,6 +3,8 @@
 
   <ItemGroup>
     <ExcludeFromPack Include="$(RepositoryRoot)src\Microsoft.Web.Xdt.Extensions\*.csproj" />
+
+    <SignCheckExclusionsFile>$(RepositoryRoot)eng\signcheck.exclusions.txt</SignCheckExclusionsFile>
   </ItemGroup>
 
 </Project>
diff --git a/src/SiteExtensions/eng/signcheck.exclusions.txt b/src/SiteExtensions/eng/signcheck.exclusions.txt
new file mode 100644
index 0000000000..4f16d97025
--- /dev/null
+++ b/src/SiteExtensions/eng/signcheck.exclusions.txt
@@ -0,0 +1 @@
+content/sdk/*/AppHostTemplate/apphost.exe;AspNetCoreRuntime.*.nupkg; Exclude the apphost because this is expected to be code-signed by customers after the SDK modifies it.

From ca42d0295e4673759e3a8e49ed07d7655dc9e4d0 Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Mon, 19 Nov 2018 08:26:28 -0800
Subject: [PATCH 3/4] Use property group for sign exclussions

---
 src/SiteExtensions/build/repo.props | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/SiteExtensions/build/repo.props b/src/SiteExtensions/build/repo.props
index eca3003474..419564007a 100644
--- a/src/SiteExtensions/build/repo.props
+++ b/src/SiteExtensions/build/repo.props
@@ -3,8 +3,10 @@
 
   <ItemGroup>
     <ExcludeFromPack Include="$(RepositoryRoot)src\Microsoft.Web.Xdt.Extensions\*.csproj" />
-
-    <SignCheckExclusionsFile>$(RepositoryRoot)eng\signcheck.exclusions.txt</SignCheckExclusionsFile>
   </ItemGroup>
 
+  <PropertyGroup>
+    <SignCheckExclusionsFile>$(RepositoryRoot)eng\signcheck.exclusions.txt</SignCheckExclusionsFile>
+  </PropertyGroup>
+
 </Project>

From e4249dade09f5c9772d3665d6af09de9997888fd Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Mon, 19 Nov 2018 08:42:21 -0800
Subject: [PATCH 4/4] Fix the SiteExtension signing exclusion

---
 src/SiteExtensions/eng/signcheck.exclusions.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SiteExtensions/eng/signcheck.exclusions.txt b/src/SiteExtensions/eng/signcheck.exclusions.txt
index 4f16d97025..77d94eceda 100644
--- a/src/SiteExtensions/eng/signcheck.exclusions.txt
+++ b/src/SiteExtensions/eng/signcheck.exclusions.txt
@@ -1 +1 @@
-content/sdk/*/AppHostTemplate/apphost.exe;AspNetCoreRuntime.*.nupkg; Exclude the apphost because this is expected to be code-signed by customers after the SDK modifies it.
+content/store/*/apphost.exe;Microsoft.AspNetCore.AzureAppServices.SiteExtension.*.nupkg; Exclude the apphost because this is expected to be code-signed by customers after the SDK modifies it.