Commit Graph

32524 Commits

Author SHA1 Message Date
dotnet-bot 5e9b60a573 Merge in 'release/2.2' changes 2018-12-07 21:49:04 +00:00
Nate McMaster 5017afa0ad
Merge branch 'release/2.1' to release/2.2 2018-12-07 12:45:42 -08:00
dotnet-bot 212f701d31 Merge in 'release/2.2' changes 2018-12-07 20:22:15 +00:00
dotnet-maestro-bot c331a7be14 Rewrite HttpSys response caching tests #1475 (#4486) (#4511) 2018-12-07 12:21:12 -08:00
Nate McMaster df3e4b98a2
Backport infrastructure cleanup to share sources and project references (#4513) 2018-12-07 12:20:13 -08:00
Chris Ross ae11d5d62e
Rewrite HttpSys response caching tests #1475 (#4486) 2018-12-07 09:21:33 -08:00
dotnet-bot 5af396024f Merge in 'release/2.2' changes 2018-12-07 16:21:43 +00:00
seancpeters 1670a2bd30 Updating scaffolding submodule (#4491) 2018-12-07 08:20:40 -08:00
dotnet-bot 44f04c8b4d Merge in 'release/2.2' changes 2018-12-07 01:43:13 +00:00
Nate McMaster 569a14ecb8
Merge branch 'release/2.1' into release/2.2 2018-12-06 17:09:03 -08:00
Nate McMaster 5d777b2c66
Conditionally skip patch.zip files which way not be produced in servicing builds (#4481) 2018-12-06 14:06:42 -08:00
Nate McMaster de994e0a8b
Create temporary PR validation which just compiles, without tests (#4478) 2018-12-06 12:41:37 -08:00
Nate McMaster 5c2a701b38
Remove conditional targetframeworks from routing projects (#4476) 2018-12-06 12:21:05 -08:00
dotnet-bot 19ccc8324d Merge in 'release/2.2' changes 2018-12-06 08:23:56 +00:00
ASP.NET CI fcfefd3908 Updating BuildTools from 2.2.1-build-20181203.2 to 2.2.1-build-20181205.2
[auto-updated: buildtools]
2018-12-06 08:03:46 +00:00
Nate McMaster 50bea05918
Refactor Routing to use ProjectReference and move into src/Http folder (#4441)
Changes:

* Stop producing Microsoft.AspNetCore.Routing.DecisionTree.Sources. I could not find any usages outside of the Microsoft.AspNetCore.Routing assembly, so I've moved this to be a subfolder of code in the Microsoft.AspNetCore.Routing project.
* Stop building src/Routing as a submodule. Use ProjectReference instead
* Move projects from src/Routing into src/Http/Routing/ and src/Http/Routing.Abstractions/
* Update package baselines and dependencies to support building routing projects and samples
2018-12-05 22:14:22 -08:00
Nate McMaster 1b9a6b093d
Replace PackNuspec with a dummy .csproj file 2018-12-05 17:59:29 -08:00
Justin Kotalik 0588b13f5b Fix 2.1 build issues and remove obsolete build code (#4443)
- Stop producing the 'Universe' lineup package
- Removes all PackageLineup code
- Use full msbuild on Windows
- Fix invalid reference to internal.aspnetcore.sdk in 2.1.x
- Fix shared folder references for PackageArchive task.
2018-12-05 17:01:02 -08:00
dotnet-bot 19511ed4e9 Merge in 'release/2.2' changes 2018-12-06 00:30:18 +00:00
Nate McMaster c430342dee
Ensure Internal.AspNetCore.Sdk does not end up in the LZMA (#4448) 2018-12-05 16:29:12 -08:00
ASP.NET CI 49a45e7eca Updating BuildTools from 2.1.3-rtm-15847 to 2.1.3-rtm-15848
[auto-updated: buildtools]
2018-12-05 16:21:10 -08:00
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