Commit Graph

19306 Commits

Author SHA1 Message Date
Nate McMaster 9cb41d7f80
Fix the casing on the templating submodule group 2018-11-19 21:03:41 -08:00
Nate McMaster 7c6bf7f75d
Merge branch 'release/2.2' 2018-11-19 21:00:19 -08:00
Nate McMaster ae619e6b7f
Include Microsoft.Extensions.Http.dll in signing 2018-11-19 18:38:09 -08:00
Nate McMaster 6e40f92ed4
Merge branch 'release/2.1' into release/2.2 2018-11-19 17:20:55 -08:00
Nate McMaster ea1ba001cc
Fix casing issue in the path the templating code submodule 2018-11-19 17:20:02 -08:00
Nate McMaster 21b142b65d
Merge branch 'release/2.1' into release/2.2 2018-11-19 17:04:13 -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 94f5e2bc1b Fix submodule 2018-11-19 16:57:06 -08:00
Ryan Brandenburg ade4572238 Fix submodules for AADIntegration JavaScriptServices and MetaPackages 2018-11-19 16:28:13 -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
Ryan Brandenburg 219fd0b300 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 975011071b
2018-11-19 16:20:16 -08:00
Ryan Brandenburg 151dd77fb8 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 6f02048c3c
2018-11-19 16:18:06 -08:00
Ryan Brandenburg f6f7628718 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in ea3a7bc897
2018-11-19 16:14:42 -08:00
Ryan Brandenburg 78eb188014 Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MondoMaster 2018-11-19 16:01:22 -08:00
Chris Ross (ASP.NET) 241d2c13df Add TestServer support for generic WebHost #1583 2018-11-19 14:55:18 -08:00
Ryan Brandenburg 37399bc217 Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MusicStoreMaster 2018-11-19 12:34:59 -08:00
Ryan Brandenburg af6792afc3 Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MondoMaster 2018-11-19 12:24:58 -08:00
Ryan Brandenburg ea68246950 Fix submodules for AuthSamples AzureIntegration and Templating 2018-11-19 12:21:41 -08:00
Ryan Brandenburg 47946238dd Merge remote-tracking branch 'Templating/rybrande/masterToSrc' into rybrande/MondoMaster 2018-11-19 12:18:17 -08:00
Ryan Brandenburg 1698beeee9 Merge remote-tracking branch 'AzureIntegration/rybrande/masterToSrc' into rybrande/MondoMaster 2018-11-19 12:18:08 -08:00
Ryan Brandenburg 9a70e404c9 Merge remote-tracking branch 'AuthSamples/rybrande/masterToSrc' into rybrande/MondoMaster 2018-11-19 12:17:53 -08:00
Ryan Brandenburg 6bf4967148 Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc 2018-11-19 12:15:46 -08:00
Ryan Brandenburg 39e8397b9a Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 75e3133cdb
2018-11-19 12:15:18 -08:00
Ryan Brandenburg e8e4c336fb Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc 2018-11-19 12:13:13 -08:00
Ryan Brandenburg f18c892bfb Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 8f471bf65b
2018-11-19 12:12:53 -08:00
Ryan Brandenburg fb90b5b4a9 Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc 2018-11-19 12:11:28 -08:00
Ryan Brandenburg 0816fded9d Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 514fcdcba5
2018-11-19 12:10:28 -08:00
Nate McMaster 4173f23e3e
Remove the HttpClientFactory submodule (#4085) 2018-11-19 12:05:39 -08:00
ASP.NET CI 0b8fe9ded9 Updating BuildTools from 3.0.0-build-20181114.5 to 3.0.0-build-20181116.1
[auto-updated: buildtools]
2018-11-19 11:56:13 -08:00
ASP.NET CI db42dd7faa Updating submodule(s)
AADIntegration => 3c282a4f5a
AuthSamples => 8f471bf65b
CORS => c39d85f6df
Diagnostics => 082d505977
Hosting => f6cda4fab7
HttpAbstractions => 962ec07bdb
HttpClientFactory => 7c4f9479b4753a37c8b0669a883002e5e448cc94
Identity => 68b878f0e1
JavaScriptServices => e657e7d79a
Localization => 60a3d57a3e
MetaPackages => 501dd3924b
MusicStore => aca4b432e1
Mvc => 2414db256f
Razor => 6c8e900d11
Routing => aed55d4517
Security => e053878464
ServerTests => 619d358585
Session => abbdfb72ef
SignalR => 2c3ebd1648
Templating => 514fcdcba5

[auto-updated: submodules]
2018-11-19 11:56:01 -08:00
Ryan Brandenburg 2cda14658d Fix submodules for AuthSamples AzureIntegration and Templating 2018-11-19 11:55:24 -08:00
Ryan Brandenburg 4f84c1f58c Merge remote-tracking branch 'Templating/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-19 11:51:17 -08:00
Ryan Brandenburg 9dda18a355 Merge remote-tracking branch 'AzureIntegration/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-19 11:51:03 -08:00
Ryan Brandenburg 8c81ace1a2 Merge remote-tracking branch 'AuthSamples/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-19 11:50:44 -08:00
Ryan Brandenburg eeb0970520 Merge branch 'rybrande/release21ToSrc' into rybrande/release22ToSrc 2018-11-19 11:48:14 -08:00
Ryan Brandenburg 357c79f619 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in d26f89a6bc
2018-11-19 11:47:50 -08:00
Ryan Brandenburg 111cfe9992 Merge branch 'rybrande/release21ToSrc' into rybrande/release22ToSrc 2018-11-19 11:45:00 -08:00
Ryan Brandenburg 2becec387b Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 7383e532c9
2018-11-19 11:44:35 -08:00
Ryan Brandenburg d2faba6953 Merge branch 'rybrande/release21ToSrc' into rybrande/release22ToSrc 2018-11-19 11:42:42 -08:00
Ryan Brandenburg f3ccfa326a Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 031a2ed214
2018-11-19 11:42:11 -08:00
Ryan Brandenburg 6044a66a63 Have the trailing slash 2018-11-19 11:28:19 -08:00
Ryan Brandenburg 69534b5687 Fix AzureIntegration submodule 2018-11-19 11:18:31 -08:00
Ryan Brandenburg c9e0295d1d Merge remote-tracking branch 'AzureIntegration/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-19 11:16:52 -08:00
Nate McMaster 9954f5a703
Fix MSB4062 - fix conflicting build tools dependencies by ensuring the same version is used 2018-11-19 11:16:03 -08:00
Ryan Brandenburg bb361b02f3 Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 47e2ba3755
2018-11-19 11:15:08 -08:00
Ryan Brandenburg 33a92fecd7 Fix AuthSamples submodule 2018-11-19 11:11:59 -08:00
Ryan Brandenburg 2b46511407 Merge remote-tracking branch 'AuthSamples/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-19 11:10:33 -08:00