Commit Graph

24204 Commits

Author SHA1 Message Date
Stephen Halter b6eb6dd819 Merge remote-tracking branch 'origin/release/2.2' 2018-11-27 11:14:05 -08:00
ASP.NET CI d6dd697774 Updating submodule(s)
Identity => 4046c842af

[auto-updated: submodules]
2018-11-27 10:10:22 -08:00
ASP.NET CI 4c000b03d6 Updating submodule(s)
Mvc => c9887e027a

[auto-updated: submodules]
2018-11-27 10:01:51 -08:00
Nate McMaster a0d1b8882b
Fix for ArgumentException thrown due to empty user secrets ID (#4240) 2018-11-26 17:11:58 -08:00
Stephen Halter 6a3d0fc1da
[Kestrel] Re-enable trace-level test logging (#4075) 2018-11-26 16:20:43 -08:00
Ryan Brandenburg 02ca469ea1 Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/Mondo22ToMaster 2018-11-26 16:00:44 -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 291e743c9c Remove duplicate order 2018-11-26 14:48:05 -08:00
Nate McMaster f57bed87ee
Avoid build order changes
Co-Authored-By: ryanbrandenburg <rybrande@microsoft.com>
2018-11-26 14:45:22 -08:00
Justin Kotalik 5a1ff478da
Add reference to M.A.Hosting (#4237) 2018-11-26 12:44:48 -08:00
Ryan Brandenburg 7aefd16eed Merge remote-tracking branch 'Security/rybrande/masterToSrc' into rybrande/Mondo22ToMaster 2018-11-26 12:35:26 -08:00
Ryan Brandenburg 01b58c9a3d Merge remote-tracking branch 'Routing/rybrande/masterToSrc' into rybrande/Mondo22ToMaster 2018-11-26 12:35:21 -08:00
Ryan Brandenburg a498d273e7 Merge remote-tracking branch 'ResponseCaching/rybrande/masterToSrc' into rybrande/Mondo22ToMaster 2018-11-26 12:35:16 -08:00
Ryan Brandenburg a84b7d242b Merge remote-tracking branch 'HttpSysServer/rybrande/masterToSrc' into rybrande/Mondo22ToMaster 2018-11-26 12:35:07 -08:00
Ryan Brandenburg 5e9617a5ab Merge remote-tracking branch 'CORS/rybrande/masterToSrc' into rybrande/Mondo22ToMaster 2018-11-26 12:34:50 -08:00
Ryan Brandenburg 4429575b50 Merge remote-tracking branch 'Antiforgery/rybrande/masterToSrc' into rybrande/Mondo22ToMaster 2018-11-26 12:34:43 -08:00
Ryan Brandenburg e60e74e2bb Merge remote-tracking branch 'origin/release/2.2' into rybrande/Mondo22ToMaster 2018-11-26 12:32:17 -08:00
Chris Ross e8fbd910a5
Remove Kestrel.Https from Microsoft.AspNetCore (#4236) 2018-11-26 12:21:00 -08:00
Ryan Brandenburg c849d5960a Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc 2018-11-26 12:19:19 -08:00
Ryan Brandenburg 30572ac74a Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 26d27d871b
2018-11-26 12:19:01 -08:00
Ryan Brandenburg 28e820809d Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc 2018-11-26 12:16:42 -08:00
Ryan Brandenburg 6afc6c11a9 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in c28c7dea4e
2018-11-26 12:16:11 -08:00
Ryan Brandenburg 74f1aea588 Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc 2018-11-26 12:13:35 -08:00
Ryan Brandenburg 25ae8871e0 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 12395b4d1c
2018-11-26 12:13:11 -08:00
Ryan Brandenburg f72669d71b Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc 2018-11-26 12:11:42 -08:00
Ryan Brandenburg 70dcf6c286 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in d4f5886582
2018-11-26 12:11:10 -08:00
Ryan Brandenburg 1a42d7413d Merge branch 'master' of github.com:aspnet/CORS into rybrande/masterToSrc 2018-11-26 12:09:52 -08:00
Ryan Brandenburg 2fb269dda8 Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc 2018-11-26 12:09:15 -08:00
Ryan Brandenburg b94e30d1b7 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in c39d85f6df
2018-11-26 12:08:28 -08:00
Ryan Brandenburg 8bb1f52001 Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc 2018-11-26 12:06:23 -08:00
Ryan Brandenburg 251f924a31 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 8124442320
2018-11-26 12:05:56 -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
Chris Ross (ASP.NET) c88c1f96f4 KestrelHttpServer/#3101 Remove empty Microsoft.AspNetCore.Server.Kestrel.Https assembly 2018-11-26 10:03:03 -08:00
Nate McMaster d06891e045
Update dependencies
* corefx to preview.18571.3
 * core-setup to 3.0.0-preview-27122-01
 * buildtools to 3.0.0-build-20181120.4
 * extensions to 3.0.0-preview.18572.1
 * efcore to 3.0.0-preview.18572.1

Fix #4172 - remove signcheck exclusion for core-setup files
2018-11-22 15:38:41 -08:00
Nate McMaster a5d06f35b1
Remove Roslyn from the shared framework (#4225)
Reacting to aspnet/Mvc#8755
2018-11-22 12:56:34 -08:00
ASP.NET CI 2b50ac85b9 Updating submodule(s)
Identity => 8003a5550e
Mvc => f80490f99d
Routing => c28c7dea4e

[auto-updated: submodules]
2018-11-21 17:46:18 -08:00
Nate McMaster 28157e6259
Merge branch 'release/2.2' 2018-11-21 17:16:48 -08:00
Nate McMaster c28c7dea4e
Update README.md (#917) 2018-11-21 16:52:11 -08:00
Nate McMaster f67acd67a2
Update test projects to netcoreapp3.0 2018-11-21 16:50:09 -08:00
Nate McMaster 6c60e0260c
Merge branch 'master' from aspnet/Diagnostics 2018-11-21 16:38:27 -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
Nate McMaster 006558c412
Merge branch 'release/2.2' 2018-11-21 16:28:33 -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