Commit Graph

3078 Commits

Author SHA1 Message Date
Justin Kotalik e8d898dcd9 Merge branch 'release/2.2' 2018-12-26 14:21:28 -08:00
seancpeters 21488b2b04 Add a workaround for a bug in `dotnet tool install` and the scaffolding command line tool (#4580) 2018-12-11 15:53:10 -08:00
seancpeters 1670a2bd30 Updating scaffolding submodule (#4491) 2018-12-07 08:20:40 -08:00
Nate McMaster 62f9655a2f
Merge branch 'release/2.2' 2018-12-05 08:54:38 -08:00
ASP.NET CI 1733aa0c9a Updating submodule(s)
EntityFrameworkCore => 8e7402701ea1416b7fe55e1863ae65b3147c02c7

[auto-updated: submodules]
2018-12-05 00:02:26 -08:00
Nate McMaster 1be2b427de
Merge branch 'release/2.1' into release/2.2 2018-12-04 14:23:24 -08:00
Nate McMaster b875070760
Updating submodule(s)
EntityFrameworkCore => d53e0ab01598cb05592aee7809e16d6bf55a4e14

[auto-updated: submodules]
2018-12-04 09:10:44 -08:00
ASP.NET CI ab8919e34f Updating submodule(s)
EntityFrameworkCore => d0648c44ca6eaade34907f78c3293adc5082858f

[auto-updated: submodules]
2018-12-04 00:02:30 -08:00
Nate McMaster a6b5bb16fd
Merge source code from aspnet/Identity 2018-12-03 15:54:12 -08:00
ASP.NET CI 8ebca1933c Updating submodule(s)
EntityFrameworkCore => c0800b34b69d114c986c9580df11fcd2eda28830

[auto-updated: submodules]
2018-12-03 13:20:09 -08:00
Nate McMaster 197c5567f4
Update EFCore submodule (#4349)
Prepare EF Core to build in 2.2.1

Fixes aspnet/AspNetCore-Internal#1441
2018-11-30 17:53:19 -08:00
Doug Bunting 9b228ddf57 Update Identity submodule to latest commit
- picks up "Remove `SetCompatibiltyVersion(...)` call in sample"
2018-11-30 17:09:53 -08:00
Nate McMaster 7078102961
Update targets and projects to build Localization projects 2018-11-30 15:13:05 -08:00
Nate McMaster 04fc8ae493
Update targets and projects to build BasicMiddleware projects 2018-11-30 14:44:17 -08:00
Ryan Brandenburg fa1af0e5a5 Merge remote-tracking branch 'origin/release/2.2' into rybrande/MondoMaster 2018-11-27 15:04:40 -08:00
ASP.NET CI f199a689b0 Updating submodule(s)
Localization => c283dfb56c

[auto-updated: submodules]
2018-11-27 12:08:14 -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
ASP.NET CI d6dd697774 Updating submodule(s)
Identity => 4046c842af

[auto-updated: submodules]
2018-11-27 10:10:22 -08:00
ASP.NET CI 4c000b03d6 Updating submodule(s)
Mvc => c9887e027a

[auto-updated: submodules]
2018-11-27 10:01:51 -08:00
Ryan Brandenburg e60e74e2bb Merge remote-tracking branch 'origin/release/2.2' into rybrande/Mondo22ToMaster 2018-11-26 12:32:17 -08:00
Nate McMaster a5d06f35b1
Remove Roslyn from the shared framework (#4225)
Reacting to aspnet/Mvc#8755
2018-11-22 12:56:34 -08:00
ASP.NET CI 2b50ac85b9 Updating submodule(s)
Identity => 8003a5550e
Mvc => f80490f99d
Routing => c28c7dea4e

[auto-updated: submodules]
2018-11-21 17:46:18 -08:00
Nate McMaster 28157e6259
Merge branch 'release/2.2' 2018-11-21 17:16:48 -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
ASP.NET CI abb8a4bbdb Updating submodule(s)
Antiforgery => 8124442320
CORS => 57991356e4
HttpSysServer => d4f5886582
Razor => 582f3f867e
ResponseCaching => 12395b4d1c
Security => 26d27d871b
SignalR => c852bdcc33

[auto-updated: submodules]
2018-11-22 00:15:51 +00: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
ASP.NET CI 61b0b83f75 Updating submodule(s)
Mvc => bfdecc8f5e

[auto-updated: submodules]
2018-11-21 01:39:38 +00:00
ASP.NET CI 4a57d28a57 Updating submodule(s)
Identity => 781ca09033
ResponseCaching => 7e6b6c6991
Routing => 47268686c0
Session => e3c711f538
SignalR => dde73d0b8a
StaticFiles => b732ef662e

[auto-updated: submodules]
2018-11-20 15:55:46 -08:00
Ryan Brandenburg d5587f3c54 Merge remote-tracking branch 'origin/release/2.1' into rybrande/21To22Merge 2018-11-20 15:42:00 -08:00
ASP.NET CI 8e5812e66e Updating submodule(s)
MetaPackages => d417aacd7c
Mvc => 1521f9298b

[auto-updated: submodules]
2018-11-20 13:51:54 -08:00
Ryan Brandenburg 6e439f1396 Fix submodules 2018-11-20 12:57:21 -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 b335283ab1 Merge branch 'release/2.1' of github.com:aspnet/AspNetCore into rybrande/Mondo2.1 2018-11-20 10:24:50 -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
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 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 7c6bf7f75d
Merge branch 'release/2.2' 2018-11-19 21:00:19 -08:00
Nate McMaster 21b142b65d
Merge branch 'release/2.1' into release/2.2 2018-11-19 17:04:13 -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