Commit Graph

21239 Commits

Author SHA1 Message Date
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
Ryan Brandenburg 6e439f1396 Fix submodules 2018-11-20 12:57:21 -08:00
Ryan Brandenburg 48528cf69f Fix templating casing 2018-11-20 12:53:46 -08:00
Ryan Brandenburg 9bddef704f Merge branch 'release/2.2' of github.com:aspnet/AspNetCore into rybrande/Mondo2.2 2018-11-20 12:08:54 -08:00
Ryan Brandenburg bd54395fe5 Remove duplicate keys 2018-11-20 12:07:14 -08:00
ASP.NET CI a25bd4e3a5 Updating submodule(s)
EntityFrameworkCore => 5262ff5b16fffd0241975fb0b90b01cb71966fd2
SignalR => d0bcdf3dd9

[auto-updated: submodules]
2018-11-20 19:53:56 +00:00
Nate McMaster 73b5d6d0e5
Remove the BrowserLink submodule (#4087) 2018-11-20 11:36:26 -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 00be61dbef Merge branch 'rybrande/release21ToSrc' into rybrande/release22ToSrc 2018-11-20 11:07:06 -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 128562955e Merge branch 'rybrande/release21ToSrc' into rybrande/release22ToSrc 2018-11-20 11:04:30 -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 fc51b31a34 Merge branch 'rybrande/release21ToSrc' into rybrande/release22ToSrc 2018-11-20 10:58:09 -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 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 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