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

32595 Commits

Author SHA1 Message Date
dotnet-bot 0ec3101fe1 Merge in 'release/2.2' changes 2018-12-21 19:03:24 +00:00
Justin Kotalik f1b125d69f
Restore IISIntegration Unit test project (#6068) 2018-12-21 11:02:18 -08:00
dotnet-bot 594e4c4c35 Merge in 'release/2.2' changes 2018-12-21 01:28:47 +00:00
Justin Kotalik d9cf76f63d Merge release/2.1 into 2.2 2018-12-20 16:51:06 -08:00
dotnet-bot 6772da9d90 Merge in 'release/2.2' changes 2018-12-20 18:35:02 +00:00
James Newton-King 4601a26ec2
Fix order in DFA matcher test (#5954) 2018-12-21 07:33:54 +13:00
dotnet-bot 66d35bd153 Merge in 'release/2.2' changes 2018-12-18 23:48:35 +00:00
Justin Kotalik de954ce702
Fixing IIS Tests (#5682) 2018-12-18 18:46:56 -05:00
dotnet-bot d481817289 Merge in 'release/2.2' changes 2018-12-18 22:33:43 +00:00
James Newton-King 03cb4a6e14
Add missing dependencies to the MVC dependencies.props (#5714) 2018-12-19 11:32:23 +13:00
dotnet-bot 967f551968 Merge in 'release/2.2' changes 2018-12-18 20:38:50 +00:00
Stephen Halter 21ef9f3c39
Revert "Fix flakiness in RequestsCanBeAbortedMidRead (#4881)" (#5708) 
This was never supposed be be merged into release/2.2 or master since both those branches include aspnet/KestrelHttpServer#2844.

This reverts commit 019ba081d3.
 2018-12-18 12:37:25 -08:00
John Luo 0cbc52ca15 Convert ServerTests to Reference and move to Server folder (#4686) 2018-12-18 14:59:47 -05:00
dotnet-bot 9dda9a3e2a Merge in 'release/2.2' changes 2018-12-18 18:58:34 +00:00
Ajay Bhargav Baaskaran 647fbbac7b Merge branch 'release/2.1' into ajbaaska/merge-22 2018-12-17 18:40:08 -08:00
Ajay Bhargav Baaskaran b079041488
Convert Razor to use Reference (#4954) 2018-12-17 12:10:40 -08:00
dotnet-bot c3a269adc3 Merge in 'release/2.2' changes 2018-12-15 01:29:18 +00:00
John Luo da72ac62ba Merge remote-tracking branch 'origin/release/2.2' into release/2.2 2018-12-14 16:52:45 -08:00
John Luo ddd335be26 Merge branch 'release/2.1' into release/2.2 2018-12-14 16:50:16 -08:00
Stephen Halter 019ba081d3
Fix flakiness in RequestsCanBeAbortedMidRead (#4881) 
Addresses aspnet/AspNetCore-Internal#1521
 2018-12-14 16:26:54 -08:00
dotnet-bot a6112bf0dd Merge in 'release/2.2' changes 2018-12-15 00:05:19 +00:00
Nate McMaster 9183145474
Fix package layout for ANCM packages (#5119) 2018-12-14 16:04:15 -08:00
John Luo f659f0acce Merge branch 'release/2.1' into release/2.2 2018-12-14 15:48:40 -08:00
Justin Kotalik 68f0aff144 security to project ref (#4618) 2018-12-14 14:49:23 -08:00
dotnet-bot a6ff4436ae Merge in 'release/2.2' changes 2018-12-14 20:06:55 +00:00
Nate McMaster cb5458e870
Exclude ancm.mof from code signing 
This file is not signable. The sign tool treats .mof as a potential signing candidate by default, even though most .mof files are not signable.
 2018-12-14 12:05:30 -08:00
dotnet-bot 9b1be901d3 Merge in 'release/2.2' changes 2018-12-14 19:43:29 +00:00
Nate McMaster 6402a6a971
Fix aspnet/AspNetCore-Internal#1503 - ensure ANCM packages are code signed 2018-12-14 11:41:56 -08:00
dotnet-bot 8b682dfe85 Merge in 'release/2.2' changes 2018-12-14 19:01:05 +00:00
Nate McMaster feb641ddda
Merge branch 'release/2.1' into release/2.2 2018-12-14 09:44:15 -08:00
Nate McMaster 13ae0057fb
Replace .Sources package references with local code (#4801) 
Replaces package references the following packages with local code:

Microsoft.AspNetCore.Certificates.Generation.Sources
Microsoft.Extensions.CopyOnWriteDictionary.Sources 
Microsoft.Extensions.ClosedGenericMatcher.Sources
Microsoft.Extensions.ObjectMethodExecutor.Sources
Microsoft.Extensions.PropertyActivator.Sources
Microsoft.Extensions.PropertyHelper.Sources
Microsoft.Extensions.RazorViews.Sources
Microsoft.Extensions.SecurityHelper.Sources
Microsoft.Extensions.StackTrace.Sources
Microsoft.Extensions.WebEncoders.Sources
 2018-12-14 08:36:36 -08:00
dotnet-bot 45dca6d8d4 Merge in 'release/2.2' changes 2018-12-14 09:22:46 +00:00
James Newton-King dd662ed2a7
Fix compiling Mvc.sln in 2.2 (#4955) 2018-12-14 22:21:44 +13:00
dotnet-bot 3b0d1253e1 Merge in 'release/2.2' changes 2018-12-14 08:57:43 +00:00
Nate McMaster 206db0558e
Update buildtools and add properties to skip IIS tests 2018-12-13 23:36:42 -08:00
Nate McMaster f0990ec531
Fix build issues with IIS integration projects 
Changes:
* Ensure IIS managed and pkg projects build after the native projects
* Update projects to build test
* Update CI checks to build on macOS and Linux
* Use package baselines to manage ANCM packages
 2018-12-13 22:53:31 -08:00
Nate McMaster 4998ad8622
Merge branch 'merge/release/2.1-to-release/2.2' into release/2.2 (#4619) 2018-12-13 22:24:21 -08:00
Justin Kotalik 6adfa32402
Merge branch 'release/2.1' into release/2.2 2018-12-13 22:12:19 -08:00
Nate McMaster 96ea326664
Document custom reference resolution (#4806) 2018-12-13 14:35:02 -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
Chris Ross a3c99028b2
Fix HttpSys Caching_SendFileWithFullContentLength_Cached test (#4630) 2018-12-12 17:14:46 -08:00
dotnet-bot f1bfecfa03 Merge in 'release/2.2' changes 2018-12-12 22:37:18 +00:00
Mikael Mengistu 9e76bec6e1
Fix CORS Functional Tests (#4610) 2018-12-12 14:36:14 -08:00
Justin Kotalik 429719b91d
Make IISIntegration use Reference instead of PackageReference (and reactionary work) (#4311) 2018-12-12 16:59:44 -05:00
dotnet-bot 1d0254977e Merge in 'release/2.2' changes 2018-12-12 21:52:26 +00:00
Ajay Bhargav Baaskaran 5e6c2208fd Merge branch 'release/2.1' into release/2.2 2018-12-12 13:14:20 -08:00
dotnet-bot 6de24d6d2c Merge in 'release/2.2' changes 2018-12-12 21:00:13 +00:00
Ajay Bhargav Baaskaran ad3835c3e2
Removed unnecessary projects (#4586) (#4612) 2018-12-12 12:59:04 -08:00
Justin Kotalik 74753428e9
Add Vs install script (#4607) 2018-12-12 15:57:00 -05:00
Ajay Bhargav Baaskaran 98f2973880
Removed unnecessary projects (#4586) 2018-12-12 10:41:06 -08:00