aspnetcore/src/Hosting/TestHost
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
..
src
test Merge remote-tracking branch 'origin/release/2.1' into tratcher/testhost/2.2 2018-12-03 09:26:57 -08:00