huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/aspnet/aspnetcore

This commit is contained in:
Justin Kotalik 2019-01-02 14:55:36 -08:00
parent 2d48eeb479 94dd5eff21
commit 3477daf3c4
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/README.md
View File

@ -2,4 +2,4 @@ Contributor documentation
========================= =========================
The primary audience for documentation in this folder is contributors to ASP.NET Core. The primary audience for documentation in this folder is contributors to ASP.NET Core.
If you are looking for documentation on to *use* ASP.NET Core, go to <https://docs.asp.net>. If you are looking for documentation on how to *use* ASP.NET Core, go to <https://docs.asp.net>.

4
src/Hosting/Hosting/src/WebHostBuilder.cs
View File

@ -186,8 +186,8 @@ namespace Microsoft.AspNetCore.Hosting
} }
catch catch
{ {
// Dispose the host if there's a failure to initialize, this should clean up // Dispose the host if there's a failure to initialize, this should dispose
// will dispose services that were constructed until the exception was thrown // services that were constructed until the exception was thrown
host.Dispose(); host.Dispose();
throw; throw;
} }

3
src/Http/WebUtilities/src/HttpResponseStreamWriter.cs
View File

@ -210,7 +210,7 @@ namespace Microsoft.AspNetCore.WebUtilities
private async Task WriteAsyncAwaited(char[] values, int index, int count) private async Task WriteAsyncAwaited(char[] values, int index, int count)
{ {
Debug.Assert(count > 0); Debug.Assert(count > 0);
Debug.Assert(_charBufferSize - _charBufferCount > count); Debug.Assert(_charBufferSize - _charBufferCount < count);
while (count > 0) while (count > 0)
{ {
@ -220,7 +220,6 @@ namespace Microsoft.AspNetCore.WebUtilities
} }
CopyToCharBuffer(values, ref index, ref count); CopyToCharBuffer(values, ref index, ref count);
Debug.Assert(count == 0);
} }
} }

1
src/Identity/README.md
View File

@ -29,3 +29,4 @@ The previous versions of Identity for MVC5 and lower, previously available on Co
* [ASP.NET Identity Firebase Provider](https://github.com/aguacongas/Identity.Firebase) * [ASP.NET Identity Firebase Provider](https://github.com/aguacongas/Identity.Firebase)
* [ASP.NET Identity Redis Provider](https://github.com/aguacongas/Identity.Redis) * [ASP.NET Identity Redis Provider](https://github.com/aguacongas/Identity.Redis)
* [ASP.NET Identity DocumentDB](https://github.com/FelschR/AspNetCore.Identity.DocumentDB) * [ASP.NET Identity DocumentDB](https://github.com/FelschR/AspNetCore.Identity.DocumentDB)
* [ASP.NET Identity Amazon Cognito Provider](https://github.com/aws/aws-aspnet-cognito-identity-provider)