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

4500 Commits

Author SHA1 Message Date
James Newton-King ce7d77aa09
Merge pull request #8577 from dotnet-maestro-bot/merge/release/2.2-to-master 2018-10-11 08:10:56 +13:00
James Newton-King 9daf5ff7a4
Fix PageRouteTransformerConvention with custom page routes (#8576) 2018-10-10 18:33:30 +13:00
Ryan Nowak c355e28ef1
Merge pull request #8571 from aspnet/rynowak/manual-merge 
This is a manual merge from release/2.2 to master
 2018-10-08 18:05:35 -07:00
Ryan Nowak d37052c467 Merge branch 'release/2.2' 2018-10-08 16:32:01 -07:00
Ryan Nowak 6cee2431f1 React to routing changes 2018-10-08 15:45:32 -07:00
David J. Quiroga 956441aa68 Ignore created URI if Assembly.CodeBase contains a fragment (#8556) 
* Fixes #8367
 2018-10-08 10:41:04 -07:00
Ryan Nowak 67a1f2dda9 Add security text about Host header 2018-10-05 22:26:37 -07:00
Ryan Nowak 9e6011bc5d
Merge pull request #8561 from aspnet/rynowak/merge/release-2.2-to-master 
merge release 2.2 to master
 2018-10-05 22:25:43 -07:00
Ryan Nowak 37decc5ce6 Merge branch 'release/2.2' 2018-10-05 21:58:13 -07:00
Ryan Nowak 384b814349 React to IEndpointSelectorPolicy changes 2018-10-05 21:03:53 -07:00
Doug Bunting 72e93d82ce
Merge pull request #8553 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-10-04 16:23:43 -07:00
Doug Bunting 5a5bb47860
Merge branch 'master' into merge/release/2.2-to-master 2018-10-04 16:04:25 -07:00
Doug Bunting 5bddd226a3
Use Internal.AspNetCore.Sdk as an MSBuild SDK 
- should resolve issues with occasional strange MSBuild caching issues in this repo
- modeled after aspnet/Scaffolding#905
- follows aspnet/BuildTools#729 recommendation to check in global.config file
  - see also Microsoft/msbuild#2914
- use newer KoreBuild
  - `.\build.cmd -update /t:noop`
 2018-10-04 15:12:38 -07:00
Pranav K 153165f9ad
Handle OPTIONS requests without a handler in Razor Pages (#8528) 
* Handle OPTIONS requests without a handler in Razor Pages

Fixes #7438
 2018-10-04 12:25:36 -07:00
Pranav K 523b2223ad
Merge pull request #8551 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-10-04 09:46:45 -07:00
Doug Bunting 39dff62893
Slight change for `master` branch 2018-10-03 22:32:42 -07:00
Doug Bunting e2594c6a2b
Merge branch 'dougbu/no.more.dev' into release/2.2 2018-10-03 21:55:24 -07:00
James Newton-King 94101a9cde
Add PageRouteTransformerConvention (#8541) 2018-10-04 17:34:26 +13:00
Doug Bunting 8ad2da9da3
Quick fix: Remove dangling mentions of `dev` branches 2018-10-03 20:25:17 -07:00
James Newton-King d30678e08e
Merge branch 'merge/release/2.2-to-master' 2018-10-04 16:17:48 +13:00
James Newton-King 7854d65c11
Support page parameter in attribute route (#8530) 2018-10-04 14:39:40 +13:00
Pranav K 60325c8010
Merge pull request #8537 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-10-02 14:25:28 -07:00
Alexej Timonin 70ddf15cbc MethodMatches 🚿 2018-10-02 12:57:18 -07:00
Pranav K a48e75dfb4
Implicitly set content type for ObjectResults containing ProblemDetails (#8512) 
* Implicitly set content type for ObjectResults containing ProblemDetails

Fixes #8467
 2018-10-02 10:24:38 -07:00
Ryan Nowak e9c7b08d10
Merge pull request #8524 from aspnet/rynowak/endpoint-selector-master 
Rynowak/endpoint selector master
 2018-09-30 14:55:28 -07:00
Ryan Nowak 925a26c264 Merge branch 'release/2.2' 2018-09-30 14:29:44 -07:00
Ryan Nowak 3667b0481a React to routing API changes 
Reaction for: https://github.com/aspnet/Routing/pull/822
 2018-09-30 14:26:06 -07:00
Ryan Nowak c3adc59792 Merge branch 'release/2.2' 2018-09-30 14:04:56 -07:00
ASP.NET CI 3e43cb0033 Update dependencies.props 
[auto-updated: dependencies]
 2018-09-30 12:25:19 -07:00
ASP.NET CI 235ab17ed4 Update dependencies.props 
[auto-updated: dependencies]
 2018-09-30 12:23:24 -07:00
Ryan Nowak cb1393cbb1 Adding functional tests for LinkGenerator 2018-09-29 20:34:48 -07:00
Nate McMaster 2d541ad68c
automated: merge branch release/2.2 2018-09-28 17:27:34 -07:00
Nate McMaster cc65115be1
automated: bulk infrastructure updates. Update bootstrapper scripts and remove unnecessary signing properties 2018-09-28 17:10:37 -07:00
Nate McMaster 9f6fd02bba
Merge branch 'release/2.2' 2018-09-28 11:44:54 -07:00
Nate McMaster ef21286792
Fix microbuild code signing configuration (#8511) 
Fixup the paths to files to be signed.
 2018-09-28 10:36:56 -07:00
Pranav K ccb6579cd7
Do not return ProblemDetails for < 4xx status codes 
Fixes #8504
 2018-09-28 10:33:45 -07:00
Pranav K e01fbe420f
Merge pull request #8505 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-09-28 07:55:27 -07:00
Eilon Lipton d985f9ec44
Update LICENSE.txt 2018-09-27 15:46:08 -07:00
Pranav K 2f0aee6736
Merge remote-tracking branch 'origin/release/2.2' 2018-09-26 16:13:57 -07:00
Pranav K 8311fd870b
Include the response type in ProducesResponseType for client errors (#8490) 
* Include the response type in ProducesResponseType for client errors

* Refactor ActualApiResponseMetadata discovery in to a separate more manageable type
* Annotate action result ctors and helper methods that specify the "object" value with attribute
* Modify the discovery of parameters to match ActionResultObjectValueAttribute and ActionResultStatusCodeAttribute by name
  to allow users to write and annotate custom helper methods and action results, a la NotNullAttribute.

Fixes #8345
 2018-09-26 15:51:49 -07:00
Ryan Nowak f2612f4cc0
Merge pull request #8498 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-09-26 12:45:27 -07:00
Ryan Nowak 3a8f1ad564
Merge branch 'master' into merge/release/2.2-to-master 2018-09-26 10:16:14 -07:00
Pranav K 5b8b3a0067
Reference Microsoft.NET.Sdk.Razor in projects with Razor files (during benchmark builds) 2018-09-26 10:10:16 -07:00
Ryan Nowak 831937c86c Add LinkGenerator extensions for MVC 2018-09-26 09:37:46 -07:00
Pranav K 50cef4822a
Invoke FlushAsync before disposing the HttpResponseWriter in JsonResultExecutor 
Fixes #8486
 2018-09-24 13:00:56 -07:00
ASP.NET CI db7555b0ba Update dependencies.props 
[auto-updated: dependencies]
 2018-09-23 19:25:04 +00:00
ASP.NET CI bd2754160e Update dependencies.props 
[auto-updated: dependencies]
 2018-09-23 12:22:59 -07:00
Ryan Nowak 71d4d1be07 Merge branch 'release/2.2' 2018-09-22 16:37:02 -07:00
Ryan Nowak 89a962716f React to Routing LinkGenerator changes 2018-09-22 15:47:38 -07:00
Doug Bunting 90089953d7
Merge pull request #8491 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-09-21 15:40:49 -07:00