Commit Graph

21239 Commits

Author SHA1 Message Date
Ryan Brandenburg 1ee4e2b936 Merge remote-tracking branch 'origin/release/2.1' into rybrande/Mondo2.2 2018-11-21 16:33:42 -08:00
Ryan Brandenburg 7ee9dac67f Merge branch 'release/2.1' of github.com:aspnet/AspNetCore into rybrande/Mondo2.1 2018-11-21 16:26:13 -08:00
Nate McMaster b2d4f8f2f1
Merge branch 'namc/merge-diag' into release/2.2 2018-11-21 16:11:17 -08:00
Ryan Brandenburg 101303eceb Fix RepositoryUrls 2018-11-21 15:55:40 -08:00
Justin Kotalik 89330075b4
Target right version of ANCM nuget package (#4194) 2018-11-21 15:42:55 -08:00
Nate McMaster 8ce7bb7f16
Add HealthChecks to Middleware.sln 2018-11-21 15:39:10 -08:00
Nate McMaster 925746158e
Merge the release/2.2 branch of Diagnostics 2018-11-21 15:36:05 -08:00
Ryan Brandenburg 94e1afafa6 Remove submodules for Antiforgery CORS HttpSysServer ResponseCaching Routing and Security 2018-11-21 15:26:19 -08:00
Nate McMaster 16212ae6df
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in c802d5ef5f
2018-11-21 15:22:25 -08:00
Ryan Brandenburg db7b28d475 Merge remote-tracking branch 'Security/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-21 15:17:40 -08:00
Ryan Brandenburg ff3891fa7a Merge remote-tracking branch 'Routing/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-21 15:17:30 -08:00
Ryan Brandenburg c8e271e8ac Merge remote-tracking branch 'ResponseCaching/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-21 15:17:21 -08:00
Ryan Brandenburg 5c0097bf69 Merge remote-tracking branch 'HttpSysServer/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-21 15:17:11 -08:00
Ryan Brandenburg af2f57386e Merge remote-tracking branch 'CORS/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-21 15:17:00 -08:00
Ryan Brandenburg 3e59973378 Merge remote-tracking branch 'Antiforgery/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-21 15:16:52 -08:00
Ryan Brandenburg f7b51eedda Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 930ed239e4
2018-11-21 15:12:11 -08:00
Ryan Brandenburg 3840ca4451 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 58b66f7cbb
2018-11-21 15:09:05 -08:00
Ryan Brandenburg ce2f7908e4 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 777b2fbf7e
2018-11-21 15:06:37 -08:00
Ryan Brandenburg 03db4faa68 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in d8d1f36f28
2018-11-21 15:05:23 -08:00
Ryan Brandenburg 2374a67d55 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in ec429447bf
2018-11-21 15:03:35 -08:00
Ryan Brandenburg 42a93c8153 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 93b496090e
2018-11-21 15:01:46 -08:00
Nate McMaster 71b1bb8887
Merge branch 'release/2.1' into release/2.2 2018-11-21 14:57:45 -08:00
Ryan Brandenburg c80604a7da
Fix directory structure (#4201)
Fix directory structure
2018-11-21 14:55:25 -08:00
Nate McMaster 6a6c88d80b
Merge source code from aspnet/Diagnostics to this repo 2018-11-21 14:23:55 -08:00
Nate McMaster ed0b421695
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 8893337fb0
2018-11-21 13:54:33 -08:00
ASP.NET CI f9bb5e5171 Updating BuildTools from 2.1.3-rtm-15846 to 2.1.3-rtm-15847
[auto-updated: buildtools]
2018-11-21 11:48:03 -08:00
Ryan Brandenburg 498e49bc84 Merge branch 'release/2.2' of github.com:aspnet/AspNetCore into rybrande/Mondo2.2 2018-11-21 11:30:50 -08:00
Artak a13e3b4813 Marked the `Microsoft.Extensions.ApiDescription.Design` package as "noship" (#4185) 2018-11-21 11:25:24 -08:00
Ryan Brandenburg 1ac92426ab Merge remote-tracking branch 'Session/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-21 11:15:09 -08:00
Ryan Brandenburg 7b708c291c Merge remote-tracking branch 'StaticFiles/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-21 11:15:02 -08:00
Ryan Brandenburg 7a9e1f9ec9 Merge remote-tracking branch 'ServerTests/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-21 11:14:50 -08:00
Ryan Brandenburg bfffb3c31e Merge remote-tracking branch 'origin/release/2.1' into rybrande/Mondo2.2 2018-11-21 11:11:35 -08:00
Ryan Brandenburg 7154ae2b94 Merge branch 'rybrande/release21ToSrc' into rybrande/release22ToSrc 2018-11-21 11:03:07 -08:00
Ryan Brandenburg feb5e3ac9b Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 774079d60d
2018-11-21 11:02:38 -08:00
Ryan Brandenburg 9d8eb419f3 Merge branch 'rybrande/release21ToSrc' into rybrande/release22ToSrc 2018-11-21 10:59:52 -08:00
Ryan Brandenburg c391301dce Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in a5fcd9dd87
2018-11-21 10:59:42 -08:00
Ryan Brandenburg 256f22ea6b Merge branch 'rybrande/release21ToSrc' into rybrande/release22ToSrc 2018-11-21 10:58:36 -08:00
Ryan Brandenburg 04096c9225 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 04c6c6bab8
2018-11-21 10:58:10 -08:00
Ryan Brandenburg 2711049cf4 Fix submodules for ServerTests StaticFiles and Session 2018-11-21 10:08:51 -08:00
Ryan Brandenburg e6b3a5b79b Merge remote-tracking branch 'Session/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-21 10:05:41 -08:00
Ryan Brandenburg 93238389a7 Merge remote-tracking branch 'StaticFiles/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-21 10:05:32 -08:00
Ryan Brandenburg c75177033a Merge remote-tracking branch 'ServerTests/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-21 10:05:22 -08:00
Ryan Brandenburg 95928c0c64 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in d20c2c8f04
2018-11-21 10:02:17 -08:00
Ryan Brandenburg 98bbdf6e34 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 2b285667a8
2018-11-21 10:00:40 -08:00
Ryan Brandenburg 9ba11244f2 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 019ba1722e
2018-11-21 09:58:26 -08:00
Ryan Brandenburg 1d36dfeb5e Sign Browserlink 2018-11-20 16:56:56 -08:00
Ryan Brandenburg 396aa9735e PR feedback 2018-11-20 16:15:51 -08:00
Ryan Brandenburg 564f5a45ba Fix about 2018-11-20 16:09:50 -08:00
Ryan Brandenburg d0c73c16d5 Fix tests 2018-11-20 16:08:17 -08:00
Ryan Brandenburg 70260923ef Remove extras 2018-11-20 16:06:40 -08:00