Use C# 7 features

src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintItem.cs

@@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.Mvc.ActionConstraints
         /// <summary>
         /// The <see cref="IActionConstraintMetadata"/> instance.
         /// </summary>
-        public IActionConstraintMetadata Metadata { get; private set; }
+        public IActionConstraintMetadata Metadata { get; }
 
         /// <summary>
         /// Gets or sets a value indicating whether or not <see cref="Constraint"/> can be reused across requests.

src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintProviderContext.cs

@@ -52,11 +52,11 @@ namespace Microsoft.AspNetCore.Mvc.ActionConstraints
         /// <summary>
         /// The <see cref="ActionDescriptor"/> for which constraints are being created.
         /// </summary>
-        public ActionDescriptor Action { get; private set; }
+        public ActionDescriptor Action { get; }
 
         /// <summary>
         /// The list of <see cref="ActionConstraintItem"/> objects.
         /// </summary>
-        public IList<ActionConstraintItem> Results { get; private set; }
+        public IList<ActionConstraintItem> Results { get; }
     }
 }

src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiDescriptionProviderContext.cs

@@ -31,11 +31,11 @@ namespace Microsoft.AspNetCore.Mvc.ApiExplorer
         /// <summary>
         /// The list of actions.
         /// </summary>
-        public IReadOnlyList<ActionDescriptor> Actions { get; private set; }
+        public IReadOnlyList<ActionDescriptor> Actions { get; }
 
         /// <summary>
         /// The list of resulting <see cref="ApiDescription"/>.
         /// </summary>
-        public IList<ApiDescription> Results { get; private set; }
+        public IList<ApiDescription> Results { get; }
     }
 }

src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterDescriptor.cs

@@ -54,7 +54,7 @@ namespace Microsoft.AspNetCore.Mvc.Filters
         /// <summary>
         /// The <see cref="IFilterMetadata"/> instance.
         /// </summary>
-        public IFilterMetadata Filter { get; private set; }
+        public IFilterMetadata Filter { get; }
 
         /// <summary>
         /// The filter order.
@@ -64,6 +64,6 @@ namespace Microsoft.AspNetCore.Mvc.Filters
         /// <summary>
         /// The filter scope.
         /// </summary>
-        public int Scope { get; private set; }
+        public int Scope { get; }
     }
 }

src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/BindingInfo.cs

@@ -125,13 +125,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
                 _providers = providers;
             }
 
-            public Func<ModelMetadata, bool> PropertyFilter
+            public Func<ModelMetadata, bool> PropertyFilter => CreatePropertyFilter();
-            {
-                get
-                {
-                    return CreatePropertyFilter();
-                }
-            }
 
             private Func<ModelMetadata, bool> CreatePropertyFilter()
             {

src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/EnumGroupAndName.cs

@@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
     /// </summary>
     public struct EnumGroupAndName
     {
-        private Func<string> _name;
+        private readonly Func<string> _name;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="EnumGroupAndName"/> structure. This constructor should 
@@ -65,12 +65,6 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
         /// <summary>
         /// Gets the name.
         /// </summary>
-        public string Name
+        public string Name => _name();
-        {
-            get
-            {
-                return _name();
-            }
-        }
     }
 }

src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelError.cs

@@ -32,8 +32,8 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
             ErrorMessage = errorMessage ?? string.Empty;
         }
 
-        public Exception Exception { get; private set; }
+        public Exception Exception { get; }
 
-        public string ErrorMessage { get; private set; }
+        public string ErrorMessage { get; }
     }
 }

src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelMetadata.cs

@@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
         /// <summary>
         /// Gets the container type of this metadata if it represents a property, otherwise <c>null</c>.
         /// </summary>
-        public Type ContainerType { get { return Identity.ContainerType; } }
+        public Type ContainerType => Identity.ContainerType;
 
         /// <summary>
         /// Gets the metadata of the container type that the current instance is part of.
@@ -56,23 +56,17 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
         /// <summary>
         /// Gets a value indicating the kind of metadata element represented by the current instance.
         /// </summary>
-        public ModelMetadataKind MetadataKind { get { return Identity.MetadataKind; } }
+        public ModelMetadataKind MetadataKind => Identity.MetadataKind;
 
         /// <summary>
         /// Gets the model type represented by the current instance.
         /// </summary>
-        public Type ModelType { get { return Identity.ModelType; } }
+        public Type ModelType => Identity.ModelType;
 
         /// <summary>
         /// Gets the property name represented by the current instance.
         /// </summary>
-        public string PropertyName
+        public string PropertyName => Identity.Name;
-        {
-            get
-            {
-                return Identity.Name;
-            }
-        }
 
         /// <summary>
         /// Gets the key for the current instance.

src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelStateDictionary.cs

@@ -112,10 +112,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
         /// Returns <c>true</c> if a <see cref="TooManyModelErrorsException"/> has been recorded;
         /// otherwise <c>false</c>.
         /// </remarks>
-        public bool HasReachedMaxErrors
+        public bool HasReachedMaxErrors => ErrorCount >= MaxAllowedErrors;
-        {
-            get { return ErrorCount >= MaxAllowedErrors; }
-        }
 
         /// <summary>
         /// Gets the number of errors added to this instance of <see cref="ModelStateDictionary"/> via

src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientValidatorProviderContext.cs

@@ -33,13 +33,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
         /// <remarks>
         /// This property provides convenience access to <see cref="ModelMetadata.ValidatorMetadata"/>.
         /// </remarks>
-        public IReadOnlyList<object> ValidatorMetadata
+        public IReadOnlyList<object> ValidatorMetadata => ModelMetadata.ValidatorMetadata;
-        {
-            get
-            {
-                return ModelMetadata.ValidatorMetadata;
-            }
-        }
 
         /// <summary>
         /// Gets the list of <see cref="ClientValidatorItem"/> instances. <see cref="IClientModelValidatorProvider"/>

src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationResult.cs

@@ -11,8 +11,8 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
             Message = message ?? string.Empty;
         }
 
-        public string MemberName { get; private set; }
+        public string MemberName { get; }
 
-        public string Message { get; private set; }
+        public string Message { get; }
     }
 }

src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidatorProviderContext.cs

@@ -32,13 +32,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
         /// <remarks>
         /// This property provides convenience access to <see cref="ModelMetadata.ValidatorMetadata"/>.
         /// </remarks>
-        public IReadOnlyList<object> ValidatorMetadata
+        public IReadOnlyList<object> ValidatorMetadata => ModelMetadata.ValidatorMetadata;
-        {
-            get
-            {
-                return ModelMetadata.ValidatorMetadata;
-            }
-        }
 
         /// <summary>
         /// Gets the list of <see cref="ValidatorItem"/> instances. <see cref="IModelValidatorProvider"/> instances

src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationStateDictionary.cs

@@ -11,12 +11,12 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
     /// <summary>
     /// Used for tracking validation state to customize validation behavior for a model object.
     /// </summary>
-    public class ValidationStateDictionary : 
+    public class ValidationStateDictionary :
-        IDictionary<object, ValidationStateEntry>, 
+        IDictionary<object, ValidationStateEntry>,
         IReadOnlyDictionary<object, ValidationStateEntry>
     {
         private readonly Dictionary<object, ValidationStateEntry> _inner;
-        
+
         /// <summary>
         /// Creates a new <see cref="ValidationStateDictionary"/>.
         /// </summary>
@@ -30,8 +30,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
         {
             get
             {
-                ValidationStateEntry entry;
+                TryGetValue(key, out var entry);
-                TryGetValue(key, out entry);
                 return entry;
             }
 
@@ -42,58 +41,24 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
         }
 
         /// <inheritdoc />
-        public int Count
+        public int Count => _inner.Count;
-        {
-            get
-            {
-                return _inner.Count;
-            }
-        }
 
         /// <inheritdoc />
-        public bool IsReadOnly
+        public bool IsReadOnly => ((IDictionary<object, ValidationStateEntry>)_inner).IsReadOnly;
-        {
-            get
-            {
-                return ((IDictionary<object, ValidationStateEntry>)_inner).IsReadOnly;
-            }
-        }
 
         /// <inheritdoc />
-        public ICollection<object> Keys
+        public ICollection<object> Keys => ((IDictionary<object, ValidationStateEntry>)_inner).Keys;
-        {
-            get
-            {
-                return ((IDictionary<object, ValidationStateEntry>)_inner).Keys;
-            }
-        }
 
         /// <inheritdoc />
-        public ICollection<ValidationStateEntry> Values
+        public ICollection<ValidationStateEntry> Values => ((IDictionary<object, ValidationStateEntry>)_inner).Values;
-        {
-            get
-            {
-                return ((IDictionary<object, ValidationStateEntry>)_inner).Values;
-            }
-        }
 
         /// <inheritdoc />
-        IEnumerable<object> IReadOnlyDictionary<object, ValidationStateEntry>.Keys
+        IEnumerable<object> IReadOnlyDictionary<object, ValidationStateEntry>.Keys =>
-        {
+            ((IReadOnlyDictionary<object, ValidationStateEntry>)_inner).Keys;
-            get
-            {
-                return ((IReadOnlyDictionary<object, ValidationStateEntry>)_inner).Keys;
-            }
-        }
 
         /// <inheritdoc />
-        IEnumerable<ValidationStateEntry> IReadOnlyDictionary<object, ValidationStateEntry>.Values
+        IEnumerable<ValidationStateEntry> IReadOnlyDictionary<object, ValidationStateEntry>.Values =>
-        {
+            ((IReadOnlyDictionary<object, ValidationStateEntry>)_inner).Values;
-            get
-            {
-                return ((IReadOnlyDictionary<object, ValidationStateEntry>)_inner).Values;
-            }
-        }
 
         /// <inheritdoc />
         public void Add(KeyValuePair<object, ValidationStateEntry> item)
@@ -160,7 +125,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
         {
             return ((IDictionary<object, ValidationStateEntry>)_inner).GetEnumerator();
         }
-        
+
         private class ReferenceEqualityComparer : IEqualityComparer<object>
         {
             private static readonly bool IsMono = Type.GetType("Mono.Runtime") != null;

src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ValueProviderResult.cs

@@ -57,12 +57,12 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
         /// <summary>
         /// Gets or sets the <see cref="CultureInfo"/> associated with the values.
         /// </summary>
-        public CultureInfo Culture { get; private set; }
+        public CultureInfo Culture { get; }
 
         /// <summary>
         /// Gets or sets the values.
         /// </summary>
-        public StringValues Values { get; private set; }
+        public StringValues Values { get; }
 
         /// <summary>
         /// Gets the first value based on the order values were provided in the request. Use <see cref="FirstValue"/>
@@ -84,13 +84,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
         /// <summary>
         /// Gets the number of submitted values.
         /// </summary>
-        public int Length
+        public int Length => Values.Count;
-        {
-            get
-            {
-                return Values.Count;
-            }
-        }
 
         /// <inheritdoc />
         public override bool Equals(object obj)

src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroup.cs

@@ -24,11 +24,11 @@ namespace Microsoft.AspNetCore.Mvc.ApiExplorer
         /// <summary>
         /// The group name.
         /// </summary>
-        public string GroupName { get; private set; }
+        public string GroupName { get; }
 
         /// <summary>
         /// A collection of <see cref="ApiDescription"/> items for this group.
         /// </summary>
-        public IReadOnlyList<ApiDescription> Items { get; private set; }
+        public IReadOnlyList<ApiDescription> Items { get; }
     }
 }

src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroupCollection.cs

@@ -30,11 +30,11 @@ namespace Microsoft.AspNetCore.Mvc.ApiExplorer
         /// <summary>
         /// Returns the list of <see cref="IReadOnlyList{ApiDescriptionGroup}"/>.
         /// </summary>
-        public IReadOnlyList<ApiDescriptionGroup> Items { get; private set; }
+        public IReadOnlyList<ApiDescriptionGroup> Items { get; }
 
         /// <summary>
         /// Returns the unique version of the current items.
         /// </summary>
-        public int Version { get; private set; }
+        public int Version { get; }
     }
 }

src/Microsoft.AspNetCore.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs

@@ -48,10 +48,7 @@ namespace Microsoft.AspNetCore.Mvc.ApiExplorer
         }
 
         /// <inheritdoc />
-        public int Order
+        public int Order => -1000;
-        {
-            get { return -1000; }
-        }
 
         /// <inheritdoc />
         public void OnProvidersExecuting(ApiDescriptionProviderContext context)
@@ -261,8 +258,7 @@ namespace Microsoft.AspNetCore.Mvc.ApiExplorer
 
         private RouteTemplate ParseTemplate(ControllerActionDescriptor action)
         {
-            if (action.AttributeRouteInfo != null &&
+            if (action.AttributeRouteInfo?.Template != null)
-                action.AttributeRouteInfo.Template != null)
             {
                 return TemplateParser.Parse(action.AttributeRouteInfo.Template);
             }

src/Microsoft.AspNetCore.Mvc.Core/AcceptVerbsAttribute.cs

@@ -14,7 +14,6 @@ namespace Microsoft.AspNetCore.Mvc
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
     public sealed class AcceptVerbsAttribute : Attribute, IActionHttpMethodProvider, IRouteTemplateProvider
     {
-        private readonly IEnumerable<string> _httpMethods;
         private int? _order;
 
         /// <summary>
@@ -36,19 +35,13 @@ namespace Microsoft.AspNetCore.Mvc
         /// <param name="methods">The HTTP methods the action supports.</param>
         public AcceptVerbsAttribute(params string[] methods)
         {
-            _httpMethods = methods.Select(method => method.ToUpperInvariant());
+            HttpMethods = methods.Select(method => method.ToUpperInvariant());
         }
 
         /// <summary>
         /// Gets the HTTP methods the action supports.
         /// </summary>
-        public IEnumerable<string> HttpMethods
+        public IEnumerable<string> HttpMethods { get; }
-        {
-            get
-            {
-                return _httpMethods;
-            }
-        }
 
         /// <summary>
         /// The route template. May be null.
@@ -56,10 +49,7 @@ namespace Microsoft.AspNetCore.Mvc
         public string Route { get; set; }
 
         /// <inheritdoc />
-        string IRouteTemplateProvider.Template
+        string IRouteTemplateProvider.Template => Route;
-        {
-            get { return Route; }
-        }
 
         /// <summary>
         /// Gets the route order. The order determines the order of route execution. Routes with a lower
@@ -74,13 +64,7 @@ namespace Microsoft.AspNetCore.Mvc
         }
 
         /// <inheritdoc />
-        int? IRouteTemplateProvider.Order
+        int? IRouteTemplateProvider.Order => _order;
-        {
-            get
-            {
-                return _order;
-            }
-        }
 
         /// <inheritdoc />
         public string Name { get; set; }

src/Microsoft.AspNetCore.Mvc.Core/AcceptedResult.cs

@@ -12,8 +12,6 @@ namespace Microsoft.AspNetCore.Mvc
     /// </summary>
     public class AcceptedResult : ObjectResult
     {
-        private string _location;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="AcceptedResult"/> class with the values
         /// provided.
@@ -67,17 +65,7 @@ namespace Microsoft.AspNetCore.Mvc
         /// <summary>
         /// Gets or sets the location at which the status of the requested content can be monitored.
         /// </summary>
-        public string Location
+        public string Location { get; set; }
-        {
-            get
-            {
-                return _location;
-            }
-            set
-            {
-                _location = value;
-            }
-        }
 
         /// <inheritdoc />
         public override void OnFormatting(ActionContext context)

src/Microsoft.AspNetCore.Mvc.Core/ActionNameAttribute.cs

@@ -23,6 +23,6 @@ namespace Microsoft.AspNetCore.Mvc
         /// <summary>
         /// Gets the name of the action.
         /// </summary>
-        public string Name { get; private set; }
+        public string Name { get; }
     }
 }

src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModel.cs

@@ -31,9 +31,9 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationModels
         /// </remarks>
         public ApiExplorerModel ApiExplorer { get; set; }
 
-        public IList<ControllerModel> Controllers { get; private set; }
+        public IList<ControllerModel> Controllers { get; }
 
-        public IList<IFilterMetadata> Filters { get; private set; }
+        public IList<IFilterMetadata> Filters { get; }
 
         /// <summary>
         /// Gets a set of properties associated with all actions.

src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/AttributeRouteModel.cs

@@ -64,14 +64,7 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationModels
         /// </summary>
         public bool SuppressPathMatching { get; set; }
 
-        public bool IsAbsoluteTemplate
+        public bool IsAbsoluteTemplate => Template != null && IsOverridePattern(Template);
-        {
-            get
-            {
-                return Template != null &&
-                    IsOverridePattern(Template);
-            }
-        }
 
         /// <summary>
         /// Combines two <see cref="AttributeRouteModel"/> instances and returns
@@ -368,8 +361,7 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationModels
                                 .Replace("[[", "[")
                                 .Replace("]]", "]");
 
-                            string value;
+                            if (!values.TryGetValue(token, out var value))
-                            if (!values.TryGetValue(token, out value))
                             {
                                 // Value not found
                                 var message = Resources.FormatAttributeRoute_TokenReplacement_ReplacementValueNotFound(

src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ParameterModel.cs

@@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.Mvc.ApplicationModels
 
         string ICommonModel.Name => ParameterName;
 
-        public ParameterInfo ParameterInfo { get; private set; }
+        public ParameterInfo ParameterInfo { get; }
 
         public string ParameterName { get; set; }
 

src/Microsoft.AspNetCore.Mvc.Core/Authorization/AuthorizeFilter.cs

@@ -92,7 +92,7 @@ namespace Microsoft.AspNetCore.Mvc.Authorization
         /// If<c>null</c>, the policy will be constructed using
         /// <see cref="AuthorizationPolicy.CombineAsync(IAuthorizationPolicyProvider, IEnumerable{IAuthorizeData})"/>.
         /// </remarks>
-        public AuthorizationPolicy Policy { get; private set; }
+        public AuthorizationPolicy Policy { get; }
 
         bool IFilterFactory.IsReusable => true;
 

src/Microsoft.AspNetCore.Mvc.Core/BindAttribute.cs

@@ -47,13 +47,7 @@ namespace Microsoft.AspNetCore.Mvc
         /// <summary>
         /// Represents the model name used during model binding.
         /// </summary>
-        string IModelNameProvider.Name
+        string IModelNameProvider.Name => Prefix;
-        {
-            get
-            {
-                return Prefix;
-            }
-        }
 
         /// <inheritdoc />
         public Func<ModelMetadata, bool> PropertyFilter

src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs

@@ -35,57 +35,27 @@ namespace Microsoft.AspNetCore.Mvc
         /// <summary>
         /// Gets the <see cref="Http.HttpContext"/> for the executing action.
         /// </summary>
-        public HttpContext HttpContext
+        public HttpContext HttpContext => ControllerContext.HttpContext;
-        {
-            get
-            {
-                return ControllerContext.HttpContext;
-            }
-        }
 
         /// <summary>
         /// Gets the <see cref="HttpRequest"/> for the executing action.
         /// </summary>
-        public HttpRequest Request
+        public HttpRequest Request => HttpContext?.Request;
-        {
-            get
-            {
-                return HttpContext?.Request;
-            }
-        }
 
         /// <summary>
         /// Gets the <see cref="HttpResponse"/> for the executing action.
         /// </summary>
-        public HttpResponse Response
+        public HttpResponse Response => HttpContext?.Response;
-        {
-            get
-            {
-                return HttpContext?.Response;
-            }
-        }
 
         /// <summary>
         /// Gets the <see cref="AspNetCore.Routing.RouteData"/> for the executing action.
         /// </summary>
-        public RouteData RouteData
+        public RouteData RouteData => ControllerContext.RouteData;
-        {
-            get
-            {
-                return ControllerContext.RouteData;
-            }
-        }
 
         /// <summary>
         /// Gets the <see cref="ModelStateDictionary"/> that contains the state of the model and of model-binding validation.
         /// </summary>
-        public ModelStateDictionary ModelState
+        public ModelStateDictionary ModelState => ControllerContext?.ModelState;
-        {
-            get
-            {
-                return ControllerContext?.ModelState;
-            }
-        }
 
         /// <summary>
         /// Gets or sets the <see cref="Mvc.ControllerContext"/>.
@@ -222,13 +192,7 @@ namespace Microsoft.AspNetCore.Mvc
         /// <summary>
         /// Gets the <see cref="ClaimsPrincipal"/> for user associated with the executing action.
         /// </summary>
-        public ClaimsPrincipal User
+        public ClaimsPrincipal User => HttpContext?.User;
-        {
-            get
-            {
-                return HttpContext?.User;
-            }
-        }
 
         /// <summary>
         /// Creates a <see cref="StatusCodeResult"/> object by specifying a <paramref name="statusCode"/>.

src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerFactory.cs

@@ -48,13 +48,7 @@ namespace Microsoft.AspNetCore.Mvc.Controllers
         /// <summary>
         /// The <see cref="IControllerActivator"/> used to create a controller.
         /// </summary>
-        protected IControllerActivator ControllerActivator
+        protected IControllerActivator ControllerActivator => _controllerActivator;
-        {
-            get
-            {
-                return _controllerActivator;
-            }
-        }
 
         /// <inheritdoc />
         public virtual object CreateController(ControllerContext context)

src/Microsoft.AspNetCore.Mvc.Core/CreatedResult.cs

@@ -63,10 +63,7 @@ namespace Microsoft.AspNetCore.Mvc
         /// </summary>
         public string Location
         {
-            get
+            get => _location;
-            {
-                return _location;
-            }
             set
             {
                 if (value == null)

src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/ApplicationModelConventionExtensions.cs

@@ -86,7 +86,7 @@ namespace Microsoft.Extensions.DependencyInjection
 
         private class ParameterApplicationModelConvention : IApplicationModelConvention
         {
-            private IParameterModelConvention _parameterModelConvention;
+            private readonly IParameterModelConvention _parameterModelConvention;
 
             public ParameterApplicationModelConvention(IParameterModelConvention parameterModelConvention)
             {
@@ -121,7 +121,7 @@ namespace Microsoft.Extensions.DependencyInjection
 
         private class ActionApplicationModelConvention : IApplicationModelConvention
         {
-            private IActionModelConvention _actionModelConvention;
+            private readonly IActionModelConvention _actionModelConvention;
 
             public ActionApplicationModelConvention(IActionModelConvention actionModelConvention)
             {
@@ -153,7 +153,7 @@ namespace Microsoft.Extensions.DependencyInjection
 
         private class ControllerApplicationModelConvention : IApplicationModelConvention
         {
-            private IControllerModelConvention _controllerModelConvention;
+            private readonly IControllerModelConvention _controllerModelConvention;
 
             public ControllerApplicationModelConvention(IControllerModelConvention controllerConvention)
             {

src/Microsoft.AspNetCore.Mvc.Core/FileContentResult.cs

@@ -56,10 +56,7 @@ namespace Microsoft.AspNetCore.Mvc
         /// </summary>
         public byte[] FileContents
         {
-            get
+            get => _fileContents;
-            {
-                return _fileContents;
-            }
             set
             {
                 if (value == null)

src/Microsoft.AspNetCore.Mvc.Core/FileStreamResult.cs

@@ -53,10 +53,7 @@ namespace Microsoft.AspNetCore.Mvc
         /// </summary>
         public Stream FileStream
         {
-            get
+            get => _fileStream;
-            {
-                return _fileStream;
-            }
             set
             {
                 if (value == null)

src/Microsoft.AspNetCore.Mvc.Core/Formatters/FormatFilter.cs

@@ -30,8 +30,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
         /// <inheritdoc />
         public virtual string GetFormat(ActionContext context)
         {
-            object obj;
+            if (context.RouteData.Values.TryGetValue("format", out var obj))
-            if (context.RouteData.Values.TryGetValue("format", out obj))
             {
                 // null and string.Empty are equivalent for route values.
                 var routeValue = obj?.ToString();

src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaType.cs

@@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
     {
         private static readonly StringSegment QualityParameter = new StringSegment("q");
 
-        private MediaTypeParameterParser _parameterParser;
+        private readonly MediaTypeParameterParser _parameterParser;
 
         /// <summary>
         /// Initializes a <see cref="MediaType"/> instance.
@@ -70,8 +70,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
             
             _parameterParser = default(MediaTypeParameterParser);
 
-            StringSegment type;
+            var typeLength = GetTypeLength(mediaType, offset, out var type);
-            var typeLength = GetTypeLength(mediaType, offset, out type);
             if (typeLength == 0)
             {
                 Type = new StringSegment();
@@ -85,8 +84,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
                 Type = type;
             }
 
-            StringSegment subType;
+            var subTypeLength = GetSubtypeLength(mediaType, offset + typeLength, out var subType);
-            var subTypeLength = GetSubtypeLength(mediaType, offset + typeLength, out subType);
             if (subTypeLength == 0)
             {
                 SubType = new StringSegment();
@@ -210,7 +208,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
         /// For the media type <c>"application/vnd.example+json"</c>, this property gives the value
         /// <c>"vnd.example+json"</c>.
         /// </example>
-        public StringSegment SubType { get; private set; }
+        public StringSegment SubType { get; }
 
         /// <summary>
         /// Gets the subtype of the <see cref="MediaType"/>, excluding any structured syntax suffix.
@@ -219,7 +217,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
         /// For the media type <c>"application/vnd.example+json"</c>, this property gives the value
         /// <c>"vnd.example"</c>.
         /// </example>
-        public StringSegment SubTypeWithoutSuffix { get; private set; }
+        public StringSegment SubTypeWithoutSuffix { get; }
 
         /// <summary>
         /// Gets the structured syntax suffix of the <see cref="MediaType"/> if it has one.
@@ -228,7 +226,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
         /// For the media type <c>"application/vnd.example+json"</c>, this property gives the value
         /// <c>"json"</c>.
         /// </example>
-        public StringSegment SubTypeSuffix { get; private set; }
+        public StringSegment SubTypeSuffix { get; }
 
         /// <summary>
         /// Gets whether this <see cref="MediaType"/> matches all subtypes.
@@ -318,8 +316,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
         {
             var parametersParser = _parameterParser;
 
-            MediaTypeParameter parameter;
+            while (parametersParser.ParseNextParameter(out var parameter))
-            while (parametersParser.ParseNextParameter(out parameter))
             {
                 if (parameter.HasName(parameterName))
                 {
@@ -411,8 +408,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
             var parser = parsedMediaType._parameterParser;
 
             var quality = 1.0d;
-            MediaTypeParameter parameter;
+            while (parser.ParseNextParameter(out var parameter))
-            while (parser.ParseNextParameter(out parameter))
             {
                 if (parameter.HasName(QualityParameter))
                 {
@@ -512,8 +508,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
         private bool ContainsAllParameters(MediaTypeParameterParser setParameters)
         {
             var parameterFound = true;
-            MediaTypeParameter setParameter;
+            while (setParameters.ParseNextParameter(out var setParameter) && parameterFound)
-            while (setParameters.ParseNextParameter(out setParameter) && parameterFound)
             {
                 if (setParameter.HasName("q"))
                 {
@@ -533,8 +528,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
                 // We can do this because it's a struct
                 var subSetParameters = _parameterParser;
                 parameterFound = false;
-                MediaTypeParameter subSetParameter;
+                while (subSetParameters.ParseNextParameter(out var subSetParameter) && !parameterFound)
-                while (subSetParameters.ParseNextParameter(out subSetParameter) && !parameterFound)
                 {
                     parameterFound = subSetParameter.Equals(setParameter);
                 }
@@ -545,8 +539,8 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
 
         private struct MediaTypeParameterParser
         {
-            private string _mediaTypeBuffer;
+            private readonly string _mediaTypeBuffer;
-            private int? _length;
+            private readonly int? _length;
 
             public MediaTypeParameterParser(string mediaTypeBuffer, int offset, int? length)
             {
@@ -589,8 +583,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
                     return 0;
                 }
 
-                StringSegment name;
+                var nameLength = GetNameLength(input, startIndex, out var name);
-                var nameLength = GetNameLength(input, startIndex, out name);
 
                 var current = startIndex + nameLength;
 
@@ -611,8 +604,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
                     }
                 }
 
-                StringSegment value;
+                var valueLength = GetValueLength(input, current, out var value);
-                var valueLength = GetValueLength(input, current, out value);
 
                 parsedValue = new MediaTypeParameter(name, value);
                 current +=  valueLength;

src/Microsoft.AspNetCore.Mvc.Core/FromBodyAttribute.cs

@@ -13,6 +13,6 @@ namespace Microsoft.AspNetCore.Mvc
     public class FromBodyAttribute : Attribute, IBindingSourceMetadata
     {
         /// <inheritdoc />
-        public BindingSource BindingSource { get { return BindingSource.Body; } }
+        public BindingSource BindingSource => BindingSource.Body;
     }
 }

src/Microsoft.AspNetCore.Mvc.Core/FromFormAttribute.cs

@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Mvc
     public class FromFormAttribute : Attribute, IBindingSourceMetadata, IModelNameProvider
     {
         /// <inheritdoc />
-        public BindingSource BindingSource { get { return BindingSource.Form; } }
+        public BindingSource BindingSource => BindingSource.Form;
 
         /// <inheritdoc />
         public string Name { get; set; }

src/Microsoft.AspNetCore.Mvc.Core/FromHeaderAttribute.cs

@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Mvc
     public class FromHeaderAttribute : Attribute, IBindingSourceMetadata, IModelNameProvider
     {
         /// <inheritdoc />
-        public BindingSource BindingSource { get { return BindingSource.Header; } }
+        public BindingSource BindingSource => BindingSource.Header;
 
         /// <inheritdoc />
         public string Name { get; set; }

src/Microsoft.AspNetCore.Mvc.Core/FromQueryAttribute.cs

@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Mvc
     public class FromQueryAttribute : Attribute, IBindingSourceMetadata, IModelNameProvider
     {
         /// <inheritdoc />
-        public BindingSource BindingSource { get { return BindingSource.Query; } }
+        public BindingSource BindingSource => BindingSource.Query;
 
         /// <inheritdoc />
         public string Name { get; set; }

src/Microsoft.AspNetCore.Mvc.Core/FromRouteAttribute.cs

@@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Mvc
     public class FromRouteAttribute : Attribute, IBindingSourceMetadata, IModelNameProvider
     {
         /// <inheritdoc />
-        public BindingSource BindingSource { get { return BindingSource.Path; } }
+        public BindingSource BindingSource => BindingSource.Path;
 
         /// <inheritdoc />
         public string Name { get; set; }

src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionDescriptorCollection.cs

@@ -31,11 +31,11 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure
         /// <summary>
         /// Returns the cached <see cref="IReadOnlyList{ActionDescriptor}"/>.
         /// </summary>
-        public IReadOnlyList<ActionDescriptor> Items { get; private set; }
+        public IReadOnlyList<ActionDescriptor> Items { get; }
 
         /// <summary>
         /// Returns the unique version of the currently cached items.
         /// </summary>
-        public int Version { get; private set; }
+        public int Version { get; }
     }
 }

src/Microsoft.AspNetCore.Mvc.Core/Internal/AcceptHeaderParser.cs

@@ -37,8 +37,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters.Internal
                 {
                     var startCharIndex = charIndex;
 
-                    MediaTypeSegmentWithQuality output;
+                    if (TryParseValue(value, ref charIndex, out var output))
-                    if (TryParseValue(value, ref charIndex, out output))
                     {
                         // The entry may not contain an actual value, like Accept: application/json, , */*
                         if (output.MediaType.HasValue)

src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionConstraintCache.cs

@@ -48,8 +48,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
         {
             var cache = CurrentCache;
 
-            CacheEntry entry;
+            if (cache.Entries.TryGetValue(action, out var entry))
-            if (cache.Entries.TryGetValue(action, out entry))
             {
                 return GetActionConstraintsFromEntry(entry, httpContext, action);
             }

src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionSelector.cs

@@ -376,13 +376,13 @@ namespace Microsoft.AspNetCore.Mvc.Internal
                 }
             }
 
-            public int Version { get; set; }
+            public int Version { get; }
 
-            public string[] RouteKeys { get; set; }
+            public string[] RouteKeys { get; }
 
-            public Dictionary<string[], List<ActionDescriptor>> OrdinalEntries { get; set; }
+            public Dictionary<string[], List<ActionDescriptor>> OrdinalEntries { get; }
 
-            public Dictionary<string[], List<ActionDescriptor>> OrdinalIgnoreCaseEntries { get; set; }
+            public Dictionary<string[], List<ActionDescriptor>> OrdinalIgnoreCaseEntries { get; }
         }
 
         private class StringArrayComparer : IEqualityComparer<string[]>

src/Microsoft.AspNetCore.Mvc.Core/Internal/AuthorizationApplicationModelProvider.cs

@@ -19,7 +19,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
             _policyProvider = policyProvider;
         }
 
-        public int Order { get { return -1000 + 10; } }
+        public int Order => -1000 + 10;
 
         public void OnProvidersExecuted(ApplicationModelProviderContext context)
         {

src/Microsoft.AspNetCore.Mvc.Core/Internal/ClientValidatorCache.cs

@@ -16,8 +16,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
 
         public IReadOnlyList<IClientModelValidator> GetValidators(ModelMetadata metadata, IClientModelValidatorProvider validatorProvider)
         {
-            CacheEntry entry;
+            if (_cacheEntries.TryGetValue(metadata, out var entry))
-            if (_cacheEntries.TryGetValue(metadata, out entry))
             {
                 return GetValidatorsFromEntry(entry, metadata, validatorProvider);
             }

src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionDescriptorBuilder.cs

@@ -474,9 +474,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
             string routeName,
             ControllerActionDescriptor actionDescriptor)
         {
-            IList<ActionDescriptor> namedActionGroup;
+            if (actionsByRouteName.TryGetValue(routeName, out var namedActionGroup))
-
-            if (actionsByRouteName.TryGetValue(routeName, out namedActionGroup))
             {
                 namedActionGroup.Add(actionDescriptor);
             }

src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionDescriptorProvider.cs

@@ -44,10 +44,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
             _conventions = optionsAccessor.Value.Conventions;
         }
 
-        public int Order
+        public int Order => -1000;
-        {
-            get { return -1000; }
-        }
 
         /// <inheritdoc />
         public void OnProvidersExecuting(ActionDescriptorProviderContext context)
@@ -98,14 +95,14 @@ namespace Microsoft.AspNetCore.Mvc.Internal
             }
         }
 
-        internal protected IEnumerable<ControllerActionDescriptor> GetDescriptors()
+        protected internal IEnumerable<ControllerActionDescriptor> GetDescriptors()
         {
             var applicationModel = BuildModel();
             ApplicationModelConventions.ApplyConventions(applicationModel, _conventions);
             return ControllerActionDescriptorBuilder.Build(applicationModel);
         }
 
-        internal protected ApplicationModel BuildModel()
+        protected internal ApplicationModel BuildModel()
         {
             var controllerTypes = GetControllerTypes();
             var context = new ApplicationModelProviderContext(controllerTypes);

src/Microsoft.AspNetCore.Mvc.Core/Internal/CopyOnWriteList.cs

@@ -16,13 +16,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
             _source = source;
         }
 
-        protected IReadOnlyList<T> Readable
+        protected IReadOnlyList<T> Readable => _copy ?? _source;
-        {
-            get
-            {
-                return _copy ?? _source;
-            }
-        }
 
         protected List<T> Writable
         {
@@ -39,31 +33,13 @@ namespace Microsoft.AspNetCore.Mvc.Internal
 
         public T this[int index]
         {
-            get
+            get => Readable[index];
-            {
+            set => Writable[index] = value;
-                return Readable[index];
-            }
-            set
-            {
-                Writable[index] = value;
-            }
         }
 
-        public int Count
+        public int Count => Readable.Count;
-        {
-            get
-            {
-                return Readable.Count;
-            }
-        }
 
-        public bool IsReadOnly
+        public bool IsReadOnly => false;
-        {
-            get
-            {
-                return false;
-            }
-        }
 
         public void Add(T item)
         {

src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultActionConstraintProvider.cs

@@ -17,10 +17,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
     public class DefaultActionConstraintProvider : IActionConstraintProvider
     {
         /// <inheritdoc />
-        public int Order
+        public int Order => -1000;
-        {
-            get { return -1000; }
-        }
 
         /// <inheritdoc />
         public void OnProvidersExecuting(ActionConstraintProviderContext context)

src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultApplicationModelProvider.cs

@@ -26,13 +26,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
         }
 
         /// <inheritdoc />
-        public int Order
+        public int Order => -1000;
-        {
-            get
-            {
-                return -1000;
-            }
-        }
 
         /// <inheritdoc />
         public virtual void OnProvidersExecuting(ApplicationModelProviderContext context)
@@ -485,8 +479,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
             var createSelectorForSilentRouteProviders = false;
             foreach (var attribute in attributes)
             {
-                var routeTemplateProvider = attribute as IRouteTemplateProvider;
+                if (attribute is IRouteTemplateProvider routeTemplateProvider)
-                if (routeTemplateProvider != null)
                 {
                     if (IsSilentRouteAttribute(routeTemplateProvider))
                     {

src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultBindingMetadataProvider.cs

@@ -99,13 +99,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
                 _providers = providers;
             }
 
-            public Func<ModelMetadata, bool> PropertyFilter
+            public Func<ModelMetadata, bool> PropertyFilter => CreatePropertyFilter();
-            {
-                get
-                {
-                    return CreatePropertyFilter();
-                }
-            }
 
             private Func<ModelMetadata, bool> CreatePropertyFilter()
             {

src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultCollectionValidationStrategy.cs

@@ -108,21 +108,9 @@ namespace Microsoft.AspNetCore.Mvc.Internal
                 _index = -1;
             }
 
-            public ValidationEntry Current
+            public ValidationEntry Current => _entry;
-            {
-                get
-                {
-                    return _entry;
-                }
-            }
 
-            object IEnumerator.Current
+            object IEnumerator.Current => Current;
-            {
-                get
-                {
-                    return Current;
-                }
-            }
 
             public bool MoveNext()
             {

src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultComplexObjectValidationStrategy.cs

@@ -56,21 +56,9 @@ namespace Microsoft.AspNetCore.Mvc.Internal
                 _index = -1;
             }
 
-            public ValidationEntry Current
+            public ValidationEntry Current => _entry;
-            {
-                get
-                {
-                    return _entry;
-                }
-            }
 
-            object IEnumerator.Current
+            object IEnumerator.Current => Current;
-            {
-                get
-                {
-                    return Current;
-                }
-            }
 
             public bool MoveNext()
             {

src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultFilterProvider.cs

@@ -10,10 +10,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
 {
     public class DefaultFilterProvider : IFilterProvider
     {
-        public int Order
+        public int Order => -1000;
-        {
-            get { return -1000; }
-        }
 
         /// <inheritdoc />
         public void OnProvidersExecuting(FilterProviderContext context)

src/Microsoft.AspNetCore.Mvc.Core/Internal/ExplicitIndexCollectionValidationStrategy.cs

@@ -82,21 +82,9 @@ namespace Microsoft.AspNetCore.Mvc.Internal
                 _enumerator = enumerator;
             }
 
-            public ValidationEntry Current
+            public ValidationEntry Current => _entry;
-            {
-                get
-                {
-                    return _entry;
-                }
-            }
 
-            object IEnumerator.Current
+            object IEnumerator.Current => Current;
-            {
-                get
-                {
-                    return Current;
-                }
-            }
 
             public bool MoveNext()
             {

src/Microsoft.AspNetCore.Mvc.Core/Internal/FilterDescriptorOrderComparer.cs

@@ -9,12 +9,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
 {
     public class FilterDescriptorOrderComparer : IComparer<FilterDescriptor>
     {
-        private static readonly FilterDescriptorOrderComparer _comparer = new FilterDescriptorOrderComparer();
+        public static FilterDescriptorOrderComparer Comparer { get; } = new FilterDescriptorOrderComparer();
-
-        public static FilterDescriptorOrderComparer Comparer
-        {
-            get { return _comparer; }
-        }
 
         public int Compare(FilterDescriptor x, FilterDescriptor y)
         {

src/Microsoft.AspNetCore.Mvc.Core/Internal/HttpMethodActionConstraint.cs

@@ -42,18 +42,9 @@ namespace Microsoft.AspNetCore.Mvc.Internal
             _httpMethods = new ReadOnlyCollection<string>(methods);
         }
 
-        public IEnumerable<string> HttpMethods
+        public IEnumerable<string> HttpMethods => _httpMethods;
-        {
-            get
-            {
-                return _httpMethods;
-            }
-        }
 
-        public int Order
+        public int Order => HttpMethodConstraintOrder;
-        {
-            get { return HttpMethodConstraintOrder; }
-        }
 
         public bool Accept(ActionConstraintContext context)
         {

src/Microsoft.AspNetCore.Mvc.Core/Internal/HttpTokenParsingRules.cs

@@ -99,10 +99,9 @@ namespace Microsoft.AspNetCore.Mvc.Formatters.Internal
 
             var current = startIndex;
 
-            char c;
             while (current < input.Length)
             {
-                c = input[current];
+                var c = input[current];
 
                 if ((c == SP) || (c == Tab))
                 {
@@ -202,9 +201,8 @@ namespace Microsoft.AspNetCore.Mvc.Formatters.Internal
             {
                 // Only check whether we have a quoted char, if we have at least 3 characters left to read (i.e.
                 // quoted char + closing char). Otherwise the closing char may be considered part of the quoted char.
-                var quotedPairLength = 0;
                 if ((current + 2 < input.Length) &&
-                    (GetQuotedPairLength(input, current, out quotedPairLength) == HttpParseResult.Parsed))
+                    (GetQuotedPairLength(input, current, out var quotedPairLength) == HttpParseResult.Parsed))
                 {
                     // We ignore invalid quoted-pairs. Invalid quoted-pairs may mean that it looked like a quoted pair,
                     // but we actually have a quoted-string: e.g. "\ü" ('\' followed by a char >127 - quoted-pair only
@@ -225,9 +223,14 @@ namespace Microsoft.AspNetCore.Mvc.Formatters.Internal
                             return HttpParseResult.InvalidFormat;
                         }
 
-                        var nestedLength = 0;
+                        var nestedResult = GetExpressionLength(
-                        var nestedResult = GetExpressionLength(input, current, openChar, closeChar,
+                            input,
-                            supportsNesting, ref nestedCount, out nestedLength);
+                            current,
+                            openChar,
+                            closeChar,
+                            supportsNesting,
+                            ref nestedCount,
+                            out var nestedLength);
 
                         switch (nestedResult)
                         {

src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcAttributeRouteHandler.cs

@@ -14,10 +14,10 @@ namespace Microsoft.AspNetCore.Mvc.Internal
 {
     public class MvcAttributeRouteHandler : IRouter
     {
-        private IActionContextAccessor _actionContextAccessor;
+        private readonly IActionContextAccessor _actionContextAccessor;
-        private IActionInvokerFactory _actionInvokerFactory;
+        private readonly IActionInvokerFactory _actionInvokerFactory;
-        private IActionSelector _actionSelector;
+        private readonly IActionSelector _actionSelector;
-        private ILogger _logger;
+        private readonly ILogger _logger;
         private DiagnosticSource _diagnosticSource;
 
         public MvcAttributeRouteHandler(

src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcCoreLoggerExtensions.cs

@@ -552,13 +552,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
                 }
             }
 
-            public int Count
+            public int Count => 2;
-            {
-                get
-                {
-                    return 2;
-                }
-            }
 
             public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
             {

src/Microsoft.AspNetCore.Mvc.Core/Internal/MvcRouteHandler.cs

@@ -13,11 +13,11 @@ namespace Microsoft.AspNetCore.Mvc.Internal
 {
     public class MvcRouteHandler : IRouter
     {
-        private IActionContextAccessor _actionContextAccessor;
+        private readonly IActionContextAccessor _actionContextAccessor;
-        private IActionInvokerFactory _actionInvokerFactory;
+        private readonly IActionInvokerFactory _actionInvokerFactory;
-        private IActionSelector _actionSelector;
+        private readonly IActionSelector _actionSelector;
-        private ILogger _logger;
+        private readonly ILogger _logger;
-        private DiagnosticSource _diagnosticSource;
+        private readonly DiagnosticSource _diagnosticSource;
 
         public MvcRouteHandler(
             IActionInvokerFactory actionInvokerFactory,

src/Microsoft.AspNetCore.Mvc.Core/Internal/NonDisposableStream.cs

@@ -34,35 +34,19 @@ namespace Microsoft.AspNetCore.Mvc.Internal
         /// <summary>
         /// The inner stream this object delegates to.
         /// </summary>
-        protected Stream InnerStream
+        protected Stream InnerStream => _innerStream;
-        {
-            get { return _innerStream; }
-        }
 
         /// <inheritdoc />
-        public override bool CanRead
+        public override bool CanRead => _innerStream.CanRead;
-        {
-            get { return _innerStream.CanRead; }
-        }
 
         /// <inheritdoc />
-        public override bool CanSeek
+        public override bool CanSeek => _innerStream.CanSeek;
-        {
-            get { return _innerStream.CanSeek; }
-        }
 
         /// <inheritdoc />
-        public override bool CanWrite
+        public override bool CanWrite => _innerStream.CanWrite;
-        {
-            get { return _innerStream.CanWrite; }
-        }
 
         /// <inheritdoc />
-        public override long Length
+        public override long Length => _innerStream.Length;
-        {
-            get { return _innerStream.Length; }
-        }
-
         /// <inheritdoc />
         public override long Position
         {
@@ -78,10 +62,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal
         }
 
         /// <inheritdoc />
-        public override bool CanTimeout
+        public override bool CanTimeout => _innerStream.CanTimeout;
-        {
-            get { return _innerStream.CanTimeout; }
-        }
 
         /// <inheritdoc />
         public override int WriteTimeout

src/Microsoft.AspNetCore.Mvc.Core/Internal/ReferenceEqualityComparer.cs

@@ -9,17 +9,9 @@ namespace Microsoft.AspNetCore.Mvc.Internal
 {
     internal class ReferenceEqualityComparer : IEqualityComparer<object>
     {
-        private static readonly ReferenceEqualityComparer _instance = new ReferenceEqualityComparer();
-
         private static readonly bool IsMono = Type.GetType("Mono.Runtime") != null;
 
-        public static ReferenceEqualityComparer Instance
+        public static ReferenceEqualityComparer Instance { get; } = new ReferenceEqualityComparer();
-        {
-            get
-            {
-                return _instance;
-            }
-        }
 
         public new bool Equals(object x, object y)
         {

src/Microsoft.AspNetCore.Mvc.Core/Internal/ShortFormDictionaryValidationStrategy.cs

@@ -83,21 +83,9 @@ namespace Microsoft.AspNetCore.Mvc.Internal
                 _keyMappingEnumerator = keyMappings.GetEnumerator();
             }
 
-            public ValidationEntry Current
+            public ValidationEntry Current => _entry;
-            {
-                get
-                {
-                    return _entry;
-                }
-            }
 
-            object IEnumerator.Current
+            object IEnumerator.Current => Current;
-            {
-                get
-                {
-                    return Current;
-                }
-            }
 
             public bool MoveNext()
             {

src/Microsoft.AspNetCore.Mvc.Core/LocalRedirectResult.cs

@@ -71,10 +71,7 @@ namespace Microsoft.AspNetCore.Mvc
         /// </summary>
         public string Url
         {
-            get
+            get => _localUrl;
-            {
-                return _localUrl;
-            }
             set
             {
                 if (string.IsNullOrEmpty(value))

src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CollectionModelBinder.cs

@@ -181,8 +181,6 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
                     bindingContext.ValueProvider
                 };
 
-                object boundValue;
-
                 using (bindingContext.EnterNestedScope(
                     elementMetadata,
                     fieldName: bindingContext.FieldName,
@@ -193,7 +191,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
 
                     if (bindingContext.Result.IsModelSet)
                     {
-                        boundValue = bindingContext.Result.Model;
+                        var boundValue = bindingContext.Result.Model;
                         boundCollection.Add(ModelBindingHelper.CastOrDefault<TElement>(boundValue));
                     }
                 }

src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ComplexTypeModelBinder.cs

@@ -410,7 +410,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
             ModelBindingContext bindingContext)
         {
             var targetInvocationException = exception as TargetInvocationException;
-            if (targetInvocationException != null && targetInvocationException.InnerException != null)
+            if (targetInvocationException?.InnerException != null)
             {
                 exception = targetInvocationException.InnerException;
             }

src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormCollectionModelBinder.cs

@@ -41,37 +41,13 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
 
         private class EmptyFormCollection : IFormCollection
         {
-            public StringValues this[string key]
+            public StringValues this[string key] => StringValues.Empty;
-            {
-                get
-                {
-                    return StringValues.Empty;
-                }
-            }
 
-            public int Count
+            public int Count => 0;
-            {
-                get
-                {
-                    return 0;
-                }
-            }
 
-            public IFormFileCollection Files
+            public IFormFileCollection Files => new EmptyFormFileCollection();
-            {
-                get
-                {
-                    return new EmptyFormFileCollection();
-                }
-            }
 
-            public ICollection<string> Keys
+            public ICollection<string> Keys => new List<string>();
-            {
-                get
-                {
-                    return new List<string>();
-                }
-            }
 
             public bool ContainsKey(string key)
             {
@@ -97,23 +73,11 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
 
         private class EmptyFormFileCollection : List<IFormFile>, IFormFileCollection
         {
-            public IFormFile this[string name]
+            public IFormFile this[string name] => null;
-            {
-                get
-                {
-                    return null;
-                }
-            }
 
-            public IFormFile GetFile(string name)
+            public IFormFile GetFile(string name) => null;
-            {
-                return null;
-            }
 
-            IReadOnlyList<IFormFile> IFormFileCollection.GetFiles(string name)
+            IReadOnlyList<IFormFile> IFormFileCollection.GetFiles(string name) => null;
-            {
-                return null;
-            }
         }
     }
 }

src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingBehaviorAttribute.cs

@@ -23,6 +23,6 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
         /// <summary>
         /// Gets the <see cref="BindingBehavior"/> to apply.
         /// </summary>
-        public BindingBehavior Behavior { get; private set; }
+        public BindingBehavior Behavior { get; }
     }
 }

src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/DefaultPropertyFilterProvider.cs

@@ -22,25 +22,13 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
         /// <summary>
         /// The prefix which is used while generating the property filter.
         /// </summary>
-        public virtual string Prefix
+        public virtual string Prefix => string.Empty;
-        {
-            get
-            {
-                return string.Empty;
-            }
-        }
 
         /// <summary>
         /// Expressions which can be used to generate property filter which can filter model 
         /// properties.
         /// </summary>
-        public virtual IEnumerable<Expression<Func<TModel, object>>> PropertyIncludeExpressions
+        public virtual IEnumerable<Expression<Func<TModel, object>>> PropertyIncludeExpressions => null;
-        {
-            get
-            {
-                return null;
-            }
-        }
 
         /// <inheritdoc />
         public virtual Func<ModelMetadata, bool> PropertyFilter

src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormValueProvider.cs

@@ -15,8 +15,8 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
     public class FormValueProvider : BindingSourceValueProvider, IEnumerableValueProvider
     {
         private readonly CultureInfo _culture;
+        private readonly IFormCollection _values;
         private PrefixContainer _prefixContainer;
-        private IFormCollection _values;
 
         /// <summary>
         /// Creates a value provider for <see cref="IFormCollection"/>.
@@ -44,13 +44,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
             _culture = culture;
         }
 
-        public CultureInfo Culture
+        public CultureInfo Culture => _culture;
-        {
-            get
-            {
-                return _culture;
-            }
-        }
 
         protected PrefixContainer PrefixContainer
         {

src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Internal/ModelBindingHelper.cs

@@ -331,8 +331,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Internal
             }
 
             var memberExpression = (MemberExpression)expression;
-            var memberInfo = memberExpression.Member as PropertyInfo;
+            if (memberExpression.Member is PropertyInfo memberInfo)
-            if (memberInfo != null)
             {
                 if (memberExpression.Expression.NodeType != ExpressionType.Parameter)
                 {
@@ -531,8 +530,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Internal
                 return false;
             }
 
-            var collection = model as ICollection<T>;
+            if (model is ICollection<T> collection && !collection.IsReadOnly)
-            if (collection != null && !collection.IsReadOnly)
             {
                 // Can use the existing collection.
                 return true;
@@ -615,8 +613,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Internal
             }
 
             // Does collection exist and can it be reused?
-            var collection = model as ICollection<T>;
+            if (model is ICollection<T> collection && !collection.IsReadOnly)
-            if (collection != null && !collection.IsReadOnly)
             {
                 collection.Clear();
 
@@ -739,8 +736,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Internal
             destinationType = UnwrapNullableType(destinationType);
 
             // if this is a user-input value but the user didn't type anything, return no value
-            var valueAsString = value as string;
+            if (value is string valueAsString && string.IsNullOrWhiteSpace(valueAsString))
-            if (valueAsString != null && string.IsNullOrWhiteSpace(valueAsString))
             {
                 return null;
             }

src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingMetadata.cs

@@ -58,10 +58,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
         /// </summary>
         public DefaultModelBindingMessageProvider ModelBindingMessageProvider
         {
-            get
+            get => _messageProvider;
-            {
-                return _messageProvider;
-            }
             set
             {
                 if (value == null)

src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadata.cs

@@ -88,22 +88,10 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
         /// <summary>
         /// Gets the set of attributes for the current instance.
         /// </summary>
-        public ModelAttributes Attributes
+        public ModelAttributes Attributes => _details.ModelAttributes;
-        {
-            get
-            {
-                return _details.ModelAttributes;
-            }
-        }
 
         /// <inheritdoc />
-        public override ModelMetadata ContainerMetadata
+        public override ModelMetadata ContainerMetadata => _details.ContainerMetadata;
-        {
-            get
-            {
-                return _details.ContainerMetadata;
-            }
-        }
 
         /// <summary>
         /// Gets the <see cref="Metadata.BindingMetadata"/> for the current instance.
@@ -188,49 +176,19 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
         }
 
         /// <inheritdoc />
-        public override BindingSource BindingSource
+        public override BindingSource BindingSource => BindingMetadata.BindingSource;
-        {
-            get
-            {
-                return BindingMetadata.BindingSource;
-            }
-        }
 
         /// <inheritdoc />
-        public override string BinderModelName
+        public override string BinderModelName => BindingMetadata.BinderModelName;
-        {
-            get
-            {
-                return BindingMetadata.BinderModelName;
-            }
-        }
 
         /// <inheritdoc />
-        public override Type BinderType
+        public override Type BinderType => BindingMetadata.BinderType;
-        {
-            get
-            {
-                return BindingMetadata.BinderType;
-            }
-        }
 
         /// <inheritdoc />
-        public override bool ConvertEmptyStringToNull
+        public override bool ConvertEmptyStringToNull => DisplayMetadata.ConvertEmptyStringToNull;
-        {
-            get
-            {
-                return DisplayMetadata.ConvertEmptyStringToNull;
-            }
-        }
 
         /// <inheritdoc />
-        public override string DataTypeName
+        public override string DataTypeName => DisplayMetadata.DataTypeName;
-        {
-            get
-            {
-                return DisplayMetadata.DataTypeName;
-            }
-        }
 
         /// <inheritdoc />
         public override string Description
@@ -247,13 +205,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
         }
 
         /// <inheritdoc />
-        public override string DisplayFormatString
+        public override string DisplayFormatString => DisplayMetadata.DisplayFormatString;
-        {
-            get
-            {
-                return DisplayMetadata.DisplayFormatString;
-            }
-        }
 
         /// <inheritdoc />
         public override string DisplayName
@@ -270,13 +222,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
         }
 
         /// <inheritdoc />
-        public override string EditFormatString
+        public override string EditFormatString => DisplayMetadata.EditFormatString;
-        {
-            get
-            {
-                return DisplayMetadata.EditFormatString;
-            }
-        }
 
         /// <inheritdoc />
         public override ModelMetadata ElementMetadata
@@ -294,48 +240,19 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
 
         /// <inheritdoc />
         public override IEnumerable<KeyValuePair<EnumGroupAndName, string>> EnumGroupedDisplayNamesAndValues
-        {
+            => DisplayMetadata.EnumGroupedDisplayNamesAndValues;
-            get
-            {
-                return DisplayMetadata.EnumGroupedDisplayNamesAndValues;
-            }
-        }
 
         /// <inheritdoc />
-        public override IReadOnlyDictionary<string, string> EnumNamesAndValues
+        public override IReadOnlyDictionary<string, string> EnumNamesAndValues => DisplayMetadata.EnumNamesAndValues;
-        {
-            get
-            {
-                return DisplayMetadata.EnumNamesAndValues;
-            }
-        }
 
         /// <inheritdoc />
-        public override bool HasNonDefaultEditFormat
+        public override bool HasNonDefaultEditFormat => DisplayMetadata.HasNonDefaultEditFormat;
-        {
-            get
-            {
-                return DisplayMetadata.HasNonDefaultEditFormat;
-            }
-        }
 
         /// <inheritdoc />
-        public override bool HideSurroundingHtml
+        public override bool HideSurroundingHtml => DisplayMetadata.HideSurroundingHtml;
-        {
-            get
-            {
-                return DisplayMetadata.HideSurroundingHtml;
-            }
-        }
 
         /// <inheritdoc />
-        public override bool HtmlEncode
+        public override bool HtmlEncode => DisplayMetadata.HtmlEncode;
-        {
-            get
-            {
-                return DisplayMetadata.HtmlEncode;
-            }
-        }
 
         /// <inheritdoc />
         public override bool IsBindingAllowed
@@ -375,22 +292,10 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
         }
 
         /// <inheritdoc />
-        public override bool IsEnum
+        public override bool IsEnum => DisplayMetadata.IsEnum;
-        {
-            get
-            {
-                return DisplayMetadata.IsEnum;
-            }
-        }
 
         /// <inheritdoc />
-        public override bool IsFlagsEnum
+        public override bool IsFlagsEnum => DisplayMetadata.IsFlagsEnum;
-        {
-            get
-            {
-                return DisplayMetadata.IsFlagsEnum;
-            }
-        }
 
         /// <inheritdoc />
         public override bool IsReadOnly
@@ -440,31 +345,14 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
         }
 
         /// <inheritdoc />
-        public override ModelBindingMessageProvider ModelBindingMessageProvider
+        public override ModelBindingMessageProvider ModelBindingMessageProvider =>
-        {
+            BindingMetadata.ModelBindingMessageProvider;
-            get
-            {
-                return BindingMetadata.ModelBindingMessageProvider;
-            }
-        }
 
         /// <inheritdoc />
-        public override string NullDisplayText
+        public override string NullDisplayText => DisplayMetadata.NullDisplayText;
-        {
-            get
-            {
-                return DisplayMetadata.NullDisplayText;
-            }
-        }
 
         /// <inheritdoc />
-        public override int Order
+        public override int Order => DisplayMetadata.Order;
-        {
-            get
-            {
-                return DisplayMetadata.Order;
-            }
-        }
 
         /// <inheritdoc />
         public override string Placeholder
@@ -497,58 +385,22 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
         }
 
         /// <inheritdoc />
-        public override IPropertyFilterProvider PropertyFilterProvider
+        public override IPropertyFilterProvider PropertyFilterProvider => BindingMetadata.PropertyFilterProvider;
-        {
-            get
-            {
-                return BindingMetadata.PropertyFilterProvider;
-            }
-        }
 
         /// <inheritdoc />
-        public override bool ShowForDisplay
+        public override bool ShowForDisplay => DisplayMetadata.ShowForDisplay;
-        {
-            get
-            {
-                return DisplayMetadata.ShowForDisplay;
-            }
-        }
 
         /// <inheritdoc />
-        public override bool ShowForEdit
+        public override bool ShowForEdit => DisplayMetadata.ShowForEdit;
-        {
-            get
-            {
-                return DisplayMetadata.ShowForEdit;
-            }
-        }
 
         /// <inheritdoc />
-        public override string SimpleDisplayProperty
+        public override string SimpleDisplayProperty => DisplayMetadata.SimpleDisplayProperty;
-        {
-            get
-            {
-                return DisplayMetadata.SimpleDisplayProperty;
-            }
-        }
 
         /// <inheritdoc />
-        public override string TemplateHint
+        public override string TemplateHint => DisplayMetadata.TemplateHint;
-        {
-            get
-            {
-                return DisplayMetadata.TemplateHint;
-            }
-        }
 
         /// <inheritdoc />
-        public override IPropertyValidationFilter PropertyValidationFilter
+        public override IPropertyValidationFilter PropertyValidationFilter => ValidationMetadata.PropertyValidationFilter;
-        {
-            get
-            {
-                return ValidationMetadata.PropertyValidationFilter;
-            }
-        }
 
         /// <inheritdoc />
         public override bool ValidateChildren
@@ -590,22 +442,10 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
         }
 
         /// <inheritdoc />
-        public override Func<object, object> PropertyGetter
+        public override Func<object, object> PropertyGetter => _details.PropertyGetter;
-        {
-            get
-            {
-                return _details.PropertyGetter;
-            }
-        }
 
         /// <inheritdoc />
-        public override Action<object, object> PropertySetter
+        public override Action<object, object> PropertySetter => _details.PropertySetter;
-        {
-            get
-            {
-                return _details.PropertySetter;
-            }
-        }
 
         /// <inheritdoc />
         public override ModelMetadata GetMetadataForType(Type modelType)

src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadataProvider.cs

@@ -251,9 +251,9 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
                 Details = details;
             }
 
-            public ModelMetadata Metadata { get; private set; }
+            public ModelMetadata Metadata { get; }
 
-            public DefaultMetadataDetails Details { get; private set; }
+            public DefaultMetadataDetails Details { get; }
         }
 
         private class ModelMetadataIdentityComparer : IEqualityComparer<ModelMetadataIdentity>

src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/QueryStringValueProvider.cs

@@ -15,8 +15,8 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
     public class QueryStringValueProvider : BindingSourceValueProvider, IEnumerableValueProvider
     {
         private readonly CultureInfo _culture;
+        private readonly IQueryCollection _values;
         private PrefixContainer _prefixContainer;
-        private IQueryCollection _values;
 
         /// <summary>
         /// Creates a value provider for <see cref="IQueryCollection"/>.
@@ -44,13 +44,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
             _culture = culture;
         }
 
-        public CultureInfo Culture
+        public CultureInfo Culture => _culture;
-        {
-            get
-            {
-                return _culture;
-            }
-        }
 
         protected PrefixContainer PrefixContainer
         {

src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidationVisitor.cs

@@ -21,6 +21,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
         private readonly ActionContext _actionContext;
         private readonly ModelStateDictionary _modelState;
         private readonly ValidationStateDictionary _validationState;
+        private readonly ValidationStack _currentPath;
 
         private object _container;
         private string _key;
@@ -28,8 +29,6 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
         private ModelMetadata _metadata;
         private IValidationStrategy _strategy;
 
-        private ValidationStack _currentPath;
-
         /// <summary>
         /// Creates a new <see cref="ValidationVisitor"/>.
         /// </summary>

src/Microsoft.AspNetCore.Mvc.Core/MvcOptions.cs

@@ -85,7 +85,7 @@ namespace Microsoft.AspNetCore.Mvc
         /// </summary>
         public int MaxModelValidationErrors
         {
-            get { return _maxModelStateErrors; }
+            get => _maxModelStateErrors;
             set
             {
                 if (value < 0)

src/Microsoft.AspNetCore.Mvc.Core/PhysicalFileResult.cs

@@ -54,10 +54,7 @@ namespace Microsoft.AspNetCore.Mvc
         /// </summary>
         public string FileName
         {
-            get
+            get => _fileName;
-            {
-                return _fileName;
-            }
             set
             {
                 if (value == null)

src/Microsoft.AspNetCore.Mvc.Core/RedirectResult.cs

@@ -81,10 +81,7 @@ namespace Microsoft.AspNetCore.Mvc
         /// </summary>
         public string Url
         {
-            get
+            get => _url;
-            {
-                return _url;
-            }
             set
             {
                 if (string.IsNullOrEmpty(value))

src/Microsoft.AspNetCore.Mvc.Core/ResponseCacheAttribute.cs

@@ -29,14 +29,8 @@ namespace Microsoft.AspNetCore.Mvc
         /// </summary>
         public int Duration
         {
-            get
+            get => _duration ?? 0;
-            {
+            set => _duration = value;
-                return _duration ?? 0;
-            }
-            set
-            {
-                _duration = value;
-            }
         }
 
         /// <summary>
@@ -44,14 +38,8 @@ namespace Microsoft.AspNetCore.Mvc
         /// </summary>
         public ResponseCacheLocation Location
         {
-            get
+            get => _location ?? ResponseCacheLocation.Any;
-            {
+            set => _location = value;
-                return _location ?? ResponseCacheLocation.Any;
-            }
-            set
-            {
-                _location = value;
-            }
         }
 
         /// <summary>
@@ -62,14 +50,8 @@ namespace Microsoft.AspNetCore.Mvc
         /// </summary>
         public bool NoStore
         {
-            get
+            get => _noStore ?? false;
-            {
+            set => _noStore = value;
-                return _noStore ?? false;
-            }
-            set
-            {
-                _noStore = value;
-            }
         }
 
         /// <summary>

src/Microsoft.AspNetCore.Mvc.Core/RouteAttribute.cs

@@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.Mvc
         }
 
         /// <inheritdoc />
-        public string Template { get; private set; }
+        public string Template { get; }
 
         /// <summary>
         /// Gets the route order. The order determines the order of route execution. Routes with a lower order
@@ -44,13 +44,7 @@ namespace Microsoft.AspNetCore.Mvc
         }
 
         /// <inheritdoc />
-        int? IRouteTemplateProvider.Order
+        int? IRouteTemplateProvider.Order => _order;
-        {
-            get
-            {
-                return _order;
-            }
-        }
 
         /// <inheritdoc />
         public string Name { get; set; }

src/Microsoft.AspNetCore.Mvc.Core/Routing/HttpMethodAttribute.cs

@@ -12,7 +12,6 @@ namespace Microsoft.AspNetCore.Mvc.Routing
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
     public abstract class HttpMethodAttribute : Attribute, IActionHttpMethodProvider, IRouteTemplateProvider
     {
-        private readonly IEnumerable<string> _httpMethods;
         private int? _order;
 
         /// <summary>
@@ -42,21 +41,15 @@ namespace Microsoft.AspNetCore.Mvc.Routing
                 throw new ArgumentNullException(nameof(httpMethods));
             }
 
-            _httpMethods = httpMethods;
+            HttpMethods = httpMethods;
             Template = template;
         }
 
         /// <inheritdoc />
-        public IEnumerable<string> HttpMethods
+        public IEnumerable<string> HttpMethods { get; }
-        {
-            get
-            {
-                return _httpMethods;
-            }
-        }
 
         /// <inheritdoc />
-        public string Template { get; private set; }
+        public string Template { get; }
 
         /// <summary>
         /// Gets the route order. The order determines the order of route execution. Routes with a lower
@@ -71,13 +64,7 @@ namespace Microsoft.AspNetCore.Mvc.Routing
         }
 
         /// <inheritdoc />
-        int? IRouteTemplateProvider.Order
+        int? IRouteTemplateProvider.Order => _order;
-        {
-            get
-            {
-                return _order;
-            }
-        }
 
         /// <inheritdoc />
         public string Name { get; set; }

src/Microsoft.AspNetCore.Mvc.Core/Routing/KnownRouteValueConstraint.cs

@@ -116,9 +116,9 @@ namespace Microsoft.AspNetCore.Mvc.Routing
                 Items = items;
             }
 
-            public int Version { get; private set; }
+            public int Version { get; }
 
-            public string[] Items { get; private set; }
+            public string[] Items { get; }
         }
     }
 }

src/Microsoft.AspNetCore.Mvc.Core/StatusCodeResult.cs

@@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Mvc
         /// <summary>
         /// Gets the HTTP status code.
         /// </summary>
-        public int StatusCode { get; private set; }
+        public int StatusCode { get; }
 
         /// <inheritdoc />
         public override void ExecuteResult(ActionContext context)

src/Microsoft.AspNetCore.Mvc.Cors/CorsAuthorizationFilter.cs

@@ -18,8 +18,8 @@ namespace Microsoft.AspNetCore.Mvc.Cors
     /// </summary>
     public class CorsAuthorizationFilter : ICorsAuthorizationFilter
     {
-        private ICorsService _corsService;
+        private readonly ICorsService _corsService;
-        private ICorsPolicyProvider _corsPolicyProvider;
+        private readonly ICorsPolicyProvider _corsPolicyProvider;
 
         /// <summary>
         /// Creates a new instance of <see cref="CorsAuthorizationFilter"/>.
@@ -38,16 +38,9 @@ namespace Microsoft.AspNetCore.Mvc.Cors
         public string PolicyName { get; set; }
 
         /// <inheritdoc />
-        public int Order
+        // Since clients' preflight requests would not have data to authenticate requests, this
-        {
+        // filter must run before any other authorization filters.
-            get
+        public int Order => int.MinValue + 100;
-            {
-                // Since clients' preflight requests would not have data to authenticate requests, this
-                // filter must run before any other authorization filters.
-                return int.MinValue + 100;
-            }
-        }
-
 
         /// <inheritdoc />
         public async Task OnAuthorizationAsync(Filters.AuthorizationFilterContext context)

src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsApplicationModelProvider.cs

@@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Mvc.Cors.Internal
 {
     public class CorsApplicationModelProvider : IApplicationModelProvider
     {
-        public int Order { get { return -1000 + 10; } }
+        public int Order => -1000 + 10;
 
         public void OnProvidersExecuted(ApplicationModelProviderContext context)
         {
@@ -28,18 +28,15 @@ namespace Microsoft.AspNetCore.Mvc.Cors.Internal
                 throw new ArgumentNullException(nameof(context));
             }
 
-            IEnableCorsAttribute enableCors;
-            IDisableCorsAttribute disableCors;
-
             foreach (var controllerModel in context.Result.Controllers)
             {
-                enableCors = controllerModel.Attributes.OfType<IEnableCorsAttribute>().FirstOrDefault();
+                var enableCors = controllerModel.Attributes.OfType<IEnableCorsAttribute>().FirstOrDefault();
                 if (enableCors != null)
                 {
                     controllerModel.Filters.Add(new CorsAuthorizationFilterFactory(enableCors.PolicyName));
                 }
 
-                disableCors = controllerModel.Attributes.OfType<IDisableCorsAttribute>().FirstOrDefault();
+                var disableCors = controllerModel.Attributes.OfType<IDisableCorsAttribute>().FirstOrDefault();
                 if (disableCors != null)
                 {
                     controllerModel.Filters.Add(new DisableCorsAuthorizationFilter());

src/Microsoft.AspNetCore.Mvc.Cors/Internal/CorsAuthorizationFilterFactory.cs

@@ -24,15 +24,9 @@ namespace Microsoft.AspNetCore.Mvc.Cors.Internal
         }
 
         /// <inheritdoc />
-        public int Order
+        // Since clients' preflight requests would not have data to authenticate requests, this
-        {
+        // filter must run before any other authorization filters.
-            get
+        public int Order => int.MinValue + 100;
-            {
-                // Since clients' preflight requests would not have data to authenticate requests, this
-                // filter must run before any other authorization filters.
-                return int.MinValue + 100;
-            }
-        }
 
         /// <inheritdoc />
         public bool IsReusable => true;

src/Microsoft.AspNetCore.Mvc.Cors/Internal/DisableCorsAuthorizationFilter.cs

@@ -16,15 +16,9 @@ namespace Microsoft.AspNetCore.Mvc.Cors.Internal
     public class DisableCorsAuthorizationFilter : ICorsAuthorizationFilter
     {
         /// <inheritdoc />
-        public int Order
+        // Since clients' preflight requests would not have data to authenticate requests, this
-        {
+        // filter must run before any other authorization filters.
-            get
+        public int Order => int.MinValue + 100;
-            {
-                // Since clients' preflight requests would not have data to authenticate requests, this
-                // filter must run before any other authorization filters.
-                return int.MinValue + 100;
-            }
-        }
 
         /// <inheritdoc />
         public Task OnAuthorizationAsync(AuthorizationFilterContext context)

src/Microsoft.AspNetCore.Mvc.DataAnnotations/Internal/DataAnnotationsMetadataProvider.cs

@@ -130,7 +130,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations.Internal
 
             // DisplayName
             // DisplayAttribute has precendence over DisplayNameAttribute.
-            if (displayAttribute != null && displayAttribute.GetName() != null)
+            if (displayAttribute?.GetName() != null)
             {
                 if (localizer != null &&
                     !string.IsNullOrEmpty(displayAttribute.Name) &&

src/Microsoft.AspNetCore.Mvc.Formatters.Json/Internal/JsonResultExecutor.cs

@@ -99,14 +99,12 @@ namespace Microsoft.AspNetCore.Mvc.Formatters.Json.Internal
 
             var response = context.HttpContext.Response;
 
-            string resolvedContentType;
-            Encoding resolvedContentTypeEncoding;
             ResponseContentTypeHelper.ResolveContentTypeAndEncoding(
                 result.ContentType,
                 response.ContentType,
                 DefaultContentType,
-                out resolvedContentType,
+                out var resolvedContentType,
-                out resolvedContentTypeEncoding);
+                out var resolvedContentTypeEncoding);
 
             response.ContentType = resolvedContentType;
 

src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonInputFormatter.cs

@@ -149,7 +149,8 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
                     jsonReader.CloseInput = false;
 
                     var successful = true;
-                    EventHandler<Newtonsoft.Json.Serialization.ErrorEventArgs> errorHandler = (sender, eventArgs) =>
+
+                    void ErrorHandler(object sender, Newtonsoft.Json.Serialization.ErrorEventArgs eventArgs)
                     {
                         successful = false;
 
@@ -180,11 +181,11 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
                         // Failure to do so can cause the exception to be rethrown at every recursive level and
                         // overflow the stack for x64 CLR processes
                         eventArgs.ErrorContext.Handled = true;
-                    };
+                    }
 
                     var type = context.ModelType;
                     var jsonSerializer = CreateJsonSerializer();
-                    jsonSerializer.Error += errorHandler;
+                    jsonSerializer.Error += ErrorHandler;
                     object model;
                     try
                     {
@@ -193,7 +194,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
                     finally
                     {
                         // Clean up the error handler since CreateJsonSerializer() pools instances.
-                        jsonSerializer.Error -= errorHandler;
+                        jsonSerializer.Error -= ErrorHandler;
                         ReleaseJsonSerializer(jsonSerializer);
                     }
 

src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchOperationsArrayProvider.cs

@@ -31,10 +31,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters.Json
         /// <remarks>
         /// The order -999 ensures that this provider is executed right after the <c>Microsoft.AspNetCore.Mvc.ApiExplorer.DefaultApiDescriptionProvider</c>.
         /// </remarks>
-        public int Order
+        public int Order => -999;
-        {
-            get { return -999; }
-        }
 
         /// <inheritdoc />
         public void OnProvidersExecuting(ApiDescriptionProviderContext context)

src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DelegatingEnumerator.cs

@@ -53,13 +53,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
         }
 
         /// <inheritdoc />
-        object IEnumerator.Current
+        object IEnumerator.Current => Current;
-        {
-            get
-            {
-                return Current;
-            }
-        }
 
         /// <inheritdoc />
         public void Dispose()

src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapperProvider.cs

@@ -11,13 +11,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters.Xml
     public class SerializableErrorWrapperProvider : IWrapperProvider
     {
         /// <inheritdoc />
-        public Type WrappingType
+        public Type WrappingType => typeof(SerializableErrorWrapper);
-        {
-            get
-            {
-                return typeof(SerializableErrorWrapper);
-            }
-        }
 
         /// <inheritdoc />
         public object Wrap(object original)

src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerInputFormatter.cs

@@ -25,10 +25,10 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
     /// </summary>
     public class XmlDataContractSerializerInputFormatter : TextInputFormatter
     {
-        private DataContractSerializerSettings _serializerSettings;
+        private readonly ConcurrentDictionary<Type, object> _serializerCache = new ConcurrentDictionary<Type, object>();
-        private ConcurrentDictionary<Type, object> _serializerCache = new ConcurrentDictionary<Type, object>();
         private readonly XmlDictionaryReaderQuotas _readerQuotas = FormattingUtilities.GetDefaultXmlReaderQuotas();
         private readonly bool _suppressInputFormatterBuffering;
+        private DataContractSerializerSettings _serializerSettings;
 
         /// <summary>
         /// Initializes a new instance of DataContractSerializerInputFormatter
@@ -78,10 +78,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
         /// The quotas include - DefaultMaxDepth, DefaultMaxStringContentLength, DefaultMaxArrayLength,
         /// DefaultMaxBytesPerRead, DefaultMaxNameTableCharCount
         /// </summary>
-        public XmlDictionaryReaderQuotas XmlDictionaryReaderQuotas
+        public XmlDictionaryReaderQuotas XmlDictionaryReaderQuotas => _readerQuotas;
-        {
-            get { return _readerQuotas; }
-        }
 
         /// <summary>
         /// Gets or sets the <see cref="DataContractSerializerSettings"/> used to configure the
@@ -89,7 +86,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
         /// </summary>
         public DataContractSerializerSettings SerializerSettings
         {
-            get { return _serializerSettings; }
+            get => _serializerSettings;
             set
             {
                 if (value == null)
@@ -137,8 +134,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
                 // Unwrap only if the original type was wrapped.
                 if (type != context.ModelType)
                 {
-                    var unwrappable = deserializedObject as IUnwrappable;
+                    if (deserializedObject is IUnwrappable unwrappable)
-                    if (unwrappable != null)
                     {
                         deserializedObject = unwrappable.Unwrap(declaredType: context.ModelType);
                     }
@@ -234,8 +230,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
                 throw new ArgumentNullException(nameof(type));
             }
 
-            object serializer;
+            if (!_serializerCache.TryGetValue(type, out var serializer))
-            if (!_serializerCache.TryGetValue(type, out serializer))
             {
                 serializer = CreateSerializer(type);
                 if (serializer != null)

src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerOutputFormatter.cs

@@ -20,8 +20,8 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
     /// </summary>
     public class XmlDataContractSerializerOutputFormatter : TextOutputFormatter
     {
+        private readonly ConcurrentDictionary<Type, object> _serializerCache = new ConcurrentDictionary<Type, object>();
         private DataContractSerializerSettings _serializerSettings;
-        private ConcurrentDictionary<Type, object> _serializerCache = new ConcurrentDictionary<Type, object>();
 
         /// <summary>
         /// Initializes a new instance of <see cref="XmlDataContractSerializerOutputFormatter"/>
@@ -76,7 +76,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
         /// </summary>
         public DataContractSerializerSettings SerializerSettings
         {
-            get { return _serializerSettings; }
+            get => _serializerSettings;
             set
             {
                 if (value == null)
@@ -225,8 +225,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
         /// <returns>The <see cref="DataContractSerializer"/> instance.</returns>
         protected virtual DataContractSerializer GetCachedSerializer(Type type)
         {
-            object serializer;
+            if (!_serializerCache.TryGetValue(type, out var serializer))
-            if (!_serializerCache.TryGetValue(type, out serializer))
             {
                 serializer = CreateSerializer(type);
                 if (serializer != null)

src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs

@@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
     /// </summary>
     public class XmlSerializerInputFormatter : TextInputFormatter
     {
-        private ConcurrentDictionary<Type, object> _serializerCache = new ConcurrentDictionary<Type, object>();
+        private readonly ConcurrentDictionary<Type, object> _serializerCache = new ConcurrentDictionary<Type, object>();
         private readonly XmlDictionaryReaderQuotas _readerQuotas = FormattingUtilities.GetDefaultXmlReaderQuotas();
         private readonly bool _suppressInputFormatterBuffering;
 
@@ -75,10 +75,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
         /// The quotas include - DefaultMaxDepth, DefaultMaxStringContentLength, DefaultMaxArrayLength,
         /// DefaultMaxBytesPerRead, DefaultMaxNameTableCharCount
         /// </summary>
-        public XmlDictionaryReaderQuotas XmlDictionaryReaderQuotas
+        public XmlDictionaryReaderQuotas XmlDictionaryReaderQuotas => _readerQuotas;
-        {
-            get { return _readerQuotas; }
-        }
 
         /// <inheritdoc />
         public override async Task<InputFormatterResult> ReadRequestBodyAsync(
@@ -119,8 +116,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
                 // Unwrap only if the original type was wrapped.
                 if (type != context.ModelType)
                 {
-                    var unwrappable = deserializedObject as IUnwrappable;
+                    if (deserializedObject is IUnwrappable unwrappable)
-                    if (unwrappable != null)
                     {
                         deserializedObject = unwrappable.Unwrap(declaredType: context.ModelType);
                     }
@@ -210,8 +206,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
                 throw new ArgumentNullException(nameof(type));
             }
 
-            object serializer;
+            if (!_serializerCache.TryGetValue(type, out var serializer))
-            if (!_serializerCache.TryGetValue(type, out serializer))
             {
                 serializer = CreateSerializer(type);
                 if (serializer != null)

src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerOutputFormatter.cs

@@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
     /// </summary>
     public class XmlSerializerOutputFormatter : TextOutputFormatter
     {
-        private ConcurrentDictionary<Type, object> _serializerCache = new ConcurrentDictionary<Type, object>();
+        private readonly ConcurrentDictionary<Type, object> _serializerCache = new ConcurrentDictionary<Type, object>();
 
         /// <summary>
         /// Initializes a new instance of <see cref="XmlSerializerOutputFormatter"/>
@@ -203,8 +203,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
         /// <returns>The <see cref="XmlSerializer"/> instance.</returns>
         protected virtual XmlSerializer GetCachedSerializer(Type type)
         {
-            object serializer;
+            if (!_serializerCache.TryGetValue(type, out var serializer))
-            if (!_serializerCache.TryGetValue(type, out serializer))
             {
                 serializer = CreateSerializer(type);
                 if (serializer != null)

src/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs

@@ -36,10 +36,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor
         /// <summary>
         /// Gets the asynchronous delegate to invoke when <see cref="WriteTo(TextWriter, HtmlEncoder)"/> is called.
         /// </summary>
-        public Func<TextWriter, Task> WriteAction
+        public Func<TextWriter, Task> WriteAction => _asyncAction;
-        {
-            get { return _asyncAction; }
-        }
 
         /// <summary>
         /// Method invoked to produce content from the <see cref="HelperResult"/>.

src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorViewCompiler.cs

@@ -32,7 +32,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Internal
         private readonly Action<RoslynCompilationContext> _compilationCallback;
         private readonly ILogger _logger;
         private readonly CSharpCompiler _csharpCompiler;
-        private IMemoryCache _cache;
+        private readonly IMemoryCache _cache;
 
         public RazorViewCompiler(
             IFileProvider fileProvider,