Commit Graph

1877 Commits

Author SHA1 Message Date
Nate McMaster 71b1bb8887
Merge branch 'release/2.1' into release/2.2 2018-11-21 14:57:45 -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 498e49bc84 Merge branch 'release/2.2' of github.com:aspnet/AspNetCore into rybrande/Mondo2.2 2018-11-21 11:30:50 -08:00
Artak a13e3b4813 Marked the `Microsoft.Extensions.ApiDescription.Design` package as "noship" (#4185) 2018-11-21 11:25:24 -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 2711049cf4 Fix submodules for ServerTests StaticFiles and Session 2018-11-21 10:08:51 -08:00
Ryan Brandenburg 1d36dfeb5e Sign Browserlink 2018-11-20 16:56:56 -08:00
Ryan Brandenburg 396aa9735e PR feedback 2018-11-20 16:15:51 -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
Nate McMaster 73b5d6d0e5
Remove the BrowserLink submodule (#4087) 2018-11-20 11:36:26 -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 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
Nate McMaster bfba741326
Merge aspnet/Hosting release/2.2 2018-11-20 09:35:34 -08:00
Nate McMaster feb68c1382
Merge branch 'release/2.1' into release/2.2 2018-11-20 09:13:55 -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 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 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 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
Nate McMaster 4173f23e3e
Remove the HttpClientFactory submodule (#4085) 2018-11-19 12:05:39 -08:00
Ryan Brandenburg 2cda14658d Fix submodules for AuthSamples AzureIntegration and Templating 2018-11-19 11:55:24 -08:00
Ryan Brandenburg 69534b5687 Fix AzureIntegration submodule 2018-11-19 11:18:31 -08:00
Ryan Brandenburg 33a92fecd7 Fix AuthSamples submodule 2018-11-19 11:11:59 -08:00
Ryan Brandenburg c38d6e662a Remove templating module 2018-11-19 10:50:39 -08:00
Matt Mitchell c813950439 React to changes in produced corefx packages (#4077) 2018-11-19 09:29:33 -08:00
Ryan Brandenburg 6da92b9d6d Fix dependencies 2018-11-16 15:30:22 -08:00
Ryan Brandenburg 8227f9f819 Fix merge problem 2018-11-16 13:14:45 -08:00
Ryan Brandenburg 422d30b521 Merge remote-tracking branch 'origin/release/2.1' into rybrande/MusicStore2.2 2018-11-16 11:34:39 -08:00
Ryan Brandenburg 9adb829eb5 Fix MusicStore RootPath 2018-11-16 10:18:09 -08:00
Ryan Brandenburg 681d743170 Update MusicStore source 2018-11-16 09:36:17 -08:00
Nate McMaster c2685813ab
2.1: Update corefx dependencies (#4037) 2018-11-15 12:20:37 -08:00
Nate McMaster 0271428dbe
Merge aspnet/KestrelHttpServer release/2.2 and release/2.1 2018-11-14 21:33:33 -08:00
Nate McMaster 406c80bfb0
Reorganize source code in preparation to move into aspnet/AspNetCore
Prior to reorganization, this source code was found in 4598850c20
2018-11-14 16:03:24 -08:00
Nate McMaster 289050b9f2
Normalize code sign metadata to avoid duplication between projects and cross-gen config settings 2018-11-14 15:14:27 -08:00
Nate McMaster 27acef3d46
Merge branch 'release/2.1' into release/2.2 2018-11-14 14:01:43 -08:00
Nate McMaster 51c9b7355d
Create Kestrel.sln, update documentation and README, and ensure all Kestrel test projects have the test logger installed 2018-11-14 13:14:47 -08:00
John Luo b4dbaa95d0 Add ChromeDriver dependency 2018-11-14 11:24:59 -08:00
Nate McMaster 0cf9019caa
Remove KestrelHttpServer submodule and update targets and baselines for Kestrel packages 2018-11-14 11:21:15 -08:00
John Luo e69285a36d Use Selenium to test Chrome 2018-11-14 11:13:24 -08:00