Commit Graph

32553 Commits

Author SHA1 Message Date
dotnet-bot b19997eff8 Merge in 'release/2.2' changes 2018-12-05 18:12:44 +00:00
Justin Kotalik 0646bb98b0
Call Flush With fMoreData=false when response isn't allowed to have body (#4403) 2018-12-05 10:11:36 -08:00
dotnet-bot 9fc1a463a9 Merge in 'release/2.2' changes 2018-12-05 08:22:25 +00:00
ASP.NET CI 1733aa0c9a Updating submodule(s)
EntityFrameworkCore => 8e7402701ea1416b7fe55e1863ae65b3147c02c7

[auto-updated: submodules]
2018-12-05 00:02:26 -08:00
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
Justin Kotalik 736083c2f2
Make HttpSys use ProjectReference and move HttpSys into Servers folder (#4335) 2018-12-04 16:44:07 -08:00
Nate McMaster 495e4fe4f7
Merge branch 'release/2.2' 2018-12-04 16:03:47 -08:00
Nate McMaster 638d6d0630
Merge branch 'release/2.1' 2018-12-04 15:31:29 -08:00
Nate McMaster ab12c706ab
Suppress false-positives in credential scanning (#4392) 2018-12-04 15:30:47 -08:00
Nate McMaster cd3f6e6283
Add Localization assemblies to sign config 2018-12-04 15:29:36 -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 9400390d51
Merge branch 'release/2.1' into release/2.2 2018-12-04 14:47:40 -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 4b3d8e5106
Delete msbuild.binlog 2018-12-04 14:33:21 -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 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