Chris R
|
d73e3b20b8
|
Merge remote-tracking branch 'origin/release/2.1' into tratcher/testhost/2.2
# Conflicts:
# eng/targets/Packaging.targets
# src/Hosting/TestHost/test/ClientHandlerTests.cs
# src/Middleware/WebSockets/test/ConformanceTests/Microsoft.AspNetCore.WebSockets.ConformanceTests.csproj
|
2018-12-03 09:26:57 -08:00 |
|
Chris R
|
63b26d42d2
|
Replace ManualResetEvent with TaskCompletionSource in TestHost tests
|
2018-11-28 11:00:22 -08:00 |
Nate McMaster
|
bfba741326
|
Merge aspnet/Hosting release/2.2
|
2018-11-20 09:35:34 -08:00 |
|
Nate McMaster
|
9b1cfd59b5
|
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 0724e6cde1
|
2018-11-20 09:03:14 -08:00 |
|
Nate McMaster
|
05b8745172
|
Remove aspnet/Hosting submodule and update targets and projects
|
2018-11-19 22:25:43 -08:00 |
|
Nate McMaster
|
87ab2744ce
|
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 3f7ee338d4
|
2018-11-19 22:00:32 -08:00 |