Merge branch 'release/2.2' of github.com:aspnet/AspNetCore into rybrande/MusicStore2.2

This commit is contained in:
Ryan Brandenburg 2018-11-19 10:52:23 -08:00
commit 8e77b5f6c0
3 changed files with 11 additions and 0 deletions

View File

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

View File

@ -5,4 +5,8 @@
<ExcludeFromPack Include="$(RepositoryRoot)src\Microsoft.Web.Xdt.Extensions\*.csproj" />
</ItemGroup>
<PropertyGroup>
<SignCheckExclusionsFile>$(RepositoryRoot)eng\signcheck.exclusions.txt</SignCheckExclusionsFile>
</PropertyGroup>
</Project>

View File

@ -0,0 +1 @@
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.