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

3036 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
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 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
Nate McMaster 0271428dbe
Merge aspnet/KestrelHttpServer release/2.2 and release/2.1 2018-11-14 21:33:33 -08:00
ASP.NET CI f232b8e975 Updating submodule(s) 
AADIntegration => 1e26b6673d
AzureIntegration => 5cf821d1b4
Hosting => cfe9b26a34
HttpAbstractions => ea1ee2b68c
Identity => 073b0377e8
KestrelHttpServer => 5d80016b4f
Mvc => 9ff5a441f5
Routing => b6a1de5676
Security => 42dd66647d
SignalR => 05b0d41533
Templating => 2ca560f0b2

[auto-updated: submodules]
 2018-11-15 01:36:32 +00:00
Nate McMaster 27acef3d46
Merge branch 'release/2.1' into release/2.2 2018-11-14 14:01:43 -08:00
Pranav K fe981c108b Add Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X 2018-11-14 11:32:20 -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
ASP.NET CI 85a5b1b51f Updating submodule(s) 
Diagnostics => cfdbbdec15
JavaScriptServices => 160d822f52
KestrelHttpServer => f223b4a663
ResponseCaching => 1da1c69a6f

[auto-updated: submodules]
 2018-11-13 12:03:47 -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
ASP.NET CI 67754ecff4 Updating submodule(s) 
Mvc => 5ed7658bf2
SignalR => 012f953a9d

[auto-updated: submodules]
 2018-11-13 00:03:37 -08:00
ASP.NET CI ee3e71e6ba Updating submodule(s) 
SignalR => b476df9acd

[auto-updated: submodules]
 2018-11-12 20:03:45 +00:00
ASP.NET CI f466a3a803 Updating submodule(s) 
Mvc => 8308d94e39

[auto-updated: submodules]
 2018-11-12 12:03:04 -08:00
Nate McMaster ce8cf65589
Update SignalR submodule 2018-11-11 20:24:57 -08:00
Nate McMaster 2fee09506e
Update the SignalR module to correct code signing config 2018-11-11 17:14:16 -08:00
ASP.NET CI 30b2fc6b04 Updating submodule(s) 
Routing => bd481034fe

[auto-updated: submodules]
 2018-11-11 08:03:28 +00:00
ASP.NET CI 603ce5bf46 Updating submodule(s) 
Mvc => fcf5593813
Razor => fe7881d5f7
Routing => f6b1138ce3

[auto-updated: submodules]
 2018-11-10 08:03:30 +00:00
ASP.NET CI 1fa7c5b91c Updating submodule(s) 
SignalR => df668017ee

[auto-updated: submodules]
 2018-11-10 00:15:24 +00:00
ASP.NET CI 684e66a707 Updating submodule(s) 
CORS => e790a9bb10
KestrelHttpServer => 119a7695aa
Mvc => ecb7edadc8
Razor => 9d2c394b99
SignalR => 67a37f9db3

[auto-updated: submodules]
 2018-11-09 14:46:07 -08:00
Pranav K 116f31362a Remove WebApiCompatShim 2018-11-09 14:32:18 -08:00
Nate McMaster 32622d1a0a
Remove the JsonPatch git submodule 2018-11-09 13:06:34 -08:00
ASP.NET CI 7060d3a6c5 Updating submodule(s) 
KestrelHttpServer => 5db6394769

[auto-updated: submodules]
 2018-11-09 20:46:08 +00:00