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

3058 Commits

Author SHA1 Message Date
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
Ryan Brandenburg 37399bc217 Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MusicStoreMaster 2018-11-19 12:34:59 -08:00
Ryan Brandenburg af6792afc3 Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MondoMaster 2018-11-19 12:24:58 -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
ASP.NET CI db42dd7faa Updating submodule(s) 
AADIntegration => 3c282a4f5a
AuthSamples => 8f471bf65b
CORS => c39d85f6df
Diagnostics => 082d505977
Hosting => f6cda4fab7
HttpAbstractions => 962ec07bdb
HttpClientFactory => 7c4f9479b4753a37c8b0669a883002e5e448cc94
Identity => 68b878f0e1
JavaScriptServices => e657e7d79a
Localization => 60a3d57a3e
MetaPackages => 501dd3924b
MusicStore => aca4b432e1
Mvc => 2414db256f
Razor => 6c8e900d11
Routing => aed55d4517
Security => e053878464
ServerTests => 619d358585
Session => abbdfb72ef
SignalR => 2c3ebd1648
Templating => 514fcdcba5

[auto-updated: submodules]
 2018-11-19 11:56:01 -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
Nate McMaster 137a72f85d
React to the removal of Microsoft.AspNetCore.ApplicationInsights.HostingStartup 2018-11-19 09:43:13 -08:00
Nate McMaster fd1a5b43f1
Generate PlatformManifest and package conflict overrides for Microsoft.AspNetCore.App (#4072) 
This generates additional metadata for the .NET Core SDK to resolve conflicts between Microsoft.AspNetCore.App and PackageReferences which contain the same assemblies.
 2018-11-16 16:36:14 -08:00
ASP.NET CI 658653808d Updating submodule(s) 
HttpClientFactory => 7c4f9479b4753a37c8b0669a883002e5e448cc94
MusicStore => aca4b432e1
Templating => 514fcdcba5

[auto-updated: submodules]
 2018-11-16 20:04:04 +00: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
ASP.NET CI e550cb59b3 Updating submodule(s) 
HttpAbstractions => 49d785c934
Localization => b8747c8b6b
Mvc => 7c68233125
Security => 7e14b052ea
Templating => 0af2acd6ff

[auto-updated: submodules]
 2018-11-16 09:10:27 +00:00
ASP.NET CI 67335899ba Updating submodule(s) 
AzureIntegration => 202a87088f

[auto-updated: submodules]
 2018-11-15 20:02:57 +00:00
ASP.NET CI e28b5b31c8 Updating submodule(s) 
Mvc => 6270ea48a6

[auto-updated: submodules]
 2018-11-15 17:46:59 +00: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