Commit Graph

14064 Commits

Author SHA1 Message Date
Ryan Brandenburg beb142701e Merge branch 'release/2.1' of github.com:aspnet/AspNetCore into rybrande/Mondo2.1 2018-11-27 11:52:30 -08:00
Justin Kotalik 4d856dd279
Revert "Target right version of ANCM nuget package (#4194)" (#4261) 2018-11-27 11:44:47 -08:00
Ryan Brandenburg 137bf3dde7 Merge remote-tracking branch 'Razor/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-27 10:57:43 -08:00
Ryan Brandenburg 54e9e55535 Merge remote-tracking branch 'MvcPrecompilation/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-27 10:57:37 -08:00
Ryan Brandenburg 35d2f10a20 Merge remote-tracking branch 'Mvc/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-27 10:57:22 -08:00
Ryan Brandenburg 5eae7ec020 Merge remote-tracking branch 'SignalR/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-27 10:57:13 -08:00
Ryan Brandenburg 1b461749cb Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in fd4572874e
2018-11-27 10:52:49 -08:00
Ryan Brandenburg 0ea7940af5 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 617586a984
2018-11-27 10:49:05 -08:00
Ryan Brandenburg f4578f127c Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 5a4fd3e792
2018-11-27 10:43:55 -08:00
Ryan Brandenburg 20330961ba Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in bc148a0724
2018-11-27 10:40:07 -08:00
Stephen Halter dabf5d8ba9 [2.1] [Kestrel] Move AddressRegistrationTests to own TestGroup 2018-11-26 18:28:23 -08:00
Chris Ross (ASP.NET) f7d1e98623 Create Hosting.sln and add Logging.Testing depedendency to fix tests 2018-11-26 15:58:17 -08:00
Ryan Brandenburg dc11b1b9de Merge branch 'release/2.2' of github.com:aspnet/AspNetCore into rybrande/Mondo2.2 2018-11-26 11:51:27 -08:00
Nate McMaster c8da5ed085
Remove conditional target frameworks on HealthChecks sample (#4235) 2018-11-26 11:50:19 -08:00
Ryan Brandenburg a5da5612bd Merge remote-tracking branch 'Security/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-21 16:36:06 -08:00
Ryan Brandenburg ee050a4725 Merge remote-tracking branch 'Routing/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-21 16:35:57 -08:00
Ryan Brandenburg 7860280dd9 Merge remote-tracking branch 'ResponseCaching/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-21 16:35:46 -08:00
Ryan Brandenburg 33a5544c90 Merge remote-tracking branch 'HttpSysServer/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-21 16:35:36 -08:00
Ryan Brandenburg 396bb7a2d8 Merge remote-tracking branch 'CORS/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-21 16:35:26 -08:00
Ryan Brandenburg 68eafa9d3c Merge remote-tracking branch 'Antiforgery/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-21 16:35:18 -08:00
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
Ryan Brandenburg ca8ce2e58d Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 93926543f8
2018-11-21 16:13:09 -08:00
Nate McMaster b2d4f8f2f1
Merge branch 'namc/merge-diag' into release/2.2 2018-11-21 16:11:17 -08:00
Ryan Brandenburg d18558c3ab Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 3d828221a1
2018-11-21 16:10:55 -08:00
Ryan Brandenburg c593daa1f9 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 9f49398f28
2018-11-21 16:03:25 -08:00
Ryan Brandenburg bd3a77ec8e Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 3e08bf8833
2018-11-21 16:02:22 -08:00
Ryan Brandenburg e8849f6626 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in f05b0e792d
2018-11-21 16:01:19 -08:00
Ryan Brandenburg d5f14412c2 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 9e5146cff9
2018-11-21 15:59:55 -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
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
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 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 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 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 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 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
Ryan Brandenburg 0f2ae895e3 Remove bower files 2018-11-20 16:02:55 -08:00
Ryan Brandenburg dd914d9430 Revert back to 2.2 2018-11-20 16:00:48 -08:00
Ryan Brandenburg d5587f3c54 Merge remote-tracking branch 'origin/release/2.1' into rybrande/21To22Merge 2018-11-20 15:42:00 -08:00
Javier Calvarro Nelson 4046c842af
Update Identity Server dependencies to 2.3.0 (#2077) 2018-11-20 15:19:14 -08:00
Ryan Brandenburg 48528cf69f Fix templating casing 2018-11-20 12:53:46 -08:00
Ryan Brandenburg bd54395fe5 Remove duplicate keys 2018-11-20 12:07:14 -08:00
Ryan Brandenburg 5e36c334e1 Merge remote-tracking branch 'MetaPackages/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-20 11:10:34 -08:00
Ryan Brandenburg 2b146e5266 Merge remote-tracking branch 'JavaScriptServices/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-20 11:10:19 -08:00
Ryan Brandenburg 65ceeb6560 Merge remote-tracking branch 'AADIntegration/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-20 11:09:14 -08:00
Ryan Brandenburg a6acf47e79 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 27efce1042
2018-11-20 11:06:50 -08:00
Ryan Brandenburg 964498a69d Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 7819c2f950
2018-11-20 11:04:10 -08:00
Ryan Brandenburg 33b736b4a7 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 0efa96de73
2018-11-20 10:57:52 -08:00
Ryan Brandenburg b335283ab1 Merge branch 'release/2.1' of github.com:aspnet/AspNetCore into rybrande/Mondo2.1 2018-11-20 10:24:50 -08:00
Ryan Brandenburg 550435373b Fix casing in MetaPackages 2018-11-20 10:24:34 -08:00
Ryan Brandenburg 6fc3eb3bfc Fix MetaPackage casing 2018-11-20 10:21:21 -08:00
Ryan Brandenburg f45dacf924
Fix folder casing (#4144)
Fix folder casing
2018-11-20 10:02:51 -08:00
Pavel Krymets d17392bc45
Port Resolve C26496 compiler errors when building in release mode with VS 15.9 (#4141) 2018-11-20 10:00:37 -08:00
Nate McMaster bfba741326
Merge aspnet/Hosting release/2.2 2018-11-20 09:35:34 -08:00
Nate McMaster 0f64aa5c01
Merge aspnet/HttpAbstractions release/2.2 2018-11-20 09:15:59 -08:00
Nate McMaster feb68c1382
Merge branch 'release/2.1' into release/2.2 2018-11-20 09:13:55 -08:00
Nate McMaster 9b1cfd59b5
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 0724e6cde1
2018-11-20 09:03:14 -08:00
Nate McMaster 0063d5a031
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 91db78cf92
2018-11-20 08:37:32 -08:00
Nate McMaster 3f025e3a38
Make Microsoft.AspNetCore.Server.IntegrationTesting a temporary external dependency 2018-11-19 23:38:13 -08:00
Nate McMaster 05b8745172
Remove aspnet/Hosting submodule and update targets and projects 2018-11-19 22:25:43 -08:00
Nate McMaster dc4c18e9ac
Merge source code from aspnet/Hosting into this repo 2018-11-19 22:02:46 -08:00
Nate McMaster 87ab2744ce
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 3f7ee338d4
2018-11-19 22:00:32 -08:00
Nate McMaster 4fcc8b9902
Update targets to build HttpAbstractions projects 2018-11-19 21:34:26 -08:00
Nate McMaster 98190bdaf9
Merge source code from aspnet/HttpAbstractions into this repo 2018-11-19 21:13:15 -08:00
Nate McMaster 0ef9993f46
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in d142d58eb4
2018-11-19 21:12:01 -08:00
Ryan Brandenburg 838cafcc4f Fix the casing 2018-11-19 17:01:30 -08:00
Ryan Brandenburg a11f4c2409 Fix the casing 2018-11-19 17:00:44 -08:00
Ryan Brandenburg f98aa3b4a3 Merge remote-tracking branch 'MetaPackages/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-19 16:23:58 -08:00
Ryan Brandenburg 544b5e68e1 Merge remote-tracking branch 'AADIntegration/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-19 16:23:43 -08:00
Ryan Brandenburg 80167655b3 Merge remote-tracking branch 'JavaScriptServices/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-19 16:23:20 -08:00