006558c412
Merge branch 'release/2.2'
2018-11-21 16:28:33 -08:00
925746158e
Merge the release/2.2 branch of Diagnostics
2018-11-21 15:36:05 -08:00
71b1bb8887
Merge branch 'release/2.1' into release/2.2
2018-11-21 14:57:45 -08:00
6a6c88d80b
Merge source code from aspnet/Diagnostics to this repo
2018-11-21 14:23:55 -08:00
425c196cba
Merge the master branch of aspnet/Hosting
2018-11-20 09:59:15 -08:00
294b5f2928
Merge branch 'release/2.2'
2018-11-20 09:47:59 -08:00
feb68c1382
Merge branch 'release/2.1' into release/2.2
2018-11-20 09:13:55 -08:00
05b8745172
Remove aspnet/Hosting submodule and update targets and projects
2018-11-19 22:25:43 -08:00
4fcc8b9902
Update targets to build HttpAbstractions projects
2018-11-19 21:34:26 -08:00
68cc5e7846
Merge release/2.2 and aspnet/KestrelHttpServer
...
* Merges latest changes from the master branch of aspnet/KestrelHttpServer
* Merges changes on release/2.2
2018-11-15 08:41:55 -08:00
6cc9f6f130
Merge release/2.2 and replace submodules
...
* Replace the aspnet/JsonPatch git submodule and merge the master branch of its source to this repo
* Likewise for aspnet/DotNetTools
* And aspnet/HtmlAbstractions
* merge latest infrastructure changes from the release/2.2 branch
2018-11-14 22:57:10 -08:00
0271428dbe
Merge aspnet/KestrelHttpServer release/2.2 and release/2.1
2018-11-14 21:33:33 -08:00
27acef3d46
Merge branch 'release/2.1' into release/2.2
2018-11-14 14:01:43 -08:00
0cf9019caa
Remove KestrelHttpServer submodule and update targets and baselines for Kestrel packages
2018-11-14 11:21:15 -08:00
c1c7d711b6
Merge branch 'release/2.1' into release/2.2
2018-11-14 09:27:23 -08:00
87092a2590
Update targets and infrastructure for dotnet-watch et. al.
2018-11-13 15:58:22 -08:00
ccd098ecad
Update DataProtection to use custom reference resolution
...
This changes DataProtection to build as projects instead of a pseudo-submodule. It replaces Package and ProjectReference with <Reference> items which custom targets then resolve.
2018-11-13 10:28:42 -08:00
bb6901141c
Remove the HtmlAbstractions git submodule and merge Html.Abstractions into this repo
2018-11-13 09:29:27 -08:00
59ed8df382
Add targets and tools for ensuring consistent package versions between servicing builds
2018-11-09 13:05:31 -08:00
Nate McMaster