Ryan Brandenburg
321327f84b
Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MondoMaster
2018-11-28 12:28:04 -08:00
Ryan Brandenburg
fa1af0e5a5
Merge remote-tracking branch 'origin/release/2.2' into rybrande/MondoMaster
2018-11-27 15:04:40 -08:00
Ryan Brandenburg
6603195a10
Merge remote-tracking branch 'origin/release/2.1' into rybrande/Mondo2.2
2018-11-27 11:57:39 -08:00
Ryan Brandenburg
d025e4e0ad
Fix submodules for Mvc MvcPrecompilation Razor and SignalR
2018-11-27 11:02:50 -08:00
Steve Sanderson
16c11b4c87
Integrate src/Components into mondorepo build system
2018-11-27 17:17:34 +00:00
Ryan Brandenburg
e60e74e2bb
Merge remote-tracking branch 'origin/release/2.2' into rybrande/Mondo22ToMaster
2018-11-26 12:32:17 -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
94e1afafa6
Remove submodules for Antiforgery CORS HttpSysServer ResponseCaching Routing and Security
2018-11-21 15:26:19 -08:00
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
Ryan Brandenburg
1182293e8b
Merge remote-tracking branch 'origin/release/2.2' into rybrande/Mondo22ToMaster
2018-11-21 12:03:58 -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
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
294b5f2928
Merge branch 'release/2.2'
2018-11-20 09:47: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
05b8745172
Remove aspnet/Hosting submodule and update targets and projects
2018-11-19 22:25:43 -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
7c6bf7f75d
Merge branch 'release/2.2'
2018-11-19 21:00:19 -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
Ryan Brandenburg
78eb188014
Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MondoMaster
2018-11-19 16:01:22 -08:00
Ryan Brandenburg
ea68246950
Fix submodules for AuthSamples AzureIntegration and Templating
2018-11-19 12:21:41 -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
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
33a92fecd7
Fix AuthSamples submodule
2018-11-19 11:11:59 -08:00
Ryan Brandenburg
50acf42eda
Fix submodule
2018-11-19 11:03:12 -08:00
Ryan Brandenburg
c38d6e662a
Remove templating module
2018-11-19 10:50:39 -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
68cc5e7846
Merge release/2.2 and aspnet/KestrelHttpServer
...
* Merges latest changes from the master branch of aspnet/KestrelHttpServer
* Merges changes on release/2.2
2018-11-15 08:41:55 -08:00
Nate McMaster
6cc9f6f130
Merge release/2.2 and replace submodules
...
* Replace the aspnet/JsonPatch git submodule and merge the master branch of its source to this repo
* Likewise for aspnet/DotNetTools
* And aspnet/HtmlAbstractions
* merge latest infrastructure changes from the release/2.2 branch
2018-11-14 22:57:10 -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
27acef3d46
Merge branch 'release/2.1' into release/2.2
2018-11-14 14:01:43 -08:00
Nate McMaster
0cf9019caa
Remove KestrelHttpServer submodule and update targets and baselines for Kestrel packages
2018-11-14 11:21:15 -08:00
Nate McMaster
c1c7d711b6
Merge branch 'release/2.1' into release/2.2
2018-11-14 09:27:23 -08:00