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

4268 Commits

Author SHA1 Message Date
Ryan Nowak 4c552f2a1e
Merge pull request #8163 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-07-28 21:23:08 -07:00
Ryan Nowak 9c26fe6207
Merge branch 'master' into merge/release/2.2-to-master 2018-07-28 19:41:15 -07:00
Ryan Nowak fbae57cde1 React to the removal of EndpointConstraint 2018-07-28 19:03:16 -07:00
James Newton-King c01c7075be
Add EndpointMetadata to ActionDescriptor and hookup CORS (#8158) 2018-07-28 16:12:54 +12:00
Doug Bunting efb29913a9
Merge pull request #8160 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-07-27 12:13:16 -07:00
Doug Bunting 556880872d
Ensure later validations of `null` models do not overwrite `Invalid` state 
- #8078
 2018-07-26 13:49:22 -07:00
Doug Bunting 7d2160e6c9
Merge pull request #8151 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-07-26 11:50:24 -07:00
Doug Bunting 0d427a60e5
Use `TheoryData` properties to avoid duplicate test data 
- couldn't just remove duplicate `[TheoryData]` in `GlobalRoutingTest`
  - xUnit analyzers don't understand `[InlineData]` is inherited (though runtime certainly does)
 2018-07-26 10:12:50 -07:00
Doug Bunting f165738c99
Merge pull request #8149 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-07-26 09:37:03 -07:00
Doug Bunting 498fa2d72f
Avoid `InvalidOperationException` when serializing `SerializableError` 
- #8055
- provide unique name (`<Empty-Key>`) for XML elements that would otherwise be nameless

nits:
- remove now-useless Mono special case in updated test class
- extend updated tests to involve square brackets as well as empty keys
 2018-07-26 08:56:02 -07:00
James Newton-King 1e0d1d7eb2
Merge branch 'merge/release/2.2-to-master' 2018-07-26 10:30:01 +12:00
James Newton-King f31ab716ee
Change MvcEndpointDataSource to use GetChangeToken (#8137) 2018-07-26 09:20:26 +12:00
Kiran Challa f06810f744 Updated dependencies.props 2018-07-25 11:50:23 -07:00
Kiran Challa 06b0872ff9 Merge branch 'merge/release/2.2-to-master' 2018-07-25 10:38:40 -07:00
Kiran Challa 5628b5c496 Use feature branch versions of routing 2018-07-25 07:12:10 -07:00
Kiran Challa b0cd3f2d7a Merge branch 'merge/release/2.2-to-master' 
# Conflicts:
#	build/dependencies.props
 2018-07-25 07:08:16 -07:00
Kiran Challa 10ce77b9ca Updated MvcEndpointDataSource to create endpoints with SuppressLinkGenerationMetadata 2018-07-25 06:41:57 -07:00
Kiran Challa bf50387092 Upgraded dependencies.props 2018-07-25 06:31:58 -07:00
Kiran Challa bcd6e83591 Upgraded dependencies.props 2018-07-25 06:15:17 -07:00
Ryan Nowak b71d5da05e Fix test break due to 405 returned from routing 2018-07-24 22:15:32 -07:00
James Newton-King c08504b08a
MVC startup experience (#8131) 2018-07-25 14:30:51 +12:00
Kiran Challa 630aeade07 Added tests related to generating urls with route name 2018-07-24 15:06:16 -07:00
Nate McMaster 6a8f015d34
Merge branch 'release/2.1' into release/2.2 2018-07-24 12:07:23 -07:00
Eilon Lipton f850e31bfb
Update CONTRIBUTING.md 2018-07-24 10:54:26 -07:00
Kiran Challa 1b40c4388e Use routing feature branch versions 2018-07-24 10:12:41 -07:00
Kiran Challa a608f9f844 Merge branch 'merge/release/2.2-to-master' 
# Conflicts:
#	build/dependencies.props
 2018-07-24 10:06:00 -07:00
Kiran Challa 5580928209 Upgraded dependencies.props 2018-07-24 09:18:08 -07:00
Kiran Challa 9b217892ab Using routing feature branch versions to prevent cross repo breaking changes 2018-07-24 05:21:37 -07:00
Kiran Challa 3df34dbbfe React to Routing repo's LinkGenerator api changes 2018-07-24 05:20:53 -07:00
Pranav K 64a977b87d
Merge pull request #8129 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-07-23 11:29:13 -07:00
Alexej Timonin 52c1e942c6
Added UseCamelCasing and UseMemberCasing extension methods to MvcJsonOptions (#7256) 2018-07-23 10:11:04 -07:00
Ryan Nowak 3c1034cf12 Merge remote-tracking branch 'origin/release/2.2' 2018-07-23 08:06:47 -07:00
Ryan Nowak 83d3ddb686 update deps 2018-07-23 08:06:05 -07:00
Ryan Nowak 196e3f109f React to Routing branding 
This is a reaction PR for the branding changes in progress in Routing.

This can be merged after the changes to in to Routing.
 2018-07-22 19:47:15 -07:00
ASP.NET CI 8170534275 Update dependencies.props 
[auto-updated: dependencies]
 2018-07-22 13:07:51 -07:00
ASP.NET CI 3c73a98357 Update dependencies.props 
[auto-updated: dependencies]
 2018-07-22 12:21:04 -07:00
Doug Bunting ff4e2eb4c8
Merge pull request #8123 from kishanAnem/dev 
Custom error messages with validation message tag helper #8035
 2018-07-22 11:05:53 -07:00
kishan.anem c0ba374549 Custom error messages with validation message tag helper #8035 
#8035
PR #8087
https://github.com/aspnet/Razor/issues/2497
 2018-07-22 17:55:06 +05:30
Kiran Challa e1e7ec0f28 Enable couple of skipped Dispatching functional tests 2018-07-21 04:44:38 -07:00
Pranav K 2081abd75d
Merge remote-tracking branch 'origin/release/2.2' 2018-07-20 17:09:38 -07:00
Pranav K e903bda94a
Add test project to Mvc.NoFun.sln 2018-07-20 17:09:20 -07:00
Remco 28c0c4d128
Add ability to override the testing web content root using environment variables 2018-07-20 16:56:24 -07:00
Alexej Timonin d4beab5d09
CompositeValidationAttribute 
- Add abstract CompositeValidationAttribute.
- Change DataAnnotationsMetadataProvider.CreateValidationMetadata to
populate ValidatorMetadata with validation attributes from CompositeValidationAttribute.
 2018-07-20 15:31:14 -07:00
Ryan Nowak 56a67b92a6 Merge remote-tracking branch 'origin/release/2.2' 2018-07-20 13:09:18 -07:00
Ryan Nowak 5c488bf09c make feature branch build 2018-07-20 12:57:43 -07:00
Ryan Nowak 8f8d3afd36 Fix bug in benchmark 2018-07-20 12:57:43 -07:00
Ryan Nowak 3ba6f35495 React to RoutePattern changes in Routing 2018-07-20 12:57:43 -07:00
Pranav K 49be8d20a9
Merge pull request #8119 from dotnet-maestro-bot/merge/release/2.2-to-master 
[automated] Merge branch 'release/2.2' => 'master'
 2018-07-19 18:41:06 -07:00
Kristian Hellang 53930af0e3 Set ProblemDetails status field during ObjectResult formatting 2018-07-19 17:57:55 -07:00
James Newton-King 707f02a266
Merge branch 'merge/release/2.2-to-master' 2018-07-19 17:17:46 +12:00