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

19306 Commits

Author SHA1 Message Date
Ryan Brandenburg 1182293e8b Merge remote-tracking branch 'origin/release/2.2' into rybrande/Mondo22ToMaster 2018-11-21 12:03:58 -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
Artak a13e3b4813 Marked the `Microsoft.Extensions.ApiDescription.Design` package as "noship" (#4185) 2018-11-21 11:25:24 -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
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
Nate McMaster 40ef11cf54
Fix UserSecretsIdAttribute generation when using FrameworkReference to Microsoft.AspNetCore.App (#4177) 
When only Microsoft.AspNetCore.App is referenced, the project will no longer have MSBuild imports from the Microsoft.Extensions.Configuration.UserSecrets package, which takes care of generating the UserSecretsIdAttribute. This ensures the attribute is still generated in default project templates without needing a new package ref to Config.UserSecrets.
 2018-11-21 09:12:06 -08:00
Nate McMaster e25c2acb25
Flow BUILD_NUMBER and BUILD_BUILDNUMBER into Docker builds 2018-11-21 08:35:25 -08:00
ASP.NET CI ccb335799f Updating BuildTools from 3.0.0-build-20181120.3 to 3.0.0-build-20181120.4 
[auto-updated: buildtools]
 2018-11-20 21:15:09 -08:00
Nate McMaster 0cbfa9ce6d
Update branding to 3.0.0-preview (#4171) 
Changes:
* This uses date-based versioning
* Builds are `3.0.0-preview-$(buildnumber)`, not alpha1 or preview1.
 2018-11-20 19:47:12 -08:00
ASP.NET CI 61b0b83f75 Updating submodule(s) 
Mvc => bfdecc8f5e

[auto-updated: submodules]
 2018-11-21 01:39:38 +00:00
Ryan Brandenburg 1d36dfeb5e Sign Browserlink 2018-11-20 16:56:56 -08:00
Ryan Brandenburg c8dddaaafc Merge remote-tracking branch 'Metapackages/rybrande/masterToSrc' into rybrande/Mondo22ToMaster 2018-11-20 16:43:26 -08:00
Ryan Brandenburg 4ab02a9ad9 Merge remote-tracking branch 'JavaScriptServices/rybrande/masterToSrc' into rybrande/Mondo22ToMaster 2018-11-20 16:43:12 -08:00
Ryan Brandenburg 9ecf86fe65 Merge remote-tracking branch 'AADIntegration/rybrande/masterToSrc' into rybrande/Mondo22ToMaster 2018-11-20 16:42:54 -08:00
Ryan Brandenburg 73dbfdbee1 Merge branch 'release/2.2' into rybrande/Mondo22ToMaster 2018-11-20 16:42:11 -08:00
Ryan Brandenburg 41b359c119 Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc 2018-11-20 16:32:45 -08:00
Ryan Brandenburg 27eed7e904 Reorganize source code in preparation to move into aspnet/AspNetCore 
Prior to reorganization, this source code was found in d417aacd7c
 2018-11-20 16:32:23 -08:00
Ryan Brandenburg cdc621d428 Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc 2018-11-20 16:26:40 -08:00
Ryan Brandenburg 00b0bcc665 Merge branch 'rybrande/release22ToSrc' into rybrande/masterToSrc 2018-11-20 16:23:13 -08:00
Ryan Brandenburg 396aa9735e PR feedback 2018-11-20 16:15:51 -08:00
Ryan Brandenburg 564f5a45ba Fix about 2018-11-20 16:09:50 -08:00
Ryan Brandenburg d0c73c16d5 Fix tests 2018-11-20 16:08:17 -08:00
Ryan Brandenburg 70260923ef Remove extras 2018-11-20 16:06:40 -08:00
Ryan Brandenburg 0f2ae895e3 Remove bower files 2018-11-20 16:02:55 -08:00
Ryan Brandenburg dd914d9430 Revert back to 2.2 2018-11-20 16:00:48 -08: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
Nate McMaster 3318d0c7f9
Temporarily add a signcheck exclusion to unblock aspnet builds (#4170) 
Workaround dotnet/core-setup#4797
 2018-11-20 15:08:46 -08:00
ASP.NET CI c206b18707 Updating BuildTools from 3.0.0-build-20181116.1 to 3.0.0-build-20181120.3 
[auto-updated: buildtools]
 2018-11-20 13:52:05 -08:00
ASP.NET CI 8e5812e66e Updating submodule(s) 
MetaPackages => d417aacd7c
Mvc => 1521f9298b

[auto-updated: submodules]
 2018-11-20 13:51:54 -08:00
Jacques Eloff 5a446ecc53
Merge pull request #4165 from aspnet/joeloff/SharedInstall 
#3697 - override default install location
 2018-11-20 13:41:08 -08:00
Nate McMaster 1d9b77e255
Import DotNetPackageVersionPropsPath into all sub-folder builds 2018-11-20 13:23:55 -08:00