Commit Graph

4194 Commits

Author SHA1 Message Date
James Newton-King 4814610a4c
Merge branch 'merge/release/2.2-to-master' 2018-07-13 13:01:33 +12:00
Pranav K 0e9123dfcc
Merge pull request #8069 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-07-12 17:24:17 -07:00
James Newton-King f12f9b46ed
Add startup filter to set MiddlewareFilterBuilder.ApplicationBuilder 2018-07-13 12:23:30 +12:00
Hao Kung a5083d525b
Fix regression with Authorize + IPolicyProvider (#8068) 2018-07-12 15:36:03 -07:00
Pranav K 46189abda7 Refactoring for ApiConvention analyzers 2018-07-12 14:26:27 -07:00
Pranav K 0cadd94183
Merge pull request #8063 from dotnet-maestro-bot/merge/release/2.2-to-master
[automated] Merge branch 'release/2.2' => 'master'
2018-07-12 13:53:02 -07:00
Pranav K a87b8fa2af
Merge remote-tracking branch 'origin/release/2.1' into release/2.2 2018-07-12 12:48:57 -07:00
Pranav K f26a613528
Merge commit '4f1b7ccca634bd0ab2d3336a6f2623ebe8b6682d' into release/2.2 2018-07-12 12:48:50 -07:00
Pranav K 174c5eaa6c Make fewer public API changes 2018-07-12 12:46:49 -07:00
Pranav K 4f1b7ccca6 Use ModelMetadata from actual types for validation
Fixes https://github.com/aspnet/Mvc/issues/7952
2018-07-12 12:46:49 -07:00
James Newton-King 152ed3b4c3
Merge branch 'merge/release/2.2-to-master' 2018-07-12 17:12:23 +12:00
James Newton-King a67d9363e2
Consumes endpoint constraint (#8057) 2018-07-12 16:35:33 +12:00
James Newton-King 601861289a
Merge branch 'merge/release/2.2-to-master' 2018-07-12 15:00:16 +12:00
James Newton-King 3154979189
Add Consumes endpoint constraint (#8053) 2018-07-12 14:58:57 +12:00
James Newton-King c367e1d681
Fix dispatching functional tests not using dispatching startup (#8052) 2018-07-12 14:19:48 +12:00
James Newton-King a6987cc1cd
Merge branch 'merge/release/2.2-to-master' 2018-07-11 12:37:38 +12:00
James Newton-King 183ecd85d6
Fix MVC integration with UseEndpoint (#8047) 2018-07-11 11:47:33 +12:00
Kiran Challa 5a7a3bfcb3 Merge branch 'merge/release/2.2-to-master'
# Conflicts:
#	build/dependencies.props
#	korebuild-lock.txt
2018-07-10 14:04:43 -07:00
Pranav K 1e7be641ae Add some common aliases for conventions
Fixes #8015
2018-07-09 18:25:29 -07:00
Kiran Challa 0812279464 Merge branch 'release/2.1' into kichalla/21.to.22.mergecommit
# Conflicts:
#	build/dependencies.props
#	korebuild-lock.txt
#	src/Microsoft.AspNetCore.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs
#	test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ApiBehaviorApplicationModelProviderTest.cs
#	version.props
2018-07-09 13:00:10 -07:00
Kiran Challa bd995d4cb1 [Fixes #7959] Conventional routing with custom templates not working when you have area attributes 2018-07-09 12:35:14 -07:00
Alexej Timonin dc2ae93c3f
Add fallback attribute to partial tag helper.
Addresses #7515
2018-07-09 12:24:26 -07:00
hishamco dee479fda7
Add partial helper to Razor Page \ PageModel
Fixes #7885
2018-07-09 11:01:15 -07:00
ASP.NET CI 432e11f286 Update dependencies.props
[auto-updated: dependencies]
2018-07-08 20:03:13 +00:00
ASP.NET CI d2cfbd2671 Update dependencies.props
[auto-updated: dependencies]
2018-07-08 12:22:39 -07:00
Pranav K d2bb674b0a
Add support for default response (#8028)
* Add support for default response

Fixes #6828
2018-07-06 16:44:07 -07:00
Pranav K 23cf9643a2
Merge pull request #8024 from aspnet/merge/release/2.2
[automated] Merge branch 'release/2.2' => 'master'
2018-07-06 12:14:40 -07:00
ASP.NET CI da556a41b7 Update dependencies.props
[auto-updated: dependencies]
2018-07-03 16:21:36 +00:00
Nate McMaster (automated) 4aed4adf83
[automated] Change default branch to master 2018-07-02 12:40:30 -07:00
Pranav K 335500ab0e Use ModelMetadata from actual types for validation
Fixes https://github.com/aspnet/Mvc/issues/7952
2018-07-02 11:23:16 -07:00
Alexej Timonin c2fcfabdf3 Add optional property to PartialTagHelper (#7991)
* Add optional to PartialTagHelper

Addresses #7268
2018-06-29 16:02:38 -07:00
Zbginiew Dobras f6befb9ed3 Added ObjectResult implementation for Unauthorized response 2018-06-29 14:27:34 -07:00
Pranav K 4f1f97b5d5
Merge branch 'release/2.2' into dev 2018-06-29 13:56:00 -07:00
Nathanael Marchand 133d49c57e
Fix Api Explorer not returning type with ActionResult<T> and no type in ProducesResponseTypeAttribute 2018-06-29 13:55:30 -07:00
Pranav K 7f2a64e32b
Razor runtime compilation produces errors if running on a shared runtime that's rolled forward
Do not provide compilation references from runtime MVC assemblies. This avoids cases where the app is compiled
against an older MVC but running against a newer one (e.g. shared fx roll forward) resulting in compiling against multiple
versions of MVC assemblies

Fixes #7969
2018-06-29 13:55:22 -07:00
Nate McMaster ef58ac5a87
Merge branch 'release/2.2' into dev 2018-06-29 13:44:30 -07:00
Nate McMaster e3d8189f98
Update branding to 3.0.0-alpha1 2018-06-29 13:44:20 -07:00
Nathanael Marchand 82f7f2aab8 Fix Api Explorer not returning type with ActionResult<T> and no type in ProducesResponseTypeAttribute 2018-06-29 12:00:16 -07:00
Nathanael Marchand ac4d6366b7 Fix Api Explorer not returning type with ActionResult<T> and no type in ProducesResponseTypeAttribute 2018-06-29 11:47:13 -07:00
Pranav K 042c833145
Razor runtime compilation produces errors if running on a shared runtime that's rolled forward
Do not provide compilation references from runtime MVC assemblies. This avoids cases where the app is compiled
against an older MVC but running against a newer one (e.g. shared fx roll forward) resulting in compiling against multiple
versions of MVC assemblies

Fixes #7969
2018-06-29 11:40:23 -07:00
Nate McMaster 224017c762
Update CI and build tools for to use 2.2 versions 2018-06-29 11:33:02 -07:00
Pranav K c4d5ef94a9 Razor runtime compilation produces errors if running on a shared runtime that's rolled forward
Do not provide compilation references from runtime MVC assemblies. This avoids cases where the app is compiled
against an older MVC but running against a newer one (e.g. shared fx roll forward) resulting in compiling against multiple
versions of MVC assemblies

Fixes #7969
2018-06-29 11:17:25 -07:00
Kiran Challa 66cb3d50aa Upgraded dependencies.props 2018-06-29 04:48:28 -07:00
Kiran Challa 0295f6d6e3 Revert "Using Routing feature branch package"
This reverts commit 13585f711f.
2018-06-29 04:39:32 -07:00
Doug Bunting 192e8073ee
Work around `CryptographicException`s thrown in some full framework test runs
- always skip affected tests on full framework
2018-06-28 15:52:19 -07:00
Kiran Challa 13585f711f Using Routing feature branch package 2018-06-28 13:27:15 -07:00
Kiran Challa 54c14b8782 Reacting to Routing repo's EndpointFinder changes 2018-06-28 12:40:04 -07:00
Doug Bunting 4dd4e5ef3e
Shorten names so MVC repo can be cloned on Windows benchmarks server 2018-06-27 14:33:31 -07:00
kishanAnem e1af5b8b6d Array or List in query string does not get parsed #7712 (#7967)
- exclude collections when detecting complex types in `ApiBehaviorApplicationModelProvider`
- add test cases
2018-06-26 11:43:46 -07:00
ASP.NET CI f15457c026 Update dependencies.props
[auto-updated: dependencies]
2018-06-25 11:23:45 -07:00