huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
42,100 Commits 1 Branch 0 Tags 251 MiB
Commit Graph

221 Commits

Author SHA1 Message Date
Nate McMaster 62f9655a2f
Merge branch 'release/2.2' 2018-12-05 08:54:38 -08:00
Pavel Krymets 2e56f056d0
Re-enable IISIntegration tests (#4377) 2018-12-05 08:24:12 -08:00
Nate McMaster 1be2b427de
Merge branch 'release/2.1' into release/2.2 2018-12-04 14:23:24 -08:00
Chris R 81bc0b1ca8 Fix test asset casing in Hosting funcational tests 2018-12-03 12:50:48 -08:00
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 d852e10293 Hosting/#839 UseConfiguration with a config section 2018-12-03 09:09:09 -08:00
Chris R 63b26d42d2 Replace ManualResetEvent with TaskCompletionSource in TestHost tests 2018-11-28 11:00:22 -08:00
Chris R 70483af8dd Create Hosting.sln to fix tests 2018-11-27 11:58:52 -08:00
Stephen Halter b6eb6dd819 Merge remote-tracking branch 'origin/release/2.2' 2018-11-27 11:14:05 -08:00
Chris Ross (ASP.NET) f7d1e98623 Create Hosting.sln and add Logging.Testing depedendency to fix tests 2018-11-26 15:58:17 -08:00
Nate McMaster 6c60e0260c
Merge branch 'master' from aspnet/Diagnostics 2018-11-21 16:38:27 -08:00
Nate McMaster 006558c412
Merge branch 'release/2.2' 2018-11-21 16:28:33 -08:00
Nate McMaster 925746158e
Merge the release/2.2 branch of Diagnostics 2018-11-21 15:36:05 -08:00
Nate McMaster 0af21077c3
Update .NET Core 3.0 dependencies (#4091) 
* Update Extensions to 3.0.0-preview.18569.14
* Update EFCore to 3.0.0-preview.18569.2
* Update corefx to preview.18566.8
* Update core-setup to preview-27117-01
 2018-11-20 10:37:13 -08:00
Nate McMaster 425c196cba
Merge the master branch of aspnet/Hosting 2018-11-20 09:59:15 -08:00
Nate McMaster b6de45ee72
Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in 241d2c13df
 2018-11-20 09:51:45 -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 3f025e3a38
Make Microsoft.AspNetCore.Server.IntegrationTesting a temporary external dependency 2018-11-19 23:38:13 -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