huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
16,135 Commits 1 Branch 0 Tags 251 MiB
Commit Graph

81 Commits

Author SHA1 Message Date
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 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 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 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 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
Nate McMaster 87092a2590
Update targets and infrastructure for dotnet-watch et. al. 2018-11-13 15:58:22 -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 32622d1a0a
Remove the JsonPatch git submodule 2018-11-09 13:06:34 -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 b75fa54ad2
Remove the EntityFrameworkCore submodule (#3964) 
This removes EntityFrameworkCore as a git submodule. The EFCore repo will build on its own, and the AspNetCore repo will consume EFCore via PackageReference.
 2018-11-07 14:00:19 -08:00
Nate McMaster 0e3260f2b4
Merge branch 'release/2.2' 2018-11-06 21:47:30 -08:00
Nate McMaster 302d8d59dd
Remove the aspnet/Caching submodule 2018-11-06 21:20:06 -08:00
Nate McMaster 011cf21a5c
Merge branch 'release/2.2' 2018-11-06 17:42:44 -08:00
Nate McMaster 3cf8a41e4a
Remove the aspnet/Logging submodule 2018-11-06 17:30:26 -08:00
Nate McMaster e8aab7ae34
Merge branch 'release/2.2' 2018-11-06 12:36:51 -08:00
Nate McMaster 355c6d3a83
Remove the aspnet/Options submodule 2018-11-06 12:28:45 -08:00
Nate McMaster df46dfee73
Merge branch 'release/2.2' 2018-11-06 12:13:05 -08:00
Nate McMaster 67c3a099ec
Remove the aspnet/Configuration submodule (#3948) 2018-11-06 12:04:36 -08:00
Nate McMaster f8a1e14921
Merge branch 'release/2.2' 2018-11-05 16:35:20 -08:00
Nate McMaster 62b24f930e
Remove the aspnet/FileSystem submodule (#3884) 2018-11-05 14:19:19 -08:00
Justin Kotalik dcece2090c
Remove IISIntegration submodule, add CI (#3867) 2018-11-02 14:34:31 -07:00
Nate McMaster 50e1e60247
Merge branch 'release/2.2' 2018-11-02 10:49:11 -07:00
Justin Kotalik afab1a5be6
Remove IISIntegration submodule, add CI [2.2] (#3865) 2018-11-02 10:22:04 -07:00
Nate McMaster cb85ffa8f6
Merge branch 'release/2.2' 2018-11-02 10:10:49 -07:00
Nate McMaster c92536a21a
Remove the DependencyInjection submodule 2018-11-02 09:58:20 -07:00
Justin Kotalik 868dc32c97 Merge branch 'release/2.2' 2018-10-31 21:04:25 -07:00
Justin Kotalik 3f04c928f4 Merge branch 'jkotalik/21Merge' into jkotalik/22Merge 2018-10-31 18:38:00 -07:00
Nate McMaster 4b99a85a5f
Merge branch 'release/2.1' into release/2.2 2018-10-31 17:25:20 -07:00
Nate McMaster f2c1eb73a6
Remove the Microsoft.Data.Sqlite submodule 2018-10-31 16:24:18 -07:00
Nate McMaster 908a8b3013
Merge branch 'release/2.2' 2018-10-30 17:18:22 -07:00
Nate McMaster eb79d8f75e
Remove the EventNotification submodule 2018-10-30 17:10:11 -07:00
Nate McMaster ee11d10f04
Remove BrowserLink and Scaffolding gitsubmodules (#3730) 
As a part of simplifying the way we build ASP.NET Core, the BrowserLink and Scaffolding repos and the packages they produce will be independent from aspnet/AspNetCore.
 2018-10-26 10:17:57 -07:00
Nate McMaster 43792f20b2
Merge branch 'release/2.2' 2018-10-24 12:45:15 -07:00