Nate McMaster
1be2b427de
Merge branch 'release/2.1' into release/2.2
2018-12-04 14:23:24 -08:00
Nate McMaster
a6b5bb16fd
Merge source code from aspnet/Identity
2018-12-03 15:54:12 -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
Nate McMaster
054cfac97e
Add EntityFrameworkCore to the list of submodules patching in 2.2.1 ( #4341 )
2018-11-30 13:39:28 -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
Ryan Brandenburg
1ee4e2b936
Merge remote-tracking branch 'origin/release/2.1' into rybrande/Mondo2.2
2018-11-21 16:33:42 -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
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
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
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
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
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
Nate McMaster
a8ec75aac4
Prepare for the 2.2.1 patch
...
* Generate 2.2.0 package baselines
* Update dependencies to 2.2.0
* Update branding to 2.2.1-servicing
2018-11-13 18:21:09 -08:00
Nate McMaster
87092a2590
Update targets and infrastructure for dotnet-watch et. al.
2018-11-13 15:58:22 -08:00
Nate McMaster
ccd098ecad
Update DataProtection to use custom reference resolution
...
This changes DataProtection to build as projects instead of a pseudo-submodule. It replaces Package and ProjectReference with <Reference> items which custom targets then resolve.
2018-11-13 10:28:42 -08:00
Nate McMaster
bb6901141c
Remove the HtmlAbstractions git submodule and merge Html.Abstractions into this repo
2018-11-13 09:29:27 -08:00
Nate McMaster
59ed8df382
Add targets and tools for ensuring consistent package versions between servicing builds
2018-11-09 13:05:31 -08:00
Nate McMaster
34999a804e
Remove submodules for repos that merged to aspnet/Extensions ( #3671 )
...
Builds of the packages in aspnet/Extensions repo go through ProdCon instead of building as a submodule of this repo.
2018-11-09 08:48:42 -08:00
Nate McMaster
0c6e4bebab
Prepare to build the 2.1.7 patch ( #3970 )
...
* Prepare 2.1.7 patch
* Add documentation for how we prepare servicing updates
2018-11-08 17:07:18 -08:00
Nate McMaster
302d8d59dd
Remove the aspnet/Caching submodule
2018-11-06 21:20:06 -08:00
Nate McMaster
3cf8a41e4a
Remove the aspnet/Logging submodule
2018-11-06 17:30:26 -08:00