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

14069 Commits

Author SHA1 Message Date
dotnet-bot 69a0641c53 Merge in 'release/2.2' changes 2018-12-05 02:13:55 +00:00
Stephen Halter f6e691f26a Move InMemory.FunctionalTests to own TestGroup 
It looks like some shutdown timeouts are cause by CPU starvation
 2018-12-04 17:54:42 -08:00
Nate McMaster 495e4fe4f7
Merge branch 'release/2.2' 2018-12-04 16:03:47 -08:00
Nate McMaster 11fdf9b50a
Fix bad merge of .csproj and update Middleware.sln 2018-12-04 14:59:11 -08:00
Nate McMaster 2c376ebc0c
Merge the release/2.2 branch of aspnet/Identity 2018-12-04 14:49:11 -08:00
Nate McMaster c5bc96d601
Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in 4b3d8e5106
 2018-12-04 14:45:54 -08:00
Nate McMaster e261ca5426
Merge release/2.2 from aspnet/Localization 2018-12-04 14:25:25 -08:00
Nate McMaster 7e823a05ec
Merge release/2.2 from aspnet/BasicMiddleware 2018-12-04 14:24:42 -08:00
Nate McMaster 1be2b427de
Merge branch 'release/2.1' into release/2.2 2018-12-04 14:23:24 -08:00
Nate McMaster 44ec52ebfe
Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in 2d3ad1cb0f
 2018-12-04 14:10:25 -08:00
Nate McMaster d8c434febe
Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in de1579bdda
 2018-12-04 13:57:22 -08:00
Nate McMaster 61e9b3eae9
Merge Identity, Localization and BasicMiddleware 2018-12-04 09:02:03 -08:00
Javier Calvarro Nelson f6b4d65218
[Diagnostics] Fix Diagnostics middleware errors (#4271) 
Removes setting two forbidden headers.
 2018-12-04 01:18:31 +01:00
Nate McMaster a6b5bb16fd
Merge source code from aspnet/Identity 2018-12-03 15:54:12 -08:00
Nate McMaster c6459614c7
Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in fa3cfd08eb
 2018-12-03 15:52:23 -08:00
Chris R 81bc0b1ca8 Fix test asset casing in Hosting funcational tests 2018-12-03 12:50:48 -08:00
dotnet-bot 342d55bef6 Merge in 'release/2.2' changes 2018-12-03 20:13:50 +00: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
Mikael Mengistu d9a953dfeb
Autobahn test suite fix(#4302) 2018-11-30 16:42:23 -08:00
Nate McMaster 7078102961
Update targets and projects to build Localization projects 2018-11-30 15:13:05 -08:00
Nate McMaster 7e0f561425
Merge source code from aspnet/Localization 2018-11-30 15:11:31 -08:00
Nate McMaster d93796fdef
Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in 0bcac31dd7
 2018-11-30 14:58:51 -08:00
Nate McMaster 04fc8ae493
Update targets and projects to build BasicMiddleware projects 2018-11-30 14:44:17 -08:00
Nate McMaster 0843320e3e
Merge source code from aspnet/BasicMiddleware 2018-11-30 14:42:07 -08:00
Nate McMaster 2f2cec4ace
Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in 1de636cd18
 2018-11-30 14:21:50 -08:00
dotnet-bot ebe1bea714 Merge in 'release/2.2' changes 2018-11-29 23:05:26 +00:00
BrennanConroy 7dc01b6928 Fix 2.2 benchmarks (#4322) 2018-11-29 15:04:24 -08:00
dotnet-bot da7f95dfa2 Merge in 'release/2.2' changes 2018-11-29 17:26:57 +00:00
BrennanConroy e435fd1d23
Fix accidental skipped tests (#4301) 2018-11-29 09:25:52 -08:00
Chris R 63b26d42d2 Replace ManualResetEvent with TaskCompletionSource in TestHost tests 2018-11-28 11:00:22 -08:00
dotnet-bot 93b26d0cc4 Merge in 'release/2.2' changes 2018-11-28 02:33:02 +00:00
Mikael Mengistu 079107aa92 Make gradlew executable (#4275) 2018-11-27 18:31:57 -08:00
Ryan Brandenburg e46623e256 Merge remote-tracking branch 'Razor/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-27 12:26:29 -08:00
Ryan Brandenburg 9c3fee5fea Merge remote-tracking branch 'MvcPrecompilation/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-27 12:26:22 -08:00
Ryan Brandenburg 4d9b60d0ad Merge remote-tracking branch 'Mvc/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-27 12:26:05 -08:00
Ryan Brandenburg c51e6aad29 Merge remote-tracking branch 'SignalR/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-27 12:25:27 -08:00
Ryan Brandenburg 6f80eeda29 Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in 8ba0a89425
 2018-11-27 12:16:27 -08:00
Ryan Brandenburg 589db8b413 Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in 032768b063
 2018-11-27 12:12:19 -08:00
Ryan Brandenburg b659c82df6 Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in a6199bbfba
 2018-11-27 12:09:17 -08:00
Ryan Brandenburg 1992701808 Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in d0bcdf3dd9
 2018-11-27 12:06:02 -08:00
Chris R 70483af8dd Create Hosting.sln to fix tests 2018-11-27 11:58:52 -08:00
Ryan Brandenburg 6603195a10 Merge remote-tracking branch 'origin/release/2.1' into rybrande/Mondo2.2 2018-11-27 11:57:39 -08:00
Ryan Brandenburg beb142701e Merge branch 'release/2.1' of github.com:aspnet/AspNetCore into rybrande/Mondo2.1 2018-11-27 11:52:30 -08:00
dotnet-bot 1716c7bd02 Merge in 'release/2.2' changes 2018-11-27 19:45:47 +00:00
Justin Kotalik 4d856dd279
Revert "Target right version of ANCM nuget package (#4194)" (#4261) 2018-11-27 11:44:47 -08:00
Ryan Brandenburg 137bf3dde7 Merge remote-tracking branch 'Razor/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-27 10:57:43 -08:00
Ryan Brandenburg 54e9e55535 Merge remote-tracking branch 'MvcPrecompilation/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-27 10:57:37 -08:00
Ryan Brandenburg 35d2f10a20 Merge remote-tracking branch 'Mvc/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-27 10:57:22 -08:00
Ryan Brandenburg 5eae7ec020 Merge remote-tracking branch 'SignalR/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-27 10:57:13 -08:00
Ryan Brandenburg 1b461749cb Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in fd4572874e
 2018-11-27 10:52:49 -08:00