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

32535 Commits

Author SHA1 Message Date
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 b875070760
Updating submodule(s) 
EntityFrameworkCore => d53e0ab01598cb05592aee7809e16d6bf55a4e14

[auto-updated: submodules]
 2018-12-04 09:10:44 -08:00
Nate McMaster 61e9b3eae9
Merge Identity, Localization and BasicMiddleware 2018-12-04 09:02:03 -08:00
ASP.NET CI 9f2829a48d Updating BuildTools from 2.2.1-build-20181130.1 to 2.2.1-build-20181203.2 
[auto-updated: buildtools]
 2018-12-04 00:02:41 -08:00
ASP.NET CI ab8919e34f Updating submodule(s) 
EntityFrameworkCore => d0648c44ca6eaade34907f78c3293adc5082858f

[auto-updated: submodules]
 2018-12-04 00:02:30 -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
dotnet-bot 29b7d683fb Merge in 'release/2.2' changes 2018-12-03 21:36:36 +00:00
ASP.NET CI 8ebca1933c Updating submodule(s) 
EntityFrameworkCore => c0800b34b69d114c986c9580df11fcd2eda28830

[auto-updated: submodules]
 2018-12-03 13:20:09 -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
dotnet-bot bc8ef6c1d1 Merge in 'release/2.2' changes 2018-12-01 03:16:49 +00:00
ASP.NET CI b2b1cf24ba Updating BuildTools from 2.2.1-build-20181114.3 to 2.2.1-build-20181130.1 
[auto-updated: buildtools]
 2018-11-30 19:00:00 -08:00
dotnet-bot 36c482af6f Merge in 'release/2.2' changes 2018-12-01 01:54:37 +00:00
Nate McMaster 197c5567f4
Update EFCore submodule (#4349) 
Prepare EF Core to build in 2.2.1

Fixes aspnet/AspNetCore-Internal#1441
 2018-11-30 17:53:19 -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 6faf720363 Merge in 'release/2.2' changes 2018-11-30 21:40:30 +00:00
Nate McMaster 054cfac97e
Add EntityFrameworkCore to the list of submodules patching in 2.2.1 (#4341) 2018-11-30 13:39:28 -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
Chris R cdb9d0bc68 Prepare to patch WebSockets 2018-11-29 10:55:57 -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
dotnet-bot faf40073fc Merge in 'release/2.2' changes 2018-11-29 16:45:49 +00:00
Nate McMaster 78c0813631
Set Microsoft.Owin.Security.Interop to 'noship' for 2.2 (#4314)[ci skip] 2018-11-29 08:44:39 -08:00
dotnet-bot 2410fab6c0 Merge in 'release/2.2' changes 2018-11-29 00:47:11 +00:00
Nate McMaster 8b48191120
Ensure static analysis gets the right package versions when patching a package 2018-11-28 16:46:05 -08:00
dotnet-bot d5fcfbce16 Merge in 'release/2.2' changes 2018-11-29 00:06:08 +00:00
Nate McMaster b38f936f31
Ensure Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets is included in 2.2.1 (#4308) 2018-11-28 16:04:59 -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
Nate McMaster af8d67f353
Ensure static analysis gets the right package versions when patching a package 2018-11-27 12:56:46 -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 a031deb8c5 Merge branch 'rybrande/release21ToSrc' into rybrande/release22ToSrc 2018-11-27 12:17:02 -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 ddb5af991d Merge branch 'rybrande/release21ToSrc' into rybrande/release22ToSrc 2018-11-27 12:12:43 -08:00