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

137 Commits

Author SHA1 Message Date
Nate McMaster edfb2ab8ab
Merge branch 'release/2.2' 2019-01-05 00:34:13 -08:00
Nate McMaster bfec2c14be
Merge branch 'release/2.2' 2019-01-03 12:18:01 -08:00
Nate McMaster d66537c7d1
Convert Azure hosting startup and integration projects to use ProjectRef (#6207) 2019-01-02 09:56:39 -08:00
Justin Kotalik 666f0dc0fd Readd components 2018-12-26 15:52:33 -08:00
Justin Kotalik e8d898dcd9 Merge branch 'release/2.2' 2018-12-26 14:21:28 -08:00
Ajay Bhargav Baaskaran 3787fbf3a3 Merge branch 'release/2.2' 2018-12-21 18:29:32 -08:00
John Luo edcee859f0
Convert Identity to Reference (#6086) 
* Convert Identity to Reference
* Remove Microsoft.AspNet.Identity.AspNetCoreCompat
 2018-12-21 15:29:35 -08:00
Justin Kotalik f111a2d73a Merge release/2.2 into master 2018-12-21 14:14:10 -08:00
Nate McMaster 3641761d18
Convert AADIntegration projects to ProjectRef (#6082) 2018-12-21 11:43:09 -08:00
Justin Kotalik ce481c6c79
Make JavaScriptServices use ProjectReference (#5953) 2018-12-20 23:50:53 -08:00
Ajay Bhargav Baaskaran 7f17d095d8
Convert Mvc to use Reference (#6047) 
* Convert Mvc to use Reference

* Use ProjectReference for test assets
 2018-12-20 16:27:32 -08:00
Ajay Bhargav Baaskaran 2a696f6a1c Merge branch 'release/2.2' 2018-12-18 12:50:01 -08:00
John Luo 0cbc52ca15 Convert ServerTests to Reference and move to Server folder (#4686) 2018-12-18 14:59:47 -05:00
John Luo 98636fed6d Merge branch 'release/2.2' 2018-12-17 14:24:30 -08:00
Ajay Bhargav Baaskaran b079041488
Convert Razor to use Reference (#4954) 2018-12-17 12:10:40 -08:00
Nate McMaster 02780bac26
Merge branch 'release/2.2' 2018-12-14 16:03:16 -08:00
Justin Kotalik 68f0aff144 security to project ref (#4618) 2018-12-14 14:49:23 -08:00
John Luo a026e7a4e7
Convert MetaPackages to Reference and move to DefauldBuilder folder (#4687) 
* Convert ServerTests to Reference and move to Server folder

* Fix NU1105
 2018-12-13 11:39:15 -08:00
Justin Kotalik 429719b91d
Make IISIntegration use Reference instead of PackageReference (and reactionary work) (#4311) 2018-12-12 16:59:44 -05:00
Nate McMaster d12827e609
Merge branch 'release/2.2' 2018-12-11 18:04:58 -08:00
dotnet-maestro-bot 38785d0be9 [automated] Merge branch 'release/2.1' => 'release/2.2' (#4577) 
* Workaround problems when opening solution files in Visual Studio (#4569)

Changes:

* Condense Routing.sln into HttpAbstractions.sln
* Workaround NU1105 by adding all ProjectReferences to the .sln
* Workaround exceptions in the ReferencesHostBridge by moving Reference items to a temporary item group
* Add a 'startvs.cmd' script for launching VS with the right env variables
* Remove RangeHelper test project
* Move RangeHelper tests into StaticFiles.Tests and add target for NPM restore

* Convert Session to use Reference and move to Middleware folder (#4576)

* Add RoutingSample.Web to HttpAbstractions.sln
 2018-12-11 16:13:20 -08:00
John Luo 3acdfb3d26
Convert Session to use Reference and move to Middleware folder (#4576) 2018-12-11 14:56:42 -08:00
Nate McMaster 790ae47055
Merge branch 'release/2.2' 2018-12-10 17:41:14 -08:00
Justin Kotalik 5f843f223e
[2.1] Make Antiforgery, ResponseCaching, StaticFiles, and Cors use project ref (#4484) 2018-12-07 14:30:50 -08:00
Nate McMaster 85e2147ff0
Merge branch 'release/2.2' 2018-12-07 11:11:44 -08:00
Nate McMaster 50bea05918
Refactor Routing to use ProjectReference and move into src/Http folder (#4441) 
Changes:

* Stop producing Microsoft.AspNetCore.Routing.DecisionTree.Sources. I could not find any usages outside of the Microsoft.AspNetCore.Routing assembly, so I've moved this to be a subfolder of code in the Microsoft.AspNetCore.Routing project.
* Stop building src/Routing as a submodule. Use ProjectReference instead
* Move projects from src/Routing into src/Http/Routing/ and src/Http/Routing.Abstractions/
* Update package baselines and dependencies to support building routing projects and samples
 2018-12-05 22:14:22 -08:00
Nate McMaster f0b4ac75c4
Set the default submodule path to src/ and fixup bad merge from release/2.2 2018-12-05 11:11:14 -08:00
Nate McMaster 62f9655a2f
Merge branch 'release/2.2' 2018-12-05 08:54:38 -08:00
Justin Kotalik 736083c2f2
Make HttpSys use ProjectReference and move HttpSys into Servers folder (#4335) 2018-12-04 16:44:07 -08:00
Steve Sanderson c7d6364900 Enable src/Components to build (#4367) 
Fix aspnet/AspNetCore-Internal#1443
 2018-12-03 16:38:28 -08:00
Nate McMaster a6b5bb16fd
Merge source code from aspnet/Identity 2018-12-03 15:54:12 -08:00
Nate McMaster 7078102961
Update targets and projects to build Localization projects 2018-11-30 15:13:05 -08:00
Nate McMaster 04fc8ae493
Update targets and projects to build BasicMiddleware projects 2018-11-30 14:44:17 -08:00
Nate McMaster 26dfce1f3c
Disable building src/Components and fix its code signing configuration (#4299) 2018-11-28 15:29:25 -08:00
Ryan Brandenburg 321327f84b Merge branch 'master' of github.com:aspnet/AspNetCore into rybrande/MondoMaster 2018-11-28 12:28:04 -08:00
Ryan Brandenburg 47d6329f67 Fix Razor RootPath 2018-11-27 16:57:06 -08:00
Ryan Brandenburg fa1af0e5a5 Merge remote-tracking branch 'origin/release/2.2' into rybrande/MondoMaster 2018-11-27 15:04:40 -08:00
Ryan Brandenburg d025e4e0ad Fix submodules for Mvc MvcPrecompilation Razor and SignalR 2018-11-27 11:02:50 -08:00
Steve Sanderson 16c11b4c87 Integrate src/Components into mondorepo build system 2018-11-27 17:17:34 +00:00
Ryan Brandenburg 291e743c9c Remove duplicate order 2018-11-26 14:48:05 -08:00
Nate McMaster f57bed87ee
Avoid build order changes 
Co-Authored-By: ryanbrandenburg <rybrande@microsoft.com>
 2018-11-26 14:45:22 -08:00
Ryan Brandenburg e60e74e2bb Merge remote-tracking branch 'origin/release/2.2' into rybrande/Mondo22ToMaster 2018-11-26 12:32:17 -08:00
Nate McMaster 006558c412
Merge branch 'release/2.2' 2018-11-21 16:28:33 -08: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
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
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