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

20153 Commits

Author SHA1 Message Date
Nate McMaster 006558c412
Merge branch 'release/2.2' 2018-11-21 16:28:33 -08:00
Nate McMaster b2d4f8f2f1
Merge branch 'namc/merge-diag' into release/2.2 2018-11-21 16:11:17 -08:00
Nate McMaster 8ce7bb7f16
Add HealthChecks to Middleware.sln 2018-11-21 15:39:10 -08:00
Nate McMaster 925746158e
Merge the release/2.2 branch of Diagnostics 2018-11-21 15:36:05 -08:00
Nate McMaster 16212ae6df
Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in c802d5ef5f
 2018-11-21 15:22:25 -08:00
Ryan Brandenburg 85873966a2 Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/Mondo22ToMaster 2018-11-21 14:58:10 -08:00
Ryan Brandenburg 9fc5a5b841 Merge remote-tracking branch 'origin/release/2.2' into rybrande/Mondo22ToMaster 2018-11-21 14:57:58 -08:00
Nate McMaster 71b1bb8887
Merge branch 'release/2.1' into release/2.2 2018-11-21 14:57:45 -08:00
Ryan Brandenburg c80604a7da
Fix directory structure (#4201) 
Fix directory structure
 2018-11-21 14:55:25 -08:00
Ryan Brandenburg 0a0851b197
Remove old Submodules (#4199) 
Remove old Submodules
 2018-11-21 14:50:05 -08:00
Ryan Brandenburg 1619454b06 PR feedback 2018-11-21 14:31:40 -08:00
Nate McMaster 6a6c88d80b
Merge source code from aspnet/Diagnostics to this repo 2018-11-21 14:23:55 -08:00
Nate McMaster ed0b421695
Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in 8893337fb0
 2018-11-21 13:54:33 -08:00
Ryan Brandenburg 2dfe427c33 Fix RepositoryUrl 2018-11-21 12:14:50 -08:00
Ryan Brandenburg 4e93ff7835 Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/Mondo22ToMaster 2018-11-21 12:13:13 -08:00
Ryan Brandenburg 4075c10733 Merge remote-tracking branch 'Session/rybrande/masterToSrc' into rybrande/Mondo22ToMaster 2018-11-21 12:05:57 -08:00
Ryan Brandenburg b519951572 Merge remote-tracking branch 'StaticFiles/rybrande/masterToSrc' into rybrande/Mondo22ToMaster 2018-11-21 12:05:51 -08:00
Ryan Brandenburg dac9378e31 Merge remote-tracking branch 'ServerTests/rybrande/masterToSrc' into rybrande/Mondo22ToMaster 2018-11-21 12:05:41 -08:00
Ryan Brandenburg 1182293e8b Merge remote-tracking branch 'origin/release/2.2' into rybrande/Mondo22ToMaster 2018-11-21 12:03:58 -08:00
ASP.NET CI f9bb5e5171 Updating BuildTools from 2.1.3-rtm-15846 to 2.1.3-rtm-15847 
[auto-updated: buildtools]
 2018-11-21 11:48:03 -08:00
Nate McMaster 5e8e24ec88
Set RepositoryUrl to aspnet/AspNetCore 2018-11-21 11:32:49 -08:00
Ryan Brandenburg 498e49bc84 Merge branch 'release/2.2' of github.com:aspnet/AspNetCore into rybrande/Mondo2.2 2018-11-21 11:30:50 -08:00
Ryan Brandenburg cd21212206 Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc 2018-11-21 11:27:59 -08:00
Ryan Brandenburg c0fb3d2278 Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in 67aa19aea7
 2018-11-21 11:27:50 -08:00
Ryan Brandenburg 8db26709f4 Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc 2018-11-21 11:26:12 -08:00
Ryan Brandenburg 7b891fc3d1 Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in b732ef662e
 2018-11-21 11:25:55 -08:00
Artak a13e3b4813 Marked the `Microsoft.Extensions.ApiDescription.Design` package as "noship" (#4185) 2018-11-21 11:25:24 -08:00
Ryan Brandenburg 673991d093 Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc 2018-11-21 11:25:16 -08:00
Ryan Brandenburg b5894e6b5b Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in e3c711f538
 2018-11-21 11:23:53 -08:00
Ryan Brandenburg 1ac92426ab Merge remote-tracking branch 'Session/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-21 11:15:09 -08:00
Ryan Brandenburg 7b708c291c Merge remote-tracking branch 'StaticFiles/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-21 11:15:02 -08:00
Ryan Brandenburg 7a9e1f9ec9 Merge remote-tracking branch 'ServerTests/rybrande/release22ToSrc' into rybrande/Mondo2.2 2018-11-21 11:14:50 -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
Nate McMaster 67aa19aea7
Update README.md 2018-11-21 11:06:05 -08:00
Ryan Brandenburg 7154ae2b94 Merge branch 'rybrande/release21ToSrc' into rybrande/release22ToSrc 2018-11-21 11:03:07 -08:00
Ryan Brandenburg feb5e3ac9b Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in 774079d60d
 2018-11-21 11:02:38 -08:00
Ryan Brandenburg 9d8eb419f3 Merge branch 'rybrande/release21ToSrc' into rybrande/release22ToSrc 2018-11-21 10:59:52 -08:00
Ryan Brandenburg c391301dce Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in a5fcd9dd87
 2018-11-21 10:59:42 -08:00
Ryan Brandenburg 256f22ea6b Merge branch 'rybrande/release21ToSrc' into rybrande/release22ToSrc 2018-11-21 10:58:36 -08:00
Ryan Brandenburg 04096c9225 Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in 04c6c6bab8
 2018-11-21 10:58:10 -08:00
Ryan Brandenburg c2ab65fa76 Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/Mondo22ToMaster 2018-11-21 10:34:45 -08:00
Nate McMaster 0295f536ef
Stop shipping packages for assemblies which are shared-framework-only (#4178) 
The removes the need to ship packages for assemblies which are part of Microsoft.AspNetCore.App. The implementation of this requires first building packages, and then modifying .nuspec's and categorizing packages as "noship". This will be cleaned up in the future as we continue to refactor the way this repository builds.
 2018-11-21 10:33:07 -08:00
Ryan Brandenburg 2711049cf4 Fix submodules for ServerTests StaticFiles and Session 2018-11-21 10:08:51 -08:00
Ryan Brandenburg e6b3a5b79b Merge remote-tracking branch 'Session/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-21 10:05:41 -08:00
Ryan Brandenburg 93238389a7 Merge remote-tracking branch 'StaticFiles/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-21 10:05:32 -08:00
Ryan Brandenburg c75177033a Merge remote-tracking branch 'ServerTests/rybrande/release21ToSrc' into rybrande/Mondo2.1 2018-11-21 10:05:22 -08:00
Ryan Brandenburg 95928c0c64 Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in d20c2c8f04
 2018-11-21 10:02:17 -08:00
Ryan Brandenburg 98bbdf6e34 Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in 2b285667a8
 2018-11-21 10:00:40 -08:00
Ryan Brandenburg 9ba11244f2 Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in 019ba1722e
 2018-11-21 09:58:26 -08:00
Ryan Brandenburg e808301e38 Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/Mondo22ToMaster 2018-11-21 09:54:05 -08:00