Merge branch 'release/2.2'

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))
             {

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" />

src/SiteExtensions/Directory.Build.targets

@@ -0,0 +1,5 @@
+<Project>
+
+  <!-- Not including parent is intentional, this build should be isolated -->
+
+</Project>