Commit Graph

16135 Commits

Author SHA1 Message Date
Nate McMaster 294b5f2928
Merge branch 'release/2.2' 2018-11-20 09:47:59 -08:00
Luke Latham 5539b0f6e7 Change Google scope in external providers sample (#4138) 2018-11-20 09:38:05 -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
ASP.NET CI 5a6b6c90b6 Updating submodule(s)
Hosting => 241d2c13df
HttpAbstractions => bc7092a32b
Mvc => 3fe61d6601
Razor => a7ae749ab2

[auto-updated: submodules]
2018-11-19 23:37:03 -08:00
Nate McMaster 23996a550a
Resolve C26496 compiler errors when building in release mode with VS 15.9 (#4113)
Updating CI machines to VS 15.9 causes the project to fail to compile with C26496 errors. This adds `const` keywords to resolve the compiler errors.
2018-11-19 23:34:01 -08:00
Nate McMaster 7ccb8dbfe1
Account for the relocation of Microsoft.AspNetCore.Hosting.WebHostBuilderFactory.Sources 2018-11-19 22:50:46 -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
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 78eb188014 Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MondoMaster 2018-11-19 16:01:22 -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